[54628] trunk/dports/math/cadabra

[gwright at macports.org]

Revision: 54628
          http://trac.macports.org/changeset/54628
Author:   gwright at macports.org
Date:     2009-07-30 07:12:04 -0700 (Thu, 30 Jul 2009)
Log Message:
-----------
Version bump to 1.14.

Modified Paths:
--------------
    trunk/dports/math/cadabra/Portfile
    trunk/dports/math/cadabra/files/patch-Makefile.in.diff
    trunk/dports/math/cadabra/files/patch-src-Makefile.in.diff

Added Paths:
-----------
    trunk/dports/math/cadabra/files/patch-configure.diff

Modified: trunk/dports/math/cadabra/Portfile
===================================================================
--- trunk/dports/math/cadabra/Portfile	2009-07-30 14:10:49 UTC (rev 54627)
+++ trunk/dports/math/cadabra/Portfile	2009-07-30 14:12:04 UTC (rev 54628)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name		cadabra
-version		1.11
+version		1.14
 categories	math
 platforms	darwin
 maintainers	gwright
@@ -17,12 +17,13 @@
 	differ substantially from other computer algebra systems.
 
 homepage	http://www.aei.mpg.de/~peekas/cadabra/
-master_sites	${homepage}/
+master_sites	${homepage}
 
-checksums	md5     cf97dd9c4b353604d24c5c6c8cd35b09		\
-		sha1    8ce4808914bd4f4dfe53672e8737d46c4ae9475f	\
-		rmd160  3f10de798118d975a9fb067939f6207ebef68c15
+checksums	md5     57b20e2ca58a0f9c4642fedc53701b3d		\
+		sha1    1034e109aa44e97379445a313a20a978a285bdff	\
+		rmd160  1e739f97b8a5ae7776ef2c1487498d3e2a903a20
 
+
 variant texmacs	description { install TeXmacs from end } {
 		  depends_run port:TeXmacs
 		}
@@ -33,7 +34,8 @@
 		}
 
 patchfiles	patch-Makefile.in.diff		\
-		patch-src-Makefile.in.diff
+		patch-src-Makefile.in.diff	\
+		patch-configure.diff
 
 depends_lib	port:modglue	\
 		port:pcre	\
@@ -42,8 +44,12 @@
 		port:gtkmm	\
 		port:texlive
 
-build.env	CC=gcc CXX=g++
+post-patch	{
+		  reinplace "s|XXPATH_TO_GCCXX|${configure.cc}|" ${worksrcpath}/configure
+		}
 
+build.env	CC=${configure.cc} CXX=${configure.cxx}
+
 post-build	{
 		  system "env CDB_LOG=1 ${build.cmd} advtest"
 		}

Modified: trunk/dports/math/cadabra/files/patch-Makefile.in.diff
===================================================================
--- trunk/dports/math/cadabra/files/patch-Makefile.in.diff	2009-07-30 14:10:49 UTC (rev 54627)
+++ trunk/dports/math/cadabra/files/patch-Makefile.in.diff	2009-07-30 14:12:04 UTC (rev 54628)
@@ -2,7 +2,7 @@
 +++ Makefile.in	2008-09-02 17:16:36.000000000 -0400
 @@ -1,4 +1,5 @@
  
- export RELEASE=1.11
+ export RELEASE=1.14
 +export LDFLAGS=@LDFLAGS@
  
  .PHONY: static program_static test fasttest gui gui_static doc

Added: trunk/dports/math/cadabra/files/patch-configure.diff
===================================================================
--- trunk/dports/math/cadabra/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/math/cadabra/files/patch-configure.diff	2009-07-30 14:12:04 UTC (rev 54628)
@@ -0,0 +1,11 @@
+--- configure.sav	2009-07-30 09:52:24.000000000 -0400
++++ configure	2009-07-30 09:52:48.000000000 -0400
+@@ -4824,7 +4824,7 @@
+ echo -n "Checking whether to use -fnested-functions..."
+ echo "main() {};" > conftmp.c
+ NESTED=-fnested-functions
+-if gcc -fnested-functions -c -o conftmp.o conftmp.c 1>/dev/null 2>&1
++if XXPATH_TO_GCCXX -fnested-functions -c -o conftmp.o conftmp.c 1>/dev/null 2>&1
+    then echo " yes"
+    else NESTED=""
+         echo " no"

Modified: trunk/dports/math/cadabra/files/patch-src-Makefile.in.diff
===================================================================
--- trunk/dports/math/cadabra/files/patch-src-Makefile.in.diff	2009-07-30 14:10:49 UTC (rev 54627)
+++ trunk/dports/math/cadabra/files/patch-src-Makefile.in.diff	2009-07-30 14:12:04 UTC (rev 54628)
@@ -1,11 +1,12 @@
---- src/Makefile.in.sav	2009-06-01 01:38:05.000000000 -0400
-+++ src/Makefile.in	2009-06-01 01:39:06.000000000 -0400
-@@ -38,7 +38,7 @@
- modules: $(MOBJS)
+--- src/Makefile.in.sav	2009-07-30 10:00:54.000000000 -0400
++++ src/Makefile.in	2009-07-30 10:02:27.000000000 -0400
+@@ -32,6 +32,9 @@
+ modules/xperm.o: modules/xperm.c
+ 	@CC@ @NESTED@ ${MCFLAGS} ${TIMESTAMP} -c -o $@ $<
  
- cadabra: $(OBJS) $(MOBJS)
--	@CXX@ -o cadabra ${LDFLAGS} -Wl,--as-needed $+ `pkg-config modglue --libs` -lgmpxx -lpcrecpp -lgmp
-+	@CXX@ -o cadabra ${LDFLAGS} -Wl,-dead_strip_dylibs $+ `pkg-config modglue --libs` -lgmpxx -lpcrecpp -lgmp
++modules/xperm_new.o: modules/xperm_new.c
++	@CC@ @NESTED@ ${MCFLAGS} ${TIMESTAMP} -c -o $@ $<
++
+ #modules/xperm_no_nests.o: modules/xperm_no_nests.c
+ #	@CC@ -Wall -g @NESTED@ ${MCFLAGS} ${TIMESTAMP} -c -o $@ $<
  
- #`pkg-config glib-2.0 --libs` 
- # Static linking now works!
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090730/99f88b76/attachment.html>