- update to snapshot 20061221

7 files changed, 54 insertions, 39 deletions

diff --git a/www/etoile-bookmarkkit/Makefile b/www/etoile-bookmarkkit/Makefile
index 6eb5d9069d5e..f61ebf754101 100644
--- a/www/etoile-bookmarkkit/Makefile
+++ b/www/etoile-bookmarkkit/Makefile
@@ -8,26 +8,29 @@
 PORTNAME=	bookmarkkit
 PORTVERSION=	0.1.${SNAPSHOT}
 CATEGORIES=	www
-MASTER_SITES=	http://io.debian.net/~tar/ports/distfiles/
+MASTER_SITES=	${MASTER_SITE_LOCAL} \
+		http://people.freebsd.org/~%%SUBDIR%%/distfiles/
+MASTER_SITE_SUBDIR=	dinoex
 PKGNAMEPREFIX=	etoile-
-DISTNAME=	etoile_0+${SNAPSHOT}+dfsg.orig
+DISTNAME=	Etoile-${SNAPSHOT}
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Etoile Project BookmarkKit framework
 
-SNAPSHOT=	20060917
-WRKSRC=	${WRKDIR}/etoile-0+${SNAPSHOT}+dfsg/Etoile/
-USE_GMAKE=	yes
+USE_BZIP2=	yes
 USE_GNUSTEP=	yes
 USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
-MAKEFILE=	GNUmakefile
-NO_FILTER_SHLIBS=	yes
-USE_GNUSTEP_SYSTEM_LIBS+=	TrackerKit:${TRACKERKIT_PORT}
+USE_GNUSTEP_LOCAL_LIBS+=	CollectionKit:${COLLECTIONKIT_PORT}
+DEFAULT_LIBVERSION=	0.1
+USE_GNUSTEP_LDCONFIG=	${SYSLIBDIR}
+
+SNAPSHOT=	20061221
+WRKSRC=	${WRKDIR}/Etoile/
 USE_GNUSTEP_MAKE_DIRS+=	Frameworks/BookmarkKit
 
-TRACKERKIT_PORT?=	deskutils/etoile-trackerkit
+COLLECTIONKIT_PORT?=	devel/etoile-collectionkit
 
 .include <bsd.port.mk>
diff --git a/www/etoile-bookmarkkit/distinfo b/www/etoile-bookmarkkit/distinfo
index 2d5c7ccf5d13..545ac18e8091 100644
--- a/www/etoile-bookmarkkit/distinfo
+++ b/www/etoile-bookmarkkit/distinfo
@@ -1,3 +1,3 @@
-MD5 (etoile_0+20060917+dfsg.orig.tar.gz) = bc96dcaba7ac66abb1320d5cfc98f05e
-SHA256 (etoile_0+20060917+dfsg.orig.tar.gz) = de7cb026ccebdbb72d115ca800a13910cd51c9df27f5578ad7059b13f88eb334
-SIZE (etoile_0+20060917+dfsg.orig.tar.gz) = 10478850
+MD5 (Etoile-20061221.tar.bz2) = 120ffa8cf06c58ff775f8a218ad91448
+SHA256 (Etoile-20061221.tar.bz2) = 7dc8acbf2cb46d9d119c9817204bbbbe72884065f3287877550c400e68f4c992
+SIZE (Etoile-20061221.tar.bz2) = 9867481
diff --git a/www/etoile-bookmarkkit/pkg-descr b/www/etoile-bookmarkkit/pkg-descr
index 5e9d6ce7b98e..cc2a63b75375 100644
--- a/www/etoile-bookmarkkit/pkg-descr
+++ b/www/etoile-bookmarkkit/pkg-descr
@@ -1,10 +1,12 @@
-Etoile intends to be an innovative GNUstep based user environnement built
-from the ground up on highly modular and light components with project and
-document orientation in mind, in order to allow users to create their own
-workflow by reshaping or recombining provided Services (aka Applications),
-Components etc. Flexibility and modularity on both User Interface and code
-level should allow us to scale from PDA to computer environment.
-
 This package installs the BookmarkKit framework.
 
+It provides a basic storage for shared bookmarks.
+It can be used for web browser bookmark, recently opened documents, etc.
+It is based on CollectionKit.
+
+BookmarkKit has a basic assumption: it has a hierarchical structure.
+A bookmark or a group can only exist under a group.
+In another word, an item or a group can has a parent or none.
+Therefore, bookmark can be displayed in NSOutlineView.
+
 WWW: http://www.etoile-project.org/
diff --git a/www/etoile-bookmarkkit/pkg-plist b/www/etoile-bookmarkkit/pkg-plist
index cdb62bdd3eab..425aa532397e 100644
--- a/www/etoile-bookmarkkit/pkg-plist
+++ b/www/etoile-bookmarkkit/pkg-plist
@@ -1,8 +1,12 @@
-System/Library/Headers/BookmarkKit/BKBookmark.h
-System/Library/Headers/BookmarkKit/BKBookmarkQuery.h
-System/Library/Headers/BookmarkKit/BKBookmarkSearchResult.h
-System/Library/Headers/BookmarkKit/BKBookmarkStore.h
-System/Library/Libraries/libBookmarkKit.so
-System/Library/Libraries/libBookmarkKit.so.%%MAJORLIBVERSION%%
-System/Library/Libraries/libBookmarkKit.so.%%MAJORLIBVERSION%%.1
-@dirrm System/Library/Headers/BookmarkKit
+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/Libraries/libBookmarkKit.so
+Local/Library/Libraries/libBookmarkKit.so.%%MAJORLIBVERSION%%
+Local/Library/Libraries/libBookmarkKit.so.%%LIBVERSION%%
+@dirrm Local/Library/Headers/BookmarkKit
diff --git a/www/etoile-rsskit/Makefile b/www/etoile-rsskit/Makefile
index 75065e03fa2d..4b0285b23728 100644
--- a/www/etoile-rsskit/Makefile
+++ b/www/etoile-rsskit/Makefile
@@ -8,25 +8,25 @@
 PORTNAME=	rsskit
 PORTVERSION=	0.1.${SNAPSHOT}
 CATEGORIES=	www
-MASTER_SITES=	http://io.debian.net/~tar/ports/distfiles/
+MASTER_SITES=	${MASTER_SITE_LOCAL} \
+		http://people.freebsd.org/~%%SUBDIR%%/distfiles/
+MASTER_SITE_SUBDIR=	dinoex
 PKGNAMEPREFIX=	etoile-
-DISTNAME=	etoile_0+${SNAPSHOT}+dfsg.orig
+DISTNAME=	Etoile-${SNAPSHOT}
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Etoile Project RSSKit framwork
 
-SNAPSHOT=	20060917
-WRKSRC=	${WRKDIR}/etoile-0+${SNAPSHOT}+dfsg/Etoile/
-USE_GMAKE=	yes
+USE_BZIP2=	yes
 USE_GNUSTEP=	yes
 USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
-MAKEFILE=	GNUmakefile
-LDCONFIG_DIRS=	${LOCALLIBDIR}
-INSTALLS_SHLIB=	yes
-NO_FILTER_SHLIBS=	yes
+USE_GNUSTEP_LDCONFIG=	${LOCALLIBDIR}
+
+SNAPSHOT=	20061221
+WRKSRC=	${WRKDIR}/Etoile/
 USE_GNUSTEP_MAKE_DIRS+=	Frameworks/RSSKit
 
 .include <bsd.port.mk>
diff --git a/www/etoile-rsskit/distinfo b/www/etoile-rsskit/distinfo
index 2d5c7ccf5d13..545ac18e8091 100644
--- a/www/etoile-rsskit/distinfo
+++ b/www/etoile-rsskit/distinfo
@@ -1,3 +1,3 @@
-MD5 (etoile_0+20060917+dfsg.orig.tar.gz) = bc96dcaba7ac66abb1320d5cfc98f05e
-SHA256 (etoile_0+20060917+dfsg.orig.tar.gz) = de7cb026ccebdbb72d115ca800a13910cd51c9df27f5578ad7059b13f88eb334
-SIZE (etoile_0+20060917+dfsg.orig.tar.gz) = 10478850
+MD5 (Etoile-20061221.tar.bz2) = 120ffa8cf06c58ff775f8a218ad91448
+SHA256 (Etoile-20061221.tar.bz2) = 7dc8acbf2cb46d9d119c9817204bbbbe72884065f3287877550c400e68f4c992
+SIZE (Etoile-20061221.tar.bz2) = 9867481
diff --git a/www/etoile-rsskit/pkg-plist b/www/etoile-rsskit/pkg-plist
index 9fe142e3a70b..3c6c6cfbb8cc 100644
--- a/www/etoile-rsskit/pkg-plist
+++ b/www/etoile-rsskit/pkg-plist
@@ -7,11 +7,17 @@ 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/Libraries/libRSSKit.so
 Local/Library/Libraries/libRSSKit.so.%%MAJORLIBVERSION%%
 Local/Library/Libraries/libRSSKit.so.%%LIBVERSION%%