[21741] trunk/dports/math/cadabra
source_changes at macosforge.org
source_changes at macosforge.org
Sun Feb 4 14:51:29 PST 2007
Revision: 21741
http://trac.macosforge.org/projects/macports/changeset/21741
Author: gwright at macports.org
Date: 2007-02-04 14:51:29 -0800 (Sun, 04 Feb 2007)
Log Message:
-----------
Version bump to 0.98.
Modified Paths:
--------------
trunk/dports/math/cadabra/Portfile
trunk/dports/math/cadabra/files/patch-src-Makefile.in
Removed Paths:
-------------
trunk/dports/math/cadabra/files/patch-Makefile.in
Modified: trunk/dports/math/cadabra/Portfile
===================================================================
--- trunk/dports/math/cadabra/Portfile 2007-02-04 22:12:29 UTC (rev 21740)
+++ trunk/dports/math/cadabra/Portfile 2007-02-04 22:51:29 UTC (rev 21741)
@@ -2,7 +2,7 @@
PortSystem 1.0
name cadabra
-version 0.92
+version 0.98
categories math
platforms darwin
maintainers gwright at macports.org
@@ -18,10 +18,9 @@
homepage http://www.aei.mpg.de/~peekas/cadabra/
master_sites ${homepage}/
-checksums sha1 7a21ea84dbcd869a7082eea7d951eefa8dc0940d
+checksums sha1 dd9b2b1e8b7a9923ed06c2140c98a82785caf966
-patchfiles patch-Makefile.in \
- patch-src-Makefile.in
+patchfiles patch-src-Makefile.in
depends_run port:TeXmacs
depends_lib port:modglue \
@@ -32,7 +31,6 @@
port:LiE
configure.env CPPFLAGS=-I${prefix}/include
-configure.args --prefix=${destroot}${prefix}
build { cd ${worksrcpath}
system "LDFLAGS=-L${prefix}/lib ${build.cmd} ${build.target}"
Deleted: trunk/dports/math/cadabra/files/patch-Makefile.in
===================================================================
--- trunk/dports/math/cadabra/files/patch-Makefile.in 2007-02-04 22:12:29 UTC (rev 21740)
+++ trunk/dports/math/cadabra/files/patch-Makefile.in 2007-02-04 22:51:29 UTC (rev 21741)
@@ -1,13 +0,0 @@
---- Makefile.in.sav 2006-11-17 12:26:35.000000000 -0500
-+++ Makefile.in 2006-11-17 12:27:45.000000000 -0500
-@@ -51,8 +51,8 @@
-
- install_program: program
- ( cd src && $(MAKE) install );
-- install -d @prefix@/man/man1
-- install man/man1/cadabra.1 @prefix@/man/man1
-+ install -d @prefix@/share/man/man1
-+ install man/man1/cadabra.1 @prefix@/share/man/man1
- install -d @prefix@/bin
- install -d @prefix@/share/TeXmacs/plugins/cadabra/progs
- install texmacs/init-cadabra.scm @prefix@/share/TeXmacs/plugins/cadabra/progs
Modified: trunk/dports/math/cadabra/files/patch-src-Makefile.in
===================================================================
--- trunk/dports/math/cadabra/files/patch-src-Makefile.in 2007-02-04 22:12:29 UTC (rev 21740)
+++ trunk/dports/math/cadabra/files/patch-src-Makefile.in 2007-02-04 22:51:29 UTC (rev 21741)
@@ -1,30 +1,38 @@
---- src/Makefile.in.sav 2006-11-17 10:07:36.000000000 -0500
-+++ src/Makefile.in 2006-11-17 10:14:14.000000000 -0500
-@@ -25,13 +25,16 @@
+--- src/Makefile.in.sav 2007-02-01 20:35:36.000000000 -0500
++++ src/Makefile.in 2007-02-01 20:39:21.000000000 -0500
+@@ -18,13 +18,12 @@
+ modules/linear.o modules/combinat.o modules/xperm.o modules/lie.o modules/lists.o
- #`pkg-config glib-2.0 --cflags`
+ 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
+ ${CC} -Wall -g -fnested-functions -c -o $@ $<
-+
+
%.o: %.cc
${CXX} -Wall -g ${MCFLAGS} ${TIMESTAMP} -c -o $@ $<
-
+@@ -32,7 +31,7 @@
modules: $(MOBJS)
cadabra: $(OBJS) $(MOBJS)
-- ${CXX} -o cadabra ${LDFLAGS} `pkg-config modglue --libs` $+ -lgmpxx -lpcre -lpcre++ -lexpect
-+ ${CXX} -o cadabra ${LDFLAGS} `pkg-config modglue --libs` $+ -lgmp -lgmpxx -lpcre -lpcre++ -lexpect
+- ${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
#`pkg-config glib-2.0 --libs`
# Static linking now works!
-@@ -40,19 +43,14 @@
+@@ -41,19 +40,14 @@
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 -lpcre++ -lpcre \
+ -lgmpxx -lgmp -lpcrecpp -lpcre \
-lexpect5.42 \
`pkg-config sigc++-2.0 --libs` -lsigc-2.0 -lutil
else
@@ -41,7 +49,7 @@
endif
#-lglib-2.0
-@@ -73,9 +71,9 @@
+@@ -74,9 +68,9 @@
test_lie: test_lie.o modules/lie.o
ifeq ($(strip $(MACTEST)),)
@@ -53,12 +61,12 @@
endif
tree_regression_tests: tree_regression_tests.o
-@@ -91,10 +89,10 @@
- ${CXX} -o test_combinatorics test_combinatorics.o
+@@ -92,10 +86,10 @@
+ ${CXX} -o test_combinatorics test_combinatorics.o combinatorics.o
- test_young: test_young.o youngtab.o
-- ${CXX} -o test_young test_young.o youngtab.o -L at prefix@/lib -lgmpxx -lgmp
-+ ${CXX} -o test_young test_young.o youngtab.o ${LDFLAGS} -lgmpxx -lgmp
+ test_young: test_young.o youngtab.o combinatorics.o
+- ${CXX} -o test_young test_young.o youngtab.o combinatorics.o -L at prefix@/lib -lgmpxx -lgmp
++ ${CXX} -o test_young test_young.o youngtab.o combinatorics.o ${LDFLAGS} -lgmpxx -lgmp
test_preprocessor: test_preprocessor.o preprocessor.o
- ${CXX} -o test_preprocessor test_preprocessor.o preprocessor.o -L at prefix@/lib -lgmpxx -lgmp
@@ -66,7 +74,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
-@@ -109,7 +107,7 @@
+@@ -110,7 +104,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/20070204/86347083/attachment.html
More information about the macports-changes
mailing list