8 files changed, 108 insertions, 91 deletions

diff --git a/net-p2p/transmission-cli/Makefile b/net-p2p/transmission-cli/Makefile
index 941acce37221..5f1799765c45 100644
--- a/net-p2p/transmission-cli/Makefile
+++ b/net-p2p/transmission-cli/Makefile
@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	transmission
-PORTVERSION=	2.04
-PORTREVISION?=	1
+PORTVERSION=	2.12
+PORTREVISION?=	0
 CATEGORIES?=	net-p2p
 MASTER_SITES=	http://download.m0k.org/${PORTNAME}/files/
 PKGNAMESUFFIX?=	-cli
 
 MAINTAINER?=	mezz@FreeBSD.org
-COMMENT?=	A fast and lightweight CLI (command line) BitTorrent client
+COMMENT?=	A lightweight CLI (command line) BitTorrent client and utilities
 
-SLAVEPORT?=
+SLAVEPORT?=	cli
 .if ${SLAVEPORT}!="web"
 LIB_DEPENDS?=	${GEN_LIB_DEPENDS}
 
@@ -42,7 +42,8 @@ EXTRA_CONF_ARGS?=--enable-cli \
 		 --disable-mac \
 		 --disable-nls
 
-MAN1?=		transmissioncli.1
+MAN1?=		transmission-cli.1 transmission-create.1 transmission-edit.1 \
+		transmission-show.1
 EXTRA_PATCHES=	${PATCHDIR}/disable-web
 .endif
 
@@ -65,6 +66,10 @@ general-patch:
 			${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|doc \\| \\|g' \
 		${WRKSRC}/Makefile.in
+.if ${SLAVEPORT}!="cli"
+	@${REINPLACE_CMD} -e 's|utils \\|\\|g' \
+		${WRKSRC}/Makefile.in
+.endif
 
 post-patch: general-patch
 
diff --git a/net-p2p/transmission-cli/distinfo b/net-p2p/transmission-cli/distinfo
index d19319c75f9b..df678b2db00a 100644
--- a/net-p2p/transmission-cli/distinfo
+++ b/net-p2p/transmission-cli/distinfo
@@ -1,3 +1,2 @@
-MD5 (transmission-2.04.tar.xz) = f926b9fb655ca2f2db6f0dc3adb3124f
-SHA256 (transmission-2.04.tar.xz) = 60d5ed06b812660f21c04dd8b490a483b24d99bbea287d0ff252eb9e41338988
-SIZE (transmission-2.04.tar.xz) = 2422044
+SHA256 (transmission-2.12.tar.xz) = d63de56815298d55b3e6ff6914fd10791648199d53225a361da7976d37f00abf
+SIZE (transmission-2.12.tar.xz) = 2341100
diff --git a/net-p2p/transmission-cli/files/disable-web b/net-p2p/transmission-cli/files/disable-web
index 0816b57d2701..2c63c36e62a8 100644
--- a/net-p2p/transmission-cli/files/disable-web
+++ b/net-p2p/transmission-cli/files/disable-web
@@ -1,12 +1,13 @@
---- Makefile.in.orig	2010-01-29 15:39:44.000000000 -0600
-+++ Makefile.in	2010-01-29 15:46:11.000000000 -0600
-@@ -300,14 +300,12 @@
+--- Makefile.in.orig	2010-10-23 15:56:02.000000000 -0500
++++ Makefile.in	2010-10-23 15:56:55.000000000 -0500
+@@ -303,15 +303,13 @@
  @BUILD_GTK_TRUE@GTK_DIR = gtk po
  @BUILD_MAC_TRUE@MAC_DIR = macosx
  SUBDIRS = \
--  doc \
+-  extras \
    third-party \
    libtransmission \
+   utils \
    $(DAEMON_DIR) \
    $(CLI_DIR) \
    $(GTK_DIR) \
diff --git a/net-p2p/transmission-cli/pkg-plist b/net-p2p/transmission-cli/pkg-plist
index 635d782e33af..58ae01daf4a8 100644
--- a/net-p2p/transmission-cli/pkg-plist
+++ b/net-p2p/transmission-cli/pkg-plist
@@ -1,4 +1,7 @@
-bin/transmissioncli
+bin/transmission-cli
+bin/transmission-create
+bin/transmission-edit
+bin/transmission-show
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
diff --git a/net-p2p/transmission-daemon/Makefile b/net-p2p/transmission-daemon/Makefile
index 0283f76abf19..ed2a5bd0a54f 100644
--- a/net-p2p/transmission-daemon/Makefile
+++ b/net-p2p/transmission-daemon/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	-daemon
 
 MAINTAINER=	mezz@FreeBSD.org
diff --git a/net-p2p/transmission-gtk2/Makefile b/net-p2p/transmission-gtk2/Makefile
index 7c0f1ba3536c..6ab9d7a31e98 100644
--- a/net-p2p/transmission-gtk2/Makefile
+++ b/net-p2p/transmission-gtk2/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	-gtk2
 
 MAINTAINER=	mezz@FreeBSD.org
@@ -33,11 +33,11 @@ EXTRA_CONF_ARGS=--disable-cli \
 		--disable-mac \
 		--enable-nls
 
-MAN1=		transmission.1
+MAN1=		transmission-gtk.1
 
 post-patch: general-patch
 	@${REINPLACE_CMD} -e 's|TryExec=.*||g ; /^$$/d' \
-		${WRKSRC}/gtk/transmission.desktop.in
+		${WRKSRC}/gtk/transmission-gtk.desktop.in
 
 post-install: general-install
 	@-update-desktop-database
diff --git a/net-p2p/transmission-gtk2/pkg-plist b/net-p2p/transmission-gtk2/pkg-plist
index 2e037830b7c7..cf40662a1f95 100644
--- a/net-p2p/transmission-gtk2/pkg-plist
+++ b/net-p2p/transmission-gtk2/pkg-plist
@@ -1,5 +1,5 @@
-bin/transmission
-share/applications/transmission.desktop
+bin/transmission-gtk
+share/applications/transmission-gtk.desktop
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
@@ -10,84 +10,91 @@ share/icons/hicolor/24x24/apps/transmission.png
 share/icons/hicolor/32x32/apps/transmission.png
 share/icons/hicolor/48x48/apps/transmission.png
 share/icons/hicolor/scalable/apps/transmission.svg
-share/locale/an/LC_MESSAGES/transmission.mo
-share/locale/ar/LC_MESSAGES/transmission.mo
-share/locale/ast/LC_MESSAGES/transmission.mo
-share/locale/az/LC_MESSAGES/transmission.mo
-share/locale/be/LC_MESSAGES/transmission.mo
-share/locale/be@latin/LC_MESSAGES/transmission.mo
-share/locale/bg/LC_MESSAGES/transmission.mo
-share/locale/br/LC_MESSAGES/transmission.mo
-share/locale/bs/LC_MESSAGES/transmission.mo
-share/locale/ca/LC_MESSAGES/transmission.mo
-share/locale/ckb/LC_MESSAGES/transmission.mo
-share/locale/cs/LC_MESSAGES/transmission.mo
-share/locale/da/LC_MESSAGES/transmission.mo
-share/locale/de/LC_MESSAGES/transmission.mo
-share/locale/el/LC_MESSAGES/transmission.mo
-share/locale/en_AU/LC_MESSAGES/transmission.mo
-share/locale/en_CA/LC_MESSAGES/transmission.mo
-share/locale/en_GB/LC_MESSAGES/transmission.mo
-share/locale/eo/LC_MESSAGES/transmission.mo
-share/locale/es/LC_MESSAGES/transmission.mo
-share/locale/et/LC_MESSAGES/transmission.mo
-share/locale/eu/LC_MESSAGES/transmission.mo
-share/locale/fa/LC_MESSAGES/transmission.mo
-share/locale/fi/LC_MESSAGES/transmission.mo
-share/locale/fil/LC_MESSAGES/transmission.mo
-share/locale/fo/LC_MESSAGES/transmission.mo
-share/locale/fr/LC_MESSAGES/transmission.mo
-share/locale/ga/LC_MESSAGES/transmission.mo
-share/locale/gl/LC_MESSAGES/transmission.mo
-share/locale/gv/LC_MESSAGES/transmission.mo
-share/locale/he/LC_MESSAGES/transmission.mo
-share/locale/hi/LC_MESSAGES/transmission.mo
-share/locale/hr/LC_MESSAGES/transmission.mo
-share/locale/hu/LC_MESSAGES/transmission.mo
-share/locale/id/LC_MESSAGES/transmission.mo
-share/locale/is/LC_MESSAGES/transmission.mo
-share/locale/it/LC_MESSAGES/transmission.mo
-share/locale/ja/LC_MESSAGES/transmission.mo
-share/locale/ka/LC_MESSAGES/transmission.mo
-share/locale/kk/LC_MESSAGES/transmission.mo
-share/locale/ko/LC_MESSAGES/transmission.mo
-share/locale/ku/LC_MESSAGES/transmission.mo
-share/locale/li/LC_MESSAGES/transmission.mo
-share/locale/lt/LC_MESSAGES/transmission.mo
-share/locale/lv/LC_MESSAGES/transmission.mo
-share/locale/mk/LC_MESSAGES/transmission.mo
-share/locale/ml/LC_MESSAGES/transmission.mo
-share/locale/ms/LC_MESSAGES/transmission.mo
-share/locale/mt/LC_MESSAGES/transmission.mo
-share/locale/nb/LC_MESSAGES/transmission.mo
-share/locale/nl/LC_MESSAGES/transmission.mo
-share/locale/nn/LC_MESSAGES/transmission.mo
-share/locale/oc/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/sl/LC_MESSAGES/transmission.mo
-share/locale/sq/LC_MESSAGES/transmission.mo
-share/locale/sr/LC_MESSAGES/transmission.mo
-share/locale/sv/LC_MESSAGES/transmission.mo
-share/locale/te/LC_MESSAGES/transmission.mo
-share/locale/th/LC_MESSAGES/transmission.mo
-share/locale/tr/LC_MESSAGES/transmission.mo
-share/locale/ug/LC_MESSAGES/transmission.mo
-share/locale/uk/LC_MESSAGES/transmission.mo
-share/locale/vi/LC_MESSAGES/transmission.mo
-share/locale/zh_CN/LC_MESSAGES/transmission.mo
-share/locale/zh_TW/LC_MESSAGES/transmission.mo
+share/locale/an/LC_MESSAGES/transmission-gtk.mo
+share/locale/ar/LC_MESSAGES/transmission-gtk.mo
+share/locale/ast/LC_MESSAGES/transmission-gtk.mo
+share/locale/az/LC_MESSAGES/transmission-gtk.mo
+share/locale/be/LC_MESSAGES/transmission-gtk.mo
+share/locale/be@latin/LC_MESSAGES/transmission-gtk.mo
+share/locale/bg/LC_MESSAGES/transmission-gtk.mo
+share/locale/br/LC_MESSAGES/transmission-gtk.mo
+share/locale/bs/LC_MESSAGES/transmission-gtk.mo
+share/locale/ca/LC_MESSAGES/transmission-gtk.mo
+share/locale/ceb/LC_MESSAGES/transmission-gtk.mo
+share/locale/ckb/LC_MESSAGES/transmission-gtk.mo
+share/locale/cs/LC_MESSAGES/transmission-gtk.mo
+share/locale/da/LC_MESSAGES/transmission-gtk.mo
+share/locale/de/LC_MESSAGES/transmission-gtk.mo
+share/locale/el/LC_MESSAGES/transmission-gtk.mo
+share/locale/en_AU/LC_MESSAGES/transmission-gtk.mo
+share/locale/en_CA/LC_MESSAGES/transmission-gtk.mo
+share/locale/en_GB/LC_MESSAGES/transmission-gtk.mo
+share/locale/eo/LC_MESSAGES/transmission-gtk.mo
+share/locale/es/LC_MESSAGES/transmission-gtk.mo
+share/locale/et/LC_MESSAGES/transmission-gtk.mo
+share/locale/eu/LC_MESSAGES/transmission-gtk.mo
+share/locale/fa/LC_MESSAGES/transmission-gtk.mo
+share/locale/fi/LC_MESSAGES/transmission-gtk.mo
+share/locale/fil/LC_MESSAGES/transmission-gtk.mo
+share/locale/fo/LC_MESSAGES/transmission-gtk.mo
+share/locale/fr/LC_MESSAGES/transmission-gtk.mo
+share/locale/ga/LC_MESSAGES/transmission-gtk.mo
+share/locale/gl/LC_MESSAGES/transmission-gtk.mo
+share/locale/gv/LC_MESSAGES/transmission-gtk.mo
+share/locale/he/LC_MESSAGES/transmission-gtk.mo
+share/locale/hi/LC_MESSAGES/transmission-gtk.mo
+share/locale/hr/LC_MESSAGES/transmission-gtk.mo
+share/locale/hu/LC_MESSAGES/transmission-gtk.mo
+share/locale/id/LC_MESSAGES/transmission-gtk.mo
+share/locale/is/LC_MESSAGES/transmission-gtk.mo
+share/locale/it/LC_MESSAGES/transmission-gtk.mo
+share/locale/ja/LC_MESSAGES/transmission-gtk.mo
+share/locale/ka/LC_MESSAGES/transmission-gtk.mo
+share/locale/kk/LC_MESSAGES/transmission-gtk.mo
+share/locale/ko/LC_MESSAGES/transmission-gtk.mo
+share/locale/ku/LC_MESSAGES/transmission-gtk.mo
+share/locale/li/LC_MESSAGES/transmission-gtk.mo
+share/locale/lt/LC_MESSAGES/transmission-gtk.mo
+share/locale/lv/LC_MESSAGES/transmission-gtk.mo
+share/locale/mk/LC_MESSAGES/transmission-gtk.mo
+share/locale/ml/LC_MESSAGES/transmission-gtk.mo
+share/locale/mr/LC_MESSAGES/transmission-gtk.mo
+share/locale/ms/LC_MESSAGES/transmission-gtk.mo
+share/locale/mt/LC_MESSAGES/transmission-gtk.mo
+share/locale/nb/LC_MESSAGES/transmission-gtk.mo
+share/locale/nl/LC_MESSAGES/transmission-gtk.mo
+share/locale/nn/LC_MESSAGES/transmission-gtk.mo
+share/locale/oc/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/sl/LC_MESSAGES/transmission-gtk.mo
+share/locale/sq/LC_MESSAGES/transmission-gtk.mo
+share/locale/sr/LC_MESSAGES/transmission-gtk.mo
+share/locale/sv/LC_MESSAGES/transmission-gtk.mo
+share/locale/te/LC_MESSAGES/transmission-gtk.mo
+share/locale/th/LC_MESSAGES/transmission-gtk.mo
+share/locale/tl/LC_MESSAGES/transmission-gtk.mo
+share/locale/tr/LC_MESSAGES/transmission-gtk.mo
+share/locale/ug/LC_MESSAGES/transmission-gtk.mo
+share/locale/uk/LC_MESSAGES/transmission-gtk.mo
+share/locale/vi/LC_MESSAGES/transmission-gtk.mo
+share/locale/zh_CN/LC_MESSAGES/transmission-gtk.mo
+share/locale/zh_TW/LC_MESSAGES/transmission-gtk.mo
 share/pixmaps/transmission.png
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
+@dirrmtry share/locale/tl/LC_MESSAGES
+@dirrmtry share/locale/tl
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/kk/LC_MESSAGES
@@ -100,6 +107,8 @@ share/pixmaps/transmission.png
 @dirrmtry share/locale/fil
 @dirrmtry share/locale/ckb/LC_MESSAGES
 @dirrmtry share/locale/ckb
+@dirrmtry share/locale/ceb/LC_MESSAGES
+@dirrmtry share/locale/ceb
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
 @dirrmtry share/locale/ast/LC_MESSAGES
diff --git a/net-p2p/transmission/Makefile b/net-p2p/transmission/Makefile
index 8b1d7f458bbf..f0cbdb58c4d6 100644
--- a/net-p2p/transmission/Makefile
+++ b/net-p2p/transmission/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	transmission
-PORTVERSION=	2.04
+PORTVERSION=	2.12
 CATEGORIES=	net-p2p
 MASTER_SITES=	# empty
 DISTFILES=	# empty