[Midnightbsd-cvs] mports: graphics/poppler: Update to 0.6.4

[laffer1 at midnightbsd.org]

Log Message:
-----------
Update to 0.6.4

Modified Files:
--------------
    mports/graphics/poppler:
        Makefile (r1.5 -> r1.6)
        distinfo (r1.2 -> r1.3)

Removed Files:
-------------
    mports/graphics/poppler/files:
        patch-Makefile.in
        patch-configure

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/graphics/poppler/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -L graphics/poppler/Makefile -L graphics/poppler/Makefile -u -r1.5 -r1.6
--- graphics/poppler/Makefile
+++ graphics/poppler/Makefile
@@ -8,7 +8,7 @@
 #
 
 PORTNAME=	poppler
-PORTVERSION=	0.6
+PORTVERSION=	0.6.4
 CATEGORIES=	graphics print
 MASTER_SITES=	http://poppler.freedesktop.org/
 
@@ -16,6 +16,8 @@
 COMMENT?=	A PDF rendering library
 LICENSE=	gpl2
 
+RUN_DEPENDS=	poppler-data>0:${PORTSDIR}/graphics/poppler-data
+
 USE_GMAKE=	yes
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
@@ -24,7 +26,7 @@
 CONFIGURE_ARGS=	--enable-zlib \
 		--enable-xpdf-headers \
 		--with-html-dir=${DOCSDIR}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 .if !defined(SLAVEPORT)
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/graphics/poppler/distinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -L graphics/poppler/distinfo -L graphics/poppler/distinfo -u -r1.2 -r1.3
--- graphics/poppler/distinfo
+++ graphics/poppler/distinfo
@@ -1,3 +1,3 @@
-MD5 (poppler-0.6.tar.gz) = 96883867572aa1e55e979ec75369c562
-SHA256 (poppler-0.6.tar.gz) = ef4bb8fd1bb4dffd5dc689509bf3e33260774550425ee78995a8d0297f76bfae
-SIZE (poppler-0.6.tar.gz) = 1228142
+MD5 (poppler-0.6.4.tar.gz) = 13d12ca4e349574cfbbcf4a9b2b3ae52
+SHA256 (poppler-0.6.4.tar.gz) = 54269075e4d611a61792a374986e920744c8ca39c2df45911233873c7e714354
+SIZE (poppler-0.6.4.tar.gz) = 1294481
--- graphics/poppler/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Tue Jul  3 17:06:02 2007
-+++ configure	Tue Jul  3 17:06:36 2007
-@@ -25848,7 +25848,7 @@
-     fi
- fi
- 
--if test "x$have_qt" == "xyes"; then
-+if test "x$have_qt" = "xyes"; then
-     ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--- graphics/poppler/files/patch-Makefile.in
+++ /dev/null
@@ -1,24 +0,0 @@
---- Makefile.in.orig	Thu Sep 21 20:54:29 2006
-+++ Makefile.in	Sat Sep 30 10:51:57 2006
-@@ -76,7 +76,7 @@
- DATA = $(pkgconfig_DATA)
- ETAGS = etags
- CTAGS = ctags
--DIST_SUBDIRS = goo fofi splash poppler utils glib qt test qt4
-+DIST_SUBDIRS = goo fofi splash poppler utils glib qt
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- distdir = $(PACKAGE)-$(VERSION)
- top_distdir = $(distdir)
-@@ -254,10 +254,10 @@
- @BUILD_POPPLER_GLIB_TRUE at glib_pc_file = poppler-glib.pc
- @BUILD_POPPLER_QT_TRUE at qt_subdir = qt
- @BUILD_POPPLER_QT_TRUE at qt_pc_file = poppler-qt.pc
-- at BUILD_POPPLER_QT4_TRUE@qt4_subdir = qt4
-+ at BUILD_POPPLER_QT4_TRUE@qt4_subdir =
- @BUILD_POPPLER_QT4_TRUE at qt4_pc_file = poppler-qt4.pc
- @BUILD_UTILS_TRUE at utils_subdir = utils
--SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir) test $(qt4_subdir)
-+SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir)
- EXTRA_DIST = \
- 	README-XPDF				\
- 	poppler.pc.in				\