aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archivers/freetar/pkg-plist2
-rw-r--r--astro/position/Makefile1
-rw-r--r--astro/position/pkg-plist2
-rw-r--r--audio/cddb-bundle/Makefile1
-rw-r--r--audio/gnustep-cdplayer/Makefile1
-rw-r--r--audio/gnustep-cdplayer/pkg-plist2
-rw-r--r--audio/mp3towav-bundle/Makefile2
-rw-r--r--audio/mpdcon/pkg-plist2
-rw-r--r--benchmarks/gsbench/pkg-plist2
-rw-r--r--biology/biococoa/pkg-plist2
-rw-r--r--databases/fortytwo-bdb/pkg-plist54
-rw-r--r--databases/mylibrary/pkg-plist2
-rw-r--r--databases/sqlclient/Makefile1
-rw-r--r--deskutils/affiche/pkg-plist2
-rw-r--r--deskutils/appwrapper/pkg-plist2
-rw-r--r--deskutils/cartotheque/pkg-plist2
-rw-r--r--deskutils/displaycalibrator/pkg-plist2
-rw-r--r--deskutils/etoile-extendedworkspacekit/Makefile1
-rw-r--r--deskutils/etoile-hardware/pkg-plist2
-rw-r--r--deskutils/etoile-lookandbehavior/pkg-plist2
-rw-r--r--deskutils/etoile-menuserver/pkg-plist2
-rw-r--r--deskutils/etoile-servicesbarkit/Makefile1
-rw-r--r--deskutils/etoile-trackerkit/Makefile1
-rw-r--r--deskutils/gnustep-notebook/pkg-plist2
-rw-r--r--deskutils/gnustep-wrapper/Makefile10
-rw-r--r--deskutils/gnustep-wrapper/pkg-plist2
-rw-r--r--deskutils/gnuwash/pkg-plist2
-rw-r--r--deskutils/gworkspace-clipbook/Makefile1
-rw-r--r--deskutils/gworkspace-clipbook/pkg-plist2
-rw-r--r--deskutils/gworkspace-gwmetadata/Makefile1
-rw-r--r--deskutils/gworkspace-gwmetadata/pkg-plist144
-rw-r--r--deskutils/gworkspace/Makefile6
-rw-r--r--deskutils/gworkspace/pkg-plist322
-rw-r--r--deskutils/helpviewer/pkg-plist2
-rw-r--r--deskutils/mywiki/pkg-plist2
-rw-r--r--deskutils/plopfolio/pkg-plist2
-rw-r--r--deskutils/preferencepanes/pkg-plist22
-rw-r--r--deskutils/preferences.app/Makefile2
-rw-r--r--deskutils/preferences.app/pkg-plist63
-rw-r--r--deskutils/systempreferences/Makefile1
-rw-r--r--deskutils/systempreferences/pkg-plist2
-rw-r--r--deskutils/toolbox/Makefile1
-rw-r--r--deskutils/toolbox/pkg-plist2
-rw-r--r--devel/fortytwo-encore/pkg-plist92
-rw-r--r--devel/gnustep-make/Makefile25
-rw-r--r--devel/gnustep-make/distinfo6
-rw-r--r--devel/gnustep-make/pkg-plist15
-rw-r--r--devel/highlighterkit/pkg-plist38
-rw-r--r--devel/objcunit/Makefile5
-rw-r--r--devel/objcunit/pkg-plist62
-rw-r--r--devel/projectcenter.app/Makefile1
-rw-r--r--devel/projectcenter.app/pkg-plist65
-rw-r--r--devel/projectmanager/Makefile2
-rw-r--r--devel/projectmanager/pkg-plist2
-rw-r--r--devel/ruby-gnustep/Makefile4
-rw-r--r--devel/wizardkit/pkg-plist22
-rw-r--r--editors/codeeditor/Makefile1
-rw-r--r--editors/codeeditor/pkg-plist2
-rw-r--r--editors/etoile-typewriter/pkg-plist2
-rw-r--r--finance/expense/pkg-plist2
-rw-r--r--ftp/gnustep-ftp/pkg-plist2
-rw-r--r--ftp/waiho/pkg-plist2
-rw-r--r--games/fortunate/pkg-plist2
-rw-r--r--games/gmastermind/pkg-plist2
-rw-r--r--games/gmines/pkg-plist2
-rw-r--r--games/gomoku.app/pkg-plist2
-rw-r--r--games/gpuzzle/pkg-plist2
-rw-r--r--games/grubik/pkg-plist2
-rw-r--r--games/gshisen/pkg-plist2
-rw-r--r--games/jigsaw/pkg-plist2
-rw-r--r--games/nextgo/pkg-plist2
-rw-r--r--german/digibux/pkg-plist2
-rw-r--r--graphics/camerakit/pkg-plist22
-rw-r--r--graphics/cenon/pkg-plist2
-rw-r--r--graphics/fortytwo/pkg-plist152
-rw-r--r--graphics/gnustep-slideshow/pkg-plist2
-rw-r--r--graphics/imageviewer/pkg-plist2
-rw-r--r--graphics/pixen/pkg-plist2
-rw-r--r--graphics/popplerkit/pkg-plist2
-rw-r--r--graphics/preview/pkg-plist2
-rw-r--r--graphics/svgviewer/pkg-plist2
-rw-r--r--graphics/vindaloo/pkg-plist2
-rw-r--r--graphics/yap/pkg-plist2
-rw-r--r--lang/gnustep-guile/pkg-plist4
-rw-r--r--lang/gscheme/pkg-plist2
-rw-r--r--lang/steptalk/Makefile1
-rw-r--r--lang/steptalk/pkg-plist88
-rw-r--r--mail/addresses/Makefile4
-rw-r--r--mail/addresses/pkg-plist171
-rw-r--r--mail/gnumail/Makefile1
-rw-r--r--mail/gnumail/pkg-plist20
-rw-r--r--mail/pantomime/Makefile1
-rw-r--r--mail/pantomime/pkg-plist168
-rw-r--r--misc/gnustep-examples/Makefile1
-rw-r--r--misc/gnustep-examples/pkg-plist24
-rw-r--r--multimedia/etoile-babbler/pkg-plist2
-rw-r--r--multimedia/gnustep-mplayer/pkg-plist2
-rw-r--r--multimedia/poe/pkg-plist2
-rw-r--r--net/remotedesk/pkg-plist2
-rw-r--r--net/tryst-examples/pkg-plist4
-rw-r--r--news/lusernet/pkg-plist2
-rw-r--r--print/gspdf/pkg-plist2
-rw-r--r--shells/gscommander/pkg-plist2
-rw-r--r--sysutils/batmon/pkg-plist2
-rw-r--r--sysutils/burn/Makefile1
-rw-r--r--sysutils/burn/pkg-plist2
-rw-r--r--sysutils/etoile-installer/pkg-plist2
-rw-r--r--sysutils/etoile-system/Makefile3
-rw-r--r--sysutils/etoile-system/pkg-plist2
-rw-r--r--textproc/easydiff/pkg-plist2
-rw-r--r--textproc/localize/pkg-plist2
-rw-r--r--textproc/popup/pkg-plist2
-rw-r--r--www/etoile-mollusk/pkg-plist2
-rw-r--r--www/gnustep-ticker/pkg-plist2
-rw-r--r--x11-themes/etoile-azbackground/Makefile5
-rw-r--r--x11-themes/etoile-azbackground/pkg-plist2
-rw-r--r--x11-themes/etoile-camaelon/Makefile1
-rw-r--r--x11-themes/etoile-iconkit/Makefile1
-rw-r--r--x11-toolkits/gnustep-back/Makefile2
-rw-r--r--x11-toolkits/gnustep-gui/Makefile10
-rw-r--r--x11-toolkits/gnustep-gui/pkg-plist1
-rw-r--r--x11-wm/etoile-azalea/pkg-plist2
-rw-r--r--x11-wm/etoile-azdock/Makefile1
-rw-r--r--x11-wm/etoile-azdock/pkg-plist2
-rw-r--r--x11/etoile-iterm/Makefile8
-rw-r--r--x11/etoile-iterm/pkg-plist2
-rw-r--r--x11/gskrab/Makefile5
-rw-r--r--x11/gskrab/pkg-plist26
-rw-r--r--x11/innerspace/pkg-plist2
129 files changed, 983 insertions, 856 deletions
diff --git a/archivers/freetar/pkg-plist b/archivers/freetar/pkg-plist
index a6acfc6ba22e..33b25a692f43 100644
--- a/archivers/freetar/pkg-plist
+++ b/archivers/freetar/pkg-plist
@@ -10,8 +10,8 @@ Local/Applications/FreeTar.app/Resources/French.lproj/MainMenu.gorm/objects.gorm
Local/Applications/FreeTar.app/Resources/French.lproj/Preferences.gorm/data.classes
Local/Applications/FreeTar.app/Resources/French.lproj/Preferences.gorm/objects.gorm
Local/Applications/FreeTar.app/Resources/Info-gnustep.plist
-Local/Applications/FreeTar.app/library_paths.openapp
Local/Applications/FreeTar.app/stamp.make
+Local/Tools/FreeTar
@dirrm Local/Applications/FreeTar.app/Resources/French.lproj/Preferences.gorm
@dirrm Local/Applications/FreeTar.app/Resources/French.lproj/MainMenu.gorm
@dirrm Local/Applications/FreeTar.app/Resources/French.lproj
diff --git a/astro/position/Makefile b/astro/position/Makefile
index 8d7d367fb1df..6f37a9e013a1 100644
--- a/astro/position/Makefile
+++ b/astro/position/Makefile
@@ -26,6 +26,7 @@ USE_GNUSTEP_INSTALL= yes
WRKSRC= ${WRKDIR}/Position/Position
ADDITIONAL_OBJCFLAGS+= -I${LOCALBASE}/include
ADDITIONAL_LDFLAGS+= -L${LOCALBASE}/lib
+MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
PROJ4_PORT?= misc/proj4
diff --git a/astro/position/pkg-plist b/astro/position/pkg-plist
index 4b0ed8dd43cd..f943abb99bb0 100644
--- a/astro/position/pkg-plist
+++ b/astro/position/pkg-plist
@@ -209,8 +209,8 @@ System/Applications/Position.app/Resources/navigationCircle.tiff
System/Applications/Position.app/Resources/point.tiff
System/Applications/Position.app/Resources/satCircle.tiff
System/Applications/Position.app/Resources/wayPointHiLight.tiff
-System/Applications/Position.app/library_paths.openapp
System/Applications/Position.app/stamp.make
+System/Tools/Position
@dirrm System/Applications/Position.app/Resources/Resources/English.lproj/WayPointInspector.gorm
@dirrm System/Applications/Position.app/Resources/Resources/English.lproj/UnitsAndTuningPref.gorm
@dirrm System/Applications/Position.app/Resources/Resources/English.lproj/SatsInspector.gorm
diff --git a/audio/cddb-bundle/Makefile b/audio/cddb-bundle/Makefile
index a37f825875d6..7074e453743a 100644
--- a/audio/cddb-bundle/Makefile
+++ b/audio/cddb-bundle/Makefile
@@ -24,5 +24,6 @@ USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
WRKSRC= ${WRKDIR}/cddb.bundle
+MAKE_ENV+= GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT}
.include <bsd.port.mk>
diff --git a/audio/gnustep-cdplayer/Makefile b/audio/gnustep-cdplayer/Makefile
index 61c6d56a8cbd..d6e5027f48f5 100644
--- a/audio/gnustep-cdplayer/Makefile
+++ b/audio/gnustep-cdplayer/Makefile
@@ -27,6 +27,7 @@ USE_GNUSTEP_LOCAL_BUNDLES+= Cddb:${CDDB_BUNDLE_PORT}
USE_GNUSTEP_SYSTEM_LIBS+= PrefsModule:${PREFERENCES_PORT}
WRKSRC= ${WRKDIR}/${PORTNAME}
+MAKE_ENV+= GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT}
CDDB_BUNDLE_PORT?= audio/cddb-bundle
PREFERENCES_PORT?= deskutils/preferences.app
diff --git a/audio/gnustep-cdplayer/pkg-plist b/audio/gnustep-cdplayer/pkg-plist
index c0c50270b82d..218096bdf72a 100644
--- a/audio/gnustep-cdplayer/pkg-plist
+++ b/audio/gnustep-cdplayer/pkg-plist
@@ -55,7 +55,6 @@ Local/Applications/CDPlayer.app/Resources/play.tiff
Local/Applications/CDPlayer.app/Resources/prev.tiff
Local/Applications/CDPlayer.app/Resources/rwd.tiff
Local/Applications/CDPlayer.app/Resources/stop.tiff
-Local/Applications/CDPlayer.app/library_paths.openapp
Local/Applications/CDPlayer.app/stamp.make
Local/Library/Bundles/AudioCD.bundle/AudioCD
Local/Library/Bundles/AudioCD.bundle/Resources/Info-gnustep.plist
@@ -74,6 +73,7 @@ Local/Library/Preferences/AudioCD.prefs/Resources/German.lproj/AudioCD.gorm/obje
Local/Library/Preferences/AudioCD.prefs/Resources/German.lproj/Localizable.strings
Local/Library/Preferences/AudioCD.prefs/Resources/Info-gnustep.plist
Local/Library/Preferences/AudioCD.prefs/stamp.make
+Local/Tools/CDPlayer
@dirrm Local/Library/Preferences/AudioCD.prefs/Resources/German.lproj/AudioCD.gorm
@dirrm Local/Library/Preferences/AudioCD.prefs/Resources/German.lproj
@dirrm Local/Library/Preferences/AudioCD.prefs/Resources/French.lproj/AudioCD.gorm
diff --git a/audio/mp3towav-bundle/Makefile b/audio/mp3towav-bundle/Makefile
index 8e48ac2b6fb8..d22e837a951b 100644
--- a/audio/mp3towav-bundle/Makefile
+++ b/audio/mp3towav-bundle/Makefile
@@ -24,8 +24,8 @@ USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LOCAL_APPS+= Burn:${BURN_PORT}
WRKSRC= ${WRKDIR}/MP3ToWav
-#ADDITIONAL_INCLUDE_DIRS+= -IBurn
ADDITIONAL_INCLUDE_DIRS+= -I${GNUSTEP_PREFIX}/Local/Library/Headers/Burn
+MAKE_ENV+= GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT}
BURN_PORT?= sysutils/burn
diff --git a/audio/mpdcon/pkg-plist b/audio/mpdcon/pkg-plist
index dc08a9021e5f..02722543601b 100644
--- a/audio/mpdcon/pkg-plist
+++ b/audio/mpdcon/pkg-plist
@@ -48,8 +48,8 @@ Local/Applications/MPDCon.app/Resources/StatisticsViewer.gorm/data.classes
Local/Applications/MPDCon.app/Resources/StatisticsViewer.gorm/data.info
Local/Applications/MPDCon.app/Resources/StatisticsViewer.gorm/objects.gorm
Local/Applications/MPDCon.app/Resources/Stop.tiff
-Local/Applications/MPDCon.app/library_paths.openapp
Local/Applications/MPDCon.app/stamp.make
+Local/Tools/MPDCon
@dirrm Local/Applications/MPDCon.app/Resources/StatisticsViewer.gorm
@dirrm Local/Applications/MPDCon.app/Resources/Preferences.gorm
@dirrm Local/Applications/MPDCon.app/Resources/PlaylistsManager.gorm
diff --git a/benchmarks/gsbench/pkg-plist b/benchmarks/gsbench/pkg-plist
index 64b00655faa0..716bad1dd2ca 100644
--- a/benchmarks/gsbench/pkg-plist
+++ b/benchmarks/gsbench/pkg-plist
@@ -4,7 +4,6 @@ Local/Applications/GSBench.app/Resources/GSBench.desktop
Local/Applications/GSBench.app/Resources/GSBench.tiff
Local/Applications/GSBench.app/Resources/GSBenchInfo.plist
Local/Applications/GSBench.app/Resources/Info-gnustep.plist
-Local/Applications/GSBench.app/library_paths.openapp
Local/Applications/GSBench.app/stamp.make
Local/Library/Bundles/Dhry.bundle/Dhry
Local/Library/Bundles/Dhry.bundle/Resources/Info-gnustep.plist
@@ -12,6 +11,7 @@ Local/Library/Bundles/Dhry.bundle/stamp.make
Local/Library/Bundles/GSFactor.bundle/GSFactor
Local/Library/Bundles/GSFactor.bundle/Resources/Info-gnustep.plist
Local/Library/Bundles/GSFactor.bundle/stamp.make
+Local/Tools/GSBench
@dirrm Local/Library/Bundles/GSFactor.bundle/Resources
@dirrm Local/Library/Bundles/GSFactor.bundle
@dirrm Local/Library/Bundles/Dhry.bundle/Resources
diff --git a/biology/biococoa/pkg-plist b/biology/biococoa/pkg-plist
index 886d3fe3ddc1..eea54cb859a6 100644
--- a/biology/biococoa/pkg-plist
+++ b/biology/biococoa/pkg-plist
@@ -2,7 +2,7 @@ Local/Applications/BioCocoa.app/BioCocoa
Local/Applications/BioCocoa.app/Resources/BioCocoa.desktop
Local/Applications/BioCocoa.app/Resources/Info-gnustep.plist
Local/Applications/BioCocoa.app/Resources/biococoa.tiff
-Local/Applications/BioCocoa.app/library_paths.openapp
Local/Applications/BioCocoa.app/stamp.make
+Local/Tools/BioCocoa
@dirrm Local/Applications/BioCocoa.app/Resources
@dirrm Local/Applications/BioCocoa.app
diff --git a/databases/fortytwo-bdb/pkg-plist b/databases/fortytwo-bdb/pkg-plist
index ffff2fa6e7ef..1ae63a54ad46 100644
--- a/databases/fortytwo-bdb/pkg-plist
+++ b/databases/fortytwo-bdb/pkg-plist
@@ -1,36 +1,38 @@
+Local/Library/Frameworks/BDB.framework/BDB
Local/Library/Frameworks/BDB.framework/Headers
Local/Library/Frameworks/BDB.framework/Resources
-Local/Library/Frameworks/BDB.framework/Versions/A/BDB
-Local/Library/Frameworks/BDB.framework/Versions/A/Headers/BDB.h
-Local/Library/Frameworks/BDB.framework/Versions/A/Headers/BDBConfig.h
-Local/Library/Frameworks/BDB.framework/Versions/A/Headers/BDBConstants.h
-Local/Library/Frameworks/BDB.framework/Versions/A/Headers/BDBCursor.h
-Local/Library/Frameworks/BDB.framework/Versions/A/Headers/BDBCursorConfig.h
-Local/Library/Frameworks/BDB.framework/Versions/A/Headers/BDBDatabase.h
-Local/Library/Frameworks/BDB.framework/Versions/A/Headers/BDBDatabaseConfig.h
-Local/Library/Frameworks/BDB.framework/Versions/A/Headers/BDBDatabaseEntry.h
-Local/Library/Frameworks/BDB.framework/Versions/A/Headers/BDBDatabaseEntryData.h
-Local/Library/Frameworks/BDB.framework/Versions/A/Headers/BDBDatabaseRecordNumber.h
-Local/Library/Frameworks/BDB.framework/Versions/A/Headers/BDBErrorHandling.h
-Local/Library/Frameworks/BDB.framework/Versions/A/Headers/BDBExceptions.h
-Local/Library/Frameworks/BDB.framework/Versions/A/Headers/BDBLockMode.h
-Local/Library/Frameworks/BDB.framework/Versions/A/Headers/BDBObject.h
-Local/Library/Frameworks/BDB.framework/Versions/A/Headers/BDBOperationStatus.h
-Local/Library/Frameworks/BDB.framework/Versions/A/Headers/BDBSerializer.h
-Local/Library/Frameworks/BDB.framework/Versions/A/Headers/BDBTransaction.h
-Local/Library/Frameworks/BDB.framework/Versions/A/Headers/NSArchiver-BDBExtensions.h
-Local/Library/Frameworks/BDB.framework/Versions/A/Resources/Info-gnustep.plist
-Local/Library/Frameworks/BDB.framework/Versions/A/libBDB.so
-Local/Library/Frameworks/BDB.framework/Versions/A/libBDB.so.%%MAJORLIBVERSION%%
-Local/Library/Frameworks/BDB.framework/Versions/A/libBDB.so.%%LIBVERSION%%
+Local/Library/Frameworks/BDB.framework/Versions/%%MAJORVERSION%%/BDB
+Local/Library/Frameworks/BDB.framework/Versions/%%MAJORVERSION%%/Headers/BDB.h
+Local/Library/Frameworks/BDB.framework/Versions/%%MAJORVERSION%%/Headers/BDBConfig.h
+Local/Library/Frameworks/BDB.framework/Versions/%%MAJORVERSION%%/Headers/BDBConstants.h
+Local/Library/Frameworks/BDB.framework/Versions/%%MAJORVERSION%%/Headers/BDBCursor.h
+Local/Library/Frameworks/BDB.framework/Versions/%%MAJORVERSION%%/Headers/BDBCursorConfig.h
+Local/Library/Frameworks/BDB.framework/Versions/%%MAJORVERSION%%/Headers/BDBDatabase.h
+Local/Library/Frameworks/BDB.framework/Versions/%%MAJORVERSION%%/Headers/BDBDatabaseConfig.h
+Local/Library/Frameworks/BDB.framework/Versions/%%MAJORVERSION%%/Headers/BDBDatabaseEntry.h
+Local/Library/Frameworks/BDB.framework/Versions/%%MAJORVERSION%%/Headers/BDBDatabaseEntryData.h
+Local/Library/Frameworks/BDB.framework/Versions/%%MAJORVERSION%%/Headers/BDBDatabaseRecordNumber.h
+Local/Library/Frameworks/BDB.framework/Versions/%%MAJORVERSION%%/Headers/BDBErrorHandling.h
+Local/Library/Frameworks/BDB.framework/Versions/%%MAJORVERSION%%/Headers/BDBExceptions.h
+Local/Library/Frameworks/BDB.framework/Versions/%%MAJORVERSION%%/Headers/BDBLockMode.h
+Local/Library/Frameworks/BDB.framework/Versions/%%MAJORVERSION%%/Headers/BDBObject.h
+Local/Library/Frameworks/BDB.framework/Versions/%%MAJORVERSION%%/Headers/BDBOperationStatus.h
+Local/Library/Frameworks/BDB.framework/Versions/%%MAJORVERSION%%/Headers/BDBSerializer.h
+Local/Library/Frameworks/BDB.framework/Versions/%%MAJORVERSION%%/Headers/BDBTransaction.h
+Local/Library/Frameworks/BDB.framework/Versions/%%MAJORVERSION%%/Headers/NSArchiver-BDBExtensions.h
+Local/Library/Frameworks/BDB.framework/Versions/%%MAJORVERSION%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/BDB.framework/Versions/%%MAJORVERSION%%/libBDB.so
+Local/Library/Frameworks/BDB.framework/Versions/%%MAJORVERSION%%/libBDB.so.%%MAJORLIBVERSION%%
+Local/Library/Frameworks/BDB.framework/Versions/%%MAJORVERSION%%/libBDB.so.%%LIBVERSION%%
Local/Library/Frameworks/BDB.framework/Versions/Current
+Local/Library/Frameworks/BDB.framework/libBDB.so
Local/Library/Headers/BDB
Local/Library/Libraries/libBDB.so
Local/Library/Libraries/libBDB.so.%%MAJORLIBVERSION%%
Local/Library/Libraries/libBDB.so.%%LIBVERSION%%
-@dirrm Local/Library/Frameworks/BDB.framework/Versions/A/Resources
-@dirrm Local/Library/Frameworks/BDB.framework/Versions/A/Headers
-@dirrm Local/Library/Frameworks/BDB.framework/Versions/A
+@dirrm Local/Library/Frameworks/BDB.framework/Versions/%%MAJORVERSION%%/Resources
+@dirrm Local/Library/Frameworks/BDB.framework/Versions/%%MAJORVERSION%%/Headers
+@dirrm Local/Library/Frameworks/BDB.framework/Versions/%%MAJORVERSION%%
@dirrm Local/Library/Frameworks/BDB.framework/Versions
@dirrm Local/Library/Frameworks/BDB.framework
%%PORTDOCS%%%%DOCSDIR%%/BDB/BDB.html
diff --git a/databases/mylibrary/pkg-plist b/databases/mylibrary/pkg-plist
index 2789bdb67bc4..7b0c83fe2edb 100644
--- a/databases/mylibrary/pkg-plist
+++ b/databases/mylibrary/pkg-plist
@@ -46,8 +46,8 @@ Local/Applications/MyLibrary.app/Resources/refresh12.png
Local/Applications/MyLibrary.app/Resources/remove11.png
Local/Applications/MyLibrary.app/Resources/remove12.png
Local/Applications/MyLibrary.app/Resources/remove13.png
-Local/Applications/MyLibrary.app/library_paths.openapp
Local/Applications/MyLibrary.app/stamp.make
+Local/Tools/MyLibrary
@dirrm Local/Applications/MyLibrary.app/Resources/English.lproj/SummaryViewer.gorm
@dirrm Local/Applications/MyLibrary.app/Resources/English.lproj/SmartFolderEditor.gorm
@dirrm Local/Applications/MyLibrary.app/Resources/English.lproj/MainLibrary.gorm
diff --git a/databases/sqlclient/Makefile b/databases/sqlclient/Makefile
index 728128f087ac..c20196bbe3ab 100644
--- a/databases/sqlclient/Makefile
+++ b/databases/sqlclient/Makefile
@@ -33,6 +33,7 @@ USE_SQLITE=yes
CFLAGS+= ${PTHREAD_CFLAGS}
LDFLAGS+= ${PTHREAD_LIBS}
ADDITIONAL_LIB_DIRS+= -L${LOCLABASE}/lib
+MAKE_ENV+= GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT}
DEFAULT_LIBVERSION= 1.3
.include <bsd.port.mk>
diff --git a/deskutils/affiche/pkg-plist b/deskutils/affiche/pkg-plist
index 608b52e88c8c..5de421ee9af4 100644
--- a/deskutils/affiche/pkg-plist
+++ b/deskutils/affiche/pkg-plist
@@ -18,8 +18,8 @@ Local/Applications/Affiche.app/Resources/resize_gray.tiff
Local/Applications/Affiche.app/Resources/resize_green.tiff
Local/Applications/Affiche.app/Resources/resize_purple.tiff
Local/Applications/Affiche.app/Resources/resize_yellow.tiff
-Local/Applications/Affiche.app/library_paths.openapp
Local/Applications/Affiche.app/stamp.make
+Local/Tools/Affiche
@dirrm Local/Applications/Affiche.app/Resources/Swedish.lproj
@dirrm Local/Applications/Affiche.app/Resources/Spanish.lproj
@dirrm Local/Applications/Affiche.app/Resources/Lojban.lproj
diff --git a/deskutils/appwrapper/pkg-plist b/deskutils/appwrapper/pkg-plist
index 04f98297669b..fb2ffa1c1a0a 100644
--- a/deskutils/appwrapper/pkg-plist
+++ b/deskutils/appwrapper/pkg-plist
@@ -4,7 +4,7 @@ Local/Applications/AppWrapper.app/Resources/AppWrapper.desktop
Local/Applications/AppWrapper.app/Resources/AppWrapper.gorm
Local/Applications/AppWrapper.app/Resources/AppWrapperInfo.plist
Local/Applications/AppWrapper.app/Resources/Info-gnustep.plist
-Local/Applications/AppWrapper.app/library_paths.openapp
Local/Applications/AppWrapper.app/stamp.make
+Local/Tools/AppWrapper
@dirrm Local/Applications/AppWrapper.app/Resources
@dirrm Local/Applications/AppWrapper.app
diff --git a/deskutils/cartotheque/pkg-plist b/deskutils/cartotheque/pkg-plist
index b930e965124e..6ad228ecab94 100644
--- a/deskutils/cartotheque/pkg-plist
+++ b/deskutils/cartotheque/pkg-plist
@@ -16,8 +16,8 @@ Local/Applications/Cartotheque.app/Resources/Info-gnustep.plist
Local/Applications/Cartotheque.app/Resources/InspectorPanel.gorm/data.classes
Local/Applications/Cartotheque.app/Resources/InspectorPanel.gorm/data.info
Local/Applications/Cartotheque.app/Resources/InspectorPanel.gorm/objects.gorm
-Local/Applications/Cartotheque.app/library_paths.openapp
Local/Applications/Cartotheque.app/stamp.make
+Local/Tools/Cartotheque
@dirrm Local/Applications/Cartotheque.app/Resources/InspectorPanel.gorm
@dirrm Local/Applications/Cartotheque.app/Resources/CartothequeWindow.gorm
@dirrm Local/Applications/Cartotheque.app/Resources/Cartotheque.gorm
diff --git a/deskutils/displaycalibrator/pkg-plist b/deskutils/displaycalibrator/pkg-plist
index e45cc0f5e776..ac81650d3ded 100644
--- a/deskutils/displaycalibrator/pkg-plist
+++ b/deskutils/displaycalibrator/pkg-plist
@@ -8,8 +8,8 @@ Local/Applications/DisplayCalibrator.app/Resources/DisplayCalibrator.gorm/object
Local/Applications/DisplayCalibrator.app/Resources/DisplayCalibrator.gorm/white-black.png
Local/Applications/DisplayCalibrator.app/Resources/Info-gnustep.plist
Local/Applications/DisplayCalibrator.app/Resources/gammascrew.png
-Local/Applications/DisplayCalibrator.app/library_paths.openapp
Local/Applications/DisplayCalibrator.app/stamp.make
+Local/Tools/DisplayCalibrator
@dirrm Local/Applications/DisplayCalibrator.app/Resources/DisplayCalibrator.gorm
@dirrm Local/Applications/DisplayCalibrator.app/Resources
@dirrm Local/Applications/DisplayCalibrator.app
diff --git a/deskutils/etoile-extendedworkspacekit/Makefile b/deskutils/etoile-extendedworkspacekit/Makefile
index fcb5fcaf970f..0c520bbe6fd0 100644
--- a/deskutils/etoile-extendedworkspacekit/Makefile
+++ b/deskutils/etoile-extendedworkspacekit/Makefile
@@ -30,6 +30,7 @@ USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES}
SNAPSHOT= 20061221
WRKSRC= ${WRKDIR}/Etoile/
USE_GNUSTEP_MAKE_DIRS+= Frameworks/ExtendedWorkspaceKit
+MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
TRACKERKIT_PORT?= deskutils/etoile-trackerkit
diff --git a/deskutils/etoile-hardware/pkg-plist b/deskutils/etoile-hardware/pkg-plist
index fd3bb14316ff..d4d1acd0b7be 100644
--- a/deskutils/etoile-hardware/pkg-plist
+++ b/deskutils/etoile-hardware/pkg-plist
@@ -5,8 +5,8 @@ Local/Applications/Hardware.app/Resources/Info-gnustep.plist
Local/Applications/Hardware.app/Resources/MainMenu.gorm/data.classes
Local/Applications/Hardware.app/Resources/MainMenu.gorm/data.info
Local/Applications/Hardware.app/Resources/MainMenu.gorm/objects.gorm
-Local/Applications/Hardware.app/library_paths.openapp
Local/Applications/Hardware.app/stamp.make
+Local/Tools/Hardware
@dirrm Local/Applications/Hardware.app/Resources/MainMenu.gorm
@dirrm Local/Applications/Hardware.app/Resources
@dirrm Local/Applications/Hardware.app
diff --git a/deskutils/etoile-lookandbehavior/pkg-plist b/deskutils/etoile-lookandbehavior/pkg-plist
index 08f5a6fa091f..42ec21274550 100644
--- a/deskutils/etoile-lookandbehavior/pkg-plist
+++ b/deskutils/etoile-lookandbehavior/pkg-plist
@@ -20,8 +20,8 @@ Local/Applications/LookAndBehavior.app/Resources/LookAndBehaviorInfo.plist
Local/Applications/LookAndBehavior.app/Resources/MainMenu.gorm/data.classes
Local/Applications/LookAndBehavior.app/Resources/MainMenu.gorm/data.info
Local/Applications/LookAndBehavior.app/Resources/MainMenu.gorm/objects.gorm
-Local/Applications/LookAndBehavior.app/library_paths.openapp
Local/Applications/LookAndBehavior.app/stamp.make
+Local/Tools/LookAndBehavior
@dirrm Local/Applications/LookAndBehavior.app/Resources/MainMenu.gorm
@dirrm Local/Applications/LookAndBehavior.app/Resources
@dirrm Local/Applications/LookAndBehavior.app/PlugIns/LanguagesPrefPane.prefPane/Resources/Languages.gorm
diff --git a/deskutils/etoile-menuserver/pkg-plist b/deskutils/etoile-menuserver/pkg-plist
index 97593ac83bb3..023e3c403ec6 100644
--- a/deskutils/etoile-menuserver/pkg-plist
+++ b/deskutils/etoile-menuserver/pkg-plist
@@ -33,8 +33,8 @@ Local/Applications/EtoileMenuServer.app/Resources/MenuBarRightEdge.tiff
Local/Applications/EtoileMenuServer.app/Resources/SystemPreferencesEntry.sysbarentry/Resources/Info-gnustep.plist
Local/Applications/EtoileMenuServer.app/Resources/SystemPreferencesEntry.sysbarentry/SystemPreferencesEntry
Local/Applications/EtoileMenuServer.app/Resources/SystemPreferencesEntry.sysbarentry/stamp.make
-Local/Applications/EtoileMenuServer.app/library_paths.openapp
Local/Applications/EtoileMenuServer.app/stamp.make
+Local/Tools/EtoileMenuServer
@dirrm Local/Applications/EtoileMenuServer.app/Resources/SystemPreferencesEntry.sysbarentry/Resources
@dirrm Local/Applications/EtoileMenuServer.app/Resources/SystemPreferencesEntry.sysbarentry
@dirrm Local/Applications/EtoileMenuServer.app/Resources/LookAndBehaviorEntry.sysbarentry/Resources
diff --git a/deskutils/etoile-servicesbarkit/Makefile b/deskutils/etoile-servicesbarkit/Makefile
index d0ef35e41881..37b569b70a68 100644
--- a/deskutils/etoile-servicesbarkit/Makefile
+++ b/deskutils/etoile-servicesbarkit/Makefile
@@ -30,6 +30,7 @@ USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES}
SNAPSHOT= 20061221
WRKSRC= ${WRKDIR}/Etoile/
USE_GNUSTEP_MAKE_DIRS+= Frameworks/ServicesBarKit
+MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
UNITKIT_PORT?= devel/etoile-unitkit
diff --git a/deskutils/etoile-trackerkit/Makefile b/deskutils/etoile-trackerkit/Makefile
index a05a639359ce..0970df9f7fd6 100644
--- a/deskutils/etoile-trackerkit/Makefile
+++ b/deskutils/etoile-trackerkit/Makefile
@@ -29,6 +29,7 @@ USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES}
SNAPSHOT= 20061221
WRKSRC= ${WRKDIR}/Etoile/
USE_GNUSTEP_MAKE_DIRS+= Frameworks/TrackerKit
+MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
HEADERS= TKCollection.h TKKeyValuePredicate.h TKObject.h \
TKQuery.h TKTracker.h
diff --git a/deskutils/gnustep-notebook/pkg-plist b/deskutils/gnustep-notebook/pkg-plist
index b0deeb23eb61..16f49ce241a9 100644
--- a/deskutils/gnustep-notebook/pkg-plist
+++ b/deskutils/gnustep-notebook/pkg-plist
@@ -15,8 +15,8 @@ Local/Applications/NoteBook.app/Resources/Info-gnustep.plist
Local/Applications/NoteBook.app/Resources/NoteBook.desktop
Local/Applications/NoteBook.app/Resources/NoteBook.png
Local/Applications/NoteBook.app/Resources/NoteBookInfo.plist
-Local/Applications/NoteBook.app/library_paths.openapp
Local/Applications/NoteBook.app/stamp.make
+Local/Tools/NoteBook
@dirrm Local/Applications/NoteBook.app/Resources/English.lproj/PageName.gorm
@dirrm Local/Applications/NoteBook.app/Resources/English.lproj/Page.gorm
@dirrm Local/Applications/NoteBook.app/Resources/English.lproj/NoteBookApp.gorm
diff --git a/deskutils/gnustep-wrapper/Makefile b/deskutils/gnustep-wrapper/Makefile
index 642e7c4d97dd..b79305cc8d27 100644
--- a/deskutils/gnustep-wrapper/Makefile
+++ b/deskutils/gnustep-wrapper/Makefile
@@ -25,8 +25,16 @@ USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES}
+ADDITIONAL_LIB_DIRS+= -L${WRKSRC}/libGSWrapper/obj
+MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
+MAKE_FLAGS+= debug=no
+
post-patch:
- ${REINPLACE_CMD} -e 's|cp -u|cp -p|' \
+ ${REINPLACE_CMD} -e 's|cp -u|#cp -p|' \
${WRKSRC}/WrapperFactory/GNUmakefile.postamble
+post-install:
+ ${INSTALL_SCRIPT} ${WRKSRC}/Launcher/obj/GSWrapper_Launcher \
+ ${GNUSTEP_SYSTEM_ROOT}/Applications/WrapperFactory.app/Resources/
+
.include <bsd.port.mk>
diff --git a/deskutils/gnustep-wrapper/pkg-plist b/deskutils/gnustep-wrapper/pkg-plist
index c562930e230a..4c5a8923c0b9 100644
--- a/deskutils/gnustep-wrapper/pkg-plist
+++ b/deskutils/gnustep-wrapper/pkg-plist
@@ -10,12 +10,12 @@ System/Applications/WrapperFactory.app/Resources/Info-gnustep.plist
System/Applications/WrapperFactory.app/Resources/WrapperFactory.desktop
System/Applications/WrapperFactory.app/Resources/WrapperFactory.tiff
System/Applications/WrapperFactory.app/WrapperFactory
-System/Applications/WrapperFactory.app/library_paths.openapp
System/Applications/WrapperFactory.app/stamp.make
System/Library/Libraries/libGSWrapper.so
System/Library/Libraries/libGSWrapper.so.%%MAJORLIBVERSION%%
System/Library/Libraries/libGSWrapper.so.%%LIBVERSION%%
System/Tools/GSWrapper_Launcher
+System/Tools/WrapperFactory
@dirrm System/Applications/WrapperFactory.app/Resources/English.lproj/WrapperFactory.gorm
@dirrm System/Applications/WrapperFactory.app/Resources/English.lproj/WrapperDocument.gorm
@dirrm System/Applications/WrapperFactory.app/Resources/English.lproj
diff --git a/deskutils/gnuwash/pkg-plist b/deskutils/gnuwash/pkg-plist
index bd2e1979d069..e1c618512021 100644
--- a/deskutils/gnuwash/pkg-plist
+++ b/deskutils/gnuwash/pkg-plist
@@ -12,8 +12,8 @@ Local/Applications/GNUWash.app/Resources/alarm.tiff
Local/Applications/GNUWash.app/Resources/gnuwash.tiff
Local/Applications/GNUWash.app/Resources/pizza.tiff
Local/Applications/GNUWash.app/Resources/tea.tiff
-Local/Applications/GNUWash.app/library_paths.openapp
Local/Applications/GNUWash.app/stamp.make
+Local/Tools/GNUWash
@dirrm Local/Applications/GNUWash.app/Resources/Preferences.gorm
@dirrm Local/Applications/GNUWash.app/Resources/GNUWash.gorm
@dirrm Local/Applications/GNUWash.app/Resources
diff --git a/deskutils/gworkspace-clipbook/Makefile b/deskutils/gworkspace-clipbook/Makefile
index 54552bb49464..1fc2aaced173 100644
--- a/deskutils/gworkspace-clipbook/Makefile
+++ b/deskutils/gworkspace-clipbook/Makefile
@@ -22,5 +22,6 @@ USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
WRKSRC= ${WRKDIR}/GWorkspace-${PORTVERSION}/ClipBook
+MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
.include <bsd.port.mk>
diff --git a/deskutils/gworkspace-clipbook/pkg-plist b/deskutils/gworkspace-clipbook/pkg-plist
index 385d7a759a19..fcab950e4c3c 100644
--- a/deskutils/gworkspace-clipbook/pkg-plist
+++ b/deskutils/gworkspace-clipbook/pkg-plist
@@ -19,8 +19,8 @@ System/Applications/ClipBook.app/Resources/rtfPboard.tiff
System/Applications/ClipBook.app/Resources/rtfdPboard.tiff
System/Applications/ClipBook.app/Resources/stringPboard.tiff
System/Applications/ClipBook.app/Resources/tiffPboard.tiff
-System/Applications/ClipBook.app/library_paths.openapp
System/Applications/ClipBook.app/stamp.make
+System/Tools/ClipBook
@dirrm System/Applications/ClipBook.app/Resources/Resources/English.lproj/ClipBookWindow.gorm
@dirrm System/Applications/ClipBook.app/Resources/Resources/English.lproj
@dirrm System/Applications/ClipBook.app/Resources/Resources
diff --git a/deskutils/gworkspace-gwmetadata/Makefile b/deskutils/gworkspace-gwmetadata/Makefile
index 9e06774c5a31..cd6f1324be9b 100644
--- a/deskutils/gworkspace-gwmetadata/Makefile
+++ b/deskutils/gworkspace-gwmetadata/Makefile
@@ -34,7 +34,6 @@ CONFIGURE_ARGS+= --with-sqlite-include=${LOCALBASE}/include
CONFIGURE_ARGS+= --with-sqlite-library=${LOCALBASE}/lib
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
DEFAULT_LIBVERSION= 0.1.0
-MAKE_ENV+= GNUSTEP_INSTALLATION_DIR="${GNUSTEP_SYSTEM_ROOT}"
GWORKSPACE_PORT?= deskutils/gworkspace
PREFERENCEPANES_PORT?= deskutils/preferencepanes
diff --git a/deskutils/gworkspace-gwmetadata/pkg-plist b/deskutils/gworkspace-gwmetadata/pkg-plist
index d4600a64f6a8..5bb898dafc07 100644
--- a/deskutils/gworkspace-gwmetadata/pkg-plist
+++ b/deskutils/gworkspace-gwmetadata/pkg-plist
@@ -6,7 +6,6 @@ System/Applications/MDFinder.app/Resources/Info-gnustep.plist
System/Applications/MDFinder.app/Resources/MDFinder.desktop
System/Applications/MDFinder.app/Resources/MDFinder.tiff
System/Applications/MDFinder.app/Resources/SavedSearch.tiff
-System/Applications/MDFinder.app/library_paths.openapp
System/Applications/MDFinder.app/stamp.make
System/Library/Bundles/AbiwordExtractor.extr/AbiwordExtractor
System/Library/Bundles/AbiwordExtractor.extr/Resources/Info-gnustep.plist
@@ -53,85 +52,88 @@ System/Library/Bundles/XmlExtractor.extr/Resources/Info-gnustep.plist
System/Library/Bundles/XmlExtractor.extr/XmlExtractor
System/Library/Bundles/XmlExtractor.extr/stamp.make
System/Library/Frameworks/MDKit.framework/Headers
+System/Library/Frameworks/MDKit.framework/MDKit
System/Library/Frameworks/MDKit.framework/Resources
-System/Library/Frameworks/MDKit.framework/Versions/A/Headers/MDKAttribute.h
-System/Library/Frameworks/MDKit.framework/Versions/A/Headers/MDKAttributeChooser.h
-System/Library/Frameworks/MDKit.framework/Versions/A/Headers/MDKAttributeEditor.h
-System/Library/Frameworks/MDKit.framework/Versions/A/Headers/MDKAttributeView.h
-System/Library/Frameworks/MDKit.framework/Versions/A/Headers/MDKQuery.h
-System/Library/Frameworks/MDKit.framework/Versions/A/Headers/MDKQueryManager.h
-System/Library/Frameworks/MDKit.framework/Versions/A/Headers/MDKWindow.h
-System/Library/Frameworks/MDKit.framework/Versions/A/Headers/MDKit.h
-System/Library/Frameworks/MDKit.framework/Versions/A/Headers/SQLite.h
-System/Library/Frameworks/MDKit.framework/Versions/A/MDKit
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/English.lproj/Help.rtfd/TXT.rtf
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/English.lproj/Help.rtfd/dummy.tiff
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/English.lproj/MDKArrayEditor.gorm/data.classes
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/English.lproj/MDKArrayEditor.gorm/data.info
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/English.lproj/MDKArrayEditor.gorm/objects.gorm
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/English.lproj/MDKAttributeChooser.gorm/data.classes
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/English.lproj/MDKAttributeChooser.gorm/data.info
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/English.lproj/MDKAttributeChooser.gorm/objects.gorm
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/English.lproj/MDKAttributeView.gorm/data.classes
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/English.lproj/MDKAttributeView.gorm/data.info
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/English.lproj/MDKAttributeView.gorm/objects.gorm
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/English.lproj/MDKCategoryControls.gorm/data.classes
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/English.lproj/MDKCategoryControls.gorm/data.info
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/English.lproj/MDKCategoryControls.gorm/objects.gorm
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/English.lproj/MDKDateEditor.gorm/data.classes
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/English.lproj/MDKDateEditor.gorm/data.info
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/English.lproj/MDKDateEditor.gorm/objects.gorm
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/English.lproj/MDKNumberEditor.gorm/data.classes
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/English.lproj/MDKNumberEditor.gorm/data.info
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/English.lproj/MDKNumberEditor.gorm/objects.gorm
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/English.lproj/MDKStringEditor.gorm/data.classes
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/English.lproj/MDKStringEditor.gorm/data.info
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/English.lproj/MDKStringEditor.gorm/objects.gorm
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/English.lproj/MDKWindow.gorm/data.classes
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/English.lproj/MDKWindow.gorm/data.info
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/English.lproj/MDKWindow.gorm/objects.gorm
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/Info-gnustep.plist
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/MDFinder.tiff
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/add.tiff
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/anim-logo-%%MAJORVERSION%%.tiff
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/anim-logo-1.tiff
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/anim-logo-2.tiff
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/anim-logo-3.tiff
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/anim-logo-4.tiff
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/anim-logo-5.tiff
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/anim-logo-6.tiff
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/anim-logo-7.tiff
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/attributes.plist
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/casesens.tiff
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/remove.tiff
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/switchOff.tiff
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/switchOn.tiff
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/whiteArrowDown.tiff
-System/Library/Frameworks/MDKit.framework/Versions/A/Resources/whiteArrowRight.tiff
-System/Library/Frameworks/MDKit.framework/Versions/A/libMDKit.so
-System/Library/Frameworks/MDKit.framework/Versions/A/libMDKit.so.%%MAJORVERSION%%
-System/Library/Frameworks/MDKit.framework/Versions/A/libMDKit.so.%%MAJORVERSION%%.1.%%MAJORVERSION%%
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Headers/MDKAttribute.h
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Headers/MDKAttributeChooser.h
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Headers/MDKAttributeEditor.h
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Headers/MDKAttributeView.h
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Headers/MDKQuery.h
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Headers/MDKQueryManager.h
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Headers/MDKWindow.h
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Headers/MDKit.h
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Headers/SQLite.h
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/MDKit
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/Help.rtfd/TXT.rtf
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/Help.rtfd/dummy.tiff
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/MDKArrayEditor.gorm/data.classes
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/MDKArrayEditor.gorm/data.info
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/MDKArrayEditor.gorm/objects.gorm
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/MDKAttributeChooser.gorm/data.classes
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/MDKAttributeChooser.gorm/data.info
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/MDKAttributeChooser.gorm/objects.gorm
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/MDKAttributeView.gorm/data.classes
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/MDKAttributeView.gorm/data.info
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/MDKAttributeView.gorm/objects.gorm
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/MDKCategoryControls.gorm/data.classes
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/MDKCategoryControls.gorm/data.info
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/MDKCategoryControls.gorm/objects.gorm
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/MDKDateEditor.gorm/data.classes
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/MDKDateEditor.gorm/data.info
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/MDKDateEditor.gorm/objects.gorm
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/MDKNumberEditor.gorm/data.classes
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/MDKNumberEditor.gorm/data.info
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/MDKNumberEditor.gorm/objects.gorm
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/MDKStringEditor.gorm/data.classes
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/MDKStringEditor.gorm/data.info
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/MDKStringEditor.gorm/objects.gorm
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/MDKWindow.gorm/data.classes
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/MDKWindow.gorm/data.info
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/MDKWindow.gorm/objects.gorm
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/Info-gnustep.plist
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/MDFinder.tiff
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/add.tiff
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/anim-logo-%%MAJORVERSION%%.tiff
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/anim-logo-1.tiff
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/anim-logo-2.tiff
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/anim-logo-3.tiff
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/anim-logo-4.tiff
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/anim-logo-5.tiff
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/anim-logo-6.tiff
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/anim-logo-7.tiff
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/attributes.plist
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/casesens.tiff
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/remove.tiff
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/switchOff.tiff
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/switchOn.tiff
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/whiteArrowDown.tiff
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/whiteArrowRight.tiff
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/libMDKit.so
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/libMDKit.so.%%MAJORVERSION%%
+System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/libMDKit.so.%%MAJORVERSION%%.1.%%MAJORVERSION%%
System/Library/Frameworks/MDKit.framework/Versions/Current
+System/Library/Frameworks/MDKit.framework/libMDKit.so
System/Library/Headers/MDKit
System/Library/Libraries/libMDKit.so
System/Library/Libraries/libMDKit.so.%%MAJORLIBVERSION%%
System/Library/Libraries/libMDKit.so.%%LIBVERSION%%
+System/Tools/MDFinder
System/Tools/gmds
System/Tools/mdextractor
System/Tools/mdfind
-@dirrm System/Library/Frameworks/MDKit.framework/Versions/A/Resources/English.lproj/MDKWindow.gorm
-@dirrm System/Library/Frameworks/MDKit.framework/Versions/A/Resources/English.lproj/MDKStringEditor.gorm
-@dirrm System/Library/Frameworks/MDKit.framework/Versions/A/Resources/English.lproj/MDKNumberEditor.gorm
-@dirrm System/Library/Frameworks/MDKit.framework/Versions/A/Resources/English.lproj/MDKDateEditor.gorm
-@dirrm System/Library/Frameworks/MDKit.framework/Versions/A/Resources/English.lproj/MDKCategoryControls.gorm
-@dirrm System/Library/Frameworks/MDKit.framework/Versions/A/Resources/English.lproj/MDKAttributeView.gorm
-@dirrm System/Library/Frameworks/MDKit.framework/Versions/A/Resources/English.lproj/MDKAttributeChooser.gorm
-@dirrm System/Library/Frameworks/MDKit.framework/Versions/A/Resources/English.lproj/MDKArrayEditor.gorm
-@dirrm System/Library/Frameworks/MDKit.framework/Versions/A/Resources/English.lproj/Help.rtfd
-@dirrm System/Library/Frameworks/MDKit.framework/Versions/A/Resources/English.lproj
-@dirrm System/Library/Frameworks/MDKit.framework/Versions/A/Resources
-@dirrm System/Library/Frameworks/MDKit.framework/Versions/A/Headers
-@dirrm System/Library/Frameworks/MDKit.framework/Versions/A
+@dirrm System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/MDKWindow.gorm
+@dirrm System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/MDKStringEditor.gorm
+@dirrm System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/MDKNumberEditor.gorm
+@dirrm System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/MDKDateEditor.gorm
+@dirrm System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/MDKCategoryControls.gorm
+@dirrm System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/MDKAttributeView.gorm
+@dirrm System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/MDKAttributeChooser.gorm
+@dirrm System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/MDKArrayEditor.gorm
+@dirrm System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/Help.rtfd
+@dirrm System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj
+@dirrm System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Resources
+@dirrm System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%/Headers
+@dirrm System/Library/Frameworks/MDKit.framework/Versions/%%MAJORVERSION%%
@dirrm System/Library/Frameworks/MDKit.framework/Versions
@dirrm System/Library/Frameworks/MDKit.framework
@dirrm System/Library/Bundles/XmlExtractor.extr/Resources
diff --git a/deskutils/gworkspace/Makefile b/deskutils/gworkspace/Makefile
index dfb1c5b4e370..52531d7b5042 100644
--- a/deskutils/gworkspace/Makefile
+++ b/deskutils/gworkspace/Makefile
@@ -26,9 +26,11 @@ WRKSRC= ${WRKDIR}/GWorkspace-${PORTVERSION}
GNU_CONFIGURE= yes
ADDITIONAL_LDFLAGS+= -L${WRKSRC}/FSNode/FSNode.framework/Versions/A
DEFAULT_LIBVERSION2= 0.1.0
+DEFAULT_LIBVERSION3= 1.0.0
PLIST_SUB+= LIBVERSION2=${DEFAULT_LIBVERSION2}
PLIST_SUB+= MAJORLIBVERSION2=${DEFAULT_LIBVERSION2:C/([0-9]).*/\1/1}
-MAKE_ENV+= GNUSTEP_INSTALLATION_DIR="${GNUSTEP_SYSTEM_ROOT}"
+PLIST_SUB+= LIBVERSION3=${DEFAULT_LIBVERSION3}
+PLIST_SUB+= MAJORLIBVERSION3=${DEFAULT_LIBVERSION3:C/([0-9]).*/\1/1}
.if defined(WITHOUT_GHOSTSCRIPT)
PLIST_SUB+= PDFVIEW="@comment "
@@ -39,6 +41,6 @@ USE_GHOSTSCRIPT= yes
post-install:
${CP} ${WRKSRC}/Inspector/ContentViewersProtocol.h \
- ${GNUSTEP_SYSTEM_ROOT}/Library/Frameworks/Inspector.framework/Versions/A/Headers/ContentViewersProtocol.h
+ ${GNUSTEP_SYSTEM_ROOT}/Library/Frameworks/Inspector.framework/Versions/${DEFAULT_LIBVERSION2:C/([0-9]).*/\1/1}/Headers/ContentViewersProtocol.h
.include <bsd.port.mk>
diff --git a/deskutils/gworkspace/pkg-plist b/deskutils/gworkspace/pkg-plist
index 13a501c298b6..f93fe84aad77 100644
--- a/deskutils/gworkspace/pkg-plist
+++ b/deskutils/gworkspace/pkg-plist
@@ -225,7 +225,6 @@ System/Applications/GWorkspace.app/Resources/tabUnSelectedLeft.tiff
System/Applications/GWorkspace.app/Resources/tabUnSelectedRight.tiff
System/Applications/GWorkspace.app/Resources/tiffPboard.tiff
System/Applications/GWorkspace.app/Resources/watch.tiff
-System/Applications/GWorkspace.app/library_paths.openapp
System/Applications/GWorkspace.app/stamp.make
System/Applications/Recycler.app/Recycler
System/Applications/Recycler.app/Resources/English.lproj/Localizable.strings
@@ -236,7 +235,6 @@ System/Applications/Recycler.app/Resources/English.lproj/StartAppWin.gorm/object
System/Applications/Recycler.app/Resources/Info-gnustep.plist
System/Applications/Recycler.app/Resources/Recycler.desktop
System/Applications/Recycler.app/Resources/Recycler.tiff
-System/Applications/Recycler.app/library_paths.openapp
System/Applications/Recycler.app/stamp.make
System/Library/Bundles/AppViewer.inspector/AppViewer
System/Library/Bundles/AppViewer.inspector/Resources/English.lproj/Help.rtfd/TXT.rtf
@@ -357,153 +355,159 @@ System/Library/Bundles/SoundViewer.inspector/Resources/progind10.tiff
System/Library/Bundles/SoundViewer.inspector/Resources/stop.tiff
System/Library/Bundles/SoundViewer.inspector/SoundViewer
System/Library/Bundles/SoundViewer.inspector/stamp.make
+System/Library/Frameworks/FSNode.framework/FSNode
System/Library/Frameworks/FSNode.framework/Headers
System/Library/Frameworks/FSNode.framework/Resources
-System/Library/Frameworks/FSNode.framework/Versions/A/Headers/FSNBrowser.h
-System/Library/Frameworks/FSNode.framework/Versions/A/Headers/FSNBrowserCell.h
-System/Library/Frameworks/FSNode.framework/Versions/A/Headers/FSNBrowserColumn.h
-System/Library/Frameworks/FSNode.framework/Versions/A/Headers/FSNBrowserMatrix.h
-System/Library/Frameworks/FSNode.framework/Versions/A/Headers/FSNBrowserScroll.h
-System/Library/Frameworks/FSNode.framework/Versions/A/Headers/FSNFunctions.h
-System/Library/Frameworks/FSNode.framework/Versions/A/Headers/FSNIcon.h
-System/Library/Frameworks/FSNode.framework/Versions/A/Headers/FSNIconsView.h
-System/Library/Frameworks/FSNode.framework/Versions/A/Headers/FSNListView.h
-System/Library/Frameworks/FSNode.framework/Versions/A/Headers/FSNPathComponentsViewer.h
-System/Library/Frameworks/FSNode.framework/Versions/A/Headers/FSNTextCell.h
-System/Library/Frameworks/FSNode.framework/Versions/A/Headers/FSNode.h
-System/Library/Frameworks/FSNode.framework/Versions/A/Headers/FSNodeRep.h
-System/Library/Frameworks/FSNode.framework/Versions/A/Resources/ArrowRight.tiff
-System/Library/Frameworks/FSNode.framework/Versions/A/Resources/English.lproj/Localizable.strings
-System/Library/Frameworks/FSNode.framework/Versions/A/Resources/FolderOpen.tiff
-System/Library/Frameworks/FSNode.framework/Versions/A/Resources/HardDisk.tiff
-System/Library/Frameworks/FSNode.framework/Versions/A/Resources/HardDiskOpen.tiff
-System/Library/Frameworks/FSNode.framework/Versions/A/Resources/Info-gnustep.plist
-System/Library/Frameworks/FSNode.framework/Versions/A/Resources/MultipleSelection.tiff
-System/Library/Frameworks/FSNode.framework/Versions/A/Resources/Recycler.tiff
-System/Library/Frameworks/FSNode.framework/Versions/A/Resources/RecyclerFull.tiff
-System/Library/Frameworks/FSNode.framework/Versions/A/Resources/Workspace.tiff
-System/Library/Frameworks/FSNode.framework/Versions/A/FSNode
-System/Library/Frameworks/FSNode.framework/Versions/A/libFSNode.so
-System/Library/Frameworks/FSNode.framework/Versions/A/libFSNode.so.%%MAJORLIBVERSION2%%
-System/Library/Frameworks/FSNode.framework/Versions/A/libFSNode.so.%%LIBVERSION2%%
+System/Library/Frameworks/FSNode.framework/Versions/%%MAJORLIBVERSION2%%/FSNode
+System/Library/Frameworks/FSNode.framework/Versions/%%MAJORLIBVERSION2%%/Headers/FSNBrowser.h
+System/Library/Frameworks/FSNode.framework/Versions/%%MAJORLIBVERSION2%%/Headers/FSNBrowserCell.h
+System/Library/Frameworks/FSNode.framework/Versions/%%MAJORLIBVERSION2%%/Headers/FSNBrowserColumn.h
+System/Library/Frameworks/FSNode.framework/Versions/%%MAJORLIBVERSION2%%/Headers/FSNBrowserMatrix.h
+System/Library/Frameworks/FSNode.framework/Versions/%%MAJORLIBVERSION2%%/Headers/FSNBrowserScroll.h
+System/Library/Frameworks/FSNode.framework/Versions/%%MAJORLIBVERSION2%%/Headers/FSNFunctions.h
+System/Library/Frameworks/FSNode.framework/Versions/%%MAJORLIBVERSION2%%/Headers/FSNIcon.h
+System/Library/Frameworks/FSNode.framework/Versions/%%MAJORLIBVERSION2%%/Headers/FSNIconsView.h
+System/Library/Frameworks/FSNode.framework/Versions/%%MAJORLIBVERSION2%%/Headers/FSNListView.h
+System/Library/Frameworks/FSNode.framework/Versions/%%MAJORLIBVERSION2%%/Headers/FSNPathComponentsViewer.h
+System/Library/Frameworks/FSNode.framework/Versions/%%MAJORLIBVERSION2%%/Headers/FSNTextCell.h
+System/Library/Frameworks/FSNode.framework/Versions/%%MAJORLIBVERSION2%%/Headers/FSNode.h
+System/Library/Frameworks/FSNode.framework/Versions/%%MAJORLIBVERSION2%%/Headers/FSNodeRep.h
+System/Library/Frameworks/FSNode.framework/Versions/%%MAJORLIBVERSION2%%/Resources/ArrowRight.tiff
+System/Library/Frameworks/FSNode.framework/Versions/%%MAJORLIBVERSION2%%/Resources/English.lproj/Localizable.strings
+System/Library/Frameworks/FSNode.framework/Versions/%%MAJORLIBVERSION2%%/Resources/FolderOpen.tiff
+System/Library/Frameworks/FSNode.framework/Versions/%%MAJORLIBVERSION2%%/Resources/HardDisk.tiff
+System/Library/Frameworks/FSNode.framework/Versions/%%MAJORLIBVERSION2%%/Resources/HardDiskOpen.tiff
+System/Library/Frameworks/FSNode.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Info-gnustep.plist
+System/Library/Frameworks/FSNode.framework/Versions/%%MAJORLIBVERSION2%%/Resources/MultipleSelection.tiff
+System/Library/Frameworks/FSNode.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Recycler.tiff
+System/Library/Frameworks/FSNode.framework/Versions/%%MAJORLIBVERSION2%%/Resources/RecyclerFull.tiff
+System/Library/Frameworks/FSNode.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Workspace.tiff
+System/Library/Frameworks/FSNode.framework/Versions/%%MAJORLIBVERSION2%%/libFSNode.so
+System/Library/Frameworks/FSNode.framework/Versions/%%MAJORLIBVERSION2%%/libFSNode.so.%%MAJORLIBVERSION2%%
+System/Library/Frameworks/FSNode.framework/Versions/%%MAJORLIBVERSION2%%/libFSNode.so.%%LIBVERSION2%%
System/Library/Frameworks/FSNode.framework/Versions/Current
+System/Library/Frameworks/FSNode.framework/libFSNode.so
System/Library/Frameworks/Inspector.framework/Headers
+System/Library/Frameworks/Inspector.framework/Inspector
System/Library/Frameworks/Inspector.framework/Resources
-System/Library/Frameworks/Inspector.framework/Versions/A/Headers/ContentViewersProtocol.h
-System/Library/Frameworks/Inspector.framework/Versions/A/Headers/Inspector.h
-System/Library/Frameworks/Inspector.framework/Versions/A/Inspector
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/Date-0.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/Date-1.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/Date-2.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/Date-3.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/Date-4.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/Date-5.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/Date-6.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/Date-7.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/Date-8.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/Date-9.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/Date-Colon.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/Date.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/English.lproj/Annotations.gorm/data.classes
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/English.lproj/Annotations.gorm/data.info
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/English.lproj/Annotations.gorm/objects.gorm
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/English.lproj/Attributes.gorm/data.classes
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/English.lproj/Attributes.gorm/data.info
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/English.lproj/Attributes.gorm/objects.gorm
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/English.lproj/Contents.gorm/data.classes
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/English.lproj/Contents.gorm/data.info
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/English.lproj/Contents.gorm/objects.gorm
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/English.lproj/InspectorWin.gorm/data.classes
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/English.lproj/InspectorWin.gorm/data.info
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/English.lproj/InspectorWin.gorm/objects.gorm
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/English.lproj/Localizable.strings
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/English.lproj/Tools.gorm/data.classes
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/English.lproj/Tools.gorm/data.info
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/English.lproj/Tools.gorm/objects.gorm
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/Info-gnustep.plist
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/Inspector.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/LED-0.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/LED-1.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/LED-2.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/LED-3.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/LED-4.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/LED-5.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/LED-6.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/LED-7.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/LED-8.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/LED-9.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/LED-AM.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/LED-Colon.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/LED-PM.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/LED.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/Magnify.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/Mask.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/Month-10.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/Month-1.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/Month-11.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/Month-12.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/Month-2.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/Month-3.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/Month-4.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/Month-5.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/Month-6.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/Month-7.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/Month-8.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/Month-9.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/Month.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/MultipleSelection.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/Pboard.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/Weekday-0.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/Weekday-1.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/Weekday-2.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/Weekday-3.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/Weekday-4.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/Weekday-5.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/Weekday-6.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/Weekday.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/anim-logo-0.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/anim-logo-1.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/anim-logo-2.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/anim-logo-3.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/anim-logo-4.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/anim-logo-5.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/anim-logo-6.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/anim-logo-7.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/colorPboard.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/filecontsPboard.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/gormPboard.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/progind.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/progind10.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/rtfPboard.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/rtfdPboard.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/stringPboard.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/switchMultiple.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/switchOff.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/switchOn.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/Resources/tiffPboard.tiff
-System/Library/Frameworks/Inspector.framework/Versions/A/libInspector.so
-System/Library/Frameworks/Inspector.framework/Versions/A/libInspector.so.%%MAJORLIBVERSION2%%
-System/Library/Frameworks/Inspector.framework/Versions/A/libInspector.so.%%LIBVERSION2%%
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Headers/ContentViewersProtocol.h
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Headers/Inspector.h
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Inspector
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Date-0.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Date-1.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Date-2.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Date-3.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Date-4.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Date-5.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Date-6.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Date-7.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Date-8.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Date-9.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Date-Colon.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Date.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/English.lproj/Annotations.gorm/data.classes
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/English.lproj/Annotations.gorm/data.info
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/English.lproj/Annotations.gorm/objects.gorm
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/English.lproj/Attributes.gorm/data.classes
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/English.lproj/Attributes.gorm/data.info
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/English.lproj/Attributes.gorm/objects.gorm
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/English.lproj/Contents.gorm/data.classes
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/English.lproj/Contents.gorm/data.info
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/English.lproj/Contents.gorm/objects.gorm
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/English.lproj/InspectorWin.gorm/data.classes
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/English.lproj/InspectorWin.gorm/data.info
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/English.lproj/InspectorWin.gorm/objects.gorm
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/English.lproj/Localizable.strings
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/English.lproj/Tools.gorm/data.classes
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/English.lproj/Tools.gorm/data.info
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/English.lproj/Tools.gorm/objects.gorm
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Info-gnustep.plist
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Inspector.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/LED-0.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/LED-1.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/LED-2.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/LED-3.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/LED-4.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/LED-5.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/LED-6.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/LED-7.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/LED-8.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/LED-9.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/LED-AM.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/LED-Colon.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/LED-PM.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/LED.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Magnify.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Mask.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Month-10.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Month-1.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Month-11.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Month-12.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Month-2.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Month-3.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Month-4.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Month-5.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Month-6.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Month-7.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Month-8.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Month-9.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Month.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/MultipleSelection.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Pboard.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Weekday-0.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Weekday-1.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Weekday-2.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Weekday-3.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Weekday-4.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Weekday-5.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Weekday-6.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Weekday.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/anim-logo-0.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/anim-logo-1.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/anim-logo-2.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/anim-logo-3.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/anim-logo-4.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/anim-logo-5.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/anim-logo-6.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/anim-logo-7.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/colorPboard.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/filecontsPboard.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/gormPboard.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/progind.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/progind10.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/rtfPboard.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/rtfdPboard.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/stringPboard.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/switchMultiple.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/switchOff.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/switchOn.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/tiffPboard.tiff
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/libInspector.so
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/libInspector.so.%%MAJORLIBVERSION2%%
+System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/libInspector.so.%%LIBVERSION2%%
System/Library/Frameworks/Inspector.framework/Versions/Current
+System/Library/Frameworks/Inspector.framework/libInspector.so
System/Library/Frameworks/Operation.framework/Headers
+System/Library/Frameworks/Operation.framework/Operation
System/Library/Frameworks/Operation.framework/Resources
-System/Library/Frameworks/Operation.framework/Versions/A/Headers/Operation.h
-System/Library/Frameworks/Operation.framework/Versions/A/Operation
-System/Library/Frameworks/Operation.framework/Versions/A/Resources/English.lproj/FileOperationWin.gorm/data.classes
-System/Library/Frameworks/Operation.framework/Versions/A/Resources/English.lproj/FileOperationWin.gorm/data.info
-System/Library/Frameworks/Operation.framework/Versions/A/Resources/English.lproj/FileOperationWin.gorm/objects.gorm
-System/Library/Frameworks/Operation.framework/Versions/A/Resources/English.lproj/Localizable.strings
-System/Library/Frameworks/Operation.framework/Versions/A/Resources/Info-gnustep.plist
-System/Library/Frameworks/Operation.framework/Versions/A/Resources/Operation.tiff
-System/Library/Frameworks/Operation.framework/Versions/A/Resources/progind.tiff
-System/Library/Frameworks/Operation.framework/Versions/A/libOperation.so
-System/Library/Frameworks/Operation.framework/Versions/A/libOperation.so.1
-System/Library/Frameworks/Operation.framework/Versions/A/libOperation.so.1.%%MAJORLIBVERSION2%%.%%MAJORLIBVERSION2%%
+System/Library/Frameworks/Operation.framework/Versions/%%MAJORLIBVERSION3%%/Headers/Operation.h
+System/Library/Frameworks/Operation.framework/Versions/%%MAJORLIBVERSION3%%/Operation
+System/Library/Frameworks/Operation.framework/Versions/%%MAJORLIBVERSION3%%/Resources/English.lproj/FileOperationWin.gorm/data.classes
+System/Library/Frameworks/Operation.framework/Versions/%%MAJORLIBVERSION3%%/Resources/English.lproj/FileOperationWin.gorm/data.info
+System/Library/Frameworks/Operation.framework/Versions/%%MAJORLIBVERSION3%%/Resources/English.lproj/FileOperationWin.gorm/objects.gorm
+System/Library/Frameworks/Operation.framework/Versions/%%MAJORLIBVERSION3%%/Resources/English.lproj/Localizable.strings
+System/Library/Frameworks/Operation.framework/Versions/%%MAJORLIBVERSION3%%/Resources/Info-gnustep.plist
+System/Library/Frameworks/Operation.framework/Versions/%%MAJORLIBVERSION3%%/Resources/Operation.tiff
+System/Library/Frameworks/Operation.framework/Versions/%%MAJORLIBVERSION3%%/Resources/progind.tiff
+System/Library/Frameworks/Operation.framework/Versions/%%MAJORLIBVERSION3%%/libOperation.so
+System/Library/Frameworks/Operation.framework/Versions/%%MAJORLIBVERSION3%%/libOperation.so.%%MAJORLIBVERSION3%%
+System/Library/Frameworks/Operation.framework/Versions/%%MAJORLIBVERSION3%%/libOperation.so.%%LIBVERSION3%%
System/Library/Frameworks/Operation.framework/Versions/Current
+System/Library/Frameworks/Operation.framework/libOperation.so
System/Library/Headers/DBKit/DBKBTree.h
System/Library/Headers/DBKit/DBKBTreeNode.h
-System/Library/Headers/DBKit/DBKPathsTree.h
System/Library/Headers/DBKit/DBKFixLenRecordsFile.h
+System/Library/Headers/DBKit/DBKPathsTree.h
System/Library/Headers/DBKit/DBKVarLenRecordsFile.h
System/Library/Headers/FSNode
System/Library/Headers/Inspector
@@ -518,10 +522,12 @@ System/Library/Libraries/libInspector.so
System/Library/Libraries/libInspector.so.%%MAJORLIBVERSION2%%
System/Library/Libraries/libInspector.so.%%LIBVERSION2%%
System/Library/Libraries/libOperation.so
-System/Library/Libraries/libOperation.so.1
-System/Library/Libraries/libOperation.so.1.0.0
+System/Library/Libraries/libOperation.so.%%MAJORLIBVERSION3%%
+System/Library/Libraries/libOperation.so.%%LIBVERSION3%%
System/Library/Services/thumbnailer.service/Resources/Info-gnustep.plist
System/Library/Services/thumbnailer.service/thumbnailer
+System/Tools/GWorkspace
+System/Tools/Recycler
System/Tools/ddbd
System/Tools/fswatcher
System/Tools/lsfupdater
@@ -531,28 +537,28 @@ System/Tools/wopen
@dirrm System/Library/Services/thumbnailer.service/Resources
@dirrm System/Library/Services/thumbnailer.service
@dirrm System/Library/Headers/DBKit
-@dirrm System/Library/Frameworks/Operation.framework/Versions/A/Resources/English.lproj/FileOperationWin.gorm
-@dirrm System/Library/Frameworks/Operation.framework/Versions/A/Resources/English.lproj
-@dirrm System/Library/Frameworks/Operation.framework/Versions/A/Resources
-@dirrm System/Library/Frameworks/Operation.framework/Versions/A/Headers
-@dirrm System/Library/Frameworks/Operation.framework/Versions/A
+@dirrm System/Library/Frameworks/Operation.framework/Versions/%%MAJORLIBVERSION3%%/Resources/English.lproj/FileOperationWin.gorm
+@dirrm System/Library/Frameworks/Operation.framework/Versions/%%MAJORLIBVERSION3%%/Resources/English.lproj
+@dirrm System/Library/Frameworks/Operation.framework/Versions/%%MAJORLIBVERSION3%%/Resources
+@dirrm System/Library/Frameworks/Operation.framework/Versions/%%MAJORLIBVERSION3%%/Headers
+@dirrm System/Library/Frameworks/Operation.framework/Versions/%%MAJORLIBVERSION3%%
@dirrm System/Library/Frameworks/Operation.framework/Versions
@dirrm System/Library/Frameworks/Operation.framework
-@dirrm System/Library/Frameworks/Inspector.framework/Versions/A/Resources/English.lproj/Tools.gorm
-@dirrm System/Library/Frameworks/Inspector.framework/Versions/A/Resources/English.lproj/InspectorWin.gorm
-@dirrm System/Library/Frameworks/Inspector.framework/Versions/A/Resources/English.lproj/Contents.gorm
-@dirrm System/Library/Frameworks/Inspector.framework/Versions/A/Resources/English.lproj/Attributes.gorm
-@dirrm System/Library/Frameworks/Inspector.framework/Versions/A/Resources/English.lproj/Annotations.gorm
-@dirrm System/Library/Frameworks/Inspector.framework/Versions/A/Resources/English.lproj
-@dirrm System/Library/Frameworks/Inspector.framework/Versions/A/Resources
-@dirrm System/Library/Frameworks/Inspector.framework/Versions/A/Headers
-@dirrm System/Library/Frameworks/Inspector.framework/Versions/A
+@dirrm System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/English.lproj/Tools.gorm
+@dirrm System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/English.lproj/InspectorWin.gorm
+@dirrm System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/English.lproj/Contents.gorm
+@dirrm System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/English.lproj/Attributes.gorm
+@dirrm System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/English.lproj/Annotations.gorm
+@dirrm System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources/English.lproj
+@dirrm System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Resources
+@dirrm System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%/Headers
+@dirrm System/Library/Frameworks/Inspector.framework/Versions/%%MAJORLIBVERSION2%%
@dirrm System/Library/Frameworks/Inspector.framework/Versions
@dirrm System/Library/Frameworks/Inspector.framework
-@dirrm System/Library/Frameworks/FSNode.framework/Versions/A/Resources/English.lproj
-@dirrm System/Library/Frameworks/FSNode.framework/Versions/A/Resources
-@dirrm System/Library/Frameworks/FSNode.framework/Versions/A/Headers
-@dirrm System/Library/Frameworks/FSNode.framework/Versions/A
+@dirrm System/Library/Frameworks/FSNode.framework/Versions/%%MAJORLIBVERSION2%%/Resources/English.lproj
+@dirrm System/Library/Frameworks/FSNode.framework/Versions/%%MAJORLIBVERSION2%%/Resources
+@dirrm System/Library/Frameworks/FSNode.framework/Versions/%%MAJORLIBVERSION2%%/Headers
+@dirrm System/Library/Frameworks/FSNode.framework/Versions/%%MAJORLIBVERSION2%%
@dirrm System/Library/Frameworks/FSNode.framework/Versions
@dirrm System/Library/Frameworks/FSNode.framework
@dirrm System/Library/Bundles/SoundViewer.inspector/Resources/English.lproj/Help.rtfd
@@ -631,8 +637,8 @@ System/Tools/wopen
@dirrm System/Applications/GWorkspace.app/Resources/Portuguese.lproj
@dirrm System/Applications/GWorkspace.app/Resources/Norvegian.lproj
@dirrm System/Applications/GWorkspace.app/Resources/Italian.lproj
-@dirrm System/Applications/GWorkspace.app/Resources/German.lproj
@dirrm System/Applications/GWorkspace.app/Resources/Hungarian.lproj
+@dirrm System/Applications/GWorkspace.app/Resources/German.lproj
@dirrm System/Applications/GWorkspace.app/Resources/French.lproj
@dirrm System/Applications/GWorkspace.app/Resources/Esperanto.lproj
@dirrm System/Applications/GWorkspace.app/Resources/English.lproj/XTermPref.gorm
diff --git a/deskutils/helpviewer/pkg-plist b/deskutils/helpviewer/pkg-plist
index 088f9d179925..d9716756c28e 100644
--- a/deskutils/helpviewer/pkg-plist
+++ b/deskutils/helpviewer/pkg-plist
@@ -31,8 +31,8 @@ Local/Applications/HelpViewer.app/Resources/listing.png
Local/Applications/HelpViewer.app/Resources/note.png
Local/Applications/HelpViewer.app/Resources/notloaded.tiff
Local/Applications/HelpViewer.app/Resources/part.tiff
-Local/Applications/HelpViewer.app/library_paths.openapp
Local/Applications/HelpViewer.app/stamp.make
+Local/Tools/HelpViewer
@dirrm Local/Applications/HelpViewer.app/Resources/Main.gorm
@dirrm Local/Applications/HelpViewer.app/Resources/HelpViewer.help
@dirrm Local/Applications/HelpViewer.app/Resources
diff --git a/deskutils/mywiki/pkg-plist b/deskutils/mywiki/pkg-plist
index 3855b1a02ce5..86ef5a06c885 100644
--- a/deskutils/mywiki/pkg-plist
+++ b/deskutils/mywiki/pkg-plist
@@ -18,8 +18,8 @@ Local/Applications/MyWiki.app/Resources/common_ArrowLeft.tif
Local/Applications/MyWiki.app/Resources/common_ArrowRight.tif
Local/Applications/MyWiki.app/Resources/information.png
Local/Applications/MyWiki.app/Resources/note.png
-Local/Applications/MyWiki.app/library_paths.openapp
Local/Applications/MyWiki.app/stamp.make
+Local/Tools/MyWiki
@dirrm Local/Applications/MyWiki.app/Resources/English.lproj/MyDocument.gorm
@dirrm Local/Applications/MyWiki.app/Resources/English.lproj/MainMenu.gorm
@dirrm Local/Applications/MyWiki.app/Resources/English.lproj
diff --git a/deskutils/plopfolio/pkg-plist b/deskutils/plopfolio/pkg-plist
index 5fdb3e672f97..f5b243411e7f 100644
--- a/deskutils/plopfolio/pkg-plist
+++ b/deskutils/plopfolio/pkg-plist
@@ -22,8 +22,8 @@ Local/Applications/PlopFolio.app/Resources/anim9.tiff
Local/Applications/PlopFolio.app/Resources/reload.tiff
Local/Applications/PlopFolio.app/Resources/resize.tiff
Local/Applications/PlopFolio.app/Resources/stop.tiff
-Local/Applications/PlopFolio.app/library_paths.openapp
Local/Applications/PlopFolio.app/stamp.make
+Local/Tools/PlopFolio
@dirrm Local/Applications/PlopFolio.app/Resources/English.lproj
@dirrm Local/Applications/PlopFolio.app/Resources
@dirrm Local/Applications/PlopFolio.app
diff --git a/deskutils/preferencepanes/pkg-plist b/deskutils/preferencepanes/pkg-plist
index 691beb310ba1..ef0ae6fb7640 100644
--- a/deskutils/preferencepanes/pkg-plist
+++ b/deskutils/preferencepanes/pkg-plist
@@ -1,19 +1,21 @@
System/Library/Frameworks/PreferencePanes.framework/Headers
+System/Library/Frameworks/PreferencePanes.framework/PreferencePanes
System/Library/Frameworks/PreferencePanes.framework/Resources
-System/Library/Frameworks/PreferencePanes.framework/Versions/A/Headers/NSPreferencePane.h
-System/Library/Frameworks/PreferencePanes.framework/Versions/A/Headers/PreferencePanes.h
-System/Library/Frameworks/PreferencePanes.framework/Versions/A/PreferencePanes
-System/Library/Frameworks/PreferencePanes.framework/Versions/A/Resources/Info-gnustep.plist
-System/Library/Frameworks/PreferencePanes.framework/Versions/A/libPreferencePanes.so
-System/Library/Frameworks/PreferencePanes.framework/Versions/A/libPreferencePanes.so.%%MAJORLIBVERSION%%
-System/Library/Frameworks/PreferencePanes.framework/Versions/A/libPreferencePanes.so.%%LIBVERSION%%
+System/Library/Frameworks/PreferencePanes.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSPreferencePane.h
+System/Library/Frameworks/PreferencePanes.framework/Versions/%%MAJORLIBVERSION%%/Headers/PreferencePanes.h
+System/Library/Frameworks/PreferencePanes.framework/Versions/%%MAJORLIBVERSION%%/PreferencePanes
+System/Library/Frameworks/PreferencePanes.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist
+System/Library/Frameworks/PreferencePanes.framework/Versions/%%MAJORLIBVERSION%%/libPreferencePanes.so
+System/Library/Frameworks/PreferencePanes.framework/Versions/%%MAJORLIBVERSION%%/libPreferencePanes.so.%%MAJORLIBVERSION%%
+System/Library/Frameworks/PreferencePanes.framework/Versions/%%MAJORLIBVERSION%%/libPreferencePanes.so.%%LIBVERSION%%
System/Library/Frameworks/PreferencePanes.framework/Versions/Current
+System/Library/Frameworks/PreferencePanes.framework/libPreferencePanes.so
System/Library/Headers/PreferencePanes
System/Library/Libraries/libPreferencePanes.so
System/Library/Libraries/libPreferencePanes.so.%%MAJORLIBVERSION%%
System/Library/Libraries/libPreferencePanes.so.%%LIBVERSION%%
-@dirrm System/Library/Frameworks/PreferencePanes.framework/Versions/A/Resources
-@dirrm System/Library/Frameworks/PreferencePanes.framework/Versions/A/Headers
-@dirrm System/Library/Frameworks/PreferencePanes.framework/Versions/A
+@dirrm System/Library/Frameworks/PreferencePanes.framework/Versions/%%MAJORLIBVERSION%%/Resources
+@dirrm System/Library/Frameworks/PreferencePanes.framework/Versions/%%MAJORLIBVERSION%%/Headers
+@dirrm System/Library/Frameworks/PreferencePanes.framework/Versions/%%MAJORLIBVERSION%%
@dirrm System/Library/Frameworks/PreferencePanes.framework/Versions
@dirrm System/Library/Frameworks/PreferencePanes.framework
diff --git a/deskutils/preferences.app/Makefile b/deskutils/preferences.app/Makefile
index 1aaa043a5eda..4cbe049c8050 100644
--- a/deskutils/preferences.app/Makefile
+++ b/deskutils/preferences.app/Makefile
@@ -24,6 +24,8 @@ USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_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/preferences.app/pkg-plist b/deskutils/preferences.app/pkg-plist
index bba93a2b0215..548255442c11 100644
--- a/deskutils/preferences.app/pkg-plist
+++ b/deskutils/preferences.app/pkg-plist
@@ -1,8 +1,14 @@
System/Applications/Preferences.app/Preferences
+System/Applications/Preferences.app/Resources/English.lproj/Localizable.strings
+System/Applications/Preferences.app/Resources/English.lproj/Preferences.gorm
System/Applications/Preferences.app/Resources/Info-gnustep.plist
System/Applications/Preferences.app/Resources/Preferences.desktop
System/Applications/Preferences.app/Resources/Preferences.tiff
System/Applications/Preferences.app/Resources/PreferencesInfo.plist
+System/Applications/Preferences.app/Resources/PrefsApp.prefs/PrefsApp
+System/Applications/Preferences.app/Resources/PrefsApp.prefs/Resources/Info-gnustep.plist
+System/Applications/Preferences.app/Resources/PrefsApp.prefs/Resources/PrefsApp.gorm
+System/Applications/Preferences.app/Resources/PrefsApp.prefs/stamp.make
System/Applications/Preferences.app/Resources/PrefsIcon_Appearances.tiff
System/Applications/Preferences.app/Resources/PrefsIcon_Keyboard.tiff
System/Applications/Preferences.app/Resources/PrefsIcon_Localisation.tiff
@@ -11,45 +17,40 @@ System/Applications/Preferences.app/Resources/PrefsIcon_Mouse.tiff
System/Applications/Preferences.app/Resources/PrefsIcon_Screen.tiff
System/Applications/Preferences.app/Resources/PrefsIcon_SelectSpooler.tiff
System/Applications/Preferences.app/Resources/PrefsModule.tiff
-System/Applications/Preferences.app/Resources/English.lproj/Localizable.strings
-System/Applications/Preferences.app/Resources/English.lproj/Preferences.gorm
-System/Applications/Preferences.app/Resources/PrefsApp.prefs/Resources/Info-gnustep.plist
-System/Applications/Preferences.app/Resources/PrefsApp.prefs/Resources/PrefsApp.gorm
-System/Applications/Preferences.app/Resources/PrefsApp.prefs/PrefsApp
-System/Applications/Preferences.app/Resources/PrefsApp.prefs/stamp.make
-System/Applications/Preferences.app/library_paths.openapp
System/Applications/Preferences.app/stamp.make
+System/Library/Frameworks/PrefsModule.framework/Headers
+System/Library/Frameworks/PrefsModule.framework/PrefsModule
+System/Library/Frameworks/PrefsModule.framework/Resources
+System/Library/Frameworks/PrefsModule.framework/Versions/%%MAJORLIBVERSION%%/Headers/PrefsModule.h
+System/Library/Frameworks/PrefsModule.framework/Versions/%%MAJORLIBVERSION%%/PrefsModule
+System/Library/Frameworks/PrefsModule.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist
+System/Library/Frameworks/PrefsModule.framework/Versions/%%MAJORLIBVERSION%%/libPrefsModule.so
+System/Library/Frameworks/PrefsModule.framework/Versions/%%MAJORLIBVERSION%%/libPrefsModule.so.%%MAJORLIBVERSION%%
+System/Library/Frameworks/PrefsModule.framework/Versions/%%MAJORLIBVERSION%%/libPrefsModule.so.%%LIBVERSION%%
+System/Library/Frameworks/PrefsModule.framework/Versions/Current
+System/Library/Frameworks/PrefsModule.framework/libPrefsModule.so
+System/Library/Headers/PrefsModule
System/Library/Libraries/libPrefsModule.so
System/Library/Libraries/libPrefsModule.so.%%MAJORLIBVERSION%%
System/Library/Libraries/libPrefsModule.so.%%LIBVERSION%%
-System/Library/Frameworks/PrefsModule.framework/Resources
-System/Library/Frameworks/PrefsModule.framework/Versions/A/Headers/PrefsModule.h
-System/Library/Frameworks/PrefsModule.framework/Versions/A/Resources/Info-gnustep.plist
-System/Library/Frameworks/PrefsModule.framework/Versions/A/PrefsModule
-System/Library/Frameworks/PrefsModule.framework/Versions/A/libPrefsModule.so
-System/Library/Frameworks/PrefsModule.framework/Versions/A/libPrefsModule.so.%%MAJORLIBVERSION%%
-System/Library/Frameworks/PrefsModule.framework/Versions/A/libPrefsModule.so.%%LIBVERSION%%
-@exec ln -fs Versions/Current/Headers %D/System/Library/Frameworks/PrefsModule.framework/Headers
-@exec ln -fs Versions/Current/Resources %D/System/Library/Frameworks/PrefsModule.framework/Resources
-@exec ln -fs A %D/System/Library/Frameworks/PrefsModule.framework/Versions/Current
-@unexec rm -f %D/System/Library/Frameworks/PrefsModule.framework/Headers
-@unexec rm -f %D/System/Library/Frameworks/PrefsModule.framework/Resources
-@unexec rm -f %D/System/Library/Frameworks/PrefsModule.framework/Versions/Current
-@unexec rm -f %D/System/Library/Headers/PrefsModule
+System/Library/Preferences/Keyboard.prefs/Keyboard
System/Library/Preferences/Keyboard.prefs/Resources/Info-gnustep.plist
System/Library/Preferences/Keyboard.prefs/Resources/Keyboard.gorm
-System/Library/Preferences/Keyboard.prefs/Keyboard
System/Library/Preferences/Keyboard.prefs/stamp.make
-@dirrm System/Applications/Preferences.app/Resources/English.lproj
+System/Tools/Preferences
+@dirrm System/Library/Preferences/Keyboard.prefs/Resources
+@dirrm System/Library/Preferences/Keyboard.prefs
+@dirrm System/Library/Preferences
+@dirrm System/Library/Frameworks/PrefsModule.framework/Versions/%%MAJORLIBVERSION%%/Resources
+@dirrm System/Library/Frameworks/PrefsModule.framework/Versions/%%MAJORLIBVERSION%%/Headers
+@dirrm System/Library/Frameworks/PrefsModule.framework/Versions/%%MAJORLIBVERSION%%
+@dirrm System/Library/Frameworks/PrefsModule.framework/Versions
+@dirrm System/Library/Frameworks/PrefsModule.framework
@dirrm System/Applications/Preferences.app/Resources/PrefsApp.prefs/Resources
@dirrm System/Applications/Preferences.app/Resources/PrefsApp.prefs
+@dirrm System/Applications/Preferences.app/Resources/English.lproj
@dirrm System/Applications/Preferences.app/Resources
@dirrm System/Applications/Preferences.app
-@dirrm System/Library/Frameworks/PrefsModule.framework/Versions/A/Headers
-@dirrm System/Library/Frameworks/PrefsModule.framework/Versions/A/Resources
-@dirrm System/Library/Frameworks/PrefsModule.framework/Versions/A
-@dirrm System/Library/Frameworks/PrefsModule.framework/Versions
-@dirrm System/Library/Frameworks/PrefsModule.framework
-@dirrm System/Library/Preferences/Keyboard.prefs/Resources
-@dirrm System/Library/Preferences/Keyboard.prefs
-@dirrm System/Library/Preferences
+@dirrmtry Network/Library/Preferences
+@dirrmtry Network/Library
+@dirrmtry Network
diff --git a/deskutils/systempreferences/Makefile b/deskutils/systempreferences/Makefile
index 40d7ff1c9e74..5a9ddf49b122 100644
--- a/deskutils/systempreferences/Makefile
+++ b/deskutils/systempreferences/Makefile
@@ -22,6 +22,7 @@ USE_GNUSTEP_BACK= yes
USE_GNUSTEP_SYSTEM_LIBS+= PreferencePanes:${PREFERENCEPANES_PORT}
USE_GNUSTEP_MAKE_DIRS= SystemPreferences Modules
+MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
PREFERENCEPANES_PORT?= deskutils/preferencepanes
diff --git a/deskutils/systempreferences/pkg-plist b/deskutils/systempreferences/pkg-plist
index af8a2b79c68c..ce2a68bc4814 100644
--- a/deskutils/systempreferences/pkg-plist
+++ b/deskutils/systempreferences/pkg-plist
@@ -5,7 +5,6 @@ System/Applications/SystemPreferences.app/Resources/Info-gnustep.plist
System/Applications/SystemPreferences.app/Resources/SystemPreferences.desktop
System/Applications/SystemPreferences.app/Resources/SystemPreferences.tiff
System/Applications/SystemPreferences.app/SystemPreferences
-System/Applications/SystemPreferences.app/library_paths.openapp
System/Applications/SystemPreferences.app/stamp.make
System/Library/Bundles/Defaults.prefPane/Defaults
System/Library/Bundles/Defaults.prefPane/Resources/Defaults.tiff
@@ -50,6 +49,7 @@ System/Library/Bundles/Volumes.prefPane/Resources/Info.plist
System/Library/Bundles/Volumes.prefPane/Resources/Volumes.tiff
System/Library/Bundles/Volumes.prefPane/Volumes
System/Library/Bundles/Volumes.prefPane/stamp.make
+System/Tools/SystemPreferences
@dirrm System/Library/Bundles/Volumes.prefPane/Resources/English.lproj/Volumes.gorm
@dirrm System/Library/Bundles/Volumes.prefPane/Resources/English.lproj
@dirrm System/Library/Bundles/Volumes.prefPane/Resources
diff --git a/deskutils/toolbox/Makefile b/deskutils/toolbox/Makefile
index 3814354c414e..d212066485af 100644
--- a/deskutils/toolbox/Makefile
+++ b/deskutils/toolbox/Makefile
@@ -25,6 +25,7 @@ USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LOCAL_LIBS+= Toolbox:${TOOLBOXKIT_PORT}
WRKSRC= ${WRKDIR}/Toolbox
+MAKE_ENV+= GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT}
TOOLBOXKIT_PORT?= deskutils/toolboxkit
diff --git a/deskutils/toolbox/pkg-plist b/deskutils/toolbox/pkg-plist
index 4b7641cd02ac..97a198828e9f 100644
--- a/deskutils/toolbox/pkg-plist
+++ b/deskutils/toolbox/pkg-plist
@@ -5,7 +5,6 @@ Local/Applications/Toolbox.app/Resources/ToolboxDefaults.plist
Local/Applications/Toolbox.app/Resources/ToolboxHelp.rtf
Local/Applications/Toolbox.app/Resources/ToolboxInfo.plist
Local/Applications/Toolbox.app/Toolbox
-Local/Applications/Toolbox.app/library_paths.openapp
Local/Applications/Toolbox.app/stamp.make
Local/Library/Toolbox/Calculator.toolbox/Calculator
Local/Library/Toolbox/Calculator.toolbox/Resources/Calculator.tiff
@@ -51,6 +50,7 @@ Local/Library/Toolbox/Preference.toolbox/Resources/PreferenceHelp.rtf
Local/Library/Toolbox/Preference.toolbox/Resources/PreferenceInfo.plist
Local/Library/Toolbox/Preference.toolbox/Resources/Toolbox.tiff
Local/Library/Toolbox/Preference.toolbox/stamp.make
+Local/Tools/Toolbox
@dirrm Local/Library/Toolbox/Preference.toolbox/Resources
@dirrm Local/Library/Toolbox/Preference.toolbox
@dirrm Local/Library/Toolbox/Ploplet.toolbox/Resources
diff --git a/devel/fortytwo-encore/pkg-plist b/devel/fortytwo-encore/pkg-plist
index dcfb74a6cc36..df64eab199b0 100644
--- a/devel/fortytwo-encore/pkg-plist
+++ b/devel/fortytwo-encore/pkg-plist
@@ -1,55 +1,57 @@
+Local/Library/Frameworks/Encore.framework/Encore
Local/Library/Frameworks/Encore.framework/Headers
Local/Library/Frameworks/Encore.framework/Resources
-Local/Library/Frameworks/Encore.framework/Versions/A/Encore
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECArrayIterator.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECCache.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECCacheItem.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECDefaultLoggingFormatter.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECEmptyIterator.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECEnumeratorIterator.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECExceptions.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECFileLoggingWriter.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECIterator.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECKeyToListMap.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECLogger.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECLogging.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECLoggingConfiguration.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECLoggingFormatter.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECLoggingWriter.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECLoggingXMLConfiguration.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECMemory.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECNSLogLoggingWriter.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECObject.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECParameterString.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECStack.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECStandardOutput.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECStringUtils.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECTestResult.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECTestSuite.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECTestcase.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECXMLControl.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECXMLControlContext.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECXMLControlDefaultAllocatorRule.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECXMLControlDefaultRule.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECXMLControlDelegateMessageRule.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECXMLControlEvent.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECXMLControlReferenceRule.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECXMLControlRule.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECXMLControlRuleSelector.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECXMLControlState.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/Encore.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Resources/Info-gnustep.plist
-Local/Library/Frameworks/Encore.framework/Versions/A/libEncore.so
-Local/Library/Frameworks/Encore.framework/Versions/A/libEncore.so.%%MAJORLIBVERSION%%
-Local/Library/Frameworks/Encore.framework/Versions/A/libEncore.so.%%LIBVERSION%%
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Encore
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECArrayIterator.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECCache.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECCacheItem.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECDefaultLoggingFormatter.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECEmptyIterator.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECEnumeratorIterator.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECExceptions.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECFileLoggingWriter.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECIterator.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECKeyToListMap.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECLogger.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECLogging.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECLoggingConfiguration.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECLoggingFormatter.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECLoggingWriter.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECLoggingXMLConfiguration.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECMemory.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECNSLogLoggingWriter.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECObject.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECParameterString.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECStack.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECStandardOutput.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECStringUtils.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECTestResult.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECTestSuite.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECTestcase.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECXMLControl.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECXMLControlContext.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECXMLControlDefaultAllocatorRule.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECXMLControlDefaultRule.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECXMLControlDelegateMessageRule.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECXMLControlEvent.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECXMLControlReferenceRule.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECXMLControlRule.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECXMLControlRuleSelector.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECXMLControlState.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/Encore.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/libEncore.so
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/libEncore.so.%%MAJORLIBVERSION%%
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/libEncore.so.%%LIBVERSION%%
Local/Library/Frameworks/Encore.framework/Versions/Current
+Local/Library/Frameworks/Encore.framework/libEncore.so
Local/Library/Headers/Encore
Local/Library/Libraries/libEncore.so
Local/Library/Libraries/libEncore.so.%%MAJORLIBVERSION%%
Local/Library/Libraries/libEncore.so.%%LIBVERSION%%
-@dirrm Local/Library/Frameworks/Encore.framework/Versions/A/Resources
-@dirrm Local/Library/Frameworks/Encore.framework/Versions/A/Headers
-@dirrm Local/Library/Frameworks/Encore.framework/Versions/A
+@dirrm Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Resources
+@dirrm Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers
+@dirrm Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%
@dirrm Local/Library/Frameworks/Encore.framework/Versions
@dirrm Local/Library/Frameworks/Encore.framework
%%PORTDOCS%%%%DOCSDIR%%/ECArrayIterator/Classes/ECArrayIterator/CompositePage.html
diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile
index 6e692ebc1a43..6dac5b965d60 100644
--- a/devel/gnustep-make/Makefile
+++ b/devel/gnustep-make/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= gnustep-make
-PORTVERSION= 1.13.0
-PORTREVISION= 4
+PORTVERSION= 2.0.0
CATEGORIES= devel gnustep
MASTER_SITES= ${MASTER_SITE_GNUSTEP}
MASTER_SITE_SUBDIR= core
@@ -33,6 +32,28 @@ GNUSTEP_WITHOUT_LIBOBJC= yes
post-install:
${LN} -s Library/Makefiles ${PREFIX}/System/
+ -${MKDIR} ${PREFIX}/System/Applications
+ -${MKDIR} ${PREFIX}/System/Library/ApplicationSupport
+ -${MKDIR} ${PREFIX}/System/Library/Bundles
+ -${MKDIR} ${PREFIX}/System/Library/ColorPickers
+ -${MKDIR} ${PREFIX}/System/Library/Colors
+ -${MKDIR} ${PREFIX}/System/Library/DocTemplates
+ -${MKDIR} ${PREFIX}/System/Library/Documentation/info
+ -${MKDIR} ${PREFIX}/System/Library/Documentation/man
+ -${MKDIR} ${PREFIX}/System/Library/Documentation/Developer
+ -${MKDIR} ${PREFIX}/System/Library/Documentation/User
+ -${MKDIR} ${PREFIX}/System/Library/Fonts
+ -${MKDIR} ${PREFIX}/System/Library/Frameworks
+ -${MKDIR} ${PREFIX}/System/Library/Headers
+ -${MKDIR} ${PREFIX}/System/Library/Images
+ -${MKDIR} ${PREFIX}/System/Library/KeyBindings
+ -${MKDIR} ${PREFIX}/System/Library/Libraries/Java
+ -${MKDIR} ${PREFIX}/System/Library/Libraries/Resources
+ -${MKDIR} ${PREFIX}/System/Library/PostScript
+ -${MKDIR} ${PREFIX}/System/Library/Services
+ -${MKDIR} ${PREFIX}/System/Library/Sounds
+ -${MKDIR} ${PREFIX}/System/Tools/Java
+ -${MKDIR} ${PREFIX}/System/Tools/Resources
-${MKDIR} ${PREFIX}/Local/Applications
-${MKDIR} ${PREFIX}/Local/Library/ApplicationSupport
-${MKDIR} ${PREFIX}/Local/Library/Bundles
diff --git a/devel/gnustep-make/distinfo b/devel/gnustep-make/distinfo
index 16567ab0c336..91b7865e24bf 100644
--- a/devel/gnustep-make/distinfo
+++ b/devel/gnustep-make/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnustep-make-1.13.0.tar.gz) = 1d7a434e751c58c6390055c14ada302b
-SHA256 (gnustep-make-1.13.0.tar.gz) = d79c11bada9ccd32d0ab08a0dfbd776731b02103975a22b6b95284046b740e8f
-SIZE (gnustep-make-1.13.0.tar.gz) = 400157
+MD5 (gnustep-make-2.0.0.tar.gz) = d452546f56dbc0c66417bd2059548e71
+SHA256 (gnustep-make-2.0.0.tar.gz) = 12aa107dc7911e21066f8f5d4f05ec9b17be1bd61abef9019b18181db7cef292
+SIZE (gnustep-make-2.0.0.tar.gz) = 441630
diff --git a/devel/gnustep-make/pkg-plist b/devel/gnustep-make/pkg-plist
index db474e47809a..844a975401c0 100644
--- a/devel/gnustep-make/pkg-plist
+++ b/devel/gnustep-make/pkg-plist
@@ -59,6 +59,7 @@ System/Library/Makefiles/Master/test-library.make
System/Library/Makefiles/Master/test-tool.make
System/Library/Makefiles/Master/tool.make
System/Library/Makefiles/aggregate.make
+System/Library/Makefiles/app-wrapper.template
System/Library/Makefiles/application.make
System/Library/Makefiles/bundle.make
System/Library/Makefiles/clean_cpu.sh
@@ -66,15 +67,21 @@ System/Library/Makefiles/clean_os.sh
System/Library/Makefiles/clean_vendor.sh
System/Library/Makefiles/clibrary.make
System/Library/Makefiles/common.make
+System/Library/Makefiles/config-noarch.make
System/Library/Makefiles/config.guess
System/Library/Makefiles/config.make
System/Library/Makefiles/config.sub
System/Library/Makefiles/cpu.sh
System/Library/Makefiles/ctool.make
System/Library/Makefiles/documentation.make
+System/Library/Makefiles/empty.make
System/Library/Makefiles/executable.template
+System/Library/Makefiles/filesystem.sh
+System/Library/Makefiles/filesystem.csh
+System/Library/Makefiles/filesystem.make
System/Library/Makefiles/fixpath.sh
System/Library/Makefiles/framework.make
+System/Library/Makefiles/gnustep-make-help
System/Library/Makefiles/gswapp.make
System/Library/Makefiles/gswbundle.make
System/Library/Makefiles/install-sh
@@ -93,12 +100,11 @@ System/Library/Makefiles/native-library.make
System/Library/Makefiles/objc.make
System/Library/Makefiles/os.sh
System/Library/Makefiles/palette.make
+System/Library/Makefiles/print_unique_pathlist.sh
System/Library/Makefiles/relative_path.sh
System/Library/Makefiles/resource-set.make
System/Library/Makefiles/rules.make
System/Library/Makefiles/service.make
-System/Library/Makefiles/spec-debug-alone-rules.template
-System/Library/Makefiles/spec-debug-rules.template
System/Library/Makefiles/spec-rules.template
System/Library/Makefiles/strip_makefiles.sh
System/Library/Makefiles/tar-exclude-list
@@ -108,15 +114,12 @@ System/Library/Makefiles/test-application.make
System/Library/Makefiles/test-library.make
System/Library/Makefiles/test-tool.make
System/Library/Makefiles/tool.make
-System/Library/Makefiles/transform_paths.sh
System/Library/Makefiles/vendor.sh
-System/Library/Makefiles/which_lib
System/Tools/debugapp
+System/Tools/gnustep-config
System/Tools/openapp
System/Tools/opentool
-System/share/config.site
@exec ln -s Library/Makefiles %D/System
-@dirrm System/share
@dirrm System/Tools/Resources
@dirrm System/Tools/Java
@dirrm System/Tools
diff --git a/devel/highlighterkit/pkg-plist b/devel/highlighterkit/pkg-plist
index 647d3644800f..24630aff0651 100644
--- a/devel/highlighterkit/pkg-plist
+++ b/devel/highlighterkit/pkg-plist
@@ -1,27 +1,29 @@
Local/Library/Frameworks/HighlighterKit.framework/Headers
+Local/Library/Frameworks/HighlighterKit.framework/HighlighterKit
Local/Library/Frameworks/HighlighterKit.framework/Resources
-Local/Library/Frameworks/HighlighterKit.framework/Versions/A/Headers/HKSyntaxDefinition.h
-Local/Library/Frameworks/HighlighterKit.framework/Versions/A/Headers/HKSyntaxHighlighter.h
-Local/Library/Frameworks/HighlighterKit.framework/Versions/A/Headers/HKTextPattern.h
-Local/Library/Frameworks/HighlighterKit.framework/Versions/A/Headers/HighlighterKit.h
-Local/Library/Frameworks/HighlighterKit.framework/Versions/A/HighlighterKit
-Local/Library/Frameworks/HighlighterKit.framework/Versions/A/Resources/C++.syntax
-Local/Library/Frameworks/HighlighterKit.framework/Versions/A/Resources/C-Header.syntax
-Local/Library/Frameworks/HighlighterKit.framework/Versions/A/Resources/C.syntax
-Local/Library/Frameworks/HighlighterKit.framework/Versions/A/Resources/Info-gnustep.plist
-Local/Library/Frameworks/HighlighterKit.framework/Versions/A/Resources/ObjC++.syntax
-Local/Library/Frameworks/HighlighterKit.framework/Versions/A/Resources/ObjC.syntax
-Local/Library/Frameworks/HighlighterKit.framework/Versions/A/Resources/Plist.syntax
-Local/Library/Frameworks/HighlighterKit.framework/Versions/A/libHighlighterKit.so
-Local/Library/Frameworks/HighlighterKit.framework/Versions/A/libHighlighterKit.so.%%MAJORLIBVERSION%%
-Local/Library/Frameworks/HighlighterKit.framework/Versions/A/libHighlighterKit.so.%%LIBVERSION%%
+Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/HKSyntaxDefinition.h
+Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/HKSyntaxHighlighter.h
+Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/HKTextPattern.h
+Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/HighlighterKit.h
+Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/HighlighterKit
+Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/C++.syntax
+Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/C-Header.syntax
+Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/C.syntax
+Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/ObjC++.syntax
+Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/ObjC.syntax
+Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/Plist.syntax
+Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/libHighlighterKit.so
+Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/libHighlighterKit.so.%%MAJORLIBVERSION%%
+Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/libHighlighterKit.so.%%LIBVERSION%%
Local/Library/Frameworks/HighlighterKit.framework/Versions/Current
+Local/Library/Frameworks/HighlighterKit.framework/libHighlighterKit.so
Local/Library/Headers/HighlighterKit
Local/Library/Libraries/libHighlighterKit.so
Local/Library/Libraries/libHighlighterKit.so.%%MAJORLIBVERSION%%
Local/Library/Libraries/libHighlighterKit.so.%%LIBVERSION%%
-@dirrm Local/Library/Frameworks/HighlighterKit.framework/Versions/A/Resources
-@dirrm Local/Library/Frameworks/HighlighterKit.framework/Versions/A/Headers
-@dirrm Local/Library/Frameworks/HighlighterKit.framework/Versions/A
+@dirrm Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Resources
+@dirrm Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Headers
+@dirrm Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%
@dirrm Local/Library/Frameworks/HighlighterKit.framework/Versions
@dirrm Local/Library/Frameworks/HighlighterKit.framework
diff --git a/devel/objcunit/Makefile b/devel/objcunit/Makefile
index a296536ddd9c..e23f4984ac2b 100644
--- a/devel/objcunit/Makefile
+++ b/devel/objcunit/Makefile
@@ -24,5 +24,10 @@ USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
WRKSRC= ${WRKDIR}/ObjcUnit-${PORTVERSION}/ObjcUnit
+ADDITIONAL_INCLUDE_DIRS+= -I${WRKSRC}
+MAKE_ENV+= ObjcUnit_CURRENT_VERSION_NAME=0
+
+post-patch:
+ ${LN} -s "Classes" ${WRKSRC}/ObjcUnit
.include <bsd.port.mk>
diff --git a/devel/objcunit/pkg-plist b/devel/objcunit/pkg-plist
index b502a7167526..9a462e96e45d 100644
--- a/devel/objcunit/pkg-plist
+++ b/devel/objcunit/pkg-plist
@@ -1,37 +1,39 @@
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers/AbstractExpectation.h
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers/AbstractExpectationCollection.h
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers/AssertionFailedException.h
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers/ExpectationCounter.h
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers/ExpectationGroup.h
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers/ExpectationList.h
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers/ExpectationSet.h
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers/ExpectationValue.h
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers/NSObject-ObjcUnitAdditions.h
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers/ObjcUnit.h
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers/Test.h
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers/TestCase.h
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers/TestFailure.h
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers/TestListener.h
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers/TestResult.h
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers/TestRunner.h
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers/TestSuite.h
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers/_WarningTest.h
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers/MockCoder.h
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers/MockObjects.h
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Resources/Info-gnustep.plist
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/ObjcUnit
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/libObjcUnit.so
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/libObjcUnit.so.%%MAJORLIBVERSION%%
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/libObjcUnit.so.%%LIBVERSION%%
-Local/Library/Frameworks/ObjcUnit.framework/Versions/Current
-Local/Library/Frameworks/ObjcUnit.framework/Resources
Local/Library/Frameworks/ObjcUnit.framework/Headers
+Local/Library/Frameworks/ObjcUnit.framework/ObjcUnit
+Local/Library/Frameworks/ObjcUnit.framework/Resources
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers/AbstractExpectation.h
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers/AbstractExpectationCollection.h
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers/AssertionFailedException.h
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers/ExpectationCounter.h
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers/ExpectationGroup.h
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers/ExpectationList.h
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers/ExpectationSet.h
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers/ExpectationValue.h
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers/MockCoder.h
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers/MockObjects.h
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSObject-ObjcUnitAdditions.h
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers/ObjcUnit.h
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers/Test.h
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers/TestCase.h
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers/TestFailure.h
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers/TestListener.h
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers/TestResult.h
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers/TestRunner.h
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers/TestSuite.h
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers/_WarningTest.h
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/ObjcUnit
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/libObjcUnit.so
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/libObjcUnit.so.%%MAJORLIBVERSION%%
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/libObjcUnit.so.%%LIBVERSION%%
+Local/Library/Frameworks/ObjcUnit.framework/Versions/Current
+Local/Library/Frameworks/ObjcUnit.framework/libObjcUnit.so
Local/Library/Libraries/libObjcUnit.so
Local/Library/Libraries/libObjcUnit.so.%%LIBVERSION%%
Local/Library/Libraries/libObjcUnit.so.%%MAJORLIBVERSION%%
Local/Library/Headers/ObjcUnit
-@dirrm Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Resources
-@dirrm Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers
-@dirrm Local/Library/Frameworks/ObjcUnit.framework/Versions/A
+@dirrm Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Resources
+@dirrm Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers
+@dirrm Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%
@dirrm Local/Library/Frameworks/ObjcUnit.framework/Versions
@dirrm Local/Library/Frameworks/ObjcUnit.framework
diff --git a/devel/projectcenter.app/Makefile b/devel/projectcenter.app/Makefile
index 890cd3220c51..f8bf407f4dc2 100644
--- a/devel/projectcenter.app/Makefile
+++ b/devel/projectcenter.app/Makefile
@@ -24,5 +24,6 @@ USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES}
PLIST_SUB+= FRAMEVERSION=${PORTVERSION}
+MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
.include <bsd.port.mk>
diff --git a/devel/projectcenter.app/pkg-plist b/devel/projectcenter.app/pkg-plist
index 0d11f3d8a44e..1ef7346cad4a 100644
--- a/devel/projectcenter.app/pkg-plist
+++ b/devel/projectcenter.app/pkg-plist
@@ -1,4 +1,3 @@
-System/Applications/ProjectCenter.app/library_paths.openapp
System/Applications/ProjectCenter.app/ProjectCenter
System/Applications/ProjectCenter.app/Resources/AggregateProject.bundle/AggregateProject
System/Applications/ProjectCenter.app/Resources/AggregateProject.bundle/Resources/Info-gnustep.plist
@@ -111,6 +110,9 @@ System/Applications/ProjectCenter.app/Resources/soundSuitcaseH.tiff
System/Applications/ProjectCenter.app/Resources/subprojectSuitcase.tiff
System/Applications/ProjectCenter.app/Resources/subprojectSuitcaseH.tiff
System/Applications/ProjectCenter.app/stamp.make
+System/Library/Frameworks/ProjectCenter.framework/Headers
+System/Library/Frameworks/ProjectCenter.framework/ProjectCenter
+System/Library/Frameworks/ProjectCenter.framework/Resources
System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/Headers/PCAddFilesPanel.h
System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/Headers/PCBuildPanel.h
System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/Headers/PCBundleLoader.h
@@ -142,6 +144,7 @@ System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/Head
System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/Headers/ProjectCenter.h
System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/Headers/ProjectType.h
System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/Headers/Server.h
+System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/ProjectCenter
System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/Resources/BuildAttributes.gorm/data.classes
System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/Resources/BuildAttributes.gorm/data.info
System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/Resources/BuildAttributes.gorm/objects.gorm
@@ -177,37 +180,13 @@ System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/Reso
System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/libProjectCenter.so
System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/libProjectCenter.so.%%MAJORVERSION%%
System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/libProjectCenter.so.%%FRAMEVERSION%%
+System/Library/Frameworks/ProjectCenter.framework/Versions/Current
+System/Library/Frameworks/ProjectCenter.framework/libProjectCenter.so
+System/Library/Headers/ProjectCenter
System/Library/Libraries/libProjectCenter.so
System/Library/Libraries/libProjectCenter.so.%%MAJORVERSION%%
System/Library/Libraries/libProjectCenter.so.%%FRAMEVERSION%%
-@unexec rm -f %D/System/Library/Frameworks/ProjectCenter.framework/Headers
-@unexec rm -f %D/System/Library/Frameworks/ProjectCenter.framework/Resources
-@unexec rm -f %D/System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/ProjectCenter
-@unexec rm -f %D/System/Library/Frameworks/ProjectCenter.framework/Versions/Current
-@unexec rm -f %D/System/Library/Headers/ProjectCenter
-@dirrm System/Applications/ProjectCenter.app/Resources/ProjectCenter.gorm
-@dirrm System/Applications/ProjectCenter.app/Resources/AggregateProject.bundle/Resources/Inspector.gorm
-@dirrm System/Applications/ProjectCenter.app/Resources/AggregateProject.bundle/Resources
-@dirrm System/Applications/ProjectCenter.app/Resources/AggregateProject.bundle
-@dirrm System/Applications/ProjectCenter.app/Resources/ApplicationProject.bundle/Resources/Main.gorm
-@dirrm System/Applications/ProjectCenter.app/Resources/ApplicationProject.bundle/Resources/Inspector.gorm
-@dirrm System/Applications/ProjectCenter.app/Resources/ApplicationProject.bundle/Resources
-@dirrm System/Applications/ProjectCenter.app/Resources/ApplicationProject.bundle
-@dirrm System/Applications/ProjectCenter.app/Resources/BundleProject.bundle/Resources/Inspector.gorm
-@dirrm System/Applications/ProjectCenter.app/Resources/BundleProject.bundle/Resources
-@dirrm System/Applications/ProjectCenter.app/Resources/BundleProject.bundle
-@dirrm System/Applications/ProjectCenter.app/Resources/LibraryProject.bundle/Resources/Inspector.gorm
-@dirrm System/Applications/ProjectCenter.app/Resources/LibraryProject.bundle/Resources
-@dirrm System/Applications/ProjectCenter.app/Resources/LibraryProject.bundle
-@dirrm System/Applications/ProjectCenter.app/Resources/RenaissanceProject.bundle/Resources/Inspector.gorm
-@dirrm System/Applications/ProjectCenter.app/Resources/RenaissanceProject.bundle/Resources
-@dirrm System/Applications/ProjectCenter.app/Resources/RenaissanceProject.bundle
-@dirrm System/Applications/ProjectCenter.app/Resources/ToolProject.bundle/Resources/Inspector.gorm
-@dirrm System/Applications/ProjectCenter.app/Resources/ToolProject.bundle/Resources
-@dirrm System/Applications/ProjectCenter.app/Resources/ToolProject.bundle
-@dirrm System/Applications/ProjectCenter.app/Resources
-@dirrm System/Applications/ProjectCenter.app
-@dirrm System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/Headers
+System/Tools/ProjectCenter
@dirrm System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/Resources/ProjectInspector.gorm
@dirrm System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/Resources/ProjectDescription.gorm
@dirrm System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/Resources/Preferences.gorm
@@ -217,11 +196,29 @@ System/Library/Libraries/libProjectCenter.so.%%FRAMEVERSION%%
@dirrm System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/Resources/FileAttributes.gorm
@dirrm System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/Resources/BuildAttributes.gorm
@dirrm System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/Resources
+@dirrm System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/Headers
@dirrm System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%
@dirrm System/Library/Frameworks/ProjectCenter.framework/Versions
@dirrm System/Library/Frameworks/ProjectCenter.framework
-@exec ln -s %%FRAMEVERSION%% %D/System/Library/Frameworks/ProjectCenter.framework/Versions/Current
-@exec ln -s Versions/Current/Headers %D/System/Library/Frameworks/ProjectCenter.framework/Headers
-@exec ln -s Versions/Current/Resources %D/System/Library/Frameworks/ProjectCenter.framework/Resources
-@exec ln -s libProjectCenter.so %D/System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/ProjectCenter
-@exec ln -s ../Frameworks/ProjectCenter.framework/Headers %D/System/Library/Headers/ProjectCenter
+@dirrm System/Applications/ProjectCenter.app/Resources/ToolProject.bundle/Resources/Inspector.gorm
+@dirrm System/Applications/ProjectCenter.app/Resources/ToolProject.bundle/Resources
+@dirrm System/Applications/ProjectCenter.app/Resources/ToolProject.bundle
+@dirrm System/Applications/ProjectCenter.app/Resources/RenaissanceProject.bundle/Resources/Inspector.gorm
+@dirrm System/Applications/ProjectCenter.app/Resources/RenaissanceProject.bundle/Resources
+@dirrm System/Applications/ProjectCenter.app/Resources/RenaissanceProject.bundle
+@dirrm System/Applications/ProjectCenter.app/Resources/ProjectCenter.gorm
+@dirrm System/Applications/ProjectCenter.app/Resources/LibraryProject.bundle/Resources/Inspector.gorm
+@dirrm System/Applications/ProjectCenter.app/Resources/LibraryProject.bundle/Resources
+@dirrm System/Applications/ProjectCenter.app/Resources/LibraryProject.bundle
+@dirrm System/Applications/ProjectCenter.app/Resources/BundleProject.bundle/Resources/Inspector.gorm
+@dirrm System/Applications/ProjectCenter.app/Resources/BundleProject.bundle/Resources
+@dirrm System/Applications/ProjectCenter.app/Resources/BundleProject.bundle
+@dirrm System/Applications/ProjectCenter.app/Resources/ApplicationProject.bundle/Resources/Main.gorm
+@dirrm System/Applications/ProjectCenter.app/Resources/ApplicationProject.bundle/Resources/Inspector.gorm
+@dirrm System/Applications/ProjectCenter.app/Resources/ApplicationProject.bundle/Resources
+@dirrm System/Applications/ProjectCenter.app/Resources/ApplicationProject.bundle
+@dirrm System/Applications/ProjectCenter.app/Resources/AggregateProject.bundle/Resources/Inspector.gorm
+@dirrm System/Applications/ProjectCenter.app/Resources/AggregateProject.bundle/Resources
+@dirrm System/Applications/ProjectCenter.app/Resources/AggregateProject.bundle
+@dirrm System/Applications/ProjectCenter.app/Resources
+@dirrm System/Applications/ProjectCenter.app
diff --git a/devel/projectmanager/Makefile b/devel/projectmanager/Makefile
index 94fa3d1bfaff..054af3d26210 100644
--- a/devel/projectmanager/Makefile
+++ b/devel/projectmanager/Makefile
@@ -24,6 +24,8 @@ USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LOCAL_LIBS+= WizardKit:${WIZARDKIT_PORT}
USE_GNUSTEP_LOCAL_LIBS+= HighlighterKit:${HIGHLIGHTERKIT_PORT}
+MAKE_FLAGS+= debug=no
+
WIZARDKIT_PORT?= devel/wizardkit
HIGHLIGHTERKIT_PORT?= devel/highlighterkit
diff --git a/devel/projectmanager/pkg-plist b/devel/projectmanager/pkg-plist
index 4832abd3acf7..94a755c11905 100644
--- a/devel/projectmanager/pkg-plist
+++ b/devel/projectmanager/pkg-plist
@@ -329,8 +329,8 @@ Local/Applications/ProjectManager.app/Resources/UserPipePreferences.prefs/Resour
Local/Applications/ProjectManager.app/Resources/UserPipePreferences.prefs/Resources/Info-gnustep.plist
Local/Applications/ProjectManager.app/Resources/UserPipePreferences.prefs/UserPipePreferences
Local/Applications/ProjectManager.app/Resources/UserPipePreferences.prefs/stamp.make
-Local/Applications/ProjectManager.app/library_paths.openapp
Local/Applications/ProjectManager.app/stamp.make
+Local/Tools/ProjectManager
@dirrm Local/Applications/ProjectManager.app/Resources/UserPipePreferences.prefs/Resources/English.lproj/UserPipes.gorm
@dirrm Local/Applications/ProjectManager.app/Resources/UserPipePreferences.prefs/Resources/English.lproj
@dirrm Local/Applications/ProjectManager.app/Resources/UserPipePreferences.prefs/Resources
diff --git a/devel/ruby-gnustep/Makefile b/devel/ruby-gnustep/Makefile
index 6da1cc0caa56..f16484447c03 100644
--- a/devel/ruby-gnustep/Makefile
+++ b/devel/ruby-gnustep/Makefile
@@ -24,11 +24,14 @@ USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
+MAKE_FLAGS+= debug=no
+
post-extract:
${FIND} ${WRKSRC}/ -type f -name '.cvsignore' -delete
${FIND} -d ${WRKSRC}/ -type d -name CVS -exec ${RM} -rf "{}" ";"
post-patch:
+ ${ECHO_CMD} "" > ${WRKSRC}/Source/${MAKEFILE}.postamble
${RUBY} -i~ -p \
-e 'gsub(/-lpthread/, "-pthread");' \
-e 'gsub(/-lgmodel/, "");' \
@@ -37,6 +40,7 @@ post-patch:
${XARGS} ${RUBY} -i -pe 'gsub(/ ruby -/, " ${RUBY} -")'
post-install:
+ ${INSTALL_SCRIPT} ${WRKSRC}/Source/obj/librigs.so $(RUBY_SITEARCHLIBDIR)/
.if !defined(NOPORTDOCS)
${MKDIR} ${RUBY_MODEXAMPLESDIR}
${CP} -R ${WRKSRC}/Examples/* ${RUBY_MODEXAMPLESDIR}/
diff --git a/devel/wizardkit/pkg-plist b/devel/wizardkit/pkg-plist
index eea6f277d3c1..d3002adc042b 100644
--- a/devel/wizardkit/pkg-plist
+++ b/devel/wizardkit/pkg-plist
@@ -1,19 +1,21 @@
Local/Library/Frameworks/WizardKit.framework/Headers
Local/Library/Frameworks/WizardKit.framework/Resources
-Local/Library/Frameworks/WizardKit.framework/Versions/A/Headers/WKWizardPanel.h
-Local/Library/Frameworks/WizardKit.framework/Versions/A/Headers/WizardKit.h
-Local/Library/Frameworks/WizardKit.framework/Versions/A/Resources/Info-gnustep.plist
-Local/Library/Frameworks/WizardKit.framework/Versions/A/WizardKit
-Local/Library/Frameworks/WizardKit.framework/Versions/A/libWizardKit.so
-Local/Library/Frameworks/WizardKit.framework/Versions/A/libWizardKit.so.%%MAJORLIBVERSION%%
-Local/Library/Frameworks/WizardKit.framework/Versions/A/libWizardKit.so.%%LIBVERSION%%
+Local/Library/Frameworks/WizardKit.framework/Versions/%%MAJORVERSION%%/Headers/WKWizardPanel.h
+Local/Library/Frameworks/WizardKit.framework/Versions/%%MAJORVERSION%%/Headers/WizardKit.h
+Local/Library/Frameworks/WizardKit.framework/Versions/%%MAJORVERSION%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/WizardKit.framework/Versions/%%MAJORVERSION%%/WizardKit
+Local/Library/Frameworks/WizardKit.framework/Versions/%%MAJORVERSION%%/libWizardKit.so
+Local/Library/Frameworks/WizardKit.framework/Versions/%%MAJORVERSION%%/libWizardKit.so.%%MAJORLIBVERSION%%
+Local/Library/Frameworks/WizardKit.framework/Versions/%%MAJORVERSION%%/libWizardKit.so.%%LIBVERSION%%
Local/Library/Frameworks/WizardKit.framework/Versions/Current
+Local/Library/Frameworks/WizardKit.framework/WizardKit
+Local/Library/Frameworks/WizardKit.framework/libWizardKit.so
Local/Library/Headers/WizardKit
Local/Library/Libraries/libWizardKit.so
Local/Library/Libraries/libWizardKit.so.%%MAJORLIBVERSION%%
Local/Library/Libraries/libWizardKit.so.%%LIBVERSION%%
-@dirrm Local/Library/Frameworks/WizardKit.framework/Versions/A/Resources
-@dirrm Local/Library/Frameworks/WizardKit.framework/Versions/A/Headers
-@dirrm Local/Library/Frameworks/WizardKit.framework/Versions/A
+@dirrm Local/Library/Frameworks/WizardKit.framework/Versions/%%MAJORVERSION%%/Resources
+@dirrm Local/Library/Frameworks/WizardKit.framework/Versions/%%MAJORVERSION%%/Headers
+@dirrm Local/Library/Frameworks/WizardKit.framework/Versions/%%MAJORVERSION%%
@dirrm Local/Library/Frameworks/WizardKit.framework/Versions
@dirrm Local/Library/Frameworks/WizardKit.framework
diff --git a/editors/codeeditor/Makefile b/editors/codeeditor/Makefile
index 7fd5445b72ee..de9fab802b0c 100644
--- a/editors/codeeditor/Makefile
+++ b/editors/codeeditor/Makefile
@@ -23,5 +23,6 @@ USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
WRKSRC= ${WRKDIR}/CodeEditor
+MAKE_ENV+= GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT}
.include <bsd.port.mk>
diff --git a/editors/codeeditor/pkg-plist b/editors/codeeditor/pkg-plist
index 6193c499ec65..7b5398bdb2fa 100644
--- a/editors/codeeditor/pkg-plist
+++ b/editors/codeeditor/pkg-plist
@@ -21,7 +21,6 @@ Local/Applications/CodeEditor.app/Resources/Scripts/welcome.st
Local/Applications/CodeEditor.app/Resources/Scripts/welcome.st.stinfo
Local/Applications/CodeEditor.app/Resources/Window.gorm/data.classes
Local/Applications/CodeEditor.app/Resources/Window.gorm/objects.gorm
-Local/Applications/CodeEditor.app/library_paths.openapp
Local/Applications/CodeEditor.app/stamp.make
Local/Library/ApplicationSupport/CodeEditorView/ObjCHandler.bundle/ObjCHandler
Local/Library/ApplicationSupport/CodeEditorView/ObjCHandler.bundle/Resources/Info-gnustep.plist
@@ -30,6 +29,7 @@ Local/Library/Bundles/CodeEditorView.bundle/CodeEditorView
Local/Library/Bundles/CodeEditorView.bundle/Resources/Info-gnustep.plist
Local/Library/Bundles/CodeEditorView.bundle/Resources/OpenInWorkspace.tiff
Local/Library/Bundles/CodeEditorView.bundle/stamp.make
+Local/Tools/CodeEditor
@dirrm Local/Library/Bundles/CodeEditorView.bundle/Resources
@dirrm Local/Library/Bundles/CodeEditorView.bundle
@dirrm Local/Library/ApplicationSupport/CodeEditorView/ObjCHandler.bundle/Resources
diff --git a/editors/etoile-typewriter/pkg-plist b/editors/etoile-typewriter/pkg-plist
index 5fe3e6fba87a..e10db24f0022 100644
--- a/editors/etoile-typewriter/pkg-plist
+++ b/editors/etoile-typewriter/pkg-plist
@@ -10,8 +10,8 @@ Local/Applications/Typewriter.app/Resources/English.lproj/MainMenu.gorm/objects.
Local/Applications/Typewriter.app/Resources/Info-gnustep.plist
Local/Applications/Typewriter.app/Resources/Typewriter.desktop
Local/Applications/Typewriter.app/Typewriter
-Local/Applications/Typewriter.app/library_paths.openapp
Local/Applications/Typewriter.app/stamp.make
+Local/Tools/Typewriter
@dirrm Local/Applications/Typewriter.app/Resources/English.lproj/MainMenu.gorm
@dirrm Local/Applications/Typewriter.app/Resources/English.lproj/Document.gorm
@dirrm Local/Applications/Typewriter.app/Resources/English.lproj/CharacterPanel.gorm
diff --git a/finance/expense/pkg-plist b/finance/expense/pkg-plist
index d371fd6a28d1..58c72c2358f5 100644
--- a/finance/expense/pkg-plist
+++ b/finance/expense/pkg-plist
@@ -17,8 +17,8 @@ Local/Applications/Expense.app/Resources/Thai.lproj/Expense.gorm/objects.gorm
Local/Applications/Expense.app/Resources/Thai.lproj/Localizable.strings
Local/Applications/Expense.app/Resources/Thai.lproj/Localizable.strings~
Local/Applications/Expense.app/Resources/Thai.lproj/temp.txt
-Local/Applications/Expense.app/library_paths.openapp
Local/Applications/Expense.app/stamp.make
+Local/Tools/Expense
@dirrm Local/Applications/Expense.app/Resources/Thai.lproj/Expense.gorm
@dirrm Local/Applications/Expense.app/Resources/Thai.lproj
@dirrm Local/Applications/Expense.app/Resources/English.lproj/Expense.gorm
diff --git a/ftp/gnustep-ftp/pkg-plist b/ftp/gnustep-ftp/pkg-plist
index 09fb007ed18a..d0bbdaad3e54 100644
--- a/ftp/gnustep-ftp/pkg-plist
+++ b/ftp/gnustep-ftp/pkg-plist
@@ -8,8 +8,8 @@ Local/Applications/FTP.app/Resources/FTP.gorm/objects.gorm
Local/Applications/FTP.app/Resources/Info-gnustep.plist
Local/Applications/FTP.app/Resources/arrow_left.tiff
Local/Applications/FTP.app/Resources/arrow_right.tiff
-Local/Applications/FTP.app/library_paths.openapp
Local/Applications/FTP.app/stamp.make
+Local/Tools/FTP
@dirrm Local/Applications/FTP.app/Resources/FTP.gorm
@dirrm Local/Applications/FTP.app/Resources
@dirrm Local/Applications/FTP.app
diff --git a/ftp/waiho/pkg-plist b/ftp/waiho/pkg-plist
index c0bbe951565e..65fe600fe205 100644
--- a/ftp/waiho/pkg-plist
+++ b/ftp/waiho/pkg-plist
@@ -8,7 +8,7 @@ Local/Applications/Waiho.app/Resources/Put.tiff
Local/Applications/Waiho.app/Resources/Waiho.desktop
Local/Applications/Waiho.app/Resources/Waiho.tiff
Local/Applications/Waiho.app/Waiho
-Local/Applications/Waiho.app/library_paths.openapp
Local/Applications/Waiho.app/stamp.make
+Local/Tools/Waiho
@dirrm Local/Applications/Waiho.app/Resources
@dirrm Local/Applications/Waiho.app
diff --git a/games/fortunate/pkg-plist b/games/fortunate/pkg-plist
index f4dd314e6ed6..8be276d104c3 100644
--- a/games/fortunate/pkg-plist
+++ b/games/fortunate/pkg-plist
@@ -6,8 +6,8 @@ Local/Applications/Fortunate.app/Resources/Fortunate.desktop
Local/Applications/Fortunate.app/Resources/Fortunate.tiff
Local/Applications/Fortunate.app/Resources/FortunateInfo.plist
Local/Applications/Fortunate.app/Resources/Info-gnustep.plist
-Local/Applications/Fortunate.app/library_paths.openapp
Local/Applications/Fortunate.app/stamp.make
+Local/Tools/Fortunate
@dirrm Local/Applications/Fortunate.app/Resources/English.lproj/Fortunate.gorm
@dirrm Local/Applications/Fortunate.app/Resources/English.lproj
@dirrm Local/Applications/Fortunate.app/Resources
diff --git a/games/gmastermind/pkg-plist b/games/gmastermind/pkg-plist
index 6f4b956121d7..9f90b6875ba4 100644
--- a/games/gmastermind/pkg-plist
+++ b/games/gmastermind/pkg-plist
@@ -3,8 +3,8 @@ Local/Applications/GMastermind2.app/Resources/French.lproj/Localizable.strings
Local/Applications/GMastermind2.app/Resources/GMastermind2.desktop
Local/Applications/GMastermind2.app/Resources/GMastermind2.tiff
Local/Applications/GMastermind2.app/Resources/Info-gnustep.plist
-Local/Applications/GMastermind2.app/library_paths.openapp
Local/Applications/GMastermind2.app/stamp.make
+Local/Tools/GMastermind2
@dirrm Local/Applications/GMastermind2.app/Resources/French.lproj
@dirrm Local/Applications/GMastermind2.app/Resources
@dirrm Local/Applications/GMastermind2.app
diff --git a/games/gmines/pkg-plist b/games/gmines/pkg-plist
index a3b46c787b2f..c6b765e87b0d 100644
--- a/games/gmines/pkg-plist
+++ b/games/gmines/pkg-plist
@@ -2,7 +2,7 @@ Local/Applications/GMines.app/GMines
Local/Applications/GMines.app/Resources/GMines.desktop
Local/Applications/GMines.app/Resources/GMines.tiff
Local/Applications/GMines.app/Resources/Info-gnustep.plist
-Local/Applications/GMines.app/library_paths.openapp
Local/Applications/GMines.app/stamp.make
+Local/Tools/GMines
@dirrm Local/Applications/GMines.app/Resources
@dirrm Local/Applications/GMines.app
diff --git a/games/gomoku.app/pkg-plist b/games/gomoku.app/pkg-plist
index ebf95907af1e..c9a76c77957c 100644
--- a/games/gomoku.app/pkg-plist
+++ b/games/gomoku.app/pkg-plist
@@ -38,8 +38,8 @@ Local/Applications/Gomoku.app/Resources/Norwegian.lproj/Localizable.strings
Local/Applications/Gomoku.app/Resources/Spanish.lproj/Localizable.strings
Local/Applications/Gomoku.app/Resources/Swedish.lproj/Localizable.strings
Local/Applications/Gomoku.app/Resources/TraditionalChinese.lproj/Localizable.strings
-Local/Applications/Gomoku.app/library_paths.openapp
Local/Applications/Gomoku.app/stamp.make
+Local/Tools/Gomoku
@dirrm Local/Applications/Gomoku.app/Resources/TraditionalChinese.lproj
@dirrm Local/Applications/Gomoku.app/Resources/Swedish.lproj
@dirrm Local/Applications/Gomoku.app/Resources/Spanish.lproj
diff --git a/games/gpuzzle/pkg-plist b/games/gpuzzle/pkg-plist
index 4015497cc611..fd71670d8dfc 100644
--- a/games/gpuzzle/pkg-plist
+++ b/games/gpuzzle/pkg-plist
@@ -2,7 +2,7 @@ Local/Applications/GPuzzle2.app/GPuzzle2
Local/Applications/GPuzzle2.app/Resources/GPuzzle2.desktop
Local/Applications/GPuzzle2.app/Resources/GPuzzle2.tiff
Local/Applications/GPuzzle2.app/Resources/Info-gnustep.plist
-Local/Applications/GPuzzle2.app/library_paths.openapp
Local/Applications/GPuzzle2.app/stamp.make
+Local/Tools/GPuzzle2
@dirrm Local/Applications/GPuzzle2.app/Resources
@dirrm Local/Applications/GPuzzle2.app
diff --git a/games/grubik/pkg-plist b/games/grubik/pkg-plist
index e8efa9a29f27..ab487b49fb97 100644
--- a/games/grubik/pkg-plist
+++ b/games/grubik/pkg-plist
@@ -1,7 +1,7 @@
System/Applications/GRubik.app/GRubik
System/Applications/GRubik.app/Resources/GRubik.desktop
System/Applications/GRubik.app/Resources/Info-gnustep.plist
-System/Applications/GRubik.app/library_paths.openapp
System/Applications/GRubik.app/stamp.make
+System/Tools/GRubik
@dirrm System/Applications/GRubik.app/Resources
@dirrm System/Applications/GRubik.app
diff --git a/games/gshisen/pkg-plist b/games/gshisen/pkg-plist
index 3569a111c8a1..03ba378c1589 100644
--- a/games/gshisen/pkg-plist
+++ b/games/gshisen/pkg-plist
@@ -76,7 +76,7 @@ System/Applications/GShisen.app/Resources/GShisen.tiff
System/Applications/GShisen.app/Resources/Info-gnustep.plist
System/Applications/GShisen.app/Resources/green.tiff
System/Applications/GShisen.app/Resources/x.tiff
-System/Applications/GShisen.app/library_paths.openapp
System/Applications/GShisen.app/stamp.make
+System/Tools/GShisen
@dirrm System/Applications/GShisen.app/Resources
@dirrm System/Applications/GShisen.app
diff --git a/games/jigsaw/pkg-plist b/games/jigsaw/pkg-plist
index 4015497cc611..fd71670d8dfc 100644
--- a/games/jigsaw/pkg-plist
+++ b/games/jigsaw/pkg-plist
@@ -2,7 +2,7 @@ Local/Applications/GPuzzle2.app/GPuzzle2
Local/Applications/GPuzzle2.app/Resources/GPuzzle2.desktop
Local/Applications/GPuzzle2.app/Resources/GPuzzle2.tiff
Local/Applications/GPuzzle2.app/Resources/Info-gnustep.plist
-Local/Applications/GPuzzle2.app/library_paths.openapp
Local/Applications/GPuzzle2.app/stamp.make
+Local/Tools/GPuzzle2
@dirrm Local/Applications/GPuzzle2.app/Resources
@dirrm Local/Applications/GPuzzle2.app
diff --git a/games/nextgo/pkg-plist b/games/nextgo/pkg-plist
index c245294d4711..cd40e4cf8da9 100644
--- a/games/nextgo/pkg-plist
+++ b/games/nextgo/pkg-plist
@@ -11,8 +11,8 @@ Local/Applications/NeXTGo.app/Resources/NeXTGo.tiff
Local/Applications/NeXTGo.app/Resources/NeXTGoFile.tiff
Local/Applications/NeXTGo.app/Resources/NeXTGoHelp.rtf
Local/Applications/NeXTGo.app/Resources/intergo.dct
-Local/Applications/NeXTGo.app/library_paths.openapp
Local/Applications/NeXTGo.app/stamp.make
+Local/Tools/NeXTGo
@dirrm Local/Applications/NeXTGo.app/Resources/English.lproj/NeXTGo.gorm
@dirrm Local/Applications/NeXTGo.app/Resources/English.lproj
@dirrm Local/Applications/NeXTGo.app/Resources
diff --git a/german/digibux/pkg-plist b/german/digibux/pkg-plist
index 3f2812a18249..25284be38e89 100644
--- a/german/digibux/pkg-plist
+++ b/german/digibux/pkg-plist
@@ -22,8 +22,8 @@ Local/Applications/Digibux.app/Resources/ldp.gorm/data.classes
Local/Applications/Digibux.app/Resources/ldp.gorm/data.info
Local/Applications/Digibux.app/Resources/ldp.gorm/objects.gorm
Local/Applications/Digibux.app/Resources/unicode.plist
-Local/Applications/Digibux.app/library_paths.openapp
Local/Applications/Digibux.app/stamp.make
+Local/Tools/Digibux
@dirrm Local/Applications/Digibux.app/Resources/ldp.gorm
@dirrm Local/Applications/Digibux.app/Resources/StartWindow.gorm
@dirrm Local/Applications/Digibux.app/Resources/ImageViewer.gorm
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
diff --git a/lang/gnustep-guile/pkg-plist b/lang/gnustep-guile/pkg-plist
index 779714ef6459..6884819a7080 100644
--- a/lang/gnustep-guile/pkg-plist
+++ b/lang/gnustep-guile/pkg-plist
@@ -1,9 +1,7 @@
-%%USEX11%%System/Applications/guile-gui.app/library_paths.openapp
%%USEX11%%System/Applications/guile-gui.app/Resources/Info-gnustep.plist
%%USEX11%%System/Applications/guile-gui.app/Resources/guile-gui.desktop
%%USEX11%%System/Applications/guile-gui.app/guile-gui
%%USEX11%%System/Applications/guile-gui.app/stamp.make
-%%USEX11%%System/Applications/gui.app/library_paths.openapp
%%USEX11%%System/Applications/gui.app/Resources/Info-gnustep.plist
%%USEX11%%System/Applications/gui.app/Resources/gui.desktop
%%USEX11%%System/Applications/gui.app/gui
@@ -36,7 +34,9 @@ System/Library/Libraries/libgstep_guile.so.%%VERSION%%
System/Library/Libraries/libgstep_guile.so.1
System/Library/Makefiles/Additional/guile.make
System/Tools/go
+%%USEX11%%System/Tools/gui
System/Tools/guile-base
+%%USEX11%%System/Tools/guile-gui
bin/greg
info/dir
@comment @unexec install-info --delete %D/info/greg.info %D/info/dir
diff --git a/lang/gscheme/pkg-plist b/lang/gscheme/pkg-plist
index b69c8b99535e..89e9f573b597 100644
--- a/lang/gscheme/pkg-plist
+++ b/lang/gscheme/pkg-plist
@@ -4,7 +4,7 @@ Local/Applications/GScheme.app/Resources/GScheme.tiff
Local/Applications/GScheme.app/Resources/Info-gnustep.plist
Local/Applications/GScheme.app/Resources/lambda1.tiff
Local/Applications/GScheme.app/Resources/library.scm
-Local/Applications/GScheme.app/library_paths.openapp
Local/Applications/GScheme.app/stamp.make
+Local/Tools/GScheme
@dirrm Local/Applications/GScheme.app/Resources
@dirrm Local/Applications/GScheme.app
diff --git a/lang/steptalk/Makefile b/lang/steptalk/Makefile
index 84cd65103a7d..53f15a6b52d6 100644
--- a/lang/steptalk/Makefile
+++ b/lang/steptalk/Makefile
@@ -24,5 +24,6 @@ USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
WRKSRC= ${WRKDIR}/StepTalk
+MAKE_ENV+= GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT}
.include <bsd.port.mk>
diff --git a/lang/steptalk/pkg-plist b/lang/steptalk/pkg-plist
index c0355feb5577..5dbb9148458a 100644
--- a/lang/steptalk/pkg-plist
+++ b/lang/steptalk/pkg-plist
@@ -9,46 +9,48 @@ Local/Library/Bundles/ApplicationScripting.bundle/Resources/Info-gnustep.plist
Local/Library/Bundles/ApplicationScripting.bundle/stamp.make
Local/Library/Frameworks/StepTalk.framework/Headers
Local/Library/Frameworks/StepTalk.framework/Resources
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/NSInvocation+additions.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/NSObject+additions.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STActor.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STBundleInfo.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STContext.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STConversation.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STEngine.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STEnvironment.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STEnvironmentDescription.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STExterns.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STFileScript.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STFunctions.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STLanguageManager.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STMethod.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STObjCRuntime.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STObjectReference.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STRemoteConversation.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STScript.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STScriptObject.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STScripting.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STScriptsManager.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STSelector.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STUndefinedObject.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/StepTalk.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Resources/Environments/AppKit.stenv
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Resources/Environments/Common.stenv
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Resources/Environments/Distributed.stenv
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Resources/Environments/Foundation-operators.stenv
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Resources/Environments/Foundation.stenv
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Resources/Environments/Safe.stenv
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Resources/Environments/Standard.stenv
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Resources/Environments/StepTalk.stenv
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Resources/Environments/SymbolicSelectors.stenv
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Resources/Info-gnustep.plist
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Resources/ScriptingInfo.plist
-Local/Library/Frameworks/StepTalk.framework/Versions/A/StepTalk
-Local/Library/Frameworks/StepTalk.framework/Versions/A/libStepTalk.so
-Local/Library/Frameworks/StepTalk.framework/Versions/A/libStepTalk.so.%%MAJORVERSION%%
-Local/Library/Frameworks/StepTalk.framework/Versions/A/libStepTalk.so.%%VERSION%%
+Local/Library/Frameworks/StepTalk.framework/StepTalk
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSInvocation+additions.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSObject+additions.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STActor.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STBundleInfo.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STContext.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STConversation.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STEngine.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STEnvironment.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STEnvironmentDescription.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STExterns.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STFileScript.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STFunctions.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STLanguageManager.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STMethod.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STObjCRuntime.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STObjectReference.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STRemoteConversation.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STScript.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STScriptObject.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STScripting.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STScriptsManager.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STSelector.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STUndefinedObject.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/StepTalk.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Resources/Environments/AppKit.stenv
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Resources/Environments/Common.stenv
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Resources/Environments/Distributed.stenv
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Resources/Environments/Foundation-operators.stenv
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Resources/Environments/Foundation.stenv
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Resources/Environments/Safe.stenv
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Resources/Environments/Standard.stenv
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Resources/Environments/StepTalk.stenv
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Resources/Environments/SymbolicSelectors.stenv
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Resources/ScriptingInfo.plist
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/StepTalk
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/libStepTalk.so
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/libStepTalk.so.%%MAJORVERSION%%
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/libStepTalk.so.%%VERSION%%
Local/Library/Frameworks/StepTalk.framework/Versions/Current
+Local/Library/Frameworks/StepTalk.framework/libStepTalk.so
Local/Library/Headers/StepTalk
Local/Library/Libraries/libStepTalk.so
Local/Library/Libraries/libStepTalk.so.%%MAJORVERSION%%
@@ -98,10 +100,10 @@ Local/Tools/stexec
@dirrm Local/Library/StepTalk/Finders/ApplicationFinder.bundle
@dirrm Local/Library/StepTalk/Finders
@dirrm Local/Library/StepTalk
-@dirrm Local/Library/Frameworks/StepTalk.framework/Versions/A/Resources/Environments
-@dirrm Local/Library/Frameworks/StepTalk.framework/Versions/A/Resources
-@dirrm Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers
-@dirrm Local/Library/Frameworks/StepTalk.framework/Versions/A
+@dirrm Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Resources/Environments
+@dirrm Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Resources
+@dirrm Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers
+@dirrm Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%
@dirrm Local/Library/Frameworks/StepTalk.framework/Versions
@dirrm Local/Library/Frameworks/StepTalk.framework
@dirrm Local/Library/Bundles/ApplicationScripting.bundle/Resources/English.lproj/TranscriptWindow.gorm
diff --git a/mail/addresses/Makefile b/mail/addresses/Makefile
index dd12c7631f84..c1c0f14b3aea 100644
--- a/mail/addresses/Makefile
+++ b/mail/addresses/Makefile
@@ -24,5 +24,9 @@ USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
WRKSRC= ${WRKDIR}/Addresses-${PORTVERSION}
+MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=LOCAL
+MAKE_ENV+= GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT}
+ADDITIONAL_LIB_DIRS+= -L${WRKSRC}/Frameworks/AddressView/AddressView.framework/Versions/Current
+ADDITIONAL_LIB_DIRS+= -L${WRKSRC}/Frameworks/Addresses/Addresses.framework/Versions/Current
.include <bsd.port.mk>
diff --git a/mail/addresses/pkg-plist b/mail/addresses/pkg-plist
index e0e7a9ade656..10952a66a20e 100644
--- a/mail/addresses/pkg-plist
+++ b/mail/addresses/pkg-plist
@@ -33,105 +33,110 @@ Local/Applications/AddressManager.app/Resources/VCFImage.tiff
Local/Applications/AddressManager.app/Resources/VCFImageMulti.tiff
Local/Applications/AddressManager.app/library_paths.openapp
Local/Applications/AddressManager.app/stamp.make
+Local/Library/Frameworks/AddressView.framework/AddressView
Local/Library/Frameworks/AddressView.framework/Headers
Local/Library/Frameworks/AddressView.framework/Resources
-Local/Library/Frameworks/AddressView.framework/Versions/A/AddressView
-Local/Library/Frameworks/AddressView.framework/Versions/A/Headers/ADImageView.h
-Local/Library/Frameworks/AddressView.framework/Versions/A/Headers/ADPersonPropertyView.h
-Local/Library/Frameworks/AddressView.framework/Versions/A/Headers/ADPersonView.h
-Local/Library/Frameworks/AddressView.framework/Versions/A/Headers/ADSinglePropertyView.h
-Local/Library/Frameworks/AddressView.framework/Versions/A/Headers/AddressView.h
-Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/Add.tiff
-Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/AddressLayouts.dict
-Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/Change.tiff
-Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/Dutch.lproj/Localizable.strings
-Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/English.lproj/Localizable.strings
-Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/French.lproj/Localizable.strings
-Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/German.lproj/Localizable.strings
-Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/ISOCodeMapping.dict
-Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/Info-gnustep.plist
-Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/Labels.dict
-Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/Lock.tiff
-Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/Remove.tiff
-Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/ScriptingInfo.plist
-Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/Share.tiff
-Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/Spanish.lproj/Localizable.strings
-Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/UnknownImage.tiff
-Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/VCFImage.tiff
-Local/Library/Frameworks/AddressView.framework/Versions/A/libAddressView.so
-Local/Library/Frameworks/AddressView.framework/Versions/A/libAddressView.so.0
-Local/Library/Frameworks/AddressView.framework/Versions/A/libAddressView.so.0.0.1
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/AddressView
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Headers/ADImageView.h
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Headers/ADPersonPropertyView.h
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Headers/ADPersonView.h
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Headers/ADSinglePropertyView.h
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Headers/AddressView.h
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Add.tiff
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/AddressLayouts.dict
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Change.tiff
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Dutch.lproj/Localizable.strings
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/Localizable.strings
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/French.lproj/Localizable.strings
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/German.lproj/Localizable.strings
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/ISOCodeMapping.dict
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Labels.dict
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Lock.tiff
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Remove.tiff
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/ScriptingInfo.plist
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Share.tiff
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Spanish.lproj/Localizable.strings
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/UnknownImage.tiff
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/VCFImage.tiff
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/libAddressView.so
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/libAddressView.so.%%MAJORLIBVERSION%%
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/libAddressView.so.%%LIBVERSION%%
Local/Library/Frameworks/AddressView.framework/Versions/Current
+Local/Library/Frameworks/AddressView.framework/libAddressView.so
+Local/Library/Frameworks/Addresses.framework/Addresses
Local/Library/Frameworks/Addresses.framework/Headers
Local/Library/Frameworks/Addresses.framework/Resources
-Local/Library/Frameworks/Addresses.framework/Versions/A/Addresses
-Local/Library/Frameworks/Addresses.framework/Versions/A/Headers/ADAddressBook.h
-Local/Library/Frameworks/Addresses.framework/Versions/A/Headers/ADConverter.h
-Local/Library/Frameworks/Addresses.framework/Versions/A/Headers/ADEnvelopeAddressBook.h
-Local/Library/Frameworks/Addresses.framework/Versions/A/Headers/ADGlobals.h
-Local/Library/Frameworks/Addresses.framework/Versions/A/Headers/ADGroup.h
-Local/Library/Frameworks/Addresses.framework/Versions/A/Headers/ADImageLoading.h
-Local/Library/Frameworks/Addresses.framework/Versions/A/Headers/ADLocalAddressBook.h
-Local/Library/Frameworks/Addresses.framework/Versions/A/Headers/ADMultiValue.h
-Local/Library/Frameworks/Addresses.framework/Versions/A/Headers/ADPListConverter.h
-Local/Library/Frameworks/Addresses.framework/Versions/A/Headers/ADPerson.h
-Local/Library/Frameworks/Addresses.framework/Versions/A/Headers/ADPlugin.h
-Local/Library/Frameworks/Addresses.framework/Versions/A/Headers/ADPublicAddressBook.h
-Local/Library/Frameworks/Addresses.framework/Versions/A/Headers/ADRecord.h
-Local/Library/Frameworks/Addresses.framework/Versions/A/Headers/ADSearchElement.h
-Local/Library/Frameworks/Addresses.framework/Versions/A/Headers/ADTypedefs.h
-Local/Library/Frameworks/Addresses.framework/Versions/A/Headers/ADVCFConverter.h
-Local/Library/Frameworks/Addresses.framework/Versions/A/Headers/AddressBook.h
-Local/Library/Frameworks/Addresses.framework/Versions/A/Headers/Addresses.h
-Local/Library/Frameworks/Addresses.framework/Versions/A/Resources/Dutch.lproj/PropertiesAndLabels.strings
-Local/Library/Frameworks/Addresses.framework/Versions/A/Resources/English.lproj/PropertiesAndLabels.strings
-Local/Library/Frameworks/Addresses.framework/Versions/A/Resources/French.lproj/PropertiesAndLabels.strings
-Local/Library/Frameworks/Addresses.framework/Versions/A/Resources/German.lproj/PropertiesAndLabels.strings
-Local/Library/Frameworks/Addresses.framework/Versions/A/Resources/Info-gnustep.plist
-Local/Library/Frameworks/Addresses.framework/Versions/A/Resources/ScriptingInfo.plist
-Local/Library/Frameworks/Addresses.framework/Versions/A/Resources/Spanish.lproj/PropertiesAndLabels.strings
-Local/Library/Frameworks/Addresses.framework/Versions/A/libAddresses.so
-Local/Library/Frameworks/Addresses.framework/Versions/A/libAddresses.so.0
-Local/Library/Frameworks/Addresses.framework/Versions/A/libAddresses.so.0.0.1
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Addresses
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADAddressBook.h
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADConverter.h
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADEnvelopeAddressBook.h
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADGlobals.h
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADGroup.h
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADImageLoading.h
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADLocalAddressBook.h
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADMultiValue.h
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADPListConverter.h
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADPerson.h
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADPlugin.h
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADPublicAddressBook.h
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADRecord.h
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADSearchElement.h
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADTypedefs.h
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADVCFConverter.h
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/AddressBook.h
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/Addresses.h
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/Dutch.lproj/PropertiesAndLabels.strings
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/PropertiesAndLabels.strings
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/French.lproj/PropertiesAndLabels.strings
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/German.lproj/PropertiesAndLabels.strings
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/ScriptingInfo.plist
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/Spanish.lproj/PropertiesAndLabels.strings
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/libAddresses.so
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/libAddresses.so.%%MAJORLIBVERSION%%
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/libAddresses.so.%%LIBVERSION%%
Local/Library/Frameworks/Addresses.framework/Versions/Current
+Local/Library/Frameworks/Addresses.framework/libAddresses.so
Local/Library/Headers/AddressBook
Local/Library/Headers/AddressView
Local/Library/Headers/Addresses
Local/Library/Libraries/libAddressView.so
-Local/Library/Libraries/libAddressView.so.0
-Local/Library/Libraries/libAddressView.so.0.0.1
+Local/Library/Libraries/libAddressView.so.%%MAJORLIBVERSION%%
+Local/Library/Libraries/libAddressView.so.%%LIBVERSION%%
Local/Library/Libraries/libAddresses.so
-Local/Library/Libraries/libAddresses.so.0
-Local/Library/Libraries/libAddresses.so.0.0.1
-@dirrm Local/Library/Frameworks/Addresses.framework/Versions/A/Headers
-@dirrm Local/Library/Frameworks/Addresses.framework/Versions/A/Resources/Dutch.lproj
-@dirrm Local/Library/Frameworks/Addresses.framework/Versions/A/Resources/English.lproj
-@dirrm Local/Library/Frameworks/Addresses.framework/Versions/A/Resources/French.lproj
-@dirrm Local/Library/Frameworks/Addresses.framework/Versions/A/Resources/German.lproj
-@dirrm Local/Library/Frameworks/Addresses.framework/Versions/A/Resources/Spanish.lproj
-@dirrm Local/Library/Frameworks/Addresses.framework/Versions/A/Resources
-@dirrm Local/Library/Frameworks/Addresses.framework/Versions/A
+Local/Library/Libraries/libAddresses.so.%%MAJORLIBVERSION%%
+Local/Library/Libraries/libAddresses.so.%%LIBVERSION%%
+Local/Tools/AddressManager
+@dirrm Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/Spanish.lproj
+@dirrm Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/German.lproj
+@dirrm Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/French.lproj
+@dirrm Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj
+@dirrm Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/Dutch.lproj
+@dirrm Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources
+@dirrm Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers
+@dirrm Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%
@dirrm Local/Library/Frameworks/Addresses.framework/Versions
@dirrm Local/Library/Frameworks/Addresses.framework
-@dirrm Local/Library/Frameworks/AddressView.framework/Versions/A/Headers
-@dirrm Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/Dutch.lproj
-@dirrm Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/English.lproj
-@dirrm Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/French.lproj
-@dirrm Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/German.lproj
-@dirrm Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/Spanish.lproj
-@dirrm Local/Library/Frameworks/AddressView.framework/Versions/A/Resources
-@dirrm Local/Library/Frameworks/AddressView.framework/Versions/A
+@dirrm Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Spanish.lproj
+@dirrm Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/German.lproj
+@dirrm Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/French.lproj
+@dirrm Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj
+@dirrm Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Dutch.lproj
+@dirrm Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources
+@dirrm Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Headers
+@dirrm Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%
@dirrm Local/Library/Frameworks/AddressView.framework/Versions
@dirrm Local/Library/Frameworks/AddressView.framework
-@dirrm Local/Applications/AddressManager.app/Resources/Dutch.lproj/AddressManager.gorm
-@dirrm Local/Applications/AddressManager.app/Resources/Dutch.lproj
-@dirrm Local/Applications/AddressManager.app/Resources/English.lproj/AddressManager.gorm
-@dirrm Local/Applications/AddressManager.app/Resources/English.lproj
-@dirrm Local/Applications/AddressManager.app/Resources/French.lproj/AddressManager.gorm
-@dirrm Local/Applications/AddressManager.app/Resources/French.lproj
-@dirrm Local/Applications/AddressManager.app/Resources/German.lproj/AddressManager.gorm
-@dirrm Local/Applications/AddressManager.app/Resources/German.lproj
@dirrm Local/Applications/AddressManager.app/Resources/Spanish.lproj/AddressManager.gorm
@dirrm Local/Applications/AddressManager.app/Resources/Spanish.lproj
+@dirrm Local/Applications/AddressManager.app/Resources/German.lproj/AddressManager.gorm
+@dirrm Local/Applications/AddressManager.app/Resources/German.lproj
+@dirrm Local/Applications/AddressManager.app/Resources/French.lproj/AddressManager.gorm
+@dirrm Local/Applications/AddressManager.app/Resources/French.lproj
+@dirrm Local/Applications/AddressManager.app/Resources/English.lproj/AddressManager.gorm
+@dirrm Local/Applications/AddressManager.app/Resources/English.lproj
+@dirrm Local/Applications/AddressManager.app/Resources/Dutch.lproj/AddressManager.gorm
+@dirrm Local/Applications/AddressManager.app/Resources/Dutch.lproj
@dirrm Local/Applications/AddressManager.app/Resources
@dirrm Local/Applications/AddressManager.app
diff --git a/mail/gnumail/Makefile b/mail/gnumail/Makefile
index b5b643d66c54..1954def7c31c 100644
--- a/mail/gnumail/Makefile
+++ b/mail/gnumail/Makefile
@@ -25,6 +25,7 @@ USE_GNUSTEP_LOCAL_LIBS+= Addresses:${ADDRESSES_PORT}
USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
WRKSRC= ${WRKDIR}/GNUMail
+MAKE_ENV+= GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT}
PANTOMIME_PORT?= mail/pantomime
ADDRESSES_PORT?= mail/addresses
diff --git a/mail/gnumail/pkg-plist b/mail/gnumail/pkg-plist
index 1d5ca1af067c..a6405c35e527 100644
--- a/mail/gnumail/pkg-plist
+++ b/mail/gnumail/pkg-plist
@@ -159,16 +159,17 @@ Local/Applications/GNUMail.app/Resources/trash_12.tiff
Local/Applications/GNUMail.app/Resources/trash_16.tiff
Local/Applications/GNUMail.app/Resources/trash_20.tiff
Local/Applications/GNUMail.app/Resources/up_15.tiff
-Local/Applications/GNUMail.app/library_paths.openapp
Local/Applications/GNUMail.app/stamp.make
+Local/Library/Frameworks/GNUMail.framework/GNUMail
Local/Library/Frameworks/GNUMail.framework/Headers
Local/Library/Frameworks/GNUMail.framework/Resources
-Local/Library/Frameworks/GNUMail.framework/Versions/A/GNUMail
-Local/Library/Frameworks/GNUMail.framework/Versions/A/Resources/Info-gnustep.plist
-Local/Library/Frameworks/GNUMail.framework/Versions/A/libGNUMail.so
-Local/Library/Frameworks/GNUMail.framework/Versions/A/libGNUMail.so.%%MAJORVERSION%%
-Local/Library/Frameworks/GNUMail.framework/Versions/A/libGNUMail.so.%%VERSION%%
+Local/Library/Frameworks/GNUMail.framework/Versions/%%MAJORVERSION%%/GNUMail
+Local/Library/Frameworks/GNUMail.framework/Versions/%%MAJORVERSION%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/GNUMail.framework/Versions/%%MAJORVERSION%%/libGNUMail.so
+Local/Library/Frameworks/GNUMail.framework/Versions/%%MAJORVERSION%%/libGNUMail.so.%%MAJORVERSION%%
+Local/Library/Frameworks/GNUMail.framework/Versions/%%MAJORVERSION%%/libGNUMail.so.%%VERSION%%
Local/Library/Frameworks/GNUMail.framework/Versions/Current
+Local/Library/Frameworks/GNUMail.framework/libGNUMail.so
Local/Library/GNUMail/Account.prefs/Account
Local/Library/GNUMail/Account.prefs/Resources/Info-gnustep.plist
Local/Library/GNUMail/Account.prefs/Resources/account.tiff
@@ -216,6 +217,7 @@ Local/Library/Headers/GNUMail
Local/Library/Libraries/libGNUMail.so
Local/Library/Libraries/libGNUMail.so.%%MAJORVERSION%%
Local/Library/Libraries/libGNUMail.so.%%VERSION%%
+Local/Tools/GNUMail
@dirrm Local/Library/GNUMail/Viewing.prefs/Resources
@dirrm Local/Library/GNUMail/Viewing.prefs
@dirrm Local/Library/GNUMail/Sending.prefs/Resources
@@ -239,9 +241,9 @@ Local/Library/Libraries/libGNUMail.so.%%VERSION%%
@dirrm Local/Library/GNUMail/Account.prefs/Resources
@dirrm Local/Library/GNUMail/Account.prefs
@dirrm Local/Library/GNUMail
-@dirrm Local/Library/Frameworks/GNUMail.framework/Versions/A/Resources
-@dirrm Local/Library/Frameworks/GNUMail.framework/Versions/A/Headers
-@dirrm Local/Library/Frameworks/GNUMail.framework/Versions/A
+@dirrm Local/Library/Frameworks/GNUMail.framework/Versions/%%MAJORVERSION%%/Resources
+@dirrm Local/Library/Frameworks/GNUMail.framework/Versions/%%MAJORVERSION%%/Headers
+@dirrm Local/Library/Frameworks/GNUMail.framework/Versions/%%MAJORVERSION%%
@dirrm Local/Library/Frameworks/GNUMail.framework/Versions
@dirrm Local/Library/Frameworks/GNUMail.framework
@dirrm Local/Applications/GNUMail.app/Resources/Turkish.lproj
diff --git a/mail/pantomime/Makefile b/mail/pantomime/Makefile
index ebbea3dc7a15..bed63d3c90ca 100644
--- a/mail/pantomime/Makefile
+++ b/mail/pantomime/Makefile
@@ -23,5 +23,6 @@ USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
WRKSRC= ${WRKDIR}/Pantomime
+DEFAULT_LIBVERSION= 1.2
.include <bsd.port.mk>
diff --git a/mail/pantomime/pkg-plist b/mail/pantomime/pkg-plist
index 78c15beaff14..56d26ee79647 100644
--- a/mail/pantomime/pkg-plist
+++ b/mail/pantomime/pkg-plist
@@ -1,96 +1,98 @@
Local/Library/Frameworks/Pantomime.framework/Headers
+Local/Library/Frameworks/Pantomime.framework/Pantomime
Local/Library/Frameworks/Pantomime.framework/Resources
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWCacheManager.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWCharset.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWConnection.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWConstants.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWContainer.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWDNSManager.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWFlags.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWFolder.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWFolderInformation.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWIMAPCacheManager.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWIMAPFolder.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWIMAPMessage.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWIMAPStore.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWISO8859_1.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWISO8859_10.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWISO8859_11.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWISO8859_13.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWISO8859_14.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWISO8859_15.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWISO8859_2.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWISO8859_3.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWISO8859_4.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWISO8859_5.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWISO8859_6.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWISO8859_7.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWISO8859_8.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWISO8859_9.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWInternetAddress.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWKOI8_R.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWKOI8_U.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWLocalCacheManager.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWLocalFolder+maildir.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWLocalFolder+mbox.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWLocalFolder.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWLocalMessage.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWLocalStore.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWMD5.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWMIMEMultipart.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWMIMEUtility.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWMessage.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWPOP3CacheManager.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWPOP3CacheObject.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWPOP3Folder.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWPOP3Message.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWPOP3Store.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWParser.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWPart.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWRegEx.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWSMTP.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWSendmail.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWService.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWStore.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWTCPConnection.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWTransport.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWURLName.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWUUFile.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWVirtualFolder.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWWINDOWS_1250.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWWINDOWS_1251.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWWINDOWS_1252.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWWINDOWS_1253.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWWINDOWS_1254.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/NSData+Extensions.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/NSFileManager+Extensions.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/NSScanner+Extensions.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/NSString+Extensions.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/Pantomime.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/io.h
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Pantomime
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Resources/English.lproj/Localizable.strings
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Resources/English.lproj/InfoPlist.strings
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Resources/German.lproj/InfoPlist.strings
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Resources/German.lproj/Localizable.strings
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Resources/Info-gnustep.plist
-Local/Library/Frameworks/Pantomime.framework/Versions/A/libPantomime.so
-Local/Library/Frameworks/Pantomime.framework/Versions/A/libPantomime.so.%%MAJORVERSION%%.2
-Local/Library/Frameworks/Pantomime.framework/Versions/A/libPantomime.so.%%VERSION%%
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWCacheManager.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWCharset.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWConnection.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWConstants.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWContainer.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWDNSManager.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWFlags.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWFolder.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWFolderInformation.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWIMAPCacheManager.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWIMAPFolder.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWIMAPMessage.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWIMAPStore.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_1.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_10.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_11.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_13.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_14.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_15.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_2.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_3.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_4.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_5.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_6.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_7.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_8.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_9.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWInternetAddress.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWKOI8_R.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWKOI8_U.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWLocalCacheManager.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWLocalFolder+maildir.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWLocalFolder+mbox.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWLocalFolder.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWLocalMessage.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWLocalStore.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWMD5.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWMIMEMultipart.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWMIMEUtility.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWMessage.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWPOP3CacheManager.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWPOP3CacheObject.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWPOP3Folder.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWPOP3Message.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWPOP3Store.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWParser.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWPart.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWRegEx.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWSMTP.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWSendmail.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWService.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWStore.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWTCPConnection.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWTransport.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWURLName.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWUUFile.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWVirtualFolder.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWWINDOWS_1250.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWWINDOWS_1251.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWWINDOWS_1252.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWWINDOWS_1253.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWWINDOWS_1254.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/NSData+Extensions.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/NSFileManager+Extensions.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/NSScanner+Extensions.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/NSString+Extensions.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/Pantomime.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/io.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Pantomime
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Resources/English.lproj/Localizable.strings
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Resources/English.lproj/InfoPlist.strings
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Resources/German.lproj/InfoPlist.strings
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Resources/German.lproj/Localizable.strings
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/libPantomime.so
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/libPantomime.so.%%LIBVERSION%%
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/libPantomime.so.%%VERSION%%
Local/Library/Frameworks/Pantomime.framework/Versions/Current
Local/Library/Frameworks/Pantomime.framework/Versions/Resources/English.lproj/Localizable.strings
Local/Library/Frameworks/Pantomime.framework/Versions/Resources/German.lproj/Localizable.strings
+Local/Library/Frameworks/Pantomime.framework/libPantomime.so
Local/Library/Headers/Pantomime
Local/Library/Libraries/libPantomime.so
-Local/Library/Libraries/libPantomime.so.%%MAJORVERSION%%.2
+Local/Library/Libraries/libPantomime.so.%%LIBVERSION%%
Local/Library/Libraries/libPantomime.so.%%VERSION%%
@dirrm Local/Library/Frameworks/Pantomime.framework/Versions/Resources/German.lproj
@dirrm Local/Library/Frameworks/Pantomime.framework/Versions/Resources/English.lproj
@dirrm Local/Library/Frameworks/Pantomime.framework/Versions/Resources
-@dirrm Local/Library/Frameworks/Pantomime.framework/Versions/A/Resources/German.lproj
-@dirrm Local/Library/Frameworks/Pantomime.framework/Versions/A/Resources/English.lproj
-@dirrm Local/Library/Frameworks/Pantomime.framework/Versions/A/Resources
-@dirrm Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers
-@dirrm Local/Library/Frameworks/Pantomime.framework/Versions/A
+@dirrm Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Resources/German.lproj
+@dirrm Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Resources/English.lproj
+@dirrm Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Resources
+@dirrm Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers
+@dirrm Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%
@dirrm Local/Library/Frameworks/Pantomime.framework/Versions
@dirrm Local/Library/Frameworks/Pantomime.framework
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
diff --git a/multimedia/etoile-babbler/pkg-plist b/multimedia/etoile-babbler/pkg-plist
index 8f3a50e8a991..78657cbcef50 100644
--- a/multimedia/etoile-babbler/pkg-plist
+++ b/multimedia/etoile-babbler/pkg-plist
@@ -14,8 +14,8 @@ Local/Applications/Babbler.app/Resources/pause.tiff
Local/Applications/Babbler.app/Resources/play.tiff
Local/Applications/Babbler.app/Resources/seek_back.tiff
Local/Applications/Babbler.app/Resources/seek_fwd.tiff
-Local/Applications/Babbler.app/library_paths.openapp
Local/Applications/Babbler.app/stamp.make
+Local/Tools/Babbler
@dirrm Local/Applications/Babbler.app/Resources/English.lproj/StreamPanel.gorm
@dirrm Local/Applications/Babbler.app/Resources/English.lproj/Player.gorm
@dirrm Local/Applications/Babbler.app/Resources/English.lproj/MainMenu.gorm
diff --git a/multimedia/gnustep-mplayer/pkg-plist b/multimedia/gnustep-mplayer/pkg-plist
index ce6456ad7c21..b415e90c382f 100644
--- a/multimedia/gnustep-mplayer/pkg-plist
+++ b/multimedia/gnustep-mplayer/pkg-plist
@@ -85,8 +85,8 @@ Local/Applications/Mplayer.app/Resources/volume2.png
Local/Applications/Mplayer.app/Resources/volume2.tiff
Local/Applications/Mplayer.app/Resources/volume3.png
Local/Applications/Mplayer.app/Resources/volume3.tiff
-Local/Applications/Mplayer.app/library_paths.openapp
Local/Applications/Mplayer.app/stamp.make
+Local/Tools/Mplayer
@dirrm Local/Applications/Mplayer.app/Resources/MainMenu.gorm
@dirrm Local/Applications/Mplayer.app/Resources
@dirrm Local/Applications/Mplayer.app
diff --git a/multimedia/poe/pkg-plist b/multimedia/poe/pkg-plist
index b677acafe519..0adcc26e5c9b 100644
--- a/multimedia/poe/pkg-plist
+++ b/multimedia/poe/pkg-plist
@@ -48,8 +48,8 @@ Local/Applications/Poe.app/Resources/Poe.desktop
Local/Applications/Poe.app/Resources/Poe.tiff
Local/Applications/Poe.app/Resources/Thai.lproj/CommentInfo.strings
Local/Applications/Poe.app/Resources/Thai.lproj/Localizable.strings
-Local/Applications/Poe.app/library_paths.openapp
Local/Applications/Poe.app/stamp.make
+Local/Tools/Poe
@dirrm Local/Applications/Poe.app/Resources/Thai.lproj
@dirrm Local/Applications/Poe.app/Resources/Japanese.lproj/Editor.gorm
@dirrm Local/Applications/Poe.app/Resources/Japanese.lproj/AddPanel.gorm
diff --git a/net/remotedesk/pkg-plist b/net/remotedesk/pkg-plist
index 001dede99288..73e6687f6f11 100644
--- a/net/remotedesk/pkg-plist
+++ b/net/remotedesk/pkg-plist
@@ -7,8 +7,8 @@ Local/Applications/RemoteDesk.app/Resources/RemoteDesk.gorm/data.classes
Local/Applications/RemoteDesk.app/Resources/RemoteDesk.gorm/data.info
Local/Applications/RemoteDesk.app/Resources/RemoteDesk.gorm/objects.gorm
Local/Applications/RemoteDesk.app/Resources/remotedesk.tiff
-Local/Applications/RemoteDesk.app/library_paths.openapp
Local/Applications/RemoteDesk.app/stamp.make
+Local/Tools/RemoteDesk
@dirrm Local/Applications/RemoteDesk.app/Resources/RemoteDesk.gorm
@dirrm Local/Applications/RemoteDesk.app/Resources
@dirrm Local/Applications/RemoteDesk.app
diff --git a/net/tryst-examples/pkg-plist b/net/tryst-examples/pkg-plist
index a4b3e96b391d..2ac9bad32e95 100644
--- a/net/tryst-examples/pkg-plist
+++ b/net/tryst-examples/pkg-plist
@@ -6,7 +6,6 @@ Local/Applications/TBrowser.app/Resources/Info-gnustep.plist
Local/Applications/TBrowser.app/Resources/TBrowser.desktop
Local/Applications/TBrowser.app/Resources/TBrowser.png
Local/Applications/TBrowser.app/TBrowser
-Local/Applications/TBrowser.app/library_paths.openapp
Local/Applications/TBrowser.app/stamp.make
Local/Applications/TChat.app/Resources/Controller.gorm/data.classes
Local/Applications/TChat.app/Resources/Controller.gorm/data.info
@@ -18,8 +17,9 @@ Local/Applications/TChat.app/Resources/TChatInfo.plist
Local/Applications/TChat.app/Resources/WindowController.gorm/data.classes
Local/Applications/TChat.app/Resources/WindowController.gorm/objects.gorm
Local/Applications/TChat.app/TChat
-Local/Applications/TChat.app/library_paths.openapp
Local/Applications/TChat.app/stamp.make
+Local/Tools/TBrowser
+Local/Tools/TChat
@dirrm Local/Applications/TChat.app/Resources/WindowController.gorm
@dirrm Local/Applications/TChat.app/Resources/Controller.gorm
@dirrm Local/Applications/TChat.app/Resources
diff --git a/news/lusernet/pkg-plist b/news/lusernet/pkg-plist
index 4d92aeee139f..d1ce8885ca63 100644
--- a/news/lusernet/pkg-plist
+++ b/news/lusernet/pkg-plist
@@ -7,8 +7,8 @@ Local/Applications/LuserNET.app/Resources/LuserNET.desktop
Local/Applications/LuserNET.app/Resources/News.app.tiff
Local/Applications/LuserNET.app/Resources/Spanish.lproj/Localizable.strings
Local/Applications/LuserNET.app/Resources/Swedish.lproj/Localizable.strings
-Local/Applications/LuserNET.app/library_paths.openapp
Local/Applications/LuserNET.app/stamp.make
+Local/Tools/LuserNET
@dirrm Local/Applications/LuserNET.app/Resources/Swedish.lproj
@dirrm Local/Applications/LuserNET.app/Resources/Spanish.lproj
@dirrm Local/Applications/LuserNET.app/Resources/German.lproj
diff --git a/print/gspdf/pkg-plist b/print/gspdf/pkg-plist
index 4e5fb8fd61d5..91beb699a47a 100644
--- a/print/gspdf/pkg-plist
+++ b/print/gspdf/pkg-plist
@@ -15,8 +15,8 @@ System/Applications/GSPdf.app/Resources/papersizes.plist
System/Applications/GSPdf.app/Resources/right.tiff
System/Applications/GSPdf.app/Resources/zoomin.tiff
System/Applications/GSPdf.app/Resources/zoomout.tiff
-System/Applications/GSPdf.app/library_paths.openapp
System/Applications/GSPdf.app/stamp.make
+System/Tools/GSPdf
@dirrm System/Applications/GSPdf.app/Resources/English.lproj
@dirrm System/Applications/GSPdf.app/Resources
@dirrm System/Applications/GSPdf.app
diff --git a/shells/gscommander/pkg-plist b/shells/gscommander/pkg-plist
index 19cfb9764c52..615c6fd7c952 100644
--- a/shells/gscommander/pkg-plist
+++ b/shells/gscommander/pkg-plist
@@ -5,7 +5,7 @@ Local/Applications/GSCommander.app/Resources/GSCommander.tiff
Local/Applications/GSCommander.app/Resources/GSCommanderInfo.plist
Local/Applications/GSCommander.app/Resources/Info-gnustep.plist
Local/Applications/GSCommander.app/Resources/README
-Local/Applications/GSCommander.app/library_paths.openapp
Local/Applications/GSCommander.app/stamp.make
+Local/Tools/GSCommander
@dirrm Local/Applications/GSCommander.app/Resources
@dirrm Local/Applications/GSCommander.app
diff --git a/sysutils/batmon/pkg-plist b/sysutils/batmon/pkg-plist
index dfc6cea05a4a..d020aa87b457 100644
--- a/sysutils/batmon/pkg-plist
+++ b/sysutils/batmon/pkg-plist
@@ -6,8 +6,8 @@ Local/Applications/batmon.app/Resources/batmon.gorm/data.classes
Local/Applications/batmon.app/Resources/batmon.gorm/data.info
Local/Applications/batmon.app/Resources/batmon.gorm/objects.gorm
Local/Applications/batmon.app/batmon
-Local/Applications/batmon.app/library_paths.openapp
Local/Applications/batmon.app/stamp.make
+Local/Tools/batmon
@dirrm Local/Applications/batmon.app/Resources/batmon.gorm
@dirrm Local/Applications/batmon.app/Resources
@dirrm Local/Applications/batmon.app
diff --git a/sysutils/burn/Makefile b/sysutils/burn/Makefile
index 40356b4a3c37..2f3e2baa4716 100644
--- a/sysutils/burn/Makefile
+++ b/sysutils/burn/Makefile
@@ -30,6 +30,7 @@ USE_GNUSTEP_SYSTEM_LIBS+= PrefsModule:${PREFERENCES_PORT}
USE_GNUSTEP_SYSTEM_LIBS+= Inspector:${GWORKSPACE_PORT}
WRKSRC= ${WRKDIR}/Burn
+MAKE_ENV+= GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT}
HEADERS= Burn/ExternalTools.h Burn/PreferencesModule.h \
Constants.h Functions.h Track.h
diff --git a/sysutils/burn/pkg-plist b/sysutils/burn/pkg-plist
index 303a29376246..1ae8e540dabc 100644
--- a/sysutils/burn/pkg-plist
+++ b/sysutils/burn/pkg-plist
@@ -141,7 +141,6 @@ Local/Applications/Burn.app/Resources/iconGSburn.tiff
Local/Applications/Burn.app/Resources/iconGeneral.tiff
Local/Applications/Burn.app/Resources/iconMultiSelection.tiff
Local/Applications/Burn.app/Resources/iconProgressDisc.tiff
-Local/Applications/Burn.app/library_paths.openapp
Local/Applications/Burn.app/stamp.make
Local/Library/Bundles/CDparanoia.bundle/CDparanoia
Local/Library/Bundles/CDparanoia.bundle/Resources/English.lproj/Localizable.strings
@@ -205,6 +204,7 @@ Local/Library/Headers/Burn/ExternalTools.h
Local/Library/Headers/Burn/Functions.h
Local/Library/Headers/Burn/PreferencesModule.h
Local/Library/Headers/Burn/Track.h
+Local/Tools/Burn
@dirrm Local/Library/Headers/Burn
@dirrm Local/Library/Bundles/MkIsoFs.bundle/Resources/German.lproj/Settings.gorm
@dirrm Local/Library/Bundles/MkIsoFs.bundle/Resources/German.lproj/Parameters.gorm
diff --git a/sysutils/etoile-installer/pkg-plist b/sysutils/etoile-installer/pkg-plist
index 5130fc7ffd2b..f62c564bc76c 100644
--- a/sysutils/etoile-installer/pkg-plist
+++ b/sysutils/etoile-installer/pkg-plist
@@ -13,9 +13,9 @@ Local/Applications/Installer.app/Resources/Package.gorm/data.classes
Local/Applications/Installer.app/Resources/Package.gorm/data.info
Local/Applications/Installer.app/Resources/Package.gorm/objects.gorm
Local/Applications/Installer.app/Resources/Pkg.tiff
-Local/Applications/Installer.app/library_paths.openapp
Local/Applications/Installer.app/stamp.make
Local/Library/Headers/Gpkg/Gpkg.h
+Local/Tools/Installer
Local/Tools/lsgbom
Local/Tools/mkgbom
@dirrm Local/Library/Headers/Gpkg
diff --git a/sysutils/etoile-system/Makefile b/sysutils/etoile-system/Makefile
index db00f82ae61b..f160ba206014 100644
--- a/sysutils/etoile-system/Makefile
+++ b/sysutils/etoile-system/Makefile
@@ -28,10 +28,13 @@ USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES}
SNAPSHOT= 20061221
WRKSRC= ${WRKDIR}/Etoile/
USE_GNUSTEP_MAKE_DIRS+= Services/Private/System
+MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
post-install:
${MKDIR} ${GNUSTEP_PREFIX}/System/Library/Etoile
${CP} ${WRKSRC}/Services/Private/System/SystemTaskList.plist \
${GNUSTEP_PREFIX}/System/Library/Etoile/
+ ${INSTALL_SCRIPT} ${WRKSRC}/setdown.sh ${WRKSRC}/setup.sh \
+ ${GNUSTEP_PREFIX}/System/Tools/
.include <bsd.port.mk>
diff --git a/sysutils/etoile-system/pkg-plist b/sysutils/etoile-system/pkg-plist
index 6adcbd26f80b..bc95a1a706a2 100644
--- a/sysutils/etoile-system/pkg-plist
+++ b/sysutils/etoile-system/pkg-plist
@@ -4,5 +4,7 @@ System/Library/Libraries/libWorkspaceCommKit.so
System/Library/Libraries/libWorkspaceCommKit.so.%%MAJORLIBVERSION%%
System/Library/Libraries/libWorkspaceCommKit.so.%%LIBVERSION%%
System/Tools/etoile_system
+System/Tools/setup.sh
+System/Tools/setdown.sh
@dirrm System/Library/Headers/WorkspaceCommKit
@dirrm System/Library/Etoile
diff --git a/textproc/easydiff/pkg-plist b/textproc/easydiff/pkg-plist
index b9907cbfd8d8..1857f06caf29 100644
--- a/textproc/easydiff/pkg-plist
+++ b/textproc/easydiff/pkg-plist
@@ -6,8 +6,8 @@ Local/Applications/EasyDiff.app/Resources/main.gorm/data.classes
Local/Applications/EasyDiff.app/Resources/main.gorm/objects.gorm
Local/Applications/EasyDiff.app/Resources/window.gorm/data.classes
Local/Applications/EasyDiff.app/Resources/window.gorm/objects.gorm
-Local/Applications/EasyDiff.app/library_paths.openapp
Local/Applications/EasyDiff.app/stamp.make
+Local/Tools/EasyDiff
@dirrm Local/Applications/EasyDiff.app/Resources/window.gorm
@dirrm Local/Applications/EasyDiff.app/Resources/main.gorm
@dirrm Local/Applications/EasyDiff.app/Resources
diff --git a/textproc/localize/pkg-plist b/textproc/localize/pkg-plist
index e8f3fb434670..ea628795d249 100644
--- a/textproc/localize/pkg-plist
+++ b/textproc/localize/pkg-plist
@@ -18,8 +18,8 @@ Local/Applications/Localize.app/Resources/Thai.lproj/Localize.gorm/data.classes
Local/Applications/Localize.app/Resources/Thai.lproj/Localize.gorm/objects.gorm
Local/Applications/Localize.app/Resources/Translated.tiff
Local/Applications/Localize.app/Resources/UnMatched.tiff
-Local/Applications/Localize.app/library_paths.openapp
Local/Applications/Localize.app/stamp.make
+Local/Tools/Localize
@dirrm Local/Applications/Localize.app/Resources/Thai.lproj/Localize.gorm
@dirrm Local/Applications/Localize.app/Resources/Thai.lproj
@dirrm Local/Applications/Localize.app/Resources/English.lproj/MakeStrings.gorm
diff --git a/textproc/popup/pkg-plist b/textproc/popup/pkg-plist
index e2de910e0462..10f1e6968e46 100644
--- a/textproc/popup/pkg-plist
+++ b/textproc/popup/pkg-plist
@@ -45,8 +45,8 @@ Local/Applications/Popup.app/Resources/Thai.lproj/MainMenu.gorm/data.classes
Local/Applications/Popup.app/Resources/Thai.lproj/MainMenu.gorm/data.info
Local/Applications/Popup.app/Resources/Thai.lproj/MainMenu.gorm/objects.gorm
Local/Applications/Popup.app/Resources/Wrong.wav
-Local/Applications/Popup.app/library_paths.openapp
Local/Applications/Popup.app/stamp.make
+Local/Tools/Popup
@dirrm Local/Applications/Popup.app/Resources/Thai.lproj/MainMenu.gorm
@dirrm Local/Applications/Popup.app/Resources/Thai.lproj
@dirrm Local/Applications/Popup.app/Resources/German.lproj/MainMenu.gorm
diff --git a/www/etoile-mollusk/pkg-plist b/www/etoile-mollusk/pkg-plist
index 72ec28ead1b8..aedb517d0439 100644
--- a/www/etoile-mollusk/pkg-plist
+++ b/www/etoile-mollusk/pkg-plist
@@ -28,8 +28,8 @@ Local/Applications/Mollusk.app/Resources/rssreader-working.png
Local/Applications/Mollusk.app/Resources/rssreader.icns
Local/Applications/Mollusk.app/Resources/rssreader.png
Local/Applications/Mollusk.app/Resources/xml.tiff
-Local/Applications/Mollusk.app/library_paths.openapp
Local/Applications/Mollusk.app/stamp.make
+Local/Tools/Mollusk
@dirrm Local/Applications/Mollusk.app/Resources/English.lproj/PreferencePane.gorm
@dirrm Local/Applications/Mollusk.app/Resources/English.lproj/MainMenu.gorm
@dirrm Local/Applications/Mollusk.app/Resources/English.lproj/FontPreferencePane.gorm
diff --git a/www/gnustep-ticker/pkg-plist b/www/gnustep-ticker/pkg-plist
index 2bfd32d0d7bb..a688518a8340 100644
--- a/www/gnustep-ticker/pkg-plist
+++ b/www/gnustep-ticker/pkg-plist
@@ -2,7 +2,7 @@ Local/Applications/Ticker.app/Resources/Info-gnustep.plist
Local/Applications/Ticker.app/Resources/Ticker.desktop
Local/Applications/Ticker.app/Resources/Ticker.tiff
Local/Applications/Ticker.app/Ticker
-Local/Applications/Ticker.app/library_paths.openapp
Local/Applications/Ticker.app/stamp.make
+Local/Tools/Ticker
@dirrm Local/Applications/Ticker.app/Resources
@dirrm Local/Applications/Ticker.app
diff --git a/x11-themes/etoile-azbackground/Makefile b/x11-themes/etoile-azbackground/Makefile
index 51094ae360bd..8a67de3bfe8a 100644
--- a/x11-themes/etoile-azbackground/Makefile
+++ b/x11-themes/etoile-azbackground/Makefile
@@ -28,8 +28,9 @@ USE_GNUSTEP_SYSTEM_LIBS+= XWindowServerKit:${XWINDOWSERVERKIT_PORT}
SNAPSHOT= 20061221
WRKSRC= ${WRKDIR}/Etoile/
USE_GNUSTEP_MAKE_DIRS+= Services/Private/AZBackground
-ADDITIONAL_OBJCFLAGS+= -I${X11BASE}/include
-ADDITIONAL_LDFLAGS+= -L${X11BASE}/lib
+ADDITIONAL_INCLUDE_DIRS+= -I${X11BASE}/include
+ADDITIONAL_LIB_DIRS+= -L${X11BASE}/lib
+MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
XWINDOWSERVERKIT_PORT?= x11/etoile-xwindowserverkit
diff --git a/x11-themes/etoile-azbackground/pkg-plist b/x11-themes/etoile-azbackground/pkg-plist
index 9f359d3c0122..d01919b0dbc5 100644
--- a/x11-themes/etoile-azbackground/pkg-plist
+++ b/x11-themes/etoile-azbackground/pkg-plist
@@ -1,7 +1,7 @@
System/Applications/AZBackground.app/AZBackground
System/Applications/AZBackground.app/Resources/AZBackground.desktop
System/Applications/AZBackground.app/Resources/Info-gnustep.plist
-System/Applications/AZBackground.app/library_paths.openapp
System/Applications/AZBackground.app/stamp.make
+System/Tools/AZBackground
@dirrm System/Applications/AZBackground.app/Resources
@dirrm System/Applications/AZBackground.app
diff --git a/x11-themes/etoile-camaelon/Makefile b/x11-themes/etoile-camaelon/Makefile
index 5155a5dcd955..2e81c85dfd76 100644
--- a/x11-themes/etoile-camaelon/Makefile
+++ b/x11-themes/etoile-camaelon/Makefile
@@ -26,5 +26,6 @@ USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
SNAPSHOT= 20060917
WRKSRC= ${WRKDIR}/etoile-0+${SNAPSHOT}+dfsg/Etoile/
USE_GNUSTEP_MAKE_DIRS+= Bundles/Camaelon
+MAKE_ENV+= GNUSTEP_INSTALLATION_DIR="${GNUSTEP_SYSTEM_ROOT}"
.include <bsd.port.mk>
diff --git a/x11-themes/etoile-iconkit/Makefile b/x11-themes/etoile-iconkit/Makefile
index 09dba46ce5b6..56ef8ae111f4 100644
--- a/x11-themes/etoile-iconkit/Makefile
+++ b/x11-themes/etoile-iconkit/Makefile
@@ -30,6 +30,7 @@ USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES}
SNAPSHOT= 20061221
WRKSRC= ${WRKDIR}/Etoile/
USE_GNUSTEP_MAKE_DIRS+= Frameworks/IconKit
+MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
UNITKIT_PORT?= devel/etoile-unitkit
diff --git a/x11-toolkits/gnustep-back/Makefile b/x11-toolkits/gnustep-back/Makefile
index ec82d88d341d..190482998051 100644
--- a/x11-toolkits/gnustep-back/Makefile
+++ b/x11-toolkits/gnustep-back/Makefile
@@ -49,6 +49,8 @@ PLIST_SUB+= BACK=xdps-${BACKVERSION}
PLIST_SUB+= USE_XLIB="@comment "
BACK_SUFFIX?= -xdps
CONFLICTS?= gunstep-back-0.* gunstep-back-art-0.* gunstep-back-cairo-0.*
+#ADDITIONAL_INCLUDE_DIRS+= -I${X11BASE}/include
+#ADDITIONAL_LDFLAGS+= -L${X11BASE}/lib
.elif defined(WITH_GNUSTEP_LIBART)
LIB_DEPENDS+= art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
CONFIGURE_ARGS+= --enable-graphics=art --with-name=art
diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile
index 3ad92f47e763..c1aeb0113974 100644
--- a/x11-toolkits/gnustep-gui/Makefile
+++ b/x11-toolkits/gnustep-gui/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnustep-gui
PORTVERSION= 0.11.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits gnustep
MASTER_SITES= ${MASTER_SITE_GNUSTEP}
MASTER_SITE_SUBDIR= core
@@ -42,7 +42,6 @@ EXTRA_PATCHES+= ${FILESDIR}/GNUmakefile.patch
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAKE_FLAGS+= OPTFLAG="${CFLAGS}"
BREAKS_IF_PEDANTIC= yes
-
PLIST_SUB+= BASEVERSION=${PORTVERSION:C/[.][0-9]*$//1}
.if defined(WITHOUT_GNUSTEP_FAKEMAIN)
@@ -51,11 +50,16 @@ IGNORE= requires procfs mounted to build or run, for details see procfs(5)
.endif
.endif
-.if defined(WITH_PORTAUDIO2)
+.if !defined(WITHOUT_PORTAUDIO2) || !defined(WITHOUT_PORTAUDIO)
LIB_DEPENDS+= portaudio:${PORTSDIR}/audio/portaudio2
CPPFLAGS+= -I${LOCALBASE}/include/portaudio2 ${PTHREAD_CFLAGS}
CFLAGS+= ${PTHREAD_CFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib/portaudio2 ${PTHREAD_LIBS}
+ADDITIONAL_INCLUDE_DIRS+= -I${LOCALBASE}/include/portaudio2
+ADDITIONAL_LDFLAGS+= -L${LOCALBASE}/lib/portaudio2
+PLIST_SUB+= WITH_PORTAUDIO=""
+.else
+PLIST_SUB+= WITH_PORTAUDIO="@comment "
.endif
.if !defined(WITHOUT_CUPS)
diff --git a/x11-toolkits/gnustep-gui/pkg-plist b/x11-toolkits/gnustep-gui/pkg-plist
index 562f81e4f822..ff425f97b1a8 100644
--- a/x11-toolkits/gnustep-gui/pkg-plist
+++ b/x11-toolkits/gnustep-gui/pkg-plist
@@ -664,6 +664,7 @@ System/Library/Services/GSspell.service/GSspell
System/Library/Services/GSspell.service/Resources/Info-gnustep.plist
System/Tools/gclose
System/Tools/gcloseall
+%%WITH_PORTAUDIO%%System/Tools/gnustep_sndd
System/Tools/gopen
System/Tools/make_services
System/Tools/set_show_service
diff --git a/x11-wm/etoile-azalea/pkg-plist b/x11-wm/etoile-azalea/pkg-plist
index 5e12192fc8e2..e7b959917b3c 100644
--- a/x11-wm/etoile-azalea/pkg-plist
+++ b/x11-wm/etoile-azalea/pkg-plist
@@ -12,8 +12,8 @@ Local/Applications/Azalea.app/Resources/themes/Azalea/openbox-3/max.xbm
Local/Applications/Azalea.app/Resources/themes/Azalea/openbox-3/max_toggled.xbm
Local/Applications/Azalea.app/Resources/themes/Azalea/openbox-3/shade.xbm
Local/Applications/Azalea.app/Resources/themes/Azalea/openbox-3/themerc
-Local/Applications/Azalea.app/library_paths.openapp
Local/Applications/Azalea.app/stamp.make
+Local/Tools/Azalea
@dirrm Local/Applications/Azalea.app/Resources/themes/Azalea/openbox-3
@dirrm Local/Applications/Azalea.app/Resources/themes/Azalea
@dirrm Local/Applications/Azalea.app/Resources/themes
diff --git a/x11-wm/etoile-azdock/Makefile b/x11-wm/etoile-azdock/Makefile
index 1e315aa10765..ffe987f65bd0 100644
--- a/x11-wm/etoile-azdock/Makefile
+++ b/x11-wm/etoile-azdock/Makefile
@@ -31,6 +31,7 @@ WRKSRC= ${WRKDIR}/Etoile/
USE_GNUSTEP_MAKE_DIRS+= Services/Private/AZDock
ADDITIONAL_OBJCFLAGS+= -I${X11BASE}/include
ADDITIONAL_LDFLAGS+= -L${X11BASE}/lib
+MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
XWINDOWSERVERKIT_PORT?= x11/etoile-xwindowserverkit
BOOKMARKKIT_PORT?= www/etoile-bookmarkkit
diff --git a/x11-wm/etoile-azdock/pkg-plist b/x11-wm/etoile-azdock/pkg-plist
index 8bb8ae26f57b..ac40ab34856b 100644
--- a/x11-wm/etoile-azdock/pkg-plist
+++ b/x11-wm/etoile-azdock/pkg-plist
@@ -2,7 +2,7 @@ System/Applications/AZDock.app/AZDock
System/Applications/AZDock.app/Resources/AZDock.desktop
System/Applications/AZDock.app/Resources/Info-gnustep.plist
System/Applications/AZDock.app/Resources/Unknown.tiff
-System/Applications/AZDock.app/library_paths.openapp
System/Applications/AZDock.app/stamp.make
+System/Tools/AZDock
@dirrm System/Applications/AZDock.app/Resources
@dirrm System/Applications/AZDock.app
diff --git a/x11/etoile-iterm/Makefile b/x11/etoile-iterm/Makefile
index 0f7476fbb6b2..688713fd89d0 100644
--- a/x11/etoile-iterm/Makefile
+++ b/x11/etoile-iterm/Makefile
@@ -31,4 +31,10 @@ USE_GNUSTEP_MAKE_DIRS+= Services/User/Terminal
ADDRESSES_PORT?= mail/addresses
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 600000
+IGNORE= incompatible thread functions
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/x11/etoile-iterm/pkg-plist b/x11/etoile-iterm/pkg-plist
index 6a79768c925c..a22178be2284 100644
--- a/x11/etoile-iterm/pkg-plist
+++ b/x11/etoile-iterm/pkg-plist
@@ -9,7 +9,7 @@ Local/Applications/iTerm.app/Resources/iTerm.iconheader
Local/Applications/iTerm.app/Resources/iTerm.plist
Local/Applications/iTerm.app/Resources/iTerm_Framework.plist
Local/Applications/iTerm.app/iTerm
-Local/Applications/iTerm.app/library_paths.openapp
Local/Applications/iTerm.app/stamp.make
+Local/Tools/iTerm
@dirrm Local/Applications/iTerm.app/Resources
@dirrm Local/Applications/iTerm.app
diff --git a/x11/gskrab/Makefile b/x11/gskrab/Makefile
index d2f57554faac..5632ec1134b4 100644
--- a/x11/gskrab/Makefile
+++ b/x11/gskrab/Makefile
@@ -22,7 +22,8 @@ USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
-ADDITIONAL_OBJCFLAGS+= -I${X11BASE}/include ${LOCALBASE}/include
-ADDITIONAL_LDFLAGS+= -L${X11BASE}/lib
+ADDITIONAL_INCLUDE_DIRS+= -I${X11BASE}/include ${LOCALBASE}/include
+ADDITIONAL_LIB_DIRS+= -L${X11BASE}/lib
+ADDITIONAL_LIB_DIRS+= -L${WRKSRC}/GSKrabFramework/GSKrab.framework/Versions/Current
.include <bsd.port.mk>
diff --git a/x11/gskrab/pkg-plist b/x11/gskrab/pkg-plist
index 3eccb29fcfab..6ea5d3cfe741 100644
--- a/x11/gskrab/pkg-plist
+++ b/x11/gskrab/pkg-plist
@@ -1,22 +1,24 @@
+Local/Library/Frameworks/GSKrab.framework/GSKrab
Local/Library/Frameworks/GSKrab.framework/Headers
Local/Library/Frameworks/GSKrab.framework/Resources
-Local/Library/Frameworks/GSKrab.framework/Versions/A/GSKrab
-Local/Library/Frameworks/GSKrab.framework/Versions/A/Headers/GSKrab.h
-Local/Library/Frameworks/GSKrab.framework/Versions/A/Headers/GSKrabClient.h
-Local/Library/Frameworks/GSKrab.framework/Versions/A/Headers/GSKrabKeyCode.h
-Local/Library/Frameworks/GSKrab.framework/Versions/A/Headers/GSKrabServer.h
-Local/Library/Frameworks/GSKrab.framework/Versions/A/Resources/Info-gnustep.plist
-Local/Library/Frameworks/GSKrab.framework/Versions/A/libGSKrab.so
-Local/Library/Frameworks/GSKrab.framework/Versions/A/libGSKrab.so.%%MAJORVERSION%%
-Local/Library/Frameworks/GSKrab.framework/Versions/A/libGSKrab.so.%%VERSION%%
+Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/GSKrab
+Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/Headers/GSKrab.h
+Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/Headers/GSKrabClient.h
+Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/Headers/GSKrabKeyCode.h
+Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/Headers/GSKrabServer.h
+Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/libGSKrab.so
+Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/libGSKrab.so.%%MAJORVERSION%%
+Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/libGSKrab.so.%%VERSION%%
Local/Library/Frameworks/GSKrab.framework/Versions/Current
+Local/Library/Frameworks/GSKrab.framework/libGSKrab.so
Local/Library/Headers/GSKrab
Local/Library/Libraries/libGSKrab.so
Local/Library/Libraries/libGSKrab.so.%%MAJORVERSION%%
Local/Library/Libraries/libGSKrab.so.%%VERSION%%
Local/Tools/gsks
-@dirrm Local/Library/Frameworks/GSKrab.framework/Versions/A/Resources
-@dirrm Local/Library/Frameworks/GSKrab.framework/Versions/A/Headers
-@dirrm Local/Library/Frameworks/GSKrab.framework/Versions/A
+@dirrm Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/Resources
+@dirrm Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/Headers
+@dirrm Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%
@dirrm Local/Library/Frameworks/GSKrab.framework/Versions
@dirrm Local/Library/Frameworks/GSKrab.framework
diff --git a/x11/innerspace/pkg-plist b/x11/innerspace/pkg-plist
index c1e146b315f2..478f4565a72d 100644
--- a/x11/innerspace/pkg-plist
+++ b/x11/innerspace/pkg-plist
@@ -17,8 +17,8 @@ Local/Applications/InnerSpace.app/Resources/NickSpace.InnerSpace/Resources/NickS
Local/Applications/InnerSpace.app/Resources/NickSpace.InnerSpace/Resources/NickSpace.gorm/data.info
Local/Applications/InnerSpace.app/Resources/NickSpace.InnerSpace/Resources/NickSpace.gorm/objects.gorm
Local/Applications/InnerSpace.app/Resources/NickSpace.InnerSpace/stamp.make
-Local/Applications/InnerSpace.app/library_paths.openapp
Local/Applications/InnerSpace.app/stamp.make
+Local/Tools/InnerSpace
@dirrm Local/Applications/InnerSpace.app/Resources/NickSpace.InnerSpace/Resources/NickSpace.gorm
@dirrm Local/Applications/InnerSpace.app/Resources/NickSpace.InnerSpace/Resources
@dirrm Local/Applications/InnerSpace.app/Resources/NickSpace.InnerSpace