[149569] trunk/dports/science/netcdf

[takeshi at macports.org]

Revision: 149569
          https://trac.macports.org/changeset/149569
Author:   takeshi at macports.org
Date:     2016-06-27 02:52:22 -0700 (Mon, 27 Jun 2016)
Log Message:
-----------
netcdf: fix hdf4 variant, closing #51680

Modified Paths:
--------------
    trunk/dports/science/netcdf/Portfile

Added Paths:
-----------
    trunk/dports/science/netcdf/files/patch-liblib-CMakeLists.txt.diff

Modified: trunk/dports/science/netcdf/Portfile
===================================================================
--- trunk/dports/science/netcdf/Portfile	2016-06-27 02:53:51 UTC (rev 149568)
+++ trunk/dports/science/netcdf/Portfile	2016-06-27 09:52:22 UTC (rev 149569)
@@ -60,8 +60,9 @@
 }
 
 variant hdf4 description {enable support for hdf4} {
-    depends_lib-append      port:hdf4
-    configure.env-append    LIBS=-ljpeg
+    depends_lib-append      port:hdf4 \
+                            port:jpeg
+    patchfiles-append       patch-liblib-CMakeLIsts.txt.diff
     configure.args-append   -DENABLE_HDF4=ON
 }
 

Added: trunk/dports/science/netcdf/files/patch-liblib-CMakeLists.txt.diff
===================================================================
--- trunk/dports/science/netcdf/files/patch-liblib-CMakeLists.txt.diff	                        (rev 0)
+++ trunk/dports/science/netcdf/files/patch-liblib-CMakeLists.txt.diff	2016-06-27 09:52:22 UTC (rev 149569)
@@ -0,0 +1,11 @@
+--- liblib/CMakeLists.txt.orig	2016-01-14 06:40:17.000000000 +0900
++++ liblib/CMakeLists.txt	2016-06-27 18:35:41.000000000 +0900
+@@ -69,7 +69,7 @@
+ ENDIF()
+ 
+ IF(USE_HDF4)
+-  SET(TLL_LIBS ${HDF4_MFHDF_LIB} ${HDF4_DF_LIB} ${TLL_LIBS})
++  SET(TLL_LIBS ${HDF4_LIBRARIES} ${TLL_LIBS})
+ ENDIF()
+ 
+ IF(ENABLE_PNETCDF AND PNETCDF)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160627/d5cb9d23/attachment-0001.html>