Index: head/net-p2p/transmission-cli/Makefile =================================================================== --- head/net-p2p/transmission-cli/Makefile (revision 399267) +++ head/net-p2p/transmission-cli/Makefile (revision 399268) @@ -1,118 +1,118 @@ # $FreeBSD$ PORTNAME= transmission PORTVERSION= 2.84 -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES?= net-p2p #MASTER_SITES= http://download.m0k.org/${PORTNAME}/files/ MASTER_SITES= http://transmission.cachefly.net/ PKGNAMESUFFIX?= -cli MAINTAINER?= jbeich@FreeBSD.org COMMENT?= Lightweight CLI (command line) BitTorrent client and utilities SLAVEPORT?= cli LICENSE= GPLv2 .if ${SLAVEPORT} == cli LICENSE+= MIT LICENSE_COMB= multi .endif LICENSE_FILE= ${WRKSRC}/COPYING USES+= cpe tar:xz CPE_VENDOR= transmissionbt CONFLICTS_INSTALL= ${PORTNAME}${PKGNAMESUFFIX}-2.5* OPTIONS_DEFINE= LITE DOCS EXTRACT_AFTER_ARGS=--no-same-owner --no-same-permissions --exclude third-party .if ${SLAVEPORT} != web LIB_DEPENDS?= ${GEN_LIB_DEPENDS} # General dependencies GEN_LIB_DEPENDS=libcurl.so:${PORTSDIR}/ftp/curl \ libdht.so:${PORTSDIR}/devel/jech-dht \ libminiupnpc.so:${PORTSDIR}/net/miniupnpc \ libnatpmp.so:${PORTSDIR}/net/libnatpmp \ libutp.so:${PORTSDIR}/net/libutp \ libevent.so:${PORTSDIR}/devel/libevent2 GEN_RUN_DEPENDS=${LOCALBASE}/share/transmission/web/index.html:${PORTSDIR}/www/transmission-web # This is master port of transmission-*, so don't override USES definition USES+= gmake iconv libtool localbase pkgconfig USE_OPENSSL= yes GNU_CONFIGURE= yes CPPFLAGS+= -DWITH_UTP=1 LIBS+= ${ICONV_LIB} CONFIGURE_ARGS=--with-zlib=/usr \ --without-inotify \ --disable-utp \ --enable-external-natpmp \ ${EXTRA_CONF_ARGS} CONFIGURE_ENV= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto" \ DHT_CFLAGS=" " \ DHT_LIBS="-ldht" \ LIBUTP_CFLAGS=" " \ LIBUTP_LIBS="-lutp" \ LIBUTP_LIBS_QT="-lutp" EXTRA_CONF_ARGS?=--enable-cli \ --disable-daemon \ --without-gtk \ --disable-mac \ --disable-nls LITE_CONFIGURE_ENABLE= lightweight EXTRA_PATCHES= ${PATCHDIR}/disable-web .endif DOCS= AUTHORS NEWS README DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} .include .if !empty(ICONV_LIB) CONFIGURE_ARGS+=ac_cv_func_iconv_open=yes .endif general-patch: @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ 's|noinst_PROGRAMS = |noinst_PROGRAMS = #|g' .if ${SLAVEPORT} != gtk @${REINPLACE_CMD} -e '/#define DISABLE_GETTEXT/s,/\* \(.*\) \*/,\1,' \ ${WRKSRC}/libtransmission/utils.h .endif @${REINPLACE_CMD} -e \ 's|rt_clock_gettime=yes|rt_clock_gettime=no|g ; \ s|" == "|" = "|g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|doc \\| \\|g' \ ${WRKSRC}/Makefile.in .if ${SLAVEPORT} != cli @${REINPLACE_CMD} -e 's|utils \\|\\|g' \ ${WRKSRC}/Makefile.in .endif # Don't conflict with patches but force system libraries @${REINPLACE_CMD} -e 's|third-party \\|\\|g' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -Ee '/^DHT_(CFLAGS|LIBS)=/d' \ -e 's|third-party/[^ ]*Makefile||g' \ ${WRKSRC}/configure @${REINPLACE_CMD} \ -e 's,TRANSMISSION_TOP}/third-party/dht/libdht.a,DHT_LIBS},' \ ${WRKSRC}/qt/qtr.pro @${ECHO_CMD} 'DHT_LIBS = @DHT_LIBS@' >>${WRKSRC}/qt/config.pri.in post-patch: general-patch general-install: (cd ${WRKSRC} && ${COPYTREE_SHARE} \ "${DOCS}" ${STAGEDIR}${DOCSDIR}) post-install: general-install .include Index: head/net-p2p/transmission-cli/files/patch-libtransmission_upnp.c =================================================================== --- head/net-p2p/transmission-cli/files/patch-libtransmission_upnp.c (nonexistent) +++ head/net-p2p/transmission-cli/files/patch-libtransmission_upnp.c (revision 399268) @@ -0,0 +1,18 @@ +https://trac.transmissionbt.com/ticket/6003 + +Index: libtransmission/upnp.c +=================================================================== +--- libtransmission/upnp.c (revision 14564) ++++ libtransmission/upnp.c (revision 14565) +@@ -88,7 +88,11 @@ tr_upnpDiscover (int msec) + + #if (MINIUPNPC_API_VERSION >= 8) /* adds ipv6 and error args */ + int err = UPNPDISCOVER_SUCCESS; ++ #if (MINIUPNPC_API_VERSION >= 14) /* adds ttl */ ++ ret = upnpDiscover (msec, NULL, NULL, 0, 0, 2, &err); ++ #else + ret = upnpDiscover (msec, NULL, NULL, 0, 0, &err); ++ #endif + have_err = err != UPNPDISCOVER_SUCCESS; + #else + ret = upnpDiscover (msec, NULL, NULL, 0); Property changes on: head/net-p2p/transmission-cli/files/patch-libtransmission_upnp.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-p2p/transmission-daemon/Makefile =================================================================== --- head/net-p2p/transmission-daemon/Makefile (revision 399267) +++ head/net-p2p/transmission-daemon/Makefile (revision 399268) @@ -1,29 +1,29 @@ # $FreeBSD$ -PORTREVISION= 2 +PORTREVISION= 3 PKGNAMESUFFIX= -daemon MAINTAINER= crees@FreeBSD.org COMMENT= Fast and lightweight daemon BitTorrent client RUN_DEPENDS= ${GEN_RUN_DEPENDS} DESCR= ${.CURDIR}/pkg-descr MASTERDIR= ${.CURDIR}/../transmission-cli PLIST= ${.CURDIR}/pkg-plist SLAVEPORT= daemon USE_RC_SUBR= transmission USERS= transmission GROUPS= transmission EXTRA_CONF_ARGS=--disable-cli \ --enable-daemon \ --without-gtk \ --disable-mac \ --disable-nls post-install: ${MKDIR} ${STAGEDIR}${ETCDIR}/home .include "${MASTERDIR}/Makefile" Index: head/net-p2p/transmission-gtk/Makefile =================================================================== --- head/net-p2p/transmission-gtk/Makefile (revision 399267) +++ head/net-p2p/transmission-gtk/Makefile (revision 399268) @@ -1,35 +1,35 @@ # $FreeBSD$ PKGNAMESUFFIX= -gtk -PORTREVISION= 4 +PORTREVISION= 5 MAINTAINER= crees@FreeBSD.org COMMENT= Fast and lightweight GTK+3 BitTorrent client LIB_DEPENDS= ${GEN_LIB_DEPENDS} \ libnotify.so:${PORTSDIR}/devel/libnotify \ libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib RUN_DEPENDS= ${GEN_RUN_DEPENDS} \ xdg-open:${PORTSDIR}/devel/xdg-utils DESCR= ${.CURDIR}/pkg-descr MASTERDIR= ${.CURDIR}/../transmission-cli PLIST= ${.CURDIR}/pkg-plist SLAVEPORT= gtk USE_GNOME= gtk30 intlhack USES= gettext pathfix desktop-file-utils INSTALLS_ICONS= yes EXTRA_CONF_ARGS=--disable-cli \ --disable-daemon \ --with-gtk \ --disable-mac \ --enable-nls post-patch: general-patch @${REINPLACE_CMD} -e 's|TryExec=.*||g ; /^$$/d' \ ${WRKSRC}/gtk/transmission-gtk.desktop.in .include "${MASTERDIR}/Makefile" Index: head/net-p2p/transmission-qt4/Makefile =================================================================== --- head/net-p2p/transmission-qt4/Makefile (revision 399267) +++ head/net-p2p/transmission-qt4/Makefile (revision 399268) @@ -1,48 +1,48 @@ # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 2 PKGNAMESUFFIX= -qt4 MAINTAINER= crees@FreeBSD.org COMMENT= Fast and lightweight QT4 BitTorrent client LIB_DEPENDS= ${GEN_LIB_DEPENDS} RUN_DEPENDS= ${GEN_RUN_DEPENDS} DESCR= ${.CURDIR}/pkg-descr MASTERDIR= ${.CURDIR}/../transmission-cli PLIST= ${.CURDIR}/pkg-plist SLAVEPORT= qt4 QT_NONSTANDARD= yes USE_QT4= moc_build qmake_build rcc_build uic_build gui dbus network USES= desktop-file-utils EXTRA_CONF_ARGS=--disable-cli \ --disable-daemon \ --without-gtk \ --disable-mac \ --disable-nls post-patch: general-patch @${REINPLACE_CMD} -e 's|/share/man|/man|g ; /PKGCONFIG/s| openssl||g' \ ${WRKSRC}/qt/qtr.pro @${ECHO_CMD} 'LIBS += -lcrypto' >> ${WRKSRC}/qt/qtr.pro post-build: @(cd ${WRKSRC}/qt && ${QMAKE} ${QMAKE_ARGS} qtr.pro && ${MAKE_CMD}) do-install: @(cd ${WRKSRC}/qt && \ ${SETENV} INSTALL_ROOT=${STAGEDIR}${PREFIX} ${MAKE_CMD} install) post-install: general-install @${MKDIR} ${STAGEDIR}${DOCSDIR} @${INSTALL_DATA} ${WRKSRC}/qt/README.txt \ ${STAGEDIR}${DOCSDIR}/README-qt4 @${INSTALL_DATA} ${WRKSRC}/qt/transmission-qt.desktop \ ${STAGEDIR}${PREFIX}/share/applications/ @${INSTALL_DATA} ${WRKSRC}/qt/icons/transmission.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/transmission-qt.png .include "${MASTERDIR}/Makefile"