aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--deskutils/etoile-extendedworkspacekit/Makefile19
-rw-r--r--deskutils/etoile-extendedworkspacekit/distinfo6
-rw-r--r--deskutils/etoile-extendedworkspacekit/pkg-plist2
-rw-r--r--deskutils/etoile-hardware/Makefile18
-rw-r--r--deskutils/etoile-hardware/distinfo6
-rw-r--r--deskutils/etoile-hardware/pkg-plist62
-rw-r--r--deskutils/etoile-lookandbehavior/Makefile18
-rw-r--r--deskutils/etoile-lookandbehavior/distinfo6
-rw-r--r--deskutils/etoile-menuserver/Makefile15
-rw-r--r--deskutils/etoile-menuserver/distinfo6
-rw-r--r--deskutils/etoile-servicesbarkit/Makefile17
-rw-r--r--deskutils/etoile-servicesbarkit/distinfo6
-rw-r--r--deskutils/etoile-servicesbarkit/pkg-plist2
-rw-r--r--deskutils/etoile-trackerkit/Makefile19
-rw-r--r--deskutils/etoile-trackerkit/distinfo6
-rw-r--r--deskutils/etoile-trackerkit/pkg-plist2
-rw-r--r--devel/etoile-unitkit/Makefile18
-rw-r--r--devel/etoile-unitkit/distinfo6
-rw-r--r--editors/etoile-typewriter/Makefile11
-rw-r--r--editors/etoile-typewriter/distinfo6
-rw-r--r--editors/etoile-typewriter/pkg-plist4
-rw-r--r--sysutils/etoile-installer/Makefile14
-rw-r--r--sysutils/etoile-installer/distinfo6
-rw-r--r--textproc/etoile-lucenekit/Makefile11
-rw-r--r--textproc/etoile-lucenekit/distinfo6
-rw-r--r--textproc/etoile-ogrekit/Makefile11
-rw-r--r--textproc/etoile-ogrekit/distinfo6
-rw-r--r--www/etoile-bookmarkkit/Makefile21
-rw-r--r--www/etoile-bookmarkkit/distinfo6
-rw-r--r--www/etoile-bookmarkkit/pkg-descr16
-rw-r--r--www/etoile-bookmarkkit/pkg-plist20
-rw-r--r--www/etoile-rsskit/Makefile18
-rw-r--r--www/etoile-rsskit/distinfo6
-rw-r--r--www/etoile-rsskit/pkg-plist6
-rw-r--r--x11-themes/etoile-etoilemenus/Makefile17
-rw-r--r--x11-themes/etoile-etoilemenus/distinfo6
-rw-r--r--x11-themes/etoile-iconkit/Makefile17
-rw-r--r--x11-themes/etoile-iconkit/distinfo6
-rw-r--r--x11-themes/etoile-iconkit/pkg-plist13
-rw-r--r--x11-themes/etoile-wildmenus/Makefile16
-rw-r--r--x11-themes/etoile-wildmenus/distinfo6
-rw-r--r--x11-wm/etoile-azalea/Makefile13
-rw-r--r--x11-wm/etoile-azalea/distinfo6
-rw-r--r--x11-wm/etoile-azdock/Makefile19
-rw-r--r--x11-wm/etoile-azdock/distinfo6
-rw-r--r--x11/etoile-iterm/Makefile11
-rw-r--r--x11/etoile-iterm/distinfo6
-rw-r--r--x11/etoile-xwindowserverkit/Makefile22
-rw-r--r--x11/etoile-xwindowserverkit/distinfo6
-rw-r--r--x11/etoile-xwindowserverkit/pkg-plist16
50 files changed, 299 insertions, 289 deletions
diff --git a/deskutils/etoile-extendedworkspacekit/Makefile b/deskutils/etoile-extendedworkspacekit/Makefile
index 2878c8ebf54..5be78a396df 100644
--- a/deskutils/etoile-extendedworkspacekit/Makefile
+++ b/deskutils/etoile-extendedworkspacekit/Makefile
@@ -8,26 +8,27 @@
PORTNAME= extendedworkspacekit
PORTVERSION= 0.1.${SNAPSHOT}
CATEGORIES= deskutils
-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 ExtendedWorkspaceKit 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
-LDCONFIG_DIRS= ${LOCALLIBDIR}
-INSTALLS_SHLIB= yes
-NO_FILTER_SHLIBS= yes
USE_GNUSTEP_SYSTEM_LIBS+= TrackerKit:${TRACKERKIT_PORT}
+DEFAULT_LIBVERSION= 0.1
+USE_GNUSTEP_LDCONFIG= ${SYSLIBDIR}
+
+SNAPSHOT= 20061221
+WRKSRC= ${WRKDIR}/Etoile/
USE_GNUSTEP_MAKE_DIRS+= Frameworks/ExtendedWorkspaceKit
TRACKERKIT_PORT?= deskutils/etoile-trackerkit
diff --git a/deskutils/etoile-extendedworkspacekit/distinfo b/deskutils/etoile-extendedworkspacekit/distinfo
index 2d5c7ccf5d1..545ac18e809 100644
--- a/deskutils/etoile-extendedworkspacekit/distinfo
+++ b/deskutils/etoile-extendedworkspacekit/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-extendedworkspacekit/pkg-plist b/deskutils/etoile-extendedworkspacekit/pkg-plist
index 8ebd69b1691..d5797848148 100644
--- a/deskutils/etoile-extendedworkspacekit/pkg-plist
+++ b/deskutils/etoile-extendedworkspacekit/pkg-plist
@@ -19,5 +19,5 @@ System/Library/Headers/ExtendedWorkspaceKit/ExtendedWorkspaceKit.h
System/Library/Headers/ExtendedWorkspaceKit/NSURL+ExtendedWorkspace.h
System/Library/Libraries/libExtendedWorkspace.so
System/Library/Libraries/libExtendedWorkspace.so.%%MAJORLIBVERSION%%
-System/Library/Libraries/libExtendedWorkspace.so.%%MAJORLIBVERSION%%.1
+System/Library/Libraries/libExtendedWorkspace.so.%%LIBVERSION%%
@dirrm System/Library/Headers/ExtendedWorkspaceKit
diff --git a/deskutils/etoile-hardware/Makefile b/deskutils/etoile-hardware/Makefile
index 159a807260c..fb6082b8cae 100644
--- a/deskutils/etoile-hardware/Makefile
+++ b/deskutils/etoile-hardware/Makefile
@@ -8,25 +8,27 @@
PORTNAME= hardware
PORTVERSION= 0.1.${SNAPSHOT}
CATEGORIES= deskutils
-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 Hardware application
-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
-USE_GNUSTEP_SYSTEM_LIBS+= PreferencesKit:${PREFERENCESKIT_PORT}
+USE_GNUSTEP_LOCAL_LIBS+= PaneKit:${PANEKIT_PORT}
+
+SNAPSHOT= 20061221
+WRKSRC= ${WRKDIR}/Etoile/
USE_GNUSTEP_MAKE_DIRS+= Services/User/Hardware
-PREFERENCESKIT_PORT?= deskutils/etoile-preferenceskit
+PANEKIT_PORT?= deskutils/etoile-panekit
.include <bsd.port.mk>
diff --git a/deskutils/etoile-hardware/distinfo b/deskutils/etoile-hardware/distinfo
index 2d5c7ccf5d1..545ac18e809 100644
--- a/deskutils/etoile-hardware/distinfo
+++ b/deskutils/etoile-hardware/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-hardware/pkg-plist b/deskutils/etoile-hardware/pkg-plist
index 4c109211325..fd3bb14316f 100644
--- a/deskutils/etoile-hardware/pkg-plist
+++ b/deskutils/etoile-hardware/pkg-plist
@@ -1,47 +1,4 @@
Local/Applications/Hardware.app/Hardware
-Local/Applications/Hardware.app/PlugIns/EnergyPrefPane.prefPane/EnergyPrefPane
-Local/Applications/Hardware.app/PlugIns/EnergyPrefPane.prefPane/Resources/Energy.gorm/data.classes
-Local/Applications/Hardware.app/PlugIns/EnergyPrefPane.prefPane/Resources/Energy.gorm/data.info
-Local/Applications/Hardware.app/PlugIns/EnergyPrefPane.prefPane/Resources/Energy.gorm/objects.gorm
-Local/Applications/Hardware.app/PlugIns/EnergyPrefPane.prefPane/Resources/EnergyPrefPaneInfo.plist
-Local/Applications/Hardware.app/PlugIns/EnergyPrefPane.prefPane/Resources/Info-gnustep.plist
-Local/Applications/Hardware.app/PlugIns/EnergyPrefPane.prefPane/stamp.make
-Local/Applications/Hardware.app/PlugIns/KeyboardPrefPane.prefPane/KeyboardPrefPane
-Local/Applications/Hardware.app/PlugIns/KeyboardPrefPane.prefPane/Resources/Info-gnustep.plist
-Local/Applications/Hardware.app/PlugIns/KeyboardPrefPane.prefPane/Resources/Keyboard.gorm/data.classes
-Local/Applications/Hardware.app/PlugIns/KeyboardPrefPane.prefPane/Resources/Keyboard.gorm/data.info
-Local/Applications/Hardware.app/PlugIns/KeyboardPrefPane.prefPane/Resources/Keyboard.gorm/objects.gorm
-Local/Applications/Hardware.app/PlugIns/KeyboardPrefPane.prefPane/Resources/KeyboardPrefPaneInfo.plist
-Local/Applications/Hardware.app/PlugIns/KeyboardPrefPane.prefPane/stamp.make
-Local/Applications/Hardware.app/PlugIns/MonitorPrefPane.prefPane/MonitorPrefPane
-Local/Applications/Hardware.app/PlugIns/MonitorPrefPane.prefPane/Resources/Info-gnustep.plist
-Local/Applications/Hardware.app/PlugIns/MonitorPrefPane.prefPane/Resources/Monitor.gorm/data.classes
-Local/Applications/Hardware.app/PlugIns/MonitorPrefPane.prefPane/Resources/Monitor.gorm/data.info
-Local/Applications/Hardware.app/PlugIns/MonitorPrefPane.prefPane/Resources/Monitor.gorm/objects.gorm
-Local/Applications/Hardware.app/PlugIns/MonitorPrefPane.prefPane/Resources/Monitor.png
-Local/Applications/Hardware.app/PlugIns/MonitorPrefPane.prefPane/Resources/MonitorPrefPaneInfo.plist
-Local/Applications/Hardware.app/PlugIns/MonitorPrefPane.prefPane/stamp.make
-Local/Applications/Hardware.app/PlugIns/MousePrefPane.prefPane/MousePrefPane
-Local/Applications/Hardware.app/PlugIns/MousePrefPane.prefPane/Resources/Info-gnustep.plist
-Local/Applications/Hardware.app/PlugIns/MousePrefPane.prefPane/Resources/Mouse.gorm/data.classes
-Local/Applications/Hardware.app/PlugIns/MousePrefPane.prefPane/Resources/Mouse.gorm/data.info
-Local/Applications/Hardware.app/PlugIns/MousePrefPane.prefPane/Resources/Mouse.gorm/objects.gorm
-Local/Applications/Hardware.app/PlugIns/MousePrefPane.prefPane/Resources/MousePrefPaneInfo.plist
-Local/Applications/Hardware.app/PlugIns/MousePrefPane.prefPane/stamp.make
-Local/Applications/Hardware.app/PlugIns/SoundPrefPane.prefPane/Resources/Info-gnustep.plist
-Local/Applications/Hardware.app/PlugIns/SoundPrefPane.prefPane/Resources/Sound.gorm/data.classes
-Local/Applications/Hardware.app/PlugIns/SoundPrefPane.prefPane/Resources/Sound.gorm/data.info
-Local/Applications/Hardware.app/PlugIns/SoundPrefPane.prefPane/Resources/Sound.gorm/objects.gorm
-Local/Applications/Hardware.app/PlugIns/SoundPrefPane.prefPane/Resources/SoundPrefPaneInfo.plist
-Local/Applications/Hardware.app/PlugIns/SoundPrefPane.prefPane/SoundPrefPane
-Local/Applications/Hardware.app/PlugIns/SoundPrefPane.prefPane/stamp.make
-Local/Applications/Hardware.app/PlugIns/StartupPrefPane.prefPane/Resources/Info-gnustep.plist
-Local/Applications/Hardware.app/PlugIns/StartupPrefPane.prefPane/Resources/Startup.gorm/data.classes
-Local/Applications/Hardware.app/PlugIns/StartupPrefPane.prefPane/Resources/Startup.gorm/data.info
-Local/Applications/Hardware.app/PlugIns/StartupPrefPane.prefPane/Resources/Startup.gorm/objects.gorm
-Local/Applications/Hardware.app/PlugIns/StartupPrefPane.prefPane/Resources/StartupPrefPaneInfo.plist
-Local/Applications/Hardware.app/PlugIns/StartupPrefPane.prefPane/StartupPrefPane
-Local/Applications/Hardware.app/PlugIns/StartupPrefPane.prefPane/stamp.make
Local/Applications/Hardware.app/Resources/Hardware.desktop
Local/Applications/Hardware.app/Resources/HardwareInfo.plist
Local/Applications/Hardware.app/Resources/Info-gnustep.plist
@@ -52,23 +9,4 @@ Local/Applications/Hardware.app/library_paths.openapp
Local/Applications/Hardware.app/stamp.make
@dirrm Local/Applications/Hardware.app/Resources/MainMenu.gorm
@dirrm Local/Applications/Hardware.app/Resources
-@dirrm Local/Applications/Hardware.app/PlugIns/StartupPrefPane.prefPane/Resources/Startup.gorm
-@dirrm Local/Applications/Hardware.app/PlugIns/StartupPrefPane.prefPane/Resources
-@dirrm Local/Applications/Hardware.app/PlugIns/StartupPrefPane.prefPane
-@dirrm Local/Applications/Hardware.app/PlugIns/SoundPrefPane.prefPane/Resources/Sound.gorm
-@dirrm Local/Applications/Hardware.app/PlugIns/SoundPrefPane.prefPane/Resources
-@dirrm Local/Applications/Hardware.app/PlugIns/SoundPrefPane.prefPane
-@dirrm Local/Applications/Hardware.app/PlugIns/MousePrefPane.prefPane/Resources/Mouse.gorm
-@dirrm Local/Applications/Hardware.app/PlugIns/MousePrefPane.prefPane/Resources
-@dirrm Local/Applications/Hardware.app/PlugIns/MousePrefPane.prefPane
-@dirrm Local/Applications/Hardware.app/PlugIns/MonitorPrefPane.prefPane/Resources/Monitor.gorm
-@dirrm Local/Applications/Hardware.app/PlugIns/MonitorPrefPane.prefPane/Resources
-@dirrm Local/Applications/Hardware.app/PlugIns/MonitorPrefPane.prefPane
-@dirrm Local/Applications/Hardware.app/PlugIns/KeyboardPrefPane.prefPane/Resources/Keyboard.gorm
-@dirrm Local/Applications/Hardware.app/PlugIns/KeyboardPrefPane.prefPane/Resources
-@dirrm Local/Applications/Hardware.app/PlugIns/KeyboardPrefPane.prefPane
-@dirrm Local/Applications/Hardware.app/PlugIns/EnergyPrefPane.prefPane/Resources/Energy.gorm
-@dirrm Local/Applications/Hardware.app/PlugIns/EnergyPrefPane.prefPane/Resources
-@dirrm Local/Applications/Hardware.app/PlugIns/EnergyPrefPane.prefPane
-@dirrm Local/Applications/Hardware.app/PlugIns
@dirrm Local/Applications/Hardware.app
diff --git a/deskutils/etoile-lookandbehavior/Makefile b/deskutils/etoile-lookandbehavior/Makefile
index 9c5c031afbc..1a42ee37a23 100644
--- a/deskutils/etoile-lookandbehavior/Makefile
+++ b/deskutils/etoile-lookandbehavior/Makefile
@@ -8,25 +8,27 @@
PORTNAME= lookandbehavior
PORTVERSION= 0.1.${SNAPSHOT}
CATEGORIES= deskutils
-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 LookAndBehavior application
-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
-USE_GNUSTEP_SYSTEM_LIBS+= PreferencesKit:${PREFERENCESKIT_PORT}
+USE_GNUSTEP_LOCAL_LIBS+= PaneKit:${PANEKIT_PORT}
+
+SNAPSHOT= 20061221
+WRKSRC= ${WRKDIR}/Etoile/
USE_GNUSTEP_MAKE_DIRS+= Services/User/LookAndBehavior
-PREFERENCESKIT_PORT?= deskutils/etoile-preferenceskit
+PANEKIT_PORT?= deskutils/etoile-panekit
.include <bsd.port.mk>
diff --git a/deskutils/etoile-lookandbehavior/distinfo b/deskutils/etoile-lookandbehavior/distinfo
index 2d5c7ccf5d1..545ac18e809 100644
--- a/deskutils/etoile-lookandbehavior/distinfo
+++ b/deskutils/etoile-lookandbehavior/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-menuserver/Makefile b/deskutils/etoile-menuserver/Makefile
index f35c93e4fb1..3cc89954bc9 100644
--- a/deskutils/etoile-menuserver/Makefile
+++ b/deskutils/etoile-menuserver/Makefile
@@ -8,26 +8,31 @@
PORTNAME= menuserver
PORTVERSION= 0.1.${SNAPSHOT}
CATEGORIES= deskutils
-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 MenuServer application
+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+= XWindowServerKit:${XWINDOWSERVERKIT_PORT}
+USE_GNUSTEP_SYSTEM_LIBS+= XWindowServerKit:${XWINDOWSERVERKIT_PORT}
+USE_GNUSTEP_SYSTEM_LIBS+= WorkspaceCommKit:${ETOILE_SYSTEM_PORT}
-SNAPSHOT= 20060917
-WRKSRC= ${WRKDIR}/etoile-0+${SNAPSHOT}+dfsg/Etoile/
+SNAPSHOT= 20061221
+WRKSRC= ${WRKDIR}/Etoile/
USE_GNUSTEP_MAKE_DIRS+= Services/Private/MenuServer
ADDITIONAL_OBJCFLAGS+= -I${X11BASE}/include
ADDITIONAL_LDFLAGS+= -L${X11BASE}/lib
XWINDOWSERVERKIT_PORT?= x11/etoile-xwindowserverkit
+ETOILE_SYSTEM_PORT?= sysutils/etoile-system
.include <bsd.port.mk>
diff --git a/deskutils/etoile-menuserver/distinfo b/deskutils/etoile-menuserver/distinfo
index 2d5c7ccf5d1..545ac18e809 100644
--- a/deskutils/etoile-menuserver/distinfo
+++ b/deskutils/etoile-menuserver/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-servicesbarkit/Makefile b/deskutils/etoile-servicesbarkit/Makefile
index 48331f1bcf8..2bafe2de896 100644
--- a/deskutils/etoile-servicesbarkit/Makefile
+++ b/deskutils/etoile-servicesbarkit/Makefile
@@ -8,24 +8,27 @@
PORTNAME= servicesbarkit
PORTVERSION= 0.1.${SNAPSHOT}
CATEGORIES= deskutils
-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 ServicesBarKit 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_LOCAL_LIBS+= UnitKit:${UNITKIT_PORT}
+DEFAULT_LIBVERSION= 0.1
+USE_GNUSTEP_LDCONFIG= ${SYSLIBDIR}
+
+SNAPSHOT= 20061221
+WRKSRC= ${WRKDIR}/Etoile/
USE_GNUSTEP_MAKE_DIRS+= Frameworks/ServicesBarKit
UNITKIT_PORT?= devel/etoile-unitkit
diff --git a/deskutils/etoile-servicesbarkit/distinfo b/deskutils/etoile-servicesbarkit/distinfo
index 2d5c7ccf5d1..545ac18e809 100644
--- a/deskutils/etoile-servicesbarkit/distinfo
+++ b/deskutils/etoile-servicesbarkit/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-servicesbarkit/pkg-plist b/deskutils/etoile-servicesbarkit/pkg-plist
index 6ec988d9c25..d03ef07cd0f 100644
--- a/deskutils/etoile-servicesbarkit/pkg-plist
+++ b/deskutils/etoile-servicesbarkit/pkg-plist
@@ -3,6 +3,6 @@ System/Library/Bundles/ServicesBarMenulet.menulet/ServicesBarMenulet
System/Library/Bundles/ServicesBarMenulet.menulet/stamp.make
System/Library/Libraries/libServicesBarKit.so
System/Library/Libraries/libServicesBarKit.so.%%MAJORLIBVERSION%%
-System/Library/Libraries/libServicesBarKit.so.%%MAJORLIBVERSION%%.1
+System/Library/Libraries/libServicesBarKit.so.%%LIBVERSION%%
@dirrm System/Library/Bundles/ServicesBarMenulet.menulet/Resources
@dirrm System/Library/Bundles/ServicesBarMenulet.menulet
diff --git a/deskutils/etoile-trackerkit/Makefile b/deskutils/etoile-trackerkit/Makefile
index 66630ef5e2a..00eba8ed780 100644
--- a/deskutils/etoile-trackerkit/Makefile
+++ b/deskutils/etoile-trackerkit/Makefile
@@ -8,25 +8,26 @@
PORTNAME= trackerkit
PORTVERSION= 0.1.${SNAPSHOT}
CATEGORIES= deskutils
-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 TrackerKit 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
-LDCONFIG_DIRS= ${LOCALLIBDIR}
-INSTALLS_SHLIB= yes
-NO_FILTER_SHLIBS= yes
+DEFAULT_LIBVERSION= 0.1
+USE_GNUSTEP_LDCONFIG= ${SYSLIBDIR}
+
+SNAPSHOT= 20061221
+WRKSRC= ${WRKDIR}/Etoile/
USE_GNUSTEP_MAKE_DIRS+= Frameworks/TrackerKit
HEADERS= TKCollection.h TKKeyValuePredicate.h TKObject.h \
diff --git a/deskutils/etoile-trackerkit/distinfo b/deskutils/etoile-trackerkit/distinfo
index 2d5c7ccf5d1..545ac18e809 100644
--- a/deskutils/etoile-trackerkit/distinfo
+++ b/deskutils/etoile-trackerkit/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-trackerkit/pkg-plist b/deskutils/etoile-trackerkit/pkg-plist
index 5ac4c2ae14f..344afa42b95 100644
--- a/deskutils/etoile-trackerkit/pkg-plist
+++ b/deskutils/etoile-trackerkit/pkg-plist
@@ -5,5 +5,5 @@ System/Library/Headers/TrackerKit/TKQuery.h
System/Library/Headers/TrackerKit/TKTracker.h
System/Library/Libraries/libTrackerKit.so
System/Library/Libraries/libTrackerKit.so.%%MAJORLIBVERSION%%
-System/Library/Libraries/libTrackerKit.so.%%MAJORLIBVERSION%%.1
+System/Library/Libraries/libTrackerKit.so.%%LIBVERSION%%
@dirrm System/Library/Headers/TrackerKit
diff --git a/devel/etoile-unitkit/Makefile b/devel/etoile-unitkit/Makefile
index fcac3e99a1d..626fe6c63d9 100644
--- a/devel/etoile-unitkit/Makefile
+++ b/devel/etoile-unitkit/Makefile
@@ -8,25 +8,25 @@
PORTNAME= unitkit
PORTVERSION= 1.1
CATEGORIES= devel
-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 UnitKit test framework on 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
-LDCONFIG_DIRS= ${LOCALLIBDIR}
-INSTALLS_SHLIB= yes
-NO_FILTER_SHLIBS= yes
+USE_GNUSTEP_LDCONFIG= ${LOCALLIBDIR}
+
+SNAPSHOT= 20061221
+WRKSRC= ${WRKDIR}/Etoile/
USE_GNUSTEP_MAKE_DIRS+= Frameworks/UnitKit
.include <bsd.port.mk>
diff --git a/devel/etoile-unitkit/distinfo b/devel/etoile-unitkit/distinfo
index 2d5c7ccf5d1..545ac18e809 100644
--- a/devel/etoile-unitkit/distinfo
+++ b/devel/etoile-unitkit/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/editors/etoile-typewriter/Makefile b/editors/etoile-typewriter/Makefile
index 7b9a51f1c21..d624222ae81 100644
--- a/editors/etoile-typewriter/Makefile
+++ b/editors/etoile-typewriter/Makefile
@@ -8,15 +8,16 @@
PORTNAME= typewriter
PORTVERSION= 0.1.${SNAPSHOT}
CATEGORIES= editors
-MASTER_SITES= ${MASTER_SITE_GNUSTEP_CH}
+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= General text editor for plain and rich format text
-SNAPSHOT= 20060917
-WRKSRC= ${WRKDIR}/etoile-0+${SNAPSHOT}+dfsg/Etoile/
+USE_BZIP2= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
@@ -25,6 +26,8 @@ USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LOCAL_LIBS+= OgreKit:${OGREKIT_PORT}
USE_GNUSTEP_MAKE_DIRS+= Services/User/Typewriter
+SNAPSHOT= 20061221
+WRKSRC= ${WRKDIR}/Etoile/
OGREKIT_PORT?= textproc/etoile-ogrekit
.include <bsd.port.mk>
diff --git a/editors/etoile-typewriter/distinfo b/editors/etoile-typewriter/distinfo
index 2d5c7ccf5d1..545ac18e809 100644
--- a/editors/etoile-typewriter/distinfo
+++ b/editors/etoile-typewriter/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/editors/etoile-typewriter/pkg-plist b/editors/etoile-typewriter/pkg-plist
index d0fe3593d51..5fe3e6fba87 100644
--- a/editors/etoile-typewriter/pkg-plist
+++ b/editors/etoile-typewriter/pkg-plist
@@ -1,3 +1,6 @@
+Local/Applications/Typewriter.app/Resources/English.lproj/CharacterPanel.gorm/data.classes
+Local/Applications/Typewriter.app/Resources/English.lproj/CharacterPanel.gorm/data.info
+Local/Applications/Typewriter.app/Resources/English.lproj/CharacterPanel.gorm/objects.gorm
Local/Applications/Typewriter.app/Resources/English.lproj/Document.gorm/data.classes
Local/Applications/Typewriter.app/Resources/English.lproj/Document.gorm/data.info
Local/Applications/Typewriter.app/Resources/English.lproj/Document.gorm/objects.gorm
@@ -11,6 +14,7 @@ Local/Applications/Typewriter.app/library_paths.openapp
Local/Applications/Typewriter.app/stamp.make
@dirrm Local/Applications/Typewriter.app/Resources/English.lproj/MainMenu.gorm
@dirrm Local/Applications/Typewriter.app/Resources/English.lproj/Document.gorm
+@dirrm Local/Applications/Typewriter.app/Resources/English.lproj/CharacterPanel.gorm
@dirrm Local/Applications/Typewriter.app/Resources/English.lproj
@dirrm Local/Applications/Typewriter.app/Resources
@dirrm Local/Applications/Typewriter.app
diff --git a/sysutils/etoile-installer/Makefile b/sysutils/etoile-installer/Makefile
index 63cc3229a2a..03d183c7808 100644
--- a/sysutils/etoile-installer/Makefile
+++ b/sysutils/etoile-installer/Makefile
@@ -8,22 +8,24 @@
PORTNAME= installer
PORTVERSION= 0.1.${SNAPSHOT}
CATEGORIES= sysutils
-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 Installer 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/Installer
post-patch:
diff --git a/sysutils/etoile-installer/distinfo b/sysutils/etoile-installer/distinfo
index 2d5c7ccf5d1..545ac18e809 100644
--- a/sysutils/etoile-installer/distinfo
+++ b/sysutils/etoile-installer/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/textproc/etoile-lucenekit/Makefile b/textproc/etoile-lucenekit/Makefile
index 3cac57497f4..651c981b492 100644
--- a/textproc/etoile-lucenekit/Makefile
+++ b/textproc/etoile-lucenekit/Makefile
@@ -8,13 +8,16 @@
PORTNAME= lucenekit
PORTVERSION= 0.1.${SNAPSHOT}
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_GNUSTEP_CH}
+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 OgreKit framework
+USE_BZIP2= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
@@ -23,8 +26,8 @@ USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LOCAL_LIBS+= OgreKit:${OGREKIT_PORT}
USE_GNUSTEP_LDCONFIG= ${SYSLIBDIR}
-SNAPSHOT= 20060917
-WRKSRC= ${WRKDIR}/etoile-0+${SNAPSHOT}+dfsg/Etoile/
+SNAPSHOT= 20061221
+WRKSRC= ${WRKDIR}/Etoile/
USE_GNUSTEP_MAKE_DIRS+= Frameworks/LuceneKit
OGREKIT_PORT?= textproc/etoile-ogrekit
diff --git a/textproc/etoile-lucenekit/distinfo b/textproc/etoile-lucenekit/distinfo
index 2d5c7ccf5d1..545ac18e809 100644
--- a/textproc/etoile-lucenekit/distinfo
+++ b/textproc/etoile-lucenekit/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/textproc/etoile-ogrekit/Makefile b/textproc/etoile-ogrekit/Makefile
index ac1a63edd52..ea021927bba 100644
--- a/textproc/etoile-ogrekit/Makefile
+++ b/textproc/etoile-ogrekit/Makefile
@@ -8,15 +8,18 @@
PORTNAME= ogrekit
PORTVERSION= 0.1.${SNAPSHOT}
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_GNUSTEP_CH}
+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 OgreKit framework
LIB_DEPENDS= onig:${PORTSDIR}/${ONIGURUMA4_PORT}
+USE_BZIP2= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
@@ -24,8 +27,8 @@ USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LDCONFIG= ${LOCALLIBDIR}
-SNAPSHOT= 20060917
-WRKSRC= ${WRKDIR}/etoile-0+${SNAPSHOT}+dfsg/Etoile/
+SNAPSHOT= 20061221
+WRKSRC= ${WRKDIR}/Etoile/
USE_GNUSTEP_MAKE_DIRS+= Frameworks/OgreKit
UNITKIT_PORT?= devel/etoile-unitkit
diff --git a/textproc/etoile-ogrekit/distinfo b/textproc/etoile-ogrekit/distinfo
index 2d5c7ccf5d1..545ac18e809 100644
--- a/textproc/etoile-ogrekit/distinfo
+++ b/textproc/etoile-ogrekit/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/Makefile b/www/etoile-bookmarkkit/Makefile
index 6eb5d9069d5..f61ebf75410 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 2d5c7ccf5d1..545ac18e809 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 5e9d6ce7b98..cc2a63b7537 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 cdb62bdd3ea..425aa532397 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 75065e03fa2..4b0285b2372 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 2d5c7ccf5d1..545ac18e809 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 9fe142e3a70..3c6c6cfbb8c 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%%
diff --git a/x11-themes/etoile-etoilemenus/Makefile b/x11-themes/etoile-etoilemenus/Makefile
index 5f96a078b3f..a3bf6349d25 100644
--- a/x11-themes/etoile-etoilemenus/Makefile
+++ b/x11-themes/etoile-etoilemenus/Makefile
@@ -8,23 +8,26 @@
PORTNAME= etoilemenus
PORTVERSION= 0.1.${SNAPSHOT}
CATEGORIES= x11-themes
-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 EtoileMenus bundle
-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_LDCONFIG= ${LOCALLIBDIR}
+
+SNAPSHOT= 20061221
+WRKSRC= ${WRKDIR}/Etoile/
USE_GNUSTEP_MAKE_DIRS+= Bundles/EtoileWildMenus
+MAKE_ENV+= GNUSTEP_INSTALLATION_DIR="${SYSTEMDIR}"
.include <bsd.port.mk>
diff --git a/x11-themes/etoile-etoilemenus/distinfo b/x11-themes/etoile-etoilemenus/distinfo
index 2d5c7ccf5d1..545ac18e809 100644
--- a/x11-themes/etoile-etoilemenus/distinfo
+++ b/x11-themes/etoile-etoilemenus/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/x11-themes/etoile-iconkit/Makefile b/x11-themes/etoile-iconkit/Makefile
index ee151816fa0..06c681d274a 100644
--- a/x11-themes/etoile-iconkit/Makefile
+++ b/x11-themes/etoile-iconkit/Makefile
@@ -8,24 +8,27 @@
PORTNAME= iconkit
PORTVERSION= 0.1.${SNAPSHOT}
CATEGORIES= x11-themes
-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 IconKit 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_LOCAL_LIBS+= UnitKit:${UNITKIT_PORT}
+DEFAULT_LIBVERSION= 0.1
+USE_GNUSTEP_LDCONFIG= ${SYSLIBDIR}
+
+SNAPSHOT= 20061221
+WRKSRC= ${WRKDIR}/Etoile/
USE_GNUSTEP_MAKE_DIRS+= Frameworks/IconKit
UNITKIT_PORT?= devel/etoile-unitkit
diff --git a/x11-themes/etoile-iconkit/distinfo b/x11-themes/etoile-iconkit/distinfo
index 2d5c7ccf5d1..545ac18e809 100644
--- a/x11-themes/etoile-iconkit/distinfo
+++ b/x11-themes/etoile-iconkit/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/x11-themes/etoile-iconkit/pkg-plist b/x11-themes/etoile-iconkit/pkg-plist
index 9d4fc20e6c3..972c4d825c7 100644
--- a/x11-themes/etoile-iconkit/pkg-plist
+++ b/x11-themes/etoile-iconkit/pkg-plist
@@ -1,3 +1,14 @@
+System/Library/Headers/IconKit/IKApplicationIconProvider.h
+System/Library/Headers/IconKit/IKCompositor.h
+System/Library/Headers/IconKit/IKCompositorOperation.h
+System/Library/Headers/IconKit/IKIcon.h
+System/Library/Headers/IconKit/IKIconIdentifier.h
+System/Library/Headers/IconKit/IKIconPositions.h
+System/Library/Headers/IconKit/IKIconProvider.h
+System/Library/Headers/IconKit/IKThumbnailProvider.h
+System/Library/Headers/IconKit/IKWorkspaceAdditions.h
+System/Library/Headers/IconKit/IconKit.h
System/Library/Libraries/libIconKit.so
System/Library/Libraries/libIconKit.so.%%MAJORLIBVERSION%%
-System/Library/Libraries/libIconKit.so.%%MAJORLIBVERSION%%.1
+System/Library/Libraries/libIconKit.so.%%LIBVERSION%%
+@dirrm System/Library/Headers/IconKit
diff --git a/x11-themes/etoile-wildmenus/Makefile b/x11-themes/etoile-wildmenus/Makefile
index a9e5e718d71..4b727c67611 100644
--- a/x11-themes/etoile-wildmenus/Makefile
+++ b/x11-themes/etoile-wildmenus/Makefile
@@ -8,23 +8,25 @@
PORTNAME= wildmenus
PORTVERSION= 0.1.${SNAPSHOT}
CATEGORIES= x11-themes
-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 WildMenus bundle
-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_LDCONFIG= ${LOCALLIBDIR}
+
+SNAPSHOT= 20061221
+WRKSRC= ${WRKDIR}/Etoile/
USE_GNUSTEP_MAKE_DIRS+= Bundles/WildMenus
.include <bsd.port.mk>
diff --git a/x11-themes/etoile-wildmenus/distinfo b/x11-themes/etoile-wildmenus/distinfo
index 2d5c7ccf5d1..545ac18e809 100644
--- a/x11-themes/etoile-wildmenus/distinfo
+++ b/x11-themes/etoile-wildmenus/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/x11-wm/etoile-azalea/Makefile b/x11-wm/etoile-azalea/Makefile
index d0ba21b8ea9..22237bbfd1d 100644
--- a/x11-wm/etoile-azalea/Makefile
+++ b/x11-wm/etoile-azalea/Makefile
@@ -8,22 +8,25 @@
PORTNAME= azalea
PORTVERSION= 0.1.${SNAPSHOT}
CATEGORIES= x11-wm
-MASTER_SITES= ${MASTER_SITE_GNUSTEP_CH}
+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= Azalea is a GNUstep window mamager
+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+= XWindowServerKit:${XWINDOWSERVERKIT_PORT}
+USE_GNUSTEP_SYSTEM_LIBS+= XWindowServerKit:${XWINDOWSERVERKIT_PORT}
-SNAPSHOT= 20060917
-WRKSRC= ${WRKDIR}/etoile-0+${SNAPSHOT}+dfsg/Etoile/
+SNAPSHOT= 20061221
+WRKSRC= ${WRKDIR}/Etoile/
USE_GNUSTEP_MAKE_DIRS+= Services/Private/Azalea
ADDITIONAL_INCLUDE_DIRS+= -I${X11BASE}/include
ADDITIONAL_LIB_DIRS+= -L${X11BASE}/lib
diff --git a/x11-wm/etoile-azalea/distinfo b/x11-wm/etoile-azalea/distinfo
index 2d5c7ccf5d1..545ac18e809 100644
--- a/x11-wm/etoile-azalea/distinfo
+++ b/x11-wm/etoile-azalea/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/x11-wm/etoile-azdock/Makefile b/x11-wm/etoile-azdock/Makefile
index 10b85ff9b0d..a92720ce93c 100644
--- a/x11-wm/etoile-azdock/Makefile
+++ b/x11-wm/etoile-azdock/Makefile
@@ -8,26 +8,31 @@
PORTNAME= azdock
PORTVERSION= 0.1.${SNAPSHOT}
CATEGORIES= x11-wm
-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 AZDock is a wm-dock
+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+= XWindowServerKit:${XWINDOWSERVERKIT_PORT}
+USE_GNUSTEP_SYSTEM_LIBS+= XWindowServerKit:${XWINDOWSERVERKIT_PORT}
+USE_GNUSTEP_LOCAL_LIBS+= BookmarkKit:${BOOKMARKKIT_PORT}
-SNAPSHOT= 20060917
-WRKSRC= ${WRKDIR}/etoile-0+${SNAPSHOT}+dfsg/Etoile/
+SNAPSHOT= 20061221
+WRKSRC= ${WRKDIR}/Etoile/
USE_GNUSTEP_MAKE_DIRS+= Services/Private/AZDock
-
-XWINDOWSERVERKIT_PORT?= x11/etoile-xwindowserverkit
ADDITIONAL_OBJCFLAGS+= -I${X11BASE}/include
ADDITIONAL_LDFLAGS+= -L${X11BASE}/lib
+XWINDOWSERVERKIT_PORT?= x11/etoile-xwindowserverkit
+BOOKMARKKIT_PORT?= www/etoile-bookmarkkit
+
.include <bsd.port.mk>
diff --git a/x11-wm/etoile-azdock/distinfo b/x11-wm/etoile-azdock/distinfo
index 2d5c7ccf5d1..545ac18e809 100644
--- a/x11-wm/etoile-azdock/distinfo
+++ b/x11-wm/etoile-azdock/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/x11/etoile-iterm/Makefile b/x11/etoile-iterm/Makefile
index eb33e68af8d..f7ce18f5cc4 100644
--- a/x11/etoile-iterm/Makefile
+++ b/x11/etoile-iterm/Makefile
@@ -9,13 +9,16 @@ PORTNAME= iterm
PORTVERSION= 0.1.${SNAPSHOT}
PORTREVISION= 1
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_GNUSTEP_CH}
+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 Terminal application
+USE_BZIP2= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
@@ -23,8 +26,8 @@ USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LOCAL_LIBS+= Addresses:${ADDRESSES_PORT}
-SNAPSHOT= 20060917
-WRKSRC= ${WRKDIR}/etoile-0+${SNAPSHOT}+dfsg/Etoile/
+SNAPSHOT= 20061221
+WRKSRC= ${WRKDIR}/Etoile/
USE_GNUSTEP_MAKE_DIRS+= Services/User/Terminal
ADDRESSES_PORT?= mail/addresses
diff --git a/x11/etoile-iterm/distinfo b/x11/etoile-iterm/distinfo
index 2d5c7ccf5d1..545ac18e809 100644
--- a/x11/etoile-iterm/distinfo
+++ b/x11/etoile-iterm/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/x11/etoile-xwindowserverkit/Makefile b/x11/etoile-xwindowserverkit/Makefile
index 8e0ec82e305..001524ef6c2 100644
--- a/x11/etoile-xwindowserverkit/Makefile
+++ b/x11/etoile-xwindowserverkit/Makefile
@@ -8,30 +8,28 @@
PORTNAME= xwindowserverkit
PORTVERSION= 0.1.${SNAPSHOT}
CATEGORIES= x11
-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 XWindowServerKit frameowrk
-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_MAKE_DIRS+= Frameworks/XWindowServerKit
+USE_GNUSTEP_LDCONFIG= ${SYSLIBDIR}
+SNAPSHOT= 20061221
+WRKSRC= ${WRKDIR}/Etoile/
+USE_GNUSTEP_MAKE_DIRS+= Frameworks/XWindowServerKit
ADDITIONAL_OBJCFLAGS+= -I${X11BASE}/include
ADDITIONAL_LDFLAGS+= -L${X11BASE}/lib
-MAKE_ENV+= ADDITIONAL_OBJCFLAGS="${ADDITIONAL_OBJCFLAGS}"
-MAKE_ENV+= ADDITIONAL_LDFLAGS="${ADDITIONAL_LDFLAGS}"
+MAKE_ENV+= GNUSTEP_INSTALLATION_DIR="${SYSTEMDIR}"
.include <bsd.port.mk>
diff --git a/x11/etoile-xwindowserverkit/distinfo b/x11/etoile-xwindowserverkit/distinfo
index 2d5c7ccf5d1..545ac18e809 100644
--- a/x11/etoile-xwindowserverkit/distinfo
+++ b/x11/etoile-xwindowserverkit/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/x11/etoile-xwindowserverkit/pkg-plist b/x11/etoile-xwindowserverkit/pkg-plist
index 659db76790c..96d1fc0c94f 100644
--- a/x11/etoile-xwindowserverkit/pkg-plist
+++ b/x11/etoile-xwindowserverkit/pkg-plist
@@ -1,8 +1,8 @@
-Local/Library/Headers/XWindowServerKit/XFunctions.h
-Local/Library/Headers/XWindowServerKit/XScreen.h
-Local/Library/Headers/XWindowServerKit/XWindow.h
-Local/Library/Headers/XWindowServerKit/gnustep.h
-Local/Library/Libraries/libXWindowServerKit.so
-Local/Library/Libraries/libXWindowServerKit.so.%%MAJORLIBVERSION%%
-Local/Library/Libraries/libXWindowServerKit.so.%%LIBVERSION%%
-@dirrm Local/Library/Headers/XWindowServerKit
+System/Library/Headers/XWindowServerKit/XFunctions.h
+System/Library/Headers/XWindowServerKit/XScreen.h
+System/Library/Headers/XWindowServerKit/XWindow.h
+System/Library/Headers/XWindowServerKit/gnustep.h
+System/Library/Libraries/libXWindowServerKit.so
+System/Library/Libraries/libXWindowServerKit.so.%%MAJORLIBVERSION%%
+System/Library/Libraries/libXWindowServerKit.so.%%LIBVERSION%%
+@dirrm System/Library/Headers/XWindowServerKit