Attachment #56552 for bug #85387

View | Details | Raw Unified | Return to bug 85387
Collapse All | Expand All

Lines 7-14 Link Here

(-)math/yacas/Makefile (-3 / +2 lines)
7	#	7	#
8		8
9	PORTNAME= yacas	9	PORTNAME= yacas
10	PORTVERSION= 1.0.57	10	PORTVERSION= 1.0.58
11	PORTREVISION= 1
12	CATEGORIES= math	11	CATEGORIES= math
13	MASTER_SITES= http://yacas.sourceforge.net/backups/	12	MASTER_SITES= http://yacas.sourceforge.net/backups/
14		13
Lines 39-45 Link Here
39		38
40	.if defined(WITH_X11)	39	.if defined(WITH_X11)
41	USE_GL= yes	40	USE_GL= yes
42	CONFIGURE_ARGS+=--with-x	41	CONFIGURE_ARGS+= --with-x
43	PLIST_SUB+= X11=""	42	PLIST_SUB+= X11=""
44	CPPFLAGS+= -I${X11BASE}/include	43	CPPFLAGS+= -I${X11BASE}/include
45	LDFLAGS+= -L${X11BASE}/lib	44	LDFLAGS+= -L${X11BASE}/lib

Lines 1-2 Link Here

(-)math/yacas/distinfo (-2 / +2 lines)
1	MD5 (yacas-1.0.57.tar.gz) = 0e5161457cb7d818aa8009676998696b	1	MD5 (yacas-1.0.58.tar.gz) = fd7fa942789fdac8fa363e555c86cae9
2	SIZE (yacas-1.0.57.tar.gz) = 1974503	2	SIZE (yacas-1.0.58.tar.gz) = 2089209




--- embed/example4.c.orig	Mon Jul 18 04:54:09 2005
+++ embed/example4.c	Sun Aug  7 22:28:37 2005
@@ -22,10 +22,12 @@
 }
 void runexpr(void* object)
 {
+  void* result;
+
   printf("Input>  ");
   print_expr(object);
   printf("\n");
-  void* result = yacas_execute(object);
+  result = yacas_execute(object);
   printf("Output>  ");
   print_expr(result);
   printf("\n");
@@ -35,9 +37,10 @@
 int main(int argc, char** argv)
 {
   int i;
+  void *input;
   yacas_init();
-  
-  void *input = 
+
+  input = 
     yacas_create_sublist(
       yacas_link_objects(
         yacas_create_atom("+"),

Lines 1-11 Link Here

(-)math/yacas/files/patch-plugins::pcre::plugin.cc (-11 lines)
1	--- plugins/pcre/plugin.cc.orig Sun Aug 24 14:17:25 2003
2	+++ plugins/pcre/plugin.cc Thu Jul 29 16:05:37 2004
3	@@ -180,7 +180,7 @@
4	return NEW PcrePlugin;
5	}
6
7	-};
8	+}
9
10
11

Lines 1-11 Link Here

(-)math/yacas/files/patch-plugins:filescanner::plugin.cc (-11 lines)
1	--- plugins/filescanner/plugin.cc.orig Sun Aug 24 14:17:44 2003
2	+++ plugins/filescanner/plugin.cc Thu Jul 29 16:07:27 2004
3	@@ -81,7 +81,7 @@
4	return NEW FileScannerPlugin;
5	}
6
7	-};
8	+}
9
10
11

Lines 1-11 Link Here

(-)math/yacas/files/patch-scripts::compile.rep::compilecpp.ys (-11 lines)
1	--- scripts/compile.rep/compilecpp.ys.orig Sun Aug 24 14:35:27 2003
2	+++ scripts/compile.rep/compilecpp.ys Thu Jul 29 15:48:30 2004
3	@@ -395,7 +395,7 @@
4
5	// The define OPTIMIZE_COMPILED_PLUGIN_SIZE should be defined somewhere else.
6	#ifndef WIN32 // some macro expansion is failing on Win platform, no idea why.
7	-#define OPTIMIZE_COMPILED_PLUGIN_SIZE
8	+// #define OPTIMIZE_COMPILED_PLUGIN_SIZE
9	#endif // WIN32
10
11	#ifdef OPTIMIZE_COMPILED_PLUGIN_SIZE




--- src/Makefile.in.orig	Sun Aug  7 17:56:40 2005
+++ src/Makefile.in	Sun Aug  7 22:02:49 2005
@@ -878,12 +878,12 @@
 # The libmath.cpp source file is generated as follows
 
 $(srcdir)/libmath.cpp: $(top_srcdir)/scripts/base.rep/math.ys yacas$(EXEEXT) check_plugins
-	(cd ../scripts && make packages.ys corefunctions.ys)
+	(cd ../scripts && $(MAKE) packages.ys corefunctions.ys)
 	echo "Set(LoadPlugIns,False);Use(\"yacasinit.ys\");" > compileinit.txt
 	echo "CompileCpp(\"base.rep/math.ys\",\"libmath\");" > compile.txt
 	./yacas$(EXEEXT) --rootdir  $(top_srcdir)/scripts -pc --init compileinit.txt compile.txt
 	./check_plugins
-	make
+	$(MAKE)
 
 $(srcdir)/platmath.cpp: fastprimes.c
 
@@ -917,7 +917,7 @@
 
 pcre_plugin_stub.cpp:plugin_stub_gen $(srcdir)/plugins_available.h
 	./plugin_stub_gen pcre_plugin_stub.cpp ../plugins/pcre/plugin.cpp
-	cd ../plugins/pcre/ ; make chartables.c
+	cd ../plugins/pcre/ ; $(MAKE) chartables.c
 
 filescanner_stub.cpp:plugin_stub_gen $(srcdir)/plugins_available.h
 	./plugin_stub_gen filescanner_stub.cpp filescanner.cpp




lib/libyacasplatform.so.0
lib/yacas/example.la
lib/yacas/example.so
lib/yacas/filescanner.so
lib/yacas/filescanner.la
lib/yacas/filescanner.so
lib/yacas/forth.la
lib/yacas/forth.so
lib/yacas/libmath.a
lib/yacas/libmath.la
lib/yacas/libmath.so
lib/yacas/libmath.so.0
lib/yacas/pcre.so
lib/yacas/pcre.la
lib/yacas/pcre.so
%%X11%%lib/yacas/opengl.la
%%X11%%lib/yacas/opengl.so
lib/yacas/yacas_gsl.la

%%DATADIR%%/documentation/codingmanual.html
%%DATADIR%%/documentation/essays.html
%%DATADIR%%/documentation/essayschapter1.html
%%DATADIR%%/documentation/essayschapter10.html
%%DATADIR%%/documentation/essayschapter11.html
%%DATADIR%%/documentation/essayschapter12.html
%%DATADIR%%/documentation/essayschapter2.html
%%DATADIR%%/documentation/essayschapter3.html

%%DATADIR%%/documentation/essayschapter9.html
%%DATADIR%%/documentation/essayschapters.html
%%DATADIR%%/documentation/essaysmanual.html
%%DATADIR%%/documentation/hints
%%DATADIR%%/documentation/intro.html
%%DATADIR%%/documentation/introchapter1.html
%%DATADIR%%/documentation/introchapter2.html

%%DATADIR%%/documentation/refprogchapters.html
%%DATADIR%%/documentation/refprogmanual.html
%%DATADIR%%/documentation/yacaslogo.gif
%%DATADIR%%/documentation/hints
%%DATADIR%%/documentation/essayschapter10.html
%%DATADIR%%/documentation/essayschapter11.html
%%DATADIR%%/example.rep/code.ys
%%DATADIR%%/example.rep/code.ys.def
%%DATADIR%%/examples/ABIN.ys

%%DATADIR%%/include/plat/linux32/platfileio.h
%%DATADIR%%/include/plat/linux32/stubs.inl
%%DATADIR%%/include/platmath.h
%%DATADIR%%/include/plugins_available.h
%%DATADIR%%/include/refcount.h
%%DATADIR%%/include/standard.h
%%DATADIR%%/include/standard.inl

%%DATADIR%%/include/yacasprivate.h
%%DATADIR%%/integrate.rep/code.ys
%%DATADIR%%/integrate.rep/code.ys.def
%%DATADIR%%/integrate.rep/om.ys
%%DATADIR%%/io.rep/code.ys
%%DATADIR%%/io.rep/code.ys.def
%%DATADIR%%/io.rep/defaultprint.ys

%%DATADIR%%/specfunc.rep/gamma.ys.def
%%DATADIR%%/specfunc.rep/gammaconst.ys
%%DATADIR%%/specfunc.rep/gammaconst.ys.def
%%DATADIR%%/specfunc.rep/om.ys
%%DATADIR%%/specfunc.rep/zeta.ys
%%DATADIR%%/specfunc.rep/zeta.ys.def
%%DATADIR%%/standard.ys

%%DATADIR%%/statistics.rep/statistics.ys.def
%%DATADIR%%/stats.rep/code.ys
%%DATADIR%%/stats.rep/code.ys.def
%%DATADIR%%/stdarith.ys
%%DATADIR%%/stdarith.ys.def
%%DATADIR%%/stdfuncs.rep/code.ys
%%DATADIR%%/stdfuncs.rep/code.ys.def
%%DATADIR%%/stdfuncs.rep/elemfuncs.ys

%%DATADIR%%/substitute.rep/code.ys.def
%%DATADIR%%/sums.rep/code.ys
%%DATADIR%%/sums.rep/code.ys.def
%%DATADIR%%/sums.rep/om.ys
%%DATADIR%%/sums.rep/taylor.ys
%%DATADIR%%/sums.rep/taylor.ys.def
%%DATADIR%%/sums.rep/taylor3.ys

%%DATADIR%%/univar.rep/sparse.ys.def
%%DATADIR%%/univar.rep/sturm.ys
%%DATADIR%%/univar.rep/sturm.ys.def
%%DATADIR%%/stdarith.ys
%%DATADIR%%/stdarith.ys.def
%%DATADIR%%/yacas-gmtplot2d.sh
%%DATADIR%%/yacas-gmtplot3d.sh
%%DATADIR%%/yacasinit.ys

Return to bug 85387

Line 0 Link Here

(-)math/yacas/files/patch-embed-example4.c (+29 lines)
	1	--- embed/example4.c.orig Mon Jul 18 04:54:09 2005
	2	+++ embed/example4.c Sun Aug 7 22:28:37 2005
	3	@@ -22,10 +22,12 @@
	4	}
	5	void runexpr(void* object)
	6	{
	7	+ void* result;
	8	+
	9	printf("Input> ");
	10	print_expr(object);
	11	printf("\n");
	12	- void* result = yacas_execute(object);
	13	+ result = yacas_execute(object);
	14	printf("Output> ");
	15	print_expr(result);
	16	printf("\n");
	17	@@ -35,9 +37,10 @@
	18	int main(int argc, char** argv)
	19	{
	20	int i;
	21	+ void *input;
	22	yacas_init();
	23	-
	24	- void *input =
	25	+
	26	+ input =
	27	yacas_create_sublist(
	28	yacas_link_objects(
	29	yacas_create_atom("+"),

Lines 1-11 Link Here

(-)math/yacas/files/patch-src::Makefile.in (-4 / +19 lines)
1	--- src/Makefile.in.orig Wed May 21 05:56:37 2003	1	--- src/Makefile.in.orig Sun Aug 7 17:56:40 2005
2	+++ src/Makefile.in Wed May 21 12:55:31 2003	2	+++ src/Makefile.in Sun Aug 7 22:02:49 2005
3	@@ -809,7 +809,7 @@	3	@@ -878,12 +878,12 @@
4	# The libmath.cpp source file is generated as follows	4	# The libmath.cpp source file is generated as follows
5		5
6	$(srcdir)/libmath.cpp: $(top_srcdir)/scripts/base.rep/math.ys yacas$(EXEEXT)	6	$(srcdir)/libmath.cpp: $(top_srcdir)/scripts/base.rep/math.ys yacas$(EXEEXT) check_plugins
7	- (cd ../scripts && make packages.ys corefunctions.ys)	7	- (cd ../scripts && make packages.ys corefunctions.ys)
8	+ (cd ../scripts && $(MAKE) packages.ys corefunctions.ys)	8	+ (cd ../scripts && $(MAKE) packages.ys corefunctions.ys)
9	echo "Set(LoadPlugIns,False);Use(\"yacasinit.ys\");" > compileinit.txt	9	echo "Set(LoadPlugIns,False);Use(\"yacasinit.ys\");" > compileinit.txt
10	echo "CompileCpp(\"base.rep/math.ys\",\"libmath\");" > compile.txt	10	echo "CompileCpp(\"base.rep/math.ys\",\"libmath\");" > compile.txt
11	./yacas$(EXEEXT) --rootdir $(top_srcdir)/scripts -pc --init compileinit.txt compile.txt	11	./yacas$(EXEEXT) --rootdir $(top_srcdir)/scripts -pc --init compileinit.txt compile.txt
		12	./check_plugins
		13	- make
		14	+ $(MAKE)
		15
		16	$(srcdir)/platmath.cpp: fastprimes.c
		17
		18	@@ -917,7 +917,7 @@
		19
		20	pcre_plugin_stub.cpp:plugin_stub_gen $(srcdir)/plugins_available.h
		21	./plugin_stub_gen pcre_plugin_stub.cpp ../plugins/pcre/plugin.cpp
		22	- cd ../plugins/pcre/ ; make chartables.c
		23	+ cd ../plugins/pcre/ ; $(MAKE) chartables.c
		24
		25	filescanner_stub.cpp:plugin_stub_gen $(srcdir)/plugins_available.h
		26	./plugin_stub_gen filescanner_stub.cpp filescanner.cpp

Lines 23-38 Link Here

(-)math/yacas/pkg-plist (-7 / +11 lines)
23	lib/libyacasplatform.so.0	23	lib/libyacasplatform.so.0
24	lib/yacas/example.la	24	lib/yacas/example.la
25	lib/yacas/example.so	25	lib/yacas/example.so
26	lib/yacas/filescanner.so
27	lib/yacas/filescanner.la	26	lib/yacas/filescanner.la
		27	lib/yacas/filescanner.so
28	lib/yacas/forth.la	28	lib/yacas/forth.la
29	lib/yacas/forth.so	29	lib/yacas/forth.so
30	lib/yacas/libmath.a	30	lib/yacas/libmath.a
31	lib/yacas/libmath.la	31	lib/yacas/libmath.la
32	lib/yacas/libmath.so	32	lib/yacas/libmath.so
33	lib/yacas/libmath.so.0	33	lib/yacas/libmath.so.0
34	lib/yacas/pcre.so
35	lib/yacas/pcre.la	34	lib/yacas/pcre.la
		35	lib/yacas/pcre.so
36	%%X11%%lib/yacas/opengl.la	36	%%X11%%lib/yacas/opengl.la
37	%%X11%%lib/yacas/opengl.so	37	%%X11%%lib/yacas/opengl.so
38	lib/yacas/yacas_gsl.la	38	lib/yacas/yacas_gsl.la
Lines 123-128 Link Here
123	%%DATADIR%%/documentation/codingmanual.html	123	%%DATADIR%%/documentation/codingmanual.html
124	%%DATADIR%%/documentation/essays.html	124	%%DATADIR%%/documentation/essays.html
125	%%DATADIR%%/documentation/essayschapter1.html	125	%%DATADIR%%/documentation/essayschapter1.html
		126	%%DATADIR%%/documentation/essayschapter10.html
		127	%%DATADIR%%/documentation/essayschapter11.html
126	%%DATADIR%%/documentation/essayschapter12.html	128	%%DATADIR%%/documentation/essayschapter12.html
127	%%DATADIR%%/documentation/essayschapter2.html	129	%%DATADIR%%/documentation/essayschapter2.html
128	%%DATADIR%%/documentation/essayschapter3.html	130	%%DATADIR%%/documentation/essayschapter3.html
Lines 134-139 Link Here
134	%%DATADIR%%/documentation/essayschapter9.html	136	%%DATADIR%%/documentation/essayschapter9.html
135	%%DATADIR%%/documentation/essayschapters.html	137	%%DATADIR%%/documentation/essayschapters.html
136	%%DATADIR%%/documentation/essaysmanual.html	138	%%DATADIR%%/documentation/essaysmanual.html
		139	%%DATADIR%%/documentation/hints
137	%%DATADIR%%/documentation/intro.html	140	%%DATADIR%%/documentation/intro.html
138	%%DATADIR%%/documentation/introchapter1.html	141	%%DATADIR%%/documentation/introchapter1.html
139	%%DATADIR%%/documentation/introchapter2.html	142	%%DATADIR%%/documentation/introchapter2.html
Lines 182-190 Link Here
182	%%DATADIR%%/documentation/refprogchapters.html	185	%%DATADIR%%/documentation/refprogchapters.html
183	%%DATADIR%%/documentation/refprogmanual.html	186	%%DATADIR%%/documentation/refprogmanual.html
184	%%DATADIR%%/documentation/yacaslogo.gif	187	%%DATADIR%%/documentation/yacaslogo.gif
185	%%DATADIR%%/documentation/hints
186	%%DATADIR%%/documentation/essayschapter10.html
187	%%DATADIR%%/documentation/essayschapter11.html
188	%%DATADIR%%/example.rep/code.ys	188	%%DATADIR%%/example.rep/code.ys
189	%%DATADIR%%/example.rep/code.ys.def	189	%%DATADIR%%/example.rep/code.ys.def
190	%%DATADIR%%/examples/ABIN.ys	190	%%DATADIR%%/examples/ABIN.ys
Lines 273-278 Link Here
273	%%DATADIR%%/include/plat/linux32/platfileio.h	273	%%DATADIR%%/include/plat/linux32/platfileio.h
274	%%DATADIR%%/include/plat/linux32/stubs.inl	274	%%DATADIR%%/include/plat/linux32/stubs.inl
275	%%DATADIR%%/include/platmath.h	275	%%DATADIR%%/include/platmath.h
		276	%%DATADIR%%/include/plugins_available.h
276	%%DATADIR%%/include/refcount.h	277	%%DATADIR%%/include/refcount.h
277	%%DATADIR%%/include/standard.h	278	%%DATADIR%%/include/standard.h
278	%%DATADIR%%/include/standard.inl	279	%%DATADIR%%/include/standard.inl
Lines 296-301 Link Here
296	%%DATADIR%%/include/yacasprivate.h	297	%%DATADIR%%/include/yacasprivate.h
297	%%DATADIR%%/integrate.rep/code.ys	298	%%DATADIR%%/integrate.rep/code.ys
298	%%DATADIR%%/integrate.rep/code.ys.def	299	%%DATADIR%%/integrate.rep/code.ys.def
		300	%%DATADIR%%/integrate.rep/om.ys
299	%%DATADIR%%/io.rep/code.ys	301	%%DATADIR%%/io.rep/code.ys
300	%%DATADIR%%/io.rep/code.ys.def	302	%%DATADIR%%/io.rep/code.ys.def
301	%%DATADIR%%/io.rep/defaultprint.ys	303	%%DATADIR%%/io.rep/defaultprint.ys
Lines 386-391 Link Here
386	%%DATADIR%%/specfunc.rep/gamma.ys.def	388	%%DATADIR%%/specfunc.rep/gamma.ys.def
387	%%DATADIR%%/specfunc.rep/gammaconst.ys	389	%%DATADIR%%/specfunc.rep/gammaconst.ys
388	%%DATADIR%%/specfunc.rep/gammaconst.ys.def	390	%%DATADIR%%/specfunc.rep/gammaconst.ys.def
		391	%%DATADIR%%/specfunc.rep/om.ys
389	%%DATADIR%%/specfunc.rep/zeta.ys	392	%%DATADIR%%/specfunc.rep/zeta.ys
390	%%DATADIR%%/specfunc.rep/zeta.ys.def	393	%%DATADIR%%/specfunc.rep/zeta.ys.def
391	%%DATADIR%%/standard.ys	394	%%DATADIR%%/standard.ys
Lines 403-408 Link Here
403	%%DATADIR%%/statistics.rep/statistics.ys.def	406	%%DATADIR%%/statistics.rep/statistics.ys.def
404	%%DATADIR%%/stats.rep/code.ys	407	%%DATADIR%%/stats.rep/code.ys
405	%%DATADIR%%/stats.rep/code.ys.def	408	%%DATADIR%%/stats.rep/code.ys.def
		409	%%DATADIR%%/stdarith.ys
		410	%%DATADIR%%/stdarith.ys.def
406	%%DATADIR%%/stdfuncs.rep/code.ys	411	%%DATADIR%%/stdfuncs.rep/code.ys
407	%%DATADIR%%/stdfuncs.rep/code.ys.def	412	%%DATADIR%%/stdfuncs.rep/code.ys.def
408	%%DATADIR%%/stdfuncs.rep/elemfuncs.ys	413	%%DATADIR%%/stdfuncs.rep/elemfuncs.ys
Lines 420-425 Link Here
420	%%DATADIR%%/substitute.rep/code.ys.def	425	%%DATADIR%%/substitute.rep/code.ys.def
421	%%DATADIR%%/sums.rep/code.ys	426	%%DATADIR%%/sums.rep/code.ys
422	%%DATADIR%%/sums.rep/code.ys.def	427	%%DATADIR%%/sums.rep/code.ys.def
		428	%%DATADIR%%/sums.rep/om.ys
423	%%DATADIR%%/sums.rep/taylor.ys	429	%%DATADIR%%/sums.rep/taylor.ys
424	%%DATADIR%%/sums.rep/taylor.ys.def	430	%%DATADIR%%/sums.rep/taylor.ys.def
425	%%DATADIR%%/sums.rep/taylor3.ys	431	%%DATADIR%%/sums.rep/taylor3.ys
Lines 442-449 Link Here
442	%%DATADIR%%/univar.rep/sparse.ys.def	448	%%DATADIR%%/univar.rep/sparse.ys.def
443	%%DATADIR%%/univar.rep/sturm.ys	449	%%DATADIR%%/univar.rep/sturm.ys
444	%%DATADIR%%/univar.rep/sturm.ys.def	450	%%DATADIR%%/univar.rep/sturm.ys.def
445	%%DATADIR%%/stdarith.ys
446	%%DATADIR%%/stdarith.ys.def
447	%%DATADIR%%/yacas-gmtplot2d.sh	451	%%DATADIR%%/yacas-gmtplot2d.sh
448	%%DATADIR%%/yacas-gmtplot3d.sh	452	%%DATADIR%%/yacas-gmtplot3d.sh
449	%%DATADIR%%/yacasinit.ys	453	%%DATADIR%%/yacasinit.ys