This is an update for net/transmission to 0.93 and supersedes the one
to 0.90 I posted previously.

Major changes since 0.81: Encryption support.
Changes since 0.90: Bug fixes.

I haven't actually tested this yet, because I don't have a torrent
to download at the moment. :-)  Also, I haven't looked at building
the wx client, because part of its source is still missing from the
distfile.

Opinion poll: Should I keep the GTK client in a separate package?
Do people actually use the command line or daemon clients on systems
without X11?  Since Transmission's main attraction is the GTK client,
I'm uncertain whether the current packaging makes much sense.


Index: Makefile
===================================================================
RCS file: /cvs/ports/net/transmission/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile    17 Nov 2007 20:39:03 -0000      1.12
+++ Makefile    22 Nov 2007 20:48:55 -0000
@@ -3,22 +3,23 @@
 COMMENT-main=  lightweight BitTorrent command line and daemon client
 COMMENT-gui=   lightweight BitTorrent client with graphical interface
 
-VER=           0.81
-DISTNAME=      Transmission-${VER}
+VER=           0.93
+DISTNAME=      transmission-${VER}
 PKGNAME-main=  transmission-${VER}
-PKGNAME-gui=   transmission-gui-${VER}p0
+PKGNAME-gui=   transmission-gui-${VER}
 CATEGORIES=    net
 HOMEPAGE=      http://transmission.m0k.org/
 
 MAINTAINER=    Christian Weisgerber <[EMAIL PROTECTED]>
 
-# GPL
+# GPLv2
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=    Yes
 PERMIT_DISTFILES_CDROM=        Yes
 PERMIT_DISTFILES_FTP=  Yes
 
 MASTER_SITES=  http://download.m0k.org/transmission/files/
+EXTRACT_SUFX=  .tar.bz2
 
 PSEUDO_FLAVORS=        no_gui
 FLAVOR?=
@@ -26,25 +27,29 @@
 MULTI_PACKAGES=        -main
 
 WANTLIB=       c crypto m pthread
-WANTLIB-main=  ${WANTLIB} event
+WANTLIB-main=  ${WANTLIB}
 
-WRKDIST=       ${WRKDIR}
 USE_GMAKE=     Yes
-CONFIGURE_STYLE=simple
-CONFIGURE_ARGS=        --prefix="${PREFIX}"
+USE_LIBTOOL=   Yes
+CONFIGURE_STYLE=gnu
+CONFIGURE_ARGS=        --disable-shared --without-wx
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+               LDFLAGS="-L${LOCALBASE}/lib" \
+               OPENSSL_CFLAGS="-I/usr/include" \
+               OPENSSL_LIBS="-lcrypto"
+LIBTOOL_FLAGS= --tag=disable-shared
+MODGNU_CONFIG_GUESS_DIRS=${WRKSRC} ${WRKSRC}/third-party/libevent
 
 .if ${FLAVOR:L:Mno_gui}
-CONFIGURE_ARGS+=--disable-gtk
+CONFIGURE_ARGS+=--without-gtk
 .else
 MULTI_PACKAGES+=-gui
 MODULES=       devel/gettext
-WANTLIB-gui=   ${WANTLIB} X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama \
-               Xcomposite Xdamage \
-               Xrandr Xrender atk-1.0.>=1809.0 cairo expat fontconfig \
-               freetype glib-2.0.>=1200.0 glitz gmodule-2.0.>=1200.0 \
-               gobject-2.0.>=1200.0 pango-1.0.>=1300.0 pangoft2-1.0.>=1300.0 \
-               pangocairo-1.0.>=1300.0 png z
-LIB_DEPENDS=   
gdk_pixbuf-2.0.>=1000.0,gdk-x11-2.0.>=1000.0,gtk-x11-2.0.>=1000.0::x11/gtk+2
+WANTLIB-gui=   ${WANTLIB} X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
+               Xfixes Xi Xinerama Xrandr Xrender atk-1.0 cairo expat \
+               fontconfig freetype glib-2.0 glitz gmodule-2.0 gobject-2.0 \
+               gthread-2.0 pango-1.0 pangoft2-1.0 pangocairo-1.0 png pcre z
+LIB_DEPENDS=   gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2
 LIB_DEPENDS-main=
 RUN_DEPENDS-main=
 RUN_DEPENDS-gui=:${PKGNAME-main}:net/transmission,-main ${RUN_DEPENDS}
@@ -52,5 +57,8 @@
 .endif
 
 NO_REGRESS=    Yes
+
+post-install:
+       @cd ${PREFIX}/man/man1 && mv transmissioncli.1 transmission-cli.1
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/transmission/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo    2 Sep 2007 21:08:21 -0000       1.5
+++ distinfo    22 Nov 2007 20:48:55 -0000
@@ -1,5 +1,5 @@
-MD5 (Transmission-0.81.tar.gz) = 1qI4gYk/xxrlyWTGR3w18w==
-RMD160 (Transmission-0.81.tar.gz) = awfy2J8NpkBnSkjfPWSD/S3Trag=
-SHA1 (Transmission-0.81.tar.gz) = 9ZvXG9hCh2CnfOwQaJbYJKDPHPM=
-SHA256 (Transmission-0.81.tar.gz) = 
J87s9j+jKACVKCKCxhUtaeOL3QM99mXzDyiMms4aEN8=
-SIZE (Transmission-0.81.tar.gz) = 2269564
+MD5 (transmission-0.93.tar.bz2) = hgHSVpNpPe2X+0J0KLdftA==
+RMD160 (transmission-0.93.tar.bz2) = c0HdynjqIVwU2L4aMIbypCHb7s4=
+SHA1 (transmission-0.93.tar.bz2) = XF6F8XBvNwUSMqcZGKg9RBrOf64=
+SHA256 (transmission-0.93.tar.bz2) = 
thHklFAXcfwUb8By6qaDrcQuPXVAoILqPb4sSKmT/F0=
+SIZE (transmission-0.93.tar.bz2) = 2689601
Index: patches/patch-cli_transmissioncli_1
===================================================================
RCS file: patches/patch-cli_transmissioncli_1
diff -N patches/patch-cli_transmissioncli_1
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-cli_transmissioncli_1 22 Nov 2007 20:48:55 -0000
@@ -0,0 +1,20 @@
+$OpenBSD$
+--- cli/transmissioncli.1.orig Thu Nov 22 19:44:56 2007
++++ cli/transmissioncli.1      Thu Nov 22 19:45:35 2007
+@@ -14,13 +14,13 @@
+ .\"  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ .\"
+ .Dd April 18, 2007
+-.Dt TRANSMISSIONCLI 1
++.Dt TRANSMISSION-CLI 1
+ .Os
+ .Sh NAME
+-.Nm transmissioncli
++.Nm transmission-cli
+ .Nd a bittorrent client
+ .Sh SYNOPSIS
+-.Nm transmissioncli
++.Nm transmission-cli
+ .Bk -words
+ .Fl h
+ .Nm
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure     22 Nov 2007 20:48:55 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- configure.orig     Mon Nov 12 22:07:36 2007
++++ configure  Thu Nov 22 17:51:26 2007
+@@ -20783,10 +20783,6 @@ else
+ fi
+ 
+ 
+-if test "x$GCC" = "xyes" ; then
+-    CFLAGS="-g -Wall -W -O3 -funroll-loops"
+-    CXXFLAGS="-g -Wall -W -O3 -funroll-loops"
+-fi
+ { echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+ echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+ if test "${ac_cv_header_stdc+set}" = set; then
Index: patches/patch-mk_common_mk
===================================================================
RCS file: patches/patch-mk_common_mk
diff -N patches/patch-mk_common_mk
--- patches/patch-mk_common_mk  9 May 2007 14:01:55 -0000       1.3
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,56 +0,0 @@
-$OpenBSD: patch-mk_common_mk,v 1.3 2007/05/09 14:01:55 naddy Exp $
---- mk/common.mk.orig  Wed Apr 18 00:38:42 2007
-+++ mk/common.mk       Sat Apr 21 16:03:36 2007
-@@ -1,8 +1,6 @@
- # $Id: patch-mk_common_mk,v 1.3 2007/05/09 14:01:55 naddy Exp $
- 
--TMPCFLAGS   = -g -Wall -W -O3 -funroll-loops -D_FILE_OFFSET_BITS=64 \
--              -D_LARGEFILE_SOURCE -D_GNU_SOURCE \
--              -DSYS_$(shell echo $(SYSTEM) | tr a-z A-Z)
-+TMPCFLAGS   = -DSYS_$(shell echo $(SYSTEM) | tr a-z A-Z)
- TMPCXXFLAGS = $(TMPCFLAGS)
- TMPLDFLAGS  =
- 
-@@ -91,32 +89,32 @@ endef
- 
- define INSTALL_BIN_RULE
-        @echo "Install $<"
--       @$(MKDIR) $(DESTDIR)$(PREFIX)/bin
--       @$(CP) $< $(DESTDIR)$(PREFIX)/bin/
-+       @$(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(PREFIX)/bin
-+       @$(BSD_INSTALL_PROGRAM) $< $(DESTDIR)$(PREFIX)/bin/
- endef
- 
- define INSTALL_LOCALE_RULE
-        @echo "Install $<"
--       @$(MKDIR) $(DESTDIR)$(LOCALEDIR)/$*/LC_MESSAGES
--       @$(CP) $< $(DESTDIR)$(LOCALEDIR)/$*/LC_MESSAGES/transmission-gtk.mo
-+       @$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(LOCALEDIR)/$*/LC_MESSAGES
-+       @$(BSD_INSTALL_DATA) $< 
$(DESTDIR)$(LOCALEDIR)/$*/LC_MESSAGES/transmission-gtk.mo
- endef
- 
- define INSTALL_MAN_RULE
-       @echo "Install $<"
--      @$(MKDIR) $(DESTDIR)$(PREFIX)/man/man1
--      @$(CP) $< $(DESTDIR)$(PREFIX)/man/man1/
-+      @$(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(PREFIX)/man/man1
-+      @$(BSD_INSTALL_MAN) $< $(DESTDIR)$(PREFIX)/man/man1/
- endef
- 
- define INSTALL_DESKTOP_RULE
-       @echo "Install $<"
--      @$(MKDIR) $(DESTDIR)$(PREFIX)/share/applications
--      @$(CP) $< $(DESTDIR)$(PREFIX)/share/applications/
-+      @$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(PREFIX)/share/applications
-+      @$(BSD_INSTALL_DATA) $< $(DESTDIR)$(PREFIX)/share/applications/
- endef
- 
- define INSTALL_ICON_RULE
-       @echo "Install $<"
--      @$(MKDIR) $(DESTDIR)$(PREFIX)/share/pixmaps
--      @$(CP) $< $(DESTDIR)$(PREFIX)/share/pixmaps/
-+      @$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(PREFIX)/share/pixmaps
-+      @$(BSD_INSTALL_DATA) $< $(DESTDIR)$(PREFIX)/share/pixmaps/
- endef
- 
- RM       = rm -Rf
Index: pkg/PLIST-gui
===================================================================
RCS file: /cvs/ports/net/transmission/pkg/PLIST-gui,v
retrieving revision 1.4
diff -u -r1.4 PLIST-gui
--- pkg/PLIST-gui       2 Sep 2007 21:08:21 -0000       1.4
+++ pkg/PLIST-gui       22 Nov 2007 20:48:55 -0000
@@ -1,20 +1,20 @@
 @comment $OpenBSD: PLIST-gui,v 1.4 2007/09/02 21:08:21 naddy Exp $
-bin/transmission-gtk
[EMAIL PROTECTED] man/man1/transmission-gtk.1
+bin/transmission
[EMAIL PROTECTED] man/man1/transmission.1
 share/applications/
-share/applications/transmission-gtk.desktop
-share/locale/bg/LC_MESSAGES/transmission-gtk.mo
-share/locale/es/LC_MESSAGES/transmission-gtk.mo
-share/locale/fi/LC_MESSAGES/transmission-gtk.mo
-share/locale/fr/LC_MESSAGES/transmission-gtk.mo
-share/locale/it/LC_MESSAGES/transmission-gtk.mo
-share/locale/nl/LC_MESSAGES/transmission-gtk.mo
-share/locale/pl/LC_MESSAGES/transmission-gtk.mo
-share/locale/pt/LC_MESSAGES/transmission-gtk.mo
-share/locale/pt_BR/LC_MESSAGES/transmission-gtk.mo
-share/locale/ro/LC_MESSAGES/transmission-gtk.mo
-share/locale/ru/LC_MESSAGES/transmission-gtk.mo
-share/locale/sk/LC_MESSAGES/transmission-gtk.mo
-share/locale/sv/LC_MESSAGES/transmission-gtk.mo
+share/applications/transmission.desktop
+share/locale/de/LC_MESSAGES/transmission.mo
+share/locale/es/LC_MESSAGES/transmission.mo
+share/locale/fi/LC_MESSAGES/transmission.mo
+share/locale/fr/LC_MESSAGES/transmission.mo
+share/locale/it/LC_MESSAGES/transmission.mo
+share/locale/nl/LC_MESSAGES/transmission.mo
+share/locale/pl/LC_MESSAGES/transmission.mo
+share/locale/pt/LC_MESSAGES/transmission.mo
+share/locale/pt_BR/LC_MESSAGES/transmission.mo
+share/locale/ro/LC_MESSAGES/transmission.mo
+share/locale/ru/LC_MESSAGES/transmission.mo
+share/locale/sk/LC_MESSAGES/transmission.mo
+share/locale/sv/LC_MESSAGES/transmission.mo
 share/pixmaps/
 share/pixmaps/transmission.png
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/transmission/pkg/PLIST-main,v
retrieving revision 1.3
diff -u -r1.3 PLIST-main
--- pkg/PLIST-main      2 Sep 2007 21:08:21 -0000       1.3
+++ pkg/PLIST-main      22 Nov 2007 20:48:55 -0000
@@ -1,16 +1,16 @@
 @comment $OpenBSD: PLIST-main,v 1.3 2007/09/02 21:08:21 naddy Exp $
 @pkgpath net/transmission
+bin/transmission-cli
 bin/transmission-daemon
 bin/transmission-proxy
 bin/transmission-remote
-bin/transmissioncli
[EMAIL PROTECTED] man/man1/transmission-cli.1
 @man man/man1/transmission-daemon.1
 @man man/man1/transmission-proxy.1
 @man man/man1/transmission-remote.1
[EMAIL PROTECTED] man/man1/transmissioncli.1
 @comment share/locale/
[EMAIL PROTECTED] share/locale/bg/
[EMAIL PROTECTED] share/locale/bg/LC_MESSAGES/
[EMAIL PROTECTED] share/locale/de/
[EMAIL PROTECTED] share/locale/de/LC_MESSAGES/
 @comment share/locale/es/
 @comment share/locale/es/LC_MESSAGES/
 @comment share/locale/fi/
@@ -35,6 +35,3 @@
 @comment share/locale/sk/LC_MESSAGES/
 @comment share/locale/sv/
 @comment share/locale/sv/LC_MESSAGES/
-share/zsh/
-share/zsh/site-functions/
-share/zsh/site-functions/_transmissioncli
-- 
Christian "naddy" Weisgerber                          [EMAIL PROTECTED]

Reply via email to