7 files changed, 50 insertions, 31 deletions

diff --git a/x11-themes/etoile-etoilemenus/Makefile b/x11-themes/etoile-etoilemenus/Makefile
index 5f96a078b3f6..a3bf6349d257 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 2d5c7ccf5d13..545ac18e8091 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 ee151816fa02..06c681d274a6 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 2d5c7ccf5d13..545ac18e8091 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 9d4fc20e6c3f..972c4d825c76 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 a9e5e718d712..4b727c67611b 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 2d5c7ccf5d13..545ac18e8091 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