10 files changed, 23 insertions, 35 deletions

diff --git a/net-p2p/transmission-cli/Makefile b/net-p2p/transmission-cli/Makefile
index e88b089b8148..f4c2d1b481ee 100644
--- a/net-p2p/transmission-cli/Makefile
+++ b/net-p2p/transmission-cli/Makefile
@@ -25,7 +25,6 @@ CONFLICTS_INSTALL=	${PORTNAME}${PKGNAMESUFFIX}-2.5*
 
 OPTIONS_DEFINE=	LITE
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${SLAVEPORT} != web
@@ -54,8 +53,6 @@ EXTRA_CONF_ARGS?=--enable-cli \
 CONFIGURE_ARGS+=--enable-lightweight
 .endif
 
-MAN1?=		transmission-cli.1 transmission-create.1 transmission-edit.1 \
-		transmission-show.1
 EXTRA_PATCHES=	${PATCHDIR}/disable-web
 .endif
 
@@ -86,12 +83,10 @@ general-patch:
 post-patch: general-patch
 
 general-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 post-install: general-install
 
diff --git a/net-p2p/transmission-cli/files/transmission.in b/net-p2p/transmission-cli/files/transmission.in
index d365fa3140fe..f3a915ecec20 100644
--- a/net-p2p/transmission-cli/files/transmission.in
+++ b/net-p2p/transmission-cli/files/transmission.in
@@ -3,7 +3,7 @@
 # $FreeBSD$
 #
 # PROVIDE: transmission
-# REQUIRE: DAEMON 
+# REQUIRE: DAEMON
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf to enable this service:
diff --git a/net-p2p/transmission-cli/pkg-plist b/net-p2p/transmission-cli/pkg-plist
index d6901ff3bf70..78c19447d908 100644
--- a/net-p2p/transmission-cli/pkg-plist
+++ b/net-p2p/transmission-cli/pkg-plist
@@ -2,6 +2,10 @@ bin/transmission-cli
 bin/transmission-create
 bin/transmission-edit
 bin/transmission-show
+man/man1/transmission-cli.1.gz
+man/man1/transmission-create.1.gz
+man/man1/transmission-edit.1.gz
+man/man1/transmission-show.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
diff --git a/net-p2p/transmission-daemon/Makefile b/net-p2p/transmission-daemon/Makefile
index 125669227118..4ccb83373052 100644
--- a/net-p2p/transmission-daemon/Makefile
+++ b/net-p2p/transmission-daemon/Makefile
@@ -23,7 +23,7 @@ EXTRA_CONF_ARGS=--disable-cli \
 		--disable-mac \
 		--disable-nls
 
-MAN1=		transmission-daemon.1 transmission-remote.1
+post-install:
+		${MKDIR} ${STAGEDIR}${ETCDIR}/home
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/net-p2p/transmission-daemon/pkg-plist b/net-p2p/transmission-daemon/pkg-plist
index 3e1c684de016..5052a8820c01 100644
--- a/net-p2p/transmission-daemon/pkg-plist
+++ b/net-p2p/transmission-daemon/pkg-plist
@@ -1,5 +1,7 @@
 bin/transmission-daemon
 bin/transmission-remote
+man/man1/transmission-daemon.1.gz
+man/man1/transmission-remote.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
diff --git a/net-p2p/transmission-gtk/Makefile b/net-p2p/transmission-gtk/Makefile
index c9e5efa8e986..f467748c1be7 100644
--- a/net-p2p/transmission-gtk/Makefile
+++ b/net-p2p/transmission-gtk/Makefile
@@ -6,8 +6,8 @@ MAINTAINER=	crees@FreeBSD.org
 COMMENT=	Fast and lightweight GTK+2 BitTorrent client
 
 LIB_DEPENDS=	${GEN_LIB_DEPENDS} \
-		notify:${PORTSDIR}/devel/libnotify \
-		dbus-glib-1:${PORTSDIR}/devel/dbus-glib
+		libnotify.so:${PORTSDIR}/devel/libnotify \
+		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 
 RUN_DEPENDS=	${GEN_RUN_DEPENDS} \
 		xdg-open:${PORTSDIR}/devel/xdg-utils
@@ -17,8 +17,8 @@ MASTERDIR=	${.CURDIR}/../transmission-cli
 PLIST=		${.CURDIR}/pkg-plist
 SLAVEPORT=	gtk
 
-USE_GNOME=	gtk30 desktopfileutils intlhack
-USES=		gettext pathfix
+USE_GNOME=	gtk30 intlhack
+USES=		gettext pathfix desktop-file-utils
 INSTALLS_ICONS=	yes
 
 EXTRA_CONF_ARGS=--disable-cli \
@@ -28,14 +28,8 @@ EXTRA_CONF_ARGS=--disable-cli \
 		--disable-mac \
 		--enable-nls
 
-MAN1=		transmission-gtk.1
-
 post-patch: general-patch
 	@${REINPLACE_CMD} -e 's|TryExec=.*||g ; /^$$/d' \
 		${WRKSRC}/gtk/transmission-gtk.desktop.in
 
-post-install: general-install
-	@-update-desktop-database
-
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/net-p2p/transmission-gtk/pkg-plist b/net-p2p/transmission-gtk/pkg-plist
index 97c7013bd8f5..285199868cec 100644
--- a/net-p2p/transmission-gtk/pkg-plist
+++ b/net-p2p/transmission-gtk/pkg-plist
@@ -1,4 +1,5 @@
 bin/transmission-gtk
+man/man1/transmission-gtk.1.gz
 share/applications/transmission-gtk.desktop
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
@@ -138,5 +139,3 @@ share/pixmaps/transmission.png
 @dirrmtry share/locale/an/LC_MESSAGES
 @dirrmtry share/locale/an
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/net-p2p/transmission-qt4/Makefile b/net-p2p/transmission-qt4/Makefile
index b5d2fef54267..8ecfabeba1e6 100644
--- a/net-p2p/transmission-qt4/Makefile
+++ b/net-p2p/transmission-qt4/Makefile
@@ -16,7 +16,7 @@ SLAVEPORT=	qt4
 
 QT_NONSTANDARD=	yes
 USE_QT4=	moc_build qmake_build rcc_build uic_build gui dbus network
-USE_GNOME=	desktopfileutils
+USES=		desktop-file-utils
 LDFLAGS+=	-lcrypto
 
 EXTRA_CONF_ARGS=--disable-cli \
@@ -25,13 +25,10 @@ EXTRA_CONF_ARGS=--disable-cli \
 		--disable-mac \
 		--disable-nls
 
-MAN1=		transmission-qt.1
-
 post-patch: general-patch
 	@${REINPLACE_CMD} -e 's|/share/man|/man|g ; /PKGCONFIG/s| openssl||g' \
 		${WRKSRC}/qt/qtr.pro
 
-NO_STAGE=	yes
 post-build:
 	@(cd ${WRKSRC}/qt ; ${QMAKE} ${QMAKE_ARGS} qtr.pro ; ${GMAKE})
 
@@ -39,14 +36,12 @@ do-install:
 	@(cd ${WRKSRC}/qt ; ${SETENV} INSTALL_ROOT=${PREFIX} ${MAKE} install)
 
 post-install: general-install
-.ifndef (NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/qt/README.txt ${DOCSDIR}/README-qt4
-.endif
+	@${INSTALL_DATA} ${WRKSRC}/qt/README.txt \
+		${STAGEDIR}${DOCSDIR}/README-qt4
 	@${INSTALL_DATA} ${WRKSRC}/qt/transmission-qt.desktop \
-		${PREFIX}/share/applications/
+		${STAGEDIR}${PREFIX}/share/applications/
 	@${INSTALL_DATA} ${WRKSRC}/qt/icons/transmission.png \
-		${PREFIX}/share/pixmaps/transmission-qt.png
-	@-update-desktop-database
+		${STAGEDIR}${PREFIX}/share/pixmaps/transmission-qt.png
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net-p2p/transmission-qt4/pkg-plist b/net-p2p/transmission-qt4/pkg-plist
index 4931235aecd4..078dbfe2a347 100644
--- a/net-p2p/transmission-qt4/pkg-plist
+++ b/net-p2p/transmission-qt4/pkg-plist
@@ -1,4 +1,5 @@
 bin/transmission-qt
+man/man1/transmission-qt.1.gz
 share/applications/transmission-qt.desktop
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
@@ -6,5 +7,3 @@ share/applications/transmission-qt.desktop
 %%PORTDOCS%%%%DOCSDIR%%/README-qt4
 share/pixmaps/transmission-qt.png
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/net-p2p/transmission/Makefile b/net-p2p/transmission/Makefile
index 3e09b67c707c..39c7e71dc1ea 100644
--- a/net-p2p/transmission/Makefile
+++ b/net-p2p/transmission/Makefile
@@ -17,8 +17,8 @@ RUN_DEPENDS=	transmission-cli:${PORTSDIR}/net-p2p/transmission-cli \
 CONFLICTS_INSTALL=      ${PORTNAME}${PKGNAMESUFFIX}-2.[56]*
 
 NO_BUILD=	yes
+NO_MTREE=	yes
 
-NO_STAGE=	yes
 do-install:
 	@${DO_NADA}