Update to poppler-0.14.5. (Initial diff from Remi Pointel)
Add a proper CPPFLAGS setting to CONFIGURE_ENV, instead of fiddling
with CFLAGS, which is quite unusual for ports. (From Brad)
Index: Makefile
===================================================================
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.43
diff -u -p -r1.43 Makefile
--- Makefile 20 Nov 2010 09:48:39 -0000 1.43
+++ Makefile 28 Nov 2010 20:21:54 -0000
@@ -5,7 +5,7 @@ COMMENT-main= PDF rendering library
COMMENT-qt= qt interface to PDF rendering library
COMMENT-qt4= qt4 interface to PDF rendering library
-V= 0.14.4
+V= 0.14.5
DISTNAME= poppler-$V
CATEGORIES= print
PKGNAME-main= poppler-$V
@@ -13,7 +13,7 @@ REVISION-main= 0
FULLPKGNAME-qt= poppler-qt-$V
FULLPKGNAME-qt4=poppler-qt4-$V
-SHARED_LIBS += poppler 8.0
+SHARED_LIBS += poppler 9.0
SHARED_LIBS += poppler-glib 7.0
SHARED_LIBS += poppler-qt 7.0
SHARED_LIBS += poppler-qt4 6.0
@@ -90,11 +90,10 @@ CONFIGURE_ARGS+= --enable-xpdf-headers \
--disable-utils \
--enable-zlib
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include
-I${LOCALBASE}/include/libpng" \
+ LDFLAGS="-L${LOCALBASE}/lib"
USE_LIBTOOL= Yes
USE_GMAKE= Yes
-
-CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo 12 Oct 2010 07:00:04 -0000 1.13
+++ distinfo 28 Nov 2010 20:21:54 -0000
@@ -1,5 +1,5 @@
-MD5 (poppler-0.14.4.tar.gz) = pA/pbhEV9kjORonmZ3Q1MA==
-RMD160 (poppler-0.14.4.tar.gz) = UFrEw3WafUsUwdB3+SSfMX3C0q8=
-SHA1 (poppler-0.14.4.tar.gz) = xRkx1yKRJsFtpUtyv+Y6GQwrUWA=
-SHA256 (poppler-0.14.4.tar.gz) = l8OUFEgC5zPq7CaC4GvdxJOcce3ljfBFEnqpS9JExxM=
-SIZE (poppler-0.14.4.tar.gz) = 1794096
+MD5 (poppler-0.14.5.tar.gz) = 9gA48iKEh28CHynxsaD+HA==
+RMD160 (poppler-0.14.5.tar.gz) = gNREGRKwLYl3dAXOA/jhdcTM+p4=
+SHA1 (poppler-0.14.5.tar.gz) = 4jsRXk68Bsk3MYaIsGp8azMZoAo=
+SHA256 (poppler-0.14.5.tar.gz) = yAUxfEwacIAJiujHwqHBuOLHhIWPwuBJQYeO64FkgUw=
+SIZE (poppler-0.14.5.tar.gz) = 1798194
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-configure,v
retrieving revision 1.1
diff -u -p -r1.1 patch-configure
--- patches/patch-configure 9 Oct 2010 08:05:30 -0000 1.1
+++ patches/patch-configure 28 Nov 2010 20:21:54 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.1 2010/10/09 08:05:30 kili Exp $
---- configure.orig Fri Sep 10 21:08:16 2010
-+++ configure Wed Oct 6 19:31:35 2010
-@@ -20804,7 +20804,7 @@ fi
+--- configure.orig Sun Nov 7 17:08:48 2010
++++ configure Wed Nov 10 12:56:41 2010
+@@ -20802,7 +20802,7 @@ fi
if test x$enable_poppler_qt4 = xyes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt4 moc" >&5
$as_echo_n "checking for Qt4 moc... " >&6; }
