Works fine here on amd64, the cli and gtk package.
El 03/30/12 20:04, Christian Weisgerber escribió: > David Coppa <[email protected]> wrote: > >> Just out of curiosity... Why not patching transmission to use >> libnatpmp from the ports then? > > I was going the path of least resistance and hadn't even bothered > to check which libnatpmp was newer... So here's a slightly tweaked > version that relies on net/miniupnp/libnatpmp. > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/net/transmission/Makefile,v > retrieving revision 1.73 > diff -u -p -r1.73 Makefile > --- Makefile 1 Jan 2012 09:04:13 -0000 1.73 > +++ Makefile 30 Mar 2012 23:02:05 -0000 > @@ -4,7 +4,7 @@ COMMENT-main= BitTorrent command line an > COMMENT-gtk= BitTorrent client with GTK+ interface > COMMENT-qt= BitTorrent client with Qt interface > > -VER= 2.42 > +VER= 2.50 > DISTNAME= transmission-${VER} > PKGNAME-main= transmission-${VER} > PKGNAME-gtk= transmission-gtk-${VER} > @@ -12,8 +12,6 @@ PKGNAME-qt= transmission-qt-${VER} > CATEGORIES= net > HOMEPAGE= http://www.transmissionbt.com/ > > -REVISION-gtk= 1 > - > MAINTAINER= Christian Weisgerber <[email protected]> > > # GPLv2 > @@ -36,7 +34,8 @@ FLAVOR?= > # MODULES adds to WANTLIB and LIB_DEPENDS > # WANTLIB-main and LIB_DEPENDS-main default to WANTLIB and LIB_DEPENDS > > -WANTLIB= c crypto curl event_core event_extra idn m pthread ssl z > +WANTLIB= c crypto curl event_core event_extra idn m miniupnpc \ > + natpmp pthread ssl z > WANTLIB-gtk= ${WANTLIB} X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \ > Xfixes Xi Xinerama Xrandr Xrender Xxf86vm GL atk-1.0 cairo \ > cairo-gobject drm expat ffi fontconfig freetype \ > @@ -44,13 +43,16 @@ WANTLIB-gtk= ${WANTLIB} X11 Xau Xcomposi > gobject-2.0 gthread-2.0 gtk-3 pango-1.0 pangoft2-1.0 \ > pangocairo-1.0 pixman-1 png pcre pthread-stubs stdc++ xcb \ > xcb-render xcb-shm > -WANTLIB-qt= ${WANTLIB} QtCore QtDBus QtGui QtNetwork QtXml \ > +WANTLIB-qt= ${WANTLIB} ICE SM QtCore QtDBus QtGui QtNetwork QtXml \ > + X11 Xext Xi Xinerama Xrender \ > expat fontconfig freetype stdc++ > > MODULES= devel/gettext textproc/intltool > > LIB_DEPENDS= devel/libevent2 \ > - net/curl > + net/curl \ > + net/miniupnp/libnatpmp \ > + net/miniupnp/miniupnpc > LIB_DEPENDS-gtk=${LIB_DEPENDS} \ > x11/gtk+3 > LIB_DEPENDS-qt= ${LIB_DEPENDS} \ > @@ -68,11 +70,15 @@ TAR= ${LOCALBASE}/bin/gtar > USE_GMAKE= Yes > USE_LIBTOOL= Yes > CONFIGURE_STYLE=gnu > -CONFIGURE_ARGS= --disable-shared > +CONFIGURE_ARGS= --disable-shared \ > + --enable-external-natpmp > # unaligned accesses throughout > CONFIGURE_ARGS+=--disable-utp > > -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ > +# -I$(top_builddir)/third-party is required, but configure fails to > +# set it if we use external miniupnp libs. > + > +CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/third-party > -I${LOCALBASE}/include" \ > LDFLAGS="-L${LOCALBASE}/lib" > > .include <bsd.port.arch.mk> > Index: distinfo > =================================================================== > RCS file: /cvs/ports/net/transmission/distinfo,v > retrieving revision 1.36 > diff -u -p -r1.36 distinfo > --- distinfo 15 Nov 2011 16:05:19 -0000 1.36 > +++ distinfo 30 Mar 2012 23:02:05 -0000 > @@ -1,5 +1,5 @@ > -MD5 (transmission-2.42.tar.xz) = UPbddsXAH0XV7SB4PGhoFQ== > -RMD160 (transmission-2.42.tar.xz) = x0aIphwqhIn4eDYwRqxwXxzj8AU= > -SHA1 (transmission-2.42.tar.xz) = eJAwlYQv4TMcC2riFKnpmw8RKVE= > -SHA256 (transmission-2.42.tar.xz) = > ypTY3lM4F4wiEOhuMapSL1WcrIfaM6hRmfvYG36LBOs= > -SIZE (transmission-2.42.tar.xz) = 2629072 > +MD5 (transmission-2.50.tar.xz) = B2Bnifqy+XMPpFTPx6BLLQ== > +RMD160 (transmission-2.50.tar.xz) = cpn3QQr1j7utKk5XcfM7ySPyod4= > +SHA1 (transmission-2.50.tar.xz) = 3wwZwDgPKLOeY5HKsodfz3IKxws= > +SHA256 (transmission-2.50.tar.xz) = > wnHI9LZJWcKxuhJFxGXj7Ce1RQEo9A4VwH/y8Tbp+QA= > +SIZE (transmission-2.50.tar.xz) = 2766300 > Index: patches/patch-configure > =================================================================== > RCS file: /cvs/ports/net/transmission/patches/patch-configure,v > retrieving revision 1.26 > diff -u -p -r1.26 patch-configure > --- patches/patch-configure 15 Nov 2011 16:05:19 -0000 1.26 > +++ patches/patch-configure 30 Mar 2012 23:02:05 -0000 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-configure,v 1.26 2011/11/15 16:05:19 naddy Exp $ > ---- configure.orig Thu Oct 20 04:02:58 2011 > -+++ configure Sun Nov 6 19:06:37 2011 > -@@ -11648,8 +11648,8 @@ if test 0 = "0"; then > +--- configure.orig Wed Feb 15 03:02:06 2012 > ++++ configure Thu Mar 29 17:30:45 2012 > +@@ -11753,8 +11753,8 @@ if test 0 = "0"; then > else > supported_build=no > if test "x$GCC" = "xyes" ; then > @@ -12,7 +12,7 @@ $OpenBSD: patch-configure,v 1.26 2011/11 > fi > fi > if test "x$supported_build" = "xno"; then > -@@ -16049,7 +16049,7 @@ esac > +@@ -16153,7 +16153,7 @@ esac > > if test "x$GCC" = "xyes" ; then > > @@ -21,7 +21,7 @@ $OpenBSD: patch-configure,v 1.26 2011/11 > > { $as_echo "$as_me:${as_lineno-$LINENO}: checking gcc version" >&5 > $as_echo_n "checking gcc version... " >&6; } > -@@ -16061,10 +16061,10 @@ $as_echo_n "checking gcc version... " >&6; } > +@@ -16165,10 +16165,10 @@ $as_echo_n "checking gcc version... " >&6; } > { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCC_VERSION" >&5 > $as_echo "$GCC_VERSION" >&6; } > if test $GCC_VERSION_NUM -ge 304; then > @@ -34,12 +34,3 @@ $OpenBSD: patch-configure,v 1.26 2011/11 > fi > fi > > -@@ -18868,7 +18868,7 @@ $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 > - if test $? -ne 0; then > - as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5 > - else > -- IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" > -+ IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` > - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 > - $as_echo "$IT_PERL_VERSION" >&6; } > - fi > Index: patches/patch-libtransmission_natpmp_c > =================================================================== > RCS file: patches/patch-libtransmission_natpmp_c > diff -N patches/patch-libtransmission_natpmp_c > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-libtransmission_natpmp_c 30 Mar 2012 23:02:05 -0000 > @@ -0,0 +1,12 @@ > +$OpenBSD$ > +--- libtransmission/natpmp.c.orig Fri Mar 30 23:52:29 2012 > ++++ libtransmission/natpmp.c Fri Mar 30 23:52:55 2012 > +@@ -120,7 +120,7 @@ tr_natpmpPulse( struct tr_natpmp * nat, tr_port privat > + > + if( is_enabled && ( nat->state == TR_NATPMP_DISCOVER ) ) > + { > +- int val = initnatpmp( &nat->natpmp ); > ++ int val = initnatpmp( &nat->natpmp, 0, 0 ); > + logVal( "initnatpmp", val ); > + val = sendpublicaddressrequest( &nat->natpmp ); > + logVal( "sendpublicaddressrequest", val ); > Index: patches/patch-libtransmission_peer-msgs_c > =================================================================== > RCS file: patches/patch-libtransmission_peer-msgs_c > diff -N patches/patch-libtransmission_peer-msgs_c > --- patches/patch-libtransmission_peer-msgs_c 23 Sep 2011 09:12:32 -0000 > 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,12 +0,0 @@ > -$OpenBSD: patch-libtransmission_peer-msgs_c,v 1.1 2011/09/23 09:12:32 naddy > Exp $ > ---- libtransmission/peer-msgs.c.orig Thu Jul 21 01:38:56 2011 > -+++ libtransmission/peer-msgs.c Mon Sep 19 15:32:25 2011 > -@@ -16,8 +16,6 @@ > - #include <stdlib.h> > - #include <string.h> > - > --#include <alloca.h> > -- > - #include <event2/buffer.h> > - #include <event2/bufferevent.h> > - #include <event2/event.h> > Index: patches/patch-qt_qtr_pro > =================================================================== > RCS file: /cvs/ports/net/transmission/patches/patch-qt_qtr_pro,v > retrieving revision 1.3 > diff -u -p -r1.3 patch-qt_qtr_pro > --- patches/patch-qt_qtr_pro 23 Sep 2011 09:12:32 -0000 1.3 > +++ patches/patch-qt_qtr_pro 30 Mar 2012 23:02:05 -0000 > @@ -1,6 +1,6 @@ > $OpenBSD: patch-qt_qtr_pro,v 1.3 2011/09/23 09:12:32 naddy Exp $ > ---- qt/qtr.pro.orig Thu Jul 21 01:38:56 2011 > -+++ qt/qtr.pro Mon Sep 19 15:32:25 2011 > +--- 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 > > @@ -10,10 +10,10 @@ $OpenBSD: patch-qt_qtr_pro,v 1.3 2011/09 > man.files = transmission-qt.1 > > CONFIG += qt qdbus thread debug link_pkgconfig > -@@ -25,7 +25,7 @@ exists( $${TRANSMISSION_TOP}/third-party/libutp/libutp > +@@ -26,7 +26,7 @@ LIBS += $${LIBUTP_LIBS} > LIBS += $${TRANSMISSION_TOP}/third-party/dht/libdht.a > - LIBS += $${TRANSMISSION_TOP}/third-party/miniupnp/libminiupnp.a > - LIBS += $${TRANSMISSION_TOP}/third-party/libnatpmp/libnatpmp.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 > Index: patches/patch-third-party_libnatpmp_getgateway_c > =================================================================== > RCS file: patches/patch-third-party_libnatpmp_getgateway_c > diff -N patches/patch-third-party_libnatpmp_getgateway_c > --- patches/patch-third-party_libnatpmp_getgateway_c 21 Mar 2010 16:30:28 > -0000 1.3 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,12 +0,0 @@ > -$OpenBSD: patch-third-party_libnatpmp_getgateway_c,v 1.3 2010/03/21 16:30:28 > naddy Exp $ > ---- third-party/libnatpmp/getgateway.c.orig Fri Mar 12 03:04:32 2010 > -+++ third-party/libnatpmp/getgateway.c Fri Mar 12 23:10:54 2010 > -@@ -273,7 +273,7 @@ int getdefaultgateway(in_addr_t *addr) > - > - do { > - l = read(s, (char *)&m_rtmsg, sizeof(m_rtmsg)); > -- } while (l > 0 && (rtm.rtm_seq != seq || rtm.rtm_pid != pid)); > -+ } while (l > 0 && (rtm.rtm_version != RTM_VERSION || rtm.rtm_seq != seq > || rtm.rtm_pid != pid)); > - > - close(s); > - > Index: patches/patch-third-party_libutp_utypes_h > =================================================================== > RCS file: patches/patch-third-party_libutp_utypes_h > diff -N patches/patch-third-party_libutp_utypes_h > --- patches/patch-third-party_libutp_utypes_h 15 Nov 2011 16:05:19 -0000 > 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,15 +0,0 @@ > -$OpenBSD: patch-third-party_libutp_utypes_h,v 1.1 2011/11/15 16:05:19 naddy > Exp $ > ---- third-party/libutp/utypes.h.orig Wed Sep 28 19:46:15 2011 > -+++ third-party/libutp/utypes.h Wed Sep 28 19:47:06 2011 > -@@ -36,7 +36,11 @@ typedef const char * cstr; > - typedef char * str; > - > - #ifndef __cplusplus > -+#ifdef HAVE_STDBOOL_H > -+#include <stdbool.h> > -+#else > - typedef uint8 bool; > -+#endif > - #endif > - > - #endif //__UTYPES_H__ > Index: pkg/PLIST-main > =================================================================== > RCS file: /cvs/ports/net/transmission/pkg/PLIST-main,v > retrieving revision 1.20 > diff -u -p -r1.20 PLIST-main > --- pkg/PLIST-main 15 Nov 2011 16:05:19 -0000 1.20 > +++ pkg/PLIST-main 30 Mar 2012 23:02:05 -0000 > @@ -19,31 +19,8 @@ share/transmission/ > share/transmission/web/ > share/transmission/web/LICENSE > share/transmission/web/images/ > -share/transmission/web/images/buttons/ > -share/transmission/web/images/buttons/cancel.png > -share/transmission/web/images/buttons/file_priority_buttons.png > -share/transmission/web/images/buttons/file_wanted_buttons.png > -share/transmission/web/images/buttons/info_activity.png > -share/transmission/web/images/buttons/info_files.png > -share/transmission/web/images/buttons/info_general.png > -share/transmission/web/images/buttons/info_peers.png > -share/transmission/web/images/buttons/info_trackers.png > -share/transmission/web/images/buttons/tab_backgrounds.png > -share/transmission/web/images/buttons/tab_backgrounds_highlight.png > -share/transmission/web/images/buttons/toolbar_buttons.png > -share/transmission/web/images/buttons/torrent_buttons.png > share/transmission/web/images/favicon.ico > share/transmission/web/images/favicon.png > -share/transmission/web/images/graphics/ > -share/transmission/web/images/graphics/blue-turtle.png > -share/transmission/web/images/graphics/chrome.png > -share/transmission/web/images/graphics/filter_bar.png > -share/transmission/web/images/graphics/filter_icon.png > -share/transmission/web/images/graphics/iphone_chrome.png > -share/transmission/web/images/graphics/lock_icon.png > -share/transmission/web/images/graphics/logo.png > -share/transmission/web/images/progress/ > -share/transmission/web/images/progress/progress.png > share/transmission/web/images/webclip-icon.png > share/transmission/web/index.html > share/transmission/web/javascript/ > @@ -56,18 +33,58 @@ share/transmission/web/javascript/jquery > share/transmission/web/javascript/jquery/jquery.contextmenu.min.js > share/transmission/web/javascript/jquery/jquery.form.js > share/transmission/web/javascript/jquery/jquery.form.min.js > +share/transmission/web/javascript/jquery/jquery.min.js > share/transmission/web/javascript/jquery/jquery.transmenu.min.js > +share/transmission/web/javascript/jquery/jqueryui-1.8.16.min.js > share/transmission/web/javascript/jquery/json2.min.js > share/transmission/web/javascript/prefs-dialog.js > share/transmission/web/javascript/remote.js > share/transmission/web/javascript/torrent-row.js > share/transmission/web/javascript/torrent.js > share/transmission/web/javascript/transmission.js > -share/transmission/web/stylesheets/ > -share/transmission/web/stylesheets/common.css > -share/transmission/web/stylesheets/ie7.css > -share/transmission/web/stylesheets/ieAll.css > -share/transmission/web/stylesheets/mobile.css > +share/transmission/web/style/ > +share/transmission/web/style/jqueryui/ > +share/transmission/web/style/jqueryui/images/ > +share/transmission/web/style/jqueryui/images/ui-bg_flat_75_ffffff_40x100.png > +share/transmission/web/style/jqueryui/images/ui-bg_glass_65_ffffff_1x400.png > +share/transmission/web/style/jqueryui/images/ui-bg_glass_75_dadada_1x400.png > +share/transmission/web/style/jqueryui/images/ui-bg_glass_75_e6e6e6_1x400.png > +share/transmission/web/style/jqueryui/images/ui-bg_highlight-soft_75_cccccc_1x100.png > +share/transmission/web/style/jqueryui/images/ui-icons_222222_256x240.png > +share/transmission/web/style/jqueryui/images/ui-icons_454545_256x240.png > +share/transmission/web/style/jqueryui/jqueryui-1.8.16.css > +share/transmission/web/style/transmission/ > +share/transmission/web/style/transmission/common.css > +share/transmission/web/style/transmission/images/ > +share/transmission/web/style/transmission/images/arrow-down.png > +share/transmission/web/style/transmission/images/arrow-up.png > +share/transmission/web/style/transmission/images/blue-turtle.png > +share/transmission/web/style/transmission/images/buttons/ > +share/transmission/web/style/transmission/images/buttons/torrent_buttons.png > +share/transmission/web/style/transmission/images/compact.png > +share/transmission/web/style/transmission/images/file-priority-high.png > +share/transmission/web/style/transmission/images/file-priority-low.png > +share/transmission/web/style/transmission/images/file-priority-normal.png > +share/transmission/web/style/transmission/images/filter_bar.png > +share/transmission/web/style/transmission/images/filter_icon.png > +share/transmission/web/style/transmission/images/inspector-files.png > +share/transmission/web/style/transmission/images/inspector-info.png > +share/transmission/web/style/transmission/images/inspector-peers.png > +share/transmission/web/style/transmission/images/inspector-trackers.png > +share/transmission/web/style/transmission/images/lock_icon.png > +share/transmission/web/style/transmission/images/logo.png > +share/transmission/web/style/transmission/images/progress.png > +share/transmission/web/style/transmission/images/settings.png > +share/transmission/web/style/transmission/images/toolbar-close.png > +share/transmission/web/style/transmission/images/toolbar-folder.png > +share/transmission/web/style/transmission/images/toolbar-info.png > +share/transmission/web/style/transmission/images/toolbar-pause-all.png > +share/transmission/web/style/transmission/images/toolbar-pause.png > +share/transmission/web/style/transmission/images/toolbar-start-all.png > +share/transmission/web/style/transmission/images/toolbar-start.png > +share/transmission/web/style/transmission/images/turtle.png > +share/transmission/web/style/transmission/images/wrench.png > +share/transmission/web/style/transmission/mobile.css > @rcscript ${RCDIR}/transmission_daemon > @mode 750 > @owner _transmission > -- Sending from my Computer.
