[22154] trunk/dports/math/cadabra

[source_changes at macosforge.org]

Revision: 22154
          http://trac.macosforge.org/projects/macports/changeset/22154
Author:   gwright at macports.org
Date:     2007-02-19 12:34:07 -0800 (Mon, 19 Feb 2007)

Log Message:
-----------
Version bump to 0.100.

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

Modified: trunk/dports/math/cadabra/Portfile
===================================================================
--- trunk/dports/math/cadabra/Portfile	2007-02-19 20:16:53 UTC (rev 22153)
+++ trunk/dports/math/cadabra/Portfile	2007-02-19 20:34:07 UTC (rev 22154)
@@ -2,7 +2,7 @@
 
 PortSystem 1.0
 name		cadabra
-version		0.98
+version		0.100
 categories	math
 platforms	darwin
 maintainers	gwright at macports.org
@@ -18,13 +18,10 @@
 homepage	http://www.aei.mpg.de/~peekas/cadabra/
 master_sites	${homepage}/
 
-checksums	sha1 dd9b2b1e8b7a9923ed06c2140c98a82785caf966
+checksums	sha1 be66cbec9b78a5172665ec7e5257c2184c31fa2a
 
-patchfiles	patch-src-Makefile.in
-
 depends_run	port:TeXmacs
 depends_lib	port:modglue	\
-		port:expect	\
 		port:pcre	\
 		port:pcre++	\
 		port:gmp	\
@@ -34,8 +31,8 @@
 
 build		{ cd ${worksrcpath}
 		  system "LDFLAGS=-L${prefix}/lib ${build.cmd} ${build.target}"
-		  system "LDFLAGS=-L${prefix}/lib ${build.cmd} test"
-		  system "LDFLAGS=-L${prefix}/lib ${build.cmd} advtest"
+		  system "CDB_LOG=1 LDFLAGS=-L${prefix}/lib ${build.cmd} test"
+		  system "CDB_LOG=1 LDFLAGS=-L${prefix}/lib ${build.cmd} advtest"
 		}
 	
 

Modified: trunk/dports/math/cadabra/files/patch-src-Makefile.in
===================================================================
--- trunk/dports/math/cadabra/files/patch-src-Makefile.in	2007-02-19 20:16:53 UTC (rev 22153)
+++ trunk/dports/math/cadabra/files/patch-src-Makefile.in	2007-02-19 20:34:07 UTC (rev 22154)
@@ -1,15 +1,15 @@
---- src/Makefile.in.sav	2007-02-01 20:35:36.000000000 -0500
-+++ src/Makefile.in	2007-02-01 20:39:21.000000000 -0500
+--- src/Makefile.in.sav	2007-02-11 23:03:42.000000000 -0500
++++ src/Makefile.in	2007-02-11 23:04:31.000000000 -0500
 @@ -18,13 +18,12 @@
        modules/linear.o modules/combinat.o modules/xperm.o modules/lie.o modules/lists.o
  
  SRCS      = `find . -name "*.cc"`
 -ifeq ($(strip $(MACTEST)),)
-+
  MCFLAGS   = ${CFLAGS} -I. -I at top_srcdir@/src `pkg-config modglue --cflags`
 -else
 -MCFLAGS   = ${CFLAGS} -fnested-functions -I. -I at top_srcdir@/src `pkg-config modglue --cflags`
 -endif
++
  TIMESTAMP = -D"RELEASE=\"${RELEASE}\"" -D"DATETIME=\"`date | sed -e 's/  / /'`\"" -DHOSTNAME=\"`hostname`\"
  
 +%.o: %.c
@@ -21,20 +21,20 @@
  modules: $(MOBJS)
  
  cadabra: $(OBJS) $(MOBJS)
--	${CXX} -o cadabra ${LDFLAGS} `pkg-config modglue --libs` $+ -lgmpxx -lpcre -lpcrecpp -lexpect
-+	${CXX} -o cadabra ${LDFLAGS} `pkg-config modglue --libs` $+ -lgmp -lgmpxx -lpcre -lpcrecpp -lexpect
+-	${CXX} -o cadabra ${LDFLAGS} `pkg-config modglue --libs` $+ -lgmpxx -lpcre -lpcrecpp
++	${CXX} -o cadabra ${LDFLAGS} `pkg-config modglue --libs` $+ -lgmp -lgmpxx -lpcre -lpcrecpp
  
  #`pkg-config glib-2.0 --libs` 
  # Static linking now works!
-@@ -41,19 +40,14 @@
+@@ -41,18 +40,15 @@
  	rm -f main.o
  	${CXX} -Wall -g ${MCFLAGS} ${TIMESTAMP} -DSTATICBUILD -c -o main.o main.cc
  ifeq ($(strip $(MACTEST)),)
 -	g++ -o cadabra -static $+ -L at prefix@/lib `pkg-config modglue --libs` -lmodglue \
 +	g++ -o cadabra -static $+ ${LDFLAGS} `pkg-config modglue --libs` -lmodglue \
                               -lgmpxx -lgmp -lpcrecpp -lpcre \
-                              -lexpect5.42 \
                               `pkg-config sigc++-2.0 --libs` -lsigc-2.0 -lutil
+ 
  else
  	export MACOSX_DEPLOYMENT_TARGET=10.3
 -	g++ -o cadabra $+ @prefix@/lib/libmodglue.a \
@@ -42,26 +42,14 @@
 -                             @prefix@/lib/libgmp.a \
 -                             @prefix@/lib/libpcre++.a \
 -                             @prefix@/lib/libpcre.a \
--                             @prefix@/lib/libexpect5.43.a \
 -                             @prefix@/lib/libsigc-2.0.a 
 +	g++ -o cadabra $+ ${LDFLAGS} `pkg-config modglue --libs` \
-+			     -lgmp -lgmpxx -lpcre++ -lpcre -lexpect
++				-lgmp -lgmpxx -lpcre++ -lpcre -lexpect
++
  endif
  
- #-lglib-2.0 
-@@ -74,9 +68,9 @@
- 
- test_lie: test_lie.o modules/lie.o
- ifeq ($(strip $(MACTEST)),)
--	${CXX} -o test_lie test_lie.o modules/lie.o -L at prefix@/lib -lexpect
-+	${CXX} -o test_lie test_lie.o modules/lie.o ${LDFLAGS} -lexpect
- else
--	${CXX} -o test_lie test_lie.o modules/lie.o @prefix@/lib/libexpect5.43.a
-+	${CXX} -o test_lie test_lie.o modules/lie.o ${LDFLAGS} -lexpect5.43
- endif
- 
- tree_regression_tests: tree_regression_tests.o 
-@@ -92,10 +86,10 @@
+ # In order to get the build date linked in.
+@@ -89,10 +85,10 @@
  	${CXX} -o test_combinatorics test_combinatorics.o combinatorics.o
  
  test_young: test_young.o youngtab.o combinatorics.o
@@ -74,7 +62,7 @@
  
  mpi_pass_tree: mpi_pass_tree.o
  	${CXX} -o mpi_pass_tree mpi_pass_tree.o -L/usr/lib/mpich/lib -lmpich++ -lpmpich -lmpich
-@@ -110,7 +104,7 @@
+@@ -107,7 +103,7 @@
  #	${CXX} -o test_parser test_parser.o storage.o parser.o preprocessor.o display.o modules/properties.o algorithm.o -lgmpxx
  
  test_gmp: test_gmp.o 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070219/ec3c66b2/attachment.html