- update to etoile 0.2

3 files changed, 72 insertions, 60 deletions

diff --git a/textproc/etoile-ogrekit/Makefile b/textproc/etoile-ogrekit/Makefile
index 6d656dd01e97..0c42eac46095 100644
--- a/textproc/etoile-ogrekit/Makefile
+++ b/textproc/etoile-ogrekit/Makefile
@@ -6,20 +6,17 @@
 #
 
 PORTNAME=	ogrekit
-PORTVERSION=	0.1.${SNAPSHOT}
-PORTREVISION=	1
+PORTVERSION=	0.2
 CATEGORIES=	textproc gnustep
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	dinoex
+MASTER_SITES=	http://download.gna.org/etoile/
 PKGNAMEPREFIX=	etoile-
-DISTNAME=	Etoile-${SNAPSHOT}
+DISTNAME=	etoile-${PORTVERSION}
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Etoile Project OgreKit framework
 
 LIB_DEPENDS=	onig:${PORTSDIR}/${ONIGURUMA4_PORT}
 
-USE_BZIP2=	yes
 USE_GNUSTEP=	yes
 USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
@@ -27,9 +24,9 @@ USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 
-SNAPSHOT=	20061221
-WRKSRC=	${WRKDIR}/Etoile/
+WRKSRC=	${WRKDIR}/Etoile-${PORTVERSION}
 USE_GNUSTEP_MAKE_DIRS+=	Frameworks/OgreKit
+ADDITIONAL_OBJCFLAGS+=	-DONIGURUMA_4
 
 UNITKIT_PORT?=	devel/etoile-unitkit
 ONIGURUMA4_PORT?=	devel/oniguruma4
diff --git a/textproc/etoile-ogrekit/distinfo b/textproc/etoile-ogrekit/distinfo
index 545ac18e8091..2ac1ee4891af 100644
--- a/textproc/etoile-ogrekit/distinfo
+++ b/textproc/etoile-ogrekit/distinfo
@@ -1,3 +1,3 @@
-MD5 (Etoile-20061221.tar.bz2) = 120ffa8cf06c58ff775f8a218ad91448
-SHA256 (Etoile-20061221.tar.bz2) = 7dc8acbf2cb46d9d119c9817204bbbbe72884065f3287877550c400e68f4c992
-SIZE (Etoile-20061221.tar.bz2) = 9867481
+MD5 (etoile-0.2.tar.gz) = cc1b54ba2e4ba371c5eda45c756bece9
+SHA256 (etoile-0.2.tar.gz) = 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
+SIZE (etoile-0.2.tar.gz) = 21373391
diff --git a/textproc/etoile-ogrekit/pkg-plist b/textproc/etoile-ogrekit/pkg-plist
index ca2c67e8a771..d4b9e2d4e945 100644
--- a/textproc/etoile-ogrekit/pkg-plist
+++ b/textproc/etoile-ogrekit/pkg-plist
@@ -1,52 +1,67 @@
-Local/Library/Headers/OgreKit/NSString_OgreKitAdditions.h
-Local/Library/Headers/OgreKit/OGAttributedString.h
-Local/Library/Headers/OgreKit/OGMutableAttributedString.h
-Local/Library/Headers/OgreKit/OGMutablePlainString.h
-Local/Library/Headers/OgreKit/OGMutableString.h
-Local/Library/Headers/OgreKit/OGPlainString.h
-Local/Library/Headers/OgreKit/OGRegularExpression.h
-Local/Library/Headers/OgreKit/OGRegularExpressionCapture.h
-Local/Library/Headers/OgreKit/OGRegularExpressionEnumerator.h
-Local/Library/Headers/OgreKit/OGRegularExpressionFormatter.h
-Local/Library/Headers/OgreKit/OGRegularExpressionMatch.h
-Local/Library/Headers/OgreKit/OGReplaceExpression.h
-Local/Library/Headers/OgreKit/OGString.h
-Local/Library/Headers/OgreKit/OgreFindAllThread.h
-Local/Library/Headers/OgreKit/OgreFindPanelController.h
-Local/Library/Headers/OgreKit/OgreFindResultBranch.h
-Local/Library/Headers/OgreKit/OgreFindResultLeaf.h
-Local/Library/Headers/OgreKit/OgreFindResultRoot.h
-Local/Library/Headers/OgreKit/OgreFindResultWindowController.h
-Local/Library/Headers/OgreKit/OgreFindThread.h
-Local/Library/Headers/OgreKit/OgreHighlightThread.h
-Local/Library/Headers/OgreKit/OgreKit.h
-Local/Library/Headers/OgreKit/OgreOutlineColumn.h
-Local/Library/Headers/OgreKit/OgreOutlineView.h
-Local/Library/Headers/OgreKit/OgreReplaceAllThread.h
-Local/Library/Headers/OgreKit/OgreReplaceAndFindThread.h
-Local/Library/Headers/OgreKit/OgreTableColumn.h
-Local/Library/Headers/OgreKit/OgreTableView.h
-Local/Library/Headers/OgreKit/OgreTextFindBranch.h
-Local/Library/Headers/OgreKit/OgreTextFindComponent.h
-Local/Library/Headers/OgreKit/OgreTextFindComponentEnumerator.h
-Local/Library/Headers/OgreKit/OgreTextFindLeaf.h
-Local/Library/Headers/OgreKit/OgreTextFindProgressSheet.h
-Local/Library/Headers/OgreKit/OgreTextFindResult.h
-Local/Library/Headers/OgreKit/OgreTextFindReverseComponentEnumerator.h
-Local/Library/Headers/OgreKit/OgreTextFindRoot.h
-Local/Library/Headers/OgreKit/OgreTextFindThread.h
-Local/Library/Headers/OgreKit/OgreTextFinder.h
-Local/Library/Headers/OgreKit/OgreTextView.h
-Local/Library/Headers/OgreKit/OgreTextViewAdapter.h
-Local/Library/Headers/OgreKit/OgreTextViewFindResult.h
-Local/Library/Headers/OgreKit/OgreTextViewGraphicAllowedAdapter.h
-Local/Library/Headers/OgreKit/OgreTextViewMatchFindResult.h
-Local/Library/Headers/OgreKit/OgreTextViewPlainAdapter.h
-Local/Library/Headers/OgreKit/OgreTextViewRichAdapter.h
-Local/Library/Headers/OgreKit/OgreTextViewUndoer.h
-Local/Library/Headers/OgreKit/OgreUnhighlightThread.h
-Local/Library/Headers/OgreKit/OgreView.h
+Local/Library/Frameworks/OgreKit.framework/Headers
+Local/Library/Frameworks/OgreKit.framework/OgreKit
+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/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/Headers/OgreKit
+@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