aboutsummaryrefslogtreecommitdiff
path: root/deskutils
diff options
context:
space:
mode:
authorDirk Meyer <dinoex@FreeBSD.org>2007-05-25 05:55:36 +0000
committerDirk Meyer <dinoex@FreeBSD.org>2007-05-25 05:55:36 +0000
commit13b3264699685f92129a875b8e9a748e4009018d (patch)
tree3f76be59fd9d08b893230429270df55a0603b1aa /deskutils
parentd4fbb7ad92f38ed96c3850958601133f20ea14ad (diff)
Notes
Diffstat (limited to 'deskutils')
-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
30 files changed, 318 insertions, 290 deletions
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