[115907] trunk/dports/graphics/openjpeg15

[ryandesign at macports.org]

Revision: 115907
          https://trac.macports.org/changeset/115907
Author:   ryandesign at macports.org
Date:     2014-01-13 20:20:35 -0800 (Mon, 13 Jan 2014)
Log Message:
-----------
openjpeg15: check only for unversioned (current) libpng, not old libpng versions (#42060)

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

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

Modified: trunk/dports/graphics/openjpeg15/Portfile
===================================================================
--- trunk/dports/graphics/openjpeg15/Portfile	2014-01-14 04:03:50 UTC (rev 115906)
+++ trunk/dports/graphics/openjpeg15/Portfile	2014-01-14 04:20:35 UTC (rev 115907)
@@ -27,7 +27,8 @@
 checksums           rmd160  ffa85dbb0a3ba1545bc6974f4950f466789c04ef \
                     sha256  c9908fab44432a2ed2550c457cb7e736da6d7c326f1203d23d1082d992364ace
 
-patchfiles          patch-remove-t1_generate_luts.c-causing-main-symbol.diff
+patchfiles          patch-configure.ac.diff \
+                    patch-remove-t1_generate_luts.c-causing-main-symbol.diff
 
 depends_build       port:pkgconfig
 
@@ -37,6 +38,8 @@
                     port:zlib \
                     port:jbigkit
 
+use_autoconf        yes
+
 pre-activate {
     # openjpeg < 1.5.0 accidentally installed items directly into
     # ${prefix}/share/man bypassing ${destroot}; remove them if found.

Added: trunk/dports/graphics/openjpeg15/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/graphics/openjpeg15/files/patch-configure.ac.diff	                        (rev 0)
+++ trunk/dports/graphics/openjpeg15/files/patch-configure.ac.diff	2014-01-14 04:20:35 UTC (rev 115907)
@@ -0,0 +1,24 @@
+--- configure.ac.orig	2012-02-07 04:49:55.000000000 -0600
++++ configure.ac	2014-01-13 22:16:05.000000000 -0600
+@@ -197,21 +197,9 @@
+ 
+ if test "x${want_png}" = "xyes" ; then
+ 
+-   PKG_CHECK_MODULES([PNG], [libpng15 zlib],
+-      [have_libpng="yes"],
+-      [
+-       PKG_CHECK_MODULES([PNG], [libpng14 zlib],
+-          [have_libpng="yes"],
+-          [
+-           PKG_CHECK_MODULES([PNG], [libpng12 zlib],
+-              [have_libpng="yes"],
+-              [
+                PKG_CHECK_MODULES([PNG], [libpng zlib],
+                   [have_libpng="yes"],
+                   [have_libpng="no"])
+-              ])
+-          ])
+-      ])
+ 
+    if ! test "x${have_libpng}" = "xyes" ; then
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140113/d8a5fd8e/attachment.html>