- Fix the build with modern GCC [1]

- Clean up Makefile
- Utilize DATADIR macro in pkg-plist

Reported by:	pointyhat (logs) [1]

2 files changed, 48 insertions, 45 deletions

diff --git a/math/xlispstat/Makefile b/math/xlispstat/Makefile
index c4df03e6cf44..fa73408fe558 100644
--- a/math/xlispstat/Makefile
+++ b/math/xlispstat/Makefile
@@ -1,6 +1,6 @@
-# New ports collection makefile for:    xlisp-stat
-# Date created:         Tue Aug 15 17:57:48 CDT 1995
-# Whom:                 erich@rrnet.com
+# New ports collection makefile for:	xlisp-stat
+# Date created:				Tue Aug 15 17:57:48 CDT 1995
+# Whom:					Eric L. Hernes <erich@rrnet.com>
 #
 # $FreeBSD$
 #
@@ -9,10 +9,10 @@ PORTNAME=	xlispstat
 PORTVERSION=	3.52.20
 PORTREVISION=	1
 CATEGORIES=	math lang lisp
-MASTER_SITES=	ftp://ftp.stat.umn.edu/pub/xlispstat/current/   \
-		http://lib.stat.cmu.edu/xlispstat/Src/current/  \
-		ftp://ftp.stat.unipg.it/pub/stat/xlispstat/current/     \
-		ftp://srsuna.shlrc.mq.edu.au/pub/xlispstat/current/     \
+MASTER_SITES=	ftp://ftp.stat.umn.edu/pub/xlispstat/current/ \
+		http://lib.stat.cmu.edu/xlispstat/Src/current/ \
+		ftp://ftp.stat.unipg.it/pub/stat/xlispstat/current/ \
+		ftp://srsuna.shlrc.mq.edu.au/pub/xlispstat/current/ \
 		ftp://statlab.uni-heidelberg.de/pub/mirrors/umn/xlispstat/current/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/./-/g}
 
@@ -23,4 +23,7 @@ USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 ALL_TARGET=	${PORTNAME}
 
+post-patch:
+	@${REINPLACE_CMD} '/^static double fmax/d' ${WRKSRC}/lowess.c
+
 .include <bsd.port.mk>
diff --git a/math/xlispstat/pkg-plist b/math/xlispstat/pkg-plist
index 5ef09eaae43f..ae6eda54957c 100644
--- a/math/xlispstat/pkg-plist
+++ b/math/xlispstat/pkg-plist
@@ -1,42 +1,42 @@
 bin/xlispstat
 libexec/xlispstat/xlisp
 libexec/xlispstat/xlisp.wks
-share/xlispstat/Autoload/_autoidx.lsp
-share/xlispstat/Autoload/bayes.fsl
-share/xlispstat/Autoload/glim.fsl
-share/xlispstat/Autoload/maximize.fsl
-share/xlispstat/Autoload/nonlin.fsl
-share/xlispstat/Autoload/oneway.fsl
-share/xlispstat/Autoload/stepper.fsl
-share/xlispstat/Data/absorbtion.lsp
-share/xlispstat/Data/aircraft.lsp
-share/xlispstat/Data/book.lsp
-share/xlispstat/Data/car-prices.lsp
-share/xlispstat/Data/diabetes.lsp
-share/xlispstat/Data/heating.lsp
-share/xlispstat/Data/iris.lsp
-share/xlispstat/Data/leukemia.lsp
-share/xlispstat/Data/metabolism.lsp
-share/xlispstat/Data/oxygen.lsp
-share/xlispstat/Data/puromycin.lsp
-share/xlispstat/Data/randu.lsp
-share/xlispstat/Data/stackloss.lsp
-share/xlispstat/Data/tutorial.lsp
-share/xlispstat/Examples/abrasiondemo.lsp
-share/xlispstat/Examples/addbox.lsp
-share/xlispstat/Examples/addhandrotate.lsp
-share/xlispstat/Examples/bcdemo.lsp
-share/xlispstat/Examples/dataprotos.lsp
-share/xlispstat/Examples/fstat.lsp
-share/xlispstat/Examples/inspect.lsp
-share/xlispstat/Examples/plotcontrols.lsp
-share/xlispstat/Examples/regdemo.lsp
-share/xlispstat/Examples/rotatedemo.lsp
-share/xlispstat/Examples/tour.lsp
-share/xlispstat/Examples/tourdemo.lsp
-share/xlispstat/xlisp.hlp
-@dirrm share/xlispstat/Examples
-@dirrm share/xlispstat/Data
-@dirrm share/xlispstat/Autoload
-@dirrm share/xlispstat
+%%DATADIR%%/Autoload/_autoidx.lsp
+%%DATADIR%%/Autoload/bayes.fsl
+%%DATADIR%%/Autoload/glim.fsl
+%%DATADIR%%/Autoload/maximize.fsl
+%%DATADIR%%/Autoload/nonlin.fsl
+%%DATADIR%%/Autoload/oneway.fsl
+%%DATADIR%%/Autoload/stepper.fsl
+%%DATADIR%%/Data/absorbtion.lsp
+%%DATADIR%%/Data/aircraft.lsp
+%%DATADIR%%/Data/book.lsp
+%%DATADIR%%/Data/car-prices.lsp
+%%DATADIR%%/Data/diabetes.lsp
+%%DATADIR%%/Data/heating.lsp
+%%DATADIR%%/Data/iris.lsp
+%%DATADIR%%/Data/leukemia.lsp
+%%DATADIR%%/Data/metabolism.lsp
+%%DATADIR%%/Data/oxygen.lsp
+%%DATADIR%%/Data/puromycin.lsp
+%%DATADIR%%/Data/randu.lsp
+%%DATADIR%%/Data/stackloss.lsp
+%%DATADIR%%/Data/tutorial.lsp
+%%DATADIR%%/Examples/abrasiondemo.lsp
+%%DATADIR%%/Examples/addbox.lsp
+%%DATADIR%%/Examples/addhandrotate.lsp
+%%DATADIR%%/Examples/bcdemo.lsp
+%%DATADIR%%/Examples/dataprotos.lsp
+%%DATADIR%%/Examples/fstat.lsp
+%%DATADIR%%/Examples/inspect.lsp
+%%DATADIR%%/Examples/plotcontrols.lsp
+%%DATADIR%%/Examples/regdemo.lsp
+%%DATADIR%%/Examples/rotatedemo.lsp
+%%DATADIR%%/Examples/tour.lsp
+%%DATADIR%%/Examples/tourdemo.lsp
+%%DATADIR%%/xlisp.hlp
+@dirrm %%DATADIR%%/Examples
+@dirrm %%DATADIR%%/Data
+@dirrm %%DATADIR%%/Autoload
+@dirrm %%DATADIR%%
 @dirrm libexec/xlispstat