[129880] trunk/dports/math/gr1c
ryandesign at macports.org
ryandesign at macports.org
Mon Dec 22 00:06:12 PST 2014
Revision: 129880
https://trac.macports.org/changeset/129880
Author: ryandesign at macports.org
Date: 2014-12-22 00:06:11 -0800 (Mon, 22 Dec 2014)
Log Message:
-----------
gr1c: update to 0.9.0; use {*} instead of eval
Modified Paths:
--------------
trunk/dports/math/gr1c/Portfile
trunk/dports/math/gr1c/files/patch-Makefile.diff
trunk/dports/math/gr1c/files/patch-tests-Makefile.diff
Modified: trunk/dports/math/gr1c/Portfile
===================================================================
--- trunk/dports/math/gr1c/Portfile 2014-12-22 07:22:34 UTC (rev 129879)
+++ trunk/dports/math/gr1c/Portfile 2014-12-22 08:06:11 UTC (rev 129880)
@@ -4,7 +4,7 @@
PortSystem 1.0
name gr1c
-version 0.6.2
+version 0.9.0
categories math devel
platforms darwin
maintainers caltech.edu:SCL openmaintainer
@@ -21,8 +21,8 @@
master_sites http://vehicles.caltech.edu/snapshots/gr1c/ \
http://vehicles.caltech.edu/snapshots/gr1c/old/
-checksums rmd160 cecca701d1cf89c707a013221207c9820b1ec5c8 \
- sha256 414c166c8f840a1b79267ccf5ccc6da1862eae11cb3c1d81ea42bbcf555bb432
+checksums rmd160 56212751bfaf4a896cca559c04545022680de48f \
+ sha256 818782d3c304e963ab1ac4ce2e3beaede372152adcb593df1bd8245fd2b1c254
patchfiles patch-Makefile.diff \
patch-tests-Makefile.diff
@@ -41,14 +41,14 @@
build.args CC="${configure.cc} [get_canonical_archflags cc]" \
LD="${configure.cc} [get_canonical_archflags ld] -r" \
- PREFIX="${prefix}"
+ prefix="${prefix}"
test.run yes
test.target check
-eval test.args ${build.args}
+test.args {*}${build.args}
destroot.target install expinstall
-eval destroot.args ${build.args}
+destroot.args {*}${build.args}
livecheck.type regex
livecheck.url [lindex ${master_sites} 0]
Modified: trunk/dports/math/gr1c/files/patch-Makefile.diff
===================================================================
--- trunk/dports/math/gr1c/files/patch-Makefile.diff 2014-12-22 07:22:34 UTC (rev 129879)
+++ trunk/dports/math/gr1c/files/patch-Makefile.diff 2014-12-22 08:06:11 UTC (rev 129880)
@@ -1,41 +1,35 @@
---- Makefile.orig 2013-12-02 10:21:56.000000000 -0600
-+++ Makefile 2014-10-02 00:55:55.000000000 -0500
-@@ -5,12 +5,12 @@
- CORE_PROGRAMS = gr1c rg
- EXP_PROGRAMS = grjit grpatch
+--- Makefile.orig 2014-11-30 22:56:18.000000000 -0600
++++ Makefile 2014-12-22 02:00:06.000000000 -0600
+@@ -16,10 +16,10 @@
--
--INSTALLDIR = /usr/local/bin
-+PREFIX := /usr/local
-+DESTDIR =
-+CUDD_PREFIX = $(PREFIX)
-+INSTALLDIR = $(DESTDIR)$(PREFIX)/bin
SRCDIR = src
EXPDIR = exp
-export CUDD_ROOT = extern/cudd-2.5.0
-CUDD_LIB = $(CUDD_ROOT)/cudd/libcudd.a $(CUDD_ROOT)/mtr/libmtr.a $(CUDD_ROOT)/st/libst.a $(CUDD_ROOT)/util/libutil.a $(CUDD_ROOT)/epd/libepd.a
+-export CUDD_XCFLAGS = -mtune=native -DHAVE_IEEE_754 -DBSD -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=8
+-CUDD_INC = -I$(CUDD_ROOT)/include
++export CUDD_PREFIX = $(prefix)
++CUDD_LIB = $(CUDD_PREFIX)/lib/cudd/libcudd.dylib
++export CUDD_XCFLAGS = -DHAVE_IEEE_754 -DBSD
++CUDD_INC = -I$(CUDD_PREFIX)/include/cudd
LEX = flex
LFLAGS =
-@@ -20,9 +20,9 @@
- CC = gcc
+@@ -30,7 +30,7 @@
LD = ld -r
--export CFLAGS_BASE = -g -Wall -pedantic -ansi -DHAVE_IEEE_754 -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=8
--CFLAGS = $(CFLAGS_BASE) -I$(CUDD_ROOT)/include -Isrc
--LDFLAGS = $(CUDD_LIB) -lm
-+export CFLAGS_BASE = -g -Wall -pedantic -ansi -DHAVE_IEEE_754
-+CFLAGS = $(CFLAGS_BASE) -Isrc -I$(CUDD_PREFIX)/include/cudd
-+LDFLAGS = -L$(CUDD_PREFIX)/lib/cudd -lcudd -lm
+ CFLAGS = -g -Wall -pedantic -ansi
+-ALL_CFLAGS = $(CFLAGS) $(CUDD_XCFLAGS) $(CUDD_INC) -Isrc
++ALL_CFLAGS = $(CFLAGS) $(CUDD_XCFLAGS) -Isrc $(CUDD_INC)
+ LDFLAGS = $(CUDD_LIB) -lm $(CUDD_XCFLAGS)
# To use and statically link with GNU Readline
- #CFLAGS += -DUSE_READLINE
-@@ -109,7 +109,7 @@
- rm -f $(INSTALLDIR)/gr1c $(INSTALLDIR)/rg $(INSTALLDIR)/grpatch
+@@ -124,7 +124,7 @@
+ rm -f $(DESTDIR)$(bindir)/gr1c $(DESTDIR)$(bindir)/rg $(DESTDIR)$(bindir)/grpatch
check: $(CORE_PROGRAMS) $(EXP_PROGRAMS)
-- $(MAKE) -C tests
-+ $(MAKE) -C tests CUDD_PREFIX="$(CUDD_PREFIX)"
+- $(MAKE) -C tests CC=$(CC)
++ $(MAKE) -C tests CC="$(CC)"
.PHONY: doc
doc:
Modified: trunk/dports/math/gr1c/files/patch-tests-Makefile.diff
===================================================================
--- trunk/dports/math/gr1c/files/patch-tests-Makefile.diff 2014-12-22 07:22:34 UTC (rev 129879)
+++ trunk/dports/math/gr1c/files/patch-tests-Makefile.diff 2014-12-22 08:06:11 UTC (rev 129880)
@@ -1,49 +1,13 @@
---- tests/Makefile.orig 2013-12-02 10:21:56.000000000 -0600
-+++ tests/Makefile 2014-10-02 00:22:39.000000000 -0500
-@@ -3,10 +3,9 @@
+--- tests/Makefile.orig 2014-11-30 22:56:18.000000000 -0600
++++ tests/Makefile 2014-12-22 01:59:00.000000000 -0600
+@@ -3,8 +3,8 @@
# SCL; 2012, 2013.
-CUDD_LIB = ../$(CUDD_ROOT)/cudd/libcudd.a ../$(CUDD_ROOT)/mtr/libmtr.a ../$(CUDD_ROOT)/st/libst.a ../$(CUDD_ROOT)/util/libutil.a ../$(CUDD_ROOT)/epd/libepd.a
--
--CFLAGS = $(CFLAGS_BASE) -I../src -I../$(CUDD_ROOT)/include
--LDFLAGS = $(CUDD_LIB) -lm
-+CC := gcc
-+CFLAGS = $(CFLAGS_BASE) -I../src -I$(CUDD_PREFIX)/include/cudd
-+LDFLAGS = -L$(CUDD_PREFIX)/lib/cudd -lcudd -lm
- PROGRAMS = test_logging test_automaton test_automaton_io test_ptree test_ptree_to_BDD test_solve_support test_patching
+-CUDD_INC = -I../$(CUDD_ROOT)/include
++CUDD_LIB = $(CUDD_PREFIX)/lib/cudd/libcudd.dylib
++CUDD_INC = -I$(CUDD_PREFIX)/include/cudd
- all: $(PROGRAMS)
-@@ -25,25 +24,25 @@
- COMMON_BINS = ../util.o ../automaton.o ../automaton_io.o ../ptree.o ../solve_support.o ../logging.o
-
- test_logging: test_logging.c
-- gcc $(CFLAGS) $^ ../logging.o -o $@ $(LDFLAGS)
-+ $(CC) $(CFLAGS) $^ ../logging.o -o $@ $(LDFLAGS)
-
- test_ptree: test_ptree.c
-- gcc $(CFLAGS) $^ ../ptree.o -o $@ $(LDFLAGS)
-+ $(CC) $(CFLAGS) $^ ../ptree.o -o $@ $(LDFLAGS)
-
- test_ptree_to_BDD: test_ptree_to_BDD.c
-- gcc $(CFLAGS) $^ ../ptree.o -o $@ $(LDFLAGS)
-+ $(CC) $(CFLAGS) $^ ../ptree.o -o $@ $(LDFLAGS)
-
- test_automaton: test_automaton.c
-- gcc $(CFLAGS) $^ $(COMMON_BINS) -o $@ $(LDFLAGS)
-+ $(CC) $(CFLAGS) $^ $(COMMON_BINS) -o $@ $(LDFLAGS)
-
- test_automaton_io: test_automaton_io.c
-- gcc $(CFLAGS) $^ $(COMMON_BINS) -o $@ $(LDFLAGS)
-+ $(CC) $(CFLAGS) $^ $(COMMON_BINS) -o $@ $(LDFLAGS)
-
- test_solve_support: test_solve_support.c
-- gcc $(CFLAGS) $^ $(COMMON_BINS) -o $@ $(LDFLAGS)
-+ $(CC) $(CFLAGS) $^ $(COMMON_BINS) -o $@ $(LDFLAGS)
-
- test_patching: test_patching.c
-- gcc $(CFLAGS) $^ $(COMMON_BINS) ../patching.o ../patching_support.o -o $@ $(LDFLAGS)
-+ $(CC) $(CFLAGS) $^ $(COMMON_BINS) ../patching.o ../patching_support.o -o $@ $(LDFLAGS)
-
- clean:
- rm -fv *~ *.o $(PROGRAMS) temp_*_dump*
+ CFLAGS = -g -Wall -pedantic -ansi
+ ALL_CFLAGS = $(CFLAGS) $(CUDD_XCFLAGS) $(CUDD_INC) -I../src
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141222/cb7b690d/attachment.html>
More information about the macports-changes
mailing list