11 files changed, 99 insertions, 93 deletions

diff --git a/graphics/camerakit/pkg-plist b/graphics/camerakit/pkg-plist
index dcc21915dea1..92a302a3c0ee 100644
--- a/graphics/camerakit/pkg-plist
+++ b/graphics/camerakit/pkg-plist
@@ -1,19 +1,21 @@
+Local/Library/Frameworks/CameraKit.framework/CameraKit
 Local/Library/Frameworks/CameraKit.framework/Headers
 Local/Library/Frameworks/CameraKit.framework/Resources
-Local/Library/Frameworks/CameraKit.framework/Versions/A/CameraKit
-Local/Library/Frameworks/CameraKit.framework/Versions/A/Headers/GSCamera.h
-Local/Library/Frameworks/CameraKit.framework/Versions/A/Headers/GSGPhoto2.h
-Local/Library/Frameworks/CameraKit.framework/Versions/A/Resources/Info-gnustep.plist
-Local/Library/Frameworks/CameraKit.framework/Versions/A/libCameraKit.so
-Local/Library/Frameworks/CameraKit.framework/Versions/A/libCameraKit.so.%%MAJORVERSION%%
-Local/Library/Frameworks/CameraKit.framework/Versions/A/libCameraKit.so.%%VERSION%%
+Local/Library/Frameworks/CameraKit.framework/Versions/%%MAJORVERSION%%/CameraKit
+Local/Library/Frameworks/CameraKit.framework/Versions/%%MAJORVERSION%%/Headers/GSCamera.h
+Local/Library/Frameworks/CameraKit.framework/Versions/%%MAJORVERSION%%/Headers/GSGPhoto2.h
+Local/Library/Frameworks/CameraKit.framework/Versions/%%MAJORVERSION%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/CameraKit.framework/Versions/%%MAJORVERSION%%/libCameraKit.so
+Local/Library/Frameworks/CameraKit.framework/Versions/%%MAJORVERSION%%/libCameraKit.so.%%MAJORVERSION%%
+Local/Library/Frameworks/CameraKit.framework/Versions/%%MAJORVERSION%%/libCameraKit.so.%%VERSION%%
 Local/Library/Frameworks/CameraKit.framework/Versions/Current
+Local/Library/Frameworks/CameraKit.framework/libCameraKit.so
 Local/Library/Headers/CameraKit
 Local/Library/Libraries/libCameraKit.so
 Local/Library/Libraries/libCameraKit.so.%%MAJORVERSION%%
 Local/Library/Libraries/libCameraKit.so.%%VERSION%%
-@dirrm Local/Library/Frameworks/CameraKit.framework/Versions/A/Resources
-@dirrm Local/Library/Frameworks/CameraKit.framework/Versions/A/Headers
-@dirrm Local/Library/Frameworks/CameraKit.framework/Versions/A
+@dirrm Local/Library/Frameworks/CameraKit.framework/Versions/%%MAJORVERSION%%/Resources
+@dirrm Local/Library/Frameworks/CameraKit.framework/Versions/%%MAJORVERSION%%/Headers
+@dirrm Local/Library/Frameworks/CameraKit.framework/Versions/%%MAJORVERSION%%
 @dirrm Local/Library/Frameworks/CameraKit.framework/Versions
 @dirrm Local/Library/Frameworks/CameraKit.framework
diff --git a/graphics/cenon/pkg-plist b/graphics/cenon/pkg-plist
index 92b80353a5c2..eb96142c9636 100644
--- a/graphics/cenon/pkg-plist
+++ b/graphics/cenon/pkg-plist
@@ -227,7 +227,6 @@ Local/Applications/Cenon.app/Resources/typeHPGL.tiff
 Local/Applications/Cenon.app/Resources/typeHPGL_128x128.tiff
 Local/Applications/Cenon.app/Resources/typeHPGL_48x48.tiff
 Local/Applications/Cenon.app/Resources/typePS.tiff
-Local/Applications/Cenon.app/library_paths.openapp
 Local/Applications/Cenon.app/stamp.make
 Local/Library/Cenon/.dir.tiff
 Local/Library/Cenon/Devices/.dir.tiff
@@ -383,6 +382,7 @@ Local/Library/Cenon/Projects/Cenon.cenon/output
 %%FULL%%Local/Library/Cenon/Projects/TurboDuck.cenon/document
 %%FULL%%Local/Library/Cenon/Projects/TurboDuck.cenon/output
 Local/Library/Cenon/README
+Local/Tools/Cenon
 %%FULL%%@dirrm Local/Library/Cenon/Projects/TurboDuck.cenon
 %%FULL%%@dirrm Local/Library/Cenon/Projects/Teddy.cenon
 %%FULL%%@dirrm Local/Library/Cenon/Projects/Shapes/Tree.cenon
diff --git a/graphics/fortytwo/pkg-plist b/graphics/fortytwo/pkg-plist
index 2330401c6b1f..7c978a1f1bc4 100644
--- a/graphics/fortytwo/pkg-plist
+++ b/graphics/fortytwo/pkg-plist
@@ -1,84 +1,86 @@
+Local/Library/Frameworks/FT.framework/FT
 Local/Library/Frameworks/FT.framework/Headers
 Local/Library/Frameworks/FT.framework/Resources
-Local/Library/Frameworks/FT.framework/Versions/A/FT
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FT.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTAdministrationSession.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTAdministrationSessionImpl.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTBootstrap.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTConfig.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTDefaultObjectToIdMapper.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTDefaultServiceEnvironment.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTDefaultServiceManagerImpl.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTDefines.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTDictionaryProvider.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTDictionaryService.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTDictionaryServiceForGraphImpl.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTDictionaryServiceForNodeImpl.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTDictionaryServiceLoader.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTDictionaryServiceStorageException.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTDictionaryServiceTransactionStepImpl.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTEdge.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTEdgeImpl.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTExceptions.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTGenericDictionaryProviderImpl.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTGenericTransactionOptimizer.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTGraph.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTGraphImpl.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTGraphImplTransactions.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTGraphManager.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTGraphManagerImpl.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTGraphNodeIteratorImpl.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTId.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTIdImpl.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTIdToNodeIterator.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTLogging.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTNode.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTNodeImpl.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTNotifications.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTObject.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTObjectToIdMapper.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTOrderedEdgeSet.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTOrderedEdgeSetImpl.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTOrderedReferenceSet.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTOrderedReferenceSetImpl.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTPersistentSet.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTPersistentSetImpl.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTReference.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTReferenceImpl.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTServer.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTServerImpl.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTService.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTServiceAvailability.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTServiceEnvironment.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTServiceLoader.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTServiceManager.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTSession.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTSessionImpl.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTSessionManager.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTSessionManagerImpl.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTSystemDictionary.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTTransaction.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTTransactionContext.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTTransactionImpl.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTTransactionManager.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTTransactionManagerImpl.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTTransactionOptimizer.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTTransactionSettings.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTTransactionStep.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTVersion.h
-Local/Library/Frameworks/FT.framework/Versions/A/Headers/FTVersionImpl.h
-Local/Library/Frameworks/FT.framework/Versions/A/Resources/Info-gnustep.plist
-Local/Library/Frameworks/FT.framework/Versions/A/Resources/Info.plist
-Local/Library/Frameworks/FT.framework/Versions/A/libFT.so
-Local/Library/Frameworks/FT.framework/Versions/A/libFT.so.%%MAJORLIBVERSION%%
-Local/Library/Frameworks/FT.framework/Versions/A/libFT.so.%%LIBVERSION%%
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/FT
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FT.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTAdministrationSession.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTAdministrationSessionImpl.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTBootstrap.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTConfig.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTDefaultObjectToIdMapper.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTDefaultServiceEnvironment.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTDefaultServiceManagerImpl.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTDefines.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTDictionaryProvider.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTDictionaryService.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTDictionaryServiceForGraphImpl.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTDictionaryServiceForNodeImpl.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTDictionaryServiceLoader.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTDictionaryServiceStorageException.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTDictionaryServiceTransactionStepImpl.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTEdge.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTEdgeImpl.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTExceptions.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTGenericDictionaryProviderImpl.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTGenericTransactionOptimizer.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTGraph.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTGraphImpl.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTGraphImplTransactions.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTGraphManager.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTGraphManagerImpl.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTGraphNodeIteratorImpl.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTId.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTIdImpl.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTIdToNodeIterator.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTLogging.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTNode.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTNodeImpl.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTNotifications.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTObject.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTObjectToIdMapper.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTOrderedEdgeSet.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTOrderedEdgeSetImpl.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTOrderedReferenceSet.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTOrderedReferenceSetImpl.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTPersistentSet.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTPersistentSetImpl.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTReference.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTReferenceImpl.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTServer.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTServerImpl.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTService.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTServiceAvailability.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTServiceEnvironment.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTServiceLoader.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTServiceManager.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTSession.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTSessionImpl.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTSessionManager.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTSessionManagerImpl.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTSystemDictionary.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTTransaction.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTTransactionContext.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTTransactionImpl.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTTransactionManager.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTTransactionManagerImpl.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTTransactionOptimizer.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTTransactionSettings.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTTransactionStep.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTVersion.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers/FTVersionImpl.h
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Resources/Info.plist
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/libFT.so
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/libFT.so.%%MAJORLIBVERSION%%
+Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/libFT.so.%%LIBVERSION%%
 Local/Library/Frameworks/FT.framework/Versions/Current
+Local/Library/Frameworks/FT.framework/libFT.so
 Local/Library/Headers/FT
 Local/Library/Libraries/libFT.so
 Local/Library/Libraries/libFT.so.%%MAJORLIBVERSION%%
 Local/Library/Libraries/libFT.so.%%LIBVERSION%%
-@dirrm Local/Library/Frameworks/FT.framework/Versions/A/Resources
-@dirrm Local/Library/Frameworks/FT.framework/Versions/A/Headers
-@dirrm Local/Library/Frameworks/FT.framework/Versions/A
+@dirrm Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Resources
+@dirrm Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%/Headers
+@dirrm Local/Library/Frameworks/FT.framework/Versions/%%MAJORVERSION%%
 @dirrm Local/Library/Frameworks/FT.framework/Versions
 @dirrm Local/Library/Frameworks/FT.framework
diff --git a/graphics/gnustep-slideshow/pkg-plist b/graphics/gnustep-slideshow/pkg-plist
index aa7e241af8aa..5b98f7cea70c 100644
--- a/graphics/gnustep-slideshow/pkg-plist
+++ b/graphics/gnustep-slideshow/pkg-plist
@@ -13,8 +13,8 @@ Local/Applications/SlideShow.app/Resources/quit.tiff
 Local/Applications/SlideShow.app/Resources/rotateLeft.tiff
 Local/Applications/SlideShow.app/Resources/rotateRight.tiff
 Local/Applications/SlideShow.app/SlideShow
-Local/Applications/SlideShow.app/library_paths.openapp
 Local/Applications/SlideShow.app/stamp.make
+Local/Tools/SlideShow
 @dirrm Local/Applications/SlideShow.app/Resources/English.lproj/Preferences.gorm
 @dirrm Local/Applications/SlideShow.app/Resources/English.lproj/Main.gorm
 @dirrm Local/Applications/SlideShow.app/Resources/English.lproj
diff --git a/graphics/imageviewer/pkg-plist b/graphics/imageviewer/pkg-plist
index 9bc5f95d3578..9ceb4fd070ad 100644
--- a/graphics/imageviewer/pkg-plist
+++ b/graphics/imageviewer/pkg-plist
@@ -15,8 +15,8 @@ Local/Applications/ImageViewer.app/Resources/ImageViewerInfo.plist
 Local/Applications/ImageViewer.app/Resources/Info-gnustep.plist
 Local/Applications/ImageViewer.app/Resources/README
 Local/Applications/ImageViewer.app/Resources/genericImage.tiff
-Local/Applications/ImageViewer.app/library_paths.openapp
 Local/Applications/ImageViewer.app/stamp.make
+Local/Tools/ImageViewer
 @dirrm Local/Applications/ImageViewer.app/Resources/Hungarian.lproj
 @dirrm Local/Applications/ImageViewer.app/Resources/German.lproj
 @dirrm Local/Applications/ImageViewer.app/Resources/French.lproj
diff --git a/graphics/pixen/pkg-plist b/graphics/pixen/pkg-plist
index 1b88a32ae871..1142214d09a1 100644
--- a/graphics/pixen/pkg-plist
+++ b/graphics/pixen/pkg-plist
@@ -148,8 +148,8 @@ Local/Applications/Pixen.app/Resources/zoom1%%MAJORVERSION%%%%MAJORVERSION%%.png
 Local/Applications/Pixen.app/Resources/zoomIn.png
 Local/Applications/Pixen.app/Resources/zoomOut.png
 Local/Applications/Pixen.app/Resources/zoomfit.png
-Local/Applications/Pixen.app/library_paths.openapp
 Local/Applications/Pixen.app/stamp.make
+Local/Tools/Pixen
 @dirrm Local/Applications/Pixen.app/Resources/English.lproj/PXToolProperties.gorm
 @dirrm Local/Applications/Pixen.app/Resources/English.lproj/PXToolPalette.gorm
 @dirrm Local/Applications/Pixen.app/Resources/English.lproj/PXRectangleToolPropertiesView.gorm
diff --git a/graphics/popplerkit/pkg-plist b/graphics/popplerkit/pkg-plist
index 2d2b0dffb16f..d450bedf2dc5 100644
--- a/graphics/popplerkit/pkg-plist
+++ b/graphics/popplerkit/pkg-plist
@@ -1,4 +1,5 @@
 GNUstep/Local/Library/Frameworks/PopplerKit.framework/Headers
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/PopplerKit
 GNUstep/Local/Library/Frameworks/PopplerKit.framework/Resources
 GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Headers/PopplerCachingRenderer.h
 GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Headers/PopplerCairoImageRenderer.h
@@ -30,6 +31,7 @@ GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/libPopplerKit
 GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/libPopplerKit.so.%%MAJORLIBVERSION%%
 GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/libPopplerKit.so.%%LIBVERSION%%
 GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/Current
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/libPopplerKit.so
 GNUstep/Local/Library/Headers/PopplerKit
 GNUstep/Local/Library/Libraries/libPopplerKit.so
 GNUstep/Local/Library/Libraries/libPopplerKit.so.%%MAJORLIBVERSION%%
diff --git a/graphics/preview/pkg-plist b/graphics/preview/pkg-plist
index 4561c8a8a7df..4a865d9b4b50 100644
--- a/graphics/preview/pkg-plist
+++ b/graphics/preview/pkg-plist
@@ -32,8 +32,8 @@ Local/Applications/Preview.app/Resources/fitWidth.tiff
 Local/Applications/Preview.app/Resources/fitWindow.tiff
 Local/Applications/Preview.app/Resources/hand.tiff
 Local/Applications/Preview.app/Resources/last_page.tiff
-Local/Applications/Preview.app/library_paths.openapp
 Local/Applications/Preview.app/stamp.make
+Local/Tools/Preview
 @dirrm Local/Applications/Preview.app/Resources/French.lproj/Preview.help
 @dirrm Local/Applications/Preview.app/Resources/French.lproj/Preview.gorm
 @dirrm Local/Applications/Preview.app/Resources/French.lproj/Main.gorm
diff --git a/graphics/svgviewer/pkg-plist b/graphics/svgviewer/pkg-plist
index cfe014f649bf..c03a5800d779 100644
--- a/graphics/svgviewer/pkg-plist
+++ b/graphics/svgviewer/pkg-plist
@@ -1,11 +1,11 @@
 Local/Applications/SVGViewer.app/Resources/Info-gnustep.plist
 Local/Applications/SVGViewer.app/Resources/SVGViewer.desktop
 Local/Applications/SVGViewer.app/SVGViewer
-Local/Applications/SVGViewer.app/library_paths.openapp
 Local/Applications/SVGViewer.app/stamp.make
 Local/Library/Bundles/SVGImageRep.bundle/Resources/Info-gnustep.plist
 Local/Library/Bundles/SVGImageRep.bundle/SVGImageRep
 Local/Library/Bundles/SVGImageRep.bundle/stamp.make
+Local/Tools/SVGViewer
 @dirrm Local/Library/Bundles/SVGImageRep.bundle/Resources
 @dirrm Local/Library/Bundles/SVGImageRep.bundle
 @dirrm Local/Applications/SVGViewer.app/Resources
diff --git a/graphics/vindaloo/pkg-plist b/graphics/vindaloo/pkg-plist
index f859f7138166..dd6cd1933522 100644
--- a/graphics/vindaloo/pkg-plist
+++ b/graphics/vindaloo/pkg-plist
@@ -19,8 +19,8 @@ Local/Applications/Vindaloo.app/Resources/Vindaloo.desktop
 Local/Applications/Vindaloo.app/Resources/ZoomIn.png
 Local/Applications/Vindaloo.app/Resources/ZoomOut.png
 Local/Applications/Vindaloo.app/Vindaloo
-Local/Applications/Vindaloo.app/library_paths.openapp
 Local/Applications/Vindaloo.app/stamp.make
+Local/Tools/Vindaloo
 @dirrm Local/Applications/Vindaloo.app/Resources/English.lproj/Main.gorm
 @dirrm Local/Applications/Vindaloo.app/Resources/English.lproj/Document.gorm
 @dirrm Local/Applications/Vindaloo.app/Resources/English.lproj
diff --git a/graphics/yap/pkg-plist b/graphics/yap/pkg-plist
index cfccb56af477..c7cbb75d7dde 100644
--- a/graphics/yap/pkg-plist
+++ b/graphics/yap/pkg-plist
@@ -4,7 +4,7 @@ Local/Applications/Yap.app/Resources/Info-gnustep.plist
 Local/Applications/Yap.app/Resources/Yap.desktop
 Local/Applications/Yap.app/Resources/Yap.tiff
 Local/Applications/Yap.app/Yap
-Local/Applications/Yap.app/library_paths.openapp
 Local/Applications/Yap.app/stamp.make
+Local/Tools/Yap
 @dirrm Local/Applications/Yap.app/Resources
 @dirrm Local/Applications/Yap.app