[56233] trunk/dports/science/sbsat/files

[snc at macports.org]

Revision: 56233
          http://trac.macports.org/changeset/56233
Author:   snc at macports.org
Date:     2009-08-25 06:52:48 -0700 (Tue, 25 Aug 2009)
Log Message:
-----------
fix patches to set correct bindir

Modified Paths:
--------------
    trunk/dports/science/sbsat/files/patch-configure.ac.diff
    trunk/dports/science/sbsat/files/patch-src-generator-Makefile.am.diff
    trunk/dports/science/sbsat/files/patch-src-generator-gentest.cc.diff

Modified: trunk/dports/science/sbsat/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/science/sbsat/files/patch-configure.ac.diff	2009-08-25 13:36:53 UTC (rev 56232)
+++ trunk/dports/science/sbsat/files/patch-configure.ac.diff	2009-08-25 13:52:48 UTC (rev 56233)
@@ -1,10 +1,11 @@
 --- configure.ac	2009-06-14 12:58:58.000000000 -0400
-+++ /Users/snc/Source/sbsat/configure.ac	2009-08-19 14:10:22.000000000 -0400
-@@ -312,6 +312,7 @@
++++ /Users/snc/Source/sbsat/configure.ac	2009-08-25 09:04:51.000000000 -0400
+@@ -312,6 +312,8 @@
  AM_PROG_LEX
  AC_PROG_YACC("bison -y")
  # AC_PROG_LIBTOOL
 +AM_PATH_PYTHON([2.5],, [:])
++AC_PROG_SED
  
  AC_SUBST(ECHO_N)
  AC_SUBST(ECHO_C)

Modified: trunk/dports/science/sbsat/files/patch-src-generator-Makefile.am.diff
===================================================================
--- trunk/dports/science/sbsat/files/patch-src-generator-Makefile.am.diff	2009-08-25 13:36:53 UTC (rev 56232)
+++ trunk/dports/science/sbsat/files/patch-src-generator-Makefile.am.diff	2009-08-25 13:52:48 UTC (rev 56233)
@@ -1,6 +1,6 @@
 --- src/generator/Makefile.am	2008-08-27 00:39:49.000000000 -0400
-+++ /Users/snc/Source/sbsat/src/generator/Makefile.am	2009-08-17 11:00:07.000000000 -0400
-@@ -1,11 +1,19 @@
++++ /Users/snc/Source/sbsat/src/generator/Makefile.am	2009-08-25 09:03:03.000000000 -0400
+@@ -1,11 +1,21 @@
  INCLUDES=-I$(top_srcdir)/include
 -EXTRA_DIST=testite.sh
 +EXTRA_DIST=testite.sh slider3_base.py
@@ -9,15 +9,18 @@
 -add_tree.cc #rand_bdd.cc
 +libgen_a_SOURCES= xorgen.cc vanDerWaerden.cc rn.cc slider2.cc trans.cc \
 +rksat.cc add_tree.cc #rand_bdd.cc
-+
  
  bin_PROGRAMS = gentest
- gentest_SOURCES = gentest.cc
+-gentest_SOURCES = gentest.cc
++gentest_SOURCES = gentest-seded.cc
  gentest_LDADD = libgen.a #../libsbsat.la $(LIBM)
  
++gentest-seded.cc: gentest.cc
++	$(SED) "s|__PREFIX__|@bindir@|" $< >$@
+ 
 +bin_SCRIPTS = slider3.py
-+CLEANFILES = $(bin_SCRIPTS)
- 
++CLEANFILES = $(bin_SCRIPTS) gentest-seded.cc
++
 +slider3.py: slider3_base.py
 +	rm -f slider3.py
 +	echo "#! " $(PYTHON) > slider3.py

Modified: trunk/dports/science/sbsat/files/patch-src-generator-gentest.cc.diff
===================================================================
--- trunk/dports/science/sbsat/files/patch-src-generator-gentest.cc.diff	2009-08-25 13:36:53 UTC (rev 56232)
+++ trunk/dports/science/sbsat/files/patch-src-generator-gentest.cc.diff	2009-08-25 13:52:48 UTC (rev 56233)
@@ -1,5 +1,5 @@
 --- src/generator/gentest.cc	2008-08-27 00:39:49.000000000 -0400
-+++ /Users/snc/Source/sbsat/src/generator/gentest.cc	2009-08-18 13:32:36.000000000 -0400
++++ /Users/snc/Source/sbsat/src/generator/gentest.cc	2009-08-25 09:03:03.000000000 -0400
 @@ -122,7 +122,7 @@
  		  if (argc < 3 || (argc > 2 && !strcmp(argv[2], "--help"))) {
  			  fprintf(stderr, "usage: %s size sat\n", argv[0]);
@@ -14,9 +14,9 @@
  		  return 0;
  	  } else
 +	  if (argc > 1 && !strcmp(argv[1], "slider3")) {
-+        char *argv2[argc];
++        char **argv2 = new char*[argc];
 +        memset(argv2,0,sizeof(argv2));
-+        argv2[0] = "@@PREFIX@@/slider3.py";
++        argv2[0] = "__PREFIX__/slider3.py";
 +
 +        memcpy(argv2 + 1, argv + 2, sizeof(char *) * (argc - 2));
 +        int oranges = execv(argv2[0], argv2);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090825/42f7a151/attachment.html>