12 files changed, 174 insertions, 180 deletions

diff --git a/www/etoile-bookmarkkit/Makefile b/www/etoile-bookmarkkit/Makefile
index 1a0cc81216a8..1f0d8da5e127 100644
--- a/www/etoile-bookmarkkit/Makefile
+++ b/www/etoile-bookmarkkit/Makefile
@@ -19,7 +19,6 @@ MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Etoile Project BookmarkKit framework
 
 USE_GNUSTEP=	yes
-USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
diff --git a/www/etoile-bookmarkkit/pkg-plist b/www/etoile-bookmarkkit/pkg-plist
index 45260ae9ec29..4b61ed3a46fc 100644
--- a/www/etoile-bookmarkkit/pkg-plist
+++ b/www/etoile-bookmarkkit/pkg-plist
@@ -1,27 +1,27 @@
-Local/Library/Frameworks/BookmarkKit.framework/BookmarkKit
-Local/Library/Frameworks/BookmarkKit.framework/Headers
-Local/Library/Frameworks/BookmarkKit.framework/Resources
-Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/BookmarkKit
-Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/BKBookmark.h
-Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/BKBookmarkQuery.h
-Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/BKBookmarkSearchResult.h
-Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/BKBookmarkStore.h
-Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/BKBookmarkView.h
-Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/BKGlobals.h
-Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/BKGroup.h
-Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/BookmarkKit.h
-Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist
-Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/libBookmarkKit.so
-Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/libBookmarkKit.so.%%MAJORLIBVERSION%%
-Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/libBookmarkKit.so.%%LIBVERSION%%
-Local/Library/Frameworks/BookmarkKit.framework/Versions/Current
-Local/Library/Frameworks/BookmarkKit.framework/libBookmarkKit.so
-Local/Library/Headers/BookmarkKit
-Local/Library/Libraries/libBookmarkKit.so
-Local/Library/Libraries/libBookmarkKit.so.%%MAJORLIBVERSION%%
-Local/Library/Libraries/libBookmarkKit.so.%%LIBVERSION%%
-@dirrm Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/Resources
-@dirrm Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/Headers
-@dirrm Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%
-@dirrm Local/Library/Frameworks/BookmarkKit.framework/Versions
-@dirrm Local/Library/Frameworks/BookmarkKit.framework
+GNUstep/Local/Library/Frameworks/BookmarkKit.framework/BookmarkKit
+GNUstep/Local/Library/Frameworks/BookmarkKit.framework/Headers
+GNUstep/Local/Library/Frameworks/BookmarkKit.framework/Resources
+GNUstep/Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/BookmarkKit
+GNUstep/Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/BKBookmark.h
+GNUstep/Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/BKBookmarkQuery.h
+GNUstep/Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/BKBookmarkSearchResult.h
+GNUstep/Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/BKBookmarkStore.h
+GNUstep/Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/BKBookmarkView.h
+GNUstep/Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/BKGlobals.h
+GNUstep/Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/BKGroup.h
+GNUstep/Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/BookmarkKit.h
+GNUstep/Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/libBookmarkKit.so
+GNUstep/Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/libBookmarkKit.so.%%MAJORLIBVERSION%%
+GNUstep/Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/libBookmarkKit.so.%%LIBVERSION%%
+GNUstep/Local/Library/Frameworks/BookmarkKit.framework/Versions/Current
+GNUstep/Local/Library/Frameworks/BookmarkKit.framework/libBookmarkKit.so
+GNUstep/Local/Library/Headers/BookmarkKit
+GNUstep/Local/Library/Libraries/libBookmarkKit.so
+GNUstep/Local/Library/Libraries/libBookmarkKit.so.%%MAJORLIBVERSION%%
+GNUstep/Local/Library/Libraries/libBookmarkKit.so.%%LIBVERSION%%
+@dirrm GNUstep/Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/Resources
+@dirrm GNUstep/Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/Headers
+@dirrm GNUstep/Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%
+@dirrm GNUstep/Local/Library/Frameworks/BookmarkKit.framework/Versions
+@dirrm GNUstep/Local/Library/Frameworks/BookmarkKit.framework
diff --git a/www/etoile-mollusk/Makefile b/www/etoile-mollusk/Makefile
index 359dfa85529b..c1d8e251010d 100644
--- a/www/etoile-mollusk/Makefile
+++ b/www/etoile-mollusk/Makefile
@@ -19,7 +19,6 @@ COMMENT=	RSS reader in general
 
 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/www/etoile-mollusk/pkg-plist b/www/etoile-mollusk/pkg-plist
index aedb517d0439..f577ee5536a4 100644
--- a/www/etoile-mollusk/pkg-plist
+++ b/www/etoile-mollusk/pkg-plist
@@ -1,39 +1,39 @@
-Local/Applications/Mollusk.app/Mollusk
-Local/Applications/Mollusk.app/Resources/English.lproj/AddFeedPanel.gorm/Download-to-HardDrive.png
-Local/Applications/Mollusk.app/Resources/English.lproj/AddFeedPanel.gorm/Feeds-panel.png
-Local/Applications/Mollusk.app/Resources/English.lproj/AddFeedPanel.gorm/Feeds.png
-Local/Applications/Mollusk.app/Resources/English.lproj/AddFeedPanel.gorm/Zange.png
-Local/Applications/Mollusk.app/Resources/English.lproj/AddFeedPanel.gorm/data.classes
-Local/Applications/Mollusk.app/Resources/English.lproj/AddFeedPanel.gorm/data.info
-Local/Applications/Mollusk.app/Resources/English.lproj/AddFeedPanel.gorm/minus.png
-Local/Applications/Mollusk.app/Resources/English.lproj/AddFeedPanel.gorm/objects.gorm
-Local/Applications/Mollusk.app/Resources/English.lproj/AddFeedPanel.gorm/plus.png
-Local/Applications/Mollusk.app/Resources/English.lproj/AddFeedPanel.gorm/read-news.png
-Local/Applications/Mollusk.app/Resources/English.lproj/FontPreferencePane.gorm/data.classes
-Local/Applications/Mollusk.app/Resources/English.lproj/FontPreferencePane.gorm/data.info
-Local/Applications/Mollusk.app/Resources/English.lproj/FontPreferencePane.gorm/objects.gorm
-Local/Applications/Mollusk.app/Resources/English.lproj/Localizable.strings
-Local/Applications/Mollusk.app/Resources/English.lproj/MainMenu.gorm/data.classes
-Local/Applications/Mollusk.app/Resources/English.lproj/MainMenu.gorm/data.info
-Local/Applications/Mollusk.app/Resources/English.lproj/MainMenu.gorm/objects.gorm
-Local/Applications/Mollusk.app/Resources/English.lproj/PreferencePane.gorm/data.classes
-Local/Applications/Mollusk.app/Resources/English.lproj/PreferencePane.gorm/data.info
-Local/Applications/Mollusk.app/Resources/English.lproj/PreferencePane.gorm/objects.gorm
-Local/Applications/Mollusk.app/Resources/Info-gnustep.plist
-Local/Applications/Mollusk.app/Resources/Mollusk.desktop
-Local/Applications/Mollusk.app/Resources/MolluskInfo.plist
-Local/Applications/Mollusk.app/Resources/rdf.tiff
-Local/Applications/Mollusk.app/Resources/rss.tiff
-Local/Applications/Mollusk.app/Resources/rssreader-working.png
-Local/Applications/Mollusk.app/Resources/rssreader.icns
-Local/Applications/Mollusk.app/Resources/rssreader.png
-Local/Applications/Mollusk.app/Resources/xml.tiff
-Local/Applications/Mollusk.app/stamp.make
-Local/Tools/Mollusk
-@dirrm Local/Applications/Mollusk.app/Resources/English.lproj/PreferencePane.gorm
-@dirrm Local/Applications/Mollusk.app/Resources/English.lproj/MainMenu.gorm
-@dirrm Local/Applications/Mollusk.app/Resources/English.lproj/FontPreferencePane.gorm
-@dirrm Local/Applications/Mollusk.app/Resources/English.lproj/AddFeedPanel.gorm
-@dirrm Local/Applications/Mollusk.app/Resources/English.lproj
-@dirrm Local/Applications/Mollusk.app/Resources
-@dirrm Local/Applications/Mollusk.app
+GNUstep/Local/Applications/Mollusk.app/Mollusk
+GNUstep/Local/Applications/Mollusk.app/Resources/English.lproj/AddFeedPanel.gorm/Download-to-HardDrive.png
+GNUstep/Local/Applications/Mollusk.app/Resources/English.lproj/AddFeedPanel.gorm/Feeds-panel.png
+GNUstep/Local/Applications/Mollusk.app/Resources/English.lproj/AddFeedPanel.gorm/Feeds.png
+GNUstep/Local/Applications/Mollusk.app/Resources/English.lproj/AddFeedPanel.gorm/Zange.png
+GNUstep/Local/Applications/Mollusk.app/Resources/English.lproj/AddFeedPanel.gorm/data.classes
+GNUstep/Local/Applications/Mollusk.app/Resources/English.lproj/AddFeedPanel.gorm/data.info
+GNUstep/Local/Applications/Mollusk.app/Resources/English.lproj/AddFeedPanel.gorm/minus.png
+GNUstep/Local/Applications/Mollusk.app/Resources/English.lproj/AddFeedPanel.gorm/objects.gorm
+GNUstep/Local/Applications/Mollusk.app/Resources/English.lproj/AddFeedPanel.gorm/plus.png
+GNUstep/Local/Applications/Mollusk.app/Resources/English.lproj/AddFeedPanel.gorm/read-news.png
+GNUstep/Local/Applications/Mollusk.app/Resources/English.lproj/FontPreferencePane.gorm/data.classes
+GNUstep/Local/Applications/Mollusk.app/Resources/English.lproj/FontPreferencePane.gorm/data.info
+GNUstep/Local/Applications/Mollusk.app/Resources/English.lproj/FontPreferencePane.gorm/objects.gorm
+GNUstep/Local/Applications/Mollusk.app/Resources/English.lproj/Localizable.strings
+GNUstep/Local/Applications/Mollusk.app/Resources/English.lproj/MainMenu.gorm/data.classes
+GNUstep/Local/Applications/Mollusk.app/Resources/English.lproj/MainMenu.gorm/data.info
+GNUstep/Local/Applications/Mollusk.app/Resources/English.lproj/MainMenu.gorm/objects.gorm
+GNUstep/Local/Applications/Mollusk.app/Resources/English.lproj/PreferencePane.gorm/data.classes
+GNUstep/Local/Applications/Mollusk.app/Resources/English.lproj/PreferencePane.gorm/data.info
+GNUstep/Local/Applications/Mollusk.app/Resources/English.lproj/PreferencePane.gorm/objects.gorm
+GNUstep/Local/Applications/Mollusk.app/Resources/Info-gnustep.plist
+GNUstep/Local/Applications/Mollusk.app/Resources/Mollusk.desktop
+GNUstep/Local/Applications/Mollusk.app/Resources/MolluskInfo.plist
+GNUstep/Local/Applications/Mollusk.app/Resources/rdf.tiff
+GNUstep/Local/Applications/Mollusk.app/Resources/rss.tiff
+GNUstep/Local/Applications/Mollusk.app/Resources/rssreader-working.png
+GNUstep/Local/Applications/Mollusk.app/Resources/rssreader.icns
+GNUstep/Local/Applications/Mollusk.app/Resources/rssreader.png
+GNUstep/Local/Applications/Mollusk.app/Resources/xml.tiff
+GNUstep/Local/Applications/Mollusk.app/stamp.make
+GNUstep/Local/Tools/Mollusk
+@dirrm GNUstep/Local/Applications/Mollusk.app/Resources/English.lproj/PreferencePane.gorm
+@dirrm GNUstep/Local/Applications/Mollusk.app/Resources/English.lproj/MainMenu.gorm
+@dirrm GNUstep/Local/Applications/Mollusk.app/Resources/English.lproj/FontPreferencePane.gorm
+@dirrm GNUstep/Local/Applications/Mollusk.app/Resources/English.lproj/AddFeedPanel.gorm
+@dirrm GNUstep/Local/Applications/Mollusk.app/Resources/English.lproj
+@dirrm GNUstep/Local/Applications/Mollusk.app/Resources
+@dirrm GNUstep/Local/Applications/Mollusk.app
diff --git a/www/etoile-rsskit/Makefile b/www/etoile-rsskit/Makefile
index 3e00d94b0c88..dfa6792ee13a 100644
--- a/www/etoile-rsskit/Makefile
+++ b/www/etoile-rsskit/Makefile
@@ -19,7 +19,6 @@ MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Etoile Project RSSKit framwork
 
 USE_GNUSTEP=	yes
-USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
diff --git a/www/etoile-rsskit/pkg-plist b/www/etoile-rsskit/pkg-plist
index a980bb55f175..7faad35d932a 100644
--- a/www/etoile-rsskit/pkg-plist
+++ b/www/etoile-rsskit/pkg-plist
@@ -1,39 +1,39 @@
-Local/Library/Frameworks/RSSKit.framework/Headers
-Local/Library/Frameworks/RSSKit.framework/RSSKit
-Local/Library/Frameworks/RSSKit.framework/Resources
-Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/Atom03Parser.h
-Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/Atom10Parser.h
-Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/AtomParser.h
-Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/DOMParser.h
-Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/DublinCore.h
-Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/FeedParser.h
-Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/NewRSSArticleListener.h
-Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/RSS10Parser.h
-Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/RSS20Parser.h
-Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/RSSArticle+Storage.h
-Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/RSSArticle.h
-Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/RSSArticleCreationListener.h
-Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/RSSArticleProtocol.h
-Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/RSSFactory.h
-Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/RSSFeed+Fetching.h
-Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/RSSFeed+Storage.h
-Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/RSSFeed.h
-Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/RSSFeedProtocol.h
-Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/RSSKit.h
-Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/RSSLinks.h
-Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/RSSKit
-Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist
-Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/libRSSKit.so
-Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/libRSSKit.so.%%LIBVERSION%%
-Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/libRSSKit.so.%%MAJORLIBVERSION%%
-Local/Library/Frameworks/RSSKit.framework/Versions/Current
-Local/Library/Frameworks/RSSKit.framework/libRSSKit.so
-Local/Library/Headers/RSSKit
-Local/Library/Libraries/libRSSKit.so
-Local/Library/Libraries/libRSSKit.so.%%MAJORLIBVERSION%%
-Local/Library/Libraries/libRSSKit.so.%%LIBVERSION%%
-@dirrm Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Resources
-@dirrm Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers
-@dirrm Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%
-@dirrm Local/Library/Frameworks/RSSKit.framework/Versions
-@dirrm Local/Library/Frameworks/RSSKit.framework
+GNUstep/Local/Library/Frameworks/RSSKit.framework/Headers
+GNUstep/Local/Library/Frameworks/RSSKit.framework/RSSKit
+GNUstep/Local/Library/Frameworks/RSSKit.framework/Resources
+GNUstep/Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/Atom03Parser.h
+GNUstep/Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/Atom10Parser.h
+GNUstep/Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/AtomParser.h
+GNUstep/Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/DOMParser.h
+GNUstep/Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/DublinCore.h
+GNUstep/Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/FeedParser.h
+GNUstep/Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/NewRSSArticleListener.h
+GNUstep/Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/RSS10Parser.h
+GNUstep/Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/RSS20Parser.h
+GNUstep/Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/RSSArticle+Storage.h
+GNUstep/Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/RSSArticle.h
+GNUstep/Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/RSSArticleCreationListener.h
+GNUstep/Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/RSSArticleProtocol.h
+GNUstep/Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/RSSFactory.h
+GNUstep/Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/RSSFeed+Fetching.h
+GNUstep/Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/RSSFeed+Storage.h
+GNUstep/Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/RSSFeed.h
+GNUstep/Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/RSSFeedProtocol.h
+GNUstep/Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/RSSKit.h
+GNUstep/Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/RSSLinks.h
+GNUstep/Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/RSSKit
+GNUstep/Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/libRSSKit.so
+GNUstep/Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/libRSSKit.so.%%LIBVERSION%%
+GNUstep/Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/libRSSKit.so.%%MAJORLIBVERSION%%
+GNUstep/Local/Library/Frameworks/RSSKit.framework/Versions/Current
+GNUstep/Local/Library/Frameworks/RSSKit.framework/libRSSKit.so
+GNUstep/Local/Library/Headers/RSSKit
+GNUstep/Local/Library/Libraries/libRSSKit.so
+GNUstep/Local/Library/Libraries/libRSSKit.so.%%MAJORLIBVERSION%%
+GNUstep/Local/Library/Libraries/libRSSKit.so.%%LIBVERSION%%
+@dirrm GNUstep/Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Resources
+@dirrm GNUstep/Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers
+@dirrm GNUstep/Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%
+@dirrm GNUstep/Local/Library/Frameworks/RSSKit.framework/Versions
+@dirrm GNUstep/Local/Library/Frameworks/RSSKit.framework
diff --git a/www/gnustep-ticker/Makefile b/www/gnustep-ticker/Makefile
index 8a7d39b11831..9ae5f3b8016c 100644
--- a/www/gnustep-ticker/Makefile
+++ b/www/gnustep-ticker/Makefile
@@ -19,7 +19,6 @@ MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	RSS monitor for RSS and Atom feeds
 
 USE_GNUSTEP=	yes
-USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
diff --git a/www/gnustep-ticker/pkg-plist b/www/gnustep-ticker/pkg-plist
index a688518a8340..52ab4addb4ee 100644
--- a/www/gnustep-ticker/pkg-plist
+++ b/www/gnustep-ticker/pkg-plist
@@ -1,8 +1,8 @@
-Local/Applications/Ticker.app/Resources/Info-gnustep.plist
-Local/Applications/Ticker.app/Resources/Ticker.desktop
-Local/Applications/Ticker.app/Resources/Ticker.tiff
-Local/Applications/Ticker.app/Ticker
-Local/Applications/Ticker.app/stamp.make
-Local/Tools/Ticker
-@dirrm Local/Applications/Ticker.app/Resources
-@dirrm Local/Applications/Ticker.app
+GNUstep/Local/Applications/Ticker.app/Resources/Info-gnustep.plist
+GNUstep/Local/Applications/Ticker.app/Resources/Ticker.desktop
+GNUstep/Local/Applications/Ticker.app/Resources/Ticker.tiff
+GNUstep/Local/Applications/Ticker.app/Ticker
+GNUstep/Local/Applications/Ticker.app/stamp.make
+GNUstep/Local/Tools/Ticker
+@dirrm GNUstep/Local/Applications/Ticker.app/Resources
+@dirrm GNUstep/Local/Applications/Ticker.app
diff --git a/www/webserver/Makefile b/www/webserver/Makefile
index f9c4a0d89910..23ddec2606b5 100644
--- a/www/webserver/Makefile
+++ b/www/webserver/Makefile
@@ -16,7 +16,6 @@ MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Framework for a GNUstep to act as HTTP or HTTPS server
 
 USE_GNUSTEP=	yes
-USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BASE=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
diff --git a/www/webserver/pkg-plist b/www/webserver/pkg-plist
index 6297fe4ff677..3c44bb7e72e8 100644
--- a/www/webserver/pkg-plist
+++ b/www/webserver/pkg-plist
@@ -1,10 +1,10 @@
-Local/Library/Documentation/WebServer/WebServer.gsdoc
-Local/Library/Documentation/WebServer/WebServer.html
-Local/Library/Documentation/WebServer/WebServer.igsdoc
-Local/Library/Documentation/WebServer/dependencies
-Local/Library/Headers/WebServer/WebServer.h
-Local/Library/Libraries/libWebServer.so
-Local/Library/Libraries/libWebServer.so.%%LIBVERSION%%
-Local/Library/Libraries/libWebServer.so.%%LIBVERSION2%%
-@dirrm Local/Library/Headers/WebServer
-@dirrm Local/Library/Documentation/WebServer
+GNUstep/Local/Library/Documentation/WebServer/WebServer.gsdoc
+GNUstep/Local/Library/Documentation/WebServer/WebServer.html
+GNUstep/Local/Library/Documentation/WebServer/WebServer.igsdoc
+GNUstep/Local/Library/Documentation/WebServer/dependencies
+GNUstep/Local/Library/Headers/WebServer/WebServer.h
+GNUstep/Local/Library/Libraries/libWebServer.so
+GNUstep/Local/Library/Libraries/libWebServer.so.%%LIBVERSION%%
+GNUstep/Local/Library/Libraries/libWebServer.so.%%LIBVERSION2%%
+@dirrm GNUstep/Local/Library/Headers/WebServer
+@dirrm GNUstep/Local/Library/Documentation/WebServer
diff --git a/www/webservices/Makefile b/www/webservices/Makefile
index 7e1e3cd91c57..55c4fedaa5e2 100644
--- a/www/webservices/Makefile
+++ b/www/webservices/Makefile
@@ -16,7 +16,6 @@ MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Classes for building web services
 
 USE_GNUSTEP=	yes
-USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
diff --git a/www/webservices/pkg-plist b/www/webservices/pkg-plist
index c020d77f5f52..e668fd99c8c1 100644
--- a/www/webservices/pkg-plist
+++ b/www/webservices/pkg-plist
@@ -1,51 +1,51 @@
-Local/Library/Documentation/WebServices/ClassesTOC.gsdoc
-Local/Library/Documentation/WebServices/ClassesTOC.html
-Local/Library/Documentation/WebServices/ConstantsTOC.gsdoc
-Local/Library/Documentation/WebServices/ConstantsTOC.html
-Local/Library/Documentation/WebServices/GWSBinding.gsdoc
-Local/Library/Documentation/WebServices/GWSBinding.html
-Local/Library/Documentation/WebServices/GWSCoder.gsdoc
-Local/Library/Documentation/WebServices/GWSCoder.html
-Local/Library/Documentation/WebServices/GWSDocument.gsdoc
-Local/Library/Documentation/WebServices/GWSDocument.html
-Local/Library/Documentation/WebServices/GWSElement.gsdoc
-Local/Library/Documentation/WebServices/GWSElement.html
-Local/Library/Documentation/WebServices/GWSExtensibility.gsdoc
-Local/Library/Documentation/WebServices/GWSExtensibility.html
-Local/Library/Documentation/WebServices/GWSMessage.gsdoc
-Local/Library/Documentation/WebServices/GWSMessage.html
-Local/Library/Documentation/WebServices/GWSPort.gsdoc
-Local/Library/Documentation/WebServices/GWSPort.html
-Local/Library/Documentation/WebServices/GWSPortType.gsdoc
-Local/Library/Documentation/WebServices/GWSPortType.html
-Local/Library/Documentation/WebServices/GWSService.gsdoc
-Local/Library/Documentation/WebServices/GWSService.html
-Local/Library/Documentation/WebServices/GWSType.gsdoc
-Local/Library/Documentation/WebServices/GWSType.html
-Local/Library/Documentation/WebServices/MainIndex.html
-Local/Library/Documentation/WebServices/TypesAndConstants.gsdoc
-Local/Library/Documentation/WebServices/TypesAndConstants.html
-Local/Library/Documentation/WebServices/WSSUsernameToken.gsdoc
-Local/Library/Documentation/WebServices/WSSUsernameToken.html
-Local/Library/Documentation/WebServices/WebServices.html
-Local/Library/Documentation/WebServices/WebServices.igsdoc
-Local/Library/Documentation/WebServices/dependencies
-Local/Library/Documentation/WebServices/index.html
-Local/Library/Headers/WebServices/GWSBinding.h
-Local/Library/Headers/WebServices/GWSCoder.h
-Local/Library/Headers/WebServices/GWSConstants.h
-Local/Library/Headers/WebServices/GWSDocument.h
-Local/Library/Headers/WebServices/GWSElement.h
-Local/Library/Headers/WebServices/GWSExtensibility.h
-Local/Library/Headers/WebServices/GWSMessage.h
-Local/Library/Headers/WebServices/GWSPort.h
-Local/Library/Headers/WebServices/GWSPortType.h
-Local/Library/Headers/WebServices/GWSService.h
-Local/Library/Headers/WebServices/GWSType.h
-Local/Library/Headers/WebServices/WSSUsernameToken.h
-Local/Library/Headers/WebServices/WebServices.h
-Local/Library/Libraries/libWebServices.so
-Local/Library/Libraries/libWebServices.so.%%LIBVERSION%%
-Local/Library/Libraries/libWebServices.so.%%VERSION%%
-@dirrm Local/Library/Headers/WebServices
-@dirrm Local/Library/Documentation/WebServices
+GNUstep/Local/Library/Documentation/WebServices/ClassesTOC.gsdoc
+GNUstep/Local/Library/Documentation/WebServices/ClassesTOC.html
+GNUstep/Local/Library/Documentation/WebServices/ConstantsTOC.gsdoc
+GNUstep/Local/Library/Documentation/WebServices/ConstantsTOC.html
+GNUstep/Local/Library/Documentation/WebServices/GWSBinding.gsdoc
+GNUstep/Local/Library/Documentation/WebServices/GWSBinding.html
+GNUstep/Local/Library/Documentation/WebServices/GWSCoder.gsdoc
+GNUstep/Local/Library/Documentation/WebServices/GWSCoder.html
+GNUstep/Local/Library/Documentation/WebServices/GWSDocument.gsdoc
+GNUstep/Local/Library/Documentation/WebServices/GWSDocument.html
+GNUstep/Local/Library/Documentation/WebServices/GWSElement.gsdoc
+GNUstep/Local/Library/Documentation/WebServices/GWSElement.html
+GNUstep/Local/Library/Documentation/WebServices/GWSExtensibility.gsdoc
+GNUstep/Local/Library/Documentation/WebServices/GWSExtensibility.html
+GNUstep/Local/Library/Documentation/WebServices/GWSMessage.gsdoc
+GNUstep/Local/Library/Documentation/WebServices/GWSMessage.html
+GNUstep/Local/Library/Documentation/WebServices/GWSPort.gsdoc
+GNUstep/Local/Library/Documentation/WebServices/GWSPort.html
+GNUstep/Local/Library/Documentation/WebServices/GWSPortType.gsdoc
+GNUstep/Local/Library/Documentation/WebServices/GWSPortType.html
+GNUstep/Local/Library/Documentation/WebServices/GWSService.gsdoc
+GNUstep/Local/Library/Documentation/WebServices/GWSService.html
+GNUstep/Local/Library/Documentation/WebServices/GWSType.gsdoc
+GNUstep/Local/Library/Documentation/WebServices/GWSType.html
+GNUstep/Local/Library/Documentation/WebServices/MainIndex.html
+GNUstep/Local/Library/Documentation/WebServices/TypesAndConstants.gsdoc
+GNUstep/Local/Library/Documentation/WebServices/TypesAndConstants.html
+GNUstep/Local/Library/Documentation/WebServices/WSSUsernameToken.gsdoc
+GNUstep/Local/Library/Documentation/WebServices/WSSUsernameToken.html
+GNUstep/Local/Library/Documentation/WebServices/WebServices.html
+GNUstep/Local/Library/Documentation/WebServices/WebServices.igsdoc
+GNUstep/Local/Library/Documentation/WebServices/dependencies
+GNUstep/Local/Library/Documentation/WebServices/index.html
+GNUstep/Local/Library/Headers/WebServices/GWSBinding.h
+GNUstep/Local/Library/Headers/WebServices/GWSCoder.h
+GNUstep/Local/Library/Headers/WebServices/GWSConstants.h
+GNUstep/Local/Library/Headers/WebServices/GWSDocument.h
+GNUstep/Local/Library/Headers/WebServices/GWSElement.h
+GNUstep/Local/Library/Headers/WebServices/GWSExtensibility.h
+GNUstep/Local/Library/Headers/WebServices/GWSMessage.h
+GNUstep/Local/Library/Headers/WebServices/GWSPort.h
+GNUstep/Local/Library/Headers/WebServices/GWSPortType.h
+GNUstep/Local/Library/Headers/WebServices/GWSService.h
+GNUstep/Local/Library/Headers/WebServices/GWSType.h
+GNUstep/Local/Library/Headers/WebServices/WSSUsernameToken.h
+GNUstep/Local/Library/Headers/WebServices/WebServices.h
+GNUstep/Local/Library/Libraries/libWebServices.so
+GNUstep/Local/Library/Libraries/libWebServices.so.%%LIBVERSION%%
+GNUstep/Local/Library/Libraries/libWebServices.so.%%VERSION%%
+@dirrm GNUstep/Local/Library/Headers/WebServices
+@dirrm GNUstep/Local/Library/Documentation/WebServices