4 files changed, 52 insertions, 48 deletions

diff --git a/graphics/popplerkit/Makefile b/graphics/popplerkit/Makefile
index c1390c530168..fe69b2a01a6d 100644
--- a/graphics/popplerkit/Makefile
+++ b/graphics/popplerkit/Makefile
@@ -6,17 +6,17 @@
 #
 
 PORTNAME=	popplerkit
-PORTVERSION=	0.0.${SNAPSHOT}
-PORTREVISION=	3
+PORTVERSION=	1.0.1
 CATEGORIES=	graphics gnustep
-MASTER_SITES=	http://download.gna.org/gsimageapps/PopplerKit/
-DISTNAME=	PopplerKit-${SNAPSHOT}
+MASTER_SITES=	http://download.gna.org/etoile/
+DISTNAME=	etoile-0.4.0
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Framework that supports rendering of PDF content
 
 LIB_DEPENDS=	poppler:${PORTSDIR}/graphics/poppler
 
+USE_BZIP2=	yes
 USE_GNUSTEP=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
@@ -24,12 +24,7 @@ USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 USE_GNOME=	gnomeprefix gnomehack gtk20
 
-SNAPSHOT=	20050720
-WRKSRC=		${WRKDIR}/PopplerKit
-ADDITIONAL_CPPFLAGS+=	-DPOPPLER_0_5
-
-post-patch:
-	${REINPLACE_CMD} -e 's|poppler-cairo|poppler-cairo-broken|' \
-		${WRKSRC}/config.sh
+WRKSRC=	${WRKDIR}/Etoile-0.4.0
+USE_GNUSTEP_MAKE_DIRS+=	Frameworks/PopplerKit
 
 .include <bsd.port.mk>
diff --git a/graphics/popplerkit/distinfo b/graphics/popplerkit/distinfo
index 9c97e3a2049c..2c1e8a612c54 100644
--- a/graphics/popplerkit/distinfo
+++ b/graphics/popplerkit/distinfo
@@ -1,3 +1,3 @@
-MD5 (PopplerKit-20050720.tar.gz) = b6f055e3574b94b7d05c2d793a573c98
-SHA256 (PopplerKit-20050720.tar.gz) = c62b21dd236a9dfaf13ccd27ecf38f9c150323efcc6237d71dbbc21690aae6ab
-SIZE (PopplerKit-20050720.tar.gz) = 1724697
+MD5 (etoile-0.4.0.tar.bz2) = 7c33baf8ec3a708d0d419b1e137452de
+SHA256 (etoile-0.4.0.tar.bz2) = 05b5f01932aaad2ae6251ae01a1ad5376d29c984ee83d9fb62688c8d4a20237a
+SIZE (etoile-0.4.0.tar.bz2) = 8225128
diff --git a/graphics/popplerkit/pkg-descr b/graphics/popplerkit/pkg-descr
index 7c66198ade91..fc218872cccb 100644
--- a/graphics/popplerkit/pkg-descr
+++ b/graphics/popplerkit/pkg-descr
@@ -1,4 +1,10 @@
 PopplerKit is a Framework for accessing and rendering PDF content.
 It is based on the poppler library.
 
+Features:
+- Render PDF content.
+- Extract text from a PDF document.
+- Access a PDF document's outline.
+- Search in PDF documents.
+
 WWW: http://home.gna.org/gsimageapps/
diff --git a/graphics/popplerkit/pkg-plist b/graphics/popplerkit/pkg-plist
index d450bedf2dc5..8570365d0be2 100644
--- a/graphics/popplerkit/pkg-plist
+++ b/graphics/popplerkit/pkg-plist
@@ -1,43 +1,46 @@
 GNUstep/Local/Library/Frameworks/PopplerKit.framework/Headers
 GNUstep/Local/Library/Frameworks/PopplerKit.framework/PopplerKit
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/PopplerKit.framework
 GNUstep/Local/Library/Frameworks/PopplerKit.framework/Resources
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Headers/PopplerCachingRenderer.h
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Headers/PopplerCairoImageRenderer.h
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Headers/PopplerDirectBufferedRenderer.h
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Headers/PopplerDocument+Rendering.h
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Headers/PopplerDocument.h
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Headers/PopplerFontManager.h
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Headers/PopplerKit.h
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Headers/PopplerPage.h
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Headers/PopplerRenderer.h
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Headers/PopplerSplashRenderer.h
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/PopplerKit
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Resources/Info-gnustep.plist
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Resources/d050000l.pfb
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Resources/n019003l.pfb
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Resources/n019004l.pfb
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Resources/n019023l.pfb
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Resources/n019024l.pfb
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Resources/n021003l.pfb
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Resources/n021004l.pfb
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Resources/n021023l.pfb
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Resources/n021024l.pfb
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Resources/n022003l.pfb
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Resources/n022004l.pfb
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Resources/n022023l.pfb
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Resources/n022024l.pfb
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Resources/s050000l.pfb
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/libPopplerKit.so
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/libPopplerKit.so.%%MAJORLIBVERSION%%
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/libPopplerKit.so.%%LIBVERSION%%
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Headers/PopplerCachingRenderer.h
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Headers/PopplerCairoImageRenderer.h
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Headers/PopplerDirectBufferedRenderer.h
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Headers/PopplerDocument+Rendering.h
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Headers/PopplerDocument.h
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Headers/PopplerFontManager.h
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Headers/PopplerKit.h
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Headers/PopplerPage.h
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Headers/PopplerRenderer.h
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Headers/PopplerSplashRenderer.h
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Headers/PopplerTextHit.h
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Headers/PopplerTextSearch.h
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/PopplerKit
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Resources/d050000l.pfb
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Resources/n019003l.pfb
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Resources/n019004l.pfb
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Resources/n019023l.pfb
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Resources/n019024l.pfb
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Resources/n021003l.pfb
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Resources/n021004l.pfb
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Resources/n021023l.pfb
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Resources/n021024l.pfb
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Resources/n022003l.pfb
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Resources/n022004l.pfb
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Resources/n022023l.pfb
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Resources/n022024l.pfb
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Resources/s050000l.pfb
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/libPopplerKit.so
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/libPopplerKit.so.%%MAJORVERSION%%
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/libPopplerKit.so.%%VERSION%%
 GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/Current
 GNUstep/Local/Library/Frameworks/PopplerKit.framework/libPopplerKit.so
 GNUstep/Local/Library/Headers/PopplerKit
 GNUstep/Local/Library/Libraries/libPopplerKit.so
-GNUstep/Local/Library/Libraries/libPopplerKit.so.%%MAJORLIBVERSION%%
-GNUstep/Local/Library/Libraries/libPopplerKit.so.%%LIBVERSION%%
-@dirrm GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Resources
-@dirrm GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Headers
-@dirrm GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0
+GNUstep/Local/Library/Libraries/libPopplerKit.so.%%MAJORVERSION%%
+GNUstep/Local/Library/Libraries/libPopplerKit.so.%%VERSION%%
+@dirrm GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Resources
+@dirrm GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Headers
+@dirrm GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%
 @dirrm GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions
 @dirrm GNUstep/Local/Library/Frameworks/PopplerKit.framework