build poppler's "cpp" wrapper as a seperate pkg, addresses

PR pkg/45498 by Francois Tigeot

8 files changed, 115 insertions, 2 deletions

diff --git a/print/poppler-cpp/DESCR b/print/poppler-cpp/DESCR
new file mode 100644
index 00000000000..f1d60dc2f1c
--- /dev/null
+++ b/print/poppler-cpp/DESCR
@@ -0,0 +1 @@
+This is the GLib wrapper for poppler, a PDF rendering library.
diff --git a/print/poppler-cpp/Makefile b/print/poppler-cpp/Makefile
new file mode 100644
index 00000000000..408da9891c1
--- /dev/null
+++ b/print/poppler-cpp/Makefile
@@ -0,0 +1,46 @@
+# $NetBSD: Makefile,v 1.1 2011/10/20 16:32:57 drochner Exp $
+#
+
+.include "../../print/poppler/Makefile.common"
+
+PKGNAME=		poppler-cpp-${POPPLER_VERS}
+
+COMMENT=		PDF rendering library (cpp wrapper)
+MAINTAINER=		reed@reedmedia.net
+
+CONFLICTS+=		poppler<0.4.5nb1
+
+GNU_CONFIGURE=		yes
+USE_TOOLS+=		gmake
+PKGCONFIG_OVERRIDE+=	${WRKSRC}/poppler-glib.pc.in
+
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+# Don't build the cairo graphics backend, required by glib.
+CONFIGURE_ARGS+=	--disable-cairo-output
+# Don't build the splash graphics backend.
+CONFIGURE_ARGS+=	--disable-splash-output
+# Don't compile poppler qt wrapper.
+CONFIGURE_ARGS+=	--disable-poppler-qt
+# Don't compile GTK+ test program.
+CONFIGURE_ARGS+=	--disable-gtk-test
+CONFIGURE_ARGS+=	--disable-utils
+
+BUILDLINK_API_DEPENDS.poppler+=     poppler-${POPPLER_VERS}{,nb*}
+.include "../../print/poppler/buildlink3.mk"
+
+.if !empty(PKG_BUILD_OPTIONS.poppler:Mpoppler-cms)
+CONFIGURE_ARGS+=	--enable-cms
+.else
+CONFIGURE_ARGS+=	--disable-cms
+.endif
+
+BUILD_DIRS=		cpp
+INSTALL_DIRS=		cpp
+
+INSTALLATION_DIRS+=	lib/pkgconfig
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/poppler-cpp.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
+
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/print/poppler-cpp/PLIST b/print/poppler-cpp/PLIST
new file mode 100644
index 00000000000..631f9d93b5e
--- /dev/null
+++ b/print/poppler-cpp/PLIST
@@ -0,0 +1,14 @@
+@comment $NetBSD: PLIST,v 1.1 2011/10/20 16:32:57 drochner Exp $
+include/poppler/cpp/poppler-document.h
+include/poppler/cpp/poppler-embedded-file.h
+include/poppler/cpp/poppler-font.h
+include/poppler/cpp/poppler-global.h
+include/poppler/cpp/poppler-image.h
+include/poppler/cpp/poppler-page-renderer.h
+include/poppler/cpp/poppler-page-transition.h
+include/poppler/cpp/poppler-page.h
+include/poppler/cpp/poppler-rectangle.h
+include/poppler/cpp/poppler-toc.h
+include/poppler/cpp/poppler-version.h
+lib/libpoppler-cpp.la
+lib/pkgconfig/poppler-cpp.pc
diff --git a/print/poppler-cpp/buildlink3.mk b/print/poppler-cpp/buildlink3.mk
new file mode 100644
index 00000000000..ce753d0b073
--- /dev/null
+++ b/print/poppler-cpp/buildlink3.mk
@@ -0,0 +1,14 @@
+# $NetBSD: buildlink3.mk,v 1.1 2011/10/20 16:32:57 drochner Exp $
+
+BUILDLINK_TREE+=	poppler-cpp
+
+.if !defined(POPPLER_CPP_BUILDLINK3_MK)
+POPPLER_CPP_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.poppler-cpp+=	poppler-cpp>=0.16.7
+BUILDLINK_PKGSRCDIR.poppler-cpp?=	../../print/poppler-cpp
+
+.include "../../print/poppler/buildlink3.mk"
+.endif	# POPPLER_CPP_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-poppler-cpp
diff --git a/print/poppler/buildlink3.mk b/print/poppler/buildlink3.mk
index 69b91c697b7..58df72a7726 100644
--- a/print/poppler/buildlink3.mk
+++ b/print/poppler/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2011/03/09 13:06:49 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2011/10/20 16:32:57 drochner Exp $
 
 BUILDLINK_TREE+=	poppler
 
@@ -17,6 +17,7 @@ pkgbase := poppler
 
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
 .endif # POPPLER_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-poppler
diff --git a/print/poppler/distinfo b/print/poppler/distinfo
index 9f7718f965a..82bef3d1d1f 100644
--- a/print/poppler/distinfo
+++ b/print/poppler/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.70 2011/09/20 19:11:54 bsiegert Exp $
+$NetBSD: distinfo,v 1.71 2011/10/20 16:32:57 drochner Exp $
 
 SHA1 (poppler-0.16.7.tar.gz) = 26c735f863688f62b57d5159863fdad4272be89f
 RMD160 (poppler-0.16.7.tar.gz) = 279330e6feaf97a207f3396eab1af836d3d1f16c
@@ -10,3 +10,5 @@ SHA1 (patch-ag) = 4b914e85bb08ce83305d20de9c0a3e74d3cabdd2
 SHA1 (patch-ai) = a51dba3fb0e7131873ef82ae5e256fb1d17cee53
 SHA1 (patch-ao) = cf7e0f086522147a91f59b1b26ca510d1971ac74
 SHA1 (patch-aq) = 17db7fb50937611ff253f48241503281fb642f63
+SHA1 (patch-ar) = d24b92939deaccde42bbb0be48930b37d0f1a87f
+SHA1 (patch-as) = f0f4f8d9f5a49173a27e2349be4b7536ed77eaae
diff --git a/print/poppler/patches/patch-ar b/print/poppler/patches/patch-ar
new file mode 100644
index 00000000000..e0ea6b8ea2c
--- /dev/null
+++ b/print/poppler/patches/patch-ar
@@ -0,0 +1,22 @@
+$NetBSD: patch-ar,v 1.3 2011/10/20 16:32:57 drochner Exp $
+
+--- cpp/Makefile.in.orig	2011-06-27 18:45:13.000000000 +0000
++++ cpp/Makefile.in
+@@ -79,7 +79,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ libpoppler_cpp_la_DEPENDENCIES =  \
+-	$(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1)
++	$(prefix)/lib/libpoppler.la $(am__DEPENDENCIES_1)
+ am_libpoppler_cpp_la_OBJECTS = libpoppler_cpp_la-poppler-document.lo \
+ 	libpoppler_cpp_la-poppler-embedded-file.lo \
+ 	libpoppler_cpp_la-poppler-font.lo \
+@@ -430,7 +430,7 @@ libpoppler_cpp_la_CXXFLAGS = \
+ 	-Dpoppler_cpp_EXPORTS
+ 
+ libpoppler_cpp_la_LIBADD = \
+-	$(top_builddir)/poppler/libpoppler.la	\
++	$(prefix)/lib/libpoppler.la	\
+ 	$(LIBICONV)
+ 
+ libpoppler_cpp_la_LDFLAGS = -version-info 2:0:2 @create_shared_lib@ @auto_import_flags@
diff --git a/print/poppler/patches/patch-as b/print/poppler/patches/patch-as
new file mode 100644
index 00000000000..cf8a0020012
--- /dev/null
+++ b/print/poppler/patches/patch-as
@@ -0,0 +1,13 @@
+$NetBSD: patch-as,v 1.3 2011/10/20 16:32:57 drochner Exp $
+
+--- cpp/tests/Makefile.in.orig	2011-06-27 18:45:14.000000000 +0000
++++ cpp/tests/Makefile.in
+@@ -300,7 +300,7 @@ INCLUDES = \
+ 	-I$(top_srcdir)/cpp
+ 
+ LDADDS = \
+-	$(top_builddir)/poppler/libpoppler.la	\
++	$(prefix)/lib/libpoppler.la	\
+ 	$(top_builddir)/cpp/libpoppler-cpp.la
+ 
+ poppler_dump_SOURCES = \