6 files changed, 9 insertions, 3 deletions

diff --git a/sysutils/batmon/pkg-plist b/sysutils/batmon/pkg-plist
index dfc6cea05a4a..d020aa87b457 100644
--- a/sysutils/batmon/pkg-plist
+++ b/sysutils/batmon/pkg-plist
@@ -6,8 +6,8 @@ Local/Applications/batmon.app/Resources/batmon.gorm/data.classes
 Local/Applications/batmon.app/Resources/batmon.gorm/data.info
 Local/Applications/batmon.app/Resources/batmon.gorm/objects.gorm
 Local/Applications/batmon.app/batmon
-Local/Applications/batmon.app/library_paths.openapp
 Local/Applications/batmon.app/stamp.make
+Local/Tools/batmon
 @dirrm Local/Applications/batmon.app/Resources/batmon.gorm
 @dirrm Local/Applications/batmon.app/Resources
 @dirrm Local/Applications/batmon.app
diff --git a/sysutils/burn/Makefile b/sysutils/burn/Makefile
index 40356b4a3c37..2f3e2baa4716 100644
--- a/sysutils/burn/Makefile
+++ b/sysutils/burn/Makefile
@@ -30,6 +30,7 @@ USE_GNUSTEP_SYSTEM_LIBS+=	PrefsModule:${PREFERENCES_PORT}
 USE_GNUSTEP_SYSTEM_LIBS+=	Inspector:${GWORKSPACE_PORT}
 
 WRKSRC=		${WRKDIR}/Burn
+MAKE_ENV+=	GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT}
 HEADERS=	Burn/ExternalTools.h Burn/PreferencesModule.h \
 		Constants.h Functions.h Track.h
 
diff --git a/sysutils/burn/pkg-plist b/sysutils/burn/pkg-plist
index 303a29376246..1ae8e540dabc 100644
--- a/sysutils/burn/pkg-plist
+++ b/sysutils/burn/pkg-plist
@@ -141,7 +141,6 @@ Local/Applications/Burn.app/Resources/iconGSburn.tiff
 Local/Applications/Burn.app/Resources/iconGeneral.tiff
 Local/Applications/Burn.app/Resources/iconMultiSelection.tiff
 Local/Applications/Burn.app/Resources/iconProgressDisc.tiff
-Local/Applications/Burn.app/library_paths.openapp
 Local/Applications/Burn.app/stamp.make
 Local/Library/Bundles/CDparanoia.bundle/CDparanoia
 Local/Library/Bundles/CDparanoia.bundle/Resources/English.lproj/Localizable.strings
@@ -205,6 +204,7 @@ Local/Library/Headers/Burn/ExternalTools.h
 Local/Library/Headers/Burn/Functions.h
 Local/Library/Headers/Burn/PreferencesModule.h
 Local/Library/Headers/Burn/Track.h
+Local/Tools/Burn
 @dirrm Local/Library/Headers/Burn
 @dirrm Local/Library/Bundles/MkIsoFs.bundle/Resources/German.lproj/Settings.gorm
 @dirrm Local/Library/Bundles/MkIsoFs.bundle/Resources/German.lproj/Parameters.gorm
diff --git a/sysutils/etoile-installer/pkg-plist b/sysutils/etoile-installer/pkg-plist
index 5130fc7ffd2b..f62c564bc76c 100644
--- a/sysutils/etoile-installer/pkg-plist
+++ b/sysutils/etoile-installer/pkg-plist
@@ -13,9 +13,9 @@ Local/Applications/Installer.app/Resources/Package.gorm/data.classes
 Local/Applications/Installer.app/Resources/Package.gorm/data.info
 Local/Applications/Installer.app/Resources/Package.gorm/objects.gorm
 Local/Applications/Installer.app/Resources/Pkg.tiff
-Local/Applications/Installer.app/library_paths.openapp
 Local/Applications/Installer.app/stamp.make
 Local/Library/Headers/Gpkg/Gpkg.h
+Local/Tools/Installer
 Local/Tools/lsgbom
 Local/Tools/mkgbom
 @dirrm Local/Library/Headers/Gpkg
diff --git a/sysutils/etoile-system/Makefile b/sysutils/etoile-system/Makefile
index db00f82ae61b..f160ba206014 100644
--- a/sysutils/etoile-system/Makefile
+++ b/sysutils/etoile-system/Makefile
@@ -28,10 +28,13 @@ USE_GNUSTEP_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 SNAPSHOT=	20061221
 WRKSRC=	${WRKDIR}/Etoile/
 USE_GNUSTEP_MAKE_DIRS+=	Services/Private/System
+MAKE_ENV+=	GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
 
 post-install:
 	${MKDIR} ${GNUSTEP_PREFIX}/System/Library/Etoile
 	${CP} ${WRKSRC}/Services/Private/System/SystemTaskList.plist \
 		${GNUSTEP_PREFIX}/System/Library/Etoile/
+	${INSTALL_SCRIPT} ${WRKSRC}/setdown.sh ${WRKSRC}/setup.sh \
+		${GNUSTEP_PREFIX}/System/Tools/
 
 .include <bsd.port.mk>
diff --git a/sysutils/etoile-system/pkg-plist b/sysutils/etoile-system/pkg-plist
index 6adcbd26f80b..bc95a1a706a2 100644
--- a/sysutils/etoile-system/pkg-plist
+++ b/sysutils/etoile-system/pkg-plist
@@ -4,5 +4,7 @@ System/Library/Libraries/libWorkspaceCommKit.so
 System/Library/Libraries/libWorkspaceCommKit.so.%%MAJORLIBVERSION%%
 System/Library/Libraries/libWorkspaceCommKit.so.%%LIBVERSION%%
 System/Tools/etoile_system
+System/Tools/setup.sh
+System/Tools/setdown.sh
 @dirrm System/Library/Headers/WorkspaceCommKit
 @dirrm System/Library/Etoile