15 files changed, 27 insertions, 24 deletions

diff --git a/deskutils/alacarte/Makefile b/deskutils/alacarte/Makefile
index 6274efa75965..d147a528957f 100644
--- a/deskutils/alacarte/Makefile
+++ b/deskutils/alacarte/Makefile
@@ -21,7 +21,6 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|applications.menu|gnome-applications.menu|' \
 		${WRKSRC}/Alacarte/MenuEditor.py
diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile
index 283f9972db9e..9f74c5652527 100644
--- a/deskutils/deskbar-applet/Makefile
+++ b/deskutils/deskbar-applet/Makefile
@@ -31,7 +31,6 @@ OPTIONS_DEFINE=	EVO
 OPTIONS_DEFAULT=EVO
 EVO_DESC=	Enable evolution support
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MEVO}
diff --git a/deskutils/glabels/Makefile b/deskutils/glabels/Makefile
index 76c14189bfed..a8213b671341 100644
--- a/deskutils/glabels/Makefile
+++ b/deskutils/glabels/Makefile
@@ -22,9 +22,6 @@ USE_AUTOTOOLS=	libtool
 CPPFLAGS+=	-I${LOCALBASE}/include -DGLIB_COMPILATION
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-MAN1=		glabels.1
-
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${HAVE_GNOME:Mevolutiondataserver}!=""
diff --git a/deskutils/glabels/files/patch-data_mime_Makefile.in b/deskutils/glabels/files/patch-data_mime_Makefile.in
new file mode 100644
index 000000000000..4cb1ea11d57d
--- /dev/null
+++ b/deskutils/glabels/files/patch-data_mime_Makefile.in
@@ -0,0 +1,11 @@
+--- data/mime/Makefile.in.orig	2014-03-31 23:47:20.000000000 +0200
++++ data/mime/Makefile.in	2014-03-31 23:48:26.000000000 +0200
+@@ -513,7 +513,7 @@
+ 
+ install-data-hook:
+ @ENABLE_UPDATE_MIMEDB_TRUE@@HAVE_NEW_MIME_TRUE@	$(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"
+-@ENABLE_UPDATE_DESKTOPDB_TRUE@@HAVE_NEWER_MIME_TRUE@	$(UPDATE_DESKTOP_DATABASE) 
++#@ENABLE_UPDATE_DESKTOPDB_TRUE@@HAVE_NEWER_MIME_TRUE@	$(UPDATE_DESKTOP_DATABASE) 
+ 
+ uninstall-hook:
+ @ENABLE_UPDATE_MIMEDB_TRUE@@HAVE_NEW_MIME_TRUE@	$(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"
diff --git a/deskutils/glabels/pkg-plist b/deskutils/glabels/pkg-plist
index 27f921aa8955..84347ed1e3b4 100644
--- a/deskutils/glabels/pkg-plist
+++ b/deskutils/glabels/pkg-plist
@@ -16,6 +16,7 @@ lib/libglabels.la
 lib/libglabels.so
 lib/libglabels.so.5
 libdata/pkgconfig/libglabels.pc
+man/man1/glabels.1.gz
 share/application-registry/glabels.applications
 share/applications/glabels.desktop
 share/doc/libglabels/ch01.html
diff --git a/deskutils/gnome-blog/Makefile b/deskutils/gnome-blog/Makefile
index 86df4cb609d4..6f51c8d09fd0 100644
--- a/deskutils/gnome-blog/Makefile
+++ b/deskutils/gnome-blog/Makefile
@@ -22,5 +22,4 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	gnomeblog.schemas
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/deskutils/gnome-main-menu/Makefile b/deskutils/gnome-main-menu/Makefile
index 6ebf9ed26269..d60e830c09aa 100644
--- a/deskutils/gnome-main-menu/Makefile
+++ b/deskutils/gnome-main-menu/Makefile
@@ -24,7 +24,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	application-browser.schemas slab.schemas
 
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} -e 's|glib/gmacros.h|glib.h|g' \
 		-e 's|glib/gfileutils.h|glib.h|g' \
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index 11094ef95b84..a833411cd2e6 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -31,13 +31,10 @@ CONFIGURE_ARGS=	--enable-maintainer-flags=no
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-MAN1=		gnome-dictionary.1 gnome-screenshot.1 gnome-search-tool.1 \
-		gnome-system-log.1 baobab.1
 GCONF_SCHEMAS=	gnome-dictionary.schemas gnome-screenshot.schemas \
 		gnome-search-tool.schemas baobab.schemas \
 		gnome-system-log.schemas
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|-DGTK_DISABLE_DEPRECATED||g' \
 		${WRKSRC}/gsearchtool/libgnomeui-deprecated/Makefile.in
diff --git a/deskutils/gnome-utils/pkg-plist b/deskutils/gnome-utils/pkg-plist
index 56eea8b83752..ed4bf5ee02a2 100644
--- a/deskutils/gnome-utils/pkg-plist
+++ b/deskutils/gnome-utils/pkg-plist
@@ -24,6 +24,11 @@ lib/libgdict-1.0.so.6
 libdata/bonobo/servers/GNOME_DictionaryApplet.server
 libdata/pkgconfig/gdict-1.0.pc
 libexec/gnome-dictionary-applet
+man/man1/baobab.1.gz
+man/man1/gnome-dictionary.1.gz
+man/man1/gnome-screenshot.1.gz
+man/man1/gnome-search-tool.1.gz
+man/man1/gnome-system-log.1.gz
 share/doc/gdict/GdictClientContext.html
 share/doc/gdict/GdictDatabaseChooser.html
 share/doc/gdict/GdictDefbox.html
diff --git a/deskutils/gnote/Makefile b/deskutils/gnote/Makefile
index 6c813e4bfdd2..d3d18d79a1cd 100644
--- a/deskutils/gnote/Makefile
+++ b/deskutils/gnote/Makefile
@@ -46,16 +46,15 @@ PLIST_SUB+=	APPLET="@comment "
 
 PLIST_SUB+=	VERSION=${PORTVERSION}
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/include/boost|${LOCALBASE}/include/boost|g' \
 		${WRKSRC}/configure
 
 .ifndef (NOPORTDOCS)
 post-install:
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
 
diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile
index 0d1b5b67298d..ee8a8e3a82a6 100644
--- a/deskutils/gucharmap/Makefile
+++ b/deskutils/gucharmap/Makefile
@@ -26,5 +26,4 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	gucharmap.schemas
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/deskutils/hamster-applet/Makefile b/deskutils/hamster-applet/Makefile
index 3cf41a905b96..fdf69d50bb55 100644
--- a/deskutils/hamster-applet/Makefile
+++ b/deskutils/hamster-applet/Makefile
@@ -30,7 +30,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	hamster-applet.schemas
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 # WAF needs that
@@ -43,11 +42,10 @@ do-build:
 	@cd ${WRKSRC} && ./waf build
 
 do-install:
-	@cd ${WRKSRC} && dbus-launch ./waf install
-# -O -Qold
-	@${PYTHON_CMD} -Qold ${PYTHON_LIBDIR}/compileall.py -q \
-		${PYTHON_SITELIBDIR:S|${LOCALBASE}|${PREFIX}|}/hamster
-	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -q \
-		${PYTHON_SITELIBDIR:S|${LOCALBASE}|${PREFIX}|}/hamster
+	@cd ${WRKSRC} && DESTDIR=${STAGEDIR} dbus-launch ./waf install
+	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
+		-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
+	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
+		-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
 
 .include <bsd.port.post.mk>
diff --git a/deskutils/nautilus-locked-folder/Makefile b/deskutils/nautilus-locked-folder/Makefile
index bbb9cd9ab3dc..835e8152270a 100644
--- a/deskutils/nautilus-locked-folder/Makefile
+++ b/deskutils/nautilus-locked-folder/Makefile
@@ -29,7 +29,6 @@ PLIST_FILES=	lib/nautilus/extensions-2.0/libnautilus-locked-folder.a \
 		lib/nautilus/extensions-2.0/libnautilus-locked-folder.la \
 		lib/nautilus/extensions-2.0/libnautilus-locked-folder.so
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/share/icons/hicolor/32x32/stock/data/|${LOCALBASE}/share/icons/hicolor/32x32/stock/data/|' \
 		${WRKSRC}/src/lockedfolder-extension.c
diff --git a/deskutils/notification-daemon/Makefile b/deskutils/notification-daemon/Makefile
index fd01e01a7081..146a086a0ff9 100644
--- a/deskutils/notification-daemon/Makefile
+++ b/deskutils/notification-daemon/Makefile
@@ -28,5 +28,4 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFLICTS=	xfce4-notification-daemon-[0-9]* xfce4-notifyd-[0-9]*
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/deskutils/ontv/Makefile b/deskutils/ontv/Makefile
index 4e8a428f9acc..d05ee077b69a 100644
--- a/deskutils/ontv/Makefile
+++ b/deskutils/ontv/Makefile
@@ -30,9 +30,11 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 GCONF_SCHEMAS=	ontv.schemas
 INSTALLS_ICONS=	yes
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local/lib/python2.6|${PYTHON_LIBDIR}|' \
 		${WRKSRC}/bin/ontv
 
+post-install:
+	@${RM} -f ${STAGEDIR}${PREFIX}/share/gnome-control-center/keybindings/90-ontv.xml
+
 .include <bsd.port.mk>