- drop USE_GNUSTEP_PREFIX

10 files changed, 79 insertions, 84 deletions

diff --git a/net/netclasses/Makefile b/net/netclasses/Makefile
index f8fb07048642..e43138a941d2 100644
--- a/net/netclasses/Makefile
+++ b/net/netclasses/Makefile
@@ -14,7 +14,6 @@ MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Objective-C framework for socket programming with GNUstep
 
 USE_GNUSTEP=	yes
-USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BASE=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
diff --git a/net/netclasses/pkg-plist b/net/netclasses/pkg-plist
index 3c79ec63028c..aae4d1b43f7c 100644
--- a/net/netclasses/pkg-plist
+++ b/net/netclasses/pkg-plist
@@ -1,23 +1,23 @@
-Local/Library/Frameworks/netclasses.framework/Headers
-Local/Library/Frameworks/netclasses.framework/Resources
-Local/Library/Frameworks/netclasses.framework/Versions/%%VERSION%%/Headers/IRCObject.h
-Local/Library/Frameworks/netclasses.framework/Versions/%%VERSION%%/Headers/LineObject.h
-Local/Library/Frameworks/netclasses.framework/Versions/%%VERSION%%/Headers/NetBase.h
-Local/Library/Frameworks/netclasses.framework/Versions/%%VERSION%%/Headers/NetTCP.h
-Local/Library/Frameworks/netclasses.framework/Versions/%%VERSION%%/Resources/Info-gnustep.plist
-Local/Library/Frameworks/netclasses.framework/Versions/%%VERSION%%/libnetclasses.so
-Local/Library/Frameworks/netclasses.framework/Versions/%%VERSION%%/libnetclasses.so.%%MAJORLIBVERSION%%
-Local/Library/Frameworks/netclasses.framework/Versions/%%VERSION%%/libnetclasses.so.%%LIBVERSION%%
-Local/Library/Frameworks/netclasses.framework/Versions/%%VERSION%%/netclasses
-Local/Library/Frameworks/netclasses.framework/Versions/Current
-Local/Library/Frameworks/netclasses.framework/libnetclasses.so
-Local/Library/Frameworks/netclasses.framework/netclasses
-Local/Library/Headers/netclasses
-Local/Library/Libraries/libnetclasses.so
-Local/Library/Libraries/libnetclasses.so.%%MAJORLIBVERSION%%
-Local/Library/Libraries/libnetclasses.so.%%LIBVERSION%%
-@dirrm Local/Library/Frameworks/netclasses.framework/Versions/%%VERSION%%/Resources
-@dirrm Local/Library/Frameworks/netclasses.framework/Versions/%%VERSION%%/Headers
-@dirrm Local/Library/Frameworks/netclasses.framework/Versions/%%VERSION%%
-@dirrm Local/Library/Frameworks/netclasses.framework/Versions
-@dirrm Local/Library/Frameworks/netclasses.framework
+GNUstep/Local/Library/Frameworks/netclasses.framework/Headers
+GNUstep/Local/Library/Frameworks/netclasses.framework/Resources
+GNUstep/Local/Library/Frameworks/netclasses.framework/Versions/%%VERSION%%/Headers/IRCObject.h
+GNUstep/Local/Library/Frameworks/netclasses.framework/Versions/%%VERSION%%/Headers/LineObject.h
+GNUstep/Local/Library/Frameworks/netclasses.framework/Versions/%%VERSION%%/Headers/NetBase.h
+GNUstep/Local/Library/Frameworks/netclasses.framework/Versions/%%VERSION%%/Headers/NetTCP.h
+GNUstep/Local/Library/Frameworks/netclasses.framework/Versions/%%VERSION%%/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Frameworks/netclasses.framework/Versions/%%VERSION%%/libnetclasses.so
+GNUstep/Local/Library/Frameworks/netclasses.framework/Versions/%%VERSION%%/libnetclasses.so.%%MAJORLIBVERSION%%
+GNUstep/Local/Library/Frameworks/netclasses.framework/Versions/%%VERSION%%/libnetclasses.so.%%LIBVERSION%%
+GNUstep/Local/Library/Frameworks/netclasses.framework/Versions/%%VERSION%%/netclasses
+GNUstep/Local/Library/Frameworks/netclasses.framework/Versions/Current
+GNUstep/Local/Library/Frameworks/netclasses.framework/libnetclasses.so
+GNUstep/Local/Library/Frameworks/netclasses.framework/netclasses
+GNUstep/Local/Library/Headers/netclasses
+GNUstep/Local/Library/Libraries/libnetclasses.so
+GNUstep/Local/Library/Libraries/libnetclasses.so.%%MAJORLIBVERSION%%
+GNUstep/Local/Library/Libraries/libnetclasses.so.%%LIBVERSION%%
+@dirrm GNUstep/Local/Library/Frameworks/netclasses.framework/Versions/%%VERSION%%/Resources
+@dirrm GNUstep/Local/Library/Frameworks/netclasses.framework/Versions/%%VERSION%%/Headers
+@dirrm GNUstep/Local/Library/Frameworks/netclasses.framework/Versions/%%VERSION%%
+@dirrm GNUstep/Local/Library/Frameworks/netclasses.framework/Versions
+@dirrm GNUstep/Local/Library/Frameworks/netclasses.framework
diff --git a/net/remotedesk/Makefile b/net/remotedesk/Makefile
index 8b8e848e6627..c3634f9a0693 100644
--- a/net/remotedesk/Makefile
+++ b/net/remotedesk/Makefile
@@ -19,7 +19,6 @@ COMMENT=	Graphical interface to rdesktop
 RUN_DEPENDS=	rdesktop:${PORTSDIR}/net/rdesktop
 
 USE_GNUSTEP=	yes
-USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
diff --git a/net/remotedesk/pkg-plist b/net/remotedesk/pkg-plist
index 73e6687f6f11..d5b97cc111b4 100644
--- a/net/remotedesk/pkg-plist
+++ b/net/remotedesk/pkg-plist
@@ -1,14 +1,14 @@
-Local/Applications/RemoteDesk.app/RemoteDesk
-Local/Applications/RemoteDesk.app/Resources/Info-gnustep.plist
-Local/Applications/RemoteDesk.app/Resources/LICENSE
-Local/Applications/RemoteDesk.app/Resources/README
-Local/Applications/RemoteDesk.app/Resources/RemoteDesk.desktop
-Local/Applications/RemoteDesk.app/Resources/RemoteDesk.gorm/data.classes
-Local/Applications/RemoteDesk.app/Resources/RemoteDesk.gorm/data.info
-Local/Applications/RemoteDesk.app/Resources/RemoteDesk.gorm/objects.gorm
-Local/Applications/RemoteDesk.app/Resources/remotedesk.tiff
-Local/Applications/RemoteDesk.app/stamp.make
-Local/Tools/RemoteDesk
-@dirrm Local/Applications/RemoteDesk.app/Resources/RemoteDesk.gorm
-@dirrm Local/Applications/RemoteDesk.app/Resources
-@dirrm Local/Applications/RemoteDesk.app
+GNUstep/Local/Applications/RemoteDesk.app/RemoteDesk
+GNUstep/Local/Applications/RemoteDesk.app/Resources/Info-gnustep.plist
+GNUstep/Local/Applications/RemoteDesk.app/Resources/LICENSE
+GNUstep/Local/Applications/RemoteDesk.app/Resources/README
+GNUstep/Local/Applications/RemoteDesk.app/Resources/RemoteDesk.desktop
+GNUstep/Local/Applications/RemoteDesk.app/Resources/RemoteDesk.gorm/data.classes
+GNUstep/Local/Applications/RemoteDesk.app/Resources/RemoteDesk.gorm/data.info
+GNUstep/Local/Applications/RemoteDesk.app/Resources/RemoteDesk.gorm/objects.gorm
+GNUstep/Local/Applications/RemoteDesk.app/Resources/remotedesk.tiff
+GNUstep/Local/Applications/RemoteDesk.app/stamp.make
+GNUstep/Local/Tools/RemoteDesk
+@dirrm GNUstep/Local/Applications/RemoteDesk.app/Resources/RemoteDesk.gorm
+@dirrm GNUstep/Local/Applications/RemoteDesk.app/Resources
+@dirrm GNUstep/Local/Applications/RemoteDesk.app
diff --git a/net/tryst-examples/Makefile b/net/tryst-examples/Makefile
index 38bca362f907..ac7266e6284b 100644
--- a/net/tryst-examples/Makefile
+++ b/net/tryst-examples/Makefile
@@ -21,7 +21,6 @@ COMMENT=	TBrowser and TChat
 LIB_DEPENDS=	dns_sd:${PORTSDIR}/net/mDNSResponder
 
 USE_GNUSTEP=	yes
-USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
diff --git a/net/tryst-examples/pkg-plist b/net/tryst-examples/pkg-plist
index 2ac9bad32e95..30a9a9fee099 100644
--- a/net/tryst-examples/pkg-plist
+++ b/net/tryst-examples/pkg-plist
@@ -1,29 +1,29 @@
-Local/Applications/TBrowser.app/Resources/Controller.gorm/data.classes
-Local/Applications/TBrowser.app/Resources/Controller.gorm/data.info
-Local/Applications/TBrowser.app/Resources/Controller.gorm/objects.gorm
-Local/Applications/TBrowser.app/Resources/Info.plist
-Local/Applications/TBrowser.app/Resources/Info-gnustep.plist
-Local/Applications/TBrowser.app/Resources/TBrowser.desktop
-Local/Applications/TBrowser.app/Resources/TBrowser.png
-Local/Applications/TBrowser.app/TBrowser
-Local/Applications/TBrowser.app/stamp.make
-Local/Applications/TChat.app/Resources/Controller.gorm/data.classes
-Local/Applications/TChat.app/Resources/Controller.gorm/data.info
-Local/Applications/TChat.app/Resources/Controller.gorm/objects.gorm
-Local/Applications/TChat.app/Resources/Info-gnustep.plist
-Local/Applications/TChat.app/Resources/TChat.desktop
-Local/Applications/TChat.app/Resources/TChat.png
-Local/Applications/TChat.app/Resources/TChatInfo.plist
-Local/Applications/TChat.app/Resources/WindowController.gorm/data.classes
-Local/Applications/TChat.app/Resources/WindowController.gorm/objects.gorm
-Local/Applications/TChat.app/TChat
-Local/Applications/TChat.app/stamp.make
-Local/Tools/TBrowser
-Local/Tools/TChat
-@dirrm Local/Applications/TChat.app/Resources/WindowController.gorm
-@dirrm Local/Applications/TChat.app/Resources/Controller.gorm
-@dirrm Local/Applications/TChat.app/Resources
-@dirrm Local/Applications/TChat.app
-@dirrm Local/Applications/TBrowser.app/Resources/Controller.gorm
-@dirrm Local/Applications/TBrowser.app/Resources
-@dirrm Local/Applications/TBrowser.app
+GNUstep/Local/Applications/TBrowser.app/Resources/Controller.gorm/data.classes
+GNUstep/Local/Applications/TBrowser.app/Resources/Controller.gorm/data.info
+GNUstep/Local/Applications/TBrowser.app/Resources/Controller.gorm/objects.gorm
+GNUstep/Local/Applications/TBrowser.app/Resources/Info.plist
+GNUstep/Local/Applications/TBrowser.app/Resources/Info-gnustep.plist
+GNUstep/Local/Applications/TBrowser.app/Resources/TBrowser.desktop
+GNUstep/Local/Applications/TBrowser.app/Resources/TBrowser.png
+GNUstep/Local/Applications/TBrowser.app/TBrowser
+GNUstep/Local/Applications/TBrowser.app/stamp.make
+GNUstep/Local/Applications/TChat.app/Resources/Controller.gorm/data.classes
+GNUstep/Local/Applications/TChat.app/Resources/Controller.gorm/data.info
+GNUstep/Local/Applications/TChat.app/Resources/Controller.gorm/objects.gorm
+GNUstep/Local/Applications/TChat.app/Resources/Info-gnustep.plist
+GNUstep/Local/Applications/TChat.app/Resources/TChat.desktop
+GNUstep/Local/Applications/TChat.app/Resources/TChat.png
+GNUstep/Local/Applications/TChat.app/Resources/TChatInfo.plist
+GNUstep/Local/Applications/TChat.app/Resources/WindowController.gorm/data.classes
+GNUstep/Local/Applications/TChat.app/Resources/WindowController.gorm/objects.gorm
+GNUstep/Local/Applications/TChat.app/TChat
+GNUstep/Local/Applications/TChat.app/stamp.make
+GNUstep/Local/Tools/TBrowser
+GNUstep/Local/Tools/TChat
+@dirrm GNUstep/Local/Applications/TChat.app/Resources/WindowController.gorm
+@dirrm GNUstep/Local/Applications/TChat.app/Resources/Controller.gorm
+@dirrm GNUstep/Local/Applications/TChat.app/Resources
+@dirrm GNUstep/Local/Applications/TChat.app
+@dirrm GNUstep/Local/Applications/TBrowser.app/Resources/Controller.gorm
+@dirrm GNUstep/Local/Applications/TBrowser.app/Resources
+@dirrm GNUstep/Local/Applications/TBrowser.app
diff --git a/net/tryst/Makefile b/net/tryst/Makefile
index 5f67b833d413..cba738fd8cfa 100644
--- a/net/tryst/Makefile
+++ b/net/tryst/Makefile
@@ -20,7 +20,6 @@ COMMENT=	Implementation of Apples Bonjour for GNUstep
 LIB_DEPENDS=	dns_sd:${PORTSDIR}/net/mDNSResponder
 
 USE_GNUSTEP=	yes
-USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
diff --git a/net/tryst/pkg-plist b/net/tryst/pkg-plist
index 33ddb1bbff35..182e6c195770 100644
--- a/net/tryst/pkg-plist
+++ b/net/tryst/pkg-plist
@@ -1,5 +1,5 @@
-Local/Library/Headers/Tryst/NSNetServices.h
-Local/Library/Libraries/libTryst.so
-Local/Library/Libraries/libTryst.so.%%MAJORVERSION%%
-Local/Library/Libraries/libTryst.so.%%VERSION%%
-@dirrm Local/Library/Headers/Tryst
+GNUstep/Local/Library/Headers/Tryst/NSNetServices.h
+GNUstep/Local/Library/Libraries/libTryst.so
+GNUstep/Local/Library/Libraries/libTryst.so.%%MAJORVERSION%%
+GNUstep/Local/Library/Libraries/libTryst.so.%%VERSION%%
+@dirrm GNUstep/Local/Library/Headers/Tryst
diff --git a/net/zillion/Makefile b/net/zillion/Makefile
index 4e8125071d61..ecdc2b2642e4 100644
--- a/net/zillion/Makefile
+++ b/net/zillion/Makefile
@@ -16,7 +16,6 @@ MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Distributed computing project
 
 USE_GNUSTEP=	yes
-USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
diff --git a/net/zillion/pkg-plist b/net/zillion/pkg-plist
index 1755423251df..581de052f7d3 100644
--- a/net/zillion/pkg-plist
+++ b/net/zillion/pkg-plist
@@ -1,8 +1,8 @@
-Local/Library/Bundles/simpleZillionJob.bundle/Resources/Info-gnustep.plist
-Local/Library/Bundles/simpleZillionJob.bundle/simpleZillionJob
-Local/Library/Bundles/simpleZillionJob.bundle/stamp.make
-Local/Tools/zillion
-Local/Tools/zillionClient
-Local/Tools/zillionLoader
-@dirrm Local/Library/Bundles/simpleZillionJob.bundle/Resources
-@dirrm Local/Library/Bundles/simpleZillionJob.bundle
+GNUstep/Local/Library/Bundles/simpleZillionJob.bundle/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Bundles/simpleZillionJob.bundle/simpleZillionJob
+GNUstep/Local/Library/Bundles/simpleZillionJob.bundle/stamp.make
+GNUstep/Local/Tools/zillion
+GNUstep/Local/Tools/zillionClient
+GNUstep/Local/Tools/zillionLoader
+@dirrm GNUstep/Local/Library/Bundles/simpleZillionJob.bundle/Resources
+@dirrm GNUstep/Local/Library/Bundles/simpleZillionJob.bundle