Changeset 98016

Timestamp:

Sep 22, 2012, 8:23:37 AM (12 years ago)

Author:

ryandesign@…

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

Location:

trunk/dports/science/magic

Files:

• Portfile (modified) (4 diffs)
• files/patch-scripts-configure.in.diff (modified) (1 diff)

trunk/dports/science/magic/Portfile

@@ -6 +6 @@
 
 name                magic
-version             7.5.221
-revision            1
+version             7.5.223
 set major           [lindex [split ${version} .] 0]
 categories          science
@@ -31 +30 @@
 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 \
@@ -47 +46 @@
 compiler.blacklist  clang
 
-configure.args      --enable-modular
-
 use_parallel_build  no
 
@@ -54 +51 @@
     # 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"

trunk/dports/science/magic/files/patch-scripts-configure.in.diff

@@ -9 +9 @@
  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=""