24 files changed, 214 insertions, 220 deletions

diff --git a/deskutils/affiche/Makefile b/deskutils/affiche/Makefile
index 3ab753b34b03..1c7c12325866 100644
--- a/deskutils/affiche/Makefile
+++ b/deskutils/affiche/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	affiche
 PORTVERSION=	0.6.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	http://www.collaboration-world.com/affiche.data/releases/Stable/
 DISTNAME=	Affiche-${PORTVERSION}
@@ -18,6 +18,6 @@ USE_GNUSTEP=	back build
 WRKSRC=		${WRKDIR}/Affiche
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/Local/Applications/Affiche.app/Affiche
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Applications/Affiche.app/Affiche
 
 .include <bsd.port.mk>
diff --git a/deskutils/affiche/pkg-plist b/deskutils/affiche/pkg-plist
index 4a738802064d..ed6a9a3e9803 100644
--- a/deskutils/affiche/pkg-plist
+++ b/deskutils/affiche/pkg-plist
@@ -1,22 +1,22 @@
-GNUstep/Local/Applications/Affiche.app/Affiche
-GNUstep/Local/Applications/Affiche.app/Resources/Affiche.desktop
-GNUstep/Local/Applications/Affiche.app/Resources/Affiche.tiff
-GNUstep/Local/Applications/Affiche.app/Resources/English.lproj/Localizable.strings
-GNUstep/Local/Applications/Affiche.app/Resources/French.lproj/Localizable.strings
-GNUstep/Local/Applications/Affiche.app/Resources/German.lproj/Localizable.strings
-GNUstep/Local/Applications/Affiche.app/Resources/Info-gnustep.plist
-GNUstep/Local/Applications/Affiche.app/Resources/Lojban.lproj/Localizable.strings
-GNUstep/Local/Applications/Affiche.app/Resources/Spanish.lproj/Localizable.strings
-GNUstep/Local/Applications/Affiche.app/Resources/Swedish.lproj/Localizable.strings
-GNUstep/Local/Applications/Affiche.app/Resources/buttons_blue.tiff
-GNUstep/Local/Applications/Affiche.app/Resources/buttons_gray.tiff
-GNUstep/Local/Applications/Affiche.app/Resources/buttons_green.tiff
-GNUstep/Local/Applications/Affiche.app/Resources/buttons_purple.tiff
-GNUstep/Local/Applications/Affiche.app/Resources/buttons_yellow.tiff
-GNUstep/Local/Applications/Affiche.app/Resources/resize_blue.tiff
-GNUstep/Local/Applications/Affiche.app/Resources/resize_gray.tiff
-GNUstep/Local/Applications/Affiche.app/Resources/resize_green.tiff
-GNUstep/Local/Applications/Affiche.app/Resources/resize_purple.tiff
-GNUstep/Local/Applications/Affiche.app/Resources/resize_yellow.tiff
-GNUstep/Local/Applications/Affiche.app/stamp.make
-GNUstep/Local/Tools/Affiche
+GNUstep/System/Applications/Affiche.app/Affiche
+GNUstep/System/Applications/Affiche.app/Resources/Affiche.desktop
+GNUstep/System/Applications/Affiche.app/Resources/Affiche.tiff
+GNUstep/System/Applications/Affiche.app/Resources/English.lproj/Localizable.strings
+GNUstep/System/Applications/Affiche.app/Resources/French.lproj/Localizable.strings
+GNUstep/System/Applications/Affiche.app/Resources/German.lproj/Localizable.strings
+GNUstep/System/Applications/Affiche.app/Resources/Info-gnustep.plist
+GNUstep/System/Applications/Affiche.app/Resources/Lojban.lproj/Localizable.strings
+GNUstep/System/Applications/Affiche.app/Resources/Spanish.lproj/Localizable.strings
+GNUstep/System/Applications/Affiche.app/Resources/Swedish.lproj/Localizable.strings
+GNUstep/System/Applications/Affiche.app/Resources/buttons_blue.tiff
+GNUstep/System/Applications/Affiche.app/Resources/buttons_gray.tiff
+GNUstep/System/Applications/Affiche.app/Resources/buttons_green.tiff
+GNUstep/System/Applications/Affiche.app/Resources/buttons_purple.tiff
+GNUstep/System/Applications/Affiche.app/Resources/buttons_yellow.tiff
+GNUstep/System/Applications/Affiche.app/Resources/resize_blue.tiff
+GNUstep/System/Applications/Affiche.app/Resources/resize_gray.tiff
+GNUstep/System/Applications/Affiche.app/Resources/resize_green.tiff
+GNUstep/System/Applications/Affiche.app/Resources/resize_purple.tiff
+GNUstep/System/Applications/Affiche.app/Resources/resize_yellow.tiff
+GNUstep/System/Applications/Affiche.app/stamp.make
+GNUstep/System/Tools/Affiche
diff --git a/deskutils/appwrapper/Makefile b/deskutils/appwrapper/Makefile
index 43df7f14e63c..66d8326fc1a8 100644
--- a/deskutils/appwrapper/Makefile
+++ b/deskutils/appwrapper/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	appwrapper
 PORTVERSION=	0.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/AppWrapper%20${PORTVERSION}
 DISTNAME=	AppWrapper.${PORTVERSION}
@@ -24,6 +24,6 @@ post-patch:
 		${WRKSRC}/GNUmakefile
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/Local/Applications/AppWrapper.app/AppWrapper
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Applications/AppWrapper.app/AppWrapper
 
 .include <bsd.port.mk>
diff --git a/deskutils/appwrapper/pkg-plist b/deskutils/appwrapper/pkg-plist
index 8e79919facf1..efa5f80ddb1f 100644
--- a/deskutils/appwrapper/pkg-plist
+++ b/deskutils/appwrapper/pkg-plist
@@ -1,8 +1,8 @@
-GNUstep/Local/Applications/AppWrapper.app/AppWrapper
-GNUstep/Local/Applications/AppWrapper.app/Resources/AppWrapper.app.tiff
-GNUstep/Local/Applications/AppWrapper.app/Resources/AppWrapper.desktop
-GNUstep/Local/Applications/AppWrapper.app/Resources/AppWrapper.gorm
-GNUstep/Local/Applications/AppWrapper.app/Resources/AppWrapperInfo.plist
-GNUstep/Local/Applications/AppWrapper.app/Resources/Info-gnustep.plist
-GNUstep/Local/Applications/AppWrapper.app/stamp.make
-GNUstep/Local/Tools/AppWrapper
+GNUstep/System/Applications/AppWrapper.app/AppWrapper
+GNUstep/System/Applications/AppWrapper.app/Resources/AppWrapper.app.tiff
+GNUstep/System/Applications/AppWrapper.app/Resources/AppWrapper.desktop
+GNUstep/System/Applications/AppWrapper.app/Resources/AppWrapper.gorm
+GNUstep/System/Applications/AppWrapper.app/Resources/AppWrapperInfo.plist
+GNUstep/System/Applications/AppWrapper.app/Resources/Info-gnustep.plist
+GNUstep/System/Applications/AppWrapper.app/stamp.make
+GNUstep/System/Tools/AppWrapper
diff --git a/deskutils/cartotheque/Makefile b/deskutils/cartotheque/Makefile
index df04df7c051c..1ea58fb474de 100644
--- a/deskutils/cartotheque/Makefile
+++ b/deskutils/cartotheque/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	cartotheque
 PORTVERSION=	0.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	LOCAL/dinoex
 DISTNAME=	Cartotheque-${PORTVERSION}
@@ -20,6 +20,6 @@ post-patch:
 		${WRKSRC}/GNUmakefile
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/Local/Applications/Cartotheque.app/Cartotheque
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Applications/Cartotheque.app/Cartotheque
 
 .include <bsd.port.mk>
diff --git a/deskutils/cartotheque/pkg-plist b/deskutils/cartotheque/pkg-plist
index 9833275871a0..0eec646d2382 100644
--- a/deskutils/cartotheque/pkg-plist
+++ b/deskutils/cartotheque/pkg-plist
@@ -1,20 +1,20 @@
-GNUstep/Local/Applications/Cartotheque.app/Cartotheque
-GNUstep/Local/Applications/Cartotheque.app/Resources/CardInspector.gorm/data.classes
-GNUstep/Local/Applications/Cartotheque.app/Resources/CardInspector.gorm/data.info
-GNUstep/Local/Applications/Cartotheque.app/Resources/CardInspector.gorm/objects.gorm
-GNUstep/Local/Applications/Cartotheque.app/Resources/CardWindow.gorm/data.classes
-GNUstep/Local/Applications/Cartotheque.app/Resources/CardWindow.gorm/data.info
-GNUstep/Local/Applications/Cartotheque.app/Resources/CardWindow.gorm/objects.gorm
-GNUstep/Local/Applications/Cartotheque.app/Resources/Cartotheque.desktop
-GNUstep/Local/Applications/Cartotheque.app/Resources/Cartotheque.gorm/data.classes
-GNUstep/Local/Applications/Cartotheque.app/Resources/Cartotheque.gorm/data.info
-GNUstep/Local/Applications/Cartotheque.app/Resources/Cartotheque.gorm/objects.gorm
-GNUstep/Local/Applications/Cartotheque.app/Resources/CartothequeWindow.gorm/data.classes
-GNUstep/Local/Applications/Cartotheque.app/Resources/CartothequeWindow.gorm/data.info
-GNUstep/Local/Applications/Cartotheque.app/Resources/CartothequeWindow.gorm/objects.gorm
-GNUstep/Local/Applications/Cartotheque.app/Resources/Info-gnustep.plist
-GNUstep/Local/Applications/Cartotheque.app/Resources/InspectorPanel.gorm/data.classes
-GNUstep/Local/Applications/Cartotheque.app/Resources/InspectorPanel.gorm/data.info
-GNUstep/Local/Applications/Cartotheque.app/Resources/InspectorPanel.gorm/objects.gorm
-GNUstep/Local/Applications/Cartotheque.app/stamp.make
-GNUstep/Local/Tools/Cartotheque
+GNUstep/System/Applications/Cartotheque.app/Cartotheque
+GNUstep/System/Applications/Cartotheque.app/Resources/CardInspector.gorm/data.classes
+GNUstep/System/Applications/Cartotheque.app/Resources/CardInspector.gorm/data.info
+GNUstep/System/Applications/Cartotheque.app/Resources/CardInspector.gorm/objects.gorm
+GNUstep/System/Applications/Cartotheque.app/Resources/CardWindow.gorm/data.classes
+GNUstep/System/Applications/Cartotheque.app/Resources/CardWindow.gorm/data.info
+GNUstep/System/Applications/Cartotheque.app/Resources/CardWindow.gorm/objects.gorm
+GNUstep/System/Applications/Cartotheque.app/Resources/Cartotheque.desktop
+GNUstep/System/Applications/Cartotheque.app/Resources/Cartotheque.gorm/data.classes
+GNUstep/System/Applications/Cartotheque.app/Resources/Cartotheque.gorm/data.info
+GNUstep/System/Applications/Cartotheque.app/Resources/Cartotheque.gorm/objects.gorm
+GNUstep/System/Applications/Cartotheque.app/Resources/CartothequeWindow.gorm/data.classes
+GNUstep/System/Applications/Cartotheque.app/Resources/CartothequeWindow.gorm/data.info
+GNUstep/System/Applications/Cartotheque.app/Resources/CartothequeWindow.gorm/objects.gorm
+GNUstep/System/Applications/Cartotheque.app/Resources/Info-gnustep.plist
+GNUstep/System/Applications/Cartotheque.app/Resources/InspectorPanel.gorm/data.classes
+GNUstep/System/Applications/Cartotheque.app/Resources/InspectorPanel.gorm/data.info
+GNUstep/System/Applications/Cartotheque.app/Resources/InspectorPanel.gorm/objects.gorm
+GNUstep/System/Applications/Cartotheque.app/stamp.make
+GNUstep/System/Tools/Cartotheque
diff --git a/deskutils/charmap/pkg-plist b/deskutils/charmap/pkg-plist
index f6db59230a34..08e7dc52be02 100644
--- a/deskutils/charmap/pkg-plist
+++ b/deskutils/charmap/pkg-plist
@@ -1,10 +1,10 @@
-GNUstep/Local/Applications/Charmap.app/Charmap
-GNUstep/Local/Applications/Charmap.app/Resources/Charmap.desktop
-GNUstep/Local/Applications/Charmap.app/Resources/Charmap.gorm/data.classes
-GNUstep/Local/Applications/Charmap.app/Resources/Charmap.gorm/objects.gorm
-GNUstep/Local/Applications/Charmap.app/Resources/Charmap.png
-GNUstep/Local/Applications/Charmap.app/Resources/CharmapInfo.plist
-GNUstep/Local/Applications/Charmap.app/Resources/Info-gnustep.plist
-GNUstep/Local/Applications/Charmap.app/Resources/UnicodeData.txt
-GNUstep/Local/Applications/Charmap.app/stamp.make
-GNUstep/Local/Tools/Charmap
+GNUstep/System/Applications/Charmap.app/Charmap
+GNUstep/System/Applications/Charmap.app/Resources/Charmap.desktop
+GNUstep/System/Applications/Charmap.app/Resources/Charmap.gorm/data.classes
+GNUstep/System/Applications/Charmap.app/Resources/Charmap.gorm/objects.gorm
+GNUstep/System/Applications/Charmap.app/Resources/Charmap.png
+GNUstep/System/Applications/Charmap.app/Resources/CharmapInfo.plist
+GNUstep/System/Applications/Charmap.app/Resources/Info-gnustep.plist
+GNUstep/System/Applications/Charmap.app/Resources/UnicodeData.txt
+GNUstep/System/Applications/Charmap.app/stamp.make
+GNUstep/System/Tools/Charmap
diff --git a/deskutils/displaycalibrator/Makefile b/deskutils/displaycalibrator/Makefile
index 465c84faad43..91c03dc0d1af 100644
--- a/deskutils/displaycalibrator/Makefile
+++ b/deskutils/displaycalibrator/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	displaycalibrator
 PORTVERSION=	0.7
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	http://gnu.ethz.ch/linuks.mine.nu/displaycalibrator/
 
@@ -13,6 +13,6 @@ USES=		gnustep
 USE_GNUSTEP=	back build
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/Local/Applications/DisplayCalibrator.app/DisplayCalibrator
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Applications/DisplayCalibrator.app/DisplayCalibrator
 
 .include <bsd.port.mk>
diff --git a/deskutils/displaycalibrator/pkg-plist b/deskutils/displaycalibrator/pkg-plist
index defbc5287080..d123f19f58e8 100644
--- a/deskutils/displaycalibrator/pkg-plist
+++ b/deskutils/displaycalibrator/pkg-plist
@@ -1,12 +1,12 @@
-GNUstep/Local/Applications/DisplayCalibrator.app/DisplayCalibrator
-GNUstep/Local/Applications/DisplayCalibrator.app/Resources/DisplayCalibrator.desktop
-GNUstep/Local/Applications/DisplayCalibrator.app/Resources/DisplayCalibrator.gorm/GammaControl.png
-GNUstep/Local/Applications/DisplayCalibrator.app/Resources/DisplayCalibrator.gorm/GammaCorrect.png
-GNUstep/Local/Applications/DisplayCalibrator.app/Resources/DisplayCalibrator.gorm/data.classes
-GNUstep/Local/Applications/DisplayCalibrator.app/Resources/DisplayCalibrator.gorm/data.info
-GNUstep/Local/Applications/DisplayCalibrator.app/Resources/DisplayCalibrator.gorm/objects.gorm
-GNUstep/Local/Applications/DisplayCalibrator.app/Resources/DisplayCalibrator.gorm/white-black.png
-GNUstep/Local/Applications/DisplayCalibrator.app/Resources/Info-gnustep.plist
-GNUstep/Local/Applications/DisplayCalibrator.app/Resources/gammascrew.png
-GNUstep/Local/Applications/DisplayCalibrator.app/stamp.make
-GNUstep/Local/Tools/DisplayCalibrator
+GNUstep/System/Applications/DisplayCalibrator.app/DisplayCalibrator
+GNUstep/System/Applications/DisplayCalibrator.app/Resources/DisplayCalibrator.desktop
+GNUstep/System/Applications/DisplayCalibrator.app/Resources/DisplayCalibrator.gorm/GammaControl.png
+GNUstep/System/Applications/DisplayCalibrator.app/Resources/DisplayCalibrator.gorm/GammaCorrect.png
+GNUstep/System/Applications/DisplayCalibrator.app/Resources/DisplayCalibrator.gorm/data.classes
+GNUstep/System/Applications/DisplayCalibrator.app/Resources/DisplayCalibrator.gorm/data.info
+GNUstep/System/Applications/DisplayCalibrator.app/Resources/DisplayCalibrator.gorm/objects.gorm
+GNUstep/System/Applications/DisplayCalibrator.app/Resources/DisplayCalibrator.gorm/white-black.png
+GNUstep/System/Applications/DisplayCalibrator.app/Resources/Info-gnustep.plist
+GNUstep/System/Applications/DisplayCalibrator.app/Resources/gammascrew.png
+GNUstep/System/Applications/DisplayCalibrator.app/stamp.make
+GNUstep/System/Tools/DisplayCalibrator
diff --git a/deskutils/gnustep-notebook/Makefile b/deskutils/gnustep-notebook/Makefile
index 6d32c0bf0344..4b624d4a6a33 100644
--- a/deskutils/gnustep-notebook/Makefile
+++ b/deskutils/gnustep-notebook/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	notebook
 PORTVERSION=	0.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	http://notebook.cowgar.com/NoteBook/releases/ \
 		http://io.debian.net/~tar/debian/notebook/
@@ -18,6 +18,6 @@ USES=		gnustep
 USE_GNUSTEP=	back build
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/Local/Applications/NoteBook.app/NoteBook
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Applications/NoteBook.app/NoteBook
 
 .include <bsd.port.mk>
diff --git a/deskutils/gnustep-notebook/pkg-plist b/deskutils/gnustep-notebook/pkg-plist
index 1a59157401a7..211684b93e41 100644
--- a/deskutils/gnustep-notebook/pkg-plist
+++ b/deskutils/gnustep-notebook/pkg-plist
@@ -1,19 +1,19 @@
-GNUstep/Local/Applications/NoteBook.app/NoteBook
-GNUstep/Local/Applications/NoteBook.app/Resources/English.lproj/NoteBookApp.gorm/data.classes
-GNUstep/Local/Applications/NoteBook.app/Resources/English.lproj/NoteBookApp.gorm/data.info
-GNUstep/Local/Applications/NoteBook.app/Resources/English.lproj/NoteBookApp.gorm/objects.gorm
-GNUstep/Local/Applications/NoteBook.app/Resources/English.lproj/Page.gorm/NoteDelete.png
-GNUstep/Local/Applications/NoteBook.app/Resources/English.lproj/Page.gorm/NoteNew.png
-GNUstep/Local/Applications/NoteBook.app/Resources/English.lproj/Page.gorm/NoteSubNew.png
-GNUstep/Local/Applications/NoteBook.app/Resources/English.lproj/Page.gorm/data.classes
-GNUstep/Local/Applications/NoteBook.app/Resources/English.lproj/Page.gorm/data.info
-GNUstep/Local/Applications/NoteBook.app/Resources/English.lproj/Page.gorm/objects.gorm
-GNUstep/Local/Applications/NoteBook.app/Resources/English.lproj/PageName.gorm/data.classes
-GNUstep/Local/Applications/NoteBook.app/Resources/English.lproj/PageName.gorm/data.info
-GNUstep/Local/Applications/NoteBook.app/Resources/English.lproj/PageName.gorm/objects.gorm
-GNUstep/Local/Applications/NoteBook.app/Resources/Info-gnustep.plist
-GNUstep/Local/Applications/NoteBook.app/Resources/NoteBook.desktop
-GNUstep/Local/Applications/NoteBook.app/Resources/NoteBook.png
-GNUstep/Local/Applications/NoteBook.app/Resources/NoteBookInfo.plist
-GNUstep/Local/Applications/NoteBook.app/stamp.make
-GNUstep/Local/Tools/NoteBook
+GNUstep/System/Applications/NoteBook.app/NoteBook
+GNUstep/System/Applications/NoteBook.app/Resources/English.lproj/NoteBookApp.gorm/data.classes
+GNUstep/System/Applications/NoteBook.app/Resources/English.lproj/NoteBookApp.gorm/data.info
+GNUstep/System/Applications/NoteBook.app/Resources/English.lproj/NoteBookApp.gorm/objects.gorm
+GNUstep/System/Applications/NoteBook.app/Resources/English.lproj/Page.gorm/NoteDelete.png
+GNUstep/System/Applications/NoteBook.app/Resources/English.lproj/Page.gorm/NoteNew.png
+GNUstep/System/Applications/NoteBook.app/Resources/English.lproj/Page.gorm/NoteSubNew.png
+GNUstep/System/Applications/NoteBook.app/Resources/English.lproj/Page.gorm/data.classes
+GNUstep/System/Applications/NoteBook.app/Resources/English.lproj/Page.gorm/data.info
+GNUstep/System/Applications/NoteBook.app/Resources/English.lproj/Page.gorm/objects.gorm
+GNUstep/System/Applications/NoteBook.app/Resources/English.lproj/PageName.gorm/data.classes
+GNUstep/System/Applications/NoteBook.app/Resources/English.lproj/PageName.gorm/data.info
+GNUstep/System/Applications/NoteBook.app/Resources/English.lproj/PageName.gorm/objects.gorm
+GNUstep/System/Applications/NoteBook.app/Resources/Info-gnustep.plist
+GNUstep/System/Applications/NoteBook.app/Resources/NoteBook.desktop
+GNUstep/System/Applications/NoteBook.app/Resources/NoteBook.png
+GNUstep/System/Applications/NoteBook.app/Resources/NoteBookInfo.plist
+GNUstep/System/Applications/NoteBook.app/stamp.make
+GNUstep/System/Tools/NoteBook
diff --git a/deskutils/gnustep-wrapper/Makefile b/deskutils/gnustep-wrapper/Makefile
index 6e55dd98b5af..7144dd067088 100644
--- a/deskutils/gnustep-wrapper/Makefile
+++ b/deskutils/gnustep-wrapper/Makefile
@@ -20,7 +20,6 @@ USE_GNUSTEP=	back build
 USE_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 
 ADDITIONAL_LIB_DIRS+=	-L${WRKSRC}/libGSWrapper/obj
-MAKE_ENV+=	GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
 MAKE_FLAGS+=	debug=no
 
 post-patch:
diff --git a/deskutils/gworkspace-gwmetadata/Makefile b/deskutils/gworkspace-gwmetadata/Makefile
index 99190f0441e4..4fb0b3e89657 100644
--- a/deskutils/gworkspace-gwmetadata/Makefile
+++ b/deskutils/gworkspace-gwmetadata/Makefile
@@ -26,7 +26,6 @@ WRKSRC=		${WRKDIR}/gworkspace-${PORTVERSION}/GWMetadata
 CONFIGURE_ARGS+=	--with-sqlite-include=${LOCALBASE}/include
 CONFIGURE_ARGS+=	--with-sqlite-library=${LOCALBASE}/lib
 DEFAULT_LIBVERSION=	0.1.0
-MAKE_ENV+=	GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
 
 post-patch:
 	${CP} ${WRKSRC}/gmds/mdextractor/Extractors/JpegExtractor/GNUmakefile.in \
diff --git a/deskutils/gworkspace/Makefile b/deskutils/gworkspace/Makefile
index a62057b642b2..a591c1ef094a 100644
--- a/deskutils/gworkspace/Makefile
+++ b/deskutils/gworkspace/Makefile
@@ -17,7 +17,6 @@ USE_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 
 GNU_CONFIGURE=	yes
 ADDITIONAL_LDFLAGS+=	-L${WRKSRC}/FSNode/FSNode.framework/Versions/A
-MAKE_ENV+=	GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
 
 .if defined(WITHOUT_GHOSTSCRIPT)
 PLIST_SUB+=	PDFVIEW="@comment "
diff --git a/deskutils/helpviewer/Makefile b/deskutils/helpviewer/Makefile
index 80f20e8ed5e4..37c679dc40ff 100644
--- a/deskutils/helpviewer/Makefile
+++ b/deskutils/helpviewer/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	helpviewer
 PORTVERSION=	0.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	http://www.roard.com/helpviewer/download/
 DISTNAME=	HelpViewer-${PORTVERSION}
@@ -21,6 +21,6 @@ post-patch:
 		${WRKSRC}/TextFormatterXLP.h
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/Local/Applications/HelpViewer.app/HelpViewer
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Applications/HelpViewer.app/HelpViewer
 
 .include <bsd.port.mk>
diff --git a/deskutils/helpviewer/pkg-plist b/deskutils/helpviewer/pkg-plist
index 9c9d3179d394..1b54bae54e0d 100644
--- a/deskutils/helpviewer/pkg-plist
+++ b/deskutils/helpviewer/pkg-plist
@@ -1,35 +1,35 @@
-GNUstep/Local/Applications/HelpViewer.app/HelpViewer
-GNUstep/Local/Applications/HelpViewer.app/Resources/Back.tiff
-GNUstep/Local/Applications/HelpViewer.app/Resources/Bookshelf.tiff
-GNUstep/Local/Applications/HelpViewer.app/Resources/HelpViewer.desktop
-GNUstep/Local/Applications/HelpViewer.app/Resources/HelpViewer.help/.gwdir
-GNUstep/Local/Applications/HelpViewer.app/Resources/HelpViewer.help/Bases.xlp
-GNUstep/Local/Applications/HelpViewer.app/Resources/HelpViewer.help/Creation.xlp
-GNUstep/Local/Applications/HelpViewer.app/Resources/HelpViewer.help/Introduction.xlp
-GNUstep/Local/Applications/HelpViewer.app/Resources/HelpViewer.help/Logo.tiff
-GNUstep/Local/Applications/HelpViewer.app/Resources/HelpViewer.help/ToDo.xlp
-GNUstep/Local/Applications/HelpViewer.app/Resources/HelpViewer.help/attention.png
-GNUstep/Local/Applications/HelpViewer.app/Resources/HelpViewer.help/helpviewer-200.tiff
-GNUstep/Local/Applications/HelpViewer.app/Resources/HelpViewer.help/main.xlp
-GNUstep/Local/Applications/HelpViewer.app/Resources/HelpViewer.help/note.png
-GNUstep/Local/Applications/HelpViewer.app/Resources/HelpViewer.tiff
-GNUstep/Local/Applications/HelpViewer.app/Resources/Icon-hlpd.tiff
-GNUstep/Local/Applications/HelpViewer.app/Resources/Index.tiff
-GNUstep/Local/Applications/HelpViewer.app/Resources/Info-gnustep.plist
-GNUstep/Local/Applications/HelpViewer.app/Resources/Logo.tiff
-GNUstep/Local/Applications/HelpViewer.app/Resources/Main.gorm/data.classes
-GNUstep/Local/Applications/HelpViewer.app/Resources/Main.gorm/objects.gorm
-GNUstep/Local/Applications/HelpViewer.app/Resources/Point.tiff
-GNUstep/Local/Applications/HelpViewer.app/Resources/Point2.tiff
-GNUstep/Local/Applications/HelpViewer.app/Resources/Search.tiff
-GNUstep/Local/Applications/HelpViewer.app/Resources/caution.png
-GNUstep/Local/Applications/HelpViewer.app/Resources/chapter.tiff
-GNUstep/Local/Applications/HelpViewer.app/Resources/errorloading.tiff
-GNUstep/Local/Applications/HelpViewer.app/Resources/helpviewer-200.tiff
-GNUstep/Local/Applications/HelpViewer.app/Resources/information.png
-GNUstep/Local/Applications/HelpViewer.app/Resources/listing.png
-GNUstep/Local/Applications/HelpViewer.app/Resources/note.png
-GNUstep/Local/Applications/HelpViewer.app/Resources/notloaded.tiff
-GNUstep/Local/Applications/HelpViewer.app/Resources/part.tiff
-GNUstep/Local/Applications/HelpViewer.app/stamp.make
-GNUstep/Local/Tools/HelpViewer
+GNUstep/System/Applications/HelpViewer.app/HelpViewer
+GNUstep/System/Applications/HelpViewer.app/Resources/Back.tiff
+GNUstep/System/Applications/HelpViewer.app/Resources/Bookshelf.tiff
+GNUstep/System/Applications/HelpViewer.app/Resources/HelpViewer.desktop
+GNUstep/System/Applications/HelpViewer.app/Resources/HelpViewer.help/.gwdir
+GNUstep/System/Applications/HelpViewer.app/Resources/HelpViewer.help/Bases.xlp
+GNUstep/System/Applications/HelpViewer.app/Resources/HelpViewer.help/Creation.xlp
+GNUstep/System/Applications/HelpViewer.app/Resources/HelpViewer.help/Introduction.xlp
+GNUstep/System/Applications/HelpViewer.app/Resources/HelpViewer.help/Logo.tiff
+GNUstep/System/Applications/HelpViewer.app/Resources/HelpViewer.help/ToDo.xlp
+GNUstep/System/Applications/HelpViewer.app/Resources/HelpViewer.help/attention.png
+GNUstep/System/Applications/HelpViewer.app/Resources/HelpViewer.help/helpviewer-200.tiff
+GNUstep/System/Applications/HelpViewer.app/Resources/HelpViewer.help/main.xlp
+GNUstep/System/Applications/HelpViewer.app/Resources/HelpViewer.help/note.png
+GNUstep/System/Applications/HelpViewer.app/Resources/HelpViewer.tiff
+GNUstep/System/Applications/HelpViewer.app/Resources/Icon-hlpd.tiff
+GNUstep/System/Applications/HelpViewer.app/Resources/Index.tiff
+GNUstep/System/Applications/HelpViewer.app/Resources/Info-gnustep.plist
+GNUstep/System/Applications/HelpViewer.app/Resources/Logo.tiff
+GNUstep/System/Applications/HelpViewer.app/Resources/Main.gorm/data.classes
+GNUstep/System/Applications/HelpViewer.app/Resources/Main.gorm/objects.gorm
+GNUstep/System/Applications/HelpViewer.app/Resources/Point.tiff
+GNUstep/System/Applications/HelpViewer.app/Resources/Point2.tiff
+GNUstep/System/Applications/HelpViewer.app/Resources/Search.tiff
+GNUstep/System/Applications/HelpViewer.app/Resources/caution.png
+GNUstep/System/Applications/HelpViewer.app/Resources/chapter.tiff
+GNUstep/System/Applications/HelpViewer.app/Resources/errorloading.tiff
+GNUstep/System/Applications/HelpViewer.app/Resources/helpviewer-200.tiff
+GNUstep/System/Applications/HelpViewer.app/Resources/information.png
+GNUstep/System/Applications/HelpViewer.app/Resources/listing.png
+GNUstep/System/Applications/HelpViewer.app/Resources/note.png
+GNUstep/System/Applications/HelpViewer.app/Resources/notloaded.tiff
+GNUstep/System/Applications/HelpViewer.app/Resources/part.tiff
+GNUstep/System/Applications/HelpViewer.app/stamp.make
+GNUstep/System/Tools/HelpViewer
diff --git a/deskutils/plopfolio/Makefile b/deskutils/plopfolio/Makefile
index b9b35dd348b1..52512c1c22d5 100644
--- a/deskutils/plopfolio/Makefile
+++ b/deskutils/plopfolio/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	plopfolio
 PORTVERSION=	0.1.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	GNUSTEP/usr-apps
 
@@ -21,6 +21,6 @@ post-patch:
 		${WRKSRC}/PreferencesPanelController.m
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/Local/Applications/PlopFolio.app/PlopFolio
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Applications/PlopFolio.app/PlopFolio
 
 .include <bsd.port.mk>
diff --git a/deskutils/plopfolio/pkg-plist b/deskutils/plopfolio/pkg-plist
index 495d565bbbd0..e76417265872 100644
--- a/deskutils/plopfolio/pkg-plist
+++ b/deskutils/plopfolio/pkg-plist
@@ -1,26 +1,26 @@
-GNUstep/Local/Applications/PlopFolio.app/PlopFolio
-GNUstep/Local/Applications/PlopFolio.app/Resources/English.lproj/Localizable.strings
-GNUstep/Local/Applications/PlopFolio.app/Resources/Info-gnustep.plist
-GNUstep/Local/Applications/PlopFolio.app/Resources/PlopFolio.desktop
-GNUstep/Local/Applications/PlopFolio.app/Resources/PlopFolio.tiff
-GNUstep/Local/Applications/PlopFolio.app/Resources/anim1.tiff
-GNUstep/Local/Applications/PlopFolio.app/Resources/anim10.tiff
-GNUstep/Local/Applications/PlopFolio.app/Resources/anim11.tiff
-GNUstep/Local/Applications/PlopFolio.app/Resources/anim12.tiff
-GNUstep/Local/Applications/PlopFolio.app/Resources/anim13.tiff
-GNUstep/Local/Applications/PlopFolio.app/Resources/anim14.tiff
-GNUstep/Local/Applications/PlopFolio.app/Resources/anim15.tiff
-GNUstep/Local/Applications/PlopFolio.app/Resources/anim16.tiff
-GNUstep/Local/Applications/PlopFolio.app/Resources/anim2.tiff
-GNUstep/Local/Applications/PlopFolio.app/Resources/anim3.tiff
-GNUstep/Local/Applications/PlopFolio.app/Resources/anim4.tiff
-GNUstep/Local/Applications/PlopFolio.app/Resources/anim5.tiff
-GNUstep/Local/Applications/PlopFolio.app/Resources/anim6.tiff
-GNUstep/Local/Applications/PlopFolio.app/Resources/anim7.tiff
-GNUstep/Local/Applications/PlopFolio.app/Resources/anim8.tiff
-GNUstep/Local/Applications/PlopFolio.app/Resources/anim9.tiff
-GNUstep/Local/Applications/PlopFolio.app/Resources/reload.tiff
-GNUstep/Local/Applications/PlopFolio.app/Resources/resize.tiff
-GNUstep/Local/Applications/PlopFolio.app/Resources/stop.tiff
-GNUstep/Local/Applications/PlopFolio.app/stamp.make
-GNUstep/Local/Tools/PlopFolio
+GNUstep/System/Applications/PlopFolio.app/PlopFolio
+GNUstep/System/Applications/PlopFolio.app/Resources/English.lproj/Localizable.strings
+GNUstep/System/Applications/PlopFolio.app/Resources/Info-gnustep.plist
+GNUstep/System/Applications/PlopFolio.app/Resources/PlopFolio.desktop
+GNUstep/System/Applications/PlopFolio.app/Resources/PlopFolio.tiff
+GNUstep/System/Applications/PlopFolio.app/Resources/anim1.tiff
+GNUstep/System/Applications/PlopFolio.app/Resources/anim10.tiff
+GNUstep/System/Applications/PlopFolio.app/Resources/anim11.tiff
+GNUstep/System/Applications/PlopFolio.app/Resources/anim12.tiff
+GNUstep/System/Applications/PlopFolio.app/Resources/anim13.tiff
+GNUstep/System/Applications/PlopFolio.app/Resources/anim14.tiff
+GNUstep/System/Applications/PlopFolio.app/Resources/anim15.tiff
+GNUstep/System/Applications/PlopFolio.app/Resources/anim16.tiff
+GNUstep/System/Applications/PlopFolio.app/Resources/anim2.tiff
+GNUstep/System/Applications/PlopFolio.app/Resources/anim3.tiff
+GNUstep/System/Applications/PlopFolio.app/Resources/anim4.tiff
+GNUstep/System/Applications/PlopFolio.app/Resources/anim5.tiff
+GNUstep/System/Applications/PlopFolio.app/Resources/anim6.tiff
+GNUstep/System/Applications/PlopFolio.app/Resources/anim7.tiff
+GNUstep/System/Applications/PlopFolio.app/Resources/anim8.tiff
+GNUstep/System/Applications/PlopFolio.app/Resources/anim9.tiff
+GNUstep/System/Applications/PlopFolio.app/Resources/reload.tiff
+GNUstep/System/Applications/PlopFolio.app/Resources/resize.tiff
+GNUstep/System/Applications/PlopFolio.app/Resources/stop.tiff
+GNUstep/System/Applications/PlopFolio.app/stamp.make
+GNUstep/System/Tools/PlopFolio
diff --git a/deskutils/preferences/Makefile b/deskutils/preferences/Makefile
index be2142b4145b..9f90bbef26f7 100644
--- a/deskutils/preferences/Makefile
+++ b/deskutils/preferences/Makefile
@@ -18,7 +18,6 @@ USE_GNUSTEP=	back build
 USE_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 
 DEAFULT_LIBVERSION=	1.1.1
-MAKE_ENV+=	GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
 MODIFY=		GNUmakefile.preamble PrefsModule/GNUmakefile.preamble \
 		Modules/Keyboard/GNUmakefile.preamble \
 		Modules/PrefsApp/GNUmakefile.preamble
diff --git a/deskutils/simpleagenda/Makefile b/deskutils/simpleagenda/Makefile
index 85745667efee..4861bc42ce72 100644
--- a/deskutils/simpleagenda/Makefile
+++ b/deskutils/simpleagenda/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	simpleagenda
 PORTVERSION=	0.43
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	http://coyote.octets.fr/pub/gnustep/
 DISTNAME=	SimpleAgenda-${PORTVERSION}
diff --git a/deskutils/simpleagenda/pkg-plist b/deskutils/simpleagenda/pkg-plist
index bf7c09d133b7..b1904734b877 100644
--- a/deskutils/simpleagenda/pkg-plist
+++ b/deskutils/simpleagenda/pkg-plist
@@ -1,39 +1,39 @@
-GNUstep/Local/Applications/SimpleAgenda.app/Resources/1left.tiff
-GNUstep/Local/Applications/SimpleAgenda.app/Resources/1right.tiff
-GNUstep/Local/Applications/SimpleAgenda.app/Resources/2left.tiff
-GNUstep/Local/Applications/SimpleAgenda.app/Resources/2right.tiff
-GNUstep/Local/Applications/SimpleAgenda.app/Resources/Agenda.gorm/data.classes
-GNUstep/Local/Applications/SimpleAgenda.app/Resources/Agenda.gorm/data.info
-GNUstep/Local/Applications/SimpleAgenda.app/Resources/Agenda.gorm/objects.gorm
-GNUstep/Local/Applications/SimpleAgenda.app/Resources/Alarm.gorm/data.classes
-GNUstep/Local/Applications/SimpleAgenda.app/Resources/Alarm.gorm/data.info
-GNUstep/Local/Applications/SimpleAgenda.app/Resources/Alarm.gorm/objects.gorm
-GNUstep/Local/Applications/SimpleAgenda.app/Resources/Appointment.gorm/data.classes
-GNUstep/Local/Applications/SimpleAgenda.app/Resources/Appointment.gorm/data.info
-GNUstep/Local/Applications/SimpleAgenda.app/Resources/Appointment.gorm/objects.gorm
-GNUstep/Local/Applications/SimpleAgenda.app/Resources/Calendar.tiff
-GNUstep/Local/Applications/SimpleAgenda.app/Resources/English.lproj/Localizable.strings
-GNUstep/Local/Applications/SimpleAgenda.app/Resources/French.lproj/Localizable.strings
-GNUstep/Local/Applications/SimpleAgenda.app/Resources/GroupDAV.gorm/data.classes
-GNUstep/Local/Applications/SimpleAgenda.app/Resources/GroupDAV.gorm/data.info
-GNUstep/Local/Applications/SimpleAgenda.app/Resources/GroupDAV.gorm/objects.gorm
-GNUstep/Local/Applications/SimpleAgenda.app/Resources/Info-gnustep.plist
-GNUstep/Local/Applications/SimpleAgenda.app/Resources/Preferences.gorm/data.classes
-GNUstep/Local/Applications/SimpleAgenda.app/Resources/Preferences.gorm/data.info
-GNUstep/Local/Applications/SimpleAgenda.app/Resources/Preferences.gorm/objects.gorm
-GNUstep/Local/Applications/SimpleAgenda.app/Resources/SimpleAgenda.desktop
-GNUstep/Local/Applications/SimpleAgenda.app/Resources/Task.gorm/data.classes
-GNUstep/Local/Applications/SimpleAgenda.app/Resources/Task.gorm/data.info
-GNUstep/Local/Applications/SimpleAgenda.app/Resources/Task.gorm/objects.gorm
-GNUstep/Local/Applications/SimpleAgenda.app/Resources/bell.tiff
-GNUstep/Local/Applications/SimpleAgenda.app/Resources/iCalendar.gorm/data.classes
-GNUstep/Local/Applications/SimpleAgenda.app/Resources/iCalendar.gorm/data.info
-GNUstep/Local/Applications/SimpleAgenda.app/Resources/iCalendar.gorm/objects.gorm
-GNUstep/Local/Applications/SimpleAgenda.app/Resources/iCalendar.gorm/warning.tiff
-GNUstep/Local/Applications/SimpleAgenda.app/Resources/ical-file.tiff
-GNUstep/Local/Applications/SimpleAgenda.app/Resources/repeat.tiff
-GNUstep/Local/Applications/SimpleAgenda.app/Resources/small-bell.tiff
-GNUstep/Local/Applications/SimpleAgenda.app/SimpleAgenda
-GNUstep/Local/Applications/SimpleAgenda.app/stamp.make
-GNUstep/Local/Tools/SimpleAgenda
-GNUstep/Local/Applications/SimpleAgenda.app/Resources/Italian.lproj/Localizable.strings
+GNUstep/System/Applications/SimpleAgenda.app/Resources/1left.tiff
+GNUstep/System/Applications/SimpleAgenda.app/Resources/1right.tiff
+GNUstep/System/Applications/SimpleAgenda.app/Resources/2left.tiff
+GNUstep/System/Applications/SimpleAgenda.app/Resources/2right.tiff
+GNUstep/System/Applications/SimpleAgenda.app/Resources/Agenda.gorm/data.classes
+GNUstep/System/Applications/SimpleAgenda.app/Resources/Agenda.gorm/data.info
+GNUstep/System/Applications/SimpleAgenda.app/Resources/Agenda.gorm/objects.gorm
+GNUstep/System/Applications/SimpleAgenda.app/Resources/Alarm.gorm/data.classes
+GNUstep/System/Applications/SimpleAgenda.app/Resources/Alarm.gorm/data.info
+GNUstep/System/Applications/SimpleAgenda.app/Resources/Alarm.gorm/objects.gorm
+GNUstep/System/Applications/SimpleAgenda.app/Resources/Appointment.gorm/data.classes
+GNUstep/System/Applications/SimpleAgenda.app/Resources/Appointment.gorm/data.info
+GNUstep/System/Applications/SimpleAgenda.app/Resources/Appointment.gorm/objects.gorm
+GNUstep/System/Applications/SimpleAgenda.app/Resources/Calendar.tiff
+GNUstep/System/Applications/SimpleAgenda.app/Resources/English.lproj/Localizable.strings
+GNUstep/System/Applications/SimpleAgenda.app/Resources/French.lproj/Localizable.strings
+GNUstep/System/Applications/SimpleAgenda.app/Resources/GroupDAV.gorm/data.classes
+GNUstep/System/Applications/SimpleAgenda.app/Resources/GroupDAV.gorm/data.info
+GNUstep/System/Applications/SimpleAgenda.app/Resources/GroupDAV.gorm/objects.gorm
+GNUstep/System/Applications/SimpleAgenda.app/Resources/Info-gnustep.plist
+GNUstep/System/Applications/SimpleAgenda.app/Resources/Preferences.gorm/data.classes
+GNUstep/System/Applications/SimpleAgenda.app/Resources/Preferences.gorm/data.info
+GNUstep/System/Applications/SimpleAgenda.app/Resources/Preferences.gorm/objects.gorm
+GNUstep/System/Applications/SimpleAgenda.app/Resources/SimpleAgenda.desktop
+GNUstep/System/Applications/SimpleAgenda.app/Resources/Task.gorm/data.classes
+GNUstep/System/Applications/SimpleAgenda.app/Resources/Task.gorm/data.info
+GNUstep/System/Applications/SimpleAgenda.app/Resources/Task.gorm/objects.gorm
+GNUstep/System/Applications/SimpleAgenda.app/Resources/bell.tiff
+GNUstep/System/Applications/SimpleAgenda.app/Resources/iCalendar.gorm/data.classes
+GNUstep/System/Applications/SimpleAgenda.app/Resources/iCalendar.gorm/data.info
+GNUstep/System/Applications/SimpleAgenda.app/Resources/iCalendar.gorm/objects.gorm
+GNUstep/System/Applications/SimpleAgenda.app/Resources/iCalendar.gorm/warning.tiff
+GNUstep/System/Applications/SimpleAgenda.app/Resources/ical-file.tiff
+GNUstep/System/Applications/SimpleAgenda.app/Resources/repeat.tiff
+GNUstep/System/Applications/SimpleAgenda.app/Resources/small-bell.tiff
+GNUstep/System/Applications/SimpleAgenda.app/SimpleAgenda
+GNUstep/System/Applications/SimpleAgenda.app/stamp.make
+GNUstep/System/Tools/SimpleAgenda
+GNUstep/System/Applications/SimpleAgenda.app/Resources/Italian.lproj/Localizable.strings
diff --git a/deskutils/systempreferences/Makefile b/deskutils/systempreferences/Makefile
index 8b443b5633dc..194f46184316 100644
--- a/deskutils/systempreferences/Makefile
+++ b/deskutils/systempreferences/Makefile
@@ -17,6 +17,4 @@ USE_GNUSTEP=	back build
 DEFAULT_LIBVERSION=	1.0.0
 USE_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 
-MAKE_ENV+=	GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
-
 .include <bsd.port.mk>
diff --git a/deskutils/toolboxkit/Makefile b/deskutils/toolboxkit/Makefile
index 04f72016247e..5cca5a4c3c8c 100644
--- a/deskutils/toolboxkit/Makefile
+++ b/deskutils/toolboxkit/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	toolbox
 PORTVERSION=	0.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	http://ftp.azc.uam.mx/mirrors/gnu/savannah/files/toolbox/Release.pkg/0.8/ \
 		LOCAL/dinoex
@@ -21,6 +21,6 @@ USE_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 WRKSRC=		${WRKDIR}/Toolbox/Toolbox
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/Local/Library/Libraries/libToolbox.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Library/Libraries/libToolbox.so
 
 .include <bsd.port.mk>
diff --git a/deskutils/toolboxkit/pkg-plist b/deskutils/toolboxkit/pkg-plist
index be9c69ec77cf..f141f3ee1f3e 100644
--- a/deskutils/toolboxkit/pkg-plist
+++ b/deskutils/toolboxkit/pkg-plist
@@ -1,6 +1,6 @@
-GNUstep/Local/Library/Headers/Toolbox/BundleLoader.h
-GNUstep/Local/Library/Headers/Toolbox/ToolboxBundleProtocol.h
-GNUstep/Local/Library/Headers/Toolbox/Utilities.h
-GNUstep/Local/Library/Libraries/libToolbox.so
-GNUstep/Local/Library/Libraries/libToolbox.so.%%MAJORLIBVERSION%%
-GNUstep/Local/Library/Libraries/libToolbox.so.%%LIBVERSION%%
+GNUstep/System/Library/Headers/Toolbox/BundleLoader.h
+GNUstep/System/Library/Headers/Toolbox/ToolboxBundleProtocol.h
+GNUstep/System/Library/Headers/Toolbox/Utilities.h
+GNUstep/System/Library/Libraries/libToolbox.so
+GNUstep/System/Library/Libraries/libToolbox.so.%%MAJORLIBVERSION%%
+GNUstep/System/Library/Libraries/libToolbox.so.%%LIBVERSION%%