[149258] trunk/dports/science/apbs

[dstrubbe at macports.org]

Revision: 149258
          https://trac.macports.org/changeset/149258
Author:   dstrubbe at macports.org
Date:     2016-06-07 15:25:57 -0700 (Tue, 07 Jun 2016)
Log Message:
-----------
apbs: Use proper convention of patch filename.

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

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

Removed Paths:
-------------
    trunk/dports/science/apbs/files/patch-apbs-CMakeLists.txt.diff

Modified: trunk/dports/science/apbs/Portfile
===================================================================
--- trunk/dports/science/apbs/Portfile	2016-06-07 21:55:22 UTC (rev 149257)
+++ trunk/dports/science/apbs/Portfile	2016-06-07 22:25:57 UTC (rev 149258)
@@ -43,7 +43,7 @@
                         -DCMAKE_C_COMPILER_ARG1:STRING="-I${worksrcpath}/include -O3 -ffast-math" \
                         -DCMAKE_CXX_COMPILER_ARG1:STRING="-I${worksrcpath}/include -O3 -ffast-math"
 
-patchfiles              patch-apbs-CMakeLists.txt.diff patch-Eigen-include-path.diff
+patchfiles              patch-CMakeLists.txt.diff patch-Eigen-include-path.diff
 
 test.run  yes
 test {

Copied: trunk/dports/science/apbs/files/patch-CMakeLists.txt.diff (from rev 149257, trunk/dports/science/apbs/files/patch-apbs-CMakeLists.txt.diff)
===================================================================
--- trunk/dports/science/apbs/files/patch-CMakeLists.txt.diff	                        (rev 0)
+++ trunk/dports/science/apbs/files/patch-CMakeLists.txt.diff	2016-06-07 22:25:57 UTC (rev 149258)
@@ -0,0 +1,27 @@
+--- CMakeLists.txt.orig	2016-06-07 15:34:23.000000000 -0400
++++ CMakeLists.txt	2016-06-07 15:31:19.000000000 -0400
+@@ -214,8 +214,8 @@
+     if(HAVE_GFORTRAN GREATER 0)
+         message(FATAL_ERROR gfortran is currently required for using BEM/TABIPB in APBS)
+     endif()
+-    get_filename_component(LIBGFORTRANPATH ${LIBGFORTRANPATH} PATH)
+-    find_path(LIBGFORTRAN_PATH ${LIBGFORTRAN_NAME} PATH ${LIBGFORTRANPATH})
++    #get_filename_component(LIBGFORTRANPATH ${LIBGFORTRANPATH} PATH)
++    #find_path(LIBGFORTRAN_PATH ${LIBGFORTRAN_NAME} PATH ${LIBGFORTRANPATH})
+     list(APPEND APBS_LIBS "-L${APBS_ROOT}/${LIBRARY_INSTALL_PATH} -L${LIBGFORTRAN_PATH} -lgfortran -ltabipb -lstdc++" )
+ endif() # ENABLE_BEM
+ 
+@@ -277,7 +277,7 @@
+     )
+     set(MALOC_LIBRARY ${LIBRARY_OUTPUT_PATH}/${MALOC_LIBRARY_BASENAME})
+ endif()
+-list(APPEND APBS_LIBS -lmaloc)
++list(APPEND APBS_LIBS -lmaloc -lreadline)
+ 
+ 
+ ##############################################################################
+@@ -676,3 +676,4 @@
+                 DESTINATION ${EXECUTABLE_INSTALL_PATH})
+     endif()
+ endif()
++include_directories(${APBS_ROOT}/include)

Deleted: trunk/dports/science/apbs/files/patch-apbs-CMakeLists.txt.diff
===================================================================
--- trunk/dports/science/apbs/files/patch-apbs-CMakeLists.txt.diff	2016-06-07 21:55:22 UTC (rev 149257)
+++ trunk/dports/science/apbs/files/patch-apbs-CMakeLists.txt.diff	2016-06-07 22:25:57 UTC (rev 149258)
@@ -1,27 +0,0 @@
---- CMakeLists.txt.orig	2016-06-07 15:34:23.000000000 -0400
-+++ CMakeLists.txt	2016-06-07 15:31:19.000000000 -0400
-@@ -214,8 +214,8 @@
-     if(HAVE_GFORTRAN GREATER 0)
-         message(FATAL_ERROR gfortran is currently required for using BEM/TABIPB in APBS)
-     endif()
--    get_filename_component(LIBGFORTRANPATH ${LIBGFORTRANPATH} PATH)
--    find_path(LIBGFORTRAN_PATH ${LIBGFORTRAN_NAME} PATH ${LIBGFORTRANPATH})
-+    #get_filename_component(LIBGFORTRANPATH ${LIBGFORTRANPATH} PATH)
-+    #find_path(LIBGFORTRAN_PATH ${LIBGFORTRAN_NAME} PATH ${LIBGFORTRANPATH})
-     list(APPEND APBS_LIBS "-L${APBS_ROOT}/${LIBRARY_INSTALL_PATH} -L${LIBGFORTRAN_PATH} -lgfortran -ltabipb -lstdc++" )
- endif() # ENABLE_BEM
- 
-@@ -277,7 +277,7 @@
-     )
-     set(MALOC_LIBRARY ${LIBRARY_OUTPUT_PATH}/${MALOC_LIBRARY_BASENAME})
- endif()
--list(APPEND APBS_LIBS -lmaloc)
-+list(APPEND APBS_LIBS -lmaloc -lreadline)
- 
- 
- ##############################################################################
-@@ -676,3 +676,4 @@
-                 DESTINATION ${EXECUTABLE_INSTALL_PATH})
-     endif()
- endif()
-+include_directories(${APBS_ROOT}/include)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160607/709ef573/attachment.html>