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

5 files changed, 48 insertions, 49 deletions

diff --git a/x11/gskrab/Makefile b/x11/gskrab/Makefile
index a18e57cecb9c..fce165928bd2 100644
--- a/x11/gskrab/Makefile
+++ b/x11/gskrab/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	gskrab
 PORTVERSION=	0.0.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11 gnustep
 MASTER_SITES=	http://organact.mine.nu/~wolfgang/gskrab/
 DISTNAME=	GSKrab-${PORTVERSION}
@@ -23,7 +23,7 @@ post-patch:
 	@${REINPLACE_CMD} -e "/GNUSTEP_INSTALLATION_DIR/d" ${WRKSRC}/GNUmakefile
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/Local/Tools/gsks \
-		${STAGEDIR}${PREFIX}/GNUstep/Local/Library/Frameworks/GSKrab.framework/Versions/0/libGSKrab.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Tools/gsks \
+		${STAGEDIR}${PREFIX}/GNUstep/System/Library/Frameworks/GSKrab.framework/Versions/0/libGSKrab.so
 
 .include <bsd.port.mk>
diff --git a/x11/gskrab/pkg-plist b/x11/gskrab/pkg-plist
index 557f2181b800..36f648805d04 100644
--- a/x11/gskrab/pkg-plist
+++ b/x11/gskrab/pkg-plist
@@ -1,19 +1,19 @@
-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
+GNUstep/System/Library/Frameworks/GSKrab.framework/GSKrab
+GNUstep/System/Library/Frameworks/GSKrab.framework/Headers
+GNUstep/System/Library/Frameworks/GSKrab.framework/Resources
+GNUstep/System/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/GSKrab
+GNUstep/System/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/Headers/GSKrab.h
+GNUstep/System/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/Headers/GSKrabClient.h
+GNUstep/System/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/Headers/GSKrabKeyCode.h
+GNUstep/System/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/Headers/GSKrabServer.h
+GNUstep/System/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/Resources/Info-gnustep.plist
+GNUstep/System/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/libGSKrab.so
+GNUstep/System/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/libGSKrab.so.%%MAJORVERSION%%
+GNUstep/System/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/libGSKrab.so.%%VERSION%%
+GNUstep/System/Library/Frameworks/GSKrab.framework/Versions/Current
+GNUstep/System/Library/Frameworks/GSKrab.framework/libGSKrab.so
+GNUstep/System/Library/Headers/GSKrab
+GNUstep/System/Library/Libraries/libGSKrab.so
+GNUstep/System/Library/Libraries/libGSKrab.so.%%MAJORVERSION%%
+GNUstep/System/Library/Libraries/libGSKrab.so.%%VERSION%%
+GNUstep/System/Tools/gsks
diff --git a/x11/innerspace/Makefile b/x11/innerspace/Makefile
index 6032545e34a9..58af91fc1001 100644
--- a/x11/innerspace/Makefile
+++ b/x11/innerspace/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	innerspace
 PORTVERSION=	0.2.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11 gnustep
 MASTER_SITES=	SAVANNAH/gap
 DISTNAME=	InnerSpace-${PORTVERSION}
@@ -21,9 +21,9 @@ post-patch:
 
 post-install:
 	${STRIP_CMD} \
-		${STAGEDIR}${PREFIX}/GNUstep/Local/Applications/InnerSpace.app/Resources/NickSpace.InnerSpace/NickSpace \
-		${STAGEDIR}${PREFIX}/GNUstep/Local/Applications/InnerSpace.app/Resources/Black.InnerSpace/Black \
-		${STAGEDIR}${PREFIX}/GNUstep/Local/Applications/InnerSpace.app/Resources/Boxes.InnerSpace/Boxes \
-		${STAGEDIR}${PREFIX}/GNUstep/Local/Applications/InnerSpace.app/InnerSpace
+		${STAGEDIR}${PREFIX}/GNUstep/System/Applications/InnerSpace.app/Resources/NickSpace.InnerSpace/NickSpace \
+		${STAGEDIR}${PREFIX}/GNUstep/System/Applications/InnerSpace.app/Resources/Black.InnerSpace/Black \
+		${STAGEDIR}${PREFIX}/GNUstep/System/Applications/InnerSpace.app/Resources/Boxes.InnerSpace/Boxes \
+		${STAGEDIR}${PREFIX}/GNUstep/System/Applications/InnerSpace.app/InnerSpace
 
 .include <bsd.port.mk>
diff --git a/x11/innerspace/pkg-plist b/x11/innerspace/pkg-plist
index 5b8ee72edd7e..de700865f9d7 100644
--- a/x11/innerspace/pkg-plist
+++ b/x11/innerspace/pkg-plist
@@ -1,21 +1,21 @@
-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
+GNUstep/System/Applications/InnerSpace.app/InnerSpace
+GNUstep/System/Applications/InnerSpace.app/Resources/Black.InnerSpace/Black
+GNUstep/System/Applications/InnerSpace.app/Resources/Black.InnerSpace/Resources/Info-gnustep.plist
+GNUstep/System/Applications/InnerSpace.app/Resources/Black.InnerSpace/stamp.make
+GNUstep/System/Applications/InnerSpace.app/Resources/Boxes.InnerSpace/Boxes
+GNUstep/System/Applications/InnerSpace.app/Resources/Boxes.InnerSpace/Resources/Info-gnustep.plist
+GNUstep/System/Applications/InnerSpace.app/Resources/Boxes.InnerSpace/stamp.make
+GNUstep/System/Applications/InnerSpace.app/Resources/English.lproj/InnerSpace.gorm/data.classes
+GNUstep/System/Applications/InnerSpace.app/Resources/English.lproj/InnerSpace.gorm/data.info
+GNUstep/System/Applications/InnerSpace.app/Resources/English.lproj/InnerSpace.gorm/objects.gorm
+GNUstep/System/Applications/InnerSpace.app/Resources/Info-gnustep.plist
+GNUstep/System/Applications/InnerSpace.app/Resources/InnerSpace.desktop
+GNUstep/System/Applications/InnerSpace.app/Resources/InnerSpace.tiff
+GNUstep/System/Applications/InnerSpace.app/Resources/NickSpace.InnerSpace/NickSpace
+GNUstep/System/Applications/InnerSpace.app/Resources/NickSpace.InnerSpace/Resources/Info-gnustep.plist
+GNUstep/System/Applications/InnerSpace.app/Resources/NickSpace.InnerSpace/Resources/NickSpace.gorm/data.classes
+GNUstep/System/Applications/InnerSpace.app/Resources/NickSpace.InnerSpace/Resources/NickSpace.gorm/data.info
+GNUstep/System/Applications/InnerSpace.app/Resources/NickSpace.InnerSpace/Resources/NickSpace.gorm/objects.gorm
+GNUstep/System/Applications/InnerSpace.app/Resources/NickSpace.InnerSpace/stamp.make
+GNUstep/System/Applications/InnerSpace.app/stamp.make
+GNUstep/System/Tools/InnerSpace
diff --git a/x11/terminal.app/Makefile b/x11/terminal.app/Makefile
index dfc51dbd59c4..a65677aa8540 100644
--- a/x11/terminal.app/Makefile
+++ b/x11/terminal.app/Makefile
@@ -18,7 +18,6 @@ USES=		gnustep iconv
 USE_GNUSTEP=	back build
 
 MAKE_ARGS+=	Terminal_TOOL_LIBS='${ICONV_LIB} -lutil'
-MAKE_ENV+=	GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Applications/Terminal.app/Terminal