2 files changed, 9 insertions, 436 deletions

diff --git a/misc/gnomehier/Makefile b/misc/gnomehier/Makefile
index 481ae03c8033..c3ee66bee0ad 100644
--- a/misc/gnomehier/Makefile
+++ b/misc/gnomehier/Makefile
@@ -17,12 +17,21 @@ COMMENT=	An utility port, installing hierarchy of common GNOME directories
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
+PLIST?=		${WRKDIR}/pkg-plist
 
 USE_X_PREFIX=	yes
 
 do-fetch:
 	@${DO_NADA}
 
+pre-install:
+	@${RM} -f ${PLIST}
+	@${TOUCH} -f ${PLIST}
+	@${CAT} ${FILESDIR}/dirlist | sort | ${SED} -e \
+		's|$$|/.keep_me|' >> ${PLIST}
+	@${CAT} ${FILESDIR}/dirlist | sort -r | ${SED} -e \
+		's|^|@dirrm |' >> ${PLIST}
+
 do-install:
 	@for dir in `${CAT} ${FILESDIR}/dirlist`; \
 	do \
diff --git a/misc/gnomehier/pkg-plist b/misc/gnomehier/pkg-plist
deleted file mode 100644
index 4cf6661c2120..000000000000
--- a/misc/gnomehier/pkg-plist
+++ /dev/null
@@ -1,436 +0,0 @@
-etc/CORBA/.keep_me
-etc/CORBA/servers/.keep_me
-etc/X11/.keep_me
-etc/X11/serverconfig/.keep_me
-etc/X11/starthere/.keep_me
-etc/X11/sysconfig/.keep_me
-etc/gconf/.keep_me
-etc/gconf/gconf.xml.defaults/.keep_me
-etc/gconf/gconf.xml.defaults/apps/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/.keep_me
-etc/gconf/gconf.xml.defaults/apps/eog/.keep_me
-etc/gconf/gconf.xml.defaults/apps/eog/full_screen/.keep_me
-etc/gconf/gconf.xml.defaults/apps/eog/view/.keep_me
-etc/gconf/gconf.xml.defaults/apps/eog/window/.keep_me
-etc/gconf/gconf.xml.defaults/schemas/.keep_me
-etc/gconf/gconf.xml.defaults/schemas/apps/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/.keep_me
-etc/gconf/gconf.xml.defaults/schemas/apps/eog/.keep_me
-etc/gconf/gconf.xml.defaults/schemas/apps/eog/full_screen/.keep_me
-etc/gconf/gconf.xml.defaults/schemas/apps/eog/view/.keep_me
-etc/gconf/gconf.xml.defaults/schemas/apps/eog/window/.keep_me
-etc/gconf/gconf.xml.mandatory/.keep_me
-etc/gconf/schemas/.keep_me
-etc/gdm/.keep_me
-etc/gdm/Init/.keep_me
-etc/gdm/PostSession/.keep_me
-etc/gdm/PreSession/.keep_me
-etc/gdm/Sessions/.keep_me
-etc/gnome-vfs-2.0/.keep_me
-etc/gnome-vfs-2.0/modules/.keep_me
-etc/gnome/.keep_me
-etc/gnome/config/.keep_me
-etc/sound/.keep_me
-etc/sound/events/.keep_me
-etc/vfs/.keep_me
-etc/vfs/modules/.keep_me
-include/gconf/.keep_me
-include/gdkcardimage/.keep_me
-include/gnome-1.0/.keep_me
-include/libnautilus/.keep_me
-lib/GConf/.keep_me
-lib/bonobo/.keep_me
-lib/bonobo/monikers/.keep_me
-lib/bonobo/plugin/.keep_me
-lib/gnome-pilot/.keep_me
-lib/gnome-pilot/conduits/.keep_me
-lib/gnome-vfs-2.0/.keep_me
-lib/gnome-vfs-2.0/modules/.keep_me
-lib/gtk-2.0/.keep_me
-lib/libglade/.keep_me
-lib/libglade/2.0/.keep_me
-lib/vfs/.keep_me
-lib/vfs/modules/.keep_me
-libdata/bonobo/.keep_me
-libdata/bonobo/servers/.keep_me
-libexec/sawfish/.keep_me
-share/doc/libgda/.keep_me
-share/gnome/.keep_me
-share/gnome/applets/.keep_me
-share/gnome/applets/Amusements/.keep_me
-share/gnome/applets/Clocks/.keep_me
-share/gnome/applets/Monitors/.keep_me
-share/gnome/applets/Multimedia/.keep_me
-share/gnome/applets/Network/.keep_me
-share/gnome/applets/Utility/.keep_me
-share/gnome/application-registry/.keep_me
-share/gnome/applications/.keep_me
-share/gnome/apps/.keep_me
-share/gnome/apps/Applications/.keep_me
-share/gnome/apps/Audio/.keep_me
-share/gnome/apps/Development/.keep_me
-share/gnome/apps/Games/.keep_me
-share/gnome/apps/Graphics/.keep_me
-share/gnome/apps/Internet/.keep_me
-share/gnome/apps/Multimedia/.keep_me
-share/gnome/apps/Settings/.keep_me
-share/gnome/apps/Settings/Desktop/.keep_me
-share/gnome/apps/Settings/Documents/.keep_me
-share/gnome/apps/Settings/Peripherals/.keep_me
-share/gnome/apps/Settings/Session/.keep_me
-share/gnome/apps/System/.keep_me
-share/gnome/apps/Utilities/.keep_me
-share/gnome/bug-buddy/.keep_me
-share/gnome/bug-buddy/bugzilla/.keep_me
-share/gnome/bug-buddy/bugzilla/gnome/.keep_me
-share/gnome/bug-buddy/bugzilla/ximian/.keep_me
-share/gnome/control-center-2.0/.keep_me
-share/gnome/control-center-2.0/capplets/.keep_me
-share/gnome/control-center/.keep_me
-share/gnome/control-center/Desktop/.keep_me
-share/gnome/control-center/Documents/.keep_me
-share/gnome/control-center/Peripherals/.keep_me
-share/gnome/control-center/Session/.keep_me
-share/gnome/control-center/capplets/.keep_me
-share/gnome/fonts/.keep_me
-share/gnome/games/.keep_me
-share/gnome/gdm/.keep_me
-share/gnome/geyes/.keep_me
-share/gnome/geyes/Bizarre/.keep_me
-share/gnome/geyes/Bloodshot/.keep_me
-share/gnome/geyes/Default-tiny/.keep_me
-share/gnome/geyes/Default/.keep_me
-share/gnome/geyes/Horrid/.keep_me
-share/gnome/gkb/.keep_me
-share/gnome/gnect/.keep_me
-share/gnome/gnibbles/.keep_me
-share/gnome/gnobots2/.keep_me
-share/gnome/gnome-2.0/.keep_me
-share/gnome/gnome-2.0/ui/.keep_me
-share/gnome/gnome-about/.keep_me
-share/gnome/gnome-pilot/.keep_me
-share/gnome/gnome-pilot/conduits/.keep_me
-share/gnome/gnome-terminal/.keep_me
-share/gnome/gnome-terminal/glade/.keep_me
-share/gnome/gweather/.keep_me
-share/gnome/help/.keep_me
-share/gnome/help/bug-buddy/.keep_me
-share/gnome/help/bug-buddy/C/.keep_me
-share/gnome/help/eog/.keep_me
-share/gnome/help/eog/C/.keep_me
-share/gnome/help/fdl/.keep_me
-share/gnome/help/fdl/C/.keep_me
-share/gnome/help/gedit/.keep_me
-share/gnome/help/gedit/C/.keep_me
-share/gnome/help/gnome-terminal/.keep_me
-share/gnome/help/gnome-terminal/C/.keep_me
-share/gnome/help/gpl/.keep_me
-share/gnome/help/gpl/C/.keep_me
-share/gnome/help/lgpl/.keep_me
-share/gnome/help/lgpl/C/.keep_me
-share/gnome/idl/.keep_me
-share/gnome/images/.keep_me
-share/gnome/mc/.keep_me
-share/gnome/mc/templates/.keep_me
-share/gnome/mime-info/.keep_me
-share/gnome/nautilus/.keep_me
-share/gnome/nautilus/emblems/.keep_me
-share/gnome/nautilus/patterns/.keep_me
-share/gnome/nautilus/services/.keep_me
-share/gnome/nautilus/services/text/.keep_me
-share/gnome/oaf/.keep_me
-share/gnome/omf/.keep_me
-share/gnome/omf/gnome-applets/.keep_me
-share/gnome/omf/gnome-games/.keep_me
-share/gnome/omf/gnome-media/.keep_me
-share/gnome/omf/gnome-utils/.keep_me
-share/gnome/panel/.keep_me
-share/gnome/pixmaps/.keep_me
-share/gnome/pixmaps/document-icons/.keep_me
-share/gnome/pixmaps/eog/.keep_me
-share/gnome/pixmaps/fish/.keep_me
-share/gnome/pixmaps/gkb/.keep_me
-share/gnome/pixmaps/gnotravex/.keep_me
-share/gnome/pixmaps/gweather/.keep_me
-share/gnome/pixmaps/mailcheck/.keep_me
-share/gnome/pixmaps/mini-commander/.keep_me
-share/gnome/pixmaps/nautilus/.keep_me
-share/gnome/pixmaps/nautilus/crux_eggplant/.keep_me
-share/gnome/pixmaps/nautilus/crux_eggplant/backgrounds/.keep_me
-share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/.keep_me
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/.keep_me
-share/gnome/pixmaps/nautilus/crux_teal/.keep_me
-share/gnome/pixmaps/nautilus/crux_teal/backgrounds/.keep_me
-share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/.keep_me
-share/gnome/pixmaps/nautilus/crux_teal/throbber/.keep_me
-share/gnome/pixmaps/nautilus/gnome/.keep_me
-share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/.keep_me
-share/gnome/pixmaps/nautilus/gnome/throbber/.keep_me
-share/gnome/pixmaps/nautilus/sidebar_tab_pieces/.keep_me
-share/gnome/pixmaps/nautilus/sierra/.keep_me
-share/gnome/pixmaps/nautilus/tahoe/.keep_me
-share/gnome/pixmaps/nautilus/throbber/.keep_me
-share/gnome/pixmaps/splash/.keep_me
-share/gnome/sgml/.keep_me
-share/gnome/sgml/docbook/.keep_me
-share/gnome/sgml/docbook/gnome-customization-0.1/.keep_me
-share/gnome/sounds/.keep_me
-share/gnome/ui/.keep_me
-share/gnome/vfolders/.keep_me
-share/gnome/wm-properties/.keep_me
-share/gnome/xbill/.keep_me
-share/gnome/xbill/cursors/.keep_me
-share/gnome/xbill/pixmaps/.keep_me
-share/gnome/xmodmap/.keep_me
-share/sawfish/.keep_me
-share/sawfish/sounds/.keep_me
-share/sawfish/themes/.keep_me
-@dirrm share/sawfish/themes
-@dirrm share/sawfish/sounds
-@dirrm share/sawfish
-@dirrm share/gnome/xmodmap
-@dirrm share/gnome/xbill/pixmaps
-@dirrm share/gnome/xbill/cursors
-@dirrm share/gnome/xbill
-@dirrm share/gnome/wm-properties
-@dirrm share/gnome/vfolders
-@dirrm share/gnome/ui
-@dirrm share/gnome/sounds/iagno
-@dirrm share/gnome/sounds/gnobots2
-@dirrm share/gnome/sounds/gnibbles
-@dirrm share/gnome/sounds/gataxx
-@dirrm share/gnome/sounds
-@dirrm share/gnome/sol-games
-@dirrm share/gnome/sgml/docbook/gnome-customization-0.1
-@dirrm share/gnome/sgml/docbook
-@dirrm share/gnome/sgml
-@dirrm share/gnome/pixmaps/splash
-@dirrm share/gnome/pixmaps/same-gnome
-@dirrm share/gnome/pixmaps/nautilus/throbber
-@dirrm share/gnome/pixmaps/nautilus/tahoe
-@dirrm share/gnome/pixmaps/nautilus/sierra
-@dirrm share/gnome/pixmaps/nautilus/sidebar_tab_pieces
-@dirrm share/gnome/pixmaps/nautilus/gnome/throbber
-@dirrm share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces
-@dirrm share/gnome/pixmaps/nautilus/gnome
-@dirrm share/gnome/pixmaps/nautilus/crux_teal/throbber
-@dirrm share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces
-@dirrm share/gnome/pixmaps/nautilus/crux_teal/backgrounds
-@dirrm share/gnome/pixmaps/nautilus/crux_teal
-@dirrm share/gnome/pixmaps/nautilus/crux_eggplant/throbber
-@dirrm share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces
-@dirrm share/gnome/pixmaps/nautilus/crux_eggplant/backgrounds
-@dirrm share/gnome/pixmaps/nautilus/crux_eggplant
-@dirrm share/gnome/pixmaps/nautilus
-@dirrm share/gnome/pixmaps/mini-commander
-@dirrm share/gnome/pixmaps/mailcheck
-@dirrm share/gnome/pixmaps/mahjongg/bg
-@dirrm share/gnome/pixmaps/mahjongg
-@dirrm share/gnome/pixmaps/iagno
-@dirrm share/gnome/pixmaps/gweather
-@dirrm share/gnome/pixmaps/gnotravex
-@dirrm share/gnome/pixmaps/gnometris/bg
-@dirrm share/gnome/pixmaps/gnometris
-@dirrm share/gnome/pixmaps/gnome-stones
-@dirrm share/gnome/pixmaps/gnobots2
-@dirrm share/gnome/pixmaps/gnibbles
-@dirrm share/gnome/pixmaps/gnect
-@dirrm share/gnome/pixmaps/glines
-@dirrm share/gnome/pixmaps/gkb
-@dirrm share/gnome/pixmaps/gataxx
-@dirrm share/gnome/pixmaps/fish
-@dirrm share/gnome/pixmaps/eog
-@dirrm share/gnome/pixmaps/document-icons
-@dirrm share/gnome/pixmaps/cards/suits_small
-@dirrm share/gnome/pixmaps/cards/suits_medium
-@dirrm share/gnome/pixmaps/cards/suits_large
-@dirrm share/gnome/pixmaps/cards/slots
-@dirrm share/gnome/pixmaps/cards/ranks
-@dirrm share/gnome/pixmaps/cards/jokers
-@dirrm share/gnome/pixmaps/cards/honors
-@dirrm share/gnome/pixmaps/cards/backs
-@dirrm share/gnome/pixmaps/cards
-@dirrm share/gnome/pixmaps
-@dirrm share/gnome/panel
-@dirrm share/gnome/omf/gnome-utils
-@dirrm share/gnome/omf/gnome-media
-@dirrm share/gnome/omf/gnome-games
-@dirrm share/gnome/omf/gnome-applets
-@dirrm share/gnome/omf
-@dirrm share/gnome/oaf
-@dirrm share/gnome/nautilus/services/text
-@dirrm share/gnome/nautilus/services
-@dirrm share/gnome/nautilus/patterns
-@dirrm share/gnome/nautilus/emblems
-@dirrm share/gnome/nautilus
-@dirrm share/gnome/mime-info
-@dirrm share/gnome/mc/templates
-@dirrm share/gnome/mc
-@dirrm share/gnome/images
-@dirrm share/gnome/idl
-@dirrm share/gnome/help/same-gnome/C
-@dirrm share/gnome/help/same-gnome
-@dirrm share/gnome/help/mahjongg/C/figures
-@dirrm share/gnome/help/mahjongg/C
-@dirrm share/gnome/help/mahjongg
-@dirrm share/gnome/help/lgpl/C
-@dirrm share/gnome/help/lgpl
-@dirrm share/gnome/help/iagno/C/figures
-@dirrm share/gnome/help/iagno/C
-@dirrm share/gnome/help/iagno
-@dirrm share/gnome/help/gtali/da
-@dirrm share/gnome/help/gtali/C/figures
-@dirrm share/gnome/help/gtali/C
-@dirrm share/gnome/help/gtali
-@dirrm share/gnome/help/gpl/C
-@dirrm share/gnome/help/gpl
-@dirrm share/gnome/help/gnotravex/C/figures
-@dirrm share/gnome/help/gnotravex/C
-@dirrm share/gnome/help/gnotravex
-@dirrm share/gnome/help/gnome-terminal/C
-@dirrm share/gnome/help/gnome-terminal
-@dirrm share/gnome/help/gnome-stones/C/figures
-@dirrm share/gnome/help/gnome-stones/C
-@dirrm share/gnome/help/gnome-stones
-@dirrm share/gnome/help/gnobots2/it
-@dirrm share/gnome/help/gnobots2/es
-@dirrm share/gnome/help/gnobots2/da
-@dirrm share/gnome/help/gnobots2/C/figures
-@dirrm share/gnome/help/gnobots2/C
-@dirrm share/gnome/help/gnobots2
-@dirrm share/gnome/help/gnibbles/C/figures
-@dirrm share/gnome/help/gnibbles/C
-@dirrm share/gnome/help/gnibbles
-@dirrm share/gnome/help/gnect/C/figures
-@dirrm share/gnome/help/gnect/C
-@dirrm share/gnome/help/gnect
-@dirrm share/gnome/help/gedit/C
-@dirrm share/gnome/help/gedit
-@dirrm share/gnome/help/gataxx/C/figures
-@dirrm share/gnome/help/gataxx/C
-@dirrm share/gnome/help/gataxx
-@dirrm share/gnome/help/fdl/C
-@dirrm share/gnome/help/fdl
-@dirrm share/gnome/help/eog/C
-@dirrm share/gnome/help/eog
-@dirrm share/gnome/help/bug-buddy/C
-@dirrm share/gnome/help/bug-buddy
-@dirrm share/gnome/help/aisleriot/C/figures
-@dirrm share/gnome/help/aisleriot/C
-@dirrm share/gnome/help/aisleriot
-@dirrm share/gnome/help
-@dirrm share/gnome/gweather
-@dirrm share/gnome/gnome-terminal/glade
-@dirrm share/gnome/gnome-terminal
-@dirrm share/gnome/gnome-stones/objects
-@dirrm share/gnome/gnome-stones
-@dirrm share/gnome/gnome-pilot/conduits
-@dirrm share/gnome/gnome-pilot
-@dirrm share/gnome/gnome-about
-@dirrm share/gnome/gnome-2.0/ui
-@dirrm share/gnome/gnome-2.0
-@dirrm share/gnome/gnobots2
-@dirrm share/gnome/gnibbles
-@dirrm share/gnome/gnect
-@dirrm share/gnome/gkb
-@dirrm share/gnome/geyes/Horrid
-@dirrm share/gnome/geyes/Default-tiny
-@dirrm share/gnome/geyes/Default
-@dirrm share/gnome/geyes/Bloodshot
-@dirrm share/gnome/geyes/Bizarre
-@dirrm share/gnome/geyes
-@dirrm share/gnome/gdm
-@dirrm share/gnome/games
-@dirrm share/gnome/fonts
-@dirrm share/gnome/control-center/capplets
-@dirrm share/gnome/control-center/Session
-@dirrm share/gnome/control-center/Peripherals
-@dirrm share/gnome/control-center/Documents
-@dirrm share/gnome/control-center/Desktop
-@dirrm share/gnome/control-center-2.0/capplets
-@dirrm share/gnome/control-center-2.0
-@dirrm share/gnome/control-center
-@dirrm share/gnome/bug-buddy/bugzilla/ximian
-@dirrm share/gnome/bug-buddy/bugzilla/gnome
-@dirrm share/gnome/bug-buddy/bugzilla
-@dirrm share/gnome/bug-buddy
-@dirrm share/gnome/apps/Utilities
-@dirrm share/gnome/apps/System
-@dirrm share/gnome/apps/Settings/Session
-@dirrm share/gnome/apps/Settings/Peripherals
-@dirrm share/gnome/apps/Settings/Documents
-@dirrm share/gnome/apps/Settings/Desktop
-@dirrm share/gnome/apps/Settings
-@dirrm share/gnome/apps/Multimedia
-@dirrm share/gnome/apps/Internet
-@dirrm share/gnome/apps/Graphics
-@dirrm share/gnome/apps/Games
-@dirrm share/gnome/apps/Development
-@dirrm share/gnome/apps/Audio
-@dirrm share/gnome/apps/Applications
-@dirrm share/gnome/apps
-@dirrm share/gnome/applications
-@dirrm share/gnome/application-registry
-@dirrm share/gnome/applets/Utility
-@dirrm share/gnome/applets/Network
-@dirrm share/gnome/applets/Multimedia
-@dirrm share/gnome/applets/Monitors
-@dirrm share/gnome/applets/Clocks
-@dirrm share/gnome/applets/Amusements
-@dirrm share/gnome/applets
-@dirrm share/gnome
-@dirrm share/doc/libgda
-@dirrm libexec/sawfish
-@dirrm libdata/bonobo/servers
-@dirrm libdata/bonobo
-@dirrm lib/vfs/modules
-@dirrm lib/vfs
-@dirrm lib/libglade/2.0
-@dirrm lib/libglade
-@dirrm lib/gtk-2.0
-@dirrm lib/gnome-vfs-2.0/modules
-@dirrm lib/gnome-vfs-2.0
-@dirrm lib/gnome-pilot/conduits
-@dirrm lib/gnome-pilot
-@dirrm lib/bonobo/plugin
-@dirrm lib/bonobo/monikers
-@dirrm lib/bonobo
-@dirrm lib/GConf
-@dirrm include/libnautilus
-@dirrm include/gnome-1.0
-@dirrm include/gdkcardimage
-@dirrm include/gconf
-@dirrm etc/vfs/modules
-@dirrm etc/vfs
-@dirrm etc/sound/events
-@dirrm etc/sound
-@dirrm etc/gnome-vfs-2.0/modules
-@dirrm etc/gnome-vfs-2.0
-@dirrm etc/gnome/config
-@dirrm etc/gnome
-@dirrm etc/gdm/Sessions
-@dirrm etc/gdm/PreSession
-@dirrm etc/gdm/PostSession
-@dirrm etc/gdm/Init
-@dirrm etc/gdm
-@dirrm etc/gconf/schemas
-@dirrm etc/gconf/gconf.xml.mandatory
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/eog/window
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/eog/view
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/eog/full_screen
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/eog
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps
-@dirrm etc/gconf/gconf.xml.defaults/schemas
-@dirrm etc/gconf/gconf.xml.defaults/apps/eog/window
-@dirrm etc/gconf/gconf.xml.defaults/apps/eog/view
-@dirrm etc/gconf/gconf.xml.defaults/apps/eog/full_screen
-@dirrm etc/gconf/gconf.xml.defaults/apps/eog
-@dirrm etc/gconf/gconf.xml.defaults/apps
-@dirrm etc/gconf/gconf.xml.defaults
-@dirrm etc/gconf
-@dirrm etc/X11/sysconfig
-@dirrm etc/X11/starthere
-@dirrm etc/X11/serverconfig
-@dirrm etc/X11
-@dirrm etc/CORBA/servers
-@dirrm etc/CORBA