2 files changed, 69 insertions, 70 deletions

diff --git a/textproc/etoile-ogrekit/Makefile b/textproc/etoile-ogrekit/Makefile
index 09cb68bb6594..262a71ea82dd 100644
--- a/textproc/etoile-ogrekit/Makefile
+++ b/textproc/etoile-ogrekit/Makefile
@@ -17,7 +17,6 @@ COMMENT=	Etoile Project OgreKit framework
 
 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/textproc/etoile-ogrekit/pkg-plist b/textproc/etoile-ogrekit/pkg-plist
index 5e810a5fe0aa..a789490358c8 100644
--- a/textproc/etoile-ogrekit/pkg-plist
+++ b/textproc/etoile-ogrekit/pkg-plist
@@ -1,69 +1,69 @@
-Local/Library/Frameworks/OgreKit.framework/Headers
-Local/Library/Frameworks/OgreKit.framework/OgreKit
-Local/Library/Frameworks/OgreKit.framework/OgreKit.framework
-Local/Library/Frameworks/OgreKit.framework/Resources
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSString_OgreKitAdditions.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OGAttributedString.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OGMutableAttributedString.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OGMutablePlainString.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OGMutableString.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OGPlainString.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OGRegularExpression.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OGRegularExpressionCapture.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OGRegularExpressionEnumerator.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OGRegularExpressionFormatter.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OGRegularExpressionMatch.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OGReplaceExpression.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OGString.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreFindAllThread.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreFindPanel.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreFindPanelController.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreFindResultBranch.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreFindResultLeaf.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreFindResultRoot.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreFindResultWindowController.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreFindThread.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreHighlightThread.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreKit.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreOutlineColumn.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreOutlineView.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreReplaceAllThread.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreReplaceAndFindThread.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTableColumn.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTableView.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextFindBranch.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextFindComponent.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextFindComponentEnumerator.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextFindLeaf.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextFindProgressSheet.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextFindResult.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextFindReverseComponentEnumerator.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextFindRoot.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextFindThread.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextFinder.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextView.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextViewAdapter.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextViewFindResult.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextViewGraphicAllowedAdapter.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextViewMatchFindResult.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextViewPlainAdapter.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextViewRichAdapter.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextViewUndoer.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreUnhighlightThread.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreView.h
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/OgreKit
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/libOgreKit.so
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/libOgreKit.so.%%LIBVERSION%%
-Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/libOgreKit.so.%%MAJORLIBVERSION%%
-Local/Library/Frameworks/OgreKit.framework/Versions/Current
-Local/Library/Frameworks/OgreKit.framework/libOgreKit.so
-Local/Library/Headers/OgreKit
-Local/Library/Libraries/libOgreKit.so
-Local/Library/Libraries/libOgreKit.so.%%MAJORLIBVERSION%%
-Local/Library/Libraries/libOgreKit.so.%%LIBVERSION%%
-@dirrm Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Resources
-@dirrm Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers
-@dirrm Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%
-@dirrm Local/Library/Frameworks/OgreKit.framework/Versions
-@dirrm Local/Library/Frameworks/OgreKit.framework
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Headers
+GNUstep/Local/Library/Frameworks/OgreKit.framework/OgreKit
+GNUstep/Local/Library/Frameworks/OgreKit.framework/OgreKit.framework
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Resources
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSString_OgreKitAdditions.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OGAttributedString.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OGMutableAttributedString.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OGMutablePlainString.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OGMutableString.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OGPlainString.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OGRegularExpression.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OGRegularExpressionCapture.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OGRegularExpressionEnumerator.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OGRegularExpressionFormatter.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OGRegularExpressionMatch.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OGReplaceExpression.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OGString.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreFindAllThread.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreFindPanel.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreFindPanelController.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreFindResultBranch.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreFindResultLeaf.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreFindResultRoot.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreFindResultWindowController.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreFindThread.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreHighlightThread.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreKit.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreOutlineColumn.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreOutlineView.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreReplaceAllThread.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreReplaceAndFindThread.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTableColumn.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTableView.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextFindBranch.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextFindComponent.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextFindComponentEnumerator.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextFindLeaf.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextFindProgressSheet.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextFindResult.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextFindReverseComponentEnumerator.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextFindRoot.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextFindThread.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextFinder.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextView.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextViewAdapter.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextViewFindResult.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextViewGraphicAllowedAdapter.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextViewMatchFindResult.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextViewPlainAdapter.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextViewRichAdapter.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextViewUndoer.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreUnhighlightThread.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreView.h
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/OgreKit
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/libOgreKit.so
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/libOgreKit.so.%%LIBVERSION%%
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/libOgreKit.so.%%MAJORLIBVERSION%%
+GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/Current
+GNUstep/Local/Library/Frameworks/OgreKit.framework/libOgreKit.so
+GNUstep/Local/Library/Headers/OgreKit
+GNUstep/Local/Library/Libraries/libOgreKit.so
+GNUstep/Local/Library/Libraries/libOgreKit.so.%%MAJORLIBVERSION%%
+GNUstep/Local/Library/Libraries/libOgreKit.so.%%LIBVERSION%%
+@dirrm GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Resources
+@dirrm GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers
+@dirrm GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%
+@dirrm GNUstep/Local/Library/Frameworks/OgreKit.framework/Versions
+@dirrm GNUstep/Local/Library/Frameworks/OgreKit.framework