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

4 files changed, 32 insertions, 31 deletions

diff --git a/ftp/gnustep-ftp/Makefile b/ftp/gnustep-ftp/Makefile
index 2d7e2eeafd81..26c5ec279e01 100644
--- a/ftp/gnustep-ftp/Makefile
+++ b/ftp/gnustep-ftp/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	ftp
 PORTVERSION=	0.5
+PORTREVISION=	2
 CATEGORIES=	ftp gnustep
 MASTER_SITES=	SAVANNAH/gap
 PKGNAMEPREFIX=	gnustep-
diff --git a/ftp/gnustep-ftp/pkg-plist b/ftp/gnustep-ftp/pkg-plist
index 80b7a5d83d1a..e1e780bde7d6 100644
--- a/ftp/gnustep-ftp/pkg-plist
+++ b/ftp/gnustep-ftp/pkg-plist
@@ -1,18 +1,18 @@
 
-GNUstep/Local/Applications/FTP.app/FTP
-GNUstep/Local/Applications/FTP.app/Resources/FTP.desktop
-GNUstep/Local/Applications/FTP.app/Resources/FTP.gorm/arrow_left.tiff
-GNUstep/Local/Applications/FTP.app/Resources/FTP.gorm/arrow_right.tiff
-GNUstep/Local/Applications/FTP.app/Resources/FTP.gorm/data.classes
-GNUstep/Local/Applications/FTP.app/Resources/FTP.gorm/data.info
-GNUstep/Local/Applications/FTP.app/Resources/FTP.gorm/objects.gorm
-GNUstep/Local/Applications/FTP.app/Resources/FTP_icon_gs.tif
-GNUstep/Local/Applications/FTP.app/Resources/GetName.gorm/FTP_icon_gs.tif
-GNUstep/Local/Applications/FTP.app/Resources/GetName.gorm/data.classes
-GNUstep/Local/Applications/FTP.app/Resources/GetName.gorm/data.info
-GNUstep/Local/Applications/FTP.app/Resources/GetName.gorm/objects.gorm
-GNUstep/Local/Applications/FTP.app/Resources/Info-gnustep.plist
-GNUstep/Local/Applications/FTP.app/Resources/arrow_left.tiff
-GNUstep/Local/Applications/FTP.app/Resources/arrow_right.tiff
-GNUstep/Local/Applications/FTP.app/stamp.make
-GNUstep/Local/Tools/FTP
+GNUstep/System/Applications/FTP.app/FTP
+GNUstep/System/Applications/FTP.app/Resources/FTP.desktop
+GNUstep/System/Applications/FTP.app/Resources/FTP.gorm/arrow_left.tiff
+GNUstep/System/Applications/FTP.app/Resources/FTP.gorm/arrow_right.tiff
+GNUstep/System/Applications/FTP.app/Resources/FTP.gorm/data.classes
+GNUstep/System/Applications/FTP.app/Resources/FTP.gorm/data.info
+GNUstep/System/Applications/FTP.app/Resources/FTP.gorm/objects.gorm
+GNUstep/System/Applications/FTP.app/Resources/FTP_icon_gs.tif
+GNUstep/System/Applications/FTP.app/Resources/GetName.gorm/FTP_icon_gs.tif
+GNUstep/System/Applications/FTP.app/Resources/GetName.gorm/data.classes
+GNUstep/System/Applications/FTP.app/Resources/GetName.gorm/data.info
+GNUstep/System/Applications/FTP.app/Resources/GetName.gorm/objects.gorm
+GNUstep/System/Applications/FTP.app/Resources/Info-gnustep.plist
+GNUstep/System/Applications/FTP.app/Resources/arrow_left.tiff
+GNUstep/System/Applications/FTP.app/Resources/arrow_right.tiff
+GNUstep/System/Applications/FTP.app/stamp.make
+GNUstep/System/Tools/FTP
diff --git a/ftp/waiho/Makefile b/ftp/waiho/Makefile
index 296cd5e9825f..70a075a03a61 100644
--- a/ftp/waiho/Makefile
+++ b/ftp/waiho/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	waiho
 PORTVERSION=	0.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	ftp gnustep
 MASTER_SITES=	http://www.roard.com/waiho/download/
 DISTNAME=	Waiho-${PORTVERSION}
@@ -17,6 +17,6 @@ USES=		tar:tgz gnustep
 USE_GNUSTEP=	back build
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/Local/Applications/Waiho.app/Waiho
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Applications/Waiho.app/Waiho
 
 .include <bsd.port.mk>
diff --git a/ftp/waiho/pkg-plist b/ftp/waiho/pkg-plist
index 81791b123a6d..ff2836cdcfca 100644
--- a/ftp/waiho/pkg-plist
+++ b/ftp/waiho/pkg-plist
@@ -1,12 +1,12 @@
-GNUstep/Local/Applications/Waiho.app/Resources/Bookmarks.tiff
-GNUstep/Local/Applications/Waiho.app/Resources/Connect-zoom.tiff
-GNUstep/Local/Applications/Waiho.app/Resources/Connect.tiff
-GNUstep/Local/Applications/Waiho.app/Resources/Disconnect.tiff
-GNUstep/Local/Applications/Waiho.app/Resources/Get.tiff
-GNUstep/Local/Applications/Waiho.app/Resources/Info-gnustep.plist
-GNUstep/Local/Applications/Waiho.app/Resources/Put.tiff
-GNUstep/Local/Applications/Waiho.app/Resources/Waiho.desktop
-GNUstep/Local/Applications/Waiho.app/Resources/Waiho.tiff
-GNUstep/Local/Applications/Waiho.app/Waiho
-GNUstep/Local/Applications/Waiho.app/stamp.make
-GNUstep/Local/Tools/Waiho
+GNUstep/System/Applications/Waiho.app/Resources/Bookmarks.tiff
+GNUstep/System/Applications/Waiho.app/Resources/Connect-zoom.tiff
+GNUstep/System/Applications/Waiho.app/Resources/Connect.tiff
+GNUstep/System/Applications/Waiho.app/Resources/Disconnect.tiff
+GNUstep/System/Applications/Waiho.app/Resources/Get.tiff
+GNUstep/System/Applications/Waiho.app/Resources/Info-gnustep.plist
+GNUstep/System/Applications/Waiho.app/Resources/Put.tiff
+GNUstep/System/Applications/Waiho.app/Resources/Waiho.desktop
+GNUstep/System/Applications/Waiho.app/Resources/Waiho.tiff
+GNUstep/System/Applications/Waiho.app/Waiho
+GNUstep/System/Applications/Waiho.app/stamp.make
+GNUstep/System/Tools/Waiho