[106057] trunk/dports/devel/libtuxcap

[ryandesign at macports.org]

Revision: 106057
          https://trac.macports.org/changeset/106057
Author:   ryandesign at macports.org
Date:     2013-05-13 19:47:18 -0700 (Mon, 13 May 2013)
Log Message:
-----------
libtuxcap: revbump and patch to build with new ImageMagick library version

Modified Paths:
--------------
    trunk/dports/devel/libtuxcap/Portfile
    trunk/dports/devel/libtuxcap/files/patch-tuxcap-CMakeModules-FindImageMagickLib.cmake.diff

Modified: trunk/dports/devel/libtuxcap/Portfile
===================================================================
--- trunk/dports/devel/libtuxcap/Portfile	2013-05-14 02:44:32 UTC (rev 106056)
+++ trunk/dports/devel/libtuxcap/Portfile	2013-05-14 02:47:18 UTC (rev 106057)
@@ -6,6 +6,7 @@
 
 name                libtuxcap
 version             1.4.0
+revision            1
 categories          devel games
 platforms           darwin
 maintainers         ryandesign openmaintainer
@@ -42,7 +43,6 @@
 build.dir           ${configure.dir}
 
 configure.args-append \
-                    -DIMAGEMAGICKLIB_CXX_LIBRARY=${prefix}/lib/libMagick++.dylib \
                     -DPYTHON_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/2.7/include/python2.7 \
                     -DPYTHON_LIBRARY=${prefix}/lib/libpython2.7.dylib \
                     ..

Modified: trunk/dports/devel/libtuxcap/files/patch-tuxcap-CMakeModules-FindImageMagickLib.cmake.diff
===================================================================
--- trunk/dports/devel/libtuxcap/files/patch-tuxcap-CMakeModules-FindImageMagickLib.cmake.diff	2013-05-14 02:44:32 UTC (rev 106056)
+++ trunk/dports/devel/libtuxcap/files/patch-tuxcap-CMakeModules-FindImageMagickLib.cmake.diff	2013-05-14 02:47:18 UTC (rev 106057)
@@ -1,18 +1,59 @@
 --- tuxcap/CMakeModules/FindImageMagickLib.cmake.orig	2009-05-12 13:26:02.000000000 -0500
-+++ tuxcap/CMakeModules/FindImageMagickLib.cmake	2013-03-02 11:48:46.000000000 -0600
-@@ -27,6 +27,7 @@
++++ tuxcap/CMakeModules/FindImageMagickLib.cmake	2013-05-05 04:03:36.000000000 -0500
+@@ -27,50 +27,27 @@
  
  # find the libraries main include header file
  FIND_PATH(IMAGEMAGICKLIB_INCLUDE_DIR Magick++.h
-+  @PREFIX@/include/ImageMagick
-   "${IMAGEMAGICKLIB_DIR}/include"
-   "$ENV{IMAGEMAGICKLIB_DIR}/include"
-   "$ENV{MAGICK_DIR}/include"
-@@ -45,6 +46,7 @@
+-  "${IMAGEMAGICKLIB_DIR}/include"
+-  "$ENV{IMAGEMAGICKLIB_DIR}/include"
+-  "$ENV{MAGICK_DIR}/include"
+-  "${IMAGEMAGICKLIB_HOME}/include"
+-  "$ENV{IMAGEMAGICKLIB_HOME}/include"
+-  "$ENV{MAGICK_HOME}/include"
+-  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include"
+-  /usr/local/include
+-  /usr/include
+-  /usr/include/ImageMagick
+-  /opt/net/gcc41/ImageMagick/include
+-  /opt/net/gcc33/ImageMagick/include
+-  )
++  @PREFIX@/include/ImageMagick-6
++)
+ #MESSAGE("DBG IMAGEMAGICKLIB_INCLUDE_DIR=${IMAGEMAGICKLIB_INCLUDE_DIR}")
  
+ 
  # set directories to search for libraries: 
  SET(IMAGEMAGICKLIB_POSSIBLE_LIBRARY_PATHS
+-  "${IMAGEMAGICKLIB_DIR}/lib"
+-  "$ENV{IMAGEMAGICKLIB_DIR}/lib"
+-  "$ENV{MAGICK_DIR}/lib"
+-  "${IMAGEMAGICKLIB_HOME}/lib"
+-  "$ENV{IMAGEMAGICKLIB_HOME}/lib"
+-  "$ENV{MAGICK_HOME}/lib"
+-  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;LibPath]/lib"
+-  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;LibPath]"
+-  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/lib"  
+-  /usr/local/lib
+-  /usr/lib
+-  /opt/net/gcc41/ImageMagick/lib  
+-  /opt/net/gcc33/ImageMagick/lib  
+-  )
 +  @PREFIX@/lib
-   "${IMAGEMAGICKLIB_DIR}/lib"
-   "$ENV{IMAGEMAGICKLIB_DIR}/lib"
-   "$ENV{MAGICK_DIR}/lib"
++)
+ #MESSAGE("DBG IMAGEMAGICKLIB_POSSIBLE_LIBRARY_PATHS=${IMAGEMAGICKLIB_POSSIBLE_LIBRARY_PATHS}")
+ 
+ 
+ # find provided .lib import library files 
+ FIND_LIBRARY(IMAGEMAGICKLIB_CXX_LIBRARY
+-  NAMES Magick++ CORE_RL_Magick++_ CORE_DB_Magick++_
++  NAMES Magick++-6.Q16
+   PATHS ${IMAGEMAGICKLIB_POSSIBLE_LIBRARY_PATHS} )
+ #MESSAGE("DBG IMAGEMAGICKLIB_CXX_LIBRARY=${IMAGEMAGICKLIB_CXX_LIBRARY}")
+ 
+ 
+ FIND_LIBRARY(IMAGEMAGICKLIB_C_LIBRARY
+-  NAMES Magick CORE_RL_magick_ CORE_DB_magick_ MagickCore
++  NAMES MagickCore-6.Q16
+   PATHS ${IMAGEMAGICKLIB_POSSIBLE_LIBRARY_PATHS} )
+ #MESSAGE("DBG IMAGEMAGICKLIB_C_LIBRARY=${IMAGEMAGICKLIB_C_LIBRARY}")
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130513/1a382dad/attachment-0001.html>