Update to 2.82 for more bug fixes.
This minor release, under the guise of adding support for Qt5, now
casually requires Qt5 as the minimum version. Since we don't have
a Qt5 port, this means dropping the Qt client. If somebody has a
strong opinion to the contrary and a better suggestion, speak up.
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/transmission/Makefile,v
retrieving revision 1.89
diff -u -p -r1.89 Makefile
--- Makefile 9 Aug 2013 19:13:08 -0000 1.89
+++ Makefile 10 Aug 2013 21:02:42 -0000
@@ -2,13 +2,11 @@
COMMENT-main= BitTorrent command line and daemon client
COMMENT-gtk= BitTorrent client with GTK+ interface
-COMMENT-qt= BitTorrent client with Qt interface
-VER= 2.81
+VER= 2.82
DISTNAME= transmission-${VER}
PKGNAME-main= transmission-${VER}
PKGNAME-gtk= transmission-gtk-${VER}
-PKGNAME-qt= transmission-qt-${VER}
CATEGORIES= net
HOMEPAGE= http://www.transmissionbt.com/
@@ -20,11 +18,9 @@ PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES= http://download.transmissionbt.com/files/
EXTRACT_SUFX= .tar.xz
-MULTI_PACKAGES= -main -gtk -qt
+MULTI_PACKAGES= -main -gtk
-ONLY_FOR_ARCHS-qt=${GCC4_ARCHS}
-
-PSEUDO_FLAVORS= no_gtk no_qt
+PSEUDO_FLAVORS= no_gtk
FLAVOR?=
# Reminder:
@@ -42,9 +38,6 @@ WANTLIB-gtk= ${WANTLIB} ICE SM X11 Xcomp
harfbuzz pango-1.0 pangoft2-1.0 \
pangocairo-1.0 pixman-1 png pcre pthread-stubs xcb \
xcb-render xcb-shm
-WANTLIB-qt= ${WANTLIB} ICE SM QtCore QtDBus QtGui QtNetwork QtXml \
- X11 Xext Xi Xinerama Xrender \
- expat fontconfig freetype stdc++
MODULES= devel/gettext textproc/intltool
@@ -54,14 +47,10 @@ LIB_DEPENDS= devel/libevent2 \
net/miniupnp/miniupnpc
LIB_DEPENDS-gtk=${LIB_DEPENDS} \
x11/gtk+3
-LIB_DEPENDS-qt= ${LIB_DEPENDS} \
- x11/qt4
RUN_DEPENDS-gtk=${PKGNAME-main}:net/transmission,-main \
devel/desktop-file-utils \
x11/gtk+2,-guic
-RUN_DEPENDS-qt= ${PKGNAME-main}:net/transmission,-main \
- devel/desktop-file-utils
USE_GMAKE= Yes
CONFIGURE_STYLE=gnu
@@ -76,9 +65,6 @@ CONFIGURE_ARGS+=--disable-utp
CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/third-party -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-QMAKE_ARGS= QMAKE_CXX="${CXX}" \
- QMAKE_CXXFLAGS="${CXXFLAGS}"
-
.include <bsd.port.arch.mk>
.if !${BUILD_PACKAGES:M-gtk}
@@ -87,21 +73,5 @@ CONFIGURE_ARGS+=--without-gtk
pre-patch:
@cd ${WRKSRC}/third-party/libutp; perl -pi -e 's/\r$$//' *.h *.cpp
-
-.if ${BUILD_PACKAGES:M-qt}
-post-build:
- cd ${WRKSRC}/qt; qmake4 ${QMAKE_ARGS} qtr.pro; make ${MAKE_FLAGS}
-
-post-install:
- cd ${WRKSRC}/qt; make ${MAKE_FLAGS} install INSTALL_ROOT=${PREFIX} \
- INSTALL_FILE="${INSTALL_DATA}" \
- INSTALL_PROGRAM="${INSTALL_PROGRAM}"
- ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
- ${INSTALL_DATA} ${WRKSRC}/qt/transmission-qt.desktop \
- ${PREFIX}/share/applications/
- ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
- ${INSTALL_DATA} ${WRKSRC}/qt/icons/transmission.png \
- ${PREFIX}/share/pixmaps/transmission-qt.png
-.endif
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/transmission/distinfo,v
retrieving revision 1.46
diff -u -p -r1.46 distinfo
--- distinfo 9 Aug 2013 19:13:08 -0000 1.46
+++ distinfo 10 Aug 2013 21:02:42 -0000
@@ -1,2 +1,2 @@
-SHA256 (transmission-2.81.tar.xz) =
u7Vx9YJUZqpF5u9K0oYXYTWhqcAjT/6jUn69gAHMVqs=
-SIZE (transmission-2.81.tar.xz) = 3167816
+SHA256 (transmission-2.82.tar.xz) =
OZZlEIffZ6hfHhtKkrG1GN3v3YTGVLjfb7zLC5HwNSI=
+SIZE (transmission-2.82.tar.xz) = 3172024
Index: patches/patch-libtransmission_platform-quota_c
===================================================================
RCS file: patches/patch-libtransmission_platform-quota_c
diff -N patches/patch-libtransmission_platform-quota_c
--- patches/patch-libtransmission_platform-quota_c 9 Aug 2013 19:13:08
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-$OpenBSD: patch-libtransmission_platform-quota_c,v 1.1 2013/08/09 19:13:08
naddy Exp $
---- libtransmission/platform-quota.c.orig Tue Jul 23 13:37:31 2013
-+++ libtransmission/platform-quota.c Tue Jul 23 13:39:38 2013
-@@ -18,7 +18,7 @@
-
- #ifndef WIN32
- #include <sys/types.h> /* types needed by quota.h */
-- #ifdef __FreeBSD__
-+ #if defined(__FreeBSD__) || defined(__OpenBSD__)
- #include <ufs/ufs/quota.h> /* quotactl() */
- #elif defined (__sun)
- #include <sys/fs/ufs_quota.h> /* quotactl */
-@@ -203,7 +203,7 @@ getquota (const char * device)
- int64_t freespace;
- int64_t spaceused;
-
--#if defined(__FreeBSD__) || defined(SYS_DARWIN)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(SYS_DARWIN)
- if (quotactl(device, QCMD(Q_GETQUOTA, USRQUOTA), getuid(), (caddr_t) &dq)
== 0)
- {
- #elif defined(__sun)
-@@ -235,7 +235,7 @@ getquota (const char * device)
- /* No quota enabled for this user */
- return -1;
- }
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__)
- spaceused = (int64_t) dq.dqb_curblocks >> 1;
- #elif defined(SYS_DARWIN)
- spaceused = (int64_t) dq.dqb_curbytes;
Index: patches/patch-qt_qtr_pro
===================================================================
RCS file: patches/patch-qt_qtr_pro
diff -N patches/patch-qt_qtr_pro
--- patches/patch-qt_qtr_pro 7 Apr 2012 10:55:04 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-qt_qtr_pro,v 1.4 2012/04/07 10:55:04 naddy Exp $
---- qt/qtr.pro.orig Thu Mar 29 17:30:57 2012
-+++ qt/qtr.pro Thu Mar 29 17:31:22 2012
-@@ -8,7 +8,7 @@ target.path = /bin
- INSTALLS += target
-
- unix: INSTALLS += man
--man.path = /share/man/man1/
-+man.path = /man/man1/
- man.files = transmission-qt.1
-
- CONFIG += qt qdbus thread debug link_pkgconfig
-@@ -26,7 +26,7 @@ LIBS += $${LIBUTP_LIBS}
- LIBS += $${TRANSMISSION_TOP}/third-party/dht/libdht.a
- LIBS += $${LIBUPNP_LIBS}
- LIBS += $${LIBNATPMP_LIBS}
--unix: LIBS += -L$${EVENT_TOP}/lib -lz -lrt
-+unix: LIBS += -L$${EVENT_TOP}/lib -lz -levent_core -levent_extra
- win32:DEFINES += QT_DBUS
- win32:LIBS += -levent-2.0 -lws2_32 -lintl
- win32:LIBS += -lidn -liconv -lwldap32 -liphlpapi
Index: patches/patch-qt_torrent-filter_cc
===================================================================
RCS file: patches/patch-qt_torrent-filter_cc
diff -N patches/patch-qt_torrent-filter_cc
--- patches/patch-qt_torrent-filter_cc 12 Jul 2013 17:03:59 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-qt_torrent-filter_cc,v 1.1 2013/07/12 17:03:59 naddy Exp $
---- qt/torrent-filter.cc.orig Sat Jul 6 22:21:17 2013
-+++ qt/torrent-filter.cc Sat Jul 6 22:29:10 2013
-@@ -211,7 +211,7 @@ TorrentFilter :: hiddenRowCount( ) const
- void
- TorrentFilter :: countTorrentsPerMode (int * setmeCounts) const
- {
-- std::fill_n (setmeCounts, FilterMode::NUM_MODES, 0);
-+ std::fill_n (setmeCounts, int(FilterMode::NUM_MODES), 0);
-
- for (int row(0); ; ++row)
- {
Index: pkg/DESCR-qt
===================================================================
RCS file: pkg/DESCR-qt
diff -N pkg/DESCR-qt
--- pkg/DESCR-qt 1 Apr 2013 16:01:21 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,6 +0,0 @@
-Transmission is a BitTorrent client that features encryption, a web
-interface, peer exchange, magnet links, DHT, UPnP and NAT-PMP port
-forwarding, webseed support, watch directories, tracker editing,
-global and per-torrent speed limits, and more.
-
-This is the Qt graphical interface client.
Index: pkg/PLIST-qt
===================================================================
RCS file: pkg/PLIST-qt
diff -N pkg/PLIST-qt
--- pkg/PLIST-qt 12 Dec 2010 20:42:39 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-qt,v 1.2 2010/12/12 20:42:39 naddy Exp $
-@bin bin/transmission-qt
-@man man/man1/transmission-qt.1
-share/applications/transmission-qt.desktop
-share/pixmaps/
-share/pixmaps/transmission-qt.png
-@exec %D/bin/update-desktop-database
-@unexec-delete %D/bin/update-desktop-database
--
Christian "naddy" Weisgerber na...@mips.inka.de
