- drop USE_GNUSTEP_PREFIX

13 files changed, 129 insertions, 137 deletions

diff --git a/x11/etoile-idle/Makefile b/x11/etoile-idle/Makefile
index 22d29820aaaa..2e7fbfefd768 100644
--- a/x11/etoile-idle/Makefile
+++ b/x11/etoile-idle/Makefile
@@ -19,7 +19,6 @@ BUILD_DEPENDS=	${LOCALBASE}/include/X11/extensions/scrnsaver.h:${PORTSDIR}/x11/s
 
 USE_BZIP2=	yes
 USE_GNUSTEP=	yes
-USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
@@ -28,7 +27,7 @@ USE_XORG=	xscrnsaver
 
 WRKSRC=	${WRKDIR}/Etoile-${PORTVERSION}
 USE_GNUSTEP_MAKE_DIRS+=	Services/Private/Idle
-PLIST_FILES=	System/Tools/Idle
+PLIST_FILES=	GNUstep/System/Tools/Idle
 
 XWINDOWSERVERKIT_PORT?=		x11/etoile-xwindowserverkit
 
diff --git a/x11/etoile-iterm/Makefile b/x11/etoile-iterm/Makefile
index c6fc4d353eae..2bc6c42eb459 100644
--- a/x11/etoile-iterm/Makefile
+++ b/x11/etoile-iterm/Makefile
@@ -19,7 +19,6 @@ COMMENT=	Etoile Project Terminal application
 
 USE_BZIP2=	yes
 USE_GNUSTEP=	yes
-USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
diff --git a/x11/etoile-iterm/pkg-plist b/x11/etoile-iterm/pkg-plist
index a22178be2284..7a8fb6243d35 100644
--- a/x11/etoile-iterm/pkg-plist
+++ b/x11/etoile-iterm/pkg-plist
@@ -1,15 +1,15 @@
-Local/Applications/iTerm.app/Resources/FreeMono.ttf
-Local/Applications/iTerm.app/Resources/FreeMonoBold.ttf
-Local/Applications/iTerm.app/Resources/FreeMonoBoldOblique.ttf
-Local/Applications/iTerm.app/Resources/FreeMonoOblique.ttf
-Local/Applications/iTerm.app/Resources/Info-gnustep.plist
-Local/Applications/iTerm.app/Resources/Profiles.plist
-Local/Applications/iTerm.app/Resources/iTerm.desktop
-Local/Applications/iTerm.app/Resources/iTerm.iconheader
-Local/Applications/iTerm.app/Resources/iTerm.plist
-Local/Applications/iTerm.app/Resources/iTerm_Framework.plist
-Local/Applications/iTerm.app/iTerm
-Local/Applications/iTerm.app/stamp.make
-Local/Tools/iTerm
-@dirrm Local/Applications/iTerm.app/Resources
-@dirrm Local/Applications/iTerm.app
+GNUstep/Local/Applications/iTerm.app/Resources/FreeMono.ttf
+GNUstep/Local/Applications/iTerm.app/Resources/FreeMonoBold.ttf
+GNUstep/Local/Applications/iTerm.app/Resources/FreeMonoBoldOblique.ttf
+GNUstep/Local/Applications/iTerm.app/Resources/FreeMonoOblique.ttf
+GNUstep/Local/Applications/iTerm.app/Resources/Info-gnustep.plist
+GNUstep/Local/Applications/iTerm.app/Resources/Profiles.plist
+GNUstep/Local/Applications/iTerm.app/Resources/iTerm.desktop
+GNUstep/Local/Applications/iTerm.app/Resources/iTerm.iconheader
+GNUstep/Local/Applications/iTerm.app/Resources/iTerm.plist
+GNUstep/Local/Applications/iTerm.app/Resources/iTerm_Framework.plist
+GNUstep/Local/Applications/iTerm.app/iTerm
+GNUstep/Local/Applications/iTerm.app/stamp.make
+GNUstep/Local/Tools/iTerm
+@dirrm GNUstep/Local/Applications/iTerm.app/Resources
+@dirrm GNUstep/Local/Applications/iTerm.app
diff --git a/x11/etoile-xwindowserverkit/Makefile b/x11/etoile-xwindowserverkit/Makefile
index c074e822b32b..a8c9537f7cc4 100644
--- a/x11/etoile-xwindowserverkit/Makefile
+++ b/x11/etoile-xwindowserverkit/Makefile
@@ -17,7 +17,6 @@ COMMENT=	Etoile Project XWindowServerKit frameowrk
 
 USE_BZIP2=	yes
 USE_GNUSTEP=	yes
-USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
diff --git a/x11/etoile-xwindowserverkit/pkg-plist b/x11/etoile-xwindowserverkit/pkg-plist
index 88b2c072fc22..a456e7eb0c9b 100644
--- a/x11/etoile-xwindowserverkit/pkg-plist
+++ b/x11/etoile-xwindowserverkit/pkg-plist
@@ -1,25 +1,25 @@
-System/Library/Frameworks/XWindowServerKit.framework/Headers
-System/Library/Frameworks/XWindowServerKit.framework/Resources
-System/Library/Frameworks/XWindowServerKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/XFunctions.h
-System/Library/Frameworks/XWindowServerKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/XScreen.h
-System/Library/Frameworks/XWindowServerKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/XWindow.h
-System/Library/Frameworks/XWindowServerKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/gnustep.h
-System/Library/Frameworks/XWindowServerKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist
-System/Library/Frameworks/XWindowServerKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/ScriptingInfo.plist
-System/Library/Frameworks/XWindowServerKit.framework/Versions/%%MAJORLIBVERSION%%/XWindowServerKit
-System/Library/Frameworks/XWindowServerKit.framework/Versions/%%MAJORLIBVERSION%%/libXWindowServerKit.so
-System/Library/Frameworks/XWindowServerKit.framework/Versions/%%MAJORLIBVERSION%%/libXWindowServerKit.so.%%MAJORLIBVERSION%%
-System/Library/Frameworks/XWindowServerKit.framework/Versions/%%MAJORLIBVERSION%%/libXWindowServerKit.so.%%LIBVERSION%%
-System/Library/Frameworks/XWindowServerKit.framework/Versions/Current
-System/Library/Frameworks/XWindowServerKit.framework/XWindowServerKit
-System/Library/Frameworks/XWindowServerKit.framework/XWindowServerKit.framework
-System/Library/Frameworks/XWindowServerKit.framework/libXWindowServerKit.so
-System/Library/Headers/XWindowServerKit
-System/Library/Libraries/libXWindowServerKit.so
-System/Library/Libraries/libXWindowServerKit.so.%%MAJORLIBVERSION%%
-System/Library/Libraries/libXWindowServerKit.so.%%LIBVERSION%%
-@dirrm System/Library/Frameworks/XWindowServerKit.framework/Versions/%%MAJORLIBVERSION%%/Resources
-@dirrm System/Library/Frameworks/XWindowServerKit.framework/Versions/%%MAJORLIBVERSION%%/Headers
-@dirrm System/Library/Frameworks/XWindowServerKit.framework/Versions/%%MAJORLIBVERSION%%
-@dirrm System/Library/Frameworks/XWindowServerKit.framework/Versions
-@dirrm System/Library/Frameworks/XWindowServerKit.framework
+GNUstep/System/Library/Frameworks/XWindowServerKit.framework/Headers
+GNUstep/System/Library/Frameworks/XWindowServerKit.framework/Resources
+GNUstep/System/Library/Frameworks/XWindowServerKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/XFunctions.h
+GNUstep/System/Library/Frameworks/XWindowServerKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/XScreen.h
+GNUstep/System/Library/Frameworks/XWindowServerKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/XWindow.h
+GNUstep/System/Library/Frameworks/XWindowServerKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/gnustep.h
+GNUstep/System/Library/Frameworks/XWindowServerKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist
+GNUstep/System/Library/Frameworks/XWindowServerKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/ScriptingInfo.plist
+GNUstep/System/Library/Frameworks/XWindowServerKit.framework/Versions/%%MAJORLIBVERSION%%/XWindowServerKit
+GNUstep/System/Library/Frameworks/XWindowServerKit.framework/Versions/%%MAJORLIBVERSION%%/libXWindowServerKit.so
+GNUstep/System/Library/Frameworks/XWindowServerKit.framework/Versions/%%MAJORLIBVERSION%%/libXWindowServerKit.so.%%MAJORLIBVERSION%%
+GNUstep/System/Library/Frameworks/XWindowServerKit.framework/Versions/%%MAJORLIBVERSION%%/libXWindowServerKit.so.%%LIBVERSION%%
+GNUstep/System/Library/Frameworks/XWindowServerKit.framework/Versions/Current
+GNUstep/System/Library/Frameworks/XWindowServerKit.framework/XWindowServerKit
+GNUstep/System/Library/Frameworks/XWindowServerKit.framework/XWindowServerKit.framework
+GNUstep/System/Library/Frameworks/XWindowServerKit.framework/libXWindowServerKit.so
+GNUstep/System/Library/Headers/XWindowServerKit
+GNUstep/System/Library/Libraries/libXWindowServerKit.so
+GNUstep/System/Library/Libraries/libXWindowServerKit.so.%%MAJORLIBVERSION%%
+GNUstep/System/Library/Libraries/libXWindowServerKit.so.%%LIBVERSION%%
+@dirrm GNUstep/System/Library/Frameworks/XWindowServerKit.framework/Versions/%%MAJORLIBVERSION%%/Resources
+@dirrm GNUstep/System/Library/Frameworks/XWindowServerKit.framework/Versions/%%MAJORLIBVERSION%%/Headers
+@dirrm GNUstep/System/Library/Frameworks/XWindowServerKit.framework/Versions/%%MAJORLIBVERSION%%
+@dirrm GNUstep/System/Library/Frameworks/XWindowServerKit.framework/Versions
+@dirrm GNUstep/System/Library/Frameworks/XWindowServerKit.framework
diff --git a/x11/etoile/Makefile b/x11/etoile/Makefile
index 87b662211230..340d05a17e22 100644
--- a/x11/etoile/Makefile
+++ b/x11/etoile/Makefile
@@ -18,7 +18,6 @@ COMMENT=	Metaport for Etoile desktop
 NO_BUILD=	yes
 NO_INSTALL=	yes
 USE_GNUSTEP=	yes
-USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BASE=	yes
 USE_GNUSTEP_GUI=	yes
 USE_GNUSTEP_BACK=	yes
diff --git a/x11/gnustep-app/Makefile b/x11/gnustep-app/Makefile
index 12d0bf3cf90a..2359f6c03bb4 100644
--- a/x11/gnustep-app/Makefile
+++ b/x11/gnustep-app/Makefile
@@ -19,7 +19,6 @@ COMMENT=	Metaport for GNUstep applications
 NO_BUILD=	yes
 NO_INSTALL=	yes
 USE_GNUSTEP=	yes
-USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BASE=	yes
 USE_GNUSTEP_GUI=	yes
 USE_GNUSTEP_BACK=	yes
diff --git a/x11/gskrab/Makefile b/x11/gskrab/Makefile
index a57a0cc76aed..ab018affc768 100644
--- a/x11/gskrab/Makefile
+++ b/x11/gskrab/Makefile
@@ -16,7 +16,6 @@ MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	GNUstep Keyboard Grabber
 
 USE_GNUSTEP=	yes
-USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
diff --git a/x11/gskrab/pkg-plist b/x11/gskrab/pkg-plist
index 6ea5d3cfe741..546432b33807 100644
--- a/x11/gskrab/pkg-plist
+++ b/x11/gskrab/pkg-plist
@@ -1,24 +1,24 @@
-Local/Library/Frameworks/GSKrab.framework/GSKrab
-Local/Library/Frameworks/GSKrab.framework/Headers
-Local/Library/Frameworks/GSKrab.framework/Resources
-Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/GSKrab
-Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/Headers/GSKrab.h
-Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/Headers/GSKrabClient.h
-Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/Headers/GSKrabKeyCode.h
-Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/Headers/GSKrabServer.h
-Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/Resources/Info-gnustep.plist
-Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/libGSKrab.so
-Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/libGSKrab.so.%%MAJORVERSION%%
-Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/libGSKrab.so.%%VERSION%%
-Local/Library/Frameworks/GSKrab.framework/Versions/Current
-Local/Library/Frameworks/GSKrab.framework/libGSKrab.so
-Local/Library/Headers/GSKrab
-Local/Library/Libraries/libGSKrab.so
-Local/Library/Libraries/libGSKrab.so.%%MAJORVERSION%%
-Local/Library/Libraries/libGSKrab.so.%%VERSION%%
-Local/Tools/gsks
-@dirrm Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/Resources
-@dirrm Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/Headers
-@dirrm Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%
-@dirrm Local/Library/Frameworks/GSKrab.framework/Versions
-@dirrm Local/Library/Frameworks/GSKrab.framework
+GNUstep/Local/Library/Frameworks/GSKrab.framework/GSKrab
+GNUstep/Local/Library/Frameworks/GSKrab.framework/Headers
+GNUstep/Local/Library/Frameworks/GSKrab.framework/Resources
+GNUstep/Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/GSKrab
+GNUstep/Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/Headers/GSKrab.h
+GNUstep/Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/Headers/GSKrabClient.h
+GNUstep/Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/Headers/GSKrabKeyCode.h
+GNUstep/Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/Headers/GSKrabServer.h
+GNUstep/Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/libGSKrab.so
+GNUstep/Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/libGSKrab.so.%%MAJORVERSION%%
+GNUstep/Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/libGSKrab.so.%%VERSION%%
+GNUstep/Local/Library/Frameworks/GSKrab.framework/Versions/Current
+GNUstep/Local/Library/Frameworks/GSKrab.framework/libGSKrab.so
+GNUstep/Local/Library/Headers/GSKrab
+GNUstep/Local/Library/Libraries/libGSKrab.so
+GNUstep/Local/Library/Libraries/libGSKrab.so.%%MAJORVERSION%%
+GNUstep/Local/Library/Libraries/libGSKrab.so.%%VERSION%%
+GNUstep/Local/Tools/gsks
+@dirrm GNUstep/Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/Resources
+@dirrm GNUstep/Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/Headers
+@dirrm GNUstep/Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%
+@dirrm GNUstep/Local/Library/Frameworks/GSKrab.framework/Versions
+@dirrm GNUstep/Local/Library/Frameworks/GSKrab.framework
diff --git a/x11/innerspace/Makefile b/x11/innerspace/Makefile
index e7b3ed4b585d..d5e976556b2d 100644
--- a/x11/innerspace/Makefile
+++ b/x11/innerspace/Makefile
@@ -18,7 +18,6 @@ MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	GNUstep screensaver
 
 USE_GNUSTEP=	yes
-USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
diff --git a/x11/innerspace/pkg-plist b/x11/innerspace/pkg-plist
index 478f4565a72d..00f1d303fa95 100644
--- a/x11/innerspace/pkg-plist
+++ b/x11/innerspace/pkg-plist
@@ -1,32 +1,32 @@
-Local/Applications/InnerSpace.app/InnerSpace
-Local/Applications/InnerSpace.app/Resources/Black.InnerSpace/Black
-Local/Applications/InnerSpace.app/Resources/Black.InnerSpace/Resources/Info-gnustep.plist
-Local/Applications/InnerSpace.app/Resources/Black.InnerSpace/stamp.make
-Local/Applications/InnerSpace.app/Resources/Boxes.InnerSpace/Boxes
-Local/Applications/InnerSpace.app/Resources/Boxes.InnerSpace/Resources/Info-gnustep.plist
-Local/Applications/InnerSpace.app/Resources/Boxes.InnerSpace/stamp.make
-Local/Applications/InnerSpace.app/Resources/English.lproj/InnerSpace.gorm/data.classes
-Local/Applications/InnerSpace.app/Resources/English.lproj/InnerSpace.gorm/data.info
-Local/Applications/InnerSpace.app/Resources/English.lproj/InnerSpace.gorm/objects.gorm
-Local/Applications/InnerSpace.app/Resources/Info-gnustep.plist
-Local/Applications/InnerSpace.app/Resources/InnerSpace.desktop
-Local/Applications/InnerSpace.app/Resources/InnerSpace.tiff
-Local/Applications/InnerSpace.app/Resources/NickSpace.InnerSpace/NickSpace
-Local/Applications/InnerSpace.app/Resources/NickSpace.InnerSpace/Resources/Info-gnustep.plist
-Local/Applications/InnerSpace.app/Resources/NickSpace.InnerSpace/Resources/NickSpace.gorm/data.classes
-Local/Applications/InnerSpace.app/Resources/NickSpace.InnerSpace/Resources/NickSpace.gorm/data.info
-Local/Applications/InnerSpace.app/Resources/NickSpace.InnerSpace/Resources/NickSpace.gorm/objects.gorm
-Local/Applications/InnerSpace.app/Resources/NickSpace.InnerSpace/stamp.make
-Local/Applications/InnerSpace.app/stamp.make
-Local/Tools/InnerSpace
-@dirrm Local/Applications/InnerSpace.app/Resources/NickSpace.InnerSpace/Resources/NickSpace.gorm
-@dirrm Local/Applications/InnerSpace.app/Resources/NickSpace.InnerSpace/Resources
-@dirrm Local/Applications/InnerSpace.app/Resources/NickSpace.InnerSpace
-@dirrm Local/Applications/InnerSpace.app/Resources/English.lproj/InnerSpace.gorm
-@dirrm Local/Applications/InnerSpace.app/Resources/English.lproj
-@dirrm Local/Applications/InnerSpace.app/Resources/Boxes.InnerSpace/Resources
-@dirrm Local/Applications/InnerSpace.app/Resources/Boxes.InnerSpace
-@dirrm Local/Applications/InnerSpace.app/Resources/Black.InnerSpace/Resources
-@dirrm Local/Applications/InnerSpace.app/Resources/Black.InnerSpace
-@dirrm Local/Applications/InnerSpace.app/Resources
-@dirrm Local/Applications/InnerSpace.app
+GNUstep/Local/Applications/InnerSpace.app/InnerSpace
+GNUstep/Local/Applications/InnerSpace.app/Resources/Black.InnerSpace/Black
+GNUstep/Local/Applications/InnerSpace.app/Resources/Black.InnerSpace/Resources/Info-gnustep.plist
+GNUstep/Local/Applications/InnerSpace.app/Resources/Black.InnerSpace/stamp.make
+GNUstep/Local/Applications/InnerSpace.app/Resources/Boxes.InnerSpace/Boxes
+GNUstep/Local/Applications/InnerSpace.app/Resources/Boxes.InnerSpace/Resources/Info-gnustep.plist
+GNUstep/Local/Applications/InnerSpace.app/Resources/Boxes.InnerSpace/stamp.make
+GNUstep/Local/Applications/InnerSpace.app/Resources/English.lproj/InnerSpace.gorm/data.classes
+GNUstep/Local/Applications/InnerSpace.app/Resources/English.lproj/InnerSpace.gorm/data.info
+GNUstep/Local/Applications/InnerSpace.app/Resources/English.lproj/InnerSpace.gorm/objects.gorm
+GNUstep/Local/Applications/InnerSpace.app/Resources/Info-gnustep.plist
+GNUstep/Local/Applications/InnerSpace.app/Resources/InnerSpace.desktop
+GNUstep/Local/Applications/InnerSpace.app/Resources/InnerSpace.tiff
+GNUstep/Local/Applications/InnerSpace.app/Resources/NickSpace.InnerSpace/NickSpace
+GNUstep/Local/Applications/InnerSpace.app/Resources/NickSpace.InnerSpace/Resources/Info-gnustep.plist
+GNUstep/Local/Applications/InnerSpace.app/Resources/NickSpace.InnerSpace/Resources/NickSpace.gorm/data.classes
+GNUstep/Local/Applications/InnerSpace.app/Resources/NickSpace.InnerSpace/Resources/NickSpace.gorm/data.info
+GNUstep/Local/Applications/InnerSpace.app/Resources/NickSpace.InnerSpace/Resources/NickSpace.gorm/objects.gorm
+GNUstep/Local/Applications/InnerSpace.app/Resources/NickSpace.InnerSpace/stamp.make
+GNUstep/Local/Applications/InnerSpace.app/stamp.make
+GNUstep/Local/Tools/InnerSpace
+@dirrm GNUstep/Local/Applications/InnerSpace.app/Resources/NickSpace.InnerSpace/Resources/NickSpace.gorm
+@dirrm GNUstep/Local/Applications/InnerSpace.app/Resources/NickSpace.InnerSpace/Resources
+@dirrm GNUstep/Local/Applications/InnerSpace.app/Resources/NickSpace.InnerSpace
+@dirrm GNUstep/Local/Applications/InnerSpace.app/Resources/English.lproj/InnerSpace.gorm
+@dirrm GNUstep/Local/Applications/InnerSpace.app/Resources/English.lproj
+@dirrm GNUstep/Local/Applications/InnerSpace.app/Resources/Boxes.InnerSpace/Resources
+@dirrm GNUstep/Local/Applications/InnerSpace.app/Resources/Boxes.InnerSpace
+@dirrm GNUstep/Local/Applications/InnerSpace.app/Resources/Black.InnerSpace/Resources
+@dirrm GNUstep/Local/Applications/InnerSpace.app/Resources/Black.InnerSpace
+@dirrm GNUstep/Local/Applications/InnerSpace.app/Resources
+@dirrm GNUstep/Local/Applications/InnerSpace.app
diff --git a/x11/terminal.app/Makefile b/x11/terminal.app/Makefile
index 1ca1ccf4a040..9c646080aa13 100644
--- a/x11/terminal.app/Makefile
+++ b/x11/terminal.app/Makefile
@@ -18,7 +18,6 @@ MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Terminal Emulator for GNUstep
 
 USE_GNUSTEP=	yes
-USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
diff --git a/x11/terminal.app/pkg-plist b/x11/terminal.app/pkg-plist
index 9e0bf7675209..85c189115f5b 100644
--- a/x11/terminal.app/pkg-plist
+++ b/x11/terminal.app/pkg-plist
@@ -1,32 +1,32 @@
-System/Applications/Terminal.app/Resources/DefaultTerminalServices.svcs
-System/Applications/Terminal.app/Resources/English.lproj/Localizable.strings
-System/Applications/Terminal.app/Resources/French.lproj/Localizable.strings
-System/Applications/Terminal.app/Resources/German.lproj/Localizable.strings
-System/Applications/Terminal.app/Resources/Hungarian.lproj/Localizable.strings
-System/Applications/Terminal.app/Resources/Info-gnustep.plist
-System/Applications/Terminal.app/Resources/Norwegian.lproj/Localizable.strings
-System/Applications/Terminal.app/Resources/Russian.lproj/Localizable.strings
-System/Applications/Terminal.app/Resources/Spanish.lproj/Localizable.strings
-System/Applications/Terminal.app/Resources/Swedish.lproj/Localizable.strings
-System/Applications/Terminal.app/Resources/Terminal.desktop
-System/Applications/Terminal.app/Resources/Terminal.tiff
-System/Applications/Terminal.app/Resources/TerminalInfo.plist
-System/Applications/Terminal.app/Resources/Turkish.lproj/Localizable.strings
-System/Applications/Terminal.app/Resources/cursor_filled.tiff
-System/Applications/Terminal.app/Resources/cursor_inverted.tiff
-System/Applications/Terminal.app/Resources/cursor_line.tiff
-System/Applications/Terminal.app/Resources/cursor_stroked.tiff
-System/Applications/Terminal.app/Terminal
-System/Applications/Terminal.app/stamp.make
-System/Tools/Terminal
-@dirrm System/Applications/Terminal.app/Resources/Turkish.lproj
-@dirrm System/Applications/Terminal.app/Resources/Swedish.lproj
-@dirrm System/Applications/Terminal.app/Resources/Spanish.lproj
-@dirrm System/Applications/Terminal.app/Resources/Russian.lproj
-@dirrm System/Applications/Terminal.app/Resources/Norwegian.lproj
-@dirrm System/Applications/Terminal.app/Resources/Hungarian.lproj
-@dirrm System/Applications/Terminal.app/Resources/German.lproj
-@dirrm System/Applications/Terminal.app/Resources/French.lproj
-@dirrm System/Applications/Terminal.app/Resources/English.lproj
-@dirrm System/Applications/Terminal.app/Resources
-@dirrm System/Applications/Terminal.app
+GNUstep/System/Applications/Terminal.app/Resources/DefaultTerminalServices.svcs
+GNUstep/System/Applications/Terminal.app/Resources/English.lproj/Localizable.strings
+GNUstep/System/Applications/Terminal.app/Resources/French.lproj/Localizable.strings
+GNUstep/System/Applications/Terminal.app/Resources/German.lproj/Localizable.strings
+GNUstep/System/Applications/Terminal.app/Resources/Hungarian.lproj/Localizable.strings
+GNUstep/System/Applications/Terminal.app/Resources/Info-gnustep.plist
+GNUstep/System/Applications/Terminal.app/Resources/Norwegian.lproj/Localizable.strings
+GNUstep/System/Applications/Terminal.app/Resources/Russian.lproj/Localizable.strings
+GNUstep/System/Applications/Terminal.app/Resources/Spanish.lproj/Localizable.strings
+GNUstep/System/Applications/Terminal.app/Resources/Swedish.lproj/Localizable.strings
+GNUstep/System/Applications/Terminal.app/Resources/Terminal.desktop
+GNUstep/System/Applications/Terminal.app/Resources/Terminal.tiff
+GNUstep/System/Applications/Terminal.app/Resources/TerminalInfo.plist
+GNUstep/System/Applications/Terminal.app/Resources/Turkish.lproj/Localizable.strings
+GNUstep/System/Applications/Terminal.app/Resources/cursor_filled.tiff
+GNUstep/System/Applications/Terminal.app/Resources/cursor_inverted.tiff
+GNUstep/System/Applications/Terminal.app/Resources/cursor_line.tiff
+GNUstep/System/Applications/Terminal.app/Resources/cursor_stroked.tiff
+GNUstep/System/Applications/Terminal.app/Terminal
+GNUstep/System/Applications/Terminal.app/stamp.make
+GNUstep/System/Tools/Terminal
+@dirrm GNUstep/System/Applications/Terminal.app/Resources/Turkish.lproj
+@dirrm GNUstep/System/Applications/Terminal.app/Resources/Swedish.lproj
+@dirrm GNUstep/System/Applications/Terminal.app/Resources/Spanish.lproj
+@dirrm GNUstep/System/Applications/Terminal.app/Resources/Russian.lproj
+@dirrm GNUstep/System/Applications/Terminal.app/Resources/Norwegian.lproj
+@dirrm GNUstep/System/Applications/Terminal.app/Resources/Hungarian.lproj
+@dirrm GNUstep/System/Applications/Terminal.app/Resources/German.lproj
+@dirrm GNUstep/System/Applications/Terminal.app/Resources/French.lproj
+@dirrm GNUstep/System/Applications/Terminal.app/Resources/English.lproj
+@dirrm GNUstep/System/Applications/Terminal.app/Resources
+@dirrm GNUstep/System/Applications/Terminal.app