[98016] trunk/dports/science/magic

[ryandesign at macports.org]

Revision: 98016
          http://trac.macports.org//changeset/98016
Author:   ryandesign at macports.org
Date:     2012-09-22 01:23:37 -0700 (Sat, 22 Sep 2012)
Log Message:
-----------
magic: update to 7.5.223 which includes an upstream fix designed to address #36251; disable modular because it's off by default and the developer says it doesn't offer any advantages; remove a part of the configure patch that has been accepted and incorporated upstream

Modified Paths:
--------------
    trunk/dports/science/magic/Portfile
    trunk/dports/science/magic/files/patch-scripts-configure.in.diff

Modified: trunk/dports/science/magic/Portfile
===================================================================
--- trunk/dports/science/magic/Portfile	2012-09-22 06:28:34 UTC (rev 98015)
+++ trunk/dports/science/magic/Portfile	2012-09-22 08:23:37 UTC (rev 98016)
@@ -5,8 +5,7 @@
 PortGroup           conflicts_build 1.0
 
 name                magic
-version             7.5.221
-revision            1
+version             7.5.223
 set major           [lindex [split ${version} .] 0]
 categories          science
 # mostly very permissively licensed, but includes a copy of GNU readline
@@ -30,8 +29,8 @@
 
 depends_lib         port:tcl port:tk port:blt port:mesa
 
-checksums           rmd160  9b2c8cdc223c1275bf1005c3c57ba78267145ba9 \
-                    sha256  7f028ba6e2ed35861d4b3256c5b0f87491901283769257432943be4372fcb42b
+checksums           rmd160  1e11d5bdef69f866c57c8f739c4ca5420f3779da \
+                    sha256  72e5609c61620161fcc3574a8a76684dde5fed1cbebe4cc54261429f05f5bce3
 
 patchfiles          patch-scripts-configure.in.diff \
                     patch-__APPLE__.diff
@@ -46,14 +45,12 @@
 # error: non-void function should return a value [-Wreturn-type]
 compiler.blacklist  clang
 
-configure.args      --enable-modular
-
 use_parallel_build  no
 
 post-build {
     # The build and install don't notice when essential files don't get built,
     # so we must exit for it when it fails. #32934
-    foreach f {ext2sim/exttosim.dylib ext2spice/exttospice.dylib magic/tclmagic.dylib} {
+    foreach f {magic/tclmagic.dylib} {
         if {![file exists ${worksrcpath}/${f}]} {
             return -code error "${f} did not get built"
         }

Modified: trunk/dports/science/magic/files/patch-scripts-configure.in.diff
===================================================================
--- trunk/dports/science/magic/files/patch-scripts-configure.in.diff	2012-09-22 06:28:34 UTC (rev 98015)
+++ trunk/dports/science/magic/files/patch-scripts-configure.in.diff	2012-09-22 08:23:37 UTC (rev 98016)
@@ -8,15 +8,6 @@
  AC_ISC_POSIX
  AC_PROG_INSTALL
  AC_PROG_RANLIB
-@@ -39,7 +40,7 @@
- dnl stage will not execute correctly on the ".in" files in the scmos
- dnl directory.
- 
--if test "$CPP" = "gcc -E" ; then
-+if test "$CPP" = "$CC -E" ; then
-    CPP="$CPP -x c"
- fi
- 
 @@ -251,7 +252,6 @@
  LD_RUN_PATH=""
  WISH_EXE=""
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120922/b31235d1/attachment.html>