diff options
| author | wiz <wiz@pkgsrc.org> | 2012-12-12 15:51:58 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2012-12-12 15:51:58 +0000 |
| commit | 08a1910502d2ca7c985c298ac1ec8328f00b89e9 (patch) | |
| tree | e04a374ac075f23f942999baf066139e3cdb3e35 /print | |
| parent | 73c69b55560cd9e08fe0bdb38a7487545b7bde0a (diff) | |
| download | pkgsrc-08a1910502d2ca7c985c298ac1ec8328f00b89e9.tar.gz | |
Fix poppler-cpp on Solaris (iconv issue) using a patch from Richard PALO
in PR 47215.
Bump PKGREVISION.
Diffstat (limited to 'print')
| -rw-r--r-- | print/poppler-cpp/Makefile | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/print/poppler-cpp/Makefile b/print/poppler-cpp/Makefile index c47e6bfb967..f5464f6d5a1 100644 --- a/print/poppler-cpp/Makefile +++ b/print/poppler-cpp/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.3 2012/07/04 20:26:58 drochner Exp $ +# $NetBSD: Makefile,v 1.4 2012/12/12 15:51:58 wiz Exp $ # .include "../../print/poppler/Makefile.common" PKGNAME= poppler-cpp-${POPPLER_VERS} +PKGREVISION= 1 COMMENT= PDF rendering library (cpp wrapper) MAINTAINER= reed@reedmedia.net @@ -25,7 +26,7 @@ CONFIGURE_ARGS+= --disable-poppler-qt CONFIGURE_ARGS+= --disable-gtk-test CONFIGURE_ARGS+= --disable-utils -BUILDLINK_API_DEPENDS.poppler+= poppler-${POPPLER_VERS}{,nb*} +BUILDLINK_API_DEPENDS.poppler+= poppler-${POPPLER_VERS}{,nb*} .include "../../print/poppler/buildlink3.mk" .if !empty(PKG_BUILD_OPTIONS.poppler:Mpoppler-cms) @@ -39,6 +40,18 @@ INSTALL_DIRS= cpp INSTALLATION_DIRS+= lib/pkgconfig +.include "../../converters/libiconv/buildlink3.mk" + +CHECK_BUILTIN.iconv:= yes +.include "../../converters/libiconv/builtin.mk" +CHECK_BUILTIN.iconv:= no + +.if !empty(USE_BUILTIN.iconv:M[nN][oO]) +CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv} +.else +CONFIGURE_ARGS+= --with-libiconv-prefix +.endif + post-install: ${INSTALL_DATA} ${WRKSRC}/poppler-cpp.pc ${DESTDIR}${PREFIX}/lib/pkgconfig |