Catch up with gnustep-base changes. Bump revision.

2 files changed, 59 insertions, 46 deletions

diff --git a/x11/gnustep-preferences/Makefile b/x11/gnustep-preferences/Makefile
index 4289238f0da..b2604c0cf55 100644
--- a/x11/gnustep-preferences/Makefile
+++ b/x11/gnustep-preferences/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.30 2008/01/18 05:09:55 tnn Exp $
+# $NetBSD: Makefile,v 1.31 2008/06/21 22:54:04 joerg Exp $
 #
 
 DISTNAME=	Preferences-1.2.0
 PKGNAME=	gnustep-${DISTNAME:S/P/p/}
-PKGREVISION=	16
+PKGREVISION=	17
 CATEGORIES=	x11 gnustep
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=prefsapp/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/gnustep-preferences/PLIST b/x11/gnustep-preferences/PLIST
index 1bd718b7b7e..f1119adea57 100644
--- a/x11/gnustep-preferences/PLIST
+++ b/x11/gnustep-preferences/PLIST
@@ -1,36 +1,38 @@
-@comment $NetBSD: PLIST,v 1.7 2004/09/15 11:10:39 wiz Exp $
-share/GNUstep/System/Applications/Preferences.app/Preferences
-share/GNUstep/System/Applications/Preferences.app/Resources/English.lproj/Localizable.strings
-share/GNUstep/System/Applications/Preferences.app/Resources/English.lproj/Preferences.gorm
-share/GNUstep/System/Applications/Preferences.app/Resources/Info-gnustep.plist
-share/GNUstep/System/Applications/Preferences.app/Resources/Preferences.desktop
-share/GNUstep/System/Applications/Preferences.app/Resources/Preferences.tiff
-share/GNUstep/System/Applications/Preferences.app/Resources/PreferencesInfo.plist
-share/GNUstep/System/Applications/Preferences.app/Resources/PrefsApp.prefs/PrefsApp
-share/GNUstep/System/Applications/Preferences.app/Resources/PrefsApp.prefs/Resources/Info-gnustep.plist
-share/GNUstep/System/Applications/Preferences.app/Resources/PrefsApp.prefs/Resources/PrefsApp.gorm
-share/GNUstep/System/Applications/Preferences.app/Resources/PrefsApp.prefs/stamp.make
-share/GNUstep/System/Applications/Preferences.app/Resources/PrefsIcon_Appearances.tiff
-share/GNUstep/System/Applications/Preferences.app/Resources/PrefsIcon_Keyboard.tiff
-share/GNUstep/System/Applications/Preferences.app/Resources/PrefsIcon_Localisation.tiff
-share/GNUstep/System/Applications/Preferences.app/Resources/PrefsIcon_Login.tiff
-share/GNUstep/System/Applications/Preferences.app/Resources/PrefsIcon_Mouse.tiff
-share/GNUstep/System/Applications/Preferences.app/Resources/PrefsIcon_Screen.tiff
-share/GNUstep/System/Applications/Preferences.app/Resources/PrefsIcon_SelectSpooler.tiff
-share/GNUstep/System/Applications/Preferences.app/Resources/PrefsModule.tiff
-share/GNUstep/System/Applications/Preferences.app/library_paths.openapp
-share/GNUstep/System/Applications/Preferences.app/stamp.make
-share/GNUstep/System/Library/Headers/PrefsModule
-share/GNUstep/System/Library/Libraries/libPrefsModule.so
-share/GNUstep/System/Library/Libraries/libPrefsModule.so.0.0.1
-share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Headers
-share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Resources
-share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A/Headers/PrefsModule.h
-share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A/PrefsModule
-share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A/Resources/Info-gnustep.plist
-share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A/libPrefsModule.so
-share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A/libPrefsModule.so.0.0.1
-share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/Current
+@comment $NetBSD: PLIST,v 1.8 2008/06/21 22:54:04 joerg Exp $
+share/GNUstep/Local/Applications/Preferences.app/Preferences
+share/GNUstep/Local/Applications/Preferences.app/Resources/English.lproj/Localizable.strings
+share/GNUstep/Local/Applications/Preferences.app/Resources/English.lproj/Preferences.gorm
+share/GNUstep/Local/Applications/Preferences.app/Resources/Info-gnustep.plist
+share/GNUstep/Local/Applications/Preferences.app/Resources/Preferences.desktop
+share/GNUstep/Local/Applications/Preferences.app/Resources/Preferences.tiff
+share/GNUstep/Local/Applications/Preferences.app/Resources/PreferencesInfo.plist
+share/GNUstep/Local/Applications/Preferences.app/Resources/PrefsApp.prefs/PrefsApp
+share/GNUstep/Local/Applications/Preferences.app/Resources/PrefsApp.prefs/Resources/Info-gnustep.plist
+share/GNUstep/Local/Applications/Preferences.app/Resources/PrefsApp.prefs/Resources/PrefsApp.gorm
+share/GNUstep/Local/Applications/Preferences.app/Resources/PrefsApp.prefs/stamp.make
+share/GNUstep/Local/Applications/Preferences.app/Resources/PrefsIcon_Appearances.tiff
+share/GNUstep/Local/Applications/Preferences.app/Resources/PrefsIcon_Keyboard.tiff
+share/GNUstep/Local/Applications/Preferences.app/Resources/PrefsIcon_Localisation.tiff
+share/GNUstep/Local/Applications/Preferences.app/Resources/PrefsIcon_Login.tiff
+share/GNUstep/Local/Applications/Preferences.app/Resources/PrefsIcon_Mouse.tiff
+share/GNUstep/Local/Applications/Preferences.app/Resources/PrefsIcon_Screen.tiff
+share/GNUstep/Local/Applications/Preferences.app/Resources/PrefsIcon_SelectSpooler.tiff
+share/GNUstep/Local/Applications/Preferences.app/Resources/PrefsModule.tiff
+share/GNUstep/Local/Applications/Preferences.app/stamp.make
+share/GNUstep/Local/Library/Frameworks/PrefsModule.framework/Headers
+share/GNUstep/Local/Library/Frameworks/PrefsModule.framework/PrefsModule
+share/GNUstep/Local/Library/Frameworks/PrefsModule.framework/Resources
+share/GNUstep/Local/Library/Frameworks/PrefsModule.framework/Versions/0/Headers/PrefsModule.h
+share/GNUstep/Local/Library/Frameworks/PrefsModule.framework/Versions/0/PrefsModule
+share/GNUstep/Local/Library/Frameworks/PrefsModule.framework/Versions/0/Resources/Info-gnustep.plist
+share/GNUstep/Local/Library/Frameworks/PrefsModule.framework/Versions/0/libPrefsModule.so
+share/GNUstep/Local/Library/Frameworks/PrefsModule.framework/Versions/0/libPrefsModule.so.0.0.1
+share/GNUstep/Local/Library/Frameworks/PrefsModule.framework/Versions/Current
+share/GNUstep/Local/Library/Frameworks/PrefsModule.framework/libPrefsModule.so
+share/GNUstep/Local/Library/Headers/PrefsModule
+share/GNUstep/Local/Library/Libraries/libPrefsModule.so
+share/GNUstep/Local/Library/Libraries/libPrefsModule.so.0.0.1
+share/GNUstep/Local/Tools/Preferences
 share/GNUstep/System/Library/Preferences/Keyboard.prefs/Keyboard
 share/GNUstep/System/Library/Preferences/Keyboard.prefs/Resources/Info-gnustep.plist
 share/GNUstep/System/Library/Preferences/Keyboard.prefs/Resources/Keyboard.gorm
@@ -38,16 +40,27 @@ share/GNUstep/System/Library/Preferences/Keyboard.prefs/stamp.make
 @dirrm share/GNUstep/System/Library/Preferences/Keyboard.prefs/Resources
 @dirrm share/GNUstep/System/Library/Preferences/Keyboard.prefs
 @dirrm share/GNUstep/System/Library/Preferences
-@dirrm share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A/Resources
-@dirrm share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A/Headers
-@dirrm share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A
-@dirrm share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions
-@dirrm share/GNUstep/System/Library/Frameworks/PrefsModule.framework
-@dirrm share/GNUstep/System/Applications/Preferences.app/Resources/PrefsApp.prefs/Resources
-@dirrm share/GNUstep/System/Applications/Preferences.app/Resources/PrefsApp.prefs
-@dirrm share/GNUstep/System/Applications/Preferences.app/Resources/English.lproj
-@dirrm share/GNUstep/System/Applications/Preferences.app/Resources
-@dirrm share/GNUstep/System/Applications/Preferences.app
+@comment in devel/gnustep-make: @dirrm share/GNUstep/System/Library
+@exec ${MKDIR} %D/share/GNUstep/Network/Library/Preferences
 @dirrm share/GNUstep/Network/Library/Preferences
-@unexec ${RMDIR} %D/share/GNUstep/Network/Library 2>/dev/null || ${TRUE}
+@dirrm share/GNUstep/Network/Library
+@comment in devel/gnustep-make: @dirrm share/GNUstep/Network
+@dirrm share/GNUstep/Local/Tools
+@exec ${MKDIR} %D/share/GNUstep/Local/Library/Preferences
 @dirrm share/GNUstep/Local/Library/Preferences
+@comment in devel/gnustep-make: @dirrm share/GNUstep/Local/Library/Libraries
+@comment in devel/gnustep-make: @dirrm share/GNUstep/Local/Library/Headers
+@dirrm share/GNUstep/Local/Library/Frameworks/PrefsModule.framework/Versions/0/Resources
+@dirrm share/GNUstep/Local/Library/Frameworks/PrefsModule.framework/Versions/0/Headers
+@dirrm share/GNUstep/Local/Library/Frameworks/PrefsModule.framework/Versions/0
+@dirrm share/GNUstep/Local/Library/Frameworks/PrefsModule.framework/Versions
+@dirrm share/GNUstep/Local/Library/Frameworks/PrefsModule.framework
+@comment in devel/gnustep-make: @dirrm share/GNUstep/Local/Library/Frameworks
+@comment in devel/gnustep-make: @dirrm share/GNUstep/Local/Library
+@dirrm share/GNUstep/Local/Applications/Preferences.app/Resources/PrefsApp.prefs/Resources
+@dirrm share/GNUstep/Local/Applications/Preferences.app/Resources/PrefsApp.prefs
+@dirrm share/GNUstep/Local/Applications/Preferences.app/Resources/English.lproj
+@dirrm share/GNUstep/Local/Applications/Preferences.app/Resources
+@dirrm share/GNUstep/Local/Applications/Preferences.app
+@comment in devel/gnustep-make: @dirrm share/GNUstep/Local/Applications
+@comment in devel/gnustep-make: @dirrm share/GNUstep/Local