Introducing gnomehier 2.0

- Remove all the .keep files and use a auto-generated BSD.gnome-11.dist mtree
  file from a combination of files/dirlist and /etc/mtree/BSD.x11[-4].dist.
- MTREE_FILE?=X11BASE/etc/mtree/BSD.gnome-x11.dist is defined for every port
  that uses gnomeprefix


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

4 files changed, 170 insertions, 1 deletions

diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index c3884d450..0ae82b4ab 100644
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@@ -86,7 +86,7 @@ gnomehack_PRE_PATCH=	${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLA
 lthack_PRE_PATCH=	${FIND} ${WRKSRC} -name "configure" | ${XARGS} ${REINPLACE_CMD} -e \
 				'/^LIBTOOL_DEPS="$$ac_aux_dir\/ltmain.sh"$$/s|$$|; $$ac_aux_dir/ltconfig $$LIBTOOL_DEPS;|'
 
-gnomehier_DETECT=	${X11BASE}/share/gnome/.keep_me
+gnomehier_DETECT=	${X11BASE}/etc/mtree/BSD.gnome-x11.dist
 gnomehier_RUN_DEPENDS=	${gnomehier_DETECT}:${PORTSDIR}/misc/gnomehier
 
 GNOME_HTML_DIR?=	${PREFIX}/share/doc
@@ -626,6 +626,10 @@ MAKE_ENV+=	${${component}_MAKE_ENV}
 CONFIGURE_TARGET=	${${component}_CONFIGURE_TARGET}
 .    endif
 
+.if ${_USE_GNOME:Mgnomeprefix}!=""
+MTREE_FILE?=	${X11BASE}/etc/mtree/BSD.gnome-x11.dist
+.endif
+
 .    if defined(${component}_PRE_PATCH)
 GNOME_PRE_PATCH+=	; ${${component}_PRE_PATCH}
 .    endif
diff --git a/misc/gnomehier/Makefile b/misc/gnomehier/Makefile
new file mode 100644
index 000000000..edad81e52
--- /dev/null
+++ b/misc/gnomehier/Makefile
@@ -0,0 +1,53 @@
+# New ports collection makefile for:	gnomehier
+# Date created:				2 July 2002
+# Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
+#
+# $FreeBSD: ports/misc/gnomehier/Makefile,v 1.27 2004/12/18 01:54:05 marcus Exp $
+#
+
+PORTNAME=	gnomehier
+PORTVERSION=	2.0
+PORTREVISION=	0
+CATEGORIES=	misc gnome
+MASTER_SITES=	# none
+DISTFILES=	# none
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	A utility port that creates the GNOME directory tree
+
+NO_BUILD=	yes
+PLIST?=		${WRKDIR}/pkg-plist
+
+GNOME_MTREE=	BSD.gnome-x11.dist
+
+USE_X_PREFIX=	yes
+
+do-fetch:
+	@${DO_NADA}
+
+pre-su-install:
+	@${CP} -f ${FILESDIR}/dirlist ${WRKDIR}
+	@${RM} -f ${PLIST} ${WRKDIR}/${GNOME_MTREE}
+	@${TOUCH} -f ${PLIST}
+	@${MKDIR} ${WRKSRC}
+	@${CAT} ${FILESDIR}/dirlist | ${SORT} -r | ${SED} -e \
+		's|^|@dirrm |' >> ${PLIST}
+	@${ECHO_CMD} etc/mtree/${GNOME_MTREE} >> ${PLIST}
+	@${ECHO_CMD} "@unexec ${RMDIR} %D/etc/mtree 2>/dev/null || ${TRUE}" >> ${PLIST}
+	@for dir in `${CAT} ${WRKDIR}/dirlist`; \
+	do \
+		${MKDIR} ${WRKSRC}/$${dir}; \
+	done
+	${CHGRP} games ${WRKSRC}/share/gnome/games
+	${CHMOD} g=rwXs ${WRKSRC}/share/gnome/games
+	${MTREE_CMD} ${MTREE_ARGS} ${WRKSRC}/
+	cd ${WRKSRC} && \
+		${MTREE_CMD} -U -d -n -i -c -k "uname, gname, mode" \
+			> ${WRKDIR}/${GNOME_MTREE}
+
+do-install:
+	${MTREE_CMD} ${MTREE_ARGS:S|${MTREE_FILE}|${WRKDIR}/${GNOME_MTREE}|} ${PREFIX}
+	${MKDIR} ${PREFIX}/etc/mtree
+	${INSTALL_DATA} ${WRKDIR}/${GNOME_MTREE} ${PREFIX}/etc/mtree
+
+.include <bsd.port.mk>
diff --git a/misc/gnomehier/files/dirlist b/misc/gnomehier/files/dirlist
new file mode 100644
index 000000000..aa3aa4a19
--- /dev/null
+++ b/misc/gnomehier/files/dirlist
@@ -0,0 +1,109 @@
+etc/CORBA
+etc/CORBA/servers
+etc/X11
+etc/X11/serverconfig
+etc/X11/starthere
+etc/X11/sysconfig
+etc/gconf
+etc/gconf/gconf.xml.defaults
+etc/gconf/gconf.xml.defaults/apps
+etc/gconf/gconf.xml.defaults/desktop
+etc/gconf/gconf.xml.defaults/desktop/gnome
+etc/gconf/gconf.xml.defaults/schemas
+etc/gconf/gconf.xml.defaults/schemas/apps
+etc/gconf/gconf.xml.defaults/schemas/desktop
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome
+etc/gconf/gconf.xml.mandatory
+etc/gconf/schemas
+etc/gnome
+etc/gnome/config
+etc/gnome-vfs-2.0
+etc/gnome-vfs-2.0/modules
+etc/sound
+etc/sound/events
+etc/vfs
+etc/vfs/modules
+include/gconf
+include/gdkcardimage
+include/gnome-1.0
+lib/GConf
+lib/bonobo
+lib/bonobo/monikers
+lib/bonobo/plugin
+lib/gnome-vfs-2.0
+lib/gnome-vfs-2.0/modules
+lib/gtk-2.0
+lib/libglade
+lib/libglade/2.0
+lib/vfs
+lib/vfs/modules
+libdata/bonobo
+libdata/bonobo/servers
+share/doc/libgda
+share/gnome
+share/gnome/applets
+share/gnome/applets/Amusements
+share/gnome/applets/Clocks
+share/gnome/applets/Monitors
+share/gnome/applets/Multimedia
+share/gnome/applets/Network
+share/gnome/applets/Utility
+share/gnome/application-registry
+share/gnome/applications
+share/gnome/apps
+share/gnome/apps/Applications
+share/gnome/apps/Audio
+share/gnome/apps/Development
+share/gnome/apps/Games
+share/gnome/apps/Graphics
+share/gnome/apps/Internet
+share/gnome/apps/Multimedia
+share/gnome/apps/Settings
+share/gnome/apps/Settings/Desktop
+share/gnome/apps/Settings/Documents
+share/gnome/apps/Settings/Peripherals
+share/gnome/apps/Settings/Session
+share/gnome/apps/System
+share/gnome/apps/Utilities
+share/gnome/capplets
+share/gnome/control-center
+share/gnome/control-center-2.0
+share/gnome/control-center-2.0/capplets
+share/gnome/control-center/Desktop
+share/gnome/control-center/Documents
+share/gnome/control-center/Peripherals
+share/gnome/control-center/Session
+share/gnome/control-center/capplets
+share/gnome/fonts
+share/gnome/games
+share/gnome/gnome-2.0
+share/gnome/gnome-2.0/ui
+share/gnome/gnome-about
+share/gnome/help
+share/gnome/help/fdl
+share/gnome/help/fdl/C
+share/gnome/help/gpl
+share/gnome/help/gpl/C
+share/gnome/help/lgpl
+share/gnome/help/lgpl/C
+share/gnome/icons
+share/gnome/idl
+share/gnome/images
+share/gnome/mc
+share/gnome/mc/templates
+share/gnome/mime-info
+share/gnome/oaf
+share/gnome/omf
+share/gnome/panel
+share/gnome/pixmaps
+share/gnome/pixmaps/document-icons
+share/gnome/pixmaps/splash
+share/gnome/sgml
+share/gnome/sgml/docbook
+share/gnome/sgml/docbook/gnome-customization-0.1
+share/gnome/sounds
+share/gnome/themes
+share/gnome/ui
+share/gnome/vfolders
+share/gnome/wm-properties
+share/gnome/xmodmap
diff --git a/misc/gnomehier/pkg-descr b/misc/gnomehier/pkg-descr
new file mode 100644
index 000000000..ec27b1ee2
--- /dev/null
+++ b/misc/gnomehier/pkg-descr
@@ -0,0 +1,3 @@
+This is a utility port that creates the common GNOME directory
+structure.  This way, the existence of the directories can be
+ensured before applications attempt to install into them.