summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirk Meyer <dinoex@FreeBSD.org>2007-05-25 06:04:44 +0000
committerDirk Meyer <dinoex@FreeBSD.org>2007-05-25 06:04:44 +0000
commit0e0e859328af1bedb7a41531b188a3fb605287f6 (patch)
tree6b0231f43527d2febb6b55135d511206511484e0
parent- add missing include (diff)
- update for gnustep-make-2.0.0
Approved by: gurkan (maintainer)
-rw-r--r--audio/cynthiune/Makefile5
-rw-r--r--audio/cynthiune/pkg-plist46
-rw-r--r--audio/volumecontrol.app/pkg-plist10
-rw-r--r--biology/adun/Makefile6
-rw-r--r--biology/adun/pkg-plist144
-rw-r--r--databases/gdl2/pkg-plist42
-rw-r--r--deskutils/charmap/pkg-plist10
-rw-r--r--deskutils/etoile-dictionaryreader/pkg-plist2
-rw-r--r--editors/textedit.app/Makefile1
-rw-r--r--editors/textedit.app/pkg-plist2
-rw-r--r--games/gnustep-ladder/pkg-plist24
-rw-r--r--games/gridlock/pkg-plist2
-rw-r--r--games/lapispuzzle/pkg-plist4
-rw-r--r--games/stepbill/pkg-plist100
-rw-r--r--graphics/camera/pkg-plist8
-rw-r--r--graphics/photoclip/pkg-plist6
-rw-r--r--graphics/price/pkg-plist2
-rw-r--r--irc/talksoup/Makefile1
-rw-r--r--irc/talksoup/pkg-plist4
-rw-r--r--japanese/jishyo/pkg-plist2
-rw-r--r--math/edenmath/pkg-plist2
-rw-r--r--math/stepulator/pkg-plist2
-rw-r--r--net-im/grouch/pkg-plist2
-rw-r--r--net/netclasses/pkg-plist2
-rw-r--r--science/gtamsanalyzer/Makefile3
-rw-r--r--science/gtamsanalyzer/pkg-plist2
-rw-r--r--science/paje/pkg-plist2
-rw-r--r--sysutils/timemon/pkg-plist2
-rw-r--r--textproc/duncan/pkg-plist2
-rw-r--r--x11-clocks/aclock/pkg-plist6
-rw-r--r--x11-toolkits/renaissance/Makefile4
-rw-r--r--x11-toolkits/renaissance/pkg-plist4
-rw-r--r--x11/terminal.app/Makefile1
-rw-r--r--x11/terminal.app/pkg-plist2
34 files changed, 242 insertions, 215 deletions
diff --git a/audio/cynthiune/Makefile b/audio/cynthiune/Makefile
index 2cf68e39c061..df8b67220b6d 100644
--- a/audio/cynthiune/Makefile
+++ b/audio/cynthiune/Makefile
@@ -33,7 +33,8 @@ USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
USE_GNOME+= esound
WRKSRC= ${WRKDIR}/cynthiune.app-${PORTVERSION}
-MAKE_FLAGS= disable-windowsmedia=yes
-#ALL_TARGET=
+ADDITIONAL_LIB_DIRS+= -L${WRKSRC}/Frameworks/Cynthiune/Cynthiune.framework/Versions/Current
+MAKE_ENV+= GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT}
+MAKE_FLAGS= disable-windowsmedia=yes debug=no
.include <bsd.port.mk>
diff --git a/audio/cynthiune/pkg-plist b/audio/cynthiune/pkg-plist
index 8a0c63b6d2e1..d04b7d9acb95 100644
--- a/audio/cynthiune/pkg-plist
+++ b/audio/cynthiune/pkg-plist
@@ -69,7 +69,6 @@ Local/Applications/Cynthiune.app/Resources/song-inspector.tiff
Local/Applications/Cynthiune.app/Resources/song-pointer.tiff
Local/Applications/Cynthiune.app/Resources/stop-pushed.tiff
Local/Applications/Cynthiune.app/Resources/stop.tiff
-Local/Applications/Cynthiune.app/library_paths.openapp
Local/Applications/Cynthiune.app/stamp.make
Local/Library/Cynthiune/ASFTags.tags/ASFTags
Local/Library/Cynthiune/ASFTags.tags/Resources/Info-gnustep.plist
@@ -126,34 +125,37 @@ Local/Library/Cynthiune/VorbisTags.tags/stamp.make
Local/Library/Cynthiune/aRts.output/Resources/Info-gnustep.plist
Local/Library/Cynthiune/aRts.output/aRts
Local/Library/Cynthiune/aRts.output/stamp.make
+Local/Library/Frameworks/Cynthiune.framework/Cynthiune
Local/Library/Frameworks/Cynthiune.framework/Headers
Local/Library/Frameworks/Cynthiune.framework/Resources
-Local/Library/Frameworks/Cynthiune.framework/Versions/A/Cynthiune
-Local/Library/Frameworks/Cynthiune.framework/Versions/A/Headers/CynthiuneBundle.h
-Local/Library/Frameworks/Cynthiune.framework/Versions/A/Headers/Format.h
-Local/Library/Frameworks/Cynthiune.framework/Versions/A/Headers/MailService.h
-Local/Library/Frameworks/Cynthiune.framework/Versions/A/Headers/NSArrayExtensions.h
-Local/Library/Frameworks/Cynthiune.framework/Versions/A/Headers/NSCellExtensions.h
-Local/Library/Frameworks/Cynthiune.framework/Versions/A/Headers/NSColorExtensions.h
-Local/Library/Frameworks/Cynthiune.framework/Versions/A/Headers/NSNumberExtensions.h
-Local/Library/Frameworks/Cynthiune.framework/Versions/A/Headers/NSStringExtensions.h
-Local/Library/Frameworks/Cynthiune.framework/Versions/A/Headers/NSTimerExtensions.h
-Local/Library/Frameworks/Cynthiune.framework/Versions/A/Headers/NSViewExtensions.h
-Local/Library/Frameworks/Cynthiune.framework/Versions/A/Headers/Output.h
-Local/Library/Frameworks/Cynthiune.framework/Versions/A/Headers/Preference.h
-Local/Library/Frameworks/Cynthiune.framework/Versions/A/Headers/utils.h
-Local/Library/Frameworks/Cynthiune.framework/Versions/A/Resources/Info-gnustep.plist
-Local/Library/Frameworks/Cynthiune.framework/Versions/A/libCynthiune.so
-Local/Library/Frameworks/Cynthiune.framework/Versions/A/libCynthiune.so.%%MAJORLIBVERSION%%
-Local/Library/Frameworks/Cynthiune.framework/Versions/A/libCynthiune.so.%%LIBVERSION%%
+Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%/Cynthiune
+Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%/Headers/CynthiuneBundle.h
+Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%/Headers/Format.h
+Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%/Headers/MailService.h
+Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%/Headers/NSArrayExtensions.h
+Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%/Headers/NSCellExtensions.h
+Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%/Headers/NSColorExtensions.h
+Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%/Headers/NSNumberExtensions.h
+Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%/Headers/NSStringExtensions.h
+Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%/Headers/NSTimerExtensions.h
+Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%/Headers/NSViewExtensions.h
+Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%/Headers/Output.h
+Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%/Headers/Preference.h
+Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%/Headers/utils.h
+Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%/libCynthiune.so
+Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%/libCynthiune.so.%%MAJORLIBVERSION%%
+Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%/libCynthiune.so.%%LIBVERSION%%
Local/Library/Frameworks/Cynthiune.framework/Versions/Current
+Local/Library/Frameworks/Cynthiune.framework/libCynthiune.so
Local/Library/Headers/Cynthiune
Local/Library/Libraries/libCynthiune.so
Local/Library/Libraries/libCynthiune.so.%%MAJORLIBVERSION%%
Local/Library/Libraries/libCynthiune.so.%%LIBVERSION%%
-@dirrm Local/Library/Frameworks/Cynthiune.framework/Versions/A/Resources
-@dirrm Local/Library/Frameworks/Cynthiune.framework/Versions/A/Headers
-@dirrm Local/Library/Frameworks/Cynthiune.framework/Versions/A
+Local/Tools/Cynthiune
+@dirrm Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%/Resources
+@dirrm Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%/Headers
+@dirrm Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%
@dirrm Local/Library/Frameworks/Cynthiune.framework/Versions
@dirrm Local/Library/Frameworks/Cynthiune.framework
@dirrm Local/Library/Cynthiune/aRts.output/Resources
diff --git a/audio/volumecontrol.app/pkg-plist b/audio/volumecontrol.app/pkg-plist
index fef8cca6eddb..5b6a4a975ed4 100644
--- a/audio/volumecontrol.app/pkg-plist
+++ b/audio/volumecontrol.app/pkg-plist
@@ -1,13 +1,13 @@
-Local/Applications/VolumeControl.app/VolumeControl
-Local/Applications/VolumeControl.app/library_paths.openapp
Local/Applications/VolumeControl.app/Resources/Info-gnustep.plist
-Local/Applications/VolumeControl.app/Resources/VolumeControl.gorm/objects.gorm
+Local/Applications/VolumeControl.app/Resources/VolumeControl.desktop
Local/Applications/VolumeControl.app/Resources/VolumeControl.gorm/data.classes
Local/Applications/VolumeControl.app/Resources/VolumeControl.gorm/data.info
-Local/Applications/VolumeControl.app/Resources/VolumeControl.desktop
-Local/Applications/VolumeControl.app/Resources/headphones.tiff
+Local/Applications/VolumeControl.app/Resources/VolumeControl.gorm/objects.gorm
Local/Applications/VolumeControl.app/Resources/VolumeControl.rtf
+Local/Applications/VolumeControl.app/Resources/headphones.tiff
+Local/Applications/VolumeControl.app/VolumeControl
Local/Applications/VolumeControl.app/stamp.make
+Local/Tools/VolumeControl
@dirrm Local/Applications/VolumeControl.app/Resources/VolumeControl.gorm
@dirrm Local/Applications/VolumeControl.app/Resources
@dirrm Local/Applications/VolumeControl.app
diff --git a/biology/adun/Makefile b/biology/adun/Makefile
index 7491feeaedac..64a2c35d9d78 100644
--- a/biology/adun/Makefile
+++ b/biology/adun/Makefile
@@ -25,6 +25,10 @@ USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
WRKSRC= ${WRKDIR}/Adun
+MAKE_ENV+= AdunKernel_CURRENT_VERSION_NAME=0
+DEFAULT_LIBVERSION2= 0.0
+PLIST_SUB+= LIBVERSION2=${DEFAULT_LIBVERSION2}
+PLIST_SUB+= MAJORLIBVERSION2=${DEFAULT_LIBVERSION2:C/([0-9]).*/\1/1}
post-patch:
${REINPLACE_CMD} -e 's|include Defs/|-include Defs/|' \
@@ -41,7 +45,7 @@ post-patch:
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 600000
-IGNORE= not enough math funtions
+IGNORE= not enough math functions
.endif
.include <bsd.port.post.mk>
diff --git a/biology/adun/pkg-plist b/biology/adun/pkg-plist
index 948a98f70978..802fdf626b2e 100644
--- a/biology/adun/pkg-plist
+++ b/biology/adun/pkg-plist
@@ -33,75 +33,76 @@ Local/Applications/UL.app/Resources/reload.png
Local/Applications/UL.app/Resources/resultsOptions.plist
Local/Applications/UL.app/Resources/splash.tiff
Local/Applications/UL.app/UL
-Local/Applications/UL.app/library_paths.openapp
Local/Applications/UL.app/stamp.make
+Local/Library/Frameworks/AdunKernel.framework/AdunKernel
Local/Library/Frameworks/AdunKernel.framework/Headers
Local/Library/Frameworks/AdunKernel.framework/Resources
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/AdunKernel
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdCommandInterface.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdController.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdCoreCommand.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdCreation.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdDataSources.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdDelegation.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdEndSimulationCommand.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdFlushEnergiesCommand.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdFrameworkFunctions.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdGridDelegate.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdKeyValueObserving.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdListMemoryManagement.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdReloadCommand.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdServerInterface.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdStatusCommand.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdUpdating.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunBondedTopology.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunBoundaryImplementor.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunController.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunCore.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunDataMatrix.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunDataSet.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunDataSource.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunDefinitions.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunDynamics.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunEnvironment.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunForceField.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunForceFieldManager.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunForceFieldTerm.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunGrid.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunIOManager.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunInteractionSystem.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunKernel.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunLinkedList.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunMemoryManager.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunModelObject.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunNonBondedListHandler.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunNonBondedTopology.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunNonbondedCalculator.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunObject.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunRelationship.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunSimulator.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunState.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunSystem.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunSystemComponent.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunSystemNode.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunTimer.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/CellListHandler.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/EnzymixForceField.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/GRFNonbondedCalculator.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/NewtonianSimulator.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/PureNonBondedCalculator.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/RemoteProcessAccess.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/SCAAS.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/ShiftedNonBondedCalculator.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/SimpleListHandler.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/SphericalBox.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/ULIndexSetConversions.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Resources/Info-gnustep.plist
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Resources/ScriptingInfo.plist
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/libAdunKernel.so
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/libAdunKernel.so.%%MAJORLIBVERSION%%
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/libAdunKernel.so.%%LIBVERSION%%
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/AdunKernel
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdCommandInterface.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdController.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdCoreCommand.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdCreation.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdDataSources.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdDelegation.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdEndSimulationCommand.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdFlushEnergiesCommand.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdFrameworkFunctions.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdGridDelegate.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdKeyValueObserving.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdListMemoryManagement.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdReloadCommand.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdServerInterface.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdStatusCommand.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdUpdating.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunBondedTopology.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunBoundaryImplementor.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunController.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunCore.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunDataMatrix.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunDataSet.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunDataSource.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunDefinitions.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunDynamics.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunEnvironment.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunForceField.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunForceFieldManager.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunForceFieldTerm.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunGrid.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunIOManager.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunInteractionSystem.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunKernel.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunLinkedList.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunMemoryManager.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunModelObject.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunNonBondedListHandler.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunNonBondedTopology.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunNonbondedCalculator.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunObject.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunRelationship.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunSimulator.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunState.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunSystem.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunSystemComponent.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunSystemNode.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunTimer.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/CellListHandler.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/EnzymixForceField.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/GRFNonbondedCalculator.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/NewtonianSimulator.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/PureNonBondedCalculator.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/RemoteProcessAccess.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/SCAAS.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/ShiftedNonBondedCalculator.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/SimpleListHandler.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/SphericalBox.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/ULIndexSetConversions.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Resources/ScriptingInfo.plist
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/libAdunKernel.so
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/libAdunKernel.so.%%MAJORLIBVERSION%%
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/libAdunKernel.so.%%LIBVERSION%%
Local/Library/Frameworks/AdunKernel.framework/Versions/Current
+Local/Library/Frameworks/AdunKernel.framework/libAdunKernel.so
Local/Library/Headers/AdunKernel
Local/Library/Headers/Base/AdForceFieldFunctions.h
Local/Library/Headers/Base/AdLinkedList.h
@@ -186,19 +187,22 @@ Local/Library/Libraries/libadun_base.so.%%LIBVERSION%%
Local/Library/Libraries/libmoltalk.so
Local/Library/Libraries/libmoltalk.so.%%MAJORLIBVERSION%%
Local/Library/Libraries/libmoltalk.so.%%LIBVERSION%%
+Local/Library/Tools/Resources/AdunCore/reloadOptions.plist
Local/Tools/AdunCore
Local/Tools/AdunServer
-Local/Tools/Resources/AdunCore/reloadOptions.plist
-@dirrm Local/Tools/Resources/AdunCore
+Local/Tools/UL
+@dirrm Local/Library/Tools/Resources/AdunCore
+@dirrmtry Local/Library/Tools/Resources
+@dirrmtry Local/Library/Tools
@dirrm Local/Library/Headers/XMLLib
@dirrm Local/Library/Headers/ULFramework
@dirrm Local/Library/Headers/MolTalk
@dirrm Local/Library/Headers/Framework/Protocols
@dirrm Local/Library/Headers/Framework
@dirrm Local/Library/Headers/Base
-@dirrm Local/Library/Frameworks/AdunKernel.framework/Versions/A/Resources
-@dirrm Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers
-@dirrm Local/Library/Frameworks/AdunKernel.framework/Versions/A
+@dirrm Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Resources
+@dirrm Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers
+@dirrm Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%
@dirrm Local/Library/Frameworks/AdunKernel.framework/Versions
@dirrm Local/Library/Frameworks/AdunKernel.framework
@dirrm Local/Applications/UL.app/Resources/UL.gorm
diff --git a/databases/gdl2/pkg-plist b/databases/gdl2/pkg-plist
index f9bfb327fc7b..20bf729fda7d 100644
--- a/databases/gdl2/pkg-plist
+++ b/databases/gdl2/pkg-plist
@@ -1,20 +1,22 @@
Local/Library/Frameworks/Postgres95EOAdaptor.framework/Headers
+Local/Library/Frameworks/Postgres95EOAdaptor.framework/Postgres95EOAdaptor
Local/Library/Frameworks/Postgres95EOAdaptor.framework/Resources
-Local/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/A/Headers/Postgres95Adaptor.h
-Local/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/A/Headers/Postgres95Channel.h
-Local/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/A/Headers/Postgres95Context.h
-Local/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/A/Headers/Postgres95SQLExpression.h
-Local/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/A/Headers/Postgres95Values.h
-Local/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/A/Postgres95EOAdaptor
-Local/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/A/Resources/Info-gnustep.plist
-Local/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/A/Resources/LoginPanel.bundle/LoginPanel
-Local/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/A/Resources/LoginPanel.bundle/Resources/Info-gnustep.plist
-Local/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/A/Resources/LoginPanel.bundle/Resources/postgreslogo.tif
-Local/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/A/Resources/LoginPanel.bundle/stamp.make
-Local/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/A/libPostgres95EOAdaptor.so
-Local/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/A/libPostgres95EOAdaptor.so.%%MAJORVERSION%%
-Local/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/A/libPostgres95EOAdaptor.so.%%VERSION%%
+Local/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/%%MAJORVERSION%%/Headers/Postgres95Adaptor.h
+Local/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/%%MAJORVERSION%%/Headers/Postgres95Channel.h
+Local/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/%%MAJORVERSION%%/Headers/Postgres95Context.h
+Local/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/%%MAJORVERSION%%/Headers/Postgres95SQLExpression.h
+Local/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/%%MAJORVERSION%%/Headers/Postgres95Values.h
+Local/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/%%MAJORVERSION%%/Postgres95EOAdaptor
+Local/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/%%MAJORVERSION%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/%%MAJORVERSION%%/Resources/LoginPanel.bundle/LoginPanel
+Local/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/%%MAJORVERSION%%/Resources/LoginPanel.bundle/Resources/Info-gnustep.plist
+Local/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/%%MAJORVERSION%%/Resources/LoginPanel.bundle/Resources/postgreslogo.tif
+Local/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/%%MAJORVERSION%%/Resources/LoginPanel.bundle/stamp.make
+Local/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/%%MAJORVERSION%%/libPostgres95EOAdaptor.so
+Local/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/%%MAJORVERSION%%/libPostgres95EOAdaptor.so.%%MAJORVERSION%%
+Local/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/%%MAJORVERSION%%/libPostgres95EOAdaptor.so.%%VERSION%%
Local/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/Current
+Local/Library/Frameworks/Postgres95EOAdaptor.framework/libPostgres95EOAdaptor.so
Local/Library/Headers/Postgres95EOAdaptor
Local/Library/Libraries/libPostgres95EOAdaptor.so
Local/Library/Libraries/libPostgres95EOAdaptor.so.%%MAJORVERSION%%
@@ -46,7 +48,6 @@ System/Applications/DBModeler.app/Resources/RelationshipInspector.tiff
System/Applications/DBModeler.app/Resources/SQLGenerator.gorm/data.classes
System/Applications/DBModeler.app/Resources/SQLGenerator.gorm/data.info
System/Applications/DBModeler.app/Resources/SQLGenerator.gorm/objects.gorm
-System/Applications/DBModeler.app/library_paths.openapp
System/Applications/DBModeler.app/stamp.make
System/Library/ApplicationSupport/Palettes/GDL2.palette/GDL2
System/Library/ApplicationSupport/Palettes/GDL2.palette/Resources/GDL2ConnectionInspector.gorm/data.classes
@@ -144,6 +145,7 @@ System/Library/Libraries/libgnustep-db2modeler.so
System/Library/Libraries/libgnustep-db2modeler.so.%%MAJORVERSION%%
System/Library/Libraries/libgnustep-db2modeler.so.%%VERSION%%
System/Library/Makefiles/Auxiliary/gdl2.make
+System/Tools/DBModeler
System/Tools/eoutil
System/Tools/gdlgsdoc
@dirrm System/Library/Headers/EOModeler
@@ -161,10 +163,10 @@ System/Tools/gdlgsdoc
@dirrm System/Applications/DBModeler.app/Resources/AttributeInspector.gorm
@dirrm System/Applications/DBModeler.app/Resources
@dirrm System/Applications/DBModeler.app
-@dirrm Local/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/A/Resources/LoginPanel.bundle/Resources
-@dirrm Local/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/A/Resources/LoginPanel.bundle
-@dirrm Local/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/A/Resources
-@dirrm Local/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/A/Headers
-@dirrm Local/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/A
+@dirrm Local/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/%%MAJORVERSION%%/Resources/LoginPanel.bundle/Resources
+@dirrm Local/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/%%MAJORVERSION%%/Resources/LoginPanel.bundle
+@dirrm Local/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/%%MAJORVERSION%%/Resources
+@dirrm Local/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/%%MAJORVERSION%%/Headers
+@dirrm Local/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/%%MAJORVERSION%%
@dirrm Local/Library/Frameworks/Postgres95EOAdaptor.framework/Versions
@dirrm Local/Library/Frameworks/Postgres95EOAdaptor.framework
diff --git a/deskutils/charmap/pkg-plist b/deskutils/charmap/pkg-plist
index 0825056bc95c..2260db80268a 100644
--- a/deskutils/charmap/pkg-plist
+++ b/deskutils/charmap/pkg-plist
@@ -1,13 +1,13 @@
Local/Applications/Charmap.app/Charmap
-Local/Applications/Charmap.app/library_paths.openapp
-Local/Applications/Charmap.app/Resources/Info-gnustep.plist
-Local/Applications/Charmap.app/Resources/CharmapInfo.plist
Local/Applications/Charmap.app/Resources/Charmap.desktop
-Local/Applications/Charmap.app/Resources/UnicodeData.txt
-Local/Applications/Charmap.app/Resources/Charmap.png
Local/Applications/Charmap.app/Resources/Charmap.gorm/data.classes
Local/Applications/Charmap.app/Resources/Charmap.gorm/objects.gorm
+Local/Applications/Charmap.app/Resources/Charmap.png
+Local/Applications/Charmap.app/Resources/CharmapInfo.plist
+Local/Applications/Charmap.app/Resources/Info-gnustep.plist
+Local/Applications/Charmap.app/Resources/UnicodeData.txt
Local/Applications/Charmap.app/stamp.make
+Local/Tools/Charmap
@dirrm Local/Applications/Charmap.app/Resources/Charmap.gorm
@dirrm Local/Applications/Charmap.app/Resources
@dirrm Local/Applications/Charmap.app
diff --git a/deskutils/etoile-dictionaryreader/pkg-plist b/deskutils/etoile-dictionaryreader/pkg-plist
index 9133f2142d5e..a1a5aebe72ec 100644
--- a/deskutils/etoile-dictionaryreader/pkg-plist
+++ b/deskutils/etoile-dictionaryreader/pkg-plist
@@ -22,8 +22,8 @@ Local/Applications/DictionaryReader.app/Resources/Info-gnustep.plist
Local/Applications/DictionaryReader.app/Resources/dict.png
Local/Applications/DictionaryReader.app/Resources/jargon.dict
Local/Applications/DictionaryReader.app/Resources/jargon.index
-Local/Applications/DictionaryReader.app/library_paths.openapp
Local/Applications/DictionaryReader.app/stamp.make
+Local/Tools/DictionaryReader
@dirrm Local/Applications/DictionaryReader.app/Resources/English.lproj/Preferences.nib/Preferences.nib
@dirrm Local/Applications/DictionaryReader.app/Resources/English.lproj/Preferences.nib
@dirrm Local/Applications/DictionaryReader.app/Resources/English.lproj/Preferences.gorm
diff --git a/editors/textedit.app/Makefile b/editors/textedit.app/Makefile
index 07e97cd495f6..5ca948162694 100644
--- a/editors/textedit.app/Makefile
+++ b/editors/textedit.app/Makefile
@@ -22,6 +22,7 @@ USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
WRKSRC= ${WRKDIR}/textedit-${PORTVERSION}
+MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
.include <bsd.port.pre.mk>
diff --git a/editors/textedit.app/pkg-plist b/editors/textedit.app/pkg-plist
index 99dda3035241..a50506712309 100644
--- a/editors/textedit.app/pkg-plist
+++ b/editors/textedit.app/pkg-plist
@@ -23,8 +23,8 @@ System/Applications/TextEdit.app/Resources/rtf.tiff
System/Applications/TextEdit.app/Resources/rtfd.tiff
System/Applications/TextEdit.app/Resources/text.tiff
System/Applications/TextEdit.app/TextEdit
-System/Applications/TextEdit.app/library_paths.openapp
System/Applications/TextEdit.app/stamp.make
+System/Tools/TextEdit
@dirrm System/Applications/TextEdit.app/Resources/Russian.lproj
@dirrm System/Applications/TextEdit.app/Resources/German.lproj
@dirrm System/Applications/TextEdit.app/Resources/English.lproj/Preferences.gorm
diff --git a/games/gnustep-ladder/pkg-plist b/games/gnustep-ladder/pkg-plist
index c492ec5acddf..8c78e1efedfa 100644
--- a/games/gnustep-ladder/pkg-plist
+++ b/games/gnustep-ladder/pkg-plist
@@ -1,25 +1,25 @@
Local/Applications/Ladder.app/Ladder
-Local/Applications/Ladder.app/library_paths.openapp
-Local/Applications/Ladder.app/Resources/Info-gnustep.plist
-Local/Applications/Ladder.app/Resources/Ladder.gorm/data.info
-Local/Applications/Ladder.app/Resources/Ladder.gorm/data.classes
-Local/Applications/Ladder.app/Resources/Ladder.gorm/objects.gorm
-Local/Applications/Ladder.app/Resources/Ladder.gorm/bigladder.png
-Local/Applications/Ladder.app/Resources/Ladder.desktop
-Local/Applications/Ladder.app/Resources/Clock.gorm/data.info
+Local/Applications/Ladder.app/Resources/COPYING.GPL
Local/Applications/Ladder.app/Resources/Clock.gorm/data.classes
+Local/Applications/Ladder.app/Resources/Clock.gorm/data.info
Local/Applications/Ladder.app/Resources/Clock.gorm/objects.gorm
-Local/Applications/Ladder.app/Resources/GoDocument.gorm/data.info
Local/Applications/Ladder.app/Resources/GoDocument.gorm/data.classes
+Local/Applications/Ladder.app/Resources/GoDocument.gorm/data.info
Local/Applications/Ladder.app/Resources/GoDocument.gorm/objects.gorm
+Local/Applications/Ladder.app/Resources/Info-gnustep.plist
+Local/Applications/Ladder.app/Resources/Ladder.desktop
+Local/Applications/Ladder.app/Resources/Ladder.gorm/bigladder.png
+Local/Applications/Ladder.app/Resources/Ladder.gorm/data.classes
+Local/Applications/Ladder.app/Resources/Ladder.gorm/data.info
+Local/Applications/Ladder.app/Resources/Ladder.gorm/objects.gorm
Local/Applications/Ladder.app/Resources/Ladder.tiff
Local/Applications/Ladder.app/Resources/LadderInfo.plist
-Local/Applications/Ladder.app/Resources/wood.jpg
-Local/Applications/Ladder.app/Resources/man_icon.png
Local/Applications/Ladder.app/Resources/machine_icon.png
+Local/Applications/Ladder.app/Resources/man_icon.png
Local/Applications/Ladder.app/Resources/network_icon.png
-Local/Applications/Ladder.app/Resources/COPYING.GPL
+Local/Applications/Ladder.app/Resources/wood.jpg
Local/Applications/Ladder.app/stamp.make
+Local/Tools/Ladder
@dirrm Local/Applications/Ladder.app/Resources/Ladder.gorm
@dirrm Local/Applications/Ladder.app/Resources/Clock.gorm
@dirrm Local/Applications/Ladder.app/Resources/GoDocument.gorm
diff --git a/games/gridlock/pkg-plist b/games/gridlock/pkg-plist
index 86f2e06dfb7a..b8f8d0ba7ed4 100644
--- a/games/gridlock/pkg-plist
+++ b/games/gridlock/pkg-plist
@@ -25,8 +25,8 @@ Local/Applications/Gridlock.app/Resources/readme.html
Local/Applications/Gridlock.app/Resources/red.tiff
Local/Applications/Gridlock.app/Resources/wall.tiff
Local/Applications/Gridlock.app/Resources/yellow.tiff
-Local/Applications/Gridlock.app/library_paths.openapp
Local/Applications/Gridlock.app/stamp.make
+Local/Tools/Gridlock
@dirrm Local/Applications/Gridlock.app/Resources/ServerWindow.gorm
@dirrm Local/Applications/Gridlock.app/Resources/PrefsWindow.gorm
@dirrm Local/Applications/Gridlock.app/Resources/Gridlock.gorm
diff --git a/games/lapispuzzle/pkg-plist b/games/lapispuzzle/pkg-plist
index 5bcf8f6edbcb..be1ac1e841d2 100644
--- a/games/lapispuzzle/pkg-plist
+++ b/games/lapispuzzle/pkg-plist
@@ -1,12 +1,12 @@
Local/Applications/LapisPuzzle.app/LapisPuzzle
-Local/Applications/LapisPuzzle.app/library_paths.openapp
Local/Applications/LapisPuzzle.app/Resources/Info-gnustep.plist
+Local/Applications/LapisPuzzle.app/Resources/LapisPuzzle.desktop
Local/Applications/LapisPuzzle.app/Resources/LapisPuzzle.gorm/data.classes
Local/Applications/LapisPuzzle.app/Resources/LapisPuzzle.gorm/objects.gorm
-Local/Applications/LapisPuzzle.app/Resources/LapisPuzzle.desktop
Local/Applications/LapisPuzzle.app/Resources/LapisPuzzle.tiff
Local/Applications/LapisPuzzle.app/Resources/LapisPuzzleInfo.plist
Local/Applications/LapisPuzzle.app/stamp.make
+Local/Tools/LapisPuzzle
@dirrm Local/Applications/LapisPuzzle.app/Resources/LapisPuzzle.gorm
@dirrm Local/Applications/LapisPuzzle.app/Resources
@dirrm Local/Applications/LapisPuzzle.app
diff --git a/games/stepbill/pkg-plist b/games/stepbill/pkg-plist
index e54a403a11c3..ab5cbf7158fc 100644
--- a/games/stepbill/pkg-plist
+++ b/games/stepbill/pkg-plist
@@ -1,76 +1,76 @@
-Local/Applications/StepBill.app/StepBill
-Local/Applications/StepBill.app/library_paths.openapp
-Local/Applications/StepBill.app/Resources/Info-gnustep.plist
+Local/Applications/StepBill.app/Resources/Bulgarian.lproj/Localizable.strings
+Local/Applications/StepBill.app/Resources/Bulgarian.lproj/StepBill.gorm/data.classes
+Local/Applications/StepBill.app/Resources/Bulgarian.lproj/StepBill.gorm/data.info
+Local/Applications/StepBill.app/Resources/Bulgarian.lproj/StepBill.gorm/objects.gorm
+Local/Applications/StepBill.app/Resources/Bulgarian.lproj/rules.txt
+Local/Applications/StepBill.app/Resources/Bulgarian.lproj/story.txt
Local/Applications/StepBill.app/Resources/Defaults.plist
+Local/Applications/StepBill.app/Resources/English.lproj/Localizable.strings
+Local/Applications/StepBill.app/Resources/English.lproj/StepBill.gorm/data.classes
+Local/Applications/StepBill.app/Resources/English.lproj/StepBill.gorm/objects.gorm
+Local/Applications/StepBill.app/Resources/English.lproj/rules.txt
+Local/Applications/StepBill.app/Resources/English.lproj/story.txt
+Local/Applications/StepBill.app/Resources/Info-gnustep.plist
+Local/Applications/StepBill.app/Resources/Japanese.lproj/Localizable.strings
Local/Applications/StepBill.app/Resources/StepBill.desktop
Local/Applications/StepBill.app/Resources/about.tiff
-Local/Applications/StepBill.app/Resources/billD_3.tiff
-Local/Applications/StepBill.app/Resources/maccpu.tiff
Local/Applications/StepBill.app/Resources/apple.tiff
-Local/Applications/StepBill.app/Resources/billD_4.tiff
-Local/Applications/StepBill.app/Resources/nextcpu.tiff
Local/Applications/StepBill.app/Resources/billA_0.tiff
-Local/Applications/StepBill.app/Resources/billL_0.tiff
-Local/Applications/StepBill.app/Resources/next.tiff
+Local/Applications/StepBill.app/Resources/billA_1.tiff
Local/Applications/StepBill.app/Resources/billA_10.tiff
-Local/Applications/StepBill.app/Resources/billL_1.tiff
-Local/Applications/StepBill.app/Resources/os2cpu.tiff
Local/Applications/StepBill.app/Resources/billA_11.tiff
-Local/Applications/StepBill.app/Resources/billL_2.tiff
-Local/Applications/StepBill.app/Resources/os2.tiff
Local/Applications/StepBill.app/Resources/billA_12.tiff
-Local/Applications/StepBill.app/Resources/billR_0.tiff
-Local/Applications/StepBill.app/Resources/palmcpu.tiff
-Local/Applications/StepBill.app/Resources/billA_1.tiff
-Local/Applications/StepBill.app/Resources/billR_1.tiff
-Local/Applications/StepBill.app/Resources/palm.tiff
Local/Applications/StepBill.app/Resources/billA_2.tiff
-Local/Applications/StepBill.app/Resources/billR_2.tiff
-Local/Applications/StepBill.app/Resources/redhat.tiff
Local/Applications/StepBill.app/Resources/billA_3.tiff
-Local/Applications/StepBill.app/Resources/bsdcpu.tiff
-Local/Applications/StepBill.app/Resources/sgicpu.tiff
Local/Applications/StepBill.app/Resources/billA_4.tiff
-Local/Applications/StepBill.app/Resources/bsd.tiff
-Local/Applications/StepBill.app/Resources/sgi.tiff
Local/Applications/StepBill.app/Resources/billA_5.tiff
-Local/Applications/StepBill.app/Resources/bucket.tiff
-Local/Applications/StepBill.app/Resources/spark_0.tiff
Local/Applications/StepBill.app/Resources/billA_6.tiff
-Local/Applications/StepBill.app/Resources/hand_down.tiff
-Local/Applications/StepBill.app/Resources/spark_1.tiff
Local/Applications/StepBill.app/Resources/billA_7.tiff
-Local/Applications/StepBill.app/Resources/hand_up.tiff
-Local/Applications/StepBill.app/Resources/suncpu.tiff
Local/Applications/StepBill.app/Resources/billA_8.tiff
-Local/Applications/StepBill.app/Resources/hurd.tiff
-Local/Applications/StepBill.app/Resources/sun.tiff
Local/Applications/StepBill.app/Resources/billA_9.tiff
-Local/Applications/StepBill.app/Resources/icon_orig.tiff
-Local/Applications/StepBill.app/Resources/toaster.tiff
Local/Applications/StepBill.app/Resources/billD_0.tiff
-Local/Applications/StepBill.app/Resources/icon.tiff
-Local/Applications/StepBill.app/Resources/wingdows.tiff
Local/Applications/StepBill.app/Resources/billD_1.tiff
-Local/Applications/StepBill.app/Resources/linux.tiff
Local/Applications/StepBill.app/Resources/billD_2.tiff
+Local/Applications/StepBill.app/Resources/billD_3.tiff
+Local/Applications/StepBill.app/Resources/billD_4.tiff
+Local/Applications/StepBill.app/Resources/billL_0.tiff
+Local/Applications/StepBill.app/Resources/billL_1.tiff
+Local/Applications/StepBill.app/Resources/billL_2.tiff
+Local/Applications/StepBill.app/Resources/billR_0.tiff
+Local/Applications/StepBill.app/Resources/billR_1.tiff
+Local/Applications/StepBill.app/Resources/billR_2.tiff
+Local/Applications/StepBill.app/Resources/bsd.tiff
+Local/Applications/StepBill.app/Resources/bsdcpu.tiff
+Local/Applications/StepBill.app/Resources/bucket.tiff
+Local/Applications/StepBill.app/Resources/hand_down.tiff
+Local/Applications/StepBill.app/Resources/hand_up.tiff
+Local/Applications/StepBill.app/Resources/hurd.tiff
+Local/Applications/StepBill.app/Resources/icon.tiff
+Local/Applications/StepBill.app/Resources/icon_orig.tiff
+Local/Applications/StepBill.app/Resources/linux.tiff
Local/Applications/StepBill.app/Resources/logo.tiff
-Local/Applications/StepBill.app/Resources/English.lproj/StepBill.gorm/data.classes
-Local/Applications/StepBill.app/Resources/English.lproj/StepBill.gorm/objects.gorm
-Local/Applications/StepBill.app/Resources/English.lproj/Localizable.strings
-Local/Applications/StepBill.app/Resources/English.lproj/story.txt
-Local/Applications/StepBill.app/Resources/English.lproj/rules.txt
-Local/Applications/StepBill.app/Resources/Japanese.lproj/Localizable.strings
-Local/Applications/StepBill.app/Resources/Bulgarian.lproj/StepBill.gorm/data.info
-Local/Applications/StepBill.app/Resources/Bulgarian.lproj/StepBill.gorm/data.classes
-Local/Applications/StepBill.app/Resources/Bulgarian.lproj/StepBill.gorm/objects.gorm
-Local/Applications/StepBill.app/Resources/Bulgarian.lproj/Localizable.strings
-Local/Applications/StepBill.app/Resources/Bulgarian.lproj/story.txt
-Local/Applications/StepBill.app/Resources/Bulgarian.lproj/rules.txt
+Local/Applications/StepBill.app/Resources/maccpu.tiff
+Local/Applications/StepBill.app/Resources/next.tiff
+Local/Applications/StepBill.app/Resources/nextcpu.tiff
+Local/Applications/StepBill.app/Resources/os2.tiff
+Local/Applications/StepBill.app/Resources/os2cpu.tiff
+Local/Applications/StepBill.app/Resources/palm.tiff
+Local/Applications/StepBill.app/Resources/palmcpu.tiff
+Local/Applications/StepBill.app/Resources/redhat.tiff
+Local/Applications/StepBill.app/Resources/sgi.tiff
+Local/Applications/StepBill.app/Resources/sgicpu.tiff
+Local/Applications/StepBill.app/Resources/spark_0.tiff
+Local/Applications/StepBill.app/Resources/spark_1.tiff
+Local/Applications/StepBill.app/Resources/sun.tiff
+Local/Applications/StepBill.app/Resources/suncpu.tiff
+Local/Applications/StepBill.app/Resources/toaster.tiff
+Local/Applications/StepBill.app/Resources/wingdows.tiff
+Local/Applications/StepBill.app/StepBill
Local/Applications/StepBill.app/stamp.make
+Local/Tools/StepBill
+@dirrm Local/Applications/StepBill.app/Resources/Japanese.lproj
@dirrm Local/Applications/StepBill.app/Resources/English.lproj/StepBill.gorm
@dirrm Local/Applications/StepBill.app/Resources/English.lproj
-@dirrm Local/Applications/StepBill.app/Resources/Japanese.lproj
@dirrm Local/Applications/StepBill.app/Resources/Bulgarian.lproj/StepBill.gorm
@dirrm Local/Applications/StepBill.app/Resources/Bulgarian.lproj
@dirrm Local/Applications/StepBill.app/Resources
diff --git a/graphics/camera/pkg-plist b/graphics/camera/pkg-plist
index a71e40a40c28..162b7f5f59d6 100644
--- a/graphics/camera/pkg-plist
+++ b/graphics/camera/pkg-plist
@@ -1,13 +1,13 @@
Local/Applications/Camera.app/Camera
-Local/Applications/Camera.app/library_paths.openapp
-Local/Applications/Camera.app/Resources/Info-gnustep.plist
+Local/Applications/Camera.app/Resources/Camera.desktop
Local/Applications/Camera.app/Resources/Camera.gorm/data.classes
Local/Applications/Camera.app/Resources/Camera.gorm/objects.gorm
-Local/Applications/Camera.app/Resources/Camera.desktop
-Local/Applications/Camera.app/Resources/CameraInfo.plist
Local/Applications/Camera.app/Resources/Camera.png
+Local/Applications/Camera.app/Resources/CameraInfo.plist
+Local/Applications/Camera.app/Resources/Info-gnustep.plist
Local/Applications/Camera.app/Resources/no_thumbnail.jpg
Local/Applications/Camera.app/stamp.make
+Local/Tools/Camera
@dirrm Local/Applications/Camera.app/Resources/Camera.gorm
@dirrm Local/Applications/Camera.app/Resources
@dirrm Local/Applications/Camera.app
diff --git a/graphics/photoclip/pkg-plist b/graphics/photoclip/pkg-plist
index 973833c3eb4a..7b38ac079392 100644
--- a/graphics/photoclip/pkg-plist
+++ b/graphics/photoclip/pkg-plist
@@ -1,10 +1,10 @@
Local/Applications/PhotoClip.app/PhotoClip
Local/Applications/PhotoClip.app/Resources/Info-gnustep.plist
-Local/Applications/PhotoClip.app/Resources/PhotoClip.tiff
-Local/Applications/PhotoClip.app/Resources/PhotoClip.desktop
Local/Applications/PhotoClip.app/Resources/KeyBindings.dict
+Local/Applications/PhotoClip.app/Resources/PhotoClip.desktop
+Local/Applications/PhotoClip.app/Resources/PhotoClip.tiff
Local/Applications/PhotoClip.app/Resources/sample.jpg
-Local/Applications/PhotoClip.app/library_paths.openapp
Local/Applications/PhotoClip.app/stamp.make
+Local/Tools/PhotoClip
@dirrm Local/Applications/PhotoClip.app/Resources
@dirrm Local/Applications/PhotoClip.app
diff --git a/graphics/price/pkg-plist b/graphics/price/pkg-plist
index 4afb17eca37c..95e91b440a3b 100644
--- a/graphics/price/pkg-plist
+++ b/graphics/price/pkg-plist
@@ -43,8 +43,8 @@ Local/Applications/PRICE.app/Resources/TraceEdges.gorm/data.classes
Local/Applications/PRICE.app/Resources/TraceEdges.gorm/data.info
Local/Applications/PRICE.app/Resources/TraceEdges.gorm/objects.gorm
Local/Applications/PRICE.app/Resources/price-icon-os.tiff
-Local/Applications/PRICE.app/library_paths.openapp
Local/Applications/PRICE.app/stamp.make
+Local/Tools/PRICE
@dirrm Local/Applications/PRICE.app/Resources/TraceEdges.gorm
@dirrm Local/Applications/PRICE.app/Resources/Scale.gorm
@dirrm Local/Applications/PRICE.app/Resources/ProgressPanel.gorm
diff --git a/irc/talksoup/Makefile b/irc/talksoup/Makefile
index 53cb1f178818..286535933ad0 100644
--- a/irc/talksoup/Makefile
+++ b/irc/talksoup/Makefile
@@ -25,6 +25,7 @@ USE_GNUSTEP_LOCAL_LIBS+= netclasses:${NETCLASSES_PORT}
USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
WRKSRC= ${WRKDIR}/${DISTNAME}
+MAKE_ENV+= GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT}
PLIST_SUB+= APPVERSION=0.990
NETCLASSES_PORT?= net/netclasses
diff --git a/irc/talksoup/pkg-plist b/irc/talksoup/pkg-plist
index d4e9eee6a89d..867152ee3819 100644
--- a/irc/talksoup/pkg-plist
+++ b/irc/talksoup/pkg-plist
@@ -4,7 +4,6 @@ Local/Applications/TalkSoup.app/Resources/TalkSoup.desktop
Local/Applications/TalkSoup.app/Resources/TalkSoup.icns
Local/Applications/TalkSoup.app/Resources/TalkSoup.tiff
Local/Applications/TalkSoup.app/TalkSoup
-Local/Applications/TalkSoup.app/library_paths.openapp
Local/Applications/TalkSoup.app/stamp.make
Local/Library/ApplicationSupport/TalkSoup/InFilters/DCCSupport/DCCSupport
Local/Library/ApplicationSupport/TalkSoup/InFilters/DCCSupport/Resources/Defaults.plist
@@ -147,6 +146,7 @@ Local/Library/ApplicationSupport/TalkSoup/Output/GNUstepOutput/Resources/general
Local/Library/ApplicationSupport/TalkSoup/Output/GNUstepOutput/stamp.make
Local/Library/Frameworks/TalkSoupBundles.framework/Headers
Local/Library/Frameworks/TalkSoupBundles.framework/Resources
+Local/Library/Frameworks/TalkSoupBundles.framework/TalkSoupBundles
Local/Library/Frameworks/TalkSoupBundles.framework/Versions/%%APPVERSION%%/Headers/Encodings.h
Local/Library/Frameworks/TalkSoupBundles.framework/Versions/%%APPVERSION%%/Headers/TalkSoup.h
Local/Library/Frameworks/TalkSoupBundles.framework/Versions/%%APPVERSION%%/Headers/TalkSoupMisc.h
@@ -158,10 +158,12 @@ Local/Library/Frameworks/TalkSoupBundles.framework/Versions/%%APPVERSION%%/libTa
Local/Library/Frameworks/TalkSoupBundles.framework/Versions/%%APPVERSION%%/libTalkSoupBundles.so.%%MAJORLIBVERSION%%
Local/Library/Frameworks/TalkSoupBundles.framework/Versions/%%APPVERSION%%/libTalkSoupBundles.so.%%LIBVERSION%%
Local/Library/Frameworks/TalkSoupBundles.framework/Versions/Current
+Local/Library/Frameworks/TalkSoupBundles.framework/libTalkSoupBundles.so
Local/Library/Headers/TalkSoupBundles
Local/Library/Libraries/libTalkSoupBundles.so
Local/Library/Libraries/libTalkSoupBundles.so.%%MAJORLIBVERSION%%
Local/Library/Libraries/libTalkSoupBundles.so.%%LIBVERSION%%
+Local/Tools/TalkSoup
@dirrm Local/Library/Frameworks/TalkSoupBundles.framework/Versions/%%APPVERSION%%/Resources/English.lproj
@dirrm Local/Library/Frameworks/TalkSoupBundles.framework/Versions/%%APPVERSION%%/Resources
@dirrm Local/Library/Frameworks/TalkSoupBundles.framework/Versions/%%APPVERSION%%/Headers
diff --git a/japanese/jishyo/pkg-plist b/japanese/jishyo/pkg-plist
index 454e4601aa7c..169c2bff990f 100644
--- a/japanese/jishyo/pkg-plist
+++ b/japanese/jishyo/pkg-plist
@@ -15,8 +15,8 @@ Local/Applications/Jishyo.app/Resources/Thai.lproj/Localizable.strings
Local/Applications/Jishyo.app/Resources/Thai.lproj/Localizable.strings~
Local/Applications/Jishyo.app/Resources/edict
Local/Applications/Jishyo.app/Resources/edict.xjdx
-Local/Applications/Jishyo.app/library_paths.openapp
Local/Applications/Jishyo.app/stamp.make
+Local/Tools/Jishyo
@dirrm Local/Applications/Jishyo.app/Resources/Thai.lproj
@dirrm Local/Applications/Jishyo.app/Resources/Japanese.lproj
@dirrm Local/Applications/Jishyo.app/Resources/English.lproj/Jishyo.gorm
diff --git a/math/edenmath/pkg-plist b/math/edenmath/pkg-plist
index fad077ce58fc..793b52ecf71f 100644
--- a/math/edenmath/pkg-plist
+++ b/math/edenmath/pkg-plist
@@ -14,8 +14,8 @@ Local/Applications/EdenMath.app/Resources/English.lproj/MainMenu.gorm/ex.tiff
Local/Applications/EdenMath.app/Resources/English.lproj/MainMenu.gorm/objects.gorm
Local/Applications/EdenMath.app/Resources/English.lproj/MainMenu.gorm/xy.tiff
Local/Applications/EdenMath.app/Resources/Info-gnustep.plist
-Local/Applications/EdenMath.app/library_paths.openapp
Local/Applications/EdenMath.app/stamp.make
+Local/Tools/EdenMath
@dirrm Local/Applications/EdenMath.app/Resources/English.lproj/MainMenu.gorm
@dirrm Local/Applications/EdenMath.app/Resources/English.lproj
@dirrm Local/Applications/EdenMath.app/Resources/Bulgarian.lproj/MainMenu.gorm
diff --git a/math/stepulator/pkg-plist b/math/stepulator/pkg-plist
index 760fcc3c7ac2..9c3a37c6933c 100644
--- a/math/stepulator/pkg-plist
+++ b/math/stepulator/pkg-plist
@@ -4,8 +4,8 @@ Local/Applications/Stepulator.app/Resources/Stepulator.gorm/data.classes
Local/Applications/Stepulator.app/Resources/Stepulator.gorm/objects.gorm
Local/Applications/Stepulator.app/Resources/StepulatorInfo.plist
Local/Applications/Stepulator.app/Stepulator
-Local/Applications/Stepulator.app/library_paths.openapp
Local/Applications/Stepulator.app/stamp.make
+Local/Tools/Stepulator
@dirrm Local/Applications/Stepulator.app/Resources/Stepulator.gorm
@dirrm Local/Applications/Stepulator.app/Resources
@dirrm Local/Applications/Stepulator.app
diff --git a/net-im/grouch/pkg-plist b/net-im/grouch/pkg-plist
index 6eb0feca2877..076f3fc98b60 100644
--- a/net-im/grouch/pkg-plist
+++ b/net-im/grouch/pkg-plist
@@ -32,7 +32,6 @@ Local/Applications/Grouch.app/Resources/SetAwayMessage.gsmarkup
Local/Applications/Grouch.app/Resources/SetProfile.gsmarkup
Local/Applications/Grouch.app/Resources/StatusWindow.gsmarkup
Local/Applications/Grouch.app/Resources/UserChooser.gsmarkup
-Local/Applications/Grouch.app/library_paths.openapp
Local/Applications/Grouch.app/stamp.make
Local/Library/Bundles/Oscar.bundle/Oscar
Local/Library/Bundles/Oscar.bundle/Resources/English.lproj/Localizable.strings
@@ -54,6 +53,7 @@ Local/Library/Headers/Grouch/NSBundle+Grouch.h
Local/Library/Libraries/libGrouchCore.so
Local/Library/Libraries/libGrouchCore.so.%%LIBVERSION%%
Local/Library/Libraries/libGrouchCore.so.%%MAJORLIBVERSION%%
+Local/Tools/Grouch
@dirrm Local/Library/Headers/Grouch
@dirrm Local/Library/Bundles/Oscar.bundle/Resources/English.lproj
@dirrm Local/Library/Bundles/Oscar.bundle/Resources
diff --git a/net/netclasses/pkg-plist b/net/netclasses/pkg-plist
index fe3170fff06f..3c79ec63028c 100644
--- a/net/netclasses/pkg-plist
+++ b/net/netclasses/pkg-plist
@@ -10,6 +10,8 @@ Local/Library/Frameworks/netclasses.framework/Versions/%%VERSION%%/libnetclasses
Local/Library/Frameworks/netclasses.framework/Versions/%%VERSION%%/libnetclasses.so.%%LIBVERSION%%
Local/Library/Frameworks/netclasses.framework/Versions/%%VERSION%%/netclasses
Local/Library/Frameworks/netclasses.framework/Versions/Current
+Local/Library/Frameworks/netclasses.framework/libnetclasses.so
+Local/Library/Frameworks/netclasses.framework/netclasses
Local/Library/Headers/netclasses
Local/Library/Libraries/libnetclasses.so
Local/Library/Libraries/libnetclasses.so.%%MAJORLIBVERSION%%
diff --git a/science/gtamsanalyzer/Makefile b/science/gtamsanalyzer/Makefile
index 682755aa82e2..88bc7fb278bf 100644
--- a/science/gtamsanalyzer/Makefile
+++ b/science/gtamsanalyzer/Makefile
@@ -24,4 +24,7 @@ USE_GNUSTEP_INSTALL= yes
WRKSRC= ${WRKDIR}/${DISTNAME}/Source
+post-patch:
+ ${RM} "${WRKSRC}/obj"
+
.include <bsd.port.mk>
diff --git a/science/gtamsanalyzer/pkg-plist b/science/gtamsanalyzer/pkg-plist
index 590643c34a18..b7291dc33f7b 100644
--- a/science/gtamsanalyzer/pkg-plist
+++ b/science/gtamsanalyzer/pkg-plist
@@ -96,8 +96,8 @@ Local/Applications/GTAMSAnalyzer.app/Resources/txt2Button.tif
Local/Applications/GTAMSAnalyzer.app/Resources/unmarkRec.tif
Local/Applications/GTAMSAnalyzer.app/Resources/unmarkRec2.tif
Local/Applications/GTAMSAnalyzer.app/Resources/wbicn.tif
-Local/Applications/GTAMSAnalyzer.app/library_paths.openapp
Local/Applications/GTAMSAnalyzer.app/stamp.make
+Local/Tools/GTAMSAnalyzer
@dirrm Local/Applications/GTAMSAnalyzer.app/Resources/preference.gorm
@dirrm Local/Applications/GTAMSAnalyzer.app/Resources/myProject.gorm
@dirrm Local/Applications/GTAMSAnalyzer.app/Resources/myPanedResults.gorm
diff --git a/science/paje/pkg-plist b/science/paje/pkg-plist
index aff69ce2eb65..da54b5e2541d 100644
--- a/science/paje/pkg-plist
+++ b/science/paje/pkg-plist
@@ -11,7 +11,6 @@ Local/Applications/Paje.app/Resources/distant.tiff
Local/Applications/Paje.app/Resources/near.tiff
Local/Applications/Paje.app/Resources/toselection.tiff
Local/Applications/Paje.app/Resources/traceFilePaje.tiff
-Local/Applications/Paje.app/library_paths.openapp
Local/Applications/Paje.app/stamp.make
Local/Library/Bundles/Paje/ContainerFilter.bundle/ContainerFilter
Local/Library/Bundles/Paje/ContainerFilter.bundle/Resources/ContainerSelector.gorm/data.classes
@@ -146,6 +145,7 @@ Local/Library/Headers/StorageController/AnchorFilter.h
Local/Library/Headers/StorageController/Encapsulate.h
Local/Library/Headers/StorageController/EventAggregator.h
Local/Library/Headers/StorageController/StateAggregator.h
+Local/Tools/Paje
@dirrm Local/Library/Headers/StorageController
@dirrm Local/Library/Headers/StatViewer
@dirrm Local/Library/Headers/SpaceTimeViewer
diff --git a/sysutils/timemon/pkg-plist b/sysutils/timemon/pkg-plist
index d0bd184f2930..07a812bbbde9 100644
--- a/sysutils/timemon/pkg-plist
+++ b/sysutils/timemon/pkg-plist
@@ -8,8 +8,8 @@ System/Applications/TimeMon.app/Resources/TimeMon.gorm/objects.gorm
System/Applications/TimeMon.app/Resources/TimeMon.tiff
System/Applications/TimeMon.app/Resources/TimeMonP.tiff
System/Applications/TimeMon.app/TimeMon
-System/Applications/TimeMon.app/library_paths.openapp
System/Applications/TimeMon.app/stamp.make
+System/Tools/TimeMon
@dirrm System/Applications/TimeMon.app/Resources/TimeMon.gorm
@dirrm System/Applications/TimeMon.app/Resources
@dirrm System/Applications/TimeMon.app
diff --git a/textproc/duncan/pkg-plist b/textproc/duncan/pkg-plist
index 125df83f2dcb..80c7eea1601a 100644
--- a/textproc/duncan/pkg-plist
+++ b/textproc/duncan/pkg-plist
@@ -18,8 +18,8 @@ Local/Applications/Duncan.app/Resources/Thai.lproj/MainMenu.gorm/Forward.tiff
Local/Applications/Duncan.app/Resources/Thai.lproj/MainMenu.gorm/MagnifyingGlass.tiff
Local/Applications/Duncan.app/Resources/Thai.lproj/MainMenu.gorm/data.classes
Local/Applications/Duncan.app/Resources/Thai.lproj/MainMenu.gorm/objects.gorm
-Local/Applications/Duncan.app/library_paths.openapp
Local/Applications/Duncan.app/stamp.make
+Local/Tools/Duncan
@dirrm Local/Applications/Duncan.app/Resources/Thai.lproj/MainMenu.gorm
@dirrm Local/Applications/Duncan.app/Resources/Thai.lproj
@dirrm Local/Applications/Duncan.app/Resources/English.lproj/MainMenu.gorm
diff --git a/x11-clocks/aclock/pkg-plist b/x11-clocks/aclock/pkg-plist
index 6c62f75fd1f6..3870bd463537 100644
--- a/x11-clocks/aclock/pkg-plist
+++ b/x11-clocks/aclock/pkg-plist
@@ -1,11 +1,11 @@
Local/Applications/AClock.app/AClock
-Local/Applications/AClock.app/Resources/Info-gnustep.plist
+Local/Applications/AClock.app/Resources/AClock.desktop
Local/Applications/AClock.app/Resources/AClock.gorm/data.classes
Local/Applications/AClock.app/Resources/AClock.gorm/objects.gorm
-Local/Applications/AClock.app/Resources/AClock.desktop
Local/Applications/AClock.app/Resources/AClock.tiff
-Local/Applications/AClock.app/library_paths.openapp
+Local/Applications/AClock.app/Resources/Info-gnustep.plist
Local/Applications/AClock.app/stamp.make
+Local/Tools/AClock
@dirrm Local/Applications/AClock.app/Resources/AClock.gorm
@dirrm Local/Applications/AClock.app/Resources
@dirrm Local/Applications/AClock.app
diff --git a/x11-toolkits/renaissance/Makefile b/x11-toolkits/renaissance/Makefile
index c91397aa3459..679a8c717cfe 100644
--- a/x11-toolkits/renaissance/Makefile
+++ b/x11-toolkits/renaissance/Makefile
@@ -25,4 +25,8 @@ USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES}
WRKSRC= ${WRKDIR}/${DISTNAME}
+post-patch:
+ ${ECHO_CMD} "GNUSTEP_INSTALLATION_DOMAIN=SYSTEM" \
+ >>${WRKSRC}/Source/GNUmakefile
+
.include <bsd.port.mk>
diff --git a/x11-toolkits/renaissance/pkg-plist b/x11-toolkits/renaissance/pkg-plist
index c58323c9fbb1..f7c1138aca38 100644
--- a/x11-toolkits/renaissance/pkg-plist
+++ b/x11-toolkits/renaissance/pkg-plist
@@ -1,13 +1,13 @@
Local/Applications/GSMarkupBrowser.app/GSMarkupBrowser
-Local/Applications/GSMarkupBrowser.app/library_paths.openapp
Local/Applications/GSMarkupBrowser.app/Resources/Info-gnustep.plist
Local/Applications/GSMarkupBrowser.app/Resources/GSMarkupBrowser.desktop
Local/Applications/GSMarkupBrowser.app/stamp.make
Local/Applications/GSMarkupLocalizableStrings.app/GSMarkupLocalizableStrings
-Local/Applications/GSMarkupLocalizableStrings.app/library_paths.openapp
Local/Applications/GSMarkupLocalizableStrings.app/Resources/Info-gnustep.plist
Local/Applications/GSMarkupLocalizableStrings.app/Resources/GSMarkupLocalizableStrings.desktop
Local/Applications/GSMarkupLocalizableStrings.app/stamp.make
+Local/Tools/GSMarkupBrowser
+Local/Tools/GSMarkupLocalizableStrings
System/Library/Headers/Renaissance/GSAutoLayoutDefaults.h
System/Library/Headers/Renaissance/GSAutoLayoutManager.h
System/Library/Headers/Renaissance/GSAutoLayoutManagerPrivate.h
diff --git a/x11/terminal.app/Makefile b/x11/terminal.app/Makefile
index f2442f974774..86eb4d514f27 100644
--- a/x11/terminal.app/Makefile
+++ b/x11/terminal.app/Makefile
@@ -23,6 +23,7 @@ USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
WRKSRC= ${WRKDIR}/${PORTNAME:C/\.app//}-${DISTVERSION}${DISTVERSIONSUFFIX:C/\.orig//}
+MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
.include <bsd.port.pre.mk>
diff --git a/x11/terminal.app/pkg-plist b/x11/terminal.app/pkg-plist
index 9a68f73eb0eb..4461a5d0592a 100644
--- a/x11/terminal.app/pkg-plist
+++ b/x11/terminal.app/pkg-plist
@@ -16,8 +16,8 @@ System/Applications/Terminal.app/Resources/cursor_inverted.tiff
System/Applications/Terminal.app/Resources/cursor_line.tiff
System/Applications/Terminal.app/Resources/cursor_stroked.tiff
System/Applications/Terminal.app/Terminal
-System/Applications/Terminal.app/library_paths.openapp
System/Applications/Terminal.app/stamp.make
+System/Tools/Terminal
@dirrm System/Applications/Terminal.app/Resources/Turkish.lproj
@dirrm System/Applications/Terminal.app/Resources/Swedish.lproj
@dirrm System/Applications/Terminal.app/Resources/Spanish.lproj