- drop USE_GNUSTEP_PREFIX

16 files changed, 436 insertions, 444 deletions

diff --git a/audio/cddb-bundle/Makefile b/audio/cddb-bundle/Makefile
index cbbada35b026..213a17831b35 100644
--- a/audio/cddb-bundle/Makefile
+++ b/audio/cddb-bundle/Makefile
@@ -17,7 +17,6 @@ MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	CDDB client bundle GNUstep
 
 USE_GNUSTEP=	yes
-USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
diff --git a/audio/cddb-bundle/pkg-plist b/audio/cddb-bundle/pkg-plist
index a9091e2a6f49..46431c7d83fc 100644
--- a/audio/cddb-bundle/pkg-plist
+++ b/audio/cddb-bundle/pkg-plist
@@ -1,7 +1,7 @@
-Local/Library/Bundles/Cddb.bundle/Cddb
-Local/Library/Bundles/Cddb.bundle/Resources/Info-gnustep.plist
-Local/Library/Bundles/Cddb.bundle/stamp.make
-Local/Library/Headers/Cddb/Cddb.h
-@dirrm Local/Library/Headers/Cddb
-@dirrm Local/Library/Bundles/Cddb.bundle/Resources
-@dirrm Local/Library/Bundles/Cddb.bundle
+GNUstep/Local/Library/Bundles/Cddb.bundle/Cddb
+GNUstep/Local/Library/Bundles/Cddb.bundle/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Bundles/Cddb.bundle/stamp.make
+GNUstep/Local/Library/Headers/Cddb/Cddb.h
+@dirrm GNUstep/Local/Library/Headers/Cddb
+@dirrm GNUstep/Local/Library/Bundles/Cddb.bundle/Resources
+@dirrm GNUstep/Local/Library/Bundles/Cddb.bundle
diff --git a/audio/cynthiune/Makefile b/audio/cynthiune/Makefile
index 4f0ad8dede15..91f138faa586 100644
--- a/audio/cynthiune/Makefile
+++ b/audio/cynthiune/Makefile
@@ -25,7 +25,6 @@ LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
 LIB_DEPENDS+=	id3tag.0:${PORTSDIR}/audio/libid3tag
 
 USE_GNUSTEP=	yes
-USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
diff --git a/audio/cynthiune/pkg-plist b/audio/cynthiune/pkg-plist
index d04b7d9acb95..cd8ab61a1c85 100644
--- a/audio/cynthiune/pkg-plist
+++ b/audio/cynthiune/pkg-plist
@@ -1,212 +1,212 @@
-Local/Applications/Cynthiune.app/Cynthiune
-Local/Applications/Cynthiune.app/Resources/Armenian.lproj/Localizable.strings
-Local/Applications/Cynthiune.app/Resources/COPYING
-Local/Applications/Cynthiune.app/Resources/Cynthiune-playlist-48.tiff
-Local/Applications/Cynthiune.app/Resources/Cynthiune-song-48.tiff
-Local/Applications/Cynthiune.app/Resources/Cynthiune.desktop
-Local/Applications/Cynthiune.app/Resources/Cynthiune.gorm/data.classes
-Local/Applications/Cynthiune.app/Resources/Cynthiune.gorm/data.info
-Local/Applications/Cynthiune.app/Resources/Cynthiune.gorm/objects.gorm
-Local/Applications/Cynthiune.app/Resources/Cynthiune.tiff
-Local/Applications/Cynthiune.app/Resources/English.lproj/Localizable.strings
-Local/Applications/Cynthiune.app/Resources/French.lproj/Localizable.strings
-Local/Applications/Cynthiune.app/Resources/GeneralPreference.gorm/data.classes
-Local/Applications/Cynthiune.app/Resources/GeneralPreference.gorm/data.info
-Local/Applications/Cynthiune.app/Resources/GeneralPreference.gorm/objects.gorm
-Local/Applications/Cynthiune.app/Resources/German.lproj/Localizable.strings
-Local/Applications/Cynthiune.app/Resources/Hungarian.lproj/Localizable.strings
-Local/Applications/Cynthiune.app/Resources/Info-gnustep.plist
-Local/Applications/Cynthiune.app/Resources/Italian.lproj/Localizable.strings
-Local/Applications/Cynthiune.app/Resources/Preferences.gorm/data.classes
-Local/Applications/Cynthiune.app/Resources/Preferences.gorm/data.info
-Local/Applications/Cynthiune.app/Resources/Preferences.gorm/objects.gorm
-Local/Applications/Cynthiune.app/Resources/Slovak.lproj/Localizable.strings
-Local/Applications/Cynthiune.app/Resources/SongInspector.gorm/data.classes
-Local/Applications/Cynthiune.app/Resources/SongInspector.gorm/data.info
-Local/Applications/Cynthiune.app/Resources/SongInspector.gorm/objects.gorm
-Local/Applications/Cynthiune.app/Resources/Spanish.lproj/Localizable.strings
-Local/Applications/Cynthiune.app/Resources/TraditionalChinese.lproj/Localizable.strings
-Local/Applications/Cynthiune.app/Resources/add.tiff
-Local/Applications/Cynthiune.app/Resources/anim-logo-1.tiff
-Local/Applications/Cynthiune.app/Resources/anim-logo-2.tiff
-Local/Applications/Cynthiune.app/Resources/anim-logo-3.tiff
-Local/Applications/Cynthiune.app/Resources/anim-logo-4.tiff
-Local/Applications/Cynthiune.app/Resources/anim-logo-5.tiff
-Local/Applications/Cynthiune.app/Resources/anim-logo-6.tiff
-Local/Applications/Cynthiune.app/Resources/anim-logo-7.tiff
-Local/Applications/Cynthiune.app/Resources/anim-logo-8.tiff
-Local/Applications/Cynthiune.app/Resources/cleanup.tiff
-Local/Applications/Cynthiune.app/Resources/common_ToolbarSeparatorItem.tiff
-Local/Applications/Cynthiune.app/Resources/cynthiune-splash-faded.tiff
-Local/Applications/Cynthiune.app/Resources/cynthiune-splash.tiff
-Local/Applications/Cynthiune.app/Resources/dragged-song.tiff
-Local/Applications/Cynthiune.app/Resources/dragged-songs.tiff
-Local/Applications/Cynthiune.app/Resources/eject-pushed.tiff
-Local/Applications/Cynthiune.app/Resources/eject.tiff
-Local/Applications/Cynthiune.app/Resources/lock.tiff
-Local/Applications/Cynthiune.app/Resources/lookup-mb-off.tiff
-Local/Applications/Cynthiune.app/Resources/lookup-mb-on.tiff
-Local/Applications/Cynthiune.app/Resources/next-pushed.tiff
-Local/Applications/Cynthiune.app/Resources/next.tiff
-Local/Applications/Cynthiune.app/Resources/pause-pushed.tiff
-Local/Applications/Cynthiune.app/Resources/pause.tiff
-Local/Applications/Cynthiune.app/Resources/play-pushed.tiff
-Local/Applications/Cynthiune.app/Resources/play.tiff
-Local/Applications/Cynthiune.app/Resources/playlist-pushed.tiff
-Local/Applications/Cynthiune.app/Resources/playlist.tiff
-Local/Applications/Cynthiune.app/Resources/previous-pushed.tiff
-Local/Applications/Cynthiune.app/Resources/previous.tiff
-Local/Applications/Cynthiune.app/Resources/remove.tiff
-Local/Applications/Cynthiune.app/Resources/repeat-pushed.tiff
-Local/Applications/Cynthiune.app/Resources/repeat.tiff
-Local/Applications/Cynthiune.app/Resources/save-as.tiff
-Local/Applications/Cynthiune.app/Resources/shuffle-pushed.tiff
-Local/Applications/Cynthiune.app/Resources/shuffle.tiff
-Local/Applications/Cynthiune.app/Resources/slider-knob-disabled.tiff
-Local/Applications/Cynthiune.app/Resources/slider-knob-enabled.tiff
-Local/Applications/Cynthiune.app/Resources/song-inspector-pushed.tiff
-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/stamp.make
-Local/Library/Cynthiune/ASFTags.tags/ASFTags
-Local/Library/Cynthiune/ASFTags.tags/Resources/Info-gnustep.plist
-Local/Library/Cynthiune/ASFTags.tags/stamp.make
-Local/Library/Cynthiune/AudioFile.format/AudioFile
-Local/Library/Cynthiune/AudioFile.format/Resources/Info-gnustep.plist
-Local/Library/Cynthiune/AudioFile.format/stamp.make
-Local/Library/Cynthiune/Esound.output/Esound
-Local/Library/Cynthiune/Esound.output/Resources/English.lproj/Localizable.strings
-Local/Library/Cynthiune/Esound.output/Resources/EsoundPreferences.gorm/data.classes
-Local/Library/Cynthiune/Esound.output/Resources/EsoundPreferences.gorm/data.info
-Local/Library/Cynthiune/Esound.output/Resources/EsoundPreferences.gorm/objects.gorm
-Local/Library/Cynthiune/Esound.output/Resources/French.lproj/Localizable.strings
-Local/Library/Cynthiune/Esound.output/Resources/Info-gnustep.plist
-Local/Library/Cynthiune/Esound.output/stamp.make
-Local/Library/Cynthiune/FLAC.format/FLAC
-Local/Library/Cynthiune/FLAC.format/Resources/Info-gnustep.plist
-Local/Library/Cynthiune/FLAC.format/stamp.make
-Local/Library/Cynthiune/FLACTags.tags/FLACTags
-Local/Library/Cynthiune/FLACTags.tags/Resources/Info-gnustep.plist
-Local/Library/Cynthiune/FLACTags.tags/stamp.make
-Local/Library/Cynthiune/ID3Tag.tags/ID3Tag
-Local/Library/Cynthiune/ID3Tag.tags/Resources/Info-gnustep.plist
-Local/Library/Cynthiune/ID3Tag.tags/stamp.make
-Local/Library/Cynthiune/MP3.format/MP3
-Local/Library/Cynthiune/MP3.format/Resources/Info-gnustep.plist
-Local/Library/Cynthiune/MP3.format/stamp.make
-Local/Library/Cynthiune/Mod.format/Mod
-Local/Library/Cynthiune/Mod.format/Resources/Info-gnustep.plist
-Local/Library/Cynthiune/Mod.format/stamp.make
-Local/Library/Cynthiune/Musepack.format/Musepack
-Local/Library/Cynthiune/Musepack.format/Resources/Info-gnustep.plist
-Local/Library/Cynthiune/Musepack.format/stamp.make
-Local/Library/Cynthiune/OSS.output/OSS
-Local/Library/Cynthiune/OSS.output/Resources/English.lproj/Localizable.strings
-Local/Library/Cynthiune/OSS.output/Resources/French.lproj/Localizable.strings
-Local/Library/Cynthiune/OSS.output/Resources/Info-gnustep.plist
-Local/Library/Cynthiune/OSS.output/Resources/OSSPreferences.gorm/data.classes
-Local/Library/Cynthiune/OSS.output/Resources/OSSPreferences.gorm/data.info
-Local/Library/Cynthiune/OSS.output/Resources/OSSPreferences.gorm/objects.gorm
-Local/Library/Cynthiune/OSS.output/stamp.make
-Local/Library/Cynthiune/Ogg.format/Ogg
-Local/Library/Cynthiune/Ogg.format/Resources/Info-gnustep.plist
-Local/Library/Cynthiune/Ogg.format/stamp.make
-Local/Library/Cynthiune/Taglib.tags/Resources/Info-gnustep.plist
-Local/Library/Cynthiune/Taglib.tags/Taglib
-Local/Library/Cynthiune/Taglib.tags/stamp.make
-Local/Library/Cynthiune/Timidity.format/Resources/Info-gnustep.plist
-Local/Library/Cynthiune/Timidity.format/Timidity
-Local/Library/Cynthiune/Timidity.format/stamp.make
-Local/Library/Cynthiune/VorbisTags.tags/Resources/Info-gnustep.plist
-Local/Library/Cynthiune/VorbisTags.tags/VorbisTags
-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/%%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%%
-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
-@dirrm Local/Library/Cynthiune/aRts.output
-@dirrm Local/Library/Cynthiune/VorbisTags.tags/Resources
-@dirrm Local/Library/Cynthiune/VorbisTags.tags
-@dirrm Local/Library/Cynthiune/Timidity.format/Resources
-@dirrm Local/Library/Cynthiune/Timidity.format
-@dirrm Local/Library/Cynthiune/Taglib.tags/Resources
-@dirrm Local/Library/Cynthiune/Taglib.tags
-@dirrm Local/Library/Cynthiune/Ogg.format/Resources
-@dirrm Local/Library/Cynthiune/Ogg.format
-@dirrm Local/Library/Cynthiune/OSS.output/Resources/OSSPreferences.gorm
-@dirrm Local/Library/Cynthiune/OSS.output/Resources/French.lproj
-@dirrm Local/Library/Cynthiune/OSS.output/Resources/English.lproj
-@dirrm Local/Library/Cynthiune/OSS.output/Resources
-@dirrm Local/Library/Cynthiune/OSS.output
-@dirrm Local/Library/Cynthiune/Musepack.format/Resources
-@dirrm Local/Library/Cynthiune/Musepack.format
-@dirrm Local/Library/Cynthiune/Mod.format/Resources
-@dirrm Local/Library/Cynthiune/Mod.format
-@dirrm Local/Library/Cynthiune/MP3.format/Resources
-@dirrm Local/Library/Cynthiune/MP3.format
-@dirrm Local/Library/Cynthiune/ID3Tag.tags/Resources
-@dirrm Local/Library/Cynthiune/ID3Tag.tags
-@dirrm Local/Library/Cynthiune/FLACTags.tags/Resources
-@dirrm Local/Library/Cynthiune/FLACTags.tags
-@dirrm Local/Library/Cynthiune/FLAC.format/Resources
-@dirrm Local/Library/Cynthiune/FLAC.format
-@dirrm Local/Library/Cynthiune/Esound.output/Resources/French.lproj
-@dirrm Local/Library/Cynthiune/Esound.output/Resources/EsoundPreferences.gorm
-@dirrm Local/Library/Cynthiune/Esound.output/Resources/English.lproj
-@dirrm Local/Library/Cynthiune/Esound.output/Resources
-@dirrm Local/Library/Cynthiune/Esound.output
-@dirrm Local/Library/Cynthiune/AudioFile.format/Resources
-@dirrm Local/Library/Cynthiune/AudioFile.format
-@dirrm Local/Library/Cynthiune/ASFTags.tags/Resources
-@dirrm Local/Library/Cynthiune/ASFTags.tags
-@dirrm Local/Library/Cynthiune
-@dirrm Local/Applications/Cynthiune.app/Resources/TraditionalChinese.lproj
-@dirrm Local/Applications/Cynthiune.app/Resources/Spanish.lproj
-@dirrm Local/Applications/Cynthiune.app/Resources/SongInspector.gorm
-@dirrm Local/Applications/Cynthiune.app/Resources/Slovak.lproj
-@dirrm Local/Applications/Cynthiune.app/Resources/Preferences.gorm
-@dirrm Local/Applications/Cynthiune.app/Resources/Italian.lproj
-@dirrm Local/Applications/Cynthiune.app/Resources/Hungarian.lproj
-@dirrm Local/Applications/Cynthiune.app/Resources/German.lproj
-@dirrm Local/Applications/Cynthiune.app/Resources/GeneralPreference.gorm
-@dirrm Local/Applications/Cynthiune.app/Resources/French.lproj
-@dirrm Local/Applications/Cynthiune.app/Resources/English.lproj
-@dirrm Local/Applications/Cynthiune.app/Resources/Cynthiune.gorm
-@dirrm Local/Applications/Cynthiune.app/Resources/Armenian.lproj
-@dirrm Local/Applications/Cynthiune.app/Resources
-@dirrm Local/Applications/Cynthiune.app
+GNUstep/Local/Applications/Cynthiune.app/Cynthiune
+GNUstep/Local/Applications/Cynthiune.app/Resources/Armenian.lproj/Localizable.strings
+GNUstep/Local/Applications/Cynthiune.app/Resources/COPYING
+GNUstep/Local/Applications/Cynthiune.app/Resources/Cynthiune-playlist-48.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/Cynthiune-song-48.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/Cynthiune.desktop
+GNUstep/Local/Applications/Cynthiune.app/Resources/Cynthiune.gorm/data.classes
+GNUstep/Local/Applications/Cynthiune.app/Resources/Cynthiune.gorm/data.info
+GNUstep/Local/Applications/Cynthiune.app/Resources/Cynthiune.gorm/objects.gorm
+GNUstep/Local/Applications/Cynthiune.app/Resources/Cynthiune.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/English.lproj/Localizable.strings
+GNUstep/Local/Applications/Cynthiune.app/Resources/French.lproj/Localizable.strings
+GNUstep/Local/Applications/Cynthiune.app/Resources/GeneralPreference.gorm/data.classes
+GNUstep/Local/Applications/Cynthiune.app/Resources/GeneralPreference.gorm/data.info
+GNUstep/Local/Applications/Cynthiune.app/Resources/GeneralPreference.gorm/objects.gorm
+GNUstep/Local/Applications/Cynthiune.app/Resources/German.lproj/Localizable.strings
+GNUstep/Local/Applications/Cynthiune.app/Resources/Hungarian.lproj/Localizable.strings
+GNUstep/Local/Applications/Cynthiune.app/Resources/Info-gnustep.plist
+GNUstep/Local/Applications/Cynthiune.app/Resources/Italian.lproj/Localizable.strings
+GNUstep/Local/Applications/Cynthiune.app/Resources/Preferences.gorm/data.classes
+GNUstep/Local/Applications/Cynthiune.app/Resources/Preferences.gorm/data.info
+GNUstep/Local/Applications/Cynthiune.app/Resources/Preferences.gorm/objects.gorm
+GNUstep/Local/Applications/Cynthiune.app/Resources/Slovak.lproj/Localizable.strings
+GNUstep/Local/Applications/Cynthiune.app/Resources/SongInspector.gorm/data.classes
+GNUstep/Local/Applications/Cynthiune.app/Resources/SongInspector.gorm/data.info
+GNUstep/Local/Applications/Cynthiune.app/Resources/SongInspector.gorm/objects.gorm
+GNUstep/Local/Applications/Cynthiune.app/Resources/Spanish.lproj/Localizable.strings
+GNUstep/Local/Applications/Cynthiune.app/Resources/TraditionalChinese.lproj/Localizable.strings
+GNUstep/Local/Applications/Cynthiune.app/Resources/add.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/anim-logo-1.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/anim-logo-2.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/anim-logo-3.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/anim-logo-4.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/anim-logo-5.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/anim-logo-6.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/anim-logo-7.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/anim-logo-8.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/cleanup.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/common_ToolbarSeparatorItem.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/cynthiune-splash-faded.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/cynthiune-splash.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/dragged-song.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/dragged-songs.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/eject-pushed.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/eject.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/lock.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/lookup-mb-off.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/lookup-mb-on.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/next-pushed.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/next.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/pause-pushed.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/pause.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/play-pushed.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/play.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/playlist-pushed.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/playlist.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/previous-pushed.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/previous.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/remove.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/repeat-pushed.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/repeat.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/save-as.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/shuffle-pushed.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/shuffle.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/slider-knob-disabled.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/slider-knob-enabled.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/song-inspector-pushed.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/song-inspector.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/song-pointer.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/stop-pushed.tiff
+GNUstep/Local/Applications/Cynthiune.app/Resources/stop.tiff
+GNUstep/Local/Applications/Cynthiune.app/stamp.make
+GNUstep/Local/Library/Cynthiune/ASFTags.tags/ASFTags
+GNUstep/Local/Library/Cynthiune/ASFTags.tags/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Cynthiune/ASFTags.tags/stamp.make
+GNUstep/Local/Library/Cynthiune/AudioFile.format/AudioFile
+GNUstep/Local/Library/Cynthiune/AudioFile.format/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Cynthiune/AudioFile.format/stamp.make
+GNUstep/Local/Library/Cynthiune/Esound.output/Esound
+GNUstep/Local/Library/Cynthiune/Esound.output/Resources/English.lproj/Localizable.strings
+GNUstep/Local/Library/Cynthiune/Esound.output/Resources/EsoundPreferences.gorm/data.classes
+GNUstep/Local/Library/Cynthiune/Esound.output/Resources/EsoundPreferences.gorm/data.info
+GNUstep/Local/Library/Cynthiune/Esound.output/Resources/EsoundPreferences.gorm/objects.gorm
+GNUstep/Local/Library/Cynthiune/Esound.output/Resources/French.lproj/Localizable.strings
+GNUstep/Local/Library/Cynthiune/Esound.output/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Cynthiune/Esound.output/stamp.make
+GNUstep/Local/Library/Cynthiune/FLAC.format/FLAC
+GNUstep/Local/Library/Cynthiune/FLAC.format/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Cynthiune/FLAC.format/stamp.make
+GNUstep/Local/Library/Cynthiune/FLACTags.tags/FLACTags
+GNUstep/Local/Library/Cynthiune/FLACTags.tags/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Cynthiune/FLACTags.tags/stamp.make
+GNUstep/Local/Library/Cynthiune/ID3Tag.tags/ID3Tag
+GNUstep/Local/Library/Cynthiune/ID3Tag.tags/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Cynthiune/ID3Tag.tags/stamp.make
+GNUstep/Local/Library/Cynthiune/MP3.format/MP3
+GNUstep/Local/Library/Cynthiune/MP3.format/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Cynthiune/MP3.format/stamp.make
+GNUstep/Local/Library/Cynthiune/Mod.format/Mod
+GNUstep/Local/Library/Cynthiune/Mod.format/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Cynthiune/Mod.format/stamp.make
+GNUstep/Local/Library/Cynthiune/Musepack.format/Musepack
+GNUstep/Local/Library/Cynthiune/Musepack.format/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Cynthiune/Musepack.format/stamp.make
+GNUstep/Local/Library/Cynthiune/OSS.output/OSS
+GNUstep/Local/Library/Cynthiune/OSS.output/Resources/English.lproj/Localizable.strings
+GNUstep/Local/Library/Cynthiune/OSS.output/Resources/French.lproj/Localizable.strings
+GNUstep/Local/Library/Cynthiune/OSS.output/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Cynthiune/OSS.output/Resources/OSSPreferences.gorm/data.classes
+GNUstep/Local/Library/Cynthiune/OSS.output/Resources/OSSPreferences.gorm/data.info
+GNUstep/Local/Library/Cynthiune/OSS.output/Resources/OSSPreferences.gorm/objects.gorm
+GNUstep/Local/Library/Cynthiune/OSS.output/stamp.make
+GNUstep/Local/Library/Cynthiune/Ogg.format/Ogg
+GNUstep/Local/Library/Cynthiune/Ogg.format/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Cynthiune/Ogg.format/stamp.make
+GNUstep/Local/Library/Cynthiune/Taglib.tags/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Cynthiune/Taglib.tags/Taglib
+GNUstep/Local/Library/Cynthiune/Taglib.tags/stamp.make
+GNUstep/Local/Library/Cynthiune/Timidity.format/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Cynthiune/Timidity.format/Timidity
+GNUstep/Local/Library/Cynthiune/Timidity.format/stamp.make
+GNUstep/Local/Library/Cynthiune/VorbisTags.tags/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Cynthiune/VorbisTags.tags/VorbisTags
+GNUstep/Local/Library/Cynthiune/VorbisTags.tags/stamp.make
+GNUstep/Local/Library/Cynthiune/aRts.output/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Cynthiune/aRts.output/aRts
+GNUstep/Local/Library/Cynthiune/aRts.output/stamp.make
+GNUstep/Local/Library/Frameworks/Cynthiune.framework/Cynthiune
+GNUstep/Local/Library/Frameworks/Cynthiune.framework/Headers
+GNUstep/Local/Library/Frameworks/Cynthiune.framework/Resources
+GNUstep/Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%/Cynthiune
+GNUstep/Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%/Headers/CynthiuneBundle.h
+GNUstep/Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%/Headers/Format.h
+GNUstep/Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%/Headers/MailService.h
+GNUstep/Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%/Headers/NSArrayExtensions.h
+GNUstep/Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%/Headers/NSCellExtensions.h
+GNUstep/Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%/Headers/NSColorExtensions.h
+GNUstep/Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%/Headers/NSNumberExtensions.h
+GNUstep/Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%/Headers/NSStringExtensions.h
+GNUstep/Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%/Headers/NSTimerExtensions.h
+GNUstep/Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%/Headers/NSViewExtensions.h
+GNUstep/Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%/Headers/Output.h
+GNUstep/Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%/Headers/Preference.h
+GNUstep/Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%/Headers/utils.h
+GNUstep/Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%/libCynthiune.so
+GNUstep/Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%/libCynthiune.so.%%MAJORLIBVERSION%%
+GNUstep/Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%/libCynthiune.so.%%LIBVERSION%%
+GNUstep/Local/Library/Frameworks/Cynthiune.framework/Versions/Current
+GNUstep/Local/Library/Frameworks/Cynthiune.framework/libCynthiune.so
+GNUstep/Local/Library/Headers/Cynthiune
+GNUstep/Local/Library/Libraries/libCynthiune.so
+GNUstep/Local/Library/Libraries/libCynthiune.so.%%MAJORLIBVERSION%%
+GNUstep/Local/Library/Libraries/libCynthiune.so.%%LIBVERSION%%
+GNUstep/Local/Tools/Cynthiune
+@dirrm GNUstep/Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%/Resources
+@dirrm GNUstep/Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%/Headers
+@dirrm GNUstep/Local/Library/Frameworks/Cynthiune.framework/Versions/%%MAJORVERSION%%
+@dirrm GNUstep/Local/Library/Frameworks/Cynthiune.framework/Versions
+@dirrm GNUstep/Local/Library/Frameworks/Cynthiune.framework
+@dirrm GNUstep/Local/Library/Cynthiune/aRts.output/Resources
+@dirrm GNUstep/Local/Library/Cynthiune/aRts.output
+@dirrm GNUstep/Local/Library/Cynthiune/VorbisTags.tags/Resources
+@dirrm GNUstep/Local/Library/Cynthiune/VorbisTags.tags
+@dirrm GNUstep/Local/Library/Cynthiune/Timidity.format/Resources
+@dirrm GNUstep/Local/Library/Cynthiune/Timidity.format
+@dirrm GNUstep/Local/Library/Cynthiune/Taglib.tags/Resources
+@dirrm GNUstep/Local/Library/Cynthiune/Taglib.tags
+@dirrm GNUstep/Local/Library/Cynthiune/Ogg.format/Resources
+@dirrm GNUstep/Local/Library/Cynthiune/Ogg.format
+@dirrm GNUstep/Local/Library/Cynthiune/OSS.output/Resources/OSSPreferences.gorm
+@dirrm GNUstep/Local/Library/Cynthiune/OSS.output/Resources/French.lproj
+@dirrm GNUstep/Local/Library/Cynthiune/OSS.output/Resources/English.lproj
+@dirrm GNUstep/Local/Library/Cynthiune/OSS.output/Resources
+@dirrm GNUstep/Local/Library/Cynthiune/OSS.output
+@dirrm GNUstep/Local/Library/Cynthiune/Musepack.format/Resources
+@dirrm GNUstep/Local/Library/Cynthiune/Musepack.format
+@dirrm GNUstep/Local/Library/Cynthiune/Mod.format/Resources
+@dirrm GNUstep/Local/Library/Cynthiune/Mod.format
+@dirrm GNUstep/Local/Library/Cynthiune/MP3.format/Resources
+@dirrm GNUstep/Local/Library/Cynthiune/MP3.format
+@dirrm GNUstep/Local/Library/Cynthiune/ID3Tag.tags/Resources
+@dirrm GNUstep/Local/Library/Cynthiune/ID3Tag.tags
+@dirrm GNUstep/Local/Library/Cynthiune/FLACTags.tags/Resources
+@dirrm GNUstep/Local/Library/Cynthiune/FLACTags.tags
+@dirrm GNUstep/Local/Library/Cynthiune/FLAC.format/Resources
+@dirrm GNUstep/Local/Library/Cynthiune/FLAC.format
+@dirrm GNUstep/Local/Library/Cynthiune/Esound.output/Resources/French.lproj
+@dirrm GNUstep/Local/Library/Cynthiune/Esound.output/Resources/EsoundPreferences.gorm
+@dirrm GNUstep/Local/Library/Cynthiune/Esound.output/Resources/English.lproj
+@dirrm GNUstep/Local/Library/Cynthiune/Esound.output/Resources
+@dirrm GNUstep/Local/Library/Cynthiune/Esound.output
+@dirrm GNUstep/Local/Library/Cynthiune/AudioFile.format/Resources
+@dirrm GNUstep/Local/Library/Cynthiune/AudioFile.format
+@dirrm GNUstep/Local/Library/Cynthiune/ASFTags.tags/Resources
+@dirrm GNUstep/Local/Library/Cynthiune/ASFTags.tags
+@dirrm GNUstep/Local/Library/Cynthiune
+@dirrm GNUstep/Local/Applications/Cynthiune.app/Resources/TraditionalChinese.lproj
+@dirrm GNUstep/Local/Applications/Cynthiune.app/Resources/Spanish.lproj
+@dirrm GNUstep/Local/Applications/Cynthiune.app/Resources/SongInspector.gorm
+@dirrm GNUstep/Local/Applications/Cynthiune.app/Resources/Slovak.lproj
+@dirrm GNUstep/Local/Applications/Cynthiune.app/Resources/Preferences.gorm
+@dirrm GNUstep/Local/Applications/Cynthiune.app/Resources/Italian.lproj
+@dirrm GNUstep/Local/Applications/Cynthiune.app/Resources/Hungarian.lproj
+@dirrm GNUstep/Local/Applications/Cynthiune.app/Resources/German.lproj
+@dirrm GNUstep/Local/Applications/Cynthiune.app/Resources/GeneralPreference.gorm
+@dirrm GNUstep/Local/Applications/Cynthiune.app/Resources/French.lproj
+@dirrm GNUstep/Local/Applications/Cynthiune.app/Resources/English.lproj
+@dirrm GNUstep/Local/Applications/Cynthiune.app/Resources/Cynthiune.gorm
+@dirrm GNUstep/Local/Applications/Cynthiune.app/Resources/Armenian.lproj
+@dirrm GNUstep/Local/Applications/Cynthiune.app/Resources
+@dirrm GNUstep/Local/Applications/Cynthiune.app
diff --git a/audio/etoile-melodie/Makefile b/audio/etoile-melodie/Makefile
index 34231efaf96a..33f510605e8d 100644
--- a/audio/etoile-melodie/Makefile
+++ b/audio/etoile-melodie/Makefile
@@ -21,7 +21,6 @@ LIB_DEPENDS=	tag.1:${PORTSDIR}/audio/taglib \
 
 USE_BZIP2=	yes
 USE_GNUSTEP=	yes
-USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
diff --git a/audio/etoile-melodie/pkg-plist b/audio/etoile-melodie/pkg-plist
index f0eb8f8e4234..f50c37d272b2 100644
--- a/audio/etoile-melodie/pkg-plist
+++ b/audio/etoile-melodie/pkg-plist
@@ -1,16 +1,16 @@
-Local/Applications/Melodie.app/Melodie
-Local/Applications/Melodie.app/Resources/ETPlaylist.st
-Local/Applications/Melodie.app/Resources/Info-gnustep.plist
-Local/Applications/Melodie.app/Resources/LKInfo.plist
-Local/Applications/Melodie.app/Resources/Melodie.desktop
-Local/Applications/Melodie.app/Resources/Melodie.gorm/data.classes
-Local/Applications/Melodie.app/Resources/Melodie.gorm/data.info
-Local/Applications/Melodie.app/Resources/Melodie.gorm/objects.gorm
-Local/Applications/Melodie.app/Resources/Melodie.tiff
-Local/Applications/Melodie.app/Resources/MelodieController.st
-Local/Applications/Melodie.app/Resources/MusicPlayerController.st
-Local/Applications/Melodie.app/stamp.make
-Local/Tools/Melodie
-@dirrm Local/Applications/Melodie.app/Resources/Melodie.gorm
-@dirrm Local/Applications/Melodie.app/Resources
-@dirrm Local/Applications/Melodie.app
+GNUstep/Local/Applications/Melodie.app/Melodie
+GNUstep/Local/Applications/Melodie.app/Resources/ETPlaylist.st
+GNUstep/Local/Applications/Melodie.app/Resources/Info-gnustep.plist
+GNUstep/Local/Applications/Melodie.app/Resources/LKInfo.plist
+GNUstep/Local/Applications/Melodie.app/Resources/Melodie.desktop
+GNUstep/Local/Applications/Melodie.app/Resources/Melodie.gorm/data.classes
+GNUstep/Local/Applications/Melodie.app/Resources/Melodie.gorm/data.info
+GNUstep/Local/Applications/Melodie.app/Resources/Melodie.gorm/objects.gorm
+GNUstep/Local/Applications/Melodie.app/Resources/Melodie.tiff
+GNUstep/Local/Applications/Melodie.app/Resources/MelodieController.st
+GNUstep/Local/Applications/Melodie.app/Resources/MusicPlayerController.st
+GNUstep/Local/Applications/Melodie.app/stamp.make
+GNUstep/Local/Tools/Melodie
+@dirrm GNUstep/Local/Applications/Melodie.app/Resources/Melodie.gorm
+@dirrm GNUstep/Local/Applications/Melodie.app/Resources
+@dirrm GNUstep/Local/Applications/Melodie.app
diff --git a/audio/etoile-volumecontrolmenulet/Makefile b/audio/etoile-volumecontrolmenulet/Makefile
index 3e5bd484e355..fbf2d8c72095 100644
--- a/audio/etoile-volumecontrolmenulet/Makefile
+++ b/audio/etoile-volumecontrolmenulet/Makefile
@@ -17,7 +17,6 @@ COMMENT=	Etoile Project VolumeControlMenulet bundle
 
 USE_BZIP2=	yes
 USE_GNUSTEP=	yes
-USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
diff --git a/audio/etoile-volumecontrolmenulet/pkg-plist b/audio/etoile-volumecontrolmenulet/pkg-plist
index 8892fa9f914c..bf1ac39ccba6 100644
--- a/audio/etoile-volumecontrolmenulet/pkg-plist
+++ b/audio/etoile-volumecontrolmenulet/pkg-plist
@@ -1,9 +1,9 @@
-Local/Library/Bundles/VolumeControlMenulet.menulet/Resources/Info-gnustep.plist
-Local/Library/Bundles/VolumeControlMenulet.menulet/Resources/VolumeControl_0.tif
-Local/Library/Bundles/VolumeControlMenulet.menulet/Resources/VolumeControl_1.tif
-Local/Library/Bundles/VolumeControlMenulet.menulet/Resources/VolumeControl_2.tif
-Local/Library/Bundles/VolumeControlMenulet.menulet/Resources/VolumeControl_3.tif
-Local/Library/Bundles/VolumeControlMenulet.menulet/VolumeControlMenulet
-Local/Library/Bundles/VolumeControlMenulet.menulet/stamp.make
-@dirrm Local/Library/Bundles/VolumeControlMenulet.menulet/Resources
-@dirrm Local/Library/Bundles/VolumeControlMenulet.menulet
+GNUstep/Local/Library/Bundles/VolumeControlMenulet.menulet/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Bundles/VolumeControlMenulet.menulet/Resources/VolumeControl_0.tif
+GNUstep/Local/Library/Bundles/VolumeControlMenulet.menulet/Resources/VolumeControl_1.tif
+GNUstep/Local/Library/Bundles/VolumeControlMenulet.menulet/Resources/VolumeControl_2.tif
+GNUstep/Local/Library/Bundles/VolumeControlMenulet.menulet/Resources/VolumeControl_3.tif
+GNUstep/Local/Library/Bundles/VolumeControlMenulet.menulet/VolumeControlMenulet
+GNUstep/Local/Library/Bundles/VolumeControlMenulet.menulet/stamp.make
+@dirrm GNUstep/Local/Library/Bundles/VolumeControlMenulet.menulet/Resources
+@dirrm GNUstep/Local/Library/Bundles/VolumeControlMenulet.menulet
diff --git a/audio/gnustep-cdplayer/Makefile b/audio/gnustep-cdplayer/Makefile
index 3c7dfca562af..e053b26fd958 100644
--- a/audio/gnustep-cdplayer/Makefile
+++ b/audio/gnustep-cdplayer/Makefile
@@ -19,7 +19,6 @@ LIB_DEPENDS+=	cdaudio.1:${PORTSDIR}/audio/libcdaudio
 
 USE_BZIP2=	yes
 USE_GNUSTEP=	yes
-USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
diff --git a/audio/gnustep-cdplayer/pkg-plist b/audio/gnustep-cdplayer/pkg-plist
index 00d5ce42ea00..276fe0654f73 100644
--- a/audio/gnustep-cdplayer/pkg-plist
+++ b/audio/gnustep-cdplayer/pkg-plist
@@ -1,105 +1,105 @@
-Local/Applications/CDPlayer.app/CDPlayer
-Local/Applications/CDPlayer.app/Resources/CDPlayer.desktop
-Local/Applications/CDPlayer.app/Resources/CDPlayer.help/Config.tiff
-Local/Applications/CDPlayer.app/Resources/CDPlayer.help/Configuration.xlp
-Local/Applications/CDPlayer.app/Resources/CDPlayer.help/HowItWorks.xlp
-Local/Applications/CDPlayer.app/Resources/CDPlayer.help/Logo.tiff
-Local/Applications/CDPlayer.app/Resources/CDPlayer.help/Main.tiff
-Local/Applications/CDPlayer.app/Resources/CDPlayer.help/MainEmpty.tiff
-Local/Applications/CDPlayer.app/Resources/CDPlayer.help/ToDo.xlp
-Local/Applications/CDPlayer.app/Resources/CDPlayer.help/TrackList.tiff
-Local/Applications/CDPlayer.app/Resources/CDPlayer.help/main.xlp
-Local/Applications/CDPlayer.app/Resources/English.lproj/FreeDB.gorm/data.classes
-Local/Applications/CDPlayer.app/Resources/English.lproj/FreeDB.gorm/objects.gorm
-Local/Applications/CDPlayer.app/Resources/English.lproj/General.gorm/data.classes
-Local/Applications/CDPlayer.app/Resources/English.lproj/General.gorm/objects.gorm
-Local/Applications/CDPlayer.app/Resources/English.lproj/Localizable.strings
-Local/Applications/CDPlayer.app/Resources/English.lproj/TrackList.gorm/data.classes
-Local/Applications/CDPlayer.app/Resources/English.lproj/TrackList.gorm/objects.gorm
-Local/Applications/CDPlayer.app/Resources/French.lproj/FreeDB.gorm/data.classes
-Local/Applications/CDPlayer.app/Resources/French.lproj/FreeDB.gorm/objects.gorm
-Local/Applications/CDPlayer.app/Resources/French.lproj/General.gorm/data.classes
-Local/Applications/CDPlayer.app/Resources/French.lproj/General.gorm/objects.gorm
-Local/Applications/CDPlayer.app/Resources/French.lproj/Localizable.strings
-Local/Applications/CDPlayer.app/Resources/French.lproj/TrackList.gorm/data.classes
-Local/Applications/CDPlayer.app/Resources/French.lproj/TrackList.gorm/objects.gorm
-Local/Applications/CDPlayer.app/Resources/German.lproj/FreeDB.gorm/data.classes
-Local/Applications/CDPlayer.app/Resources/German.lproj/FreeDB.gorm/objects.gorm
-Local/Applications/CDPlayer.app/Resources/German.lproj/General.gorm/data.classes
-Local/Applications/CDPlayer.app/Resources/German.lproj/General.gorm/objects.gorm
-Local/Applications/CDPlayer.app/Resources/German.lproj/Localizable.strings
-Local/Applications/CDPlayer.app/Resources/German.lproj/TrackList.gorm/data.classes
-Local/Applications/CDPlayer.app/Resources/German.lproj/TrackList.gorm/objects.gorm
-Local/Applications/CDPlayer.app/Resources/Info-gnustep.plist
-Local/Applications/CDPlayer.app/Resources/app.tiff
-Local/Applications/CDPlayer.app/Resources/ffwd.tiff
-Local/Applications/CDPlayer.app/Resources/iconDnDAudio.tiff
-Local/Applications/CDPlayer.app/Resources/iconDnDAudioMulti.tiff
-Local/Applications/CDPlayer.app/Resources/info.tiff
-Local/Applications/CDPlayer.app/Resources/led0.tiff
-Local/Applications/CDPlayer.app/Resources/led10.tiff
-Local/Applications/CDPlayer.app/Resources/led1.tiff
-Local/Applications/CDPlayer.app/Resources/led11.tiff
-Local/Applications/CDPlayer.app/Resources/led12.tiff
-Local/Applications/CDPlayer.app/Resources/led2.tiff
-Local/Applications/CDPlayer.app/Resources/led3.tiff
-Local/Applications/CDPlayer.app/Resources/led4.tiff
-Local/Applications/CDPlayer.app/Resources/led5.tiff
-Local/Applications/CDPlayer.app/Resources/led6.tiff
-Local/Applications/CDPlayer.app/Resources/led7.tiff
-Local/Applications/CDPlayer.app/Resources/led8.tiff
-Local/Applications/CDPlayer.app/Resources/led9.tiff
-Local/Applications/CDPlayer.app/Resources/next.tiff
-Local/Applications/CDPlayer.app/Resources/pause.tiff
-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/stamp.make
-Local/Library/Bundles/AudioCD.bundle/AudioCD
-Local/Library/Bundles/AudioCD.bundle/Resources/Info-gnustep.plist
-Local/Library/Bundles/AudioCD.bundle/stamp.make
-Local/Library/Headers/CDPlayer/AudioCDProtocol.h
-Local/Library/Bundles/AudioCD.prefs/AudioCD
-Local/Library/Bundles/AudioCD.prefs/Resources/AudioCD.tiff
-Local/Library/Bundles/AudioCD.prefs/Resources/English.lproj/AudioCD.gorm/data.classes
-Local/Library/Bundles/AudioCD.prefs/Resources/English.lproj/AudioCD.gorm/data.info
-Local/Library/Bundles/AudioCD.prefs/Resources/English.lproj/AudioCD.gorm/objects.gorm
-Local/Library/Bundles/AudioCD.prefs/Resources/English.lproj/Localizable.strings
-Local/Library/Bundles/AudioCD.prefs/Resources/French.lproj/AudioCD.gorm/data.classes
-Local/Library/Bundles/AudioCD.prefs/Resources/French.lproj/AudioCD.gorm/data.info
-Local/Library/Bundles/AudioCD.prefs/Resources/French.lproj/AudioCD.gorm/objects.gorm
-Local/Library/Bundles/AudioCD.prefs/Resources/French.lproj/Localizable.strings
-Local/Library/Bundles/AudioCD.prefs/Resources/German.lproj/AudioCD.gorm/data.classes
-Local/Library/Bundles/AudioCD.prefs/Resources/German.lproj/AudioCD.gorm/data.info
-Local/Library/Bundles/AudioCD.prefs/Resources/German.lproj/AudioCD.gorm/objects.gorm
-Local/Library/Bundles/AudioCD.prefs/Resources/German.lproj/Localizable.strings
-Local/Library/Bundles/AudioCD.prefs/Resources/Info-gnustep.plist
-Local/Library/Bundles/AudioCD.prefs/stamp.make
-Local/Tools/CDPlayer
-@dirrm Local/Library/Bundles/AudioCD.prefs/Resources/German.lproj/AudioCD.gorm
-@dirrm Local/Library/Bundles/AudioCD.prefs/Resources/German.lproj
-@dirrm Local/Library/Bundles/AudioCD.prefs/Resources/French.lproj/AudioCD.gorm
-@dirrm Local/Library/Bundles/AudioCD.prefs/Resources/French.lproj
-@dirrm Local/Library/Bundles/AudioCD.prefs/Resources/English.lproj/AudioCD.gorm
-@dirrm Local/Library/Bundles/AudioCD.prefs/Resources/English.lproj
-@dirrm Local/Library/Bundles/AudioCD.prefs/Resources
-@dirrm Local/Library/Bundles/AudioCD.prefs
-@dirrm Local/Library/Headers/CDPlayer
-@dirrm Local/Library/Bundles/AudioCD.bundle/Resources
-@dirrm Local/Library/Bundles/AudioCD.bundle
-@dirrm Local/Applications/CDPlayer.app/Resources/German.lproj/TrackList.gorm
-@dirrm Local/Applications/CDPlayer.app/Resources/German.lproj/General.gorm
-@dirrm Local/Applications/CDPlayer.app/Resources/German.lproj/FreeDB.gorm
-@dirrm Local/Applications/CDPlayer.app/Resources/German.lproj
-@dirrm Local/Applications/CDPlayer.app/Resources/French.lproj/TrackList.gorm
-@dirrm Local/Applications/CDPlayer.app/Resources/French.lproj/General.gorm
-@dirrm Local/Applications/CDPlayer.app/Resources/French.lproj/FreeDB.gorm
-@dirrm Local/Applications/CDPlayer.app/Resources/French.lproj
-@dirrm Local/Applications/CDPlayer.app/Resources/English.lproj/TrackList.gorm
-@dirrm Local/Applications/CDPlayer.app/Resources/English.lproj/General.gorm
-@dirrm Local/Applications/CDPlayer.app/Resources/English.lproj/FreeDB.gorm
-@dirrm Local/Applications/CDPlayer.app/Resources/English.lproj
-@dirrm Local/Applications/CDPlayer.app/Resources/CDPlayer.help
-@dirrm Local/Applications/CDPlayer.app/Resources
-@dirrm Local/Applications/CDPlayer.app
+GNUstep/Local/Applications/CDPlayer.app/CDPlayer
+GNUstep/Local/Applications/CDPlayer.app/Resources/CDPlayer.desktop
+GNUstep/Local/Applications/CDPlayer.app/Resources/CDPlayer.help/Config.tiff
+GNUstep/Local/Applications/CDPlayer.app/Resources/CDPlayer.help/Configuration.xlp
+GNUstep/Local/Applications/CDPlayer.app/Resources/CDPlayer.help/HowItWorks.xlp
+GNUstep/Local/Applications/CDPlayer.app/Resources/CDPlayer.help/Logo.tiff
+GNUstep/Local/Applications/CDPlayer.app/Resources/CDPlayer.help/Main.tiff
+GNUstep/Local/Applications/CDPlayer.app/Resources/CDPlayer.help/MainEmpty.tiff
+GNUstep/Local/Applications/CDPlayer.app/Resources/CDPlayer.help/ToDo.xlp
+GNUstep/Local/Applications/CDPlayer.app/Resources/CDPlayer.help/TrackList.tiff
+GNUstep/Local/Applications/CDPlayer.app/Resources/CDPlayer.help/main.xlp
+GNUstep/Local/Applications/CDPlayer.app/Resources/English.lproj/FreeDB.gorm/data.classes
+GNUstep/Local/Applications/CDPlayer.app/Resources/English.lproj/FreeDB.gorm/objects.gorm
+GNUstep/Local/Applications/CDPlayer.app/Resources/English.lproj/General.gorm/data.classes
+GNUstep/Local/Applications/CDPlayer.app/Resources/English.lproj/General.gorm/objects.gorm
+GNUstep/Local/Applications/CDPlayer.app/Resources/English.lproj/Localizable.strings
+GNUstep/Local/Applications/CDPlayer.app/Resources/English.lproj/TrackList.gorm/data.classes
+GNUstep/Local/Applications/CDPlayer.app/Resources/English.lproj/TrackList.gorm/objects.gorm
+GNUstep/Local/Applications/CDPlayer.app/Resources/French.lproj/FreeDB.gorm/data.classes
+GNUstep/Local/Applications/CDPlayer.app/Resources/French.lproj/FreeDB.gorm/objects.gorm
+GNUstep/Local/Applications/CDPlayer.app/Resources/French.lproj/General.gorm/data.classes
+GNUstep/Local/Applications/CDPlayer.app/Resources/French.lproj/General.gorm/objects.gorm
+GNUstep/Local/Applications/CDPlayer.app/Resources/French.lproj/Localizable.strings
+GNUstep/Local/Applications/CDPlayer.app/Resources/French.lproj/TrackList.gorm/data.classes
+GNUstep/Local/Applications/CDPlayer.app/Resources/French.lproj/TrackList.gorm/objects.gorm
+GNUstep/Local/Applications/CDPlayer.app/Resources/German.lproj/FreeDB.gorm/data.classes
+GNUstep/Local/Applications/CDPlayer.app/Resources/German.lproj/FreeDB.gorm/objects.gorm
+GNUstep/Local/Applications/CDPlayer.app/Resources/German.lproj/General.gorm/data.classes
+GNUstep/Local/Applications/CDPlayer.app/Resources/German.lproj/General.gorm/objects.gorm
+GNUstep/Local/Applications/CDPlayer.app/Resources/German.lproj/Localizable.strings
+GNUstep/Local/Applications/CDPlayer.app/Resources/German.lproj/TrackList.gorm/data.classes
+GNUstep/Local/Applications/CDPlayer.app/Resources/German.lproj/TrackList.gorm/objects.gorm
+GNUstep/Local/Applications/CDPlayer.app/Resources/Info-gnustep.plist
+GNUstep/Local/Applications/CDPlayer.app/Resources/app.tiff
+GNUstep/Local/Applications/CDPlayer.app/Resources/ffwd.tiff
+GNUstep/Local/Applications/CDPlayer.app/Resources/iconDnDAudio.tiff
+GNUstep/Local/Applications/CDPlayer.app/Resources/iconDnDAudioMulti.tiff
+GNUstep/Local/Applications/CDPlayer.app/Resources/info.tiff
+GNUstep/Local/Applications/CDPlayer.app/Resources/led0.tiff
+GNUstep/Local/Applications/CDPlayer.app/Resources/led10.tiff
+GNUstep/Local/Applications/CDPlayer.app/Resources/led1.tiff
+GNUstep/Local/Applications/CDPlayer.app/Resources/led11.tiff
+GNUstep/Local/Applications/CDPlayer.app/Resources/led12.tiff
+GNUstep/Local/Applications/CDPlayer.app/Resources/led2.tiff
+GNUstep/Local/Applications/CDPlayer.app/Resources/led3.tiff
+GNUstep/Local/Applications/CDPlayer.app/Resources/led4.tiff
+GNUstep/Local/Applications/CDPlayer.app/Resources/led5.tiff
+GNUstep/Local/Applications/CDPlayer.app/Resources/led6.tiff
+GNUstep/Local/Applications/CDPlayer.app/Resources/led7.tiff
+GNUstep/Local/Applications/CDPlayer.app/Resources/led8.tiff
+GNUstep/Local/Applications/CDPlayer.app/Resources/led9.tiff
+GNUstep/Local/Applications/CDPlayer.app/Resources/next.tiff
+GNUstep/Local/Applications/CDPlayer.app/Resources/pause.tiff
+GNUstep/Local/Applications/CDPlayer.app/Resources/play.tiff
+GNUstep/Local/Applications/CDPlayer.app/Resources/prev.tiff
+GNUstep/Local/Applications/CDPlayer.app/Resources/rwd.tiff
+GNUstep/Local/Applications/CDPlayer.app/Resources/stop.tiff
+GNUstep/Local/Applications/CDPlayer.app/stamp.make
+GNUstep/Local/Library/Bundles/AudioCD.bundle/AudioCD
+GNUstep/Local/Library/Bundles/AudioCD.bundle/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Bundles/AudioCD.bundle/stamp.make
+GNUstep/Local/Library/Headers/CDPlayer/AudioCDProtocol.h
+GNUstep/Local/Library/Bundles/AudioCD.prefs/AudioCD
+GNUstep/Local/Library/Bundles/AudioCD.prefs/Resources/AudioCD.tiff
+GNUstep/Local/Library/Bundles/AudioCD.prefs/Resources/English.lproj/AudioCD.gorm/data.classes
+GNUstep/Local/Library/Bundles/AudioCD.prefs/Resources/English.lproj/AudioCD.gorm/data.info
+GNUstep/Local/Library/Bundles/AudioCD.prefs/Resources/English.lproj/AudioCD.gorm/objects.gorm
+GNUstep/Local/Library/Bundles/AudioCD.prefs/Resources/English.lproj/Localizable.strings
+GNUstep/Local/Library/Bundles/AudioCD.prefs/Resources/French.lproj/AudioCD.gorm/data.classes
+GNUstep/Local/Library/Bundles/AudioCD.prefs/Resources/French.lproj/AudioCD.gorm/data.info
+GNUstep/Local/Library/Bundles/AudioCD.prefs/Resources/French.lproj/AudioCD.gorm/objects.gorm
+GNUstep/Local/Library/Bundles/AudioCD.prefs/Resources/French.lproj/Localizable.strings
+GNUstep/Local/Library/Bundles/AudioCD.prefs/Resources/German.lproj/AudioCD.gorm/data.classes
+GNUstep/Local/Library/Bundles/AudioCD.prefs/Resources/German.lproj/AudioCD.gorm/data.info
+GNUstep/Local/Library/Bundles/AudioCD.prefs/Resources/German.lproj/AudioCD.gorm/objects.gorm
+GNUstep/Local/Library/Bundles/AudioCD.prefs/Resources/German.lproj/Localizable.strings
+GNUstep/Local/Library/Bundles/AudioCD.prefs/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Bundles/AudioCD.prefs/stamp.make
+GNUstep/Local/Tools/CDPlayer
+@dirrm GNUstep/Local/Library/Bundles/AudioCD.prefs/Resources/German.lproj/AudioCD.gorm
+@dirrm GNUstep/Local/Library/Bundles/AudioCD.prefs/Resources/German.lproj
+@dirrm GNUstep/Local/Library/Bundles/AudioCD.prefs/Resources/French.lproj/AudioCD.gorm
+@dirrm GNUstep/Local/Library/Bundles/AudioCD.prefs/Resources/French.lproj
+@dirrm GNUstep/Local/Library/Bundles/AudioCD.prefs/Resources/English.lproj/AudioCD.gorm
+@dirrm GNUstep/Local/Library/Bundles/AudioCD.prefs/Resources/English.lproj
+@dirrm GNUstep/Local/Library/Bundles/AudioCD.prefs/Resources
+@dirrm GNUstep/Local/Library/Bundles/AudioCD.prefs
+@dirrm GNUstep/Local/Library/Headers/CDPlayer
+@dirrm GNUstep/Local/Library/Bundles/AudioCD.bundle/Resources
+@dirrm GNUstep/Local/Library/Bundles/AudioCD.bundle
+@dirrm GNUstep/Local/Applications/CDPlayer.app/Resources/German.lproj/TrackList.gorm
+@dirrm GNUstep/Local/Applications/CDPlayer.app/Resources/German.lproj/General.gorm
+@dirrm GNUstep/Local/Applications/CDPlayer.app/Resources/German.lproj/FreeDB.gorm
+@dirrm GNUstep/Local/Applications/CDPlayer.app/Resources/German.lproj
+@dirrm GNUstep/Local/Applications/CDPlayer.app/Resources/French.lproj/TrackList.gorm
+@dirrm GNUstep/Local/Applications/CDPlayer.app/Resources/French.lproj/General.gorm
+@dirrm GNUstep/Local/Applications/CDPlayer.app/Resources/French.lproj/FreeDB.gorm
+@dirrm GNUstep/Local/Applications/CDPlayer.app/Resources/French.lproj
+@dirrm GNUstep/Local/Applications/CDPlayer.app/Resources/English.lproj/TrackList.gorm
+@dirrm GNUstep/Local/Applications/CDPlayer.app/Resources/English.lproj/General.gorm
+@dirrm GNUstep/Local/Applications/CDPlayer.app/Resources/English.lproj/FreeDB.gorm
+@dirrm GNUstep/Local/Applications/CDPlayer.app/Resources/English.lproj
+@dirrm GNUstep/Local/Applications/CDPlayer.app/Resources/CDPlayer.help
+@dirrm GNUstep/Local/Applications/CDPlayer.app/Resources
+@dirrm GNUstep/Local/Applications/CDPlayer.app
diff --git a/audio/mp3towav-bundle/Makefile b/audio/mp3towav-bundle/Makefile
index b5a725b3e445..0551f1e04bf9 100644
--- a/audio/mp3towav-bundle/Makefile
+++ b/audio/mp3towav-bundle/Makefile
@@ -16,7 +16,6 @@ MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	MP3ToWav plugin for Burn.app
 
 USE_GNUSTEP=	yes
-USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
diff --git a/audio/mp3towav-bundle/pkg-plist b/audio/mp3towav-bundle/pkg-plist
index 8f5209c76426..4cf7dc2d7d9c 100644
--- a/audio/mp3towav-bundle/pkg-plist
+++ b/audio/mp3towav-bundle/pkg-plist
@@ -1,13 +1,13 @@
-Local/Library/Burn/MP3ToWav.bundle/MP3ToWav
-Local/Library/Burn/MP3ToWav.bundle/Resources/English.lproj/Localizable.strings
-Local/Library/Burn/MP3ToWav.bundle/Resources/French.lproj/Localizable.strings
-Local/Library/Burn/MP3ToWav.bundle/Resources/German.lproj/Localizable.strings
-Local/Library/Burn/MP3ToWav.bundle/Resources/Info-gnustep.plist
-Local/Library/Burn/MP3ToWav.bundle/Resources/iconMP3ToWav.tiff
-Local/Library/Burn/MP3ToWav.bundle/stamp.make
-@dirrm Local/Library/Burn/MP3ToWav.bundle/Resources/German.lproj
-@dirrm Local/Library/Burn/MP3ToWav.bundle/Resources/French.lproj
-@dirrm Local/Library/Burn/MP3ToWav.bundle/Resources/English.lproj
-@dirrm Local/Library/Burn/MP3ToWav.bundle/Resources
-@dirrm Local/Library/Burn/MP3ToWav.bundle
-@dirrm Local/Library/Burn
+GNUstep/Local/Library/Burn/MP3ToWav.bundle/MP3ToWav
+GNUstep/Local/Library/Burn/MP3ToWav.bundle/Resources/English.lproj/Localizable.strings
+GNUstep/Local/Library/Burn/MP3ToWav.bundle/Resources/French.lproj/Localizable.strings
+GNUstep/Local/Library/Burn/MP3ToWav.bundle/Resources/German.lproj/Localizable.strings
+GNUstep/Local/Library/Burn/MP3ToWav.bundle/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Burn/MP3ToWav.bundle/Resources/iconMP3ToWav.tiff
+GNUstep/Local/Library/Burn/MP3ToWav.bundle/stamp.make
+@dirrm GNUstep/Local/Library/Burn/MP3ToWav.bundle/Resources/German.lproj
+@dirrm GNUstep/Local/Library/Burn/MP3ToWav.bundle/Resources/French.lproj
+@dirrm GNUstep/Local/Library/Burn/MP3ToWav.bundle/Resources/English.lproj
+@dirrm GNUstep/Local/Library/Burn/MP3ToWav.bundle/Resources
+@dirrm GNUstep/Local/Library/Burn/MP3ToWav.bundle
+@dirrm GNUstep/Local/Library/Burn
diff --git a/audio/mpdcon/Makefile b/audio/mpdcon/Makefile
index 6b1cca4b94ea..844009a9e6b1 100644
--- a/audio/mpdcon/Makefile
+++ b/audio/mpdcon/Makefile
@@ -16,7 +16,6 @@ MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	A GNUstep MPD client
 
 USE_GNUSTEP=	yes
-USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
diff --git a/audio/mpdcon/pkg-plist b/audio/mpdcon/pkg-plist
index 02722543601b..fd29d18fc68c 100644
--- a/audio/mpdcon/pkg-plist
+++ b/audio/mpdcon/pkg-plist
@@ -1,61 +1,61 @@
-Local/Applications/MPDCon.app/MPDCon
-Local/Applications/MPDCon.app/Resources/COPYING
-Local/Applications/MPDCon.app/Resources/Collection.gorm/data.classes
-Local/Applications/MPDCon.app/Resources/Collection.gorm/data.info
-Local/Applications/MPDCon.app/Resources/Collection.gorm/objects.gorm
-Local/Applications/MPDCon.app/Resources/Crossfade.tiff
-Local/Applications/MPDCon.app/Resources/CrossfadeView.gorm/data.classes
-Local/Applications/MPDCon.app/Resources/CrossfadeView.gorm/data.info
-Local/Applications/MPDCon.app/Resources/CrossfadeView.gorm/objects.gorm
-Local/Applications/MPDCon.app/Resources/Current.tiff
-Local/Applications/MPDCon.app/Resources/GNUstep.tiff
-Local/Applications/MPDCon.app/Resources/Info-gnustep.plist
-Local/Applications/MPDCon.app/Resources/Install
-Local/Applications/MPDCon.app/Resources/MPDCon.desktop
-Local/Applications/MPDCon.app/Resources/MPDCon.tiff
-Local/Applications/MPDCon.app/Resources/MoveSong.tiff
-Local/Applications/MPDCon.app/Resources/Next.tiff
-Local/Applications/MPDCon.app/Resources/Pause.tiff
-Local/Applications/MPDCon.app/Resources/Play.tiff
-Local/Applications/MPDCon.app/Resources/Player.gorm/CD.tiff
-Local/Applications/MPDCon.app/Resources/Player.gorm/Crossfade.tiff
-Local/Applications/MPDCon.app/Resources/Player.gorm/Next.tiff
-Local/Applications/MPDCon.app/Resources/Player.gorm/Pause.tiff
-Local/Applications/MPDCon.app/Resources/Player.gorm/Play.tiff
-Local/Applications/MPDCon.app/Resources/Player.gorm/Playlist.tiff
-Local/Applications/MPDCon.app/Resources/Player.gorm/Prev.tiff
-Local/Applications/MPDCon.app/Resources/Player.gorm/Repeat.tiff
-Local/Applications/MPDCon.app/Resources/Player.gorm/Shuffle.tiff
-Local/Applications/MPDCon.app/Resources/Player.gorm/Stop.tiff
-Local/Applications/MPDCon.app/Resources/Player.gorm/data.classes
-Local/Applications/MPDCon.app/Resources/Player.gorm/data.info
-Local/Applications/MPDCon.app/Resources/Player.gorm/objects.gorm
-Local/Applications/MPDCon.app/Resources/Playlist.tiff
-Local/Applications/MPDCon.app/Resources/PlaylistViewer.gorm/Current.tiff
-Local/Applications/MPDCon.app/Resources/PlaylistViewer.gorm/data.classes
-Local/Applications/MPDCon.app/Resources/PlaylistViewer.gorm/data.info
-Local/Applications/MPDCon.app/Resources/PlaylistViewer.gorm/objects.gorm
-Local/Applications/MPDCon.app/Resources/PlaylistsManager.gorm/data.classes
-Local/Applications/MPDCon.app/Resources/PlaylistsManager.gorm/data.info
-Local/Applications/MPDCon.app/Resources/PlaylistsManager.gorm/objects.gorm
-Local/Applications/MPDCon.app/Resources/Preferences.gorm/data.classes
-Local/Applications/MPDCon.app/Resources/Preferences.gorm/data.info
-Local/Applications/MPDCon.app/Resources/Preferences.gorm/objects.gorm
-Local/Applications/MPDCon.app/Resources/Prev.tiff
-Local/Applications/MPDCon.app/Resources/Repeat.tiff
-Local/Applications/MPDCon.app/Resources/Shuffle.tiff
-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/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
-@dirrm Local/Applications/MPDCon.app/Resources/PlaylistViewer.gorm
-@dirrm Local/Applications/MPDCon.app/Resources/Player.gorm
-@dirrm Local/Applications/MPDCon.app/Resources/CrossfadeView.gorm
-@dirrm Local/Applications/MPDCon.app/Resources/Collection.gorm
-@dirrm Local/Applications/MPDCon.app/Resources
-@dirrm Local/Applications/MPDCon.app
+GNUstep/Local/Applications/MPDCon.app/MPDCon
+GNUstep/Local/Applications/MPDCon.app/Resources/COPYING
+GNUstep/Local/Applications/MPDCon.app/Resources/Collection.gorm/data.classes
+GNUstep/Local/Applications/MPDCon.app/Resources/Collection.gorm/data.info
+GNUstep/Local/Applications/MPDCon.app/Resources/Collection.gorm/objects.gorm
+GNUstep/Local/Applications/MPDCon.app/Resources/Crossfade.tiff
+GNUstep/Local/Applications/MPDCon.app/Resources/CrossfadeView.gorm/data.classes
+GNUstep/Local/Applications/MPDCon.app/Resources/CrossfadeView.gorm/data.info
+GNUstep/Local/Applications/MPDCon.app/Resources/CrossfadeView.gorm/objects.gorm
+GNUstep/Local/Applications/MPDCon.app/Resources/Current.tiff
+GNUstep/Local/Applications/MPDCon.app/Resources/GNUstep.tiff
+GNUstep/Local/Applications/MPDCon.app/Resources/Info-gnustep.plist
+GNUstep/Local/Applications/MPDCon.app/Resources/Install
+GNUstep/Local/Applications/MPDCon.app/Resources/MPDCon.desktop
+GNUstep/Local/Applications/MPDCon.app/Resources/MPDCon.tiff
+GNUstep/Local/Applications/MPDCon.app/Resources/MoveSong.tiff
+GNUstep/Local/Applications/MPDCon.app/Resources/Next.tiff
+GNUstep/Local/Applications/MPDCon.app/Resources/Pause.tiff
+GNUstep/Local/Applications/MPDCon.app/Resources/Play.tiff
+GNUstep/Local/Applications/MPDCon.app/Resources/Player.gorm/CD.tiff
+GNUstep/Local/Applications/MPDCon.app/Resources/Player.gorm/Crossfade.tiff
+GNUstep/Local/Applications/MPDCon.app/Resources/Player.gorm/Next.tiff
+GNUstep/Local/Applications/MPDCon.app/Resources/Player.gorm/Pause.tiff
+GNUstep/Local/Applications/MPDCon.app/Resources/Player.gorm/Play.tiff
+GNUstep/Local/Applications/MPDCon.app/Resources/Player.gorm/Playlist.tiff
+GNUstep/Local/Applications/MPDCon.app/Resources/Player.gorm/Prev.tiff
+GNUstep/Local/Applications/MPDCon.app/Resources/Player.gorm/Repeat.tiff
+GNUstep/Local/Applications/MPDCon.app/Resources/Player.gorm/Shuffle.tiff
+GNUstep/Local/Applications/MPDCon.app/Resources/Player.gorm/Stop.tiff
+GNUstep/Local/Applications/MPDCon.app/Resources/Player.gorm/data.classes
+GNUstep/Local/Applications/MPDCon.app/Resources/Player.gorm/data.info
+GNUstep/Local/Applications/MPDCon.app/Resources/Player.gorm/objects.gorm
+GNUstep/Local/Applications/MPDCon.app/Resources/Playlist.tiff
+GNUstep/Local/Applications/MPDCon.app/Resources/PlaylistViewer.gorm/Current.tiff
+GNUstep/Local/Applications/MPDCon.app/Resources/PlaylistViewer.gorm/data.classes
+GNUstep/Local/Applications/MPDCon.app/Resources/PlaylistViewer.gorm/data.info
+GNUstep/Local/Applications/MPDCon.app/Resources/PlaylistViewer.gorm/objects.gorm
+GNUstep/Local/Applications/MPDCon.app/Resources/PlaylistsManager.gorm/data.classes
+GNUstep/Local/Applications/MPDCon.app/Resources/PlaylistsManager.gorm/data.info
+GNUstep/Local/Applications/MPDCon.app/Resources/PlaylistsManager.gorm/objects.gorm
+GNUstep/Local/Applications/MPDCon.app/Resources/Preferences.gorm/data.classes
+GNUstep/Local/Applications/MPDCon.app/Resources/Preferences.gorm/data.info
+GNUstep/Local/Applications/MPDCon.app/Resources/Preferences.gorm/objects.gorm
+GNUstep/Local/Applications/MPDCon.app/Resources/Prev.tiff
+GNUstep/Local/Applications/MPDCon.app/Resources/Repeat.tiff
+GNUstep/Local/Applications/MPDCon.app/Resources/Shuffle.tiff
+GNUstep/Local/Applications/MPDCon.app/Resources/StatisticsViewer.gorm/data.classes
+GNUstep/Local/Applications/MPDCon.app/Resources/StatisticsViewer.gorm/data.info
+GNUstep/Local/Applications/MPDCon.app/Resources/StatisticsViewer.gorm/objects.gorm
+GNUstep/Local/Applications/MPDCon.app/Resources/Stop.tiff
+GNUstep/Local/Applications/MPDCon.app/stamp.make
+GNUstep/Local/Tools/MPDCon
+@dirrm GNUstep/Local/Applications/MPDCon.app/Resources/StatisticsViewer.gorm
+@dirrm GNUstep/Local/Applications/MPDCon.app/Resources/Preferences.gorm
+@dirrm GNUstep/Local/Applications/MPDCon.app/Resources/PlaylistsManager.gorm
+@dirrm GNUstep/Local/Applications/MPDCon.app/Resources/PlaylistViewer.gorm
+@dirrm GNUstep/Local/Applications/MPDCon.app/Resources/Player.gorm
+@dirrm GNUstep/Local/Applications/MPDCon.app/Resources/CrossfadeView.gorm
+@dirrm GNUstep/Local/Applications/MPDCon.app/Resources/Collection.gorm
+@dirrm GNUstep/Local/Applications/MPDCon.app/Resources
+@dirrm GNUstep/Local/Applications/MPDCon.app
diff --git a/audio/volumecontrol.app/Makefile b/audio/volumecontrol.app/Makefile
index ad40a676b0f8..ec82f663a8d5 100644
--- a/audio/volumecontrol.app/Makefile
+++ b/audio/volumecontrol.app/Makefile
@@ -16,7 +16,6 @@ MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Audio mixer for GNUstep
 
 USE_GNUSTEP=	yes
-USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
diff --git a/audio/volumecontrol.app/pkg-plist b/audio/volumecontrol.app/pkg-plist
index 5b6a4a975ed4..879cb72922ca 100644
--- a/audio/volumecontrol.app/pkg-plist
+++ b/audio/volumecontrol.app/pkg-plist
@@ -1,13 +1,13 @@
-Local/Applications/VolumeControl.app/Resources/Info-gnustep.plist
-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.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
+GNUstep/Local/Applications/VolumeControl.app/Resources/Info-gnustep.plist
+GNUstep/Local/Applications/VolumeControl.app/Resources/VolumeControl.desktop
+GNUstep/Local/Applications/VolumeControl.app/Resources/VolumeControl.gorm/data.classes
+GNUstep/Local/Applications/VolumeControl.app/Resources/VolumeControl.gorm/data.info
+GNUstep/Local/Applications/VolumeControl.app/Resources/VolumeControl.gorm/objects.gorm
+GNUstep/Local/Applications/VolumeControl.app/Resources/VolumeControl.rtf
+GNUstep/Local/Applications/VolumeControl.app/Resources/headphones.tiff
+GNUstep/Local/Applications/VolumeControl.app/VolumeControl
+GNUstep/Local/Applications/VolumeControl.app/stamp.make
+GNUstep/Local/Tools/VolumeControl
+@dirrm GNUstep/Local/Applications/VolumeControl.app/Resources/VolumeControl.gorm
+@dirrm GNUstep/Local/Applications/VolumeControl.app/Resources
+@dirrm GNUstep/Local/Applications/VolumeControl.app