Changeset 36146

Timestamp:

04/19/2008 04:37:58 (4 years ago)

Author:

takeshi@…

Message:

gnudatalanguage: fixed compatibility with ImageMagick >= 6.3.8-5

Files:

• trunk/dports/math/gnudatalanguage/Portfile (modified) (5 diffs)

trunk/dports/math/gnudatalanguage/Portfile

@@ -5 +5 @@
 name            gnudatalanguage
 version         0.9rc1
+revision        1
 categories      math science
 maintainers     takeshi@macports.org
@@ -36 +37 @@
 
 configure.env       FFLAGS=-O2
-configure.cppflags      "-I${prefix}/include/python2.4"
+configure.cppflags-append "-I${prefix}/include/python2.4"
 configure.args      --with-plplotdir=${prefix} \
                     --with-ncursesdir=${prefix} \
@@ -47 +48 @@
                     --with-Magick=${prefix} \
                     --disable-dependency-tracking
+set imflag [lsearch [exec pkg-config --libs-only-l ImageMagick] -lMagickCore]
+if {$imflag} {
+   configure.cppflags-append "-I${prefix}/include/ImageMagick"
+}
 
 patch {
@@ -57 +62 @@
    }
    reinplace "s|AC_CHECK_LIB(proj4|AC_CHECK_LIB(proj|" ${worksrcpath}/configure.in
+   if {$imflag} {
+      reinplace "s|AC_CHECK_LIB(Magick|AC_CHECK_LIB(MagickCore|" ${worksrcpath}/configure.in
+      reinplace "s|-lMagick\\.|-lMagickCore.|" ${worksrcpath}/configure
+      reinplace "s|-lMagick\"|-lMagickCore\"|" ${worksrcpath}/configure
+      reinplace "s|LIBS=\"-lMagick  \$LIBS\"|LIBS=\"-lMagickCore  \$LIBS\"|" ${worksrcpath}/configure
+   }
    reinplace "s|-L/usr/X11R6/lib64||" ${worksrcpath}/src/Makefile.am
    reinplace "s|lib_proj.h|projects.h|" ${worksrcpath}/src/math_utl.hpp
@@ -72 +83 @@
 
 post-destroot {
-    xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
-    foreach f {AUTHORS COPYING ChangeLog HACKING INSTALL NEWS PYTHON.txt README TODO} {
-        eval xinstall -m 644 [glob ${worksrcpath}/${f}] ${destroot}${prefix}/share/doc/${name}
-    }
+   xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
+   xinstall -m 644 -W ${worksrcpath} AUTHORS COPYING Doxyfile ChangeLog HACKING INSTALL NEWS MAP_INSTALL PYTHON.txt README TODO ${destroot}${prefix}/share/doc/${name}
+   xinstall -m 755 -d ${destroot}${prefix}/share/${name}
+   xinstall -m 755 -d ${destroot}${prefix}/share/${name}/py
+   eval xinstall -m 644 [glob ${worksrcpath}/src/py/*.py] ${destroot}${prefix}/share/${name}/py
+   xinstall -m 755 -d ${destroot}${prefix}/share/${name}/pro
+   xinstall -m 644 -W ${worksrcpath}/src/pro README.txt STATUS UrgentNeed.txt \
+      ${destroot}${prefix}/share/${name}/pro
+   eval xinstall -m 644 [glob ${worksrcpath}/src/pro/*.pro] \
+      ${destroot}${prefix}/share/${name}/pro
+   xinstall -m 755 -d ${destroot}${prefix}/share/${name}/pro/dicom
+   eval xinstall -m 644 [glob ${worksrcpath}/src/pro/dicom/*.pro] \
+      ${destroot}${prefix}/share/${name}/pro/dicom
+   xinstall -m 755 -d ${destroot}${prefix}/share/${name}/testsuite
+   eval xinstall -m 644 [glob ${worksrcpath}/testsuite/*.pro] \
+      ${destroot}${prefix}/share/${name}/testsuite
 }