2 files changed, 70 insertions, 71 deletions

diff --git a/deskutils/toolbox/Makefile b/deskutils/toolbox/Makefile
index a45eeef8d81f..2aba2a67b05a 100644
--- a/deskutils/toolbox/Makefile
+++ b/deskutils/toolbox/Makefile
@@ -18,7 +18,6 @@ MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Collection of tools for GNUstep
 
 USE_GNUSTEP=	yes
-USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
diff --git a/deskutils/toolbox/pkg-plist b/deskutils/toolbox/pkg-plist
index 97a198828e9f..3f19048c055e 100644
--- a/deskutils/toolbox/pkg-plist
+++ b/deskutils/toolbox/pkg-plist
@@ -1,70 +1,70 @@
-Local/Applications/Toolbox.app/Resources/Info-gnustep.plist
-Local/Applications/Toolbox.app/Resources/Toolbox.desktop
-Local/Applications/Toolbox.app/Resources/Toolbox.tiff
-Local/Applications/Toolbox.app/Resources/ToolboxDefaults.plist
-Local/Applications/Toolbox.app/Resources/ToolboxHelp.rtf
-Local/Applications/Toolbox.app/Resources/ToolboxInfo.plist
-Local/Applications/Toolbox.app/Toolbox
-Local/Applications/Toolbox.app/stamp.make
-Local/Library/Toolbox/Calculator.toolbox/Calculator
-Local/Library/Toolbox/Calculator.toolbox/Resources/Calculator.tiff
-Local/Library/Toolbox/Calculator.toolbox/Resources/CalculatorHelp.rtf
-Local/Library/Toolbox/Calculator.toolbox/Resources/CalculatorInfo.plist
-Local/Library/Toolbox/Calculator.toolbox/Resources/Info-gnustep.plist
-Local/Library/Toolbox/Calculator.toolbox/stamp.make
-Local/Library/Toolbox/Calendar.toolbox/Calendar
-Local/Library/Toolbox/Calendar.toolbox/Resources/Calendar.tiff
-Local/Library/Toolbox/Calendar.toolbox/Resources/CalendarHelp.rtf
-Local/Library/Toolbox/Calendar.toolbox/Resources/CalendarInfo.plist
-Local/Library/Toolbox/Calendar.toolbox/Resources/Info-gnustep.plist
-Local/Library/Toolbox/Calendar.toolbox/stamp.make
-Local/Library/Toolbox/Commander.toolbox/Commander
-Local/Library/Toolbox/Commander.toolbox/Resources/Commander.tiff
-Local/Library/Toolbox/Commander.toolbox/Resources/CommanderDefaults.plist
-Local/Library/Toolbox/Commander.toolbox/Resources/CommanderHelp.rtf
-Local/Library/Toolbox/Commander.toolbox/Resources/CommanderInfo.plist
-Local/Library/Toolbox/Commander.toolbox/Resources/Info-gnustep.plist
-Local/Library/Toolbox/Commander.toolbox/stamp.make
-Local/Library/Toolbox/DefaultEditor.toolbox/DefaultEditor
-Local/Library/Toolbox/DefaultEditor.toolbox/Resources/DefaultEditorHelp.rtf
-Local/Library/Toolbox/DefaultEditor.toolbox/Resources/DefaultEditorInfo.plist
-Local/Library/Toolbox/DefaultEditor.toolbox/Resources/Info-gnustep.plist
-Local/Library/Toolbox/DefaultEditor.toolbox/stamp.make
-Local/Library/Toolbox/InternetSearch.toolbox/InternetSearch
-Local/Library/Toolbox/InternetSearch.toolbox/Resources/Info-gnustep.plist
-Local/Library/Toolbox/InternetSearch.toolbox/Resources/InternetSearchDefaults.plist
-Local/Library/Toolbox/InternetSearch.toolbox/Resources/InternetSearchHelp.rtf
-Local/Library/Toolbox/InternetSearch.toolbox/Resources/InternetSearchInfo.plist
-Local/Library/Toolbox/InternetSearch.toolbox/stamp.make
-Local/Library/Toolbox/Ploplet.toolbox/Ploplet
-Local/Library/Toolbox/Ploplet.toolbox/Resources/Info-gnustep.plist
-Local/Library/Toolbox/Ploplet.toolbox/Resources/Ploplet.tiff
-Local/Library/Toolbox/Ploplet.toolbox/Resources/PlopletDefaults.plist
-Local/Library/Toolbox/Ploplet.toolbox/Resources/PlopletHelp.rtf
-Local/Library/Toolbox/Ploplet.toolbox/Resources/PlopletInfo.plist
-Local/Library/Toolbox/Ploplet.toolbox/stamp.make
-Local/Library/Toolbox/Preference.toolbox/Preference
-Local/Library/Toolbox/Preference.toolbox/Resources/Info-gnustep.plist
-Local/Library/Toolbox/Preference.toolbox/Resources/PreferenceDefaults.plist
-Local/Library/Toolbox/Preference.toolbox/Resources/PreferenceHelp.rtf
-Local/Library/Toolbox/Preference.toolbox/Resources/PreferenceInfo.plist
-Local/Library/Toolbox/Preference.toolbox/Resources/Toolbox.tiff
-Local/Library/Toolbox/Preference.toolbox/stamp.make
-Local/Tools/Toolbox
-@dirrm Local/Library/Toolbox/Preference.toolbox/Resources
-@dirrm Local/Library/Toolbox/Preference.toolbox
-@dirrm Local/Library/Toolbox/Ploplet.toolbox/Resources
-@dirrm Local/Library/Toolbox/Ploplet.toolbox
-@dirrm Local/Library/Toolbox/InternetSearch.toolbox/Resources
-@dirrm Local/Library/Toolbox/InternetSearch.toolbox
-@dirrm Local/Library/Toolbox/DefaultEditor.toolbox/Resources
-@dirrm Local/Library/Toolbox/DefaultEditor.toolbox
-@dirrm Local/Library/Toolbox/Commander.toolbox/Resources
-@dirrm Local/Library/Toolbox/Commander.toolbox
-@dirrm Local/Library/Toolbox/Calendar.toolbox/Resources
-@dirrm Local/Library/Toolbox/Calendar.toolbox
-@dirrm Local/Library/Toolbox/Calculator.toolbox/Resources
-@dirrm Local/Library/Toolbox/Calculator.toolbox
-@dirrm Local/Library/Toolbox
-@dirrm Local/Applications/Toolbox.app/Resources
-@dirrm Local/Applications/Toolbox.app
+GNUstep/Local/Applications/Toolbox.app/Resources/Info-gnustep.plist
+GNUstep/Local/Applications/Toolbox.app/Resources/Toolbox.desktop
+GNUstep/Local/Applications/Toolbox.app/Resources/Toolbox.tiff
+GNUstep/Local/Applications/Toolbox.app/Resources/ToolboxDefaults.plist
+GNUstep/Local/Applications/Toolbox.app/Resources/ToolboxHelp.rtf
+GNUstep/Local/Applications/Toolbox.app/Resources/ToolboxInfo.plist
+GNUstep/Local/Applications/Toolbox.app/Toolbox
+GNUstep/Local/Applications/Toolbox.app/stamp.make
+GNUstep/Local/Library/Toolbox/Calculator.toolbox/Calculator
+GNUstep/Local/Library/Toolbox/Calculator.toolbox/Resources/Calculator.tiff
+GNUstep/Local/Library/Toolbox/Calculator.toolbox/Resources/CalculatorHelp.rtf
+GNUstep/Local/Library/Toolbox/Calculator.toolbox/Resources/CalculatorInfo.plist
+GNUstep/Local/Library/Toolbox/Calculator.toolbox/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Toolbox/Calculator.toolbox/stamp.make
+GNUstep/Local/Library/Toolbox/Calendar.toolbox/Calendar
+GNUstep/Local/Library/Toolbox/Calendar.toolbox/Resources/Calendar.tiff
+GNUstep/Local/Library/Toolbox/Calendar.toolbox/Resources/CalendarHelp.rtf
+GNUstep/Local/Library/Toolbox/Calendar.toolbox/Resources/CalendarInfo.plist
+GNUstep/Local/Library/Toolbox/Calendar.toolbox/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Toolbox/Calendar.toolbox/stamp.make
+GNUstep/Local/Library/Toolbox/Commander.toolbox/Commander
+GNUstep/Local/Library/Toolbox/Commander.toolbox/Resources/Commander.tiff
+GNUstep/Local/Library/Toolbox/Commander.toolbox/Resources/CommanderDefaults.plist
+GNUstep/Local/Library/Toolbox/Commander.toolbox/Resources/CommanderHelp.rtf
+GNUstep/Local/Library/Toolbox/Commander.toolbox/Resources/CommanderInfo.plist
+GNUstep/Local/Library/Toolbox/Commander.toolbox/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Toolbox/Commander.toolbox/stamp.make
+GNUstep/Local/Library/Toolbox/DefaultEditor.toolbox/DefaultEditor
+GNUstep/Local/Library/Toolbox/DefaultEditor.toolbox/Resources/DefaultEditorHelp.rtf
+GNUstep/Local/Library/Toolbox/DefaultEditor.toolbox/Resources/DefaultEditorInfo.plist
+GNUstep/Local/Library/Toolbox/DefaultEditor.toolbox/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Toolbox/DefaultEditor.toolbox/stamp.make
+GNUstep/Local/Library/Toolbox/InternetSearch.toolbox/InternetSearch
+GNUstep/Local/Library/Toolbox/InternetSearch.toolbox/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Toolbox/InternetSearch.toolbox/Resources/InternetSearchDefaults.plist
+GNUstep/Local/Library/Toolbox/InternetSearch.toolbox/Resources/InternetSearchHelp.rtf
+GNUstep/Local/Library/Toolbox/InternetSearch.toolbox/Resources/InternetSearchInfo.plist
+GNUstep/Local/Library/Toolbox/InternetSearch.toolbox/stamp.make
+GNUstep/Local/Library/Toolbox/Ploplet.toolbox/Ploplet
+GNUstep/Local/Library/Toolbox/Ploplet.toolbox/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Toolbox/Ploplet.toolbox/Resources/Ploplet.tiff
+GNUstep/Local/Library/Toolbox/Ploplet.toolbox/Resources/PlopletDefaults.plist
+GNUstep/Local/Library/Toolbox/Ploplet.toolbox/Resources/PlopletHelp.rtf
+GNUstep/Local/Library/Toolbox/Ploplet.toolbox/Resources/PlopletInfo.plist
+GNUstep/Local/Library/Toolbox/Ploplet.toolbox/stamp.make
+GNUstep/Local/Library/Toolbox/Preference.toolbox/Preference
+GNUstep/Local/Library/Toolbox/Preference.toolbox/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Toolbox/Preference.toolbox/Resources/PreferenceDefaults.plist
+GNUstep/Local/Library/Toolbox/Preference.toolbox/Resources/PreferenceHelp.rtf
+GNUstep/Local/Library/Toolbox/Preference.toolbox/Resources/PreferenceInfo.plist
+GNUstep/Local/Library/Toolbox/Preference.toolbox/Resources/Toolbox.tiff
+GNUstep/Local/Library/Toolbox/Preference.toolbox/stamp.make
+GNUstep/Local/Tools/Toolbox
+@dirrm GNUstep/Local/Library/Toolbox/Preference.toolbox/Resources
+@dirrm GNUstep/Local/Library/Toolbox/Preference.toolbox
+@dirrm GNUstep/Local/Library/Toolbox/Ploplet.toolbox/Resources
+@dirrm GNUstep/Local/Library/Toolbox/Ploplet.toolbox
+@dirrm GNUstep/Local/Library/Toolbox/InternetSearch.toolbox/Resources
+@dirrm GNUstep/Local/Library/Toolbox/InternetSearch.toolbox
+@dirrm GNUstep/Local/Library/Toolbox/DefaultEditor.toolbox/Resources
+@dirrm GNUstep/Local/Library/Toolbox/DefaultEditor.toolbox
+@dirrm GNUstep/Local/Library/Toolbox/Commander.toolbox/Resources
+@dirrm GNUstep/Local/Library/Toolbox/Commander.toolbox
+@dirrm GNUstep/Local/Library/Toolbox/Calendar.toolbox/Resources
+@dirrm GNUstep/Local/Library/Toolbox/Calendar.toolbox
+@dirrm GNUstep/Local/Library/Toolbox/Calculator.toolbox/Resources
+@dirrm GNUstep/Local/Library/Toolbox/Calculator.toolbox
+@dirrm GNUstep/Local/Library/Toolbox
+@dirrm GNUstep/Local/Applications/Toolbox.app/Resources
+@dirrm GNUstep/Local/Applications/Toolbox.app