10 files changed, 221 insertions, 226 deletions

diff --git a/multimedia/etoile-babbler/Makefile b/multimedia/etoile-babbler/Makefile
index b7b61485d6b2..1b455e9f0d71 100644
--- a/multimedia/etoile-babbler/Makefile
+++ b/multimedia/etoile-babbler/Makefile
@@ -19,7 +19,6 @@ COMMENT=	Simple media player for Etoile
 
 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/multimedia/etoile-babbler/pkg-plist b/multimedia/etoile-babbler/pkg-plist
index 78657cbcef50..7b5e173dfe5a 100644
--- a/multimedia/etoile-babbler/pkg-plist
+++ b/multimedia/etoile-babbler/pkg-plist
@@ -1,24 +1,24 @@
-Local/Applications/Babbler.app/Babbler
-Local/Applications/Babbler.app/Resources/Babbler.desktop
-Local/Applications/Babbler.app/Resources/English.lproj/MainMenu.gorm/data.classes
-Local/Applications/Babbler.app/Resources/English.lproj/MainMenu.gorm/data.info
-Local/Applications/Babbler.app/Resources/English.lproj/MainMenu.gorm/objects.gorm
-Local/Applications/Babbler.app/Resources/English.lproj/Player.gorm/data.classes
-Local/Applications/Babbler.app/Resources/English.lproj/Player.gorm/data.info
-Local/Applications/Babbler.app/Resources/English.lproj/Player.gorm/objects.gorm
-Local/Applications/Babbler.app/Resources/English.lproj/StreamPanel.gorm/data.classes
-Local/Applications/Babbler.app/Resources/English.lproj/StreamPanel.gorm/data.info
-Local/Applications/Babbler.app/Resources/English.lproj/StreamPanel.gorm/objects.gorm
-Local/Applications/Babbler.app/Resources/Info-gnustep.plist
-Local/Applications/Babbler.app/Resources/pause.tiff
-Local/Applications/Babbler.app/Resources/play.tiff
-Local/Applications/Babbler.app/Resources/seek_back.tiff
-Local/Applications/Babbler.app/Resources/seek_fwd.tiff
-Local/Applications/Babbler.app/stamp.make
-Local/Tools/Babbler
-@dirrm Local/Applications/Babbler.app/Resources/English.lproj/StreamPanel.gorm
-@dirrm Local/Applications/Babbler.app/Resources/English.lproj/Player.gorm
-@dirrm Local/Applications/Babbler.app/Resources/English.lproj/MainMenu.gorm
-@dirrm Local/Applications/Babbler.app/Resources/English.lproj
-@dirrm Local/Applications/Babbler.app/Resources
-@dirrm Local/Applications/Babbler.app
+GNUstep/Local/Applications/Babbler.app/Babbler
+GNUstep/Local/Applications/Babbler.app/Resources/Babbler.desktop
+GNUstep/Local/Applications/Babbler.app/Resources/English.lproj/MainMenu.gorm/data.classes
+GNUstep/Local/Applications/Babbler.app/Resources/English.lproj/MainMenu.gorm/data.info
+GNUstep/Local/Applications/Babbler.app/Resources/English.lproj/MainMenu.gorm/objects.gorm
+GNUstep/Local/Applications/Babbler.app/Resources/English.lproj/Player.gorm/data.classes
+GNUstep/Local/Applications/Babbler.app/Resources/English.lproj/Player.gorm/data.info
+GNUstep/Local/Applications/Babbler.app/Resources/English.lproj/Player.gorm/objects.gorm
+GNUstep/Local/Applications/Babbler.app/Resources/English.lproj/StreamPanel.gorm/data.classes
+GNUstep/Local/Applications/Babbler.app/Resources/English.lproj/StreamPanel.gorm/data.info
+GNUstep/Local/Applications/Babbler.app/Resources/English.lproj/StreamPanel.gorm/objects.gorm
+GNUstep/Local/Applications/Babbler.app/Resources/Info-gnustep.plist
+GNUstep/Local/Applications/Babbler.app/Resources/pause.tiff
+GNUstep/Local/Applications/Babbler.app/Resources/play.tiff
+GNUstep/Local/Applications/Babbler.app/Resources/seek_back.tiff
+GNUstep/Local/Applications/Babbler.app/Resources/seek_fwd.tiff
+GNUstep/Local/Applications/Babbler.app/stamp.make
+GNUstep/Local/Tools/Babbler
+@dirrm GNUstep/Local/Applications/Babbler.app/Resources/English.lproj/StreamPanel.gorm
+@dirrm GNUstep/Local/Applications/Babbler.app/Resources/English.lproj/Player.gorm
+@dirrm GNUstep/Local/Applications/Babbler.app/Resources/English.lproj/MainMenu.gorm
+@dirrm GNUstep/Local/Applications/Babbler.app/Resources/English.lproj
+@dirrm GNUstep/Local/Applications/Babbler.app/Resources
+@dirrm GNUstep/Local/Applications/Babbler.app
diff --git a/multimedia/etoile-mediakit/Makefile b/multimedia/etoile-mediakit/Makefile
index 9634565c0d44..a3f998397c1c 100644
--- a/multimedia/etoile-mediakit/Makefile
+++ b/multimedia/etoile-mediakit/Makefile
@@ -19,7 +19,6 @@ LIB_DEPENDS=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg
 
 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/multimedia/etoile-mediakit/pkg-plist b/multimedia/etoile-mediakit/pkg-plist
index aae9964ba2e7..12ffea607b42 100644
--- a/multimedia/etoile-mediakit/pkg-plist
+++ b/multimedia/etoile-mediakit/pkg-plist
@@ -1,23 +1,23 @@
-Local/Library/Frameworks/MediaKit.framework/Headers
-Local/Library/Frameworks/MediaKit.framework/MediaKit
-Local/Library/Frameworks/MediaKit.framework/MediaKit.framework
-Local/Library/Frameworks/MediaKit.framework/Resources
-Local/Library/Frameworks/MediaKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/MKMediaFile.h
-Local/Library/Frameworks/MediaKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/MKMusicPlayer.h
-Local/Library/Frameworks/MediaKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/MKSoundDevice.h
-Local/Library/Frameworks/MediaKit.framework/Versions/%%MAJORLIBVERSION%%/MediaKit
-Local/Library/Frameworks/MediaKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist
-Local/Library/Frameworks/MediaKit.framework/Versions/%%MAJORLIBVERSION%%/libMediaKit.so
-Local/Library/Frameworks/MediaKit.framework/Versions/%%MAJORLIBVERSION%%/libMediaKit.so.%%MAJORLIBVERSION%%
-Local/Library/Frameworks/MediaKit.framework/Versions/%%MAJORLIBVERSION%%/libMediaKit.so.%%LIBVERSION%%
-Local/Library/Frameworks/MediaKit.framework/Versions/Current
-Local/Library/Frameworks/MediaKit.framework/libMediaKit.so
-Local/Library/Headers/MediaKit
-Local/Library/Libraries/libMediaKit.so
-Local/Library/Libraries/libMediaKit.so.%%MAJORLIBVERSION%%
-Local/Library/Libraries/libMediaKit.so.%%LIBVERSION%%
-@dirrm Local/Library/Frameworks/MediaKit.framework/Versions/%%MAJORLIBVERSION%%/Resources
-@dirrm Local/Library/Frameworks/MediaKit.framework/Versions/%%MAJORLIBVERSION%%/Headers
-@dirrm Local/Library/Frameworks/MediaKit.framework/Versions/%%MAJORLIBVERSION%%
-@dirrm Local/Library/Frameworks/MediaKit.framework/Versions
-@dirrm Local/Library/Frameworks/MediaKit.framework
+GNUstep/Local/Library/Frameworks/MediaKit.framework/Headers
+GNUstep/Local/Library/Frameworks/MediaKit.framework/MediaKit
+GNUstep/Local/Library/Frameworks/MediaKit.framework/MediaKit.framework
+GNUstep/Local/Library/Frameworks/MediaKit.framework/Resources
+GNUstep/Local/Library/Frameworks/MediaKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/MKMediaFile.h
+GNUstep/Local/Library/Frameworks/MediaKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/MKMusicPlayer.h
+GNUstep/Local/Library/Frameworks/MediaKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/MKSoundDevice.h
+GNUstep/Local/Library/Frameworks/MediaKit.framework/Versions/%%MAJORLIBVERSION%%/MediaKit
+GNUstep/Local/Library/Frameworks/MediaKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Frameworks/MediaKit.framework/Versions/%%MAJORLIBVERSION%%/libMediaKit.so
+GNUstep/Local/Library/Frameworks/MediaKit.framework/Versions/%%MAJORLIBVERSION%%/libMediaKit.so.%%MAJORLIBVERSION%%
+GNUstep/Local/Library/Frameworks/MediaKit.framework/Versions/%%MAJORLIBVERSION%%/libMediaKit.so.%%LIBVERSION%%
+GNUstep/Local/Library/Frameworks/MediaKit.framework/Versions/Current
+GNUstep/Local/Library/Frameworks/MediaKit.framework/libMediaKit.so
+GNUstep/Local/Library/Headers/MediaKit
+GNUstep/Local/Library/Libraries/libMediaKit.so
+GNUstep/Local/Library/Libraries/libMediaKit.so.%%MAJORLIBVERSION%%
+GNUstep/Local/Library/Libraries/libMediaKit.so.%%LIBVERSION%%
+@dirrm GNUstep/Local/Library/Frameworks/MediaKit.framework/Versions/%%MAJORLIBVERSION%%/Resources
+@dirrm GNUstep/Local/Library/Frameworks/MediaKit.framework/Versions/%%MAJORLIBVERSION%%/Headers
+@dirrm GNUstep/Local/Library/Frameworks/MediaKit.framework/Versions/%%MAJORLIBVERSION%%
+@dirrm GNUstep/Local/Library/Frameworks/MediaKit.framework/Versions
+@dirrm GNUstep/Local/Library/Frameworks/MediaKit.framework
diff --git a/multimedia/etoile-multimediakit/Makefile b/multimedia/etoile-multimediakit/Makefile
index 9d0337178dd8..d12f19e3b5f5 100644
--- a/multimedia/etoile-multimediakit/Makefile
+++ b/multimedia/etoile-multimediakit/Makefile
@@ -19,7 +19,6 @@ COMMENT=	Common backend engine to play multimedia stream
 
 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/multimedia/etoile-multimediakit/pkg-plist b/multimedia/etoile-multimediakit/pkg-plist
index 9fd6f545cc10..63062535b0ed 100644
--- a/multimedia/etoile-multimediakit/pkg-plist
+++ b/multimedia/etoile-multimediakit/pkg-plist
@@ -1,12 +1,12 @@
-Local/Library/Headers/MultimediaKit/MMPlayer.h
-Local/Library/Headers/MultimediaKit/MPlayer.h
-Local/Library/Headers/MultimediaKit/MPlayerInterface.h
-Local/Library/Headers/MultimediaKit/Mixer.h
-Local/Library/Headers/MultimediaKit/MixerChannel.h
-Local/Library/Headers/MultimediaKit/MixerChannelView.h
-Local/Library/Headers/MultimediaKit/MixerView.h
-Local/Library/Headers/MultimediaKit/MultimediaKit.h
-Local/Library/Libraries/libMultimediaKit.so
-Local/Library/Libraries/libMultimediaKit.so.%%MAJORLIBVERSION%%
-Local/Library/Libraries/libMultimediaKit.so.%%LIBVERSION%%
-@dirrm Local/Library/Headers/MultimediaKit
+GNUstep/Local/Library/Headers/MultimediaKit/MMPlayer.h
+GNUstep/Local/Library/Headers/MultimediaKit/MPlayer.h
+GNUstep/Local/Library/Headers/MultimediaKit/MPlayerInterface.h
+GNUstep/Local/Library/Headers/MultimediaKit/Mixer.h
+GNUstep/Local/Library/Headers/MultimediaKit/MixerChannel.h
+GNUstep/Local/Library/Headers/MultimediaKit/MixerChannelView.h
+GNUstep/Local/Library/Headers/MultimediaKit/MixerView.h
+GNUstep/Local/Library/Headers/MultimediaKit/MultimediaKit.h
+GNUstep/Local/Library/Libraries/libMultimediaKit.so
+GNUstep/Local/Library/Libraries/libMultimediaKit.so.%%MAJORLIBVERSION%%
+GNUstep/Local/Library/Libraries/libMultimediaKit.so.%%LIBVERSION%%
+@dirrm GNUstep/Local/Library/Headers/MultimediaKit
diff --git a/multimedia/gnustep-mplayer/Makefile b/multimedia/gnustep-mplayer/Makefile
index 5fabe7bb996e..cd7ca6d56aba 100644
--- a/multimedia/gnustep-mplayer/Makefile
+++ b/multimedia/gnustep-mplayer/Makefile
@@ -17,7 +17,6 @@ MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	GNUstep port of MPlayerOSX
 
 USE_GNUSTEP=	yes
-USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
diff --git a/multimedia/gnustep-mplayer/pkg-plist b/multimedia/gnustep-mplayer/pkg-plist
index b415e90c382f..f97ca303d756 100644
--- a/multimedia/gnustep-mplayer/pkg-plist
+++ b/multimedia/gnustep-mplayer/pkg-plist
@@ -1,92 +1,92 @@
-Local/Applications/Mplayer.app/Mplayer
-Local/Applications/Mplayer.app/Resources/Info-gnustep.plist
-Local/Applications/Mplayer.app/Resources/MainMenu.gorm/data.classes
-Local/Applications/Mplayer.app/Resources/MainMenu.gorm/data.info
-Local/Applications/Mplayer.app/Resources/MainMenu.gorm/objects.gorm
-Local/Applications/Mplayer.app/Resources/MainMenu.gorm/play.tiff
-Local/Applications/Mplayer.app/Resources/MainMenu.gorm/play_mini.tiff
-Local/Applications/Mplayer.app/Resources/MainMenu.gorm/seek_back.tiff
-Local/Applications/Mplayer.app/Resources/MainMenu.gorm/seek_back_mini.tiff
-Local/Applications/Mplayer.app/Resources/MainMenu.gorm/seek_fwd.tiff
-Local/Applications/Mplayer.app/Resources/MainMenu.gorm/seek_fwd_mini.tiff
-Local/Applications/Mplayer.app/Resources/MainMenu.gorm/stop.tiff
-Local/Applications/Mplayer.app/Resources/MainMenu.gorm/stop_mini.tiff
-Local/Applications/Mplayer.app/Resources/MainMenu.gorm/volume0.tiff
-Local/Applications/Mplayer.app/Resources/MainMenu.gorm/volume1.tiff
-Local/Applications/Mplayer.app/Resources/MainMenu.gorm/volume2.tiff
-Local/Applications/Mplayer.app/Resources/MainMenu.gorm/volume3.tiff
-Local/Applications/Mplayer.app/Resources/Mplayer.desktop
-Local/Applications/Mplayer.app/Resources/asf.tiff
-Local/Applications/Mplayer.app/Resources/audio.icns
-Local/Applications/Mplayer.app/Resources/audio.tiff
-Local/Applications/Mplayer.app/Resources/avi.tiff
-Local/Applications/Mplayer.app/Resources/connection.tiff
-Local/Applications/Mplayer.app/Resources/icns.tar.gz
-Local/Applications/Mplayer.app/Resources/icon.icns
-Local/Applications/Mplayer.app/Resources/icon.tiff
-Local/Applications/Mplayer.app/Resources/info.png
-Local/Applications/Mplayer.app/Resources/info.tiff
-Local/Applications/Mplayer.app/Resources/main.tiff
-Local/Applications/Mplayer.app/Resources/menu1.tiff
-Local/Applications/Mplayer.app/Resources/menu2.tiff
-Local/Applications/Mplayer.app/Resources/menu3.tiff
-Local/Applications/Mplayer.app/Resources/mini.tiff
-Local/Applications/Mplayer.app/Resources/movie.icns
-Local/Applications/Mplayer.app/Resources/movie.tiff
-Local/Applications/Mplayer.app/Resources/mpeg.png
-Local/Applications/Mplayer.app/Resources/mpeg.tiff
-Local/Applications/Mplayer.app/Resources/open-loc.tiff
-Local/Applications/Mplayer.app/Resources/oroborus_2.0.12-1.tar.gz
-Local/Applications/Mplayer.app/Resources/pause.png
-Local/Applications/Mplayer.app/Resources/pause.tiff
-Local/Applications/Mplayer.app/Resources/pause_mini.png
-Local/Applications/Mplayer.app/Resources/pause_mini.tiff
-Local/Applications/Mplayer.app/Resources/play.png
-Local/Applications/Mplayer.app/Resources/play.tiff
-Local/Applications/Mplayer.app/Resources/play_mini.png
-Local/Applications/Mplayer.app/Resources/play_mini.tiff
-Local/Applications/Mplayer.app/Resources/play_mode_0.png
-Local/Applications/Mplayer.app/Resources/play_mode_0.tiff
-Local/Applications/Mplayer.app/Resources/play_mode_1.png
-Local/Applications/Mplayer.app/Resources/play_mode_1.tiff
-Local/Applications/Mplayer.app/Resources/play_mode_2.png
-Local/Applications/Mplayer.app/Resources/play_mode_2.tiff
-Local/Applications/Mplayer.app/Resources/playing_dvd.png
-Local/Applications/Mplayer.app/Resources/playing_dvd.tiff
-Local/Applications/Mplayer.app/Resources/playing_state.png
-Local/Applications/Mplayer.app/Resources/playing_state.tiff
-Local/Applications/Mplayer.app/Resources/playing_stream.png
-Local/Applications/Mplayer.app/Resources/playing_stream.tiff
-Local/Applications/Mplayer.app/Resources/pref1.tiff
-Local/Applications/Mplayer.app/Resources/pref2.tiff
-Local/Applications/Mplayer.app/Resources/preflight.tiff
-Local/Applications/Mplayer.app/Resources/seek_back.png
-Local/Applications/Mplayer.app/Resources/seek_back.tiff
-Local/Applications/Mplayer.app/Resources/seek_back_mini.png
-Local/Applications/Mplayer.app/Resources/seek_back_mini.tiff
-Local/Applications/Mplayer.app/Resources/seek_fwd.png
-Local/Applications/Mplayer.app/Resources/seek_fwd.tiff
-Local/Applications/Mplayer.app/Resources/seek_fwd_mini.png
-Local/Applications/Mplayer.app/Resources/seek_fwd_mini.tiff
-Local/Applications/Mplayer.app/Resources/settings.png
-Local/Applications/Mplayer.app/Resources/settings.tiff
-Local/Applications/Mplayer.app/Resources/stats.tiff
-Local/Applications/Mplayer.app/Resources/stop.png
-Local/Applications/Mplayer.app/Resources/stop.tiff
-Local/Applications/Mplayer.app/Resources/stop_mini.png
-Local/Applications/Mplayer.app/Resources/stop_mini.tiff
-Local/Applications/Mplayer.app/Resources/subtitles.icns
-Local/Applications/Mplayer.app/Resources/subtitles.tiff
-Local/Applications/Mplayer.app/Resources/volume0.png
-Local/Applications/Mplayer.app/Resources/volume0.tiff
-Local/Applications/Mplayer.app/Resources/volume1.png
-Local/Applications/Mplayer.app/Resources/volume1.tiff
-Local/Applications/Mplayer.app/Resources/volume2.png
-Local/Applications/Mplayer.app/Resources/volume2.tiff
-Local/Applications/Mplayer.app/Resources/volume3.png
-Local/Applications/Mplayer.app/Resources/volume3.tiff
-Local/Applications/Mplayer.app/stamp.make
-Local/Tools/Mplayer
-@dirrm Local/Applications/Mplayer.app/Resources/MainMenu.gorm
-@dirrm Local/Applications/Mplayer.app/Resources
-@dirrm Local/Applications/Mplayer.app
+GNUstep/Local/Applications/Mplayer.app/Mplayer
+GNUstep/Local/Applications/Mplayer.app/Resources/Info-gnustep.plist
+GNUstep/Local/Applications/Mplayer.app/Resources/MainMenu.gorm/data.classes
+GNUstep/Local/Applications/Mplayer.app/Resources/MainMenu.gorm/data.info
+GNUstep/Local/Applications/Mplayer.app/Resources/MainMenu.gorm/objects.gorm
+GNUstep/Local/Applications/Mplayer.app/Resources/MainMenu.gorm/play.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/MainMenu.gorm/play_mini.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/MainMenu.gorm/seek_back.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/MainMenu.gorm/seek_back_mini.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/MainMenu.gorm/seek_fwd.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/MainMenu.gorm/seek_fwd_mini.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/MainMenu.gorm/stop.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/MainMenu.gorm/stop_mini.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/MainMenu.gorm/volume0.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/MainMenu.gorm/volume1.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/MainMenu.gorm/volume2.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/MainMenu.gorm/volume3.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/Mplayer.desktop
+GNUstep/Local/Applications/Mplayer.app/Resources/asf.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/audio.icns
+GNUstep/Local/Applications/Mplayer.app/Resources/audio.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/avi.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/connection.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/icns.tar.gz
+GNUstep/Local/Applications/Mplayer.app/Resources/icon.icns
+GNUstep/Local/Applications/Mplayer.app/Resources/icon.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/info.png
+GNUstep/Local/Applications/Mplayer.app/Resources/info.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/main.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/menu1.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/menu2.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/menu3.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/mini.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/movie.icns
+GNUstep/Local/Applications/Mplayer.app/Resources/movie.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/mpeg.png
+GNUstep/Local/Applications/Mplayer.app/Resources/mpeg.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/open-loc.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/oroborus_2.0.12-1.tar.gz
+GNUstep/Local/Applications/Mplayer.app/Resources/pause.png
+GNUstep/Local/Applications/Mplayer.app/Resources/pause.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/pause_mini.png
+GNUstep/Local/Applications/Mplayer.app/Resources/pause_mini.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/play.png
+GNUstep/Local/Applications/Mplayer.app/Resources/play.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/play_mini.png
+GNUstep/Local/Applications/Mplayer.app/Resources/play_mini.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/play_mode_0.png
+GNUstep/Local/Applications/Mplayer.app/Resources/play_mode_0.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/play_mode_1.png
+GNUstep/Local/Applications/Mplayer.app/Resources/play_mode_1.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/play_mode_2.png
+GNUstep/Local/Applications/Mplayer.app/Resources/play_mode_2.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/playing_dvd.png
+GNUstep/Local/Applications/Mplayer.app/Resources/playing_dvd.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/playing_state.png
+GNUstep/Local/Applications/Mplayer.app/Resources/playing_state.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/playing_stream.png
+GNUstep/Local/Applications/Mplayer.app/Resources/playing_stream.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/pref1.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/pref2.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/preflight.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/seek_back.png
+GNUstep/Local/Applications/Mplayer.app/Resources/seek_back.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/seek_back_mini.png
+GNUstep/Local/Applications/Mplayer.app/Resources/seek_back_mini.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/seek_fwd.png
+GNUstep/Local/Applications/Mplayer.app/Resources/seek_fwd.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/seek_fwd_mini.png
+GNUstep/Local/Applications/Mplayer.app/Resources/seek_fwd_mini.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/settings.png
+GNUstep/Local/Applications/Mplayer.app/Resources/settings.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/stats.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/stop.png
+GNUstep/Local/Applications/Mplayer.app/Resources/stop.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/stop_mini.png
+GNUstep/Local/Applications/Mplayer.app/Resources/stop_mini.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/subtitles.icns
+GNUstep/Local/Applications/Mplayer.app/Resources/subtitles.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/volume0.png
+GNUstep/Local/Applications/Mplayer.app/Resources/volume0.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/volume1.png
+GNUstep/Local/Applications/Mplayer.app/Resources/volume1.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/volume2.png
+GNUstep/Local/Applications/Mplayer.app/Resources/volume2.tiff
+GNUstep/Local/Applications/Mplayer.app/Resources/volume3.png
+GNUstep/Local/Applications/Mplayer.app/Resources/volume3.tiff
+GNUstep/Local/Applications/Mplayer.app/stamp.make
+GNUstep/Local/Tools/Mplayer
+@dirrm GNUstep/Local/Applications/Mplayer.app/Resources/MainMenu.gorm
+@dirrm GNUstep/Local/Applications/Mplayer.app/Resources
+@dirrm GNUstep/Local/Applications/Mplayer.app
diff --git a/multimedia/poe/Makefile b/multimedia/poe/Makefile
index b22c7399d6b2..44678503e2cb 100644
--- a/multimedia/poe/Makefile
+++ b/multimedia/poe/Makefile
@@ -18,7 +18,6 @@ COMMENT=	A vorbis comment editor for GNUstep
 LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
 
 USE_GNUSTEP=	yes
-USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
diff --git a/multimedia/poe/pkg-plist b/multimedia/poe/pkg-plist
index 0adcc26e5c9b..f593b843fbb6 100644
--- a/multimedia/poe/pkg-plist
+++ b/multimedia/poe/pkg-plist
@@ -1,70 +1,70 @@
-Local/Applications/Poe.app/Poe
-Local/Applications/Poe.app/Resources/B_add.tiff
-Local/Applications/Poe.app/Resources/B_add_old_.png
-Local/Applications/Poe.app/Resources/B_remove.tiff
-Local/Applications/Poe.app/Resources/B_remove_old_.png
-Local/Applications/Poe.app/Resources/Bulgarian.lproj/CommentInfo.strings
-Local/Applications/Poe.app/Resources/Bulgarian.lproj/Editor.gorm/data.classes
-Local/Applications/Poe.app/Resources/Bulgarian.lproj/Editor.gorm/data.info
-Local/Applications/Poe.app/Resources/Bulgarian.lproj/Editor.gorm/objects.gorm
-Local/Applications/Poe.app/Resources/Bulgarian.lproj/Localizable.strings
-Local/Applications/Poe.app/Resources/CommentInfo.plist
-Local/Applications/Poe.app/Resources/English.lproj/AddPanel.gorm/data.classes
-Local/Applications/Poe.app/Resources/English.lproj/AddPanel.gorm/data.info
-Local/Applications/Poe.app/Resources/English.lproj/AddPanel.gorm/objects.gorm
-Local/Applications/Poe.app/Resources/English.lproj/BrowserEditor.gorm/data.classes
-Local/Applications/Poe.app/Resources/English.lproj/BrowserEditor.gorm/objects.gorm
-Local/Applications/Poe.app/Resources/English.lproj/CommentInfo.strings
-Local/Applications/Poe.app/Resources/English.lproj/Editor.gorm/data.classes
-Local/Applications/Poe.app/Resources/English.lproj/Editor.gorm/data.info
-Local/Applications/Poe.app/Resources/English.lproj/Editor.gorm/objects.gorm
-Local/Applications/Poe.app/Resources/English.lproj/Localizable.strings
-Local/Applications/Poe.app/Resources/English.lproj/Poe.gorm/data.classes
-Local/Applications/Poe.app/Resources/English.lproj/Poe.gorm/data.info
-Local/Applications/Poe.app/Resources/English.lproj/Poe.gorm/objects.gorm
-Local/Applications/Poe.app/Resources/English.lproj/Preferences.gorm/data.classes
-Local/Applications/Poe.app/Resources/English.lproj/Preferences.gorm/objects.gorm
-Local/Applications/Poe.app/Resources/FI_ogg.tiff
-Local/Applications/Poe.app/Resources/German.lproj/CommentInfo.strings
-Local/Applications/Poe.app/Resources/German.lproj/Editor.gorm/data.classes
-Local/Applications/Poe.app/Resources/German.lproj/Editor.gorm/data.info
-Local/Applications/Poe.app/Resources/German.lproj/Editor.gorm/objects.gorm
-Local/Applications/Poe.app/Resources/German.lproj/Localizable.strings
-Local/Applications/Poe.app/Resources/Info-gnustep.plist
-Local/Applications/Poe.app/Resources/Italian.lproj/CommentInfo.strings
-Local/Applications/Poe.app/Resources/Italian.lproj/Editor.gorm/data.classes
-Local/Applications/Poe.app/Resources/Italian.lproj/Editor.gorm/data.info
-Local/Applications/Poe.app/Resources/Italian.lproj/Editor.gorm/objects.gorm
-Local/Applications/Poe.app/Resources/Italian.lproj/Localizable.strings
-Local/Applications/Poe.app/Resources/Japanese.lproj/AddPanel.gorm/data.classes
-Local/Applications/Poe.app/Resources/Japanese.lproj/AddPanel.gorm/data.info
-Local/Applications/Poe.app/Resources/Japanese.lproj/AddPanel.gorm/objects.gorm
-Local/Applications/Poe.app/Resources/Japanese.lproj/CommentInfo.strings
-Local/Applications/Poe.app/Resources/Japanese.lproj/Editor.gorm/data.classes
-Local/Applications/Poe.app/Resources/Japanese.lproj/Editor.gorm/data.info
-Local/Applications/Poe.app/Resources/Japanese.lproj/Editor.gorm/objects.gorm
-Local/Applications/Poe.app/Resources/Japanese.lproj/Localizable.strings
-Local/Applications/Poe.app/Resources/Poe.desktop
-Local/Applications/Poe.app/Resources/Poe.tiff
-Local/Applications/Poe.app/Resources/Thai.lproj/CommentInfo.strings
-Local/Applications/Poe.app/Resources/Thai.lproj/Localizable.strings
-Local/Applications/Poe.app/stamp.make
-Local/Tools/Poe
-@dirrm Local/Applications/Poe.app/Resources/Thai.lproj
-@dirrm Local/Applications/Poe.app/Resources/Japanese.lproj/Editor.gorm
-@dirrm Local/Applications/Poe.app/Resources/Japanese.lproj/AddPanel.gorm
-@dirrm Local/Applications/Poe.app/Resources/Japanese.lproj
-@dirrm Local/Applications/Poe.app/Resources/Italian.lproj/Editor.gorm
-@dirrm Local/Applications/Poe.app/Resources/Italian.lproj
-@dirrm Local/Applications/Poe.app/Resources/German.lproj/Editor.gorm
-@dirrm Local/Applications/Poe.app/Resources/German.lproj
-@dirrm Local/Applications/Poe.app/Resources/English.lproj/Preferences.gorm
-@dirrm Local/Applications/Poe.app/Resources/English.lproj/Poe.gorm
-@dirrm Local/Applications/Poe.app/Resources/English.lproj/Editor.gorm
-@dirrm Local/Applications/Poe.app/Resources/English.lproj/BrowserEditor.gorm
-@dirrm Local/Applications/Poe.app/Resources/English.lproj/AddPanel.gorm
-@dirrm Local/Applications/Poe.app/Resources/English.lproj
-@dirrm Local/Applications/Poe.app/Resources/Bulgarian.lproj/Editor.gorm
-@dirrm Local/Applications/Poe.app/Resources/Bulgarian.lproj
-@dirrm Local/Applications/Poe.app/Resources
-@dirrm Local/Applications/Poe.app
+GNUstep/Local/Applications/Poe.app/Poe
+GNUstep/Local/Applications/Poe.app/Resources/B_add.tiff
+GNUstep/Local/Applications/Poe.app/Resources/B_add_old_.png
+GNUstep/Local/Applications/Poe.app/Resources/B_remove.tiff
+GNUstep/Local/Applications/Poe.app/Resources/B_remove_old_.png
+GNUstep/Local/Applications/Poe.app/Resources/Bulgarian.lproj/CommentInfo.strings
+GNUstep/Local/Applications/Poe.app/Resources/Bulgarian.lproj/Editor.gorm/data.classes
+GNUstep/Local/Applications/Poe.app/Resources/Bulgarian.lproj/Editor.gorm/data.info
+GNUstep/Local/Applications/Poe.app/Resources/Bulgarian.lproj/Editor.gorm/objects.gorm
+GNUstep/Local/Applications/Poe.app/Resources/Bulgarian.lproj/Localizable.strings
+GNUstep/Local/Applications/Poe.app/Resources/CommentInfo.plist
+GNUstep/Local/Applications/Poe.app/Resources/English.lproj/AddPanel.gorm/data.classes
+GNUstep/Local/Applications/Poe.app/Resources/English.lproj/AddPanel.gorm/data.info
+GNUstep/Local/Applications/Poe.app/Resources/English.lproj/AddPanel.gorm/objects.gorm
+GNUstep/Local/Applications/Poe.app/Resources/English.lproj/BrowserEditor.gorm/data.classes
+GNUstep/Local/Applications/Poe.app/Resources/English.lproj/BrowserEditor.gorm/objects.gorm
+GNUstep/Local/Applications/Poe.app/Resources/English.lproj/CommentInfo.strings
+GNUstep/Local/Applications/Poe.app/Resources/English.lproj/Editor.gorm/data.classes
+GNUstep/Local/Applications/Poe.app/Resources/English.lproj/Editor.gorm/data.info
+GNUstep/Local/Applications/Poe.app/Resources/English.lproj/Editor.gorm/objects.gorm
+GNUstep/Local/Applications/Poe.app/Resources/English.lproj/Localizable.strings
+GNUstep/Local/Applications/Poe.app/Resources/English.lproj/Poe.gorm/data.classes
+GNUstep/Local/Applications/Poe.app/Resources/English.lproj/Poe.gorm/data.info
+GNUstep/Local/Applications/Poe.app/Resources/English.lproj/Poe.gorm/objects.gorm
+GNUstep/Local/Applications/Poe.app/Resources/English.lproj/Preferences.gorm/data.classes
+GNUstep/Local/Applications/Poe.app/Resources/English.lproj/Preferences.gorm/objects.gorm
+GNUstep/Local/Applications/Poe.app/Resources/FI_ogg.tiff
+GNUstep/Local/Applications/Poe.app/Resources/German.lproj/CommentInfo.strings
+GNUstep/Local/Applications/Poe.app/Resources/German.lproj/Editor.gorm/data.classes
+GNUstep/Local/Applications/Poe.app/Resources/German.lproj/Editor.gorm/data.info
+GNUstep/Local/Applications/Poe.app/Resources/German.lproj/Editor.gorm/objects.gorm
+GNUstep/Local/Applications/Poe.app/Resources/German.lproj/Localizable.strings
+GNUstep/Local/Applications/Poe.app/Resources/Info-gnustep.plist
+GNUstep/Local/Applications/Poe.app/Resources/Italian.lproj/CommentInfo.strings
+GNUstep/Local/Applications/Poe.app/Resources/Italian.lproj/Editor.gorm/data.classes
+GNUstep/Local/Applications/Poe.app/Resources/Italian.lproj/Editor.gorm/data.info
+GNUstep/Local/Applications/Poe.app/Resources/Italian.lproj/Editor.gorm/objects.gorm
+GNUstep/Local/Applications/Poe.app/Resources/Italian.lproj/Localizable.strings
+GNUstep/Local/Applications/Poe.app/Resources/Japanese.lproj/AddPanel.gorm/data.classes
+GNUstep/Local/Applications/Poe.app/Resources/Japanese.lproj/AddPanel.gorm/data.info
+GNUstep/Local/Applications/Poe.app/Resources/Japanese.lproj/AddPanel.gorm/objects.gorm
+GNUstep/Local/Applications/Poe.app/Resources/Japanese.lproj/CommentInfo.strings
+GNUstep/Local/Applications/Poe.app/Resources/Japanese.lproj/Editor.gorm/data.classes
+GNUstep/Local/Applications/Poe.app/Resources/Japanese.lproj/Editor.gorm/data.info
+GNUstep/Local/Applications/Poe.app/Resources/Japanese.lproj/Editor.gorm/objects.gorm
+GNUstep/Local/Applications/Poe.app/Resources/Japanese.lproj/Localizable.strings
+GNUstep/Local/Applications/Poe.app/Resources/Poe.desktop
+GNUstep/Local/Applications/Poe.app/Resources/Poe.tiff
+GNUstep/Local/Applications/Poe.app/Resources/Thai.lproj/CommentInfo.strings
+GNUstep/Local/Applications/Poe.app/Resources/Thai.lproj/Localizable.strings
+GNUstep/Local/Applications/Poe.app/stamp.make
+GNUstep/Local/Tools/Poe
+@dirrm GNUstep/Local/Applications/Poe.app/Resources/Thai.lproj
+@dirrm GNUstep/Local/Applications/Poe.app/Resources/Japanese.lproj/Editor.gorm
+@dirrm GNUstep/Local/Applications/Poe.app/Resources/Japanese.lproj/AddPanel.gorm
+@dirrm GNUstep/Local/Applications/Poe.app/Resources/Japanese.lproj
+@dirrm GNUstep/Local/Applications/Poe.app/Resources/Italian.lproj/Editor.gorm
+@dirrm GNUstep/Local/Applications/Poe.app/Resources/Italian.lproj
+@dirrm GNUstep/Local/Applications/Poe.app/Resources/German.lproj/Editor.gorm
+@dirrm GNUstep/Local/Applications/Poe.app/Resources/German.lproj
+@dirrm GNUstep/Local/Applications/Poe.app/Resources/English.lproj/Preferences.gorm
+@dirrm GNUstep/Local/Applications/Poe.app/Resources/English.lproj/Poe.gorm
+@dirrm GNUstep/Local/Applications/Poe.app/Resources/English.lproj/Editor.gorm
+@dirrm GNUstep/Local/Applications/Poe.app/Resources/English.lproj/BrowserEditor.gorm
+@dirrm GNUstep/Local/Applications/Poe.app/Resources/English.lproj/AddPanel.gorm
+@dirrm GNUstep/Local/Applications/Poe.app/Resources/English.lproj
+@dirrm GNUstep/Local/Applications/Poe.app/Resources/Bulgarian.lproj/Editor.gorm
+@dirrm GNUstep/Local/Applications/Poe.app/Resources/Bulgarian.lproj
+@dirrm GNUstep/Local/Applications/Poe.app/Resources
+@dirrm GNUstep/Local/Applications/Poe.app