[89126] trunk/dports/science/magic
ryandesign at macports.org
ryandesign at macports.org
Thu Jan 19 12:50:12 PST 2012
Revision: 89126
http://trac.macports.org/changeset/89126
Author: ryandesign at macports.org
Date: 2012-01-19 12:50:11 -0800 (Thu, 19 Jan 2012)
Log Message:
-----------
magic: add mesa dependency; ensure we're UsingTheRightCompiler by patching configure script to not clear CXX
Modified Paths:
--------------
trunk/dports/science/magic/Portfile
Added Paths:
-----------
trunk/dports/science/magic/files/patch-scripts-configure.in.diff
Removed Paths:
-------------
trunk/dports/science/magic/files/patch-scripts-configure.diff
Modified: trunk/dports/science/magic/Portfile
===================================================================
--- trunk/dports/science/magic/Portfile 2012-01-19 20:40:20 UTC (rev 89125)
+++ trunk/dports/science/magic/Portfile 2012-01-19 20:50:11 UTC (rev 89126)
@@ -5,6 +5,7 @@
name magic
version 7.5.214
+revision 1
set major [lindex [split ${version} .] 0]
categories science
maintainers waqar openmaintainer
@@ -24,14 +25,15 @@
extract.suffix .tgz
-depends_lib port:tcl port:tk port:blt
+depends_lib port:tcl port:tk port:blt port:mesa
checksums rmd160 00a1c576407d593b10fe9b3aeadf22d577439e7c \
sha256 c809d4b497acfa69da729d06e0b4ceaab9b4eada89c38f79056f82db943667ab
-patchfiles patch-scripts-configure.diff
+patchfiles patch-scripts-configure.in.diff
-configure.args --mandir=${prefix}/share/man --infodir=${prefix}/share/info
+use_autoreconf yes
+autoreconf.dir ${worksrcpath}/scripts
use_parallel_build no
Deleted: trunk/dports/science/magic/files/patch-scripts-configure.diff
===================================================================
--- trunk/dports/science/magic/files/patch-scripts-configure.diff 2012-01-19 20:40:20 UTC (rev 89125)
+++ trunk/dports/science/magic/files/patch-scripts-configure.diff 2012-01-19 20:50:11 UTC (rev 89126)
@@ -1,45 +0,0 @@
---- scripts/configure.orig 2010-03-08 07:33:07.000000000 -0600
-+++ scripts/configure 2012-01-19 11:33:55.000000000 -0600
-@@ -12098,7 +12098,7 @@
- echo "Configuration Summary (principle requirements):"
- echo
-
--echo -n "X11: "
-+printf "X11: "
- if test $usingX11 ; then
- echo "yes"
- else
-@@ -12112,7 +12112,7 @@
- echo
- fi
-
--echo -n "OpenGL: "
-+printf "OpenGL: "
- if test $usingOGL ; then
- echo "yes"
- else
-@@ -12129,9 +12129,9 @@
- fi
-
- if test $usingTcl ; then
-- echo -n "Tcl/Tk: "
-+ printf "Tcl/Tk: "
- echo "yes (version ${TCL_VERSION})"
-- echo -n "BLT: "
-+ printf "BLT: "
- if test "x${TCLSH_EXE}" = "x" ; then
- echo "Cannot find 'tclsh' executable to check existance of the BLT package"
- else
-@@ -12154,10 +12154,10 @@
- fi
- else
- if test $usingScheme ; then
-- echo -n "Scheme: "
-+ printf "Scheme: "
- echo "yes"
- else
-- echo -n "Tcl/Tk: "
-+ printf "Tcl/Tk: "
- echo "no"
- echo
- echo " Without Tcl/Tk, you cannot run the enhanced version of magic"
Copied: trunk/dports/science/magic/files/patch-scripts-configure.in.diff (from rev 89099, trunk/dports/science/magic/files/patch-scripts-configure.diff)
===================================================================
--- trunk/dports/science/magic/files/patch-scripts-configure.in.diff (rev 0)
+++ trunk/dports/science/magic/files/patch-scripts-configure.in.diff 2012-01-19 20:50:11 UTC (rev 89126)
@@ -0,0 +1,71 @@
+--- scripts/configure.in.orig 2010-03-08 07:33:07.000000000 -0600
++++ scripts/configure.in 2012-01-19 14:38:34.000000000 -0600
+@@ -23,6 +23,7 @@
+ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_CPP
++AC_PROG_CXX
+ AC_ISC_POSIX
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
+@@ -251,7 +252,6 @@
+ LD_RUN_PATH=""
+ WISH_EXE=""
+ TCLSH_EXE=""
+-CXX=
+
+ modules=""
+ unused=""
+@@ -1518,9 +1518,6 @@
+ DEPEND_FLAG="-MM"
+ fi
+
+-if test $usingOA ; then
+- AC_PROG_CXX
+-fi
+
+ dnl Substitute all variables
+
+@@ -1572,7 +1569,7 @@
+ echo "Configuration Summary (principle requirements):"
+ echo
+
+-echo -n "X11: "
++printf "X11: "
+ if test $usingX11 ; then
+ echo "yes"
+ else
+@@ -1586,7 +1583,7 @@
+ echo
+ fi
+
+-echo -n "OpenGL: "
++printf "OpenGL: "
+ if test $usingOGL ; then
+ echo "yes"
+ else
+@@ -1603,9 +1600,9 @@
+ fi
+
+ if test $usingTcl ; then
+- echo -n "Tcl/Tk: "
++ printf "Tcl/Tk: "
+ echo "yes (version ${TCL_VERSION})"
+- echo -n "BLT: "
++ printf "BLT: "
+ if test "x${TCLSH_EXE}" = "x" ; then
+ echo "Cannot find 'tclsh' executable to check existance of the BLT package"
+ else
+@@ -1628,10 +1625,10 @@
+ fi
+ else
+ if test $usingScheme ; then
+- echo -n "Scheme: "
++ printf "Scheme: "
+ echo "yes"
+ else
+- echo -n "Tcl/Tk: "
++ printf "Tcl/Tk: "
+ echo "no"
+ echo
+ echo " Without Tcl/Tk, you cannot run the enhanced version of magic"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120119/1be2084e/attachment.html>
More information about the macports-changes
mailing list