7 files changed, 264 insertions, 252 deletions

diff --git a/x11-toolkits/v/Makefile b/x11-toolkits/v/Makefile
index b0b2ae0db6e6..5e1d9f593639 100644
--- a/x11-toolkits/v/Makefile
+++ b/x11-toolkits/v/Makefile
@@ -1,30 +1,31 @@
 # New ports collection makefile for:    v
-# Version required:     1.17
+# Version required:     1.19
 # Date created:         8 Feb 1998
 # Whom:                 Donald Burr <dburr@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.2 1998/02/16 13:28:18 asami Exp $
+# $Id: Makefile,v 1.3 1998/05/30 12:36:21 dburr Exp $
 #
 
-DISTNAME=	v-1.17
+DISTNAME=	v-1.19
 CATEGORIES=	x11 devel graphics
 MASTER_SITES=	ftp://objectcentral.com/
 
 MAINTAINER=	dburr@FreeBSD.ORG
 
-USE_X11=	YES
-
 WRKSRC=		${WRKDIR}/v
 
+USE_X11=	YES
 USE_GMAKE=	YES
+MAKE_ENV=	INSTALLDIR=${PREFIX} HOMEV=${WRKSRC}
 
-pre-build:
-	${MKDIR} ${WRKSRC}/obj/bsd ${WRKSRC}/lib/bsd ${WRKSRC}/bin/bsd
+do-configure:
+	${CP} ${WRKSRC}/ConfigX.mk ${WRKSRC}/Config.mk
 
-do-install:
-	cd ${WRKSRC} && ${GMAKE} installv PREFIX=${PREFIX}
+pre-build:
+	${MKDIR} ${WRKSRC}/obj/bsd ${WRKSRC}/objm/bsd ${WRKSRC}/lib/bsd ${WRKSRC}/bin/bsd
 
 post-install:
+	${RANLIB} ${PREFIX}/lib/libV.a
 .ifdef NOPORTDOCS
 	@echo "==> Extra documentation WILL NOT be installed."
 .else
diff --git a/x11-toolkits/v/distinfo b/x11-toolkits/v/distinfo
index 7c6d652f03cf..a10e35dd5b6c 100644
--- a/x11-toolkits/v/distinfo
+++ b/x11-toolkits/v/distinfo
@@ -1 +1 @@
-MD5 (v-1.17.tar.gz) = d64b3d4ceabeefa6433c15ff11b7bb88
+MD5 (v-1.19.tar.gz) = 756be07f6db621672e49c35a00797faf
diff --git a/x11-toolkits/v/files/patch-aa b/x11-toolkits/v/files/patch-aa
index 8baa1157a628..9d869dafb7e4 100644
--- a/x11-toolkits/v/files/patch-aa
+++ b/x11-toolkits/v/files/patch-aa
@@ -1,48 +1,29 @@
---- ../../OLD/v/Makefile	Thu Feb  5 09:15:48 1998
-+++ Makefile	Sun Feb  8 09:38:16 1998
-@@ -329,29 +329,27 @@
+--- ConfigX.mk.orig	Mon May  4 14:05:52 1998
++++ ConfigX.mk	Sat Jul 18 23:02:36 1998
+@@ -28,7 +28,7 @@
+ #---------------------------------------------------------------------
+ # HOMEV info
+ #---------------------------------------------------------------------
+-HOMEV	=	$(HOME)/v
++#HOMEV	=	$(HOME)/v
+ 
+ 
+ #---------------------------------------------------------------------
+@@ -51,7 +51,7 @@
+ # User contributed definitions are available for:
+ # hpux, aix, solaris, bsd
+ #---------------------------------------------------------------------
+-ARCH	= linux
++#ARCH	= linux
+ #ARCH	= linuxelf
+ #ARCH	= sun4
+ #ARCH	= mips
+@@ -59,7 +59,7 @@
+ #ARCH	= hpux
+ #ARCH	= aix
+ #ARCH	= solaris
+-#ARCH	= bsd
++ARCH	= bsd
+ Arch = $(ARCH)
  
- .PHONY:	installv
- installv:
--	-mkdir /usr/local/v
--	-mkdir /usr/local/v/lib
--	-mkdir /usr/local/v/bin
--	-mkdir /usr/local/v/include
--	-mkdir /usr/local/v/include/v
--	-chmod 755 /usr/local/v 
--	-chmod 755 /usr/local/v/lib
--	-chmod 755 /usr/local/v/bin
--	-chmod 755 /usr/local/v/include
--	-chmod 755 /usr/local/v/include/v
--	cp includex/v/* /usr/local/v/include/v
--	cp $(LibDir)/*.a /usr/local/v/lib
--	cp $(Bin)/* /usr/local/v/bin
--	-chmod 644 /usr/local/v/include/v/*
--	-chmod 644 /usr/local/v/lib/*
--	-chmod 755 /usr/local/v/bin/*
-+	-mkdir -p ${PREFIX}/lib
-+	-mkdir ${PREFIX}/bin
-+	-mkdir -p ${PREFIX}/include/v
-+	-chmod 755 ${PREFIX}
-+	-chmod 755 ${PREFIX}/lib
-+	-chmod 755 ${PREFIX}/bin
-+	-chmod 755 ${PREFIX}/include
-+	-chmod 755 ${PREFIX}/include/v
-+	cp includex/v/* ${PREFIX}/include/v
-+	cp $(LibDir)/*.a ${PREFIX}/lib
-+	cp $(Bin)/* ${PREFIX}/bin
-+	-chmod 644 ${PREFIX}/include/v/*
-+	-chmod 644 ${PREFIX}/lib/libV.a
-+#	-chmod 755 ${PREFIX}/bin/*
  
- .PHONY:	instalVlLinux
- installVLinux:
- 	@echo "You must run this as root"
--	-mkdir /usr/include/v
-+	-mkdir ${PREFIX}/include/v
- 	chmod 644 includex/v/*
--	cp includex/v/* /usr/include/v
-+	cp includex/v/* ${PREFIX}/include/v
- ifeq ($(Arch),linuxelf)
- 	chmod 644 $(LibDir)/*.so.$(VV)
- 	cp $(LibDir)/*.so.$(VV) /usr/lib
diff --git a/x11-toolkits/v/files/patch-ab b/x11-toolkits/v/files/patch-ab
index 52a121cbeb16..1d5e21875ec4 100644
--- a/x11-toolkits/v/files/patch-ab
+++ b/x11-toolkits/v/files/patch-ab
@@ -1,39 +1,44 @@
---- ../../OLD/v/Config.mk	Thu Jan 29 11:44:48 1998
-+++ Config.mk	Sun Feb  8 07:36:21 1998
-@@ -20,7 +20,8 @@
- #---------------------------------------------------------------------
- # HOMEV info
- #---------------------------------------------------------------------
--HOMEV	=	$(HOME)/v
-+HOMEV	=	/usr/ports/x11/v/work/v
-+# why not use ${WRKSRC}?  does not seem to work.
+--- Makefile.orig	Mon May 11 14:20:54 1998
++++ Makefile	Sat Jul 18 23:03:49 1998
+@@ -55,13 +55,13 @@
+ #	tarfull:	everthing, including .o's, etc.
+ #	getwin:		copy MS-Windows source from /dosc
+ #	permissions:	make sources readable to world
++#	install		run as root to install in ${INSTALLDIR} (defined below)
+ #	installv:	run as root to install to /usr/local/v
+-#	installvlinux:	run as root to install to /usr/local
++#	installvlinux:	run as root to install to /usr/local (really to /usr)
+ #	installunm:	install to ../pubv (UNM specific)
+ #
+ #===============================================================
  
+-
+ #xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+ #
+ # composite targets and targets for builds in subdirs
+@@ -321,6 +321,25 @@
+ .PHONY:	installLinuxElf
+ installLinuxElf:
+ 	$(MAKE) ARCH=linuxelf installVLinux
++
++.PHONY:	install
++install:
++	-mkdir -p $(INSTALLDIR)/include/v
++	-chmod 755 $(INSTALLDIR)/include/v
++	cp includex/v/* $(INSTALLDIR)/include/v
++	-chmod 644 $(INSTALLDIR)/include/v/*
++
++	-mkdir -p $(INSTALLDIR)/lib
++	install -c -m 644 $(LibDir)/libV.a $(INSTALLDIR)/lib
++	$(RANLIB) $(INSTALLDIR)/lib/libV.a
++
++	-mkdir -p $(INSTALLDIR)/bin
++	install -s -c -m 755 $(Bin)/b2v $(INSTALLDIR)/bin
++	install -s -c -m 755 $(Bin)/icondemo $(INSTALLDIR)/bin
++	install -s -c -m 755 $(Bin)/vdraw $(INSTALLDIR)/bin
++	install -s -c -m 755 $(Bin)/ved $(INSTALLDIR)/bin
++	install -s -c -m 755 $(Bin)/vgen $(INSTALLDIR)/bin
++	install -s -c -m 755 $(Bin)/viconed $(INSTALLDIR)/bin
  
- #---------------------------------------------------------------------
-@@ -43,7 +44,7 @@
- # User contributed definitions are available for:
- # hpux, aix, solaris, bsd
- #---------------------------------------------------------------------
--ARCH	= linux
-+#ARCH	= linux
- #ARCH	= linuxelf
- #ARCH	= sun4
- #ARCH	= mips
-@@ -51,7 +52,7 @@
- #ARCH	= hpux
- #ARCH	= aix
- #ARCH	= solaris
--#ARCH	= bsd
-+ARCH	= bsd
- Arch = $(ARCH)
- 
- 
-@@ -249,7 +250,7 @@
- #CFLAGS	+= -v $(INCDIR) 
- CFLAGS	+= $(INCDIR) 
- ifeq ($(DEBUG),no)
--CFLAGS	+=	-O
-+CFLAGS	+=	-O3 -m486
- endif
- ifeq ($(DEBUG),yes)
- CFLAGS	+=	-g
+ .PHONY:	installv
+ installv:
diff --git a/x11-toolkits/v/files/patch-ac b/x11-toolkits/v/files/patch-ac
new file mode 100644
index 000000000000..22c7a128abfb
--- /dev/null
+++ b/x11-toolkits/v/files/patch-ac
@@ -0,0 +1,12 @@
+diff -ru ./appgen/vgcode.cpp ../patched/appgen/vgcode.cpp
+--- ./appgen/vgcode.cpp	Fri Apr 24 15:19:36 1998
++++ ../patched/appgen/vgcode.cpp	Tue Jun 16 07:27:50 1998
+@@ -1291,7 +1291,7 @@
+ of << "\n";
+ of << "HOMEV	=	" << op.home << "\n";
+ #ifdef V_VersionX
+-of << "X11INC	=	/usr/X11/include\n";
++of << "X11INC	=	/usr/X11R6/include\n";
+ of << "X11LIB	=	/usr/X11R6/lib\n";
+ #endif
+ of << "LIBS	=	" << DEF_LIBS << "\n";
diff --git a/x11-toolkits/v/files/patch-ad b/x11-toolkits/v/files/patch-ad
new file mode 100644
index 000000000000..d32c18daa3f8
--- /dev/null
+++ b/x11-toolkits/v/files/patch-ad
@@ -0,0 +1,12 @@
+diff -ru ./appgen/vgdefs.h ../patched/appgen/vgdefs.h
+--- ./appgen/vgdefs.h	Mon May  4 19:23:46 1998
++++ ../patched/appgen/vgdefs.h	Tue Jun 16 09:25:35 1998
+@@ -23,7 +23,7 @@
+ #ifdef LINUX
+ #define DEF_HOMEV "/usr" // to find libV.a
+ #else
+-#define DEF_HOMEV "/usr/local/v" // to find libV.a
++#define DEF_HOMEV "/usr/X11R6" // to find libV.a
+ #endif
+ 
+ #ifdef Motif
diff --git a/x11-toolkits/v/pkg-plist b/x11-toolkits/v/pkg-plist
index 2dd337461ce4..17c73dbd9f00 100644
--- a/x11-toolkits/v/pkg-plist
+++ b/x11-toolkits/v/pkg-plist
@@ -1,99 +1,130 @@
 bin/b2v
 bin/icondemo
-bin/proto
-bin/tutapp
-bin/v1
 bin/vdraw
-bin/vdrawex
 bin/ved
 bin/vgen
 bin/viconed
-lib/libV.a
 include/v/aw3d.h
+include/v/vxutil.h
+include/v/vxdc.h
+include/v/vx2vkey.h
+include/v/vwindow.h
+include/v/vutil.h
+include/v/vtipwin.h
+include/v/vtimer.h
+include/v/vtextinc.h
+include/v/vtexted.h
+include/v/vtextcnv.h
+include/v/vtextc.h
+include/v/vstatusp.h
+include/v/vspinc.h
+include/v/vsliderc.h
+include/v/vreply.h
+include/v/vradioc.h
+include/v/vpsprntr.h
+include/v/vpsdc.h
+include/v/vprogrsc.h
+include/v/vprinter.h
+include/v/vprintdc.h
+include/v/vpen.h
+include/v/vpane.h
+include/v/vnulldc.h
+include/v/vnotice.h
+include/v/vnlprntr.h
+include/v/vmodald.h
+include/v/vmenu.h
+include/v/vmemdc.h
+include/v/vlistc.h
+include/v/vlabelc.h
+include/v/vkeys.h
+include/v/vicon.h
+include/v/vframec.h
+include/v/vfontsel.h
+include/v/vfontlst.h
+include/v/vfont.h
+include/v/vfinddlg.h
+include/v/vfilesel.h
+include/v/vdialog.h
+include/v/vdebug.h
+include/v/vdc.h
+include/v/vctlclrs.h
+include/v/vcpdc.h
+include/v/vcomboc.h
+include/v/vcolor.h
+include/v/vcmdwin.h
+include/v/vcmdprnt.h
+include/v/vcmdpane.h
+include/v/vcmd.h
+include/v/vclabelc.h
+include/v/vchkboxc.h
+include/v/vcbtncmd.h
+include/v/vcb2x8.h
+include/v/vcb2x4.h
+include/v/vcanvas.h
+include/v/vbtncmd.h
+include/v/vbrush.h
+include/v/vbasewin.h
+include/v/vbaseitm.h
+include/v/vawinfo.h
+include/v/vapp.h
+include/v/v_defs.h
+include/v/canvasp.h
+include/v/canvas.h
+include/v/awtog3dp.h
+include/v/awtog3d.h
+include/v/awsld3dp.h
+include/v/awsld3d.h
+include/v/awsim3dp.h
+include/v/awsim3d.h
+include/v/awscl3dp.h
+include/v/awscl3d.h
+include/v/awlbl3dp.h
+include/v/awlbl3d.h
+include/v/awcmd3dp.h
 include/v/aw3dp.h
 include/v/awcmd3d.h
-include/v/awcmd3dp.h
-include/v/awlbl3d.h
-include/v/awlbl3dp.h
-include/v/awscl3d.h
-include/v/awscl3dp.h
-include/v/awsim3d.h
-include/v/awsim3dp.h
-include/v/awsld3d.h
-include/v/awsld3dp.h
-include/v/awtog3d.h
-include/v/awtog3dp.h
-include/v/canvas.h
-include/v/canvasp.h
-include/v/dif1617
-include/v/diffs
-include/v/v_defs.h
-include/v/vapp.h
-include/v/vawinfo.h
-include/v/vbaseitm.h
-include/v/vbasewin.h
-include/v/vbrush.h
-include/v/vbtncmd.h
-include/v/vcanvas.h
-include/v/vcb2x4.h
-include/v/vcb2x8.h
-include/v/vcbtncmd.h
-include/v/vchkboxc.h
-include/v/vclabelc.h
-include/v/vcmd.h
-include/v/vcmdpane.h
-include/v/vcmdprnt.h
-include/v/vcmdwin.h
-include/v/vcolor.h
-include/v/vcomboc.h
-include/v/vcpdc.h
-include/v/vctlclrs.h
-include/v/vdc.h
-include/v/vdebug.h
-include/v/vdialog.h
-include/v/vfilesel.h
-include/v/vfinddlg.h
-include/v/vfont.h
-include/v/vfontlst.h
-include/v/vfontsel.h
-include/v/vframec.h
-include/v/vicon.h
-include/v/vkeys.h
-include/v/vlabelc.h
-include/v/vlistc.h
-include/v/vmemdc.h
-include/v/vmenu.h
-include/v/vmodald.h
-include/v/vnlprntr.h
-include/v/vnotice.h
-include/v/vnulldc.h
-include/v/vpane.h
-include/v/vpen.h
-include/v/vprintdc.h
-include/v/vprinter.h
-include/v/vprogrsc.h
-include/v/vpsdc.h
-include/v/vpsprntr.h
-include/v/vradioc.h
-include/v/vreply.h
-include/v/vsliderc.h
-include/v/vspinc.h
-include/v/vstatusp.h
-include/v/vtextc.h
-include/v/vtextcnv.h
-include/v/vtexted.h
-include/v/vtextinc.h
-include/v/vtimer.h
-include/v/vutil.h
-include/v/vwindow.h
-include/v/vx2vkey.h
-include/v/vxdc.h
-include/v/vxutil.h
 include/v/vynreply.h
 @dirrm include/v
-share/doc/v/Makefile
-share/doc/v/cxxstyle.tex
-share/doc/v/fig/btnbar.fig
+lib/libV.a
+@exec ranlib lib/libV.a
+share/doc/v/html/vfaq.gif
+share/doc/v/html/blank.bmp
+share/doc/v/html/dnldwin.bmp
+share/doc/v/html/dnldx.bmp
+share/doc/v/html/gotoftp.bmp
+share/doc/v/html/helpwant.bmp
+share/doc/v/html/maillist.bmp
+share/doc/v/html/mirrors.bmp
+share/doc/v/html/mswin.bmp
+share/doc/v/html/refman.bmp
+share/doc/v/html/scrnshot.bmp
+share/doc/v/html/testimon.bmp
+share/doc/v/html/vgui.gif
+share/doc/v/html/vgui.bmp
+share/doc/v/html/vguibtn.bmp
+share/doc/v/html/aboutv.gif
+share/doc/v/html/blank.gif
+share/doc/v/html/dnldwin.gif
+share/doc/v/html/dnldx.gif
+share/doc/v/html/gotoftp.gif
+share/doc/v/html/helpwant.gif
+share/doc/v/html/maillist.gif
+share/doc/v/html/mirrors.gif
+share/doc/v/html/refman.gif
+share/doc/v/html/scrnshot.gif
+share/doc/v/html/testimon.gif
+share/doc/v/html/vguibtn.gif
+share/doc/v/html/drawx.gif
+share/doc/v/html/pickx.gif
+share/doc/v/html/drawwin.gif
+share/doc/v/html/pickwin.gif
+share/doc/v/html/filepikx.gif
+share/doc/v/html/fontpikx.gif
+share/doc/v/html/drawwin.bmp
+share/doc/v/html/vfaq.bmp
+share/doc/v/html/aboutv.bmp
+@dirrm share/doc/v/html
+share/doc/v/fig/vapphier.eps
 share/doc/v/fig/button.fig
 share/doc/v/fig/chkbox.fig
 share/doc/v/fig/combobox.fig
@@ -185,79 +216,49 @@ share/doc/v/fig/filesel.eps
 share/doc/v/fig/notice.eps
 share/doc/v/fig/reply.eps
 share/doc/v/fig/ynreply.eps
-share/doc/v/fig/vapphier.eps
-share/doc/v/html/aboutv.bmp
-share/doc/v/html/blank.bmp
-share/doc/v/html/dnldwin.bmp
-share/doc/v/html/dnldx.bmp
-share/doc/v/html/gotoftp.bmp
-share/doc/v/html/helpwant.bmp
-share/doc/v/html/maillist.bmp
-share/doc/v/html/mirrors.bmp
-share/doc/v/html/mswin.bmp
-share/doc/v/html/refman.bmp
-share/doc/v/html/scrnshot.bmp
-share/doc/v/html/testimon.bmp
-share/doc/v/html/vgui.gif
-share/doc/v/html/vgui.bmp
-share/doc/v/html/vguibtn.bmp
-share/doc/v/html/aboutv.gif
-share/doc/v/html/blank.gif
-share/doc/v/html/dnldwin.gif
-share/doc/v/html/dnldx.gif
-share/doc/v/html/gotoftp.gif
-share/doc/v/html/helpwant.gif
-share/doc/v/html/maillist.gif
-share/doc/v/html/mirrors.gif
-share/doc/v/html/refman.gif
-share/doc/v/html/scrnshot.gif
-share/doc/v/html/testimon.gif
-share/doc/v/html/vguibtn.gif
-share/doc/v/html/drawx.gif
-share/doc/v/html/pickx.gif
-share/doc/v/html/drawwin.gif
-share/doc/v/html/pickwin.gif
-share/doc/v/html/filepikx.gif
-share/doc/v/html/fontpikx.gif
-share/doc/v/html/drawwin.bmp
-share/doc/v/html/vfaq.bmp
-share/doc/v/html/vfaq.gif
-share/doc/v/quickref.tex
-share/doc/v/quickref.txt
-share/doc/v/release.tex
-share/doc/v/tutapndx.tex
-share/doc/v/vclshier.tex
-share/doc/v/vfaq.txt
-share/doc/v/vgeneric.tex
-share/doc/v/vopengl.tex
-share/doc/v/vrefch1.tex
-share/doc/v/vrefch2.tex
-share/doc/v/vrefch3.tex
-share/doc/v/vrefch4.tex
-share/doc/v/vrefch5.tex
-share/doc/v/vrefch6.tex
-share/doc/v/vrefch7.tex
-share/doc/v/vrefch8.tex
-share/doc/v/vrefch9.tex
-share/doc/v/vrefman.tex
-share/doc/v/vtexted.tex
-share/doc/v/vtools.tex
-share/doc/v/vvers.tex
-share/doc/v/vwebref.tex
-share/doc/v/wcxxsty.tex
-share/doc/v/wrelease.tex
-share/doc/v/wvclassh.tex
-share/doc/v/wvquickr.tex
-share/doc/v/wvrefch1.tex
-share/doc/v/wvrefch2.tex
-share/doc/v/wvrefch3.tex
-share/doc/v/wvrefch4.tex
-share/doc/v/wvrefch5.tex
-share/doc/v/wvrefch6.tex
-share/doc/v/wvrefch7.tex
-share/doc/v/wvrefch8.tex
-share/doc/v/wvrefch9.tex
+share/doc/v/fig/btnbar.fig
+@dirrm share/doc/v/fig
 share/doc/v/wvrefman.html
-share/doc/v/wvreftoc.tex
-share/doc/v/wvreftut.tex
+share/doc/v/wvrefch9.tex
+share/doc/v/wvrefch8.tex
+share/doc/v/wvrefch7.tex
+share/doc/v/wvrefch6.tex
+share/doc/v/wvrefch5.tex
+share/doc/v/wvrefch4.tex
+share/doc/v/wvrefch3.tex
+share/doc/v/wvrefch2.tex
+share/doc/v/wvrefch1.tex
+share/doc/v/wvquickr.tex
+share/doc/v/wvclassh.tex
+share/doc/v/wrelease.tex
+share/doc/v/wlatest.tex
+share/doc/v/wcxxsty.tex
+share/doc/v/vwebref.tex
+share/doc/v/vvers.tex
+share/doc/v/vtools.tex
+share/doc/v/vtexted.tex
+share/doc/v/vrefman.tex
+share/doc/v/vrefch9.tex
+share/doc/v/vrefch8.tex
+share/doc/v/vrefch7.tex
+share/doc/v/vrefch6.tex
+share/doc/v/vrefch5.tex
+share/doc/v/vrefch4.tex
+share/doc/v/vrefch3.tex
+share/doc/v/vrefch2.tex
+share/doc/v/vrefch1.tex
+share/doc/v/vopengl.tex
+share/doc/v/vlatest.tex
+share/doc/v/vinstall.tex
+share/doc/v/vgeneric.tex
+share/doc/v/vfaq.txt
+share/doc/v/vclshier.tex
+share/doc/v/tutapndx.tex
+share/doc/v/release.tex
+share/doc/v/quickref.txt
+share/doc/v/quickref.tex
+share/doc/v/cxxstyle.tex
 share/doc/v/wvtools.tex
+share/doc/v/Makefile
+share/doc/v/wvreftut.tex
+@dirrm share/doc/v