Make all GNUstep ports install into the System domain so that the Local domain is available for stuff built from source.

Some ports were already installing in the System domain, for these just remove the Makefile lines explicitly specifying the install domain.

The rest are installed in the Local domain, remove any overrides, update their pkg-plists and any explicit paths in the Makefiles and then bump port revision.

Approved by:	bapt (mentor)
Differential Revision:	https://reviews.freebsd.org/D2977

12 files changed, 141 insertions, 142 deletions

diff --git a/devel/cherivis-devel/Makefile b/devel/cherivis-devel/Makefile
index 47816134d04..a76e3583e66 100644
--- a/devel/cherivis-devel/Makefile
+++ b/devel/cherivis-devel/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	cherivis-devel
 PORTVERSION=	0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel gnustep
 
 MAINTAINER=	theraven@FreeBSD.org
diff --git a/devel/cherivis-devel/pkg-plist b/devel/cherivis-devel/pkg-plist
index 5ccdf38fd19..0bc47282502 100644
--- a/devel/cherivis-devel/pkg-plist
+++ b/devel/cherivis-devel/pkg-plist
@@ -1,9 +1,9 @@
-GNUstep/Local/Applications/CheriVis.app/CheriVis
-GNUstep/Local/Applications/CheriVis.app/Resources/CheriVis.desktop
-GNUstep/Local/Applications/CheriVis.app/Resources/CheriVis.gorm/data.classes
-GNUstep/Local/Applications/CheriVis.app/Resources/CheriVis.gorm/data.info
-GNUstep/Local/Applications/CheriVis.app/Resources/CheriVis.gorm/objects.gorm
-GNUstep/Local/Applications/CheriVis.app/Resources/CheriVis.tiff
-GNUstep/Local/Applications/CheriVis.app/Resources/Info-gnustep.plist
-GNUstep/Local/Applications/CheriVis.app/stamp.make
-GNUstep/Local/Tools/CheriVis
+GNUstep/System/Applications/CheriVis.app/CheriVis
+GNUstep/System/Applications/CheriVis.app/Resources/CheriVis.desktop
+GNUstep/System/Applications/CheriVis.app/Resources/CheriVis.gorm/data.classes
+GNUstep/System/Applications/CheriVis.app/Resources/CheriVis.gorm/data.info
+GNUstep/System/Applications/CheriVis.app/Resources/CheriVis.gorm/objects.gorm
+GNUstep/System/Applications/CheriVis.app/Resources/CheriVis.tiff
+GNUstep/System/Applications/CheriVis.app/Resources/Info-gnustep.plist
+GNUstep/System/Applications/CheriVis.app/stamp.make
+GNUstep/System/Tools/CheriVis
diff --git a/devel/fortytwo-encore/Makefile b/devel/fortytwo-encore/Makefile
index f4f774ee1aa..d2e0d65e3bb 100644
--- a/devel/fortytwo-encore/Makefile
+++ b/devel/fortytwo-encore/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	encore
 PORTVERSION=	0.3.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel gnustep
 MASTER_SITES=	SF/fortytwo/Encore/${PORTVERSION}
 PKGNAMEPREFIX=	fortytwo-
@@ -30,6 +30,6 @@ OPTIONS_DEFINE=	DOCS
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKDIR}/Encore-${PORTVERSION}-api-ref && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/Local/Library/Frameworks/Encore.framework/Versions/0/libEncore.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Library/Frameworks/Encore.framework/Versions/0/libEncore.so
 
 .include <bsd.port.mk>
diff --git a/devel/fortytwo-encore/pkg-plist b/devel/fortytwo-encore/pkg-plist
index 7a5d94c369d..3c4e0b39de0 100644
--- a/devel/fortytwo-encore/pkg-plist
+++ b/devel/fortytwo-encore/pkg-plist
@@ -1,51 +1,51 @@
-GNUstep/Local/Library/Frameworks/Encore.framework/Encore
-GNUstep/Local/Library/Frameworks/Encore.framework/Headers
-GNUstep/Local/Library/Frameworks/Encore.framework/Resources
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Encore
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECArrayIterator.h
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECCache.h
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECCacheItem.h
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECDefaultLoggingFormatter.h
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECEmptyIterator.h
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECEnumeratorIterator.h
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECExceptions.h
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECFileLoggingWriter.h
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECIterator.h
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECKeyToListMap.h
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECLogger.h
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECLogging.h
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECLoggingConfiguration.h
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECLoggingFormatter.h
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECLoggingWriter.h
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECLoggingXMLConfiguration.h
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECMemory.h
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECNSLogLoggingWriter.h
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECObject.h
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECParameterString.h
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECStack.h
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECStandardOutput.h
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECStringUtils.h
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECTestResult.h
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECTestSuite.h
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECTestcase.h
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECXMLControl.h
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECXMLControlContext.h
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECXMLControlDefaultAllocatorRule.h
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECXMLControlDefaultRule.h
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECXMLControlDelegateMessageRule.h
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECXMLControlEvent.h
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECXMLControlReferenceRule.h
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECXMLControlRule.h
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECXMLControlRuleSelector.h
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECXMLControlState.h
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/Encore.h
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Resources/Info-gnustep.plist
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/libEncore.so
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/libEncore.so.%%MAJORLIBVERSION%%
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/libEncore.so.%%LIBVERSION%%
-GNUstep/Local/Library/Frameworks/Encore.framework/Versions/Current
-GNUstep/Local/Library/Frameworks/Encore.framework/libEncore.so
-GNUstep/Local/Library/Headers/Encore
-GNUstep/Local/Library/Libraries/libEncore.so
-GNUstep/Local/Library/Libraries/libEncore.so.%%MAJORLIBVERSION%%
-GNUstep/Local/Library/Libraries/libEncore.so.%%LIBVERSION%%
+GNUstep/System/Library/Frameworks/Encore.framework/Encore
+GNUstep/System/Library/Frameworks/Encore.framework/Headers
+GNUstep/System/Library/Frameworks/Encore.framework/Resources
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Encore
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECArrayIterator.h
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECCache.h
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECCacheItem.h
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECDefaultLoggingFormatter.h
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECEmptyIterator.h
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECEnumeratorIterator.h
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECExceptions.h
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECFileLoggingWriter.h
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECIterator.h
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECKeyToListMap.h
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECLogger.h
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECLogging.h
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECLoggingConfiguration.h
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECLoggingFormatter.h
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECLoggingWriter.h
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECLoggingXMLConfiguration.h
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECMemory.h
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECNSLogLoggingWriter.h
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECObject.h
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECParameterString.h
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECStack.h
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECStandardOutput.h
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECStringUtils.h
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECTestResult.h
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECTestSuite.h
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECTestcase.h
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECXMLControl.h
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECXMLControlContext.h
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECXMLControlDefaultAllocatorRule.h
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECXMLControlDefaultRule.h
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECXMLControlDelegateMessageRule.h
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECXMLControlEvent.h
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECXMLControlReferenceRule.h
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECXMLControlRule.h
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECXMLControlRuleSelector.h
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECXMLControlState.h
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/Encore.h
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Resources/Info-gnustep.plist
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/libEncore.so
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/libEncore.so.%%MAJORLIBVERSION%%
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/libEncore.so.%%LIBVERSION%%
+GNUstep/System/Library/Frameworks/Encore.framework/Versions/Current
+GNUstep/System/Library/Frameworks/Encore.framework/libEncore.so
+GNUstep/System/Library/Headers/Encore
+GNUstep/System/Library/Libraries/libEncore.so
+GNUstep/System/Library/Libraries/libEncore.so.%%MAJORLIBVERSION%%
+GNUstep/System/Library/Libraries/libEncore.so.%%LIBVERSION%%
diff --git a/devel/gorm/Makefile b/devel/gorm/Makefile
index 780e7f93a55..575b00b18a5 100644
--- a/devel/gorm/Makefile
+++ b/devel/gorm/Makefile
@@ -15,6 +15,5 @@ USE_GNUSTEP=	back build
 USE_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 
 DEFAULT_LIBVERSION=	1.1.0
-MAKE_ENV+=	GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
 
 .include <bsd.port.mk>
diff --git a/devel/highlighterkit/Makefile b/devel/highlighterkit/Makefile
index 24d0c37d026..ce9872941ea 100644
--- a/devel/highlighterkit/Makefile
+++ b/devel/highlighterkit/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	highlighterkit
 PORTVERSION=	0.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel gnustep
 MASTER_SITES=	http://download.gna.org/pmanager/0.2/
 DISTNAME=	HighlighterKit-${PORTVERSION}
@@ -15,6 +15,6 @@ USE_GNUSTEP=	back build
 USE_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/Local/Library/Frameworks/HighlighterKit.framework/Versions/0/libHighlighterKit.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Library/Frameworks/HighlighterKit.framework/Versions/0/libHighlighterKit.so
 
 .include <bsd.port.mk>
diff --git a/devel/highlighterkit/pkg-plist b/devel/highlighterkit/pkg-plist
index e1972c1e9e1..8c11da8b4ab 100644
--- a/devel/highlighterkit/pkg-plist
+++ b/devel/highlighterkit/pkg-plist
@@ -1,24 +1,24 @@
-GNUstep/Local/Library/Frameworks/HighlighterKit.framework/Headers
-GNUstep/Local/Library/Frameworks/HighlighterKit.framework/HighlighterKit
-GNUstep/Local/Library/Frameworks/HighlighterKit.framework/Resources
-GNUstep/Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/HKSyntaxDefinition.h
-GNUstep/Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/HKSyntaxHighlighter.h
-GNUstep/Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/HKTextPattern.h
-GNUstep/Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/HighlighterKit.h
-GNUstep/Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/HighlighterKit
-GNUstep/Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/C++.syntax
-GNUstep/Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/C-Header.syntax
-GNUstep/Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/C.syntax
-GNUstep/Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist
-GNUstep/Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/ObjC++.syntax
-GNUstep/Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/ObjC.syntax
-GNUstep/Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/Plist.syntax
-GNUstep/Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/libHighlighterKit.so
-GNUstep/Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/libHighlighterKit.so.%%MAJORLIBVERSION%%
-GNUstep/Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/libHighlighterKit.so.%%LIBVERSION%%
-GNUstep/Local/Library/Frameworks/HighlighterKit.framework/Versions/Current
-GNUstep/Local/Library/Frameworks/HighlighterKit.framework/libHighlighterKit.so
-GNUstep/Local/Library/Headers/HighlighterKit
-GNUstep/Local/Library/Libraries/libHighlighterKit.so
-GNUstep/Local/Library/Libraries/libHighlighterKit.so.%%MAJORLIBVERSION%%
-GNUstep/Local/Library/Libraries/libHighlighterKit.so.%%LIBVERSION%%
+GNUstep/System/Library/Frameworks/HighlighterKit.framework/Headers
+GNUstep/System/Library/Frameworks/HighlighterKit.framework/HighlighterKit
+GNUstep/System/Library/Frameworks/HighlighterKit.framework/Resources
+GNUstep/System/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/HKSyntaxDefinition.h
+GNUstep/System/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/HKSyntaxHighlighter.h
+GNUstep/System/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/HKTextPattern.h
+GNUstep/System/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/HighlighterKit.h
+GNUstep/System/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/HighlighterKit
+GNUstep/System/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/C++.syntax
+GNUstep/System/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/C-Header.syntax
+GNUstep/System/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/C.syntax
+GNUstep/System/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist
+GNUstep/System/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/ObjC++.syntax
+GNUstep/System/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/ObjC.syntax
+GNUstep/System/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/Plist.syntax
+GNUstep/System/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/libHighlighterKit.so
+GNUstep/System/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/libHighlighterKit.so.%%MAJORLIBVERSION%%
+GNUstep/System/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/libHighlighterKit.so.%%LIBVERSION%%
+GNUstep/System/Library/Frameworks/HighlighterKit.framework/Versions/Current
+GNUstep/System/Library/Frameworks/HighlighterKit.framework/libHighlighterKit.so
+GNUstep/System/Library/Headers/HighlighterKit
+GNUstep/System/Library/Libraries/libHighlighterKit.so
+GNUstep/System/Library/Libraries/libHighlighterKit.so.%%MAJORLIBVERSION%%
+GNUstep/System/Library/Libraries/libHighlighterKit.so.%%LIBVERSION%%
diff --git a/devel/performance/Makefile b/devel/performance/Makefile
index 586284a3271..3fa0c40d8fc 100644
--- a/devel/performance/Makefile
+++ b/devel/performance/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	performance
 PORTVERSION=	0.5.0
+PORTREVISION=	2
 CATEGORIES=	devel gnustep
 MASTER_SITES=	GNUSTEP/libs
 DISTNAME=	Performance-${PORTVERSION}
diff --git a/devel/performance/pkg-plist b/devel/performance/pkg-plist
index fa67511a95c..f3595933a02 100644
--- a/devel/performance/pkg-plist
+++ b/devel/performance/pkg-plist
@@ -1,33 +1,33 @@
-GNUstep/Local/Library/Documentation/Performance/GSCache.gsdoc
-GNUstep/Local/Library/Documentation/Performance/GSCache.html
-GNUstep/Local/Library/Documentation/Performance/GSFIFO.gsdoc
-GNUstep/Local/Library/Documentation/Performance/GSFIFO.html
-GNUstep/Local/Library/Documentation/Performance/GSIOThreadPool.gsdoc
-GNUstep/Local/Library/Documentation/Performance/GSIOThreadPool.html
-GNUstep/Local/Library/Documentation/Performance/GSLinkedList.gsdoc
-GNUstep/Local/Library/Documentation/Performance/GSLinkedList.html
-GNUstep/Local/Library/Documentation/Performance/GSSkipMutableArray.gsdoc
-GNUstep/Local/Library/Documentation/Performance/GSSkipMutableArray.html
-GNUstep/Local/Library/Documentation/Performance/GSThreadPool.gsdoc
-GNUstep/Local/Library/Documentation/Performance/GSThreadPool.html
-GNUstep/Local/Library/Documentation/Performance/GSThroughput.gsdoc
-GNUstep/Local/Library/Documentation/Performance/GSThroughput.html
-GNUstep/Local/Library/Documentation/Performance/GSTicker.gsdoc
-GNUstep/Local/Library/Documentation/Performance/GSTicker.html
-GNUstep/Local/Library/Documentation/Performance/GSUniqued.gsdoc
-GNUstep/Local/Library/Documentation/Performance/GSUniqued.html
-GNUstep/Local/Library/Documentation/Performance/OrderedSymbolDeclarations.plist
-GNUstep/Local/Library/Documentation/Performance/Performance.igsdoc
-GNUstep/Local/Library/Documentation/Performance/dependencies
-GNUstep/Local/Library/Headers/Performance/GSCache.h
-GNUstep/Local/Library/Headers/Performance/GSFIFO.h
-GNUstep/Local/Library/Headers/Performance/GSIOThreadPool.h
-GNUstep/Local/Library/Headers/Performance/GSLinkedList.h
-GNUstep/Local/Library/Headers/Performance/GSSkipMutableArray.h
-GNUstep/Local/Library/Headers/Performance/GSThreadPool.h
-GNUstep/Local/Library/Headers/Performance/GSThroughput.h
-GNUstep/Local/Library/Headers/Performance/GSTicker.h
-GNUstep/Local/Library/Headers/Performance/GSUniqued.h
-GNUstep/Local/Library/Libraries/libPerformance.so
-GNUstep/Local/Library/Libraries/libPerformance.so.%%VERSION%%
-GNUstep/Local/Library/Libraries/libPerformance.so.0.5
+GNUstep/System/Library/Documentation/Performance/GSCache.gsdoc
+GNUstep/System/Library/Documentation/Performance/GSCache.html
+GNUstep/System/Library/Documentation/Performance/GSFIFO.gsdoc
+GNUstep/System/Library/Documentation/Performance/GSFIFO.html
+GNUstep/System/Library/Documentation/Performance/GSIOThreadPool.gsdoc
+GNUstep/System/Library/Documentation/Performance/GSIOThreadPool.html
+GNUstep/System/Library/Documentation/Performance/GSLinkedList.gsdoc
+GNUstep/System/Library/Documentation/Performance/GSLinkedList.html
+GNUstep/System/Library/Documentation/Performance/GSSkipMutableArray.gsdoc
+GNUstep/System/Library/Documentation/Performance/GSSkipMutableArray.html
+GNUstep/System/Library/Documentation/Performance/GSThreadPool.gsdoc
+GNUstep/System/Library/Documentation/Performance/GSThreadPool.html
+GNUstep/System/Library/Documentation/Performance/GSThroughput.gsdoc
+GNUstep/System/Library/Documentation/Performance/GSThroughput.html
+GNUstep/System/Library/Documentation/Performance/GSTicker.gsdoc
+GNUstep/System/Library/Documentation/Performance/GSTicker.html
+GNUstep/System/Library/Documentation/Performance/GSUniqued.gsdoc
+GNUstep/System/Library/Documentation/Performance/GSUniqued.html
+GNUstep/System/Library/Documentation/Performance/OrderedSymbolDeclarations.plist
+GNUstep/System/Library/Documentation/Performance/Performance.igsdoc
+GNUstep/System/Library/Documentation/Performance/dependencies
+GNUstep/System/Library/Headers/Performance/GSCache.h
+GNUstep/System/Library/Headers/Performance/GSFIFO.h
+GNUstep/System/Library/Headers/Performance/GSIOThreadPool.h
+GNUstep/System/Library/Headers/Performance/GSLinkedList.h
+GNUstep/System/Library/Headers/Performance/GSSkipMutableArray.h
+GNUstep/System/Library/Headers/Performance/GSThreadPool.h
+GNUstep/System/Library/Headers/Performance/GSThroughput.h
+GNUstep/System/Library/Headers/Performance/GSTicker.h
+GNUstep/System/Library/Headers/Performance/GSUniqued.h
+GNUstep/System/Library/Libraries/libPerformance.so
+GNUstep/System/Library/Libraries/libPerformance.so.%%VERSION%%
+GNUstep/System/Library/Libraries/libPerformance.so.0.5
diff --git a/devel/projectcenter/Makefile b/devel/projectcenter/Makefile
index 8e70a6f3456..96028a7f298 100644
--- a/devel/projectcenter/Makefile
+++ b/devel/projectcenter/Makefile
@@ -17,7 +17,6 @@ USE_GNUSTEP=	back build
 USE_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 
 PLIST_SUB+=	FRAMEVERSION=${PORTVERSION}
-MAKE_ENV+=	GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
 
 post-install:
 	${STRIP_CMD} \
diff --git a/devel/wizardkit/Makefile b/devel/wizardkit/Makefile
index 554e38c0c51..b4ac7aa1866 100644
--- a/devel/wizardkit/Makefile
+++ b/devel/wizardkit/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	wizardkit
 PORTVERSION=	0.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel gnustep
 MASTER_SITES=	http://download.gna.org/pmanager/0.2/
 DISTNAME=	WizardKit-${PORTVERSION}
@@ -18,6 +18,6 @@ USE_GNUSTEP=	back build
 USE_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/Local/Library/Frameworks/WizardKit.framework/Versions/0/libWizardKit.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Library/Frameworks/WizardKit.framework/Versions/0/libWizardKit.so
 
 .include <bsd.port.mk>
diff --git a/devel/wizardkit/pkg-plist b/devel/wizardkit/pkg-plist
index 18e11bfc8d0..2ab8dbd127d 100644
--- a/devel/wizardkit/pkg-plist
+++ b/devel/wizardkit/pkg-plist
@@ -1,16 +1,16 @@
-GNUstep/Local/Library/Frameworks/WizardKit.framework/Headers
-GNUstep/Local/Library/Frameworks/WizardKit.framework/Resources
-GNUstep/Local/Library/Frameworks/WizardKit.framework/Versions/%%MAJORVERSION%%/Headers/WKWizardPanel.h
-GNUstep/Local/Library/Frameworks/WizardKit.framework/Versions/%%MAJORVERSION%%/Headers/WizardKit.h
-GNUstep/Local/Library/Frameworks/WizardKit.framework/Versions/%%MAJORVERSION%%/Resources/Info-gnustep.plist
-GNUstep/Local/Library/Frameworks/WizardKit.framework/Versions/%%MAJORVERSION%%/WizardKit
-GNUstep/Local/Library/Frameworks/WizardKit.framework/Versions/%%MAJORVERSION%%/libWizardKit.so
-GNUstep/Local/Library/Frameworks/WizardKit.framework/Versions/%%MAJORVERSION%%/libWizardKit.so.%%MAJORLIBVERSION%%
-GNUstep/Local/Library/Frameworks/WizardKit.framework/Versions/%%MAJORVERSION%%/libWizardKit.so.%%LIBVERSION%%
-GNUstep/Local/Library/Frameworks/WizardKit.framework/Versions/Current
-GNUstep/Local/Library/Frameworks/WizardKit.framework/WizardKit
-GNUstep/Local/Library/Frameworks/WizardKit.framework/libWizardKit.so
-GNUstep/Local/Library/Headers/WizardKit
-GNUstep/Local/Library/Libraries/libWizardKit.so
-GNUstep/Local/Library/Libraries/libWizardKit.so.%%MAJORLIBVERSION%%
-GNUstep/Local/Library/Libraries/libWizardKit.so.%%LIBVERSION%%
+GNUstep/System/Library/Frameworks/WizardKit.framework/Headers
+GNUstep/System/Library/Frameworks/WizardKit.framework/Resources
+GNUstep/System/Library/Frameworks/WizardKit.framework/Versions/%%MAJORVERSION%%/Headers/WKWizardPanel.h
+GNUstep/System/Library/Frameworks/WizardKit.framework/Versions/%%MAJORVERSION%%/Headers/WizardKit.h
+GNUstep/System/Library/Frameworks/WizardKit.framework/Versions/%%MAJORVERSION%%/Resources/Info-gnustep.plist
+GNUstep/System/Library/Frameworks/WizardKit.framework/Versions/%%MAJORVERSION%%/WizardKit
+GNUstep/System/Library/Frameworks/WizardKit.framework/Versions/%%MAJORVERSION%%/libWizardKit.so
+GNUstep/System/Library/Frameworks/WizardKit.framework/Versions/%%MAJORVERSION%%/libWizardKit.so.%%MAJORLIBVERSION%%
+GNUstep/System/Library/Frameworks/WizardKit.framework/Versions/%%MAJORVERSION%%/libWizardKit.so.%%LIBVERSION%%
+GNUstep/System/Library/Frameworks/WizardKit.framework/Versions/Current
+GNUstep/System/Library/Frameworks/WizardKit.framework/WizardKit
+GNUstep/System/Library/Frameworks/WizardKit.framework/libWizardKit.so
+GNUstep/System/Library/Headers/WizardKit
+GNUstep/System/Library/Libraries/libWizardKit.so
+GNUstep/System/Library/Libraries/libWizardKit.so.%%MAJORLIBVERSION%%
+GNUstep/System/Library/Libraries/libWizardKit.so.%%LIBVERSION%%