6 files changed, 75 insertions, 53 deletions

diff --git a/www/etoile-bookmarkkit/Makefile b/www/etoile-bookmarkkit/Makefile
index aeb7ad7b992c..09a821a49ab0 100644
--- a/www/etoile-bookmarkkit/Makefile
+++ b/www/etoile-bookmarkkit/Makefile
@@ -6,29 +6,24 @@
 #
 
 PORTNAME=	bookmarkkit
-PORTVERSION=	0.1.${SNAPSHOT}
-PORTREVISION=	1
+PORTVERSION=	0.2
 CATEGORIES=	www 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 BookmarkKit framework
 
-USE_BZIP2=	yes
 USE_GNUSTEP=	yes
 USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_LOCAL_LIBS+=	CollectionKit:${COLLECTIONKIT_PORT}
-DEFAULT_LIBVERSION=	0.1
 USE_GNUSTEP_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 
-SNAPSHOT=	20061221
-WRKSRC=	${WRKDIR}/Etoile/
+WRKSRC=	${WRKDIR}/Etoile-${PORTVERSION}
 USE_GNUSTEP_MAKE_DIRS+=	Frameworks/BookmarkKit
 
 COLLECTIONKIT_PORT?=	devel/etoile-collectionkit
diff --git a/www/etoile-bookmarkkit/distinfo b/www/etoile-bookmarkkit/distinfo
index 545ac18e8091..2ac1ee4891af 100644
--- a/www/etoile-bookmarkkit/distinfo
+++ b/www/etoile-bookmarkkit/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/www/etoile-bookmarkkit/pkg-plist b/www/etoile-bookmarkkit/pkg-plist
index 425aa532397e..45260ae9ec29 100644
--- a/www/etoile-bookmarkkit/pkg-plist
+++ b/www/etoile-bookmarkkit/pkg-plist
@@ -1,12 +1,27 @@
-Local/Library/Headers/BookmarkKit/BKBookmark.h
-Local/Library/Headers/BookmarkKit/BKBookmarkQuery.h
-Local/Library/Headers/BookmarkKit/BKBookmarkSearchResult.h
-Local/Library/Headers/BookmarkKit/BKBookmarkStore.h
-Local/Library/Headers/BookmarkKit/BKBookmarkView.h
-Local/Library/Headers/BookmarkKit/BKGlobals.h
-Local/Library/Headers/BookmarkKit/BKGroup.h
-Local/Library/Headers/BookmarkKit/BookmarkKit.h
+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/Headers/BookmarkKit
+@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
diff --git a/www/etoile-rsskit/Makefile b/www/etoile-rsskit/Makefile
index a26c14f4db19..e6270b911466 100644
--- a/www/etoile-rsskit/Makefile
+++ b/www/etoile-rsskit/Makefile
@@ -6,18 +6,15 @@
 #
 
 PORTNAME=	rsskit
-PORTVERSION=	0.1.${SNAPSHOT}
-PORTREVISION=	1
+PORTVERSION=	0.2
 CATEGORIES=	www 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 RSSKit framwork
 
-USE_BZIP2=	yes
 USE_GNUSTEP=	yes
 USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
@@ -25,8 +22,7 @@ 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/RSSKit
 
 .include <bsd.port.mk>
diff --git a/www/etoile-rsskit/distinfo b/www/etoile-rsskit/distinfo
index 545ac18e8091..2ac1ee4891af 100644
--- a/www/etoile-rsskit/distinfo
+++ b/www/etoile-rsskit/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/www/etoile-rsskit/pkg-plist b/www/etoile-rsskit/pkg-plist
index 3c6c6cfbb8cc..015ada902ca5 100644
--- a/www/etoile-rsskit/pkg-plist
+++ b/www/etoile-rsskit/pkg-plist
@@ -1,24 +1,40 @@
-Local/Library/Headers/RSSKit/Atom%%MAJORVERSION%%3Parser.h
-Local/Library/Headers/RSSKit/Atom1%%MAJORVERSION%%Parser.h
-Local/Library/Headers/RSSKit/AtomParser.h
-Local/Library/Headers/RSSKit/DOMParser.h
-Local/Library/Headers/RSSKit/DublinCore.h
-Local/Library/Headers/RSSKit/FeedParser.h
-Local/Library/Headers/RSSKit/NewRSSArticleListener.h
-Local/Library/Headers/RSSKit/RSS1%%MAJORVERSION%%Parser.h
-Local/Library/Headers/RSSKit/RSS2%%MAJORVERSION%%Parser.h
-Local/Library/Headers/RSSKit/RSSArticle+Storage.h
-Local/Library/Headers/RSSKit/RSSArticle.h
-Local/Library/Headers/RSSKit/RSSArticleCreationListener.h
-Local/Library/Headers/RSSKit/RSSArticleProtocol.h
-Local/Library/Headers/RSSKit/RSSFactory.h
-Local/Library/Headers/RSSKit/RSSFeed+Fetching.h
-Local/Library/Headers/RSSKit/RSSFeed+Storage.h
-Local/Library/Headers/RSSKit/RSSFeed.h
-Local/Library/Headers/RSSKit/RSSFeedProtocol.h
-Local/Library/Headers/RSSKit/RSSKit.h
-Local/Library/Headers/RSSKit/RSSLinks.h
+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/Headers/RSSKit
+@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
+@dirrm Local/Library/Frameworks