Get rid of gnomehier

6 files changed, 17 insertions, 10 deletions

diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile
index ef58f5da4e84..4ac6be3a78c5 100644
--- a/sysutils/cdrdao/Makefile
+++ b/sysutils/cdrdao/Makefile
@@ -32,8 +32,8 @@ TOC2MP3_DESC=		Build with toc2mp3 (requires audio/lame)
 .endif
 
 .if ${PORTNAME} == "gcdmaster"
-USES+=			pkgconfig
-USE_GNOME=		gnomehier
+USES+=			pkgconfig shared-mime-info
+WANT_GNOME=		yes
 GCONF_SCHEMAS=		gcdmaster.schemas
 LIB_DEPENDS+=		${MP3OGG_LIB_DEPENDS} \
 			libgnomeuimm-2.6.so:${PORTSDIR}/x11-toolkits/libgnomeuimm26
@@ -116,18 +116,22 @@ do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/xdao/gcdmaster ${STAGEDIR}${PREFIX}/bin
 	@${INSTALL_MAN} ${WRKSRC}/xdao/gcdmaster.man \
 		${STAGEDIR}${PREFIX}/man/man1/gcdmaster.1
+	@${MKDIR} ${STAGEDIR}${LOCALBASE}/share/pixmaps/document-icons
 	@${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster-doc.png \
 		${STAGEDIR}${LOCALBASE}/share/pixmaps/document-icons
+	@${MKDIR} ${STAGEDIR}${LOCALBASE}/share/application-registry
 	@${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.applications \
 		${STAGEDIR}${LOCALBASE}/share/application-registry
 	@${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.desktop \
 		${STAGEDIR}${LOCALBASE}/share/applications
+	@${MKDIR} ${STAGEDIR}${LOCALBASE}/share/mime-info
 	@${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.keys \
 		${STAGEDIR}${LOCALBASE}/share/mime-info
 	@${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.mime \
 		${STAGEDIR}${LOCALBASE}/share/mime-info
 	@${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.png \
 		${STAGEDIR}${LOCALBASE}/share/pixmaps
+	@${MKDIR} ${STAGEDIR}${LOCALBASE}/etc/gconf/schemas
 	@${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.schemas \
 		${STAGEDIR}${LOCALBASE}/etc/gconf/schemas
 	@${MKDIR} ${STAGEDIR}${LOCALBASE}/share/mime/packages
diff --git a/sysutils/gcdmaster/Makefile b/sysutils/gcdmaster/Makefile
index 8ce46b2e270c..8caf92a4e34a 100644
--- a/sysutils/gcdmaster/Makefile
+++ b/sysutils/gcdmaster/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gcdmaster
-PORTREVISION=	6
+PORTREVISION=	7
 
 COMMENT=	GNOME frontend for cdrdao
 
diff --git a/sysutils/gcombust/Makefile b/sysutils/gcombust/Makefile
index 3c46c987044c..4c04c3faedf0 100644
--- a/sysutils/gcombust/Makefile
+++ b/sysutils/gcombust/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gcombust
 PORTVERSION=	0.1.55
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	sysutils
 MASTER_SITES=	http://mirror.symnds.com/software/misc/ \
 		http://www.egr.msu.edu/~mcdouga9/
@@ -18,7 +18,7 @@ RUN_DEPENDS=	cdlabelgen:${PORTSDIR}/print/cdlabelgen \
 
 USES=		gettext perl5
 USE_PERL5=	build
-USE_GNOME=	gtk12 gnomehier
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--without-included-gettext --datadir=${PREFIX}/share
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/sysutils/libzeitgeist/Makefile b/sysutils/libzeitgeist/Makefile
index 0588c71988f7..341c7d6fd444 100644
--- a/sysutils/libzeitgeist/Makefile
+++ b/sysutils/libzeitgeist/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libzeitgeist
 PORTVERSION=	0.3.18
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	https://launchpadlibrarian.net/100152436/ \
 	https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/ \
@@ -13,9 +13,10 @@ COMMENT=	Zeitgeist client library
 
 GNU_CONFIGURE=	yes
 USES=		gettext gmake libtool pathfix pkgconfig
-USE_GNOME=	glib20 gnomehier intltool intlhack
+USE_GNOME=	glib20 intltool intlhack
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc
+INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/sysutils/mate-polkit/Makefile b/sysutils/mate-polkit/Makefile
index 5dbd1644cf51..6b3ff22c72a9 100644
--- a/sysutils/mate-polkit/Makefile
+++ b/sysutils/mate-polkit/Makefile
@@ -1,8 +1,9 @@
-# Created by: Koop Mast<kwm@FreeBSD.org>
+# Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	mate-polkit
 PORTVERSION=	1.8.0
+PORTREVISION=	1
 CATEGORIES=	sysutils mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
@@ -16,7 +17,7 @@ LIB_DEPENDS=	libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit
 PORTSCOUT=	limitw:1,even
 
 USES=		gettext gmake libtool pathfix pkgconfig tar:xz
-USE_GNOME=	gnomehier gtk20 intlhack introspection:build
+USE_GNOME=	gtk20 intlhack introspection:build
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc \
diff --git a/sysutils/mate-system-monitor/Makefile b/sysutils/mate-system-monitor/Makefile
index 0387bcef6d2b..8aabb2c82626 100644
--- a/sysutils/mate-system-monitor/Makefile
+++ b/sysutils/mate-system-monitor/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mate-system-monitor
 PORTVERSION=	1.8.0
+PORTREVISION=	1
 CATEGORIES=	sysutils mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
@@ -18,7 +19,7 @@ PORTSCOUT=	limitw:1,even
 
 USES=		gettext gmake pathfix pkgconfig tar:xz
 USE_MATE=	icontheme
-USE_GNOME=	gnomehier gtk20 librsvg2 intlhack libxml2 gtkmm24 libwnck
+USE_GNOME=	gtk20 librsvg2 intlhack libxml2 gtkmm24 libwnck
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBS="-lutil"
 CPPFLAGS+=	-I${LOCALBASE}/include