2 files changed, 13 insertions, 12 deletions

diff --git a/misc/gnustep-examples/Makefile b/misc/gnustep-examples/Makefile
index 4f66335b15d4..975cc4d3a73a 100644
--- a/misc/gnustep-examples/Makefile
+++ b/misc/gnustep-examples/Makefile
@@ -23,5 +23,6 @@ USE_GNUSTEP_INSTALL=	yes
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 USE_GNUSTEP_MAKE_DIRS+=	. gui/Finger gui/GFractal gui/HostAddress
+MAKE_ENV+=	GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT}
 
 .include <bsd.port.mk>
diff --git a/misc/gnustep-examples/pkg-plist b/misc/gnustep-examples/pkg-plist
index 5bff544e8127..6258732dbcaf 100644
--- a/misc/gnustep-examples/pkg-plist
+++ b/misc/gnustep-examples/pkg-plist
@@ -2,12 +2,10 @@ Local/Applications/Calculator.app/Calculator
 Local/Applications/Calculator.app/Resources/Calculator.app.tiff
 Local/Applications/Calculator.app/Resources/Calculator.desktop
 Local/Applications/Calculator.app/Resources/Info-gnustep.plist
-Local/Applications/Calculator.app/library_paths.openapp
 Local/Applications/Calculator.app/stamp.make
 Local/Applications/CurrencyConverter.app/CurrencyConverter
 Local/Applications/CurrencyConverter.app/Resources/CurrencyConverter.desktop
 Local/Applications/CurrencyConverter.app/Resources/Info-gnustep.plist
-Local/Applications/CurrencyConverter.app/library_paths.openapp
 Local/Applications/CurrencyConverter.app/stamp.make
 Local/Applications/Finger.app/Finger
 Local/Applications/Finger.app/Resources/Finger.desktop
@@ -22,24 +20,20 @@ Local/Applications/Finger.app/Resources/traceroute.tiff
 Local/Applications/Finger.app/Resources/traceroute32.tiff
 Local/Applications/Finger.app/Resources/whois.tiff
 Local/Applications/Finger.app/Resources/whois32.tiff
-Local/Applications/Finger.app/library_paths.openapp
 Local/Applications/Finger.app/stamp.make
 Local/Applications/GFractal.app/GFractal
 Local/Applications/GFractal.app/Resources/GFractal.desktop
 Local/Applications/GFractal.app/Resources/Info-gnustep.plist
-Local/Applications/GFractal.app/library_paths.openapp
 Local/Applications/GFractal.app/stamp.make
 Local/Applications/GSTest.app/GSTest
 Local/Applications/GSTest.app/Resources/GSTest.desktop
 Local/Applications/GSTest.app/Resources/Info-gnustep.plist
 Local/Applications/GSTest.app/Resources/MainMenu.gorm/data.classes
 Local/Applications/GSTest.app/Resources/MainMenu.gorm/objects.gorm
-Local/Applications/GSTest.app/library_paths.openapp
 Local/Applications/GSTest.app/stamp.make
 Local/Applications/HostAddress.app/HostAddress
 Local/Applications/HostAddress.app/Resources/HostAddress.desktop
 Local/Applications/HostAddress.app/Resources/Info-gnustep.plist
-Local/Applications/HostAddress.app/library_paths.openapp
 Local/Applications/HostAddress.app/stamp.make
 Local/Applications/Ink.app/Ink
 Local/Applications/Ink.app/Resources/Document.gorm/data.classes
@@ -53,33 +47,27 @@ Local/Applications/Ink.app/Resources/FileIcon_txt.tiff
 Local/Applications/Ink.app/Resources/Info-gnustep.plist
 Local/Applications/Ink.app/Resources/Ink.desktop
 Local/Applications/Ink.app/Resources/Ink_app.tiff
-Local/Applications/Ink.app/library_paths.openapp
 Local/Applications/Ink.app/stamp.make
 Local/Applications/NSBrowserTest.app/NSBrowserTest
 Local/Applications/NSBrowserTest.app/Resources/Info-gnustep.plist
 Local/Applications/NSBrowserTest.app/Resources/NSBrowserTest.desktop
-Local/Applications/NSBrowserTest.app/library_paths.openapp
 Local/Applications/NSBrowserTest.app/stamp.make
 Local/Applications/NSImageTest.app/NSImageTest
 Local/Applications/NSImageTest.app/Resources/Info-gnustep.plist
 Local/Applications/NSImageTest.app/Resources/NSImageTest.desktop
-Local/Applications/NSImageTest.app/library_paths.openapp
 Local/Applications/NSImageTest.app/stamp.make
 Local/Applications/NSPanelTest.app/NSPanelTest
 Local/Applications/NSPanelTest.app/Resources/Info-gnustep.plist
 Local/Applications/NSPanelTest.app/Resources/NSPanelTest.desktop
 Local/Applications/NSPanelTest.app/Resources/Test.strings
 Local/Applications/NSPanelTest.app/Resources/icon.tiff
-Local/Applications/NSPanelTest.app/library_paths.openapp
 Local/Applications/NSPanelTest.app/stamp.make
 Local/Applications/NSScreenTest.app/NSScreenTest
 Local/Applications/NSScreenTest.app/Resources/Info-gnustep.plist
 Local/Applications/NSScreenTest.app/Resources/NSScreenTest.desktop
-Local/Applications/NSScreenTest.app/library_paths.openapp
 Local/Applications/NSScreenTest.app/stamp.make
 Local/Applications/md5Digest.app/Resources/Info-gnustep.plist
 Local/Applications/md5Digest.app/Resources/md5Digest.desktop
-Local/Applications/md5Digest.app/library_paths.openapp
 Local/Applications/md5Digest.app/md5Digest
 Local/Applications/md5Digest.app/stamp.make
 Local/Library/ApplicationSupport/GSTest/Composite-test.bundle/Composite-test
@@ -138,6 +126,18 @@ Local/Library/ApplicationSupport/GSTest/StringDrawing-test.bundle/StringDrawing-
 Local/Library/ApplicationSupport/GSTest/StringDrawing-test.bundle/stamp.make
 Local/Library/Services/example.service/Resources/Info-gnustep.plist
 Local/Library/Services/example.service/example
+Local/Tools/Calculator
+Local/Tools/CurrencyConverter
+Local/Tools/Finger
+Local/Tools/GFractal
+Local/Tools/GSTest
+Local/Tools/HostAddress
+Local/Tools/Ink
+Local/Tools/NSBrowserTest
+Local/Tools/NSImageTest
+Local/Tools/NSPanelTest
+Local/Tools/NSScreenTest
+Local/Tools/md5Digest
 @dirrm Local/Library/Services/example.service/Resources
 @dirrm Local/Library/Services/example.service
 @dirrm Local/Library/ApplicationSupport/GSTest/StringDrawing-test.bundle/Resources