- update to snapshot 20061221

4 files changed, 34 insertions, 21 deletions

diff --git a/deskutils/etoile-dictionaryreader/Makefile b/deskutils/etoile-dictionaryreader/Makefile
index b988936673b1..ae5b26321646 100644
--- a/deskutils/etoile-dictionaryreader/Makefile
+++ b/deskutils/etoile-dictionaryreader/Makefile
@@ -1,29 +1,31 @@
-# New ports collection makefile for:    etoile
+# New ports collection makefile for:    etoile-dictionaryreader
 # Date created:         4 Sep 2006
 # Whom:                 gurkan@linuks.mine.nu
 #
 # $FreeBSD$
 #
 
-PORTNAME=	etoile
+PORTNAME=	dictionaryreader
 PORTVERSION=	0.1.${SNAPSHOT}
-PORTREVISION=	1
 CATEGORIES=	deskutils
-MASTER_SITES=	http://io.debian.net/~tar/ports/distfiles/
-DISTNAME=	etoile_0+${SNAPSHOT}+dfsg.orig
+MASTER_SITES=	${MASTER_SITE_LOCAL} \
+		http://people.freebsd.org/~%%SUBDIR%%/distfiles/
+MASTER_SITE_SUBDIR=	dinoex
+PKGNAMEPREFIX=	etoile-
+DISTNAME=	Etoile-${SNAPSHOT}
 
 MAINTAINER=	gurkan@linuks.mine.nu
-COMMENT=	Etoile Project software for GNUstep
+COMMENT=	Dict client for GNUstep
 
-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
+
+SNAPSHOT=	20061221
+WRKSRC=	${WRKDIR}/Etoile/
 USE_GNUSTEP_MAKE_DIRS+=	Services/User/DictionaryReader
 
 .include <bsd.port.mk>
diff --git a/deskutils/etoile-dictionaryreader/distinfo b/deskutils/etoile-dictionaryreader/distinfo
index 2d5c7ccf5d13..545ac18e8091 100644
--- a/deskutils/etoile-dictionaryreader/distinfo
+++ b/deskutils/etoile-dictionaryreader/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/deskutils/etoile-dictionaryreader/pkg-descr b/deskutils/etoile-dictionaryreader/pkg-descr
index 522b3419afd1..d623edbdc26c 100644
--- a/deskutils/etoile-dictionaryreader/pkg-descr
+++ b/deskutils/etoile-dictionaryreader/pkg-descr
@@ -1,10 +1,5 @@
-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.
-
-Currently this package only installs DictionaryReader.
+DictionaryReader.app is a Dict client for GNUstep.
+It is also part of the Etoile Desktop Project
 
+WWW: http://www.unix-ag.uni-kl.de/~guenther/gnustep/dictionaryreader.html
 WWW: http://www.etoile-project.org/
diff --git a/deskutils/etoile-dictionaryreader/pkg-plist b/deskutils/etoile-dictionaryreader/pkg-plist
index cb00fdb88f10..9133f2142d5e 100644
--- a/deskutils/etoile-dictionaryreader/pkg-plist
+++ b/deskutils/etoile-dictionaryreader/pkg-plist
@@ -6,12 +6,28 @@ Local/Applications/DictionaryReader.app/Resources/English.lproj/DictionaryReader
 Local/Applications/DictionaryReader.app/Resources/English.lproj/DictionaryReader.gorm/data.info
 Local/Applications/DictionaryReader.app/Resources/English.lproj/DictionaryReader.gorm/magnifyingGlass.tiff
 Local/Applications/DictionaryReader.app/Resources/English.lproj/DictionaryReader.gorm/objects.gorm
+Local/Applications/DictionaryReader.app/Resources/English.lproj/DictionaryReader.nib/classes.nib
+Local/Applications/DictionaryReader.app/Resources/English.lproj/DictionaryReader.nib/info.nib
+Local/Applications/DictionaryReader.app/Resources/English.lproj/DictionaryReader.nib/keyedobjects.nib
+Local/Applications/DictionaryReader.app/Resources/English.lproj/Preferences.gorm/data.classes
+Local/Applications/DictionaryReader.app/Resources/English.lproj/Preferences.gorm/data.info
+Local/Applications/DictionaryReader.app/Resources/English.lproj/Preferences.gorm/objects.gorm
+Local/Applications/DictionaryReader.app/Resources/English.lproj/Preferences.nib/Preferences.nib/classes.nib
+Local/Applications/DictionaryReader.app/Resources/English.lproj/Preferences.nib/Preferences.nib/info.nib
+Local/Applications/DictionaryReader.app/Resources/English.lproj/Preferences.nib/Preferences.nib/keyedobjects.nib
+Local/Applications/DictionaryReader.app/Resources/English.lproj/Preferences.nib/classes.nib
+Local/Applications/DictionaryReader.app/Resources/English.lproj/Preferences.nib/info.nib
+Local/Applications/DictionaryReader.app/Resources/English.lproj/Preferences.nib/keyedobjects.nib
 Local/Applications/DictionaryReader.app/Resources/Info-gnustep.plist
 Local/Applications/DictionaryReader.app/Resources/dict.png
 Local/Applications/DictionaryReader.app/Resources/jargon.dict
 Local/Applications/DictionaryReader.app/Resources/jargon.index
 Local/Applications/DictionaryReader.app/library_paths.openapp
 Local/Applications/DictionaryReader.app/stamp.make
+@dirrm Local/Applications/DictionaryReader.app/Resources/English.lproj/Preferences.nib/Preferences.nib
+@dirrm Local/Applications/DictionaryReader.app/Resources/English.lproj/Preferences.nib
+@dirrm Local/Applications/DictionaryReader.app/Resources/English.lproj/Preferences.gorm
+@dirrm Local/Applications/DictionaryReader.app/Resources/English.lproj/DictionaryReader.nib
 @dirrm Local/Applications/DictionaryReader.app/Resources/English.lproj/DictionaryReader.gorm
 @dirrm Local/Applications/DictionaryReader.app/Resources/English.lproj
 @dirrm Local/Applications/DictionaryReader.app/Resources