12 files changed, 102 insertions, 154 deletions
diff --git a/net-p2p/transmission-cli/Makefile b/net-p2p/transmission-cli/Makefile
index 38b9276a5fcb..b071e6ab8f77 100644
--- a/net-p2p/transmission-cli/Makefile
+++ b/net-p2p/transmission-cli/Makefile
@@ -6,67 +6,36 @@
 #
 
 PORTNAME=	transmission
-PORTVERSION=	0.82
+PORTVERSION=	0.90
 PORTREVISION?=	0
 CATEGORIES=	net-p2p
-#MASTER_SITES=	http://download.m0k.org/${PORTNAME}/files/
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
-		http://people.freebsd.org/~mezz/distfiles/
-MASTER_SITE_SUBDIR=mezz
-DISTNAME=	Transmission-${PORTVERSION}
+MASTER_SITES=	http://download.m0k.org/${PORTNAME}/files/
 
 MAINTAINER=	mezz@FreeBSD.org
 COMMENT?=	A free BitTorrent client written from scratch in C
 
+USE_BZIP2=	yes
 USE_GMAKE=	yes
-SLAVE_TRANS?=	no
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS?=--prefix=${PREFIX} \
-		--disable-daemon \
-		--disable-gtk
-
-DOCS=		AUTHORS LICENSE NEWS README
-
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude beos \
-			--exclude macosx \
-			--exclude Transmission.xcodeproj
-
-.if !defined(MASTERDIR)
-EXTRACT_AFTER_ARGS+=	--exclude daemon \
-			--exclude gtk \
-			--exclude libevent \
-			--exclude wx
-MAN1=			transmissioncli.1
-.endif
-
-.if ${SLAVE_TRANS}=="gtk2"
-EXTRACT_AFTER_ARGS+=	--exclude cli \
-			--exclude daemon \
-			--exclude libevent \
-			--exclude wx
-.endif
-
-.if defined(WITHOUT_OPENSSL)
-CONFIGURE_ARGS+=--disable-openssl
-.else
+USE_GNOME?=	gnometarget
 USE_OPENSSL=	yes
-.endif
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+# --without-gtk broke configure, CUSTOM_SUBDIRS (manual) will taking care of it.
+CONFIGURE_ARGS?=--without-wx
 
-pre-everything::
-.if !defined(WITHOUT_OPENSSL)
-	@${ECHO_MSG} "You may specify the following on the command line:"
-	@${ECHO_MSG} " "
-	@${ECHO_MSG} "WITHOUT_OPENSSL=yes to disable OpenSSL support, using built-in SHA1 implementation. Warning, it is a bit slower if you use this option." | ${FMT} 75 75
-.endif
+CUSTOM_SUBDIRS?=third-party libtransmission cli
+DOCS=		AUTHORS LICENSE NEWS README
+#MAN1?=		transmissioncli.1
 
 general-patch:
-	@${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|g' \
+	@${REINPLACE_CMD} -e \
+		's|CFLAGS="-g -Wall.*"|CFLAGS="${CFLAGS} -Wall -W"|g ; \
+		s|CXXFLAGS="-g -Wall.*"|CXXFLAGS="${CXXFLAGS} -Wall -W"|g ; \
+		s|_pthread_flags=".*"|_pthread_flags="${PTHREAD_LIBS}"|g' \
 			${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g ; \
-		s|-g -Wall -W -O3 -funroll-loops|-Wall -W|g' \
-			${WRKSRC}/mk/common.mk
-	@${REINPLACE_CMD} -e 's|) .install.misc|)|g' \
-		${WRKSRC}/mk/default.mk
+	@${REINPLACE_CMD} -e 's|%%CUSTOM_SUBDIRS%%|${CUSTOM_SUBDIRS}|g' \
+		${WRKSRC}/Makefile.in
 
 post-patch: general-patch
 
diff --git a/net-p2p/transmission-cli/distinfo b/net-p2p/transmission-cli/distinfo
index 9f28f68d0ce8..cd610c70e49d 100644
--- a/net-p2p/transmission-cli/distinfo
+++ b/net-p2p/transmission-cli/distinfo
@@ -1,3 +1,3 @@
-MD5 (Transmission-0.82.tar.gz) = 719a9df40aee1e19a88c762272ac034b
-SHA256 (Transmission-0.82.tar.gz) = 5b55d59e529c113fbc919bdc9cb953cb5eaa86d533770b65fb486b94079e6fa2
-SIZE (Transmission-0.82.tar.gz) = 2258036
+MD5 (transmission-0.90.tar.bz2) = faebea05e9fc2e5d6c0615037657fd8f
+SHA256 (transmission-0.90.tar.bz2) = d0786700c8d9292d2b310bd4323ff836c8efcc9ff05e86630cbafdc1f2880aa8
+SIZE (transmission-0.90.tar.bz2) = 3038152
diff --git a/net-p2p/transmission-cli/files/patch-Makefile.in b/net-p2p/transmission-cli/files/patch-Makefile.in
new file mode 100644
index 000000000000..d85e9c0f82ed
--- /dev/null
+++ b/net-p2p/transmission-cli/files/patch-Makefile.in
@@ -0,0 +1,18 @@
+--- Makefile.in.orig	2007-10-24 17:35:37.000000000 -0500
++++ Makefile.in	2007-10-24 17:36:18.000000000 -0500
+@@ -253,14 +253,7 @@
+ @HAVE_DARWIN_TRUE@MAC_DIR = macosx
+ @WITH_GTK_TRUE@GTK_DIR = gtk po
+ @HAVE_WX_TRUE@WX_DIR = wx
+-SUBDIRS = \
+-  third-party \
+-  libtransmission \
+-  daemon cli \
+-  $(BEOS_DIR) \
+-  $(GTK_DIR) \
+-  $(MAC_DIR) \
+-  $(WX_DIR)
++SUBDIRS = %%CUSTOM_SUBDIRS%%
+ 
+ EXTRA_DIST = \
+   NEWS \
diff --git a/net-p2p/transmission-cli/files/patch-version.sh b/net-p2p/transmission-cli/files/patch-version.sh
deleted file mode 100644
index 52aea6e5df4d..000000000000
--- a/net-p2p/transmission-cli/files/patch-version.sh
+++ /dev/null
@@ -1,12 +0,0 @@
---- version.sh.orig	2007-08-07 10:44:05.000000000 -0500
-+++ version.sh	2007-08-07 10:44:41.000000000 -0500
-@@ -52,9 +52,4 @@
- EOF
- replace_if_differs libtransmission/version.h.new libtransmission/version.h
- 
--# Generate Info.plist from Info.plist.in
--sed -e "s/%%BUNDLE_VERSION%%/$SVN_REVISION/" -e "s/%%SHORT_VERSION_STRING%%/$USERAGENT_PREFIX/" \
--        < macosx/Info.plist.in > macosx/Info.plist.new
--replace_if_differs macosx/Info.plist.new macosx/Info.plist
--
- exit 0
diff --git a/net-p2p/transmission-cli/pkg-plist b/net-p2p/transmission-cli/pkg-plist
index 81dfef200185..34dd788c04af 100644
--- a/net-p2p/transmission-cli/pkg-plist
+++ b/net-p2p/transmission-cli/pkg-plist
@@ -1,4 +1,4 @@
-bin/transmissioncli
+bin/transmission-cli
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
diff --git a/net-p2p/transmission-gtk2/Makefile b/net-p2p/transmission-gtk2/Makefile
index 32757c672de7..0589c43c972e 100644
--- a/net-p2p/transmission-gtk2/Makefile
+++ b/net-p2p/transmission-gtk2/Makefile
@@ -13,21 +13,19 @@ COMMENT=	A free BitTorrent client written from scratch in C with GTK+2
 MASTERDIR=	${.CURDIR}/../transmission
 PLIST=		${.CURDIR}/pkg-plist
 
-USE_XLIB=	yes
-USE_GNOME=	gtk20 desktopfileutils
-SLAVE_TRANS=	gtk2
+USE_GNOME=	gnometarget gnomehack gtk20 desktopfileutils intlhack
 USE_GETTEXT=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX} \
-		--disable-daemon
+CONFIGURE_ARGS=	--without-wx
 
-MAN1=		transmission-gtk.1
+CUSTOM_SUBDIRS=	third-party libtransmission gtk po
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
+#MAN1=		transmission-gtk.1
 
 post-patch: general-patch
-	@${REINPLACE_CMD} -e 's|TARGETS = .cli|#TARGETS = .cli|g' \
-		${WRKSRC}/mk/default.mk
 	@${REINPLACE_CMD} -e 's|TryExec=.*||g ; /^$$/d' \
-		${WRKSRC}/gtk/transmission-gtk.desktop
+		${WRKSRC}/gtk/transmission.desktop.in
+	@${REINPLACE_CMD} -e 's|[$$]GMSGFMT[$$]|$$INTLTOOL_MSGFMT$$|g' \
+		${WRKSRC}/configure
 
 post-install: general-install
 	@-update-desktop-database
diff --git a/net-p2p/transmission-gtk2/pkg-plist b/net-p2p/transmission-gtk2/pkg-plist
index 3ebccca96abe..ffa8c858c05a 100644
--- a/net-p2p/transmission-gtk2/pkg-plist
+++ b/net-p2p/transmission-gtk2/pkg-plist
@@ -1,22 +1,22 @@
-bin/transmission-gtk
-share/applications/transmission-gtk.desktop
+bin/transmission
+share/applications/transmission.desktop
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
-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/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/transmission.png
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/applications
diff --git a/net-p2p/transmission/Makefile b/net-p2p/transmission/Makefile
index 38b9276a5fcb..b071e6ab8f77 100644
--- a/net-p2p/transmission/Makefile
+++ b/net-p2p/transmission/Makefile
@@ -6,67 +6,36 @@
 #
 
 PORTNAME=	transmission
-PORTVERSION=	0.82
+PORTVERSION=	0.90
 PORTREVISION?=	0
 CATEGORIES=	net-p2p
-#MASTER_SITES=	http://download.m0k.org/${PORTNAME}/files/
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
-		http://people.freebsd.org/~mezz/distfiles/
-MASTER_SITE_SUBDIR=mezz
-DISTNAME=	Transmission-${PORTVERSION}
+MASTER_SITES=	http://download.m0k.org/${PORTNAME}/files/
 
 MAINTAINER=	mezz@FreeBSD.org
 COMMENT?=	A free BitTorrent client written from scratch in C
 
+USE_BZIP2=	yes
 USE_GMAKE=	yes
-SLAVE_TRANS?=	no
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS?=--prefix=${PREFIX} \
-		--disable-daemon \
-		--disable-gtk
-
-DOCS=		AUTHORS LICENSE NEWS README
-
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude beos \
-			--exclude macosx \
-			--exclude Transmission.xcodeproj
-
-.if !defined(MASTERDIR)
-EXTRACT_AFTER_ARGS+=	--exclude daemon \
-			--exclude gtk \
-			--exclude libevent \
-			--exclude wx
-MAN1=			transmissioncli.1
-.endif
-
-.if ${SLAVE_TRANS}=="gtk2"
-EXTRACT_AFTER_ARGS+=	--exclude cli \
-			--exclude daemon \
-			--exclude libevent \
-			--exclude wx
-.endif
-
-.if defined(WITHOUT_OPENSSL)
-CONFIGURE_ARGS+=--disable-openssl
-.else
+USE_GNOME?=	gnometarget
 USE_OPENSSL=	yes
-.endif
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+# --without-gtk broke configure, CUSTOM_SUBDIRS (manual) will taking care of it.
+CONFIGURE_ARGS?=--without-wx
 
-pre-everything::
-.if !defined(WITHOUT_OPENSSL)
-	@${ECHO_MSG} "You may specify the following on the command line:"
-	@${ECHO_MSG} " "
-	@${ECHO_MSG} "WITHOUT_OPENSSL=yes to disable OpenSSL support, using built-in SHA1 implementation. Warning, it is a bit slower if you use this option." | ${FMT} 75 75
-.endif
+CUSTOM_SUBDIRS?=third-party libtransmission cli
+DOCS=		AUTHORS LICENSE NEWS README
+#MAN1?=		transmissioncli.1
 
 general-patch:
-	@${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|g' \
+	@${REINPLACE_CMD} -e \
+		's|CFLAGS="-g -Wall.*"|CFLAGS="${CFLAGS} -Wall -W"|g ; \
+		s|CXXFLAGS="-g -Wall.*"|CXXFLAGS="${CXXFLAGS} -Wall -W"|g ; \
+		s|_pthread_flags=".*"|_pthread_flags="${PTHREAD_LIBS}"|g' \
 			${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g ; \
-		s|-g -Wall -W -O3 -funroll-loops|-Wall -W|g' \
-			${WRKSRC}/mk/common.mk
-	@${REINPLACE_CMD} -e 's|) .install.misc|)|g' \
-		${WRKSRC}/mk/default.mk
+	@${REINPLACE_CMD} -e 's|%%CUSTOM_SUBDIRS%%|${CUSTOM_SUBDIRS}|g' \
+		${WRKSRC}/Makefile.in
 
 post-patch: general-patch
 
diff --git a/net-p2p/transmission/distinfo b/net-p2p/transmission/distinfo
index 9f28f68d0ce8..cd610c70e49d 100644
--- a/net-p2p/transmission/distinfo
+++ b/net-p2p/transmission/distinfo
@@ -1,3 +1,3 @@
-MD5 (Transmission-0.82.tar.gz) = 719a9df40aee1e19a88c762272ac034b
-SHA256 (Transmission-0.82.tar.gz) = 5b55d59e529c113fbc919bdc9cb953cb5eaa86d533770b65fb486b94079e6fa2
-SIZE (Transmission-0.82.tar.gz) = 2258036
+MD5 (transmission-0.90.tar.bz2) = faebea05e9fc2e5d6c0615037657fd8f
+SHA256 (transmission-0.90.tar.bz2) = d0786700c8d9292d2b310bd4323ff836c8efcc9ff05e86630cbafdc1f2880aa8
+SIZE (transmission-0.90.tar.bz2) = 3038152
diff --git a/net-p2p/transmission/files/patch-Makefile.in b/net-p2p/transmission/files/patch-Makefile.in
new file mode 100644
index 000000000000..d85e9c0f82ed
--- /dev/null
+++ b/net-p2p/transmission/files/patch-Makefile.in
@@ -0,0 +1,18 @@
+--- Makefile.in.orig	2007-10-24 17:35:37.000000000 -0500
++++ Makefile.in	2007-10-24 17:36:18.000000000 -0500
+@@ -253,14 +253,7 @@
+ @HAVE_DARWIN_TRUE@MAC_DIR = macosx
+ @WITH_GTK_TRUE@GTK_DIR = gtk po
+ @HAVE_WX_TRUE@WX_DIR = wx
+-SUBDIRS = \
+-  third-party \
+-  libtransmission \
+-  daemon cli \
+-  $(BEOS_DIR) \
+-  $(GTK_DIR) \
+-  $(MAC_DIR) \
+-  $(WX_DIR)
++SUBDIRS = %%CUSTOM_SUBDIRS%%
+ 
+ EXTRA_DIST = \
+   NEWS \
diff --git a/net-p2p/transmission/files/patch-version.sh b/net-p2p/transmission/files/patch-version.sh
deleted file mode 100644
index 52aea6e5df4d..000000000000
--- a/net-p2p/transmission/files/patch-version.sh
+++ /dev/null
@@ -1,12 +0,0 @@
---- version.sh.orig	2007-08-07 10:44:05.000000000 -0500
-+++ version.sh	2007-08-07 10:44:41.000000000 -0500
-@@ -52,9 +52,4 @@
- EOF
- replace_if_differs libtransmission/version.h.new libtransmission/version.h
- 
--# Generate Info.plist from Info.plist.in
--sed -e "s/%%BUNDLE_VERSION%%/$SVN_REVISION/" -e "s/%%SHORT_VERSION_STRING%%/$USERAGENT_PREFIX/" \
--        < macosx/Info.plist.in > macosx/Info.plist.new
--replace_if_differs macosx/Info.plist.new macosx/Info.plist
--
- exit 0
diff --git a/net-p2p/transmission/pkg-plist b/net-p2p/transmission/pkg-plist
index 81dfef200185..34dd788c04af 100644
--- a/net-p2p/transmission/pkg-plist
+++ b/net-p2p/transmission/pkg-plist
@@ -1,4 +1,4 @@
-bin/transmissioncli
+bin/transmission-cli
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/NEWS