3 files changed, 39 insertions, 23 deletions

diff --git a/deskutils/etoile-panekit/Makefile b/deskutils/etoile-panekit/Makefile
index 7f7e004e5361..128878f96ddb 100644
--- a/deskutils/etoile-panekit/Makefile
+++ b/deskutils/etoile-panekit/Makefile
@@ -6,28 +6,23 @@
 #
 
 PORTNAME=	panekit
-PORTVERSION=	0.1.${SNAPSHOT}
-PORTREVISION=	1
+PORTVERSION=	0.2
 CATEGORIES=	deskutils gnustep
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	dinoex
+MASTER_SITES=	http://download.gna.org/etoile/
 PKGNAMEPREFIX=	etoile-
-DISTNAME=	Etoile-${SNAPSHOT}
+DISTNAME=	etoile-${PORTVERSION}
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Framework which provides flexible pane window in GNUstep
 
-USE_BZIP2=	yes
 USE_GNUSTEP=	yes
 USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
-DEFAULT_LIBVERSION=	0.1
 USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 
-SNAPSHOT=	20061221
-WRKSRC=	${WRKDIR}/Etoile/
+WRKSRC=	${WRKDIR}/Etoile-${PORTVERSION}
 USE_GNUSTEP_MAKE_DIRS+=	Frameworks/PaneKit
 
 .include <bsd.port.mk>
diff --git a/deskutils/etoile-panekit/distinfo b/deskutils/etoile-panekit/distinfo
index 545ac18e8091..2ac1ee4891af 100644
--- a/deskutils/etoile-panekit/distinfo
+++ b/deskutils/etoile-panekit/distinfo
@@ -1,3 +1,3 @@
-MD5 (Etoile-20061221.tar.bz2) = 120ffa8cf06c58ff775f8a218ad91448
-SHA256 (Etoile-20061221.tar.bz2) = 7dc8acbf2cb46d9d119c9817204bbbbe72884065f3287877550c400e68f4c992
-SIZE (Etoile-20061221.tar.bz2) = 9867481
+MD5 (etoile-0.2.tar.gz) = cc1b54ba2e4ba371c5eda45c756bece9
+SHA256 (etoile-0.2.tar.gz) = 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
+SIZE (etoile-0.2.tar.gz) = 21373391
diff --git a/deskutils/etoile-panekit/pkg-plist b/deskutils/etoile-panekit/pkg-plist
index 4662361c2d8f..3c502ae04279 100644
--- a/deskutils/etoile-panekit/pkg-plist
+++ b/deskutils/etoile-panekit/pkg-plist
@@ -1,14 +1,35 @@
-Local/Library/Headers/PaneKit/CocoaCompatibility.h
-Local/Library/Headers/PaneKit/NSPreferencePane.h
-Local/Library/Headers/PaneKit/PKPane.h
-Local/Library/Headers/PaneKit/PKPaneRegistry.h
-Local/Library/Headers/PaneKit/PKPanesController.h
-Local/Library/Headers/PaneKit/PKPreferencePane.h
-Local/Library/Headers/PaneKit/PKPreferencePaneRegistry.h
-Local/Library/Headers/PaneKit/PKPreferencesController.h
-Local/Library/Headers/PaneKit/PKPresentationBuilder.h
-Local/Library/Headers/PaneKit/PaneKit.h
+Local/Library/Frameworks/PaneKit.framework/Headers
+Local/Library/Frameworks/PaneKit.framework/PaneKit
+Local/Library/Frameworks/PaneKit.framework/Resources
+Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/CocoaCompatibility.h
+Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSPreferencePane.h
+Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/PKMatrixViewPresentation.h
+Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/PKPane.h
+Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/PKPaneRegistry.h
+Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/PKPanesController.h
+Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/PKPlainPresentation.h
+Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/PKPopUpButtonPresentation.h
+Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/PKPreferencePane.h
+Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/PKPreferencePaneRegistry.h
+Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/PKPreferencesController.h
+Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/PKPresentationBuilder.h
+Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/PKTableViewPresentation.h
+Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/PKToolbarPresentation.h
+Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/PaneKit.h
+Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/PaneKit
+Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/libPaneKit.so
+Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/libPaneKit.so.%%MAJORLIBVERSION%%
+Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/libPaneKit.so.%%LIBVERSION%%
+Local/Library/Frameworks/PaneKit.framework/Versions/Current
+Local/Library/Frameworks/PaneKit.framework/libPaneKit.so
+Local/Library/Headers/PaneKit
 Local/Library/Libraries/libPaneKit.so
 Local/Library/Libraries/libPaneKit.so.%%MAJORLIBVERSION%%
 Local/Library/Libraries/libPaneKit.so.%%LIBVERSION%%
-@dirrm Local/Library/Headers/PaneKit
+@dirrm Local/Library/Libraries
+@dirrm Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/Resources
+@dirrm Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/Headers
+@dirrm Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%
+@dirrm Local/Library/Frameworks/PaneKit.framework/Versions
+@dirrm Local/Library/Frameworks/PaneKit.framework