Upgrade to 1.4.1.

PR:		3248
Submitted by:	NAKAMURA Kazushi <nkazushi@highway.or.jp>

5 files changed, 119 insertions, 49 deletions

diff --git a/graphics/plotmtv/Makefile b/graphics/plotmtv/Makefile
index 49ca70b2fd41..e6dc4f461cd7 100644
--- a/graphics/plotmtv/Makefile
+++ b/graphics/plotmtv/Makefile
@@ -3,13 +3,15 @@
 # Date created:		19 October 1996
 # Whom:			pgs
 #
-# $Id: Makefile,v 1.2 1997/02/26 09:44:44 asami Exp $
+# $Id: Makefile,v 1.3 1997/02/26 13:19:14 obrien Exp $
 #
 
-DISTNAME=	Plotmtv1.4.0
-PKGNAME=	plotmtv-1.4.0
+DISTNAME=	Plotmtv1.4.1
+PKGNAME=	plotmtv-1.4.1
 CATEGORIES=	graphics
-MASTER_SITES=   ftp://tanqueray.eecs.berkeley.edu/pub/
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+
+MASTER_SITE_SUBDIR=	applications
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	pgiffuni@FPS.biblos.unal.edu.co
@@ -20,11 +22,26 @@ ALL_TARGET=	World
 MAN1=		plotmtv.1
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/Docs/plotmtv.man ${PREFIX}/man/man1/plotmtv.1
+	@${INSTALL_MAN} ${WRKSRC}/Docs/plotmtv.man ${PREFIX}/man/man1/plotmtv.1
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/plotmtv
-	${INSTALL_DATA} ${WRKSRC}/Docs/DataFormat.ps.Z \
-		${PREFIX}/share/doc/plotmtv/
+	@${MKDIR}  ${PREFIX}/share/doc/plotmtv/Tests
+	@${INSTALL_DATA} ${WRKSRC}/Docs/DataFormat.ps.Z \
+		${PREFIX}/share/doc/plotmtv
+	@${INSTALL_SCRIPT} ${WRKSRC}/Tests/run.csh ${WRKSRC}/Tests/run.sh \
+		${PREFIX}/share/doc/plotmtv/Tests
+.for f in README test_abs.mtv test_abs2.mtv test_annot.mtv \
+	test_annot2.mtv test_axisflip.mtv test_axislabel.mtv \
+	test_bar.mtv test_column.mtv test_column2.mtv \
+	test_ctrcolors.mtv test_ctrelb.mtv test_ctrelb2.mtv \
+	test_ctrelb3.mtv test_ctrs.mtv test_curve2D.mtv \
+	test_curve3D.mtv test_curve3D2.mtv test_exp.mtv \
+	test_fillclrs.mtv test_fillclrs2.mtv test_grid4D.mtv \
+	test_histogram.mtv test_lines.mtv test_log.mtv \
+	test_markers.mtv test_prob.mtv test_pyramid.mtv \
+	test_smallnum.mtv test_spln.mtv test_trictr.mtv \
+	test_vector.mtv test_vector2.mtv
+	@${INSTALL_DATA} ${WRKSRC}/Tests/${f} ${PREFIX}/share/doc/plotmtv/Tests
+.endfor
 .endif
 
-.include <bsd.port.mk>
+.include	<bsd.port.mk>
diff --git a/graphics/plotmtv/distinfo b/graphics/plotmtv/distinfo
index dc44de3a9001..512d67bd3493 100644
--- a/graphics/plotmtv/distinfo
+++ b/graphics/plotmtv/distinfo
@@ -1 +1 @@
-MD5 (Plotmtv1.4.0.tar.Z) = 4b0ba94b08f9691c8db3f6bcda5f902f
+MD5 (Plotmtv1.4.1.tar.Z) = 71e8c04c1026c423bbed070c2a2f77ff
diff --git a/graphics/plotmtv/files/patch-aa b/graphics/plotmtv/files/patch-aa
index f0a76af599c5..1a558ce952f7 100644
--- a/graphics/plotmtv/files/patch-aa
+++ b/graphics/plotmtv/files/patch-aa
@@ -1,20 +1,9 @@
---- Imakefile.orig	Mon Jul 25 22:35:41 1994
-+++ Imakefile	Tue Feb 25 15:00:28 1997
-@@ -17,7 +17,7 @@
- #
- 
- #define IHaveSubdirs
--#define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS) $(DEFINES)'
-+#define PassCDebugFlags
- 
-     CDEBUGFLAGS = -g
-         DEFINES = -DPRINTER_NAME=\"hpps\" -DPRINTER_CMD=\"lpr\ -h\"
-@@ -51,7 +51,7 @@
- 
- install.local::
- 	@case '${MFLAGS}' in *[ik]*) set +e;; esac; \
--	for i in $(SUBDIRS) ;\
-+	for i in $(SUBDIRS); \
- 	do \
- 	(cd $$i ; echo "installing" "in $(CURRENT_DIR)/$$i..."; \
- 	$(MAKE) $(MFLAGS) DESTDIR='$(DESTDIR)' install.local); \
+*** Imakefile~	Sat Jul 15 04:07:13 1995
+--- Imakefile	Sat Jan 18 07:02:38 1997
+***************
+*** 22,23 ****
+!     CDEBUGFLAGS = -g
+!         DEFINES = -DPRINTER_NAME=\"hpps\" -DPRINTER_CMD=\"lpr\ -h\"
+--- 22,23 ----
+!     CDEBUGFLAGS = -O3
+!         DEFINES = -DPRINTER_NAME=\"S\" -DPRINTER_CMD=\"lpr\ -h\"
diff --git a/graphics/plotmtv/files/patch-ab b/graphics/plotmtv/files/patch-ab
index 5f4bc348598e..ae3caa605239 100644
--- a/graphics/plotmtv/files/patch-ab
+++ b/graphics/plotmtv/files/patch-ab
@@ -1,17 +1,44 @@
-*** Plot/Imakefile.orig	Sat Jan 25 17:35:02 1997
---- Plot/Imakefile	Sat Jan 25 17:35:31 1997
-***************
-*** 29,34 ****
-         PROGNAME = plotmtv
-  
-  install.local:: all $(PROGRAM)
-!         $(INSTALL) -c $(INSTPGMFLAGS)  $(PROGNAME) $(LOCALBINDIR)
-  
-  ComplexProgramTarget($(PROGNAME))
---- 29,34 ----
-         PROGNAME = plotmtv
-  
-  install.local:: all $(PROGRAM)
-! 	$(INSTALL) -c $(INSTPGMFLAGS)  $(PROGNAME) $(LOCALBINDIR)
-  
-  ComplexProgramTarget($(PROGNAME))
+*** Tests/run.csh~	Sat Jan 18 07:44:20 1997
+--- Tests/run.csh	Sat Jan 18 07:47:41 1997
+***************
+*** 11 ****
+! set PLOTMTV="../Bin/plotmtv"
+--- 11 ----
+! set PLOTMTV="plotmtv"
+***************
+*** 14 ****
+! #set PLOTMTV="../Bin/plotmtv -scale 0.5 -colorps"
+--- 14 ----
+! #set PLOTMTV="plotmtv -scale 0.5 -colorps"
+***************
+*** 17 ****
+! #set PLOTMTV="../Bin/plotmtv -3D -scale 0.8"
+--- 17 ----
+! #set PLOTMTV="plotmtv -3D -scale 0.8"
+***************
+*** 20 ****
+! #set PLOTMTV="../Bin/plotmtv -noxplot -print"
+--- 20 ----
+! #set PLOTMTV="plotmtv -noxplot -print"
+*** Tests/run.sh~	Sat Jan 18 07:44:25 1997
+--- Tests/run.sh	Sat Jan 18 07:48:34 1997
+***************
+*** 9 ****
+! PLOTMTV="../Bin/plotmtv"
+--- 9 ----
+! PLOTMTV="plotmtv"
+***************
+*** 12 ****
+! #PLOTMTV="../Bin/plotmtv -scale 0.5 -colorps"
+--- 12 ----
+! #PLOTMTV="plotmtv -scale 0.5 -colorps"
+***************
+*** 15 ****
+! #PLOTMTV="../Bin/plotmtv -3D -scale 0.8"
+--- 15 ----
+! #PLOTMTV="plotmtv -3D -scale 0.8"
+***************
+*** 18 ****
+! #PLOTMTV="../Bin/plotmtv -noxplot -print"
+--- 18 ----
+! #PLOTMTV="plotmtv -noxplot -print"
diff --git a/graphics/plotmtv/pkg-plist b/graphics/plotmtv/pkg-plist
index 0b24d001bddb..6bc6583de0fa 100644
--- a/graphics/plotmtv/pkg-plist
+++ b/graphics/plotmtv/pkg-plist
@@ -1,7 +1,44 @@
+bin/plotmtv
 bin/ctr2mtv
 bin/drawplot2mtv
-bin/mtv2mtv
 bin/pdraw2mtv
-bin/plotmtv
+bin/mtv2mtv
 man/man1/plotmtv.1.gz
 share/doc/plotmtv/DataFormat.ps.Z
+share/doc/plotmtv/Tests/run.csh
+share/doc/plotmtv/Tests/run.sh
+share/doc/plotmtv/Tests/README
+share/doc/plotmtv/Tests/test_abs.mtv
+share/doc/plotmtv/Tests/test_abs2.mtv
+share/doc/plotmtv/Tests/test_annot.mtv
+share/doc/plotmtv/Tests/test_annot2.mtv
+share/doc/plotmtv/Tests/test_axisflip.mtv
+share/doc/plotmtv/Tests/test_axislabel.mtv
+share/doc/plotmtv/Tests/test_bar.mtv
+share/doc/plotmtv/Tests/test_column.mtv
+share/doc/plotmtv/Tests/test_column2.mtv
+share/doc/plotmtv/Tests/test_ctrcolors.mtv
+share/doc/plotmtv/Tests/test_ctrelb.mtv
+share/doc/plotmtv/Tests/test_ctrelb2.mtv
+share/doc/plotmtv/Tests/test_ctrelb3.mtv
+share/doc/plotmtv/Tests/test_ctrs.mtv
+share/doc/plotmtv/Tests/test_curve2D.mtv
+share/doc/plotmtv/Tests/test_curve3D.mtv
+share/doc/plotmtv/Tests/test_curve3D2.mtv
+share/doc/plotmtv/Tests/test_exp.mtv
+share/doc/plotmtv/Tests/test_fillclrs.mtv
+share/doc/plotmtv/Tests/test_fillclrs2.mtv
+share/doc/plotmtv/Tests/test_grid4D.mtv
+share/doc/plotmtv/Tests/test_histogram.mtv
+share/doc/plotmtv/Tests/test_lines.mtv
+share/doc/plotmtv/Tests/test_log.mtv
+share/doc/plotmtv/Tests/test_markers.mtv
+share/doc/plotmtv/Tests/test_prob.mtv
+share/doc/plotmtv/Tests/test_pyramid.mtv
+share/doc/plotmtv/Tests/test_smallnum.mtv
+share/doc/plotmtv/Tests/test_spln.mtv
+share/doc/plotmtv/Tests/test_trictr.mtv
+share/doc/plotmtv/Tests/test_vector.mtv
+share/doc/plotmtv/Tests/test_vector2.mtv
+@dirrm share/doc/plotmtv/Tests
+@dirrm share/doc/plotmtv