Don't removed gnomehier owned dirs.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16524 df743ca5-7f9a-e211-a948-0013205c9059

12 files changed, 16 insertions, 28 deletions

diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index 3d8af5255..f3c4066e0 100644
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/atk/Makefile,v 1.116 2011/09/21 12:14:20 kwm Exp $
+#   $MCom: ports/accessibility/atk/Makefile,v 1.117 2011/10/05 07:35:11 kwm Exp $
 #
 
 PORTNAME=	atk
@@ -26,7 +26,7 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomehack glib20 ltverhack referencehack
+USE_GNOME=	gnomehier gnomehack glib20 ltverhack referencehack
 CONFIGURE_ARGS=	--enable-static \
 		--with-html-dir=${PREFIX}/share/doc
 CPPFLAGS=	-I${LOCALBASE}/include
diff --git a/accessibility/atk/pkg-plist b/accessibility/atk/pkg-plist
index 4a8847699..2955934c6 100644
--- a/accessibility/atk/pkg-plist
+++ b/accessibility/atk/pkg-plist
@@ -132,8 +132,6 @@ share/locale/zh_TW/LC_MESSAGES/atk10.mo
 share/locale/zu/LC_MESSAGES/atk10.mo
 @dirrm include/atk-1.0/atk
 @dirrm include/atk-1.0
-@dirrmtry share/gir-1.0
-@dirrmtry lib/girepository-1.0
 @dirrmtry share/locale/zu/LC_MESSAGES
 @dirrmtry share/locale/zu
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index 2d28b0f08..4d4bf99b0 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/libsoup/Makefile,v 1.109 2011/10/04 15:53:31 kwm Exp $
+#   $MCom: ports/devel/libsoup/Makefile,v 1.110 2011/10/19 09:53:33 kwm Exp $
 #
 
 PORTNAME=	libsoup
@@ -24,7 +24,7 @@ RUN_DEPENDS=	glib-networking>=2.29.18:${PORTSDIR}/net/glib-networking
 
 .if !defined(REFERENCE_PORT)
 
-USE_GNOME=	gnomehack glib20 libxml2 ltverhack referencehack
+USE_GNOME=	gnomehier gnomehack glib20 libxml2 ltverhack referencehack
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
diff --git a/devel/libsoup/pkg-plist b/devel/libsoup/pkg-plist
index e66c4f6e7..66b73fd60 100644
--- a/devel/libsoup/pkg-plist
+++ b/devel/libsoup/pkg-plist
@@ -113,5 +113,3 @@ share/gtk-doc/html/libsoup-%%VERSION%%/up.png
 @dirrmtry share/gtk-doc/
 @dirrm include/libsoup-%%VERSION%%/libsoup
 @dirrm include/libsoup-%%VERSION%%
-@dirrmtry lib/girepository-1.0
-@dirrmtry share/gir-1.0
diff --git a/net-im/folks/Makefile b/net-im/folks/Makefile
index f71936bf7..6bfd24108 100644
--- a/net-im/folks/Makefile
+++ b/net-im/folks/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net-im/folks/Makefile,v 1.21 2011/10/04 13:40:14 kwm Exp $
+#   $MCom: ports/net-im/folks/Makefile,v 1.22 2011/10/19 16:43:14 kwm Exp $
 #
 
 PORTNAME=	folks
@@ -22,7 +22,7 @@ LIB_DEPENDS=	gee.2:${PORTSDIR}/devel/libgee \
 USE_XZ=		yes
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack intlhack evolutiondataserver3
+USE_GNOME=	gnomehier gnomehack intlhack evolutiondataserver3
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS=	-I${LOCALBASE}/include
diff --git a/net-im/folks/pkg-plist b/net-im/folks/pkg-plist
index 673e363ac..934947267 100644
--- a/net-im/folks/pkg-plist
+++ b/net-im/folks/pkg-plist
@@ -37,8 +37,6 @@ share/vala/vapi/folks-telepathy.deps
 share/vala/vapi/folks-telepathy.vapi
 share/vala/vapi/folks.deps
 share/vala/vapi/folks.vapi
-@dirrmtry share/vala/vapi
-@dirrmtry share/vala
 @dirrm lib/folks/%%VERSION%%/backends/telepathy
 @dirrm lib/folks/%%VERSION%%/backends/key-file
 @dirrm lib/folks/%%VERSION%%/backends/eds
diff --git a/x11-wm/mutter/Makefile b/x11-wm/mutter/Makefile
index f58bfdd5c..beaa93f02 100644
--- a/x11-wm/mutter/Makefile
+++ b/x11-wm/mutter/Makefile
@@ -3,7 +3,7 @@
 # Whom:                Pawel Worach <pawel.worach@gmail.com>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-wm/mutter/Makefile,v 1.29 2011/10/08 09:22:23 kwm Exp $
+#   $MCom: ports/x11-wm/mutter/Makefile,v 1.30 2011/10/19 16:20:46 kwm Exp $
 #
 
 PORTNAME=	mutter
@@ -29,7 +29,7 @@ USE_PYTHON=	2.5+
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomeprefix gnomehack intlhack gtk30 gconf2 ltverhack
+USE_GNOME=	gnomehier gnomeprefix gnomehack intlhack gtk30 gconf2 ltverhack
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/x11-wm/mutter/pkg-plist b/x11-wm/mutter/pkg-plist
index 72e878e1b..8a6292cf8 100644
--- a/x11-wm/mutter/pkg-plist
+++ b/x11-wm/mutter/pkg-plist
@@ -131,13 +131,11 @@ share/locale/zh_TW/LC_MESSAGES/mutter.mo
 %%DATADIR%%/icons/mutter-window-demo.png
 @dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%
-@dirrmtry lib/girepository-1.0
 @dirrm lib/mutter/plugins
 @dirrm lib/mutter
 @dirrm include/mutter/meta
 @dirrm include/mutter
 @dirrmtry share/applications
-@dirrmtry share/gir-1.0
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/yo/LC_MESSAGES
diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
index 30ab8081d..5d4f9acd4 100644
--- a/x11/gnome-menus/Makefile
+++ b/x11/gnome-menus/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-menus/Makefile,v 1.110 2010/11/17 11:29:19 kwm Exp $
+#   $MCom: ports/x11/gnome-menus/Makefile,v 1.117 2011/06/10 21:14:05 mezz Exp $
 #
 
 PORTNAME=	gnome-menus
 PORTVERSION=	2.30.5
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -23,12 +23,12 @@ CONFLICTS=	gnome-menus-3.[0-9]*
 USE_GETTEXT=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack glib20 ltverhack
+USE_GNOME=	gnomehier gnomeprefix gnomehack intlhack glib20 ltverhack
 USE_AUTOTOOLS=	libtool
 USE_PYTHON=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|applications.menu||' \
diff --git a/x11/gnome-menus/pkg-plist b/x11/gnome-menus/pkg-plist
index f94508732..a0703b292 100644
--- a/x11/gnome-menus/pkg-plist
+++ b/x11/gnome-menus/pkg-plist
@@ -138,8 +138,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
 @dirrm share/gnome-menus
 @dirrmtry share/desktop-directories
 @dirrm include/gnome-menus
-@dirrmtry share/gir-1.0
-@dirrmtry lib/girepository-1.0
 @dirrmtry etc/xdg/menus
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
diff --git a/x11/gnome-menus3/Makefile b/x11/gnome-menus3/Makefile
index 8edfab142..b86cce309 100644
--- a/x11/gnome-menus3/Makefile
+++ b/x11/gnome-menus3/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-menus3/Makefile,v 1.3 2011/09/19 19:55:11 kwm Exp $
+#   $MCom: ports/x11/gnome-menus3/Makefile,v 1.4 2011/10/04 20:57:45 kwm Exp $
 #
 
 PORTNAME=	gnome-menus
@@ -24,12 +24,12 @@ LATEST_LINK=	gnome-menus3
 USE_GETTEXT=	yes
 USE_XZ=		yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack glib20 ltverhack
+USE_GNOME=	gnomehier gnomeprefix gnomehack intlhack glib20 ltverhack
 USE_AUTOTOOLS=	libtool
 USE_PYTHON=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|applications.menu||' \
diff --git a/x11/gnome-menus3/pkg-plist b/x11/gnome-menus3/pkg-plist
index 6f2851836..ef8b28582 100644
--- a/x11/gnome-menus3/pkg-plist
+++ b/x11/gnome-menus3/pkg-plist
@@ -153,8 +153,6 @@ share/locale/zu/LC_MESSAGES/gnome-menus-3.0.mo
 @dirrmtry share/applications
 @dirrm %%PYTHON_SITELIBDIR%%/GMenuSimpleEditor
 @dirrm include/gnome-menus-3.0
-@dirrmtry share/gir-1.0
-@dirrmtry lib/girepository-1.0
 @dirrmtry etc/xdg/menus
 @dirrmtry share/locale/zu/LC_MESSAGES
 @dirrmtry share/locale/zu