2 files changed, 76 insertions, 77 deletions

diff --git a/deskutils/systempreferences/Makefile b/deskutils/systempreferences/Makefile
index 26b8e1444249..c1c6153883c6 100644
--- a/deskutils/systempreferences/Makefile
+++ b/deskutils/systempreferences/Makefile
@@ -15,7 +15,6 @@ MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	System Preferences application for GNUstep
 
 USE_GNUSTEP=	yes
-USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_BACK=	yes
diff --git a/deskutils/systempreferences/pkg-plist b/deskutils/systempreferences/pkg-plist
index ce2a68bc4814..ec0f6e659577 100644
--- a/deskutils/systempreferences/pkg-plist
+++ b/deskutils/systempreferences/pkg-plist
@@ -1,76 +1,76 @@
-System/Applications/SystemPreferences.app/Resources/English.lproj/SystemPreferences.gorm/data.classes
-System/Applications/SystemPreferences.app/Resources/English.lproj/SystemPreferences.gorm/data.info
-System/Applications/SystemPreferences.app/Resources/English.lproj/SystemPreferences.gorm/objects.gorm
-System/Applications/SystemPreferences.app/Resources/Info-gnustep.plist
-System/Applications/SystemPreferences.app/Resources/SystemPreferences.desktop
-System/Applications/SystemPreferences.app/Resources/SystemPreferences.tiff
-System/Applications/SystemPreferences.app/SystemPreferences
-System/Applications/SystemPreferences.app/stamp.make
-System/Library/Bundles/Defaults.prefPane/Defaults
-System/Library/Bundles/Defaults.prefPane/Resources/Defaults.tiff
-System/Library/Bundles/Defaults.prefPane/Resources/English.lproj/Defaults.gorm/data.classes
-System/Library/Bundles/Defaults.prefPane/Resources/English.lproj/Defaults.gorm/data.info
-System/Library/Bundles/Defaults.prefPane/Resources/English.lproj/Defaults.gorm/objects.gorm
-System/Library/Bundles/Defaults.prefPane/Resources/English.lproj/Defaults.plist
-System/Library/Bundles/Defaults.prefPane/Resources/Info-gnustep.plist
-System/Library/Bundles/Defaults.prefPane/Resources/Info.plist
-System/Library/Bundles/Defaults.prefPane/stamp.make
-System/Library/Bundles/FileSystem.prefPane/FileSystem
-System/Library/Bundles/FileSystem.prefPane/Resources/English.lproj/FileSystem.gorm/data.classes
-System/Library/Bundles/FileSystem.prefPane/Resources/English.lproj/FileSystem.gorm/data.info
-System/Library/Bundles/FileSystem.prefPane/Resources/English.lproj/FileSystem.gorm/objects.gorm
-System/Library/Bundles/FileSystem.prefPane/Resources/FileSystem.tiff
-System/Library/Bundles/FileSystem.prefPane/Resources/Info-gnustep.plist
-System/Library/Bundles/FileSystem.prefPane/Resources/Info.plist
-System/Library/Bundles/FileSystem.prefPane/stamp.make
-System/Library/Bundles/ModifierKeys.prefPane/ModifierKeys
-System/Library/Bundles/ModifierKeys.prefPane/Resources/English.lproj/ModifierKeys.gorm/data.classes
-System/Library/Bundles/ModifierKeys.prefPane/Resources/English.lproj/ModifierKeys.gorm/data.info
-System/Library/Bundles/ModifierKeys.prefPane/Resources/English.lproj/ModifierKeys.gorm/objects.gorm
-System/Library/Bundles/ModifierKeys.prefPane/Resources/Info-gnustep.plist
-System/Library/Bundles/ModifierKeys.prefPane/Resources/Info.plist
-System/Library/Bundles/ModifierKeys.prefPane/Resources/ModifierKeys.tiff
-System/Library/Bundles/ModifierKeys.prefPane/stamp.make
-System/Library/Bundles/TimeZone.prefPane/Resources/English.lproj/TimeZone.gorm/data.classes
-System/Library/Bundles/TimeZone.prefPane/Resources/English.lproj/TimeZone.gorm/data.info
-System/Library/Bundles/TimeZone.prefPane/Resources/English.lproj/TimeZone.gorm/objects.gorm
-System/Library/Bundles/TimeZone.prefPane/Resources/Info-gnustep.plist
-System/Library/Bundles/TimeZone.prefPane/Resources/Info.plist
-System/Library/Bundles/TimeZone.prefPane/Resources/TimeZone.tiff
-System/Library/Bundles/TimeZone.prefPane/Resources/map.tiff
-System/Library/Bundles/TimeZone.prefPane/Resources/zones.db
-System/Library/Bundles/TimeZone.prefPane/TimeZone
-System/Library/Bundles/TimeZone.prefPane/stamp.make
-System/Library/Bundles/Volumes.prefPane/Resources/English.lproj/Volumes.gorm/data.classes
-System/Library/Bundles/Volumes.prefPane/Resources/English.lproj/Volumes.gorm/data.info
-System/Library/Bundles/Volumes.prefPane/Resources/English.lproj/Volumes.gorm/objects.gorm
-System/Library/Bundles/Volumes.prefPane/Resources/Info-gnustep.plist
-System/Library/Bundles/Volumes.prefPane/Resources/Info.plist
-System/Library/Bundles/Volumes.prefPane/Resources/Volumes.tiff
-System/Library/Bundles/Volumes.prefPane/Volumes
-System/Library/Bundles/Volumes.prefPane/stamp.make
-System/Tools/SystemPreferences
-@dirrm System/Library/Bundles/Volumes.prefPane/Resources/English.lproj/Volumes.gorm
-@dirrm System/Library/Bundles/Volumes.prefPane/Resources/English.lproj
-@dirrm System/Library/Bundles/Volumes.prefPane/Resources
-@dirrm System/Library/Bundles/Volumes.prefPane
-@dirrm System/Library/Bundles/TimeZone.prefPane/Resources/English.lproj/TimeZone.gorm
-@dirrm System/Library/Bundles/TimeZone.prefPane/Resources/English.lproj
-@dirrm System/Library/Bundles/TimeZone.prefPane/Resources
-@dirrm System/Library/Bundles/TimeZone.prefPane
-@dirrm System/Library/Bundles/ModifierKeys.prefPane/Resources/English.lproj/ModifierKeys.gorm
-@dirrm System/Library/Bundles/ModifierKeys.prefPane/Resources/English.lproj
-@dirrm System/Library/Bundles/ModifierKeys.prefPane/Resources
-@dirrm System/Library/Bundles/ModifierKeys.prefPane
-@dirrm System/Library/Bundles/FileSystem.prefPane/Resources/English.lproj/FileSystem.gorm
-@dirrm System/Library/Bundles/FileSystem.prefPane/Resources/English.lproj
-@dirrm System/Library/Bundles/FileSystem.prefPane/Resources
-@dirrm System/Library/Bundles/FileSystem.prefPane
-@dirrm System/Library/Bundles/Defaults.prefPane/Resources/English.lproj/Defaults.gorm
-@dirrm System/Library/Bundles/Defaults.prefPane/Resources/English.lproj
-@dirrm System/Library/Bundles/Defaults.prefPane/Resources
-@dirrm System/Library/Bundles/Defaults.prefPane
-@dirrm System/Applications/SystemPreferences.app/Resources/English.lproj/SystemPreferences.gorm
-@dirrm System/Applications/SystemPreferences.app/Resources/English.lproj
-@dirrm System/Applications/SystemPreferences.app/Resources
-@dirrm System/Applications/SystemPreferences.app
+GNUstep/System/Applications/SystemPreferences.app/Resources/English.lproj/SystemPreferences.gorm/data.classes
+GNUstep/System/Applications/SystemPreferences.app/Resources/English.lproj/SystemPreferences.gorm/data.info
+GNUstep/System/Applications/SystemPreferences.app/Resources/English.lproj/SystemPreferences.gorm/objects.gorm
+GNUstep/System/Applications/SystemPreferences.app/Resources/Info-gnustep.plist
+GNUstep/System/Applications/SystemPreferences.app/Resources/SystemPreferences.desktop
+GNUstep/System/Applications/SystemPreferences.app/Resources/SystemPreferences.tiff
+GNUstep/System/Applications/SystemPreferences.app/SystemPreferences
+GNUstep/System/Applications/SystemPreferences.app/stamp.make
+GNUstep/System/Library/Bundles/Defaults.prefPane/Defaults
+GNUstep/System/Library/Bundles/Defaults.prefPane/Resources/Defaults.tiff
+GNUstep/System/Library/Bundles/Defaults.prefPane/Resources/English.lproj/Defaults.gorm/data.classes
+GNUstep/System/Library/Bundles/Defaults.prefPane/Resources/English.lproj/Defaults.gorm/data.info
+GNUstep/System/Library/Bundles/Defaults.prefPane/Resources/English.lproj/Defaults.gorm/objects.gorm
+GNUstep/System/Library/Bundles/Defaults.prefPane/Resources/English.lproj/Defaults.plist
+GNUstep/System/Library/Bundles/Defaults.prefPane/Resources/Info-gnustep.plist
+GNUstep/System/Library/Bundles/Defaults.prefPane/Resources/Info.plist
+GNUstep/System/Library/Bundles/Defaults.prefPane/stamp.make
+GNUstep/System/Library/Bundles/FileSystem.prefPane/FileSystem
+GNUstep/System/Library/Bundles/FileSystem.prefPane/Resources/English.lproj/FileSystem.gorm/data.classes
+GNUstep/System/Library/Bundles/FileSystem.prefPane/Resources/English.lproj/FileSystem.gorm/data.info
+GNUstep/System/Library/Bundles/FileSystem.prefPane/Resources/English.lproj/FileSystem.gorm/objects.gorm
+GNUstep/System/Library/Bundles/FileSystem.prefPane/Resources/FileSystem.tiff
+GNUstep/System/Library/Bundles/FileSystem.prefPane/Resources/Info-gnustep.plist
+GNUstep/System/Library/Bundles/FileSystem.prefPane/Resources/Info.plist
+GNUstep/System/Library/Bundles/FileSystem.prefPane/stamp.make
+GNUstep/System/Library/Bundles/ModifierKeys.prefPane/ModifierKeys
+GNUstep/System/Library/Bundles/ModifierKeys.prefPane/Resources/English.lproj/ModifierKeys.gorm/data.classes
+GNUstep/System/Library/Bundles/ModifierKeys.prefPane/Resources/English.lproj/ModifierKeys.gorm/data.info
+GNUstep/System/Library/Bundles/ModifierKeys.prefPane/Resources/English.lproj/ModifierKeys.gorm/objects.gorm
+GNUstep/System/Library/Bundles/ModifierKeys.prefPane/Resources/Info-gnustep.plist
+GNUstep/System/Library/Bundles/ModifierKeys.prefPane/Resources/Info.plist
+GNUstep/System/Library/Bundles/ModifierKeys.prefPane/Resources/ModifierKeys.tiff
+GNUstep/System/Library/Bundles/ModifierKeys.prefPane/stamp.make
+GNUstep/System/Library/Bundles/TimeZone.prefPane/Resources/English.lproj/TimeZone.gorm/data.classes
+GNUstep/System/Library/Bundles/TimeZone.prefPane/Resources/English.lproj/TimeZone.gorm/data.info
+GNUstep/System/Library/Bundles/TimeZone.prefPane/Resources/English.lproj/TimeZone.gorm/objects.gorm
+GNUstep/System/Library/Bundles/TimeZone.prefPane/Resources/Info-gnustep.plist
+GNUstep/System/Library/Bundles/TimeZone.prefPane/Resources/Info.plist
+GNUstep/System/Library/Bundles/TimeZone.prefPane/Resources/TimeZone.tiff
+GNUstep/System/Library/Bundles/TimeZone.prefPane/Resources/map.tiff
+GNUstep/System/Library/Bundles/TimeZone.prefPane/Resources/zones.db
+GNUstep/System/Library/Bundles/TimeZone.prefPane/TimeZone
+GNUstep/System/Library/Bundles/TimeZone.prefPane/stamp.make
+GNUstep/System/Library/Bundles/Volumes.prefPane/Resources/English.lproj/Volumes.gorm/data.classes
+GNUstep/System/Library/Bundles/Volumes.prefPane/Resources/English.lproj/Volumes.gorm/data.info
+GNUstep/System/Library/Bundles/Volumes.prefPane/Resources/English.lproj/Volumes.gorm/objects.gorm
+GNUstep/System/Library/Bundles/Volumes.prefPane/Resources/Info-gnustep.plist
+GNUstep/System/Library/Bundles/Volumes.prefPane/Resources/Info.plist
+GNUstep/System/Library/Bundles/Volumes.prefPane/Resources/Volumes.tiff
+GNUstep/System/Library/Bundles/Volumes.prefPane/Volumes
+GNUstep/System/Library/Bundles/Volumes.prefPane/stamp.make
+GNUstep/System/Tools/SystemPreferences
+@dirrm GNUstep/System/Library/Bundles/Volumes.prefPane/Resources/English.lproj/Volumes.gorm
+@dirrm GNUstep/System/Library/Bundles/Volumes.prefPane/Resources/English.lproj
+@dirrm GNUstep/System/Library/Bundles/Volumes.prefPane/Resources
+@dirrm GNUstep/System/Library/Bundles/Volumes.prefPane
+@dirrm GNUstep/System/Library/Bundles/TimeZone.prefPane/Resources/English.lproj/TimeZone.gorm
+@dirrm GNUstep/System/Library/Bundles/TimeZone.prefPane/Resources/English.lproj
+@dirrm GNUstep/System/Library/Bundles/TimeZone.prefPane/Resources
+@dirrm GNUstep/System/Library/Bundles/TimeZone.prefPane
+@dirrm GNUstep/System/Library/Bundles/ModifierKeys.prefPane/Resources/English.lproj/ModifierKeys.gorm
+@dirrm GNUstep/System/Library/Bundles/ModifierKeys.prefPane/Resources/English.lproj
+@dirrm GNUstep/System/Library/Bundles/ModifierKeys.prefPane/Resources
+@dirrm GNUstep/System/Library/Bundles/ModifierKeys.prefPane
+@dirrm GNUstep/System/Library/Bundles/FileSystem.prefPane/Resources/English.lproj/FileSystem.gorm
+@dirrm GNUstep/System/Library/Bundles/FileSystem.prefPane/Resources/English.lproj
+@dirrm GNUstep/System/Library/Bundles/FileSystem.prefPane/Resources
+@dirrm GNUstep/System/Library/Bundles/FileSystem.prefPane
+@dirrm GNUstep/System/Library/Bundles/Defaults.prefPane/Resources/English.lproj/Defaults.gorm
+@dirrm GNUstep/System/Library/Bundles/Defaults.prefPane/Resources/English.lproj
+@dirrm GNUstep/System/Library/Bundles/Defaults.prefPane/Resources
+@dirrm GNUstep/System/Library/Bundles/Defaults.prefPane
+@dirrm GNUstep/System/Applications/SystemPreferences.app/Resources/English.lproj/SystemPreferences.gorm
+@dirrm GNUstep/System/Applications/SystemPreferences.app/Resources/English.lproj
+@dirrm GNUstep/System/Applications/SystemPreferences.app/Resources
+@dirrm GNUstep/System/Applications/SystemPreferences.app