4 files changed, 34 insertions, 18 deletions

diff --git a/math/xppaut/Makefile b/math/xppaut/Makefile
index b6660541a778..57bc593647c8 100644
--- a/math/xppaut/Makefile
+++ b/math/xppaut/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xppaut
-PORTVERSION=	5.85
+PORTVERSION=	5.91
 CATEGORIES=	math graphics
 MASTER_SITES=	http://www.math.pitt.edu/~bard/bardware/
 DISTNAME=	${PORTNAME}${PORTVERSION}
@@ -17,6 +17,7 @@ COMMENT=	Graphical tool for solving differential equations, etc
 MAN1=		xppaut.1
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
+MAKE_ARGS=	CC="${CC}"
 
 WRKSRC=		${WRKDIR}
 
@@ -28,4 +29,7 @@ pre-configure:
 	@${REINPLACE_CMD} -e "s|# PORTDOCS||" ${WRKSRC}/Makefile
 .endif
 
+post-patch:
+	@(cd ${WRKSRC} && ${REINPLACE_CMD} -e "s|gcc|${CC}|" Makefile libI77/Makefile cvodesrc/Makefile mkavi/Makefile)
+
 .include <bsd.port.mk>
diff --git a/math/xppaut/distinfo b/math/xppaut/distinfo
index 17beca479051..21ae37e0bdbc 100644
--- a/math/xppaut/distinfo
+++ b/math/xppaut/distinfo
@@ -1,2 +1,2 @@
-MD5 (xppaut5.85.tar.gz) = 879fd9a1b4306602ef44887297f20ed4
-SIZE (xppaut5.85.tar.gz) = 2772702
+MD5 (xppaut5.91.tar.gz) = 891bf6c9ce664024002a278a1fe138aa
+SIZE (xppaut5.91.tar.gz) = 2805419
diff --git a/math/xppaut/files/patch-Makefile b/math/xppaut/files/patch-Makefile
index 994780aaa359..243290a0e87c 100644
--- a/math/xppaut/files/patch-Makefile
+++ b/math/xppaut/files/patch-Makefile
@@ -1,7 +1,7 @@
---- Makefile.orig	Thu Jul 17 17:32:21 2003
-+++ Makefile	Mon Dec  6 23:32:28 2004
+--- Makefile-orig	Sun Feb 20 16:47:13 2005
++++ Makefile	Sun Feb 20 16:48:42 2005
 @@ -1,8 +1,9 @@
- # Copyright (C) 1990-2002 Bard Ermentrout
+ # Copyright (C) 1990-2003 Bard Ermentrout
  # Edited for Debian GNU/Linux.
  DESTDIR =
 -BINDIR = $(DESTDIR)/usr/X11R6/bin
@@ -12,22 +12,17 @@
  # End Debian Edit
  #################################
  #
-@@ -13,16 +14,16 @@
- # Standard C compiler
- #CC= cc
- # Use Gnu compiler
--CC= gcc
-+#CC= gcc
+@@ -13,12 +14,12 @@
  AUTLIBS= -lf2c -lX11 -lm 
  OTHERLIBS= libcvode.a libf2cm.a 
  #
  ################################## 
  # Standard Linux distributions   #
  ##################################
--CFLAGS=   -g -O -DAUTO -DCVODE_YES -DHAVEDLL -DMYSTR=$(VERSION)  -I/usr/X11R6/include
+-CFLAGS=   -g -O -DAUTO -DCVODE_YES -DNOERRNO -DHAVEDLL -DMYSTR=$(VERSION)  -I/usr/X11R6/include
 -LDFLAGS=  -L/usr/X11R6/lib
 -LIBS= -lX11 -lm -ldl 
-+CFLAGS+= -DAUTO -DCVODE_YES -DHAVEDLL -DMYSTR=$(VERSION) -I$(X11BASE)/include
++CFLAGS+=   -DAUTO -DCVODE_YES -DNOERRNO -DHAVEDLL -DMYSTR=$(VERSION)  -I/usr/X11R6/include
 +LDFLAGS=  -L$(X11BASE)/lib
 +LIBS= -lX11 -lm 
  # NOTE: Recent (RedHat 8) versions of GCC seem to no longer have
@@ -43,7 +38,7 @@
  xppaut: mkI77 mkcvode   $(OBJECTS) $(AUTOOBJ)
  #
  ###########################################################
-@@ -179,17 +183,18 @@
+@@ -179,16 +183,16 @@
  install: xppaut 
  # Make necessary installation directories
  	mkdir -p $(BINDIR)
@@ -62,10 +57,8 @@
 -	cp xppaut.1 $(DESTDIR)/usr/X11R6/man/man1
 +# PORTDOCS	cp -r ode* $(EXAMPLESDIR)
 +# PORTDOCS	cp -r help/* $(DOCDIR)/html
-+# PORTDOCS	cp README *.pdf $(DOCDIR)
++# PORTDOCS	cp README *.pdf $(DOCDIR) 
 +	cp xppaut.1 $(PREFIX)/man/man1
  # End Debian Ed
-+
  uninstall: 
  # Remove everything you created
- 	rm $(BINDIR)/xppaut
diff --git a/math/xppaut/pkg-plist b/math/xppaut/pkg-plist
index 1479df16f5a8..d088515077d3 100644
--- a/math/xppaut/pkg-plist
+++ b/math/xppaut/pkg-plist
@@ -54,6 +54,25 @@ bin/xppaut
 %%PORTDOCS%%%%DOCSDIR%%/install.pdf
 %%PORTDOCS%%%%DOCSDIR%%/xpp_doc.pdf
 %%PORTDOCS%%%%DOCSDIR%%/xpp_sum.pdf
+%%PORTDOCS%%%%EXAMPLESDIR%%/ode/auto.ps
+%%PORTDOCS%%%%EXAMPLESDIR%%/ode/dde.ode
+%%PORTDOCS%%%%EXAMPLESDIR%%/ode/ev1.ode
+%%PORTDOCS%%%%EXAMPLESDIR%%/ode/ev1.ode~
+%%PORTDOCS%%%%EXAMPLESDIR%%/ode/evelyn.ode
+%%PORTDOCS%%%%EXAMPLESDIR%%/ode/evelyn.ode.set
+%%PORTDOCS%%%%EXAMPLESDIR%%/ode/evelyn.ode~
+%%PORTDOCS%%%%EXAMPLESDIR%%/ode/fort.3
+%%PORTDOCS%%%%EXAMPLESDIR%%/ode/getmax.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/ode/getmax.so
+%%PORTDOCS%%%%EXAMPLESDIR%%/ode/gill_bruss.ode
+%%PORTDOCS%%%%EXAMPLESDIR%%/ode/gill_bruss.ode~
+%%PORTDOCS%%%%EXAMPLESDIR%%/ode/iaf.ode
+%%PORTDOCS%%%%EXAMPLESDIR%%/ode/koho.ode
+%%PORTDOCS%%%%EXAMPLESDIR%%/ode/koho.ode~
+%%PORTDOCS%%%%EXAMPLESDIR%%/ode/kohox.ode
+%%PORTDOCS%%%%EXAMPLESDIR%%/ode/kohox.ode~
+%%PORTDOCS%%%%EXAMPLESDIR%%/ode/sm1.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/ode/sm2.dat
 %%PORTDOCS%%%%EXAMPLESDIR%%/ode/6x6.ani
 %%PORTDOCS%%%%EXAMPLESDIR%%/ode/6x6.ode
 %%PORTDOCS%%%%EXAMPLESDIR%%/ode/V0.tab