Re: Update: net/transmission 2.50

2012-04-01 Thread Gonzalo L. R.
Works fine here on amd64, the cli and gtk package.


El 03/30/12 20:04, Christian Weisgerber escribió:
 David Coppa dco...@gmail.com 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 -   1.73
 +++ Makefile  30 Mar 2012 23:02:05 -
 @@ -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 na...@openbsd.org
  
  # 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 -  1.36
 +++ distinfo  30 Mar 2012 23:02:05 -
 @@ -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 -  1.26
 +++ patches/patch-configure   30 Mar 2012 23:02:05 -
 @@ -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
 -+++ configureSun Nov  6 19:06:37 2011
 -@@ -11648,8 +11648,8 @@ if test 0 = 0; then
 +--- configure.orig   Wed Feb 15 03:02:06 2012
  configureThu 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 

Re: Update: net/transmission 2.50

2012-03-30 Thread David Coppa
On Thu, Mar 29, 2012 at 9:50 PM, Christian Weisgerber
na...@mips.inka.de wrote:
 This updates net/transmission to 2.50.  New in this version:
 * Overhauled web client.
 * Various bug fixes.

 The port now uses the external miniupnp client library from the
 ports tree.  We can't do the same for natpmp because the included
 version has a different API.

Just out of curiosity... Why not patching transmission to use
libnatpmp from the ports then?

I did this for mldonkey:

ports/net/mldonkey/stable/patches/patch-src_utils_net_upnp_stubs_c

ciao,
David



Re: Update: net/transmission 2.50

2012-03-30 Thread Christian Weisgerber
David Coppa dco...@gmail.com 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
--- Makefile1 Jan 2012 09:04:13 -   1.73
+++ Makefile30 Mar 2012 23:02:05 -
@@ -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 na...@openbsd.org
 
 # 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
--- distinfo15 Nov 2011 16:05:19 -  1.36
+++ distinfo30 Mar 2012 23:02:05 -
@@ -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 -  1.26
+++ patches/patch-configure 30 Mar 2012 23:02:05 -
@@ -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
  
@@ 

Update: net/transmission 2.50

2012-03-29 Thread Christian Weisgerber
This updates net/transmission to 2.50.  New in this version:
* Overhauled web client.
* Various bug fixes.

The port now uses the external miniupnp client library from the
ports tree.  We can't do the same for natpmp because the included
version has a different API.

I'm especially interested in feedback from people who use the GTK+
and Qt clients, because I don't.

Index: Makefile
===
RCS file: /cvs/ports/net/transmission/Makefile,v
retrieving revision 1.73
diff -u -p -r1.73 Makefile
--- Makefile1 Jan 2012 09:04:13 -   1.73
+++ Makefile29 Mar 2012 19:33:56 -
@@ -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 na...@openbsd.org
 
 # 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 \
+   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,15 @@ 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/miniupnpc
 LIB_DEPENDS-gtk=${LIB_DEPENDS} \
x11/gtk+3
 LIB_DEPENDS-qt=${LIB_DEPENDS} \
@@ -72,7 +73,12 @@ CONFIGURE_ARGS=  --disable-shared
 # unaligned accesses throughout
 CONFIGURE_ARGS+=--disable-utp
 
-CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \
+# header and API conflict with net/miniupnp/natpmp
+INCLUDE_PATH=  -I${WRKSRC}/third-party/libnatpmp
+# configure fails to set this if it finds an external miniupnp
+INCLUDE_PATH+= -I${WRKSRC}/third-party
+
+CONFIGURE_ENV= CPPFLAGS=${INCLUDE_PATH} -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
--- distinfo15 Nov 2011 16:05:19 -  1.36
+++ distinfo29 Mar 2012 19:33:56 -
@@ -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 -  1.26
+++ patches/patch-configure 29 Mar 2012 19:33:56 -
@@ -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