5 files changed, 5 insertions, 3 deletions

diff --git a/audio/cddb-bundle/Makefile b/audio/cddb-bundle/Makefile
index a37f825875d6..7074e453743a 100644
--- a/audio/cddb-bundle/Makefile
+++ b/audio/cddb-bundle/Makefile
@@ -24,5 +24,6 @@ USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 
 WRKSRC=		${WRKDIR}/cddb.bundle
+MAKE_ENV+=	GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT}
 
 .include <bsd.port.mk>
diff --git a/audio/gnustep-cdplayer/Makefile b/audio/gnustep-cdplayer/Makefile
index 61c6d56a8cbd..d6e5027f48f5 100644
--- a/audio/gnustep-cdplayer/Makefile
+++ b/audio/gnustep-cdplayer/Makefile
@@ -27,6 +27,7 @@ USE_GNUSTEP_LOCAL_BUNDLES+=	Cddb:${CDDB_BUNDLE_PORT}
 USE_GNUSTEP_SYSTEM_LIBS+=	PrefsModule:${PREFERENCES_PORT}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
+MAKE_ENV+=	GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT}
 
 CDDB_BUNDLE_PORT?=	audio/cddb-bundle
 PREFERENCES_PORT?=	deskutils/preferences.app
diff --git a/audio/gnustep-cdplayer/pkg-plist b/audio/gnustep-cdplayer/pkg-plist
index c0c50270b82d..218096bdf72a 100644
--- a/audio/gnustep-cdplayer/pkg-plist
+++ b/audio/gnustep-cdplayer/pkg-plist
@@ -55,7 +55,6 @@ Local/Applications/CDPlayer.app/Resources/play.tiff
 Local/Applications/CDPlayer.app/Resources/prev.tiff
 Local/Applications/CDPlayer.app/Resources/rwd.tiff
 Local/Applications/CDPlayer.app/Resources/stop.tiff
-Local/Applications/CDPlayer.app/library_paths.openapp
 Local/Applications/CDPlayer.app/stamp.make
 Local/Library/Bundles/AudioCD.bundle/AudioCD
 Local/Library/Bundles/AudioCD.bundle/Resources/Info-gnustep.plist
@@ -74,6 +73,7 @@ Local/Library/Preferences/AudioCD.prefs/Resources/German.lproj/AudioCD.gorm/obje
 Local/Library/Preferences/AudioCD.prefs/Resources/German.lproj/Localizable.strings
 Local/Library/Preferences/AudioCD.prefs/Resources/Info-gnustep.plist
 Local/Library/Preferences/AudioCD.prefs/stamp.make
+Local/Tools/CDPlayer
 @dirrm Local/Library/Preferences/AudioCD.prefs/Resources/German.lproj/AudioCD.gorm
 @dirrm Local/Library/Preferences/AudioCD.prefs/Resources/German.lproj
 @dirrm Local/Library/Preferences/AudioCD.prefs/Resources/French.lproj/AudioCD.gorm
diff --git a/audio/mp3towav-bundle/Makefile b/audio/mp3towav-bundle/Makefile
index 8e48ac2b6fb8..d22e837a951b 100644
--- a/audio/mp3towav-bundle/Makefile
+++ b/audio/mp3towav-bundle/Makefile
@@ -24,8 +24,8 @@ USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_LOCAL_APPS+=	Burn:${BURN_PORT}
 
 WRKSRC=		${WRKDIR}/MP3ToWav
-#ADDITIONAL_INCLUDE_DIRS+=	-IBurn
 ADDITIONAL_INCLUDE_DIRS+=	-I${GNUSTEP_PREFIX}/Local/Library/Headers/Burn
+MAKE_ENV+=	GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT}
 
 BURN_PORT?=	sysutils/burn
 
diff --git a/audio/mpdcon/pkg-plist b/audio/mpdcon/pkg-plist
index dc08a9021e5f..02722543601b 100644
--- a/audio/mpdcon/pkg-plist
+++ b/audio/mpdcon/pkg-plist
@@ -48,8 +48,8 @@ Local/Applications/MPDCon.app/Resources/StatisticsViewer.gorm/data.classes
 Local/Applications/MPDCon.app/Resources/StatisticsViewer.gorm/data.info
 Local/Applications/MPDCon.app/Resources/StatisticsViewer.gorm/objects.gorm
 Local/Applications/MPDCon.app/Resources/Stop.tiff
-Local/Applications/MPDCon.app/library_paths.openapp
 Local/Applications/MPDCon.app/stamp.make
+Local/Tools/MPDCon
 @dirrm Local/Applications/MPDCon.app/Resources/StatisticsViewer.gorm
 @dirrm Local/Applications/MPDCon.app/Resources/Preferences.gorm
 @dirrm Local/Applications/MPDCon.app/Resources/PlaylistsManager.gorm