- update to snapshot 20061221

16 files changed, 81 insertions, 129 deletions

diff --git a/deskutils/etoile-extendedworkspacekit/Makefile b/deskutils/etoile-extendedworkspacekit/Makefile
index 2878c8ebf54d..5be78a396df9 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 2d5c7ccf5d13..545ac18e8091 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 8ebd69b1691a..d5797848148a 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 159a807260c5..fb6082b8cae5 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 2d5c7ccf5d13..545ac18e8091 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 4c1092113252..fd3bb14316ff 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 9c5c031afbce..1a42ee37a233 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 2d5c7ccf5d13..545ac18e8091 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 f35c93e4fb11..3cc89954bc94 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 2d5c7ccf5d13..545ac18e8091 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 48331f1bcf8f..2bafe2de8964 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 2d5c7ccf5d13..545ac18e8091 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 6ec988d9c250..d03ef07cd0f7 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 66630ef5e2a6..00eba8ed7802 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 2d5c7ccf5d13..545ac18e8091 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 5ac4c2ae14f3..344afa42b95a 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