Upgrade to 3.1.0.

Submitted by:	Brian Handy <handy@physics.montana.edu>

4 files changed, 109 insertions, 93 deletions

diff --git a/print/mgv/Makefile b/print/mgv/Makefile
index cff133033187..6decd6fe8e54 100644
--- a/print/mgv/Makefile
+++ b/print/mgv/Makefile
@@ -1,27 +1,25 @@
 # New ports collection makefile for:	mgv
-# Version required:	mgv-2.4.3
+# Version required:	mgv-3.1.0
 # Date created:		4 Mar 1998
 # Whom:			handy@physics.montana.edu
 #
-# $Id: Makefile,v 1.3 1998/05/29 07:19:01 tg Exp $
+# $Id: Makefile,v 1.4 1998/08/05 09:31:37 asami Exp $
 #
 
-DISTNAME=	mgv-2.4.3
+DISTNAME=	mgv-3.1.0
 CATEGORIES=	print
 MASTER_SITES=	http://www.trends.net/~mu/srcs/
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	handy@physics.montana.edu
 
 LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
-USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 REQUIRES_MOTIF=	yes
-MAKEFILE=	GNUmakefile
-MAN1=		mgv.1
-
-pre-build:
-		@ ${CP} -f ${WRKSRC}/make/sys.freebsd.mk ${WRKSRC}/make/sys.mk
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	X11BASE=${X11BASE}
+CONFIGURE_ARGS=	--enable-optimize \
+		--disable-debug
 
 post-install:
 		@ ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
diff --git a/print/mgv/distinfo b/print/mgv/distinfo
index fee7194fb5ff..b5de9a30c0cd 100644
--- a/print/mgv/distinfo
+++ b/print/mgv/distinfo
@@ -1 +1 @@
-MD5 (mgv-2.4.3.tar.gz) = e5e77ec7ca09126093fe91e6960e2a52
+MD5 (mgv-3.1.0.tar.gz) = 123e8577fcdac9b5438f5ff50997650d
diff --git a/print/mgv/files/patch-aa b/print/mgv/files/patch-aa
deleted file mode 100644
index 6501b7707144..000000000000
--- a/print/mgv/files/patch-aa
+++ /dev/null
@@ -1,30 +0,0 @@
---- make/sys.freebsd3.mk.orig	Thu Apr 16 01:58:12 1998
-+++ make/sys.freebsd3.mk	Fri May 29 08:57:58 1998
-@@ -35,9 +35,9 @@
- warn    = -ansi -pedantic -W -Wall -Werror -Wmissing-prototypes
- defs    = -D$(sys)
- opt     = -O2
--incl    = -I. -I/usr/local/include -I/usr/X11R6/include -I/usr/X11/include
--ldflags = -s -L/usr/local/lib -L/usr/X11R6/lib -L/usr/X11/lib $(opt)
--xlibs   = -lXm -lXpm -lXmu -lXt -lXext -lX11 -lm -lcompat
-+incl    = -I. -I${PREFIX}/include -I${X11BASE}/include
-+ldflags = -s -L${PREFIX}/lib -L${X11BASE}/lib $(opt)
-+xlibs   = ${MOTIFLIB} -lXpm -lXmu -lXt -lXext -lX11 -lm -lcompat
- hlibs   = -lhlpclient
- ar      = ar
- arflags = -r
-@@ -49,11 +49,11 @@
- 
- mkdir    = mkdirhier
- install  = install -c
--bindir   = /usr/local/bin
-+bindir   = ${PREFIX}/bin
- binflags = -o root -g bin -m 755
--mandir   = /usr/local/man/man1
-+mandir   = ${PREFIX}/man/man1
- manflags = -o root -g bin -m 644
--libdir   = /usr/local/lib/$(projname)
-+libdir   = ${PREFIX}/share/$(projname)
- libflags = $(manflags)
- addir    = $(libdir)
- adflags  = $(libflags)
diff --git a/print/mgv/pkg-plist b/print/mgv/pkg-plist
index 7f9e94b51238..e0335670e446 100644
--- a/print/mgv/pkg-plist
+++ b/print/mgv/pkg-plist
@@ -1,54 +1,102 @@
 bin/mgv
-share/mgv/MGv
-share/mgv/splash.xbm
-share/mgv/splash.xpm
-share/mgv/help/mgv.txt
-share/mgv/help/mgv-1.html
-share/mgv/help/mgv-10.html
-share/mgv/help/mgv-11.html
-share/mgv/help/mgv-12.html
-share/mgv/help/mgv-13.html
-share/mgv/help/mgv-14.html
-share/mgv/help/mgv-15.html
-share/mgv/help/mgv-16.html
-share/mgv/help/mgv-17.html
-share/mgv/help/mgv-18.html
-share/mgv/help/mgv-19.html
-share/mgv/help/mgv-2.html
-share/mgv/help/mgv-20.html
-share/mgv/help/mgv-21.html
-share/mgv/help/mgv-22.html
-share/mgv/help/mgv-23.html
-share/mgv/help/mgv-24.html
-share/mgv/help/mgv-25.html
-share/mgv/help/mgv-26.html
-share/mgv/help/mgv-27.html
-share/mgv/help/mgv-28.html
-share/mgv/help/mgv-29.html
-share/mgv/help/mgv-3.html
-share/mgv/help/mgv-30.html
-share/mgv/help/mgv-4.html
-share/mgv/help/mgv-5.html
-share/mgv/help/mgv-6.html
-share/mgv/help/mgv-7.html
-share/mgv/help/mgv-8.html
-share/mgv/help/mgv-9.html
-share/mgv/help/mgv.html
-share/mgv/help/mgv.sgml
-share/mgv/help/about.gif
-share/mgv/help/bldopts.gif
-share/mgv/help/doc-info.gif
-share/mgv/help/file-open.gif
-share/mgv/help/file-save.gif
-share/mgv/help/gslog.gif
-share/mgv/help/magstep-statusline.gif
-share/mgv/help/magstep.gif
-share/mgv/help/mainwindow.gif
-share/mgv/help/next.gif
-share/mgv/help/prev.gif
-share/mgv/help/print.gif
-share/mgv/help/toc.gif
-share/mgv/help/zoom.gif
-share/mgv/help/COPYING-2.0
-@dirrm share/mgv/help
+share/mgv/3.1.0/MGv
+share/mgv/3.1.0/icon.xbm
+share/mgv/3.1.0/icon.xpm
+share/mgv/3.1.0/mask.xbm
+share/mgv/3.1.0/splash.xbm
+share/mgv/3.1.0/splash.xpm
+share/mgv/3.1.0/help/mgv-1.html
+share/mgv/3.1.0/help/mgv-10.html
+share/mgv/3.1.0/help/mgv-11.html
+share/mgv/3.1.0/help/mgv-12.html
+share/mgv/3.1.0/help/mgv-13.html
+share/mgv/3.1.0/help/mgv-14.html
+share/mgv/3.1.0/help/mgv-15.html
+share/mgv/3.1.0/help/mgv-16.html
+share/mgv/3.1.0/help/mgv-17.html
+share/mgv/3.1.0/help/mgv-18.html
+share/mgv/3.1.0/help/mgv-19.html
+share/mgv/3.1.0/help/mgv-2.html
+share/mgv/3.1.0/help/mgv-20.html
+share/mgv/3.1.0/help/mgv-21.html
+share/mgv/3.1.0/help/mgv-22.html
+share/mgv/3.1.0/help/mgv-23.html
+share/mgv/3.1.0/help/mgv-24.html
+share/mgv/3.1.0/help/mgv-25.html
+share/mgv/3.1.0/help/mgv-26.html
+share/mgv/3.1.0/help/mgv-27.html
+share/mgv/3.1.0/help/mgv-28.html
+share/mgv/3.1.0/help/mgv-29.html
+share/mgv/3.1.0/help/mgv-3.html
+share/mgv/3.1.0/help/mgv-30.html
+share/mgv/3.1.0/help/mgv-4.html
+share/mgv/3.1.0/help/mgv-5.html
+share/mgv/3.1.0/help/mgv-6.html
+share/mgv/3.1.0/help/mgv-7.html
+share/mgv/3.1.0/help/mgv-8.html
+share/mgv/3.1.0/help/mgv-9.html
+share/mgv/3.1.0/help/mgv.html
+share/mgv/3.1.0/help/file-info.gif
+share/mgv/3.1.0/help/file-open.gif
+share/mgv/3.1.0/help/file-print.gif
+share/mgv/3.1.0/help/file-save.gif
+share/mgv/3.1.0/help/gs-log.gif
+share/mgv/3.1.0/help/help-about.gif
+share/mgv/3.1.0/help/help-bldopts.gif
+share/mgv/3.1.0/help/mainwindow.gif
+share/mgv/3.1.0/help/main-zoom.gif
+share/mgv/3.1.0/help/next.gif
+share/mgv/3.1.0/help/prev.gif
+share/mgv/3.1.0/help/toc.gif
+share/mgv/3.1.0/toolbar/fileOpen-i.xbm
+share/mgv/3.1.0/toolbar/fileOpen.xbm
+share/mgv/3.1.0/toolbar/filePrint-i.xbm
+share/mgv/3.1.0/toolbar/filePrint.xbm
+share/mgv/3.1.0/toolbar/helpContext-i.xbm
+share/mgv/3.1.0/toolbar/helpContext.xbm
+share/mgv/3.1.0/toolbar/magstepDecr-i.xbm
+share/mgv/3.1.0/toolbar/magstepDecr.xbm
+share/mgv/3.1.0/toolbar/magstepIncr-i.xbm
+share/mgv/3.1.0/toolbar/magstepIncr.xbm
+share/mgv/3.1.0/toolbar/mark-i.xbm
+share/mgv/3.1.0/toolbar/mark.xbm
+share/mgv/3.1.0/toolbar/markAll-i.xbm
+share/mgv/3.1.0/toolbar/markAll.xbm
+share/mgv/3.1.0/toolbar/markEven-i.xbm
+share/mgv/3.1.0/toolbar/markEven.xbm
+share/mgv/3.1.0/toolbar/markNone-i.xbm
+share/mgv/3.1.0/toolbar/markNone.xbm
+share/mgv/3.1.0/toolbar/markOdd-i.xbm
+share/mgv/3.1.0/toolbar/markOdd.xbm
+share/mgv/3.1.0/toolbar/pageNext-i.xbm
+share/mgv/3.1.0/toolbar/pageNext.xbm
+share/mgv/3.1.0/toolbar/pagePrev-i.xbm
+share/mgv/3.1.0/toolbar/pagePrev.xbm
+share/mgv/3.1.0/toolbar/fileOpen-i.xpm
+share/mgv/3.1.0/toolbar/fileOpen.xpm
+share/mgv/3.1.0/toolbar/filePrint-i.xpm
+share/mgv/3.1.0/toolbar/filePrint.xpm
+share/mgv/3.1.0/toolbar/helpContext-i.xpm
+share/mgv/3.1.0/toolbar/helpContext.xpm
+share/mgv/3.1.0/toolbar/magstepDecr-i.xpm
+share/mgv/3.1.0/toolbar/magstepDecr.xpm
+share/mgv/3.1.0/toolbar/magstepIncr-i.xpm
+share/mgv/3.1.0/toolbar/magstepIncr.xpm
+share/mgv/3.1.0/toolbar/mark-i.xpm
+share/mgv/3.1.0/toolbar/mark.xpm
+share/mgv/3.1.0/toolbar/markAll-i.xpm
+share/mgv/3.1.0/toolbar/markAll.xpm
+share/mgv/3.1.0/toolbar/markEven-i.xpm
+share/mgv/3.1.0/toolbar/markEven.xpm
+share/mgv/3.1.0/toolbar/markNone-i.xpm
+share/mgv/3.1.0/toolbar/markNone.xpm
+share/mgv/3.1.0/toolbar/markOdd-i.xpm
+share/mgv/3.1.0/toolbar/markOdd.xpm
+share/mgv/3.1.0/toolbar/pageNext-i.xpm
+share/mgv/3.1.0/toolbar/pageNext.xpm
+share/mgv/3.1.0/toolbar/pagePrev-i.xpm
+share/mgv/3.1.0/toolbar/pagePrev.xpm
+@dirrm share/mgv/3.1.0/help
+@dirrm share/mgv/3.1.0/toolbar
+@dirrm share/mgv/3.1.0
 @dirrm share/mgv