[147591] trunk/dports/graphics/poppler

[devans at macports.org]

Revision: 147591
          https://trac.macports.org/changeset/147591
Author:   devans at macports.org
Date:     2016-04-09 04:50:27 -0700 (Sat, 09 Apr 2016)
Log Message:
-----------
poppler: fix nss configuration logic in configure.ac and explicitly disable broken nss support, increment revision (#51069).

Modified Paths:
--------------
    trunk/dports/graphics/poppler/Portfile

Added Paths:
-----------
    trunk/dports/graphics/poppler/files/patch-configure.ac.diff

Modified: trunk/dports/graphics/poppler/Portfile
===================================================================
--- trunk/dports/graphics/poppler/Portfile	2016-04-09 08:23:34 UTC (rev 147590)
+++ trunk/dports/graphics/poppler/Portfile	2016-04-09 11:50:27 UTC (rev 147591)
@@ -9,7 +9,7 @@
 name                poppler
 conflicts           pdf2json xpdf-tools
 version             0.42.0
-revision            1
+revision            2
 license             GPL-2+
 maintainers         devans openmaintainer
 categories          graphics
@@ -38,7 +38,6 @@
                     path:lib/pkgconfig/cairo.pc:cairo \
                     port:lcms2 \
                     port:libpng \
-                    port:nss \
                     port:openjpeg15 \
                     port:poppler-data \
                     port:tiff \
@@ -56,11 +55,13 @@
                     --disable-poppler-qt5 \
                     --disable-gtk-test \
                     --disable-silent-rules \
+                    --disable-libnss \
                     --enable-xpdf-headers \
                     --enable-zlib \
                     --enable-libcurl
 
-patchfiles          patch-poppler-Decrypt.cc.diff
+patchfiles          patch-configure.ac.diff \
+                    patch-poppler-Decrypt.cc.diff
 
 post-patch {
     # clang: error: unknown argument: '-fno-check-new'

Added: trunk/dports/graphics/poppler/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/graphics/poppler/files/patch-configure.ac.diff	                        (rev 0)
+++ trunk/dports/graphics/poppler/files/patch-configure.ac.diff	2016-04-09 11:50:27 UTC (rev 147591)
@@ -0,0 +1,20 @@
+--- configure.ac.orig	2016-04-08 19:06:17.000000000 -0700
++++ configure.ac	2016-04-09 04:03:54.000000000 -0700
+@@ -266,7 +266,7 @@
+ 
+ dnl Test for NSS
+ AC_ARG_ENABLE(libnss,
+-        AC_HELP_STRING([--disable-nss],
++        AC_HELP_STRING([--disable-libnss],
+                        [Do not build against libnss3.]),
+               enable_libnss=$enableval,
+               enable_libnss="try")
+@@ -274,6 +274,8 @@
+ if test x$enable_libnss != xno; then
+   PKG_CHECK_MODULES(NSS3, nss, [enable_nss="yes"],
+       [enable_nss="no"])
++else
++  enable_nss=no
+ fi
+ 
+ if test x$enable_nss = xyes; then
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160409/d1657b0a/attachment.html>