- update to snapshot 20061221

5 files changed, 31 insertions, 30 deletions

diff --git a/x11/etoile-iterm/Makefile b/x11/etoile-iterm/Makefile
index eb33e68af8d5..f7ce18f5cc4d 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 2d5c7ccf5d13..545ac18e8091 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 8e0ec82e3059..001524ef6c23 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 2d5c7ccf5d13..545ac18e8091 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 659db76790c7..96d1fc0c94f2 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