Attachment #103086 for bug #142949

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

Lines 6-16 Link Here

(-)xppaut/Makefile (-3 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= xppaut	8	PORTNAME= xppaut
9	PORTVERSION= 5.96	9	PORTVERSION= 5.99
10	PORTREVISION= 2
11	CATEGORIES= math graphics	10	CATEGORIES= math graphics
12	MASTER_SITES= http://www.math.pitt.edu/~bard/bardware/	11	MASTER_SITES= http://www.math.pitt.edu/~bard/bardware/
13	DISTNAME= ${PORTNAME}${PORTVERSION}	12	DISTNAME= ${PORTNAME}_latest
14		13
15	MAINTAINER= stephen@missouri.edu	14	MAINTAINER= stephen@missouri.edu
16	COMMENT= Graphical tool for solving differential equations, etc	15	COMMENT= Graphical tool for solving differential equations, etc

Lines 1-3 Link Here

(-)xppaut/distinfo (-3 / +3 lines)
1	MD5 (xppaut5.96.tar.gz) = 53c865dae9b1fb6bf9d8e87fc9bedb5d	1	MD5 (xppaut_latest.tar.gz) = 956c0a0ff0db219eda5654cada5659bc
2	SHA256 (xppaut5.96.tar.gz) = 278f05c15ef35fa472f85517d48a1f39a2b1237f2144e03c465d212026545208	2	SHA256 (xppaut_latest.tar.gz) = c56c9cf1b3f3906a3df10bfbeb2183b2609ef68abdc66ff297176b4388749107
3	SIZE (xppaut5.96.tar.gz) = 2838562	3	SIZE (xppaut_latest.tar.gz) = 2163390




--- Makefile.orig	2010-01-18 14:32:47.000000000 -0600
+++ Makefile	2010-01-18 14:39:57.000000000 -0600
@@ -1,8 +1,9 @@
 # Copyright (C) 1990-2009 Bard Ermentrout
 # Edited for Debian GNU/Linux.
 DESTDIR =
-BINDIR = $(DESTDIR)/usr/X11R6/bin

 # End Debian Edit
 #################################
 #
@@ -21,9 +22,9 @@
 ################################## 
 # Standard Linux distributions   #
 ##################################
 #CFLAGS=   -g -O -DAUTO -DCVODE_YES -DHAVEDLL -DMYSTR=$(VERSION)  -I/usr/X11R6/include
-CFLAGS=   -g -O -DAUTO -DCVODE_YES  -DHAVEDLL -DMYSTR=$(VERSION)  -I/usr/X11R6/include
 #CFLAGS=   -g -O -DAUTO -DCVODE_YES  -DHAVEDLL -DMYSTR=$(VERSION)  -I/usr/X11R6/include
-LDFLAGS=  -L/usr/X11R6/lib
-LIBS= -lX11 -lm -ldl 
+CFLAGS=   -DAUTO -DCVODE_YES  -DHAVEDLL -DMYSTR=$(VERSION)  -I$(LOCALBASE)/include
+LDFLAGS=  -L$(LOCALBASE)/lib
+LIBS= -lX11 -lm
 # NOTE: Recent (RedHat 8) versions of GCC seem to no longer have
 # the integer errno, so compile with the -DNOERRNO option as well
 #
@@ -154,6 +155,9 @@
 ######################################################################
 #
 #
+
+all:	xppaut
+
 xppaut: mkI77 mkcvode   $(OBJECTS) $(AUTOOBJ)
 #
 ###########################################################
@@ -188,16 +192,16 @@
 install: xppaut 
 # Make necessary installation directories
 	mkdir -p $(BINDIR)

Return to bug 142949

Lines 1-7 Link Here

(-)xppaut/files/patch-Makefile (-10 / +10 lines)
1	--- Makefile-orig Tue Nov 7 14:14:11 2006	1	--- Makefile.orig 2010-01-18 14:32:47.000000000 -0600
2	+++ Makefile Tue Nov 7 14:20:43 2006	2	+++ Makefile 2010-01-18 14:39:57.000000000 -0600
3	@@ -1,8 +1,9 @@	3	@@ -1,8 +1,9 @@
4	# Copyright (C) 1990-2006 Bard Ermentrout	4	# Copyright (C) 1990-2009 Bard Ermentrout
5	# Edited for Debian GNU/Linux.	5	# Edited for Debian GNU/Linux.
6	DESTDIR =	6	DESTDIR =
7	-BINDIR = $(DESTDIR)/usr/X11R6/bin	7	-BINDIR = $(DESTDIR)/usr/X11R6/bin
Lines 12-41 Link Here
12	# End Debian Edit	12	# End Debian Edit
13	#################################	13	#################################
14	#	14	#
15	@@ -20,10 +21,10 @@	15	@@ -21,9 +22,9 @@
16	##################################
17	# Standard Linux distributions #	16	# Standard Linux distributions #
18	##################################	17	##################################
19	-CFLAGS= -g -O -DAUTO -DCVODE_YES -DHAVEDLL -DMYSTR=$(VERSION) -I/usr/X11R6/include	18	#CFLAGS= -g -O -DAUTO -DCVODE_YES -DHAVEDLL -DMYSTR=$(VERSION) -I/usr/X11R6/include
20	+CFLAGS= -DAUTO -DCVODE_YES -DHAVEDLL -DMYSTR=$(VERSION) -I$(LOCALBASE)/include	19	-CFLAGS= -g -O -DAUTO -DCVODE_YES -DHAVEDLL -DMYSTR=$(VERSION) -I/usr/X11R6/include
21	#CFLAGS= -g -O -DAUTO -DCVODE_YES -DHAVEDLL -DMYSTR=$(VERSION) -I/usr/X11R6/include
22	-LDFLAGS= -L/usr/X11R6/lib	20	-LDFLAGS= -L/usr/X11R6/lib
23	-LIBS= -lX11 -lm -ldl	21	-LIBS= -lX11 -lm -ldl
		22	+CFLAGS= -DAUTO -DCVODE_YES -DHAVEDLL -DMYSTR=$(VERSION) -I$(LOCALBASE)/include
24	+LDFLAGS= -L$(LOCALBASE)/lib	23	+LDFLAGS= -L$(LOCALBASE)/lib
25	+LIBS= -lX11 -lm	24	+LIBS= -lX11 -lm
26	# NOTE: Recent (RedHat 8) versions of GCC seem to no longer have	25	# NOTE: Recent (RedHat 8) versions of GCC seem to no longer have
27	# the integer errno, so compile with the -DNOERRNO option as well	26	# the integer errno, so compile with the -DNOERRNO option as well
28	#	27	#
29	@@ -154,6 +155,8 @@	28	@@ -154,6 +155,9 @@
30	######################################################################	29	######################################################################
31	#	30	#
32	#	31	#
33	+	32	+
34	+all: xppaut	33	+all: xppaut
		34	+
35	xppaut: mkI77 mkcvode $(OBJECTS) $(AUTOOBJ)	35	xppaut: mkI77 mkcvode $(OBJECTS) $(AUTOOBJ)
36	#	36	#
37	###########################################################	37	###########################################################
38	@@ -188,16 +191,16 @@	38	@@ -188,16 +192,16 @@
39	install: xppaut	39	install: xppaut
40	# Make necessary installation directories	40	# Make necessary installation directories
41	mkdir -p $(BINDIR)	41	mkdir -p $(BINDIR)

Lines 54-59 Link Here

(-)xppaut/pkg-plist (+5 lines)
54	%%PORTDOCS%%%%DOCSDIR%%/install.pdf	54	%%PORTDOCS%%%%DOCSDIR%%/install.pdf
55	%%PORTDOCS%%%%DOCSDIR%%/xpp_doc.pdf	55	%%PORTDOCS%%%%DOCSDIR%%/xpp_doc.pdf
56	%%PORTDOCS%%%%DOCSDIR%%/xpp_sum.pdf	56	%%PORTDOCS%%%%DOCSDIR%%/xpp_sum.pdf
		57	%%PORTDOCS%%%%EXAMPLESDIR%%/ode/angela.ode
		58	%%PORTDOCS%%%%EXAMPLESDIR%%/ode/angela.ode~
57	%%PORTDOCS%%%%EXAMPLESDIR%%/ode/auto.ps	59	%%PORTDOCS%%%%EXAMPLESDIR%%/ode/auto.ps
58	%%PORTDOCS%%%%EXAMPLESDIR%%/ode/dde.ode	60	%%PORTDOCS%%%%EXAMPLESDIR%%/ode/dde.ode
59	%%PORTDOCS%%%%EXAMPLESDIR%%/ode/ev1.ode	61	%%PORTDOCS%%%%EXAMPLESDIR%%/ode/ev1.ode
Lines 61-66 Link Here
61	%%PORTDOCS%%%%EXAMPLESDIR%%/ode/evelyn.ode	63	%%PORTDOCS%%%%EXAMPLESDIR%%/ode/evelyn.ode
62	%%PORTDOCS%%%%EXAMPLESDIR%%/ode/evelyn.ode.set	64	%%PORTDOCS%%%%EXAMPLESDIR%%/ode/evelyn.ode.set
63	%%PORTDOCS%%%%EXAMPLESDIR%%/ode/evelyn.ode~	65	%%PORTDOCS%%%%EXAMPLESDIR%%/ode/evelyn.ode~
		66	%%PORTDOCS%%%%EXAMPLESDIR%%/ode/fieldnoy.ode~
64	%%PORTDOCS%%%%EXAMPLESDIR%%/ode/getmax.c	67	%%PORTDOCS%%%%EXAMPLESDIR%%/ode/getmax.c
65	%%PORTDOCS%%%%EXAMPLESDIR%%/ode/getmax.so	68	%%PORTDOCS%%%%EXAMPLESDIR%%/ode/getmax.so
66	%%PORTDOCS%%%%EXAMPLESDIR%%/ode/gill_bruss.ode	69	%%PORTDOCS%%%%EXAMPLESDIR%%/ode/gill_bruss.ode
Lines 70-75 Link Here
70	%%PORTDOCS%%%%EXAMPLESDIR%%/ode/koho.ode~	73	%%PORTDOCS%%%%EXAMPLESDIR%%/ode/koho.ode~
71	%%PORTDOCS%%%%EXAMPLESDIR%%/ode/kohox.ode	74	%%PORTDOCS%%%%EXAMPLESDIR%%/ode/kohox.ode
72	%%PORTDOCS%%%%EXAMPLESDIR%%/ode/kohox.ode~	75	%%PORTDOCS%%%%EXAMPLESDIR%%/ode/kohox.ode~
		76	%%PORTDOCS%%%%EXAMPLESDIR%%/ode/lorenz.ode~
		77	%%PORTDOCS%%%%EXAMPLESDIR%%/ode/nc.dat
73	%%PORTDOCS%%%%EXAMPLESDIR%%/ode/sm1.dat	78	%%PORTDOCS%%%%EXAMPLESDIR%%/ode/sm1.dat
74	%%PORTDOCS%%%%EXAMPLESDIR%%/ode/sm2.dat	79	%%PORTDOCS%%%%EXAMPLESDIR%%/ode/sm2.dat
75	%%PORTDOCS%%%%EXAMPLESDIR%%/ode/6x6.ani	80	%%PORTDOCS%%%%EXAMPLESDIR%%/ode/6x6.ani