- Update to version 20070224.

- Use $(F77) as the linker in order to avoid ugly hacks.
- Use bigger MAXOBV as recommended by the upstream author.
- Remove ALPHA error message, it's unsupported anyway.
- Use EXTRACT_SUFX

PR:		ports/125761
Submitted by:	Pedro F. Giffuni <pfgshield-freebsd@yahoo.com>

3 files changed, 16 insertions, 28 deletions

diff --git a/graphics/dataplot/Makefile b/graphics/dataplot/Makefile
index 485d41e757bb..34b6c55426ac 100644
--- a/graphics/dataplot/Makefile
+++ b/graphics/dataplot/Makefile
@@ -1,22 +1,21 @@
 # New ports collection makefile for:	dataplot
 # Date created:		20 July 2003
-# Whom:			Pedro F. Giffuni <giffunip@asme.org>
+# Whom:			Pedro F. Giffuni <pfgshield-freebsd@yahoo.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	dataplot
-PORTVERSION=	20061219
-PORTREVISION=	3
+PORTVERSION=	20070224
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.nist.gov/pub/dataplot/unix/:source \
-				http://www.alaskaparadise.com/freebsd/:source \
-				http://www.itl.nist.gov/div898/software/dataplot.html/:doc \
-				http://www.alaskaparadise.com/freebsd/:doc
-DISTFILES=	dpsrc.12_19_2006.tar.gz:source \
-			dpsnapsh.pdf:doc
+		LOCAL/beech:source \
+		http://www.itl.nist.gov/div898/software/dataplot.html/:doc \
+		LOCAL/beech:doc
+DISTFILES=	dpsrc.02_24_2007${EXTRACT_SUFX}:source \
+		dpsnapsh.pdf:doc
 DIST_SUBDIR=	dataplot
-EXTRACT_ONLY=	dpsrc.12_19_2006.tar.gz
+EXTRACT_ONLY=	dpsrc.02_24_2007${EXTRACT_SUFX}
 
 MAINTAINER=	beech@FreeBSD.org
 COMMENT=	A free software system for statistical visualization
@@ -30,17 +29,10 @@ FFLAGS+=	-fno-range-check
 MAKE_ENV+=	FFLAGS="${FFLAGS}"
 USE_XORG=	x11 xi
 NO_WRKSUBDIR=	yes
-MAXOBV?=	20000	# Make bigger if you need more observations/variable
+MAXOBV?=	100000	# Change if you need more observations/variable
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "alpha"
-BROKEN=		Does not link on alpha (.got subsegment exceeds 64k)
-.endif
-
-FORTRANLIBS=	-lgfortranbegin -lgfortran
-GCCLIBDIR=	-L`${CAT} ${WRKSRC}/LIBDIR` -L`${CAT} ${WRKSRC}/LIBDIR`/../../..
-
 post-extract:
 	@${INSTALL_DATA} ${FILESDIR}/Makefile.tmpl ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's;%%LOCALBASE%%;${LOCALBASE};g ; \
@@ -52,13 +44,9 @@ pre-patch:
 	@${REINPLACE_CMD} -e 's/MAXOBV=100000/MAXOBV=${MAXOBV}/' \
 	${WRKSRC}/DPCOPA.INC
 
-pre-build:
-	${DIRNAME} `${F77} -print-libgcc-file-name` > ${WRKSRC}/LIBDIR
-	${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+${GCCLIBDIR}+" -e "s+%%FORTRANLIBS%%+${FORTRANLIBS}+" ${WRKSRC}/Makefile
-
 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR}  ${DOCSDIR}
+	@${INSTALL} -d  ${DOCSDIR}
 	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/dpsnapsh.pdf \
 		${DOCSDIR}
 .endif
diff --git a/graphics/dataplot/distinfo b/graphics/dataplot/distinfo
index fc38a297bd68..72b8f6576192 100644
--- a/graphics/dataplot/distinfo
+++ b/graphics/dataplot/distinfo
@@ -1,6 +1,6 @@
-MD5 (dataplot/dpsrc.12_19_2006.tar.gz) = 27bc03d5b3d7cbbb4cb13c47e00263e6
-SHA256 (dataplot/dpsrc.12_19_2006.tar.gz) = bff80f36e4054a2524dc05a590fe39158eb8bfc4afedd29eb0eb06e4888b909c
-SIZE (dataplot/dpsrc.12_19_2006.tar.gz) = 6101473
+MD5 (dataplot/dpsrc.02_24_2007.tar.gz) = 5e8018c142930e8c69a6e8595822d936
+SHA256 (dataplot/dpsrc.02_24_2007.tar.gz) = dce39fb484c191f96d8776dcfeb7f1a257cfd04cb0ab2da2255bff816517efa9
+SIZE (dataplot/dpsrc.02_24_2007.tar.gz) = 6154582
 MD5 (dataplot/dpsnapsh.pdf) = 88ca193586405a71387abbeba9be9f0e
 SHA256 (dataplot/dpsnapsh.pdf) = 4854cdab00ce10df87686eb025a80f57575fea1b362a22b49f202e10348f0e4b
 SIZE (dataplot/dpsnapsh.pdf) = 62085
diff --git a/graphics/dataplot/files/Makefile.tmpl b/graphics/dataplot/files/Makefile.tmpl
index 7080252bff7c..0462e8b5592f 100644
--- a/graphics/dataplot/files/Makefile.tmpl
+++ b/graphics/dataplot/files/Makefile.tmpl
@@ -15,11 +15,11 @@ HDRS	      =
 
 INSTALL	      = install
 
-LD	      = $(CC)
+LD	      = $(F77)
 
-LDFLAGS	      = -L%%LOCALBASE%%/lib %%GCCLIBDIR%%
+LDFLAGS	      = -L%%LOCALBASE%%/lib
 
-LIBS	      = -lgd -lpng -ljpeg -lX11 -lz %%FORTRANLIBS%%  -lm
+LIBS	      = -lgd -lpng -ljpeg -lX11 -lz -lm
 
 MAKEFILE      = Makefile