16 files changed, 87 insertions, 507 deletions

diff --git a/x11-toolkits/v/Makefile b/x11-toolkits/v/Makefile
index 2342fb4e074f..83f20e00d17d 100644
--- a/x11-toolkits/v/Makefile
+++ b/x11-toolkits/v/Makefile
@@ -6,19 +6,15 @@
 #
 
 PORTNAME=	v
-PORTVERSION=	1.19
-PORTREVISION=	1
+PORTVERSION=	1.90
 CATEGORIES=	x11-toolkits devel graphics
-MASTER_SITES=	http://programming.ccp14.ac.uk/ftp-mirror/programming/objectcentral/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	vgui
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A C++ GUI development framework for X11 and Microsoft Windows
 
-.if ${MACHINE_ARCH} == "alpha"
-BROKEN=		compiler error in function fixup_memory_subreg
-.endif
-
-WRKSRC=		${WRKDIR}/v
+WRKSRC=		${WRKDIR}/home/vgui
 
 USE_X_PREFIX=	YES
 USE_GMAKE=	YES
@@ -26,28 +22,44 @@ MAKE_ENV=	INSTALLDIR=${PREFIX} HOMEV=${WRKSRC}
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
+.if ${ARCH} == "alpha"
+BROKEN=		compiler error in function fixup_memory_subreg
 .endif
 
 do-configure:
-	${CP} ${WRKSRC}/ConfigX.mk ${WRKSRC}/Config.mk
+	${CP} ${WRKSRC}/configs/ConfigX.mk ${WRKSRC}/Config.mk
 
 pre-build:
 	${MKDIR} ${WRKSRC}/obj/bsd ${WRKSRC}/objm/bsd ${WRKSRC}/lib/bsd ${WRKSRC}/bin/bsd
 
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/viconedx ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/b2v ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/icondemox ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/protox ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/tutappx ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/vdrawx ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/vdrawexx ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/vgenx ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/vtestlibx ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/lib/libVx.a ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/lib/libVxgl.a ${PREFIX}/lib
+	${MKDIR} ${PREFIX}/include/v
+	${INSTALL_DATA} ${WRKSRC}/includex/v/* ${PREFIX}/include/v
+
 post-install:
-	${RANLIB} ${PREFIX}/lib/libV.a
-.ifdef NOPORTDOCS
-	@${ECHO_MSG} "==> Extra documentation WILL NOT be installed."
-.else
-	@${ECHO_MSG} "==> Installing extra docs under ${PREFIX}/share/doc/v..."
-	${MKDIR} ${PREFIX}/share/doc/v
-	${CP} -R ${WRKSRC}/doc/* ${PREFIX}/share/doc/v
-	${FIND} ${PREFIX}/share/doc/v -type d -exec ${CHMOD} 755 {} \;
-	${FIND} ${PREFIX}/share/doc/v -type f -exec ${CHMOD} 644 {} \;
-	@${ECHO_MSG} "==> Extra docs installed.  Note, you will need *tex to read 'em."
-.endif
+	${RANLIB} ${PREFIX}/lib/libVx.a
+	${RANLIB} ${PREFIX}/lib/libVxgl.a
+#.ifdef NOPORTDOCS
+#	@${ECHO_MSG} "==> Extra documentation WILL NOT be installed."
+#.else
+#	@${ECHO_MSG} "==> Installing extra docs under ${PREFIX}/share/doc/v..."
+##	${MKDIR} ${PREFIX}/share/doc/v
+#	${CP} -R ${WRKSRC}/doc/* ${PREFIX}/share/doc/v
+#	${FIND} ${PREFIX}/share/doc/v -type d -exec ${CHMOD} 755 {} \;
+#	${FIND} ${PREFIX}/share/doc/v -type f -exec ${CHMOD} 644 {} \;
+#	@${ECHO_MSG} "==> Extra docs installed.  Note, you will need *tex to read 'em."
+#.endif
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/v/distinfo b/x11-toolkits/v/distinfo
index c5dc6e79e748..fe564608b802 100644
--- a/x11-toolkits/v/distinfo
+++ b/x11-toolkits/v/distinfo
@@ -1,3 +1,3 @@
-MD5 (v-1.19.tar.gz) = 756be07f6db621672e49c35a00797faf
-SHA256 (v-1.19.tar.gz) = 4296955c80d42ce630a90c4720f0dbb4e1acac73a5027598773d7c9dabfa7d26
-SIZE (v-1.19.tar.gz) = 1036871
+MD5 (v-1.90.tar.gz) = 7eec3b3b72dc78d600eb8d8c2ef03fec
+SHA256 (v-1.90.tar.gz) = c6eacb3b3463e60522d8756abf7c39d30753b595bc110453d40f5f082f69ce40
+SIZE (v-1.90.tar.gz) = 1334360
diff --git a/x11-toolkits/v/files/patch-aa b/x11-toolkits/v/files/patch-aa
deleted file mode 100644
index 766a3726c6ac..000000000000
--- a/x11-toolkits/v/files/patch-aa
+++ /dev/null
@@ -1,40 +0,0 @@
---- ConfigX.mk.orig	Mon May  4 23:05:52 1998
-+++ ConfigX.mk	Thu Mar  3 01:42:06 2005
-@@ -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,8 +59,8 @@
- #ARCH	= hpux
- #ARCH	= aix
- #ARCH	= solaris
--#ARCH	= bsd
--Arch = $(ARCH)
-+ARCH	= bsd
-+Arch = bsd
- 
- 
- #---------------------------------------------------------------------
-@@ -256,7 +256,7 @@
- ifeq ($(Arch),bsd)
- INCDIR  +=       -I/usr/$(X11RV)/include
- LIBDIR  +=       -L/usr/$(X11RV)/lib
--LIBS    +=       -lV -lXaw -lXmu -lXt -lXext -lX11
-+LIBS    +=       -lV -lXaw -lXmu -lXt -lXext -lX11 -lICE -lSM
- TARZ    =
- RANLIB  =       ranlib
- VGPATH	=	UNIX
diff --git a/x11-toolkits/v/files/patch-ab b/x11-toolkits/v/files/patch-ab
deleted file mode 100644
index 1d5e21875ec4..000000000000
--- a/x11-toolkits/v/files/patch-ab
+++ /dev/null
@@ -1,44 +0,0 @@
---- 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
- 
- .PHONY:	installv
- installv:
diff --git a/x11-toolkits/v/files/patch-ac b/x11-toolkits/v/files/patch-ac
deleted file mode 100644
index 22c7a128abfb..000000000000
--- a/x11-toolkits/v/files/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index d32c18daa3f8..000000000000
--- a/x11-toolkits/v/files/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-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/files/patch-af b/x11-toolkits/v/files/patch-af
deleted file mode 100644
index 60d548cd84dd..000000000000
--- a/x11-toolkits/v/files/patch-af
+++ /dev/null
@@ -1,92 +0,0 @@
---- srcx/vapp.cxx.orig	Sun Feb 27 13:02:24 2000
-+++ srcx/vapp.cxx	Sun Feb 27 13:04:42 2000
-@@ -105,7 +105,7 @@
- 	sizeof(Pixel),
- 	XtOffsetOf(AppData,copy_fg),
- 	XtRString,
--	XtDefaultForeground
-+	(XtPointer)XtDefaultForeground
-       },
-       {
- 	XtNbackground,
-@@ -114,7 +114,7 @@
- 	sizeof(Pixel),
- 	XtOffsetOf(AppData,copy_bg),
- 	XtRString,
--	XtDefaultBackground
-+	(XtPointer)XtDefaultBackground
-       },
- 
- //--------------------------------------------
-@@ -125,7 +125,7 @@
- 	sizeof(Pixel),
- 	XtOffsetOf(AppData,dialogBG),
- 	XtRString,
--	vMedGray
-+	(XtPointer)vMedGray
-       },
-       {
- 	"vStatusBarBG",
-@@ -134,7 +134,7 @@
- 	sizeof(Pixel),
- 	XtOffsetOf(AppData,statusBarBG),
- 	XtRString,
--	vLightGray
-+	(XtPointer)vLightGray
-       },
-       {
- 	"vMenuBarBG",
-@@ -143,7 +143,7 @@
- 	sizeof(Pixel),
- 	XtOffsetOf(AppData,menuBarBG),
- 	XtRString,
--	vDarkGray
-+	(XtPointer)vDarkGray
-       },
-       {
- 	"vControlBG",
-@@ -152,7 +152,7 @@
- 	sizeof(Pixel),
- 	XtOffsetOf(AppData,controlBG),
- 	XtRString,
--	vDarkGray
-+	(XtPointer)vDarkGray
-       },
-       {
- 	"vControlFace",
-@@ -161,7 +161,7 @@
- 	sizeof(Pixel),
- 	XtOffsetOf(AppData,controlFace),
- 	XtRString,
--	vMedGray
-+	(XtPointer)vMedGray
-       },
-       {
- 	"vLightControlShadow",
-@@ -170,7 +170,7 @@
- 	sizeof(Pixel),
- 	XtOffsetOf(AppData,lightControlShadow),
- 	XtRString,
--	vLightShadow
-+	(XtPointer)vLightShadow
-       },
-       {
- 	"vDarkControlShadow",
-@@ -179,7 +179,7 @@
- 	sizeof(Pixel),
- 	XtOffsetOf(AppData,darkControlShadow),
- 	XtRString,
--	vDarkShadow
-+	(XtPointer)vDarkShadow
-       },
- //--------------------------------------------
- 
-@@ -190,7 +190,7 @@
- 	sizeof(XFontStruct*),
- 	XtOffsetOf(AppData, font),
- 	XtRString,
--	XtDefaultFont
-+	(XtPointer)XtDefaultFont
-       },
-     };
- 
diff --git a/x11-toolkits/v/files/patch-ag b/x11-toolkits/v/files/patch-ag
deleted file mode 100644
index 03d543ac1bb8..000000000000
--- a/x11-toolkits/v/files/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
---- srcx/vpsdc.cxx.orig	Sun Feb 27 13:06:07 2000
-+++ srcx/vpsdc.cxx	Sun Feb 27 13:06:48 2000
-@@ -270,7 +270,8 @@
- 	note.Notice(msg);
-     }
-     
--    char* port = (_printer.GetPortrait()) ? "Portrait\n" : "Landscape\n";
-+    char* port = (_printer.GetPortrait()) ? (char *)"Portrait\n" :
-+	(char *)"Landscape\n";
-     char* papername = _printer.GetPaperName();
- 
-     *pstream 	<< "%!PS-Adobe-2.0\n"
diff --git a/x11-toolkits/v/files/patch-ah b/x11-toolkits/v/files/patch-ah
deleted file mode 100644
index d461a9f5e84b..000000000000
--- a/x11-toolkits/v/files/patch-ah
+++ /dev/null
@@ -1,22 +0,0 @@
---- test/vtcmdwin.cpp.orig	Sun Feb 27 13:08:01 2000
-+++ test/vtcmdwin.cpp	Sun Feb 27 13:17:34 2000
-@@ -352,7 +352,7 @@
- 		"Draw colors"},
-         {C_Slider, 888, 4, "",NoList,CA_Horizontal ,isSens,NoFrame, 0, 0, 0,
- 		"Slider Test"},
--        {C_Text, 889, 4, "", " 04",CA_None,isSens,NoFrame, 0, 0},
-+        {C_Text, 889, 4, "", (void *)" 04",CA_None,isSens,NoFrame, 0, 0},
-         {C_Button, M_Dialog, 0, "Dialog", NoList,CA_None,isSens,NoFrame, 0, 0, 0,
- 		"Show Dialog Test"},
-         {C_EndOfList,0,0,0,0,CA_None,0,0,0}
-@@ -409,8 +409,8 @@
- 
-     static vFont gfont(vfDefaultFixed);
-     static long lp_lim = 0;
--    static memdcValid = 0;
--    static sliceOn = 0;
-+    static int memdcValid = 0;
-+    static int sliceOn = 0;
- 
- 
- //====================>>> myTimer::TimerTick <<<====================
diff --git a/x11-toolkits/v/files/patch-ai b/x11-toolkits/v/files/patch-ai
deleted file mode 100644
index e0ee2ec8fe35..000000000000
--- a/x11-toolkits/v/files/patch-ai
+++ /dev/null
@@ -1,20 +0,0 @@
---- test/vtdialog.cpp.orig	Sun Feb 27 13:18:38 2000
-+++ test/vtdialog.cpp	Sun Feb 27 13:20:32 2000
-@@ -92,7 +92,7 @@
-         {C_CheckBox, 3, 1, "Check 1",    NoList,CA_None,isSens,NoFrame, 0, 13},
-         {C_CheckBox, 301, 0, "Check 2 ", NoList,CA_None,isSens,NoFrame, 3, 13},
- 
--        {C_Text, 4, 0, "", "This is an example\nof a two line text. (όδ)",
-+        {C_Text, 4, 0, "", (void *)"This is an example\nof a two line text. (όδ)",
-                 CA_None,isSens,NoFrame, 301, 13},
- 
-         {C_ProgressBar, 76, 50, "", (void*)&prange[0],
-@@ -101,7 +101,7 @@
-         {C_Frame, 86, 0, "",   NoList,CA_None,isSens,NoFrame, 76,10},
-         {C_Label, 87, 0, "Slider", NoList,CA_None,isSens,86,0,0},
-         {C_Slider, 88, 50, "", (void*)&prange[0],CA_Horizontal ,isSens,86, 0, 87},
--        {C_Text, 89, 50, "", " 50",CA_NoBorder,isSens,86, 88, 87},
-+        {C_Text, 89, 50, "", (void *)" 50",CA_NoBorder,isSens,86, 88, 87},
- 
-         {C_Slider, 85, 50, "", NoList,CA_Vertical ,isSens,0, 86, 10},
-    
diff --git a/x11-toolkits/v/files/patch-aj b/x11-toolkits/v/files/patch-aj
deleted file mode 100644
index a9ccfb289170..000000000000
--- a/x11-toolkits/v/files/patch-aj
+++ /dev/null
@@ -1,29 +0,0 @@
---- iconed/coldlg.cpp.orig	Sun Feb 27 13:21:21 2000
-+++ iconed/coldlg.cpp	Sun Feb 27 13:22:42 2000
-@@ -114,7 +114,7 @@
- 	frSliders,0,0, 0, "Click to enter Red value"},
-      {C_Slider, Rslider, 0, "", (void*)&sldR[0], CA_None, isSens, frSliders,
-         iRed, 0, 256, "Set Red Value"},
--     {C_Text, Rtext, 0, "   ", "0  ", CA_None, isSens, frSliders, 
-+     {C_Text, Rtext, 0, "   ", (void *)"0  ", CA_None, isSens, frSliders, 
-         Rslider, 0},
- 
-      // add green slider
-@@ -122,7 +122,7 @@
- 	frSliders,0,Rslider, 0, "Click to enter Green value"},
-      {C_Slider, Gslider, 0, "", (void*)&sldR[0], CA_None, isSens, frSliders,
-         iGreen, Rslider, 256, "Set Green Value"},
--     {C_Text, Gtext, 0, "", "0  ", CA_None, isSens, frSliders, 
-+     {C_Text, Gtext, 0, "", (void *)"0  ", CA_None, isSens, frSliders, 
-         Gslider, Rslider},
- 
-      // add blue slider
-@@ -130,7 +130,7 @@
- 	frSliders,0,Gslider, 0, "Click to enter Blue value"},
-      {C_Slider, Bslider, 0, "", (void*)&sldR[0], CA_None, isSens, frSliders,
-         iBlue, Gslider, 256, "Set Blue Value"},
--     {C_Text, Btext, 0, "", "0  ", CA_None, isSens, frSliders, 
-+     {C_Text, Btext, 0, "", (void *)"0  ", CA_None, isSens, frSliders, 
-         Bslider, Gslider},
- 
-      {C_Button, btReset, 0, "Reset",NoList, CA_None, isSens, NoFrame,
diff --git a/x11-toolkits/v/files/patch-ak b/x11-toolkits/v/files/patch-ak
deleted file mode 100644
index c6195edbca6f..000000000000
--- a/x11-toolkits/v/files/patch-ak
+++ /dev/null
@@ -1,11 +0,0 @@
---- examp/mycmdwin.cpp.orig	Sun Feb 27 13:23:39 2000
-+++ examp/mycmdwin.cpp	Sun Feb 27 13:27:34 2000
-@@ -223,7 +223,7 @@
-   {
-     // route all commands through here - menus and buttons
- 
--    static cmdCount = 0;
-+    static int cmdCount = 0;
- 
-     vNoticeDialog note(this);		// Used for default actions
- 
diff --git a/x11-toolkits/v/files/patch-configs-ConfigX.mk b/x11-toolkits/v/files/patch-configs-ConfigX.mk
new file mode 100644
index 000000000000..73746e30b5cc
--- /dev/null
+++ b/x11-toolkits/v/files/patch-configs-ConfigX.mk
@@ -0,0 +1,32 @@
+--- configs/ConfigX.mk.orig	Thu Apr  3 18:14:40 2003
++++ configs/ConfigX.mk	Mon Mar  6 23:53:38 2006
+@@ -51,7 +51,7 @@
+ # User contributed definitions are available for:

+ # hpux, aix, solaris, bsd

+ #---------------------------------------------------------------------

+-ARCH	= linuxdev

++#ARCH	= linuxdev

+ #ARCH	= linux

+ #ARCH	= linuxelf

+ #ARCH	= sun4

+@@ -60,9 +60,9 @@
+ #ARCH	= hpux

+ #ARCH	= aix

+ #ARCH	= solaris

+-#ARCH	= bsd

++ARCH	= bsd

+ #ARCH	= tru64

+-Arch = $(ARCH)

++Arch = bsd

+ 

+ 

+ #---------------------------------------------------------------------

+@@ -307,7 +307,7 @@
+ ifeq ($(Arch),bsd)

+ INCDIR  +=       -I/usr/$(X11RV)/include

+ LIBDIR  +=       -L/usr/$(X11RV)/lib

+-LIBS    +=       -lV -lXmu -lXt -lXext -lX11 -lxm

++LIBS    +=       -lXmu -lXt -lXext -lX11

+ TARZ    =

+ RANLIB  =       ranlib

+ VGPATH	=	UNIX

diff --git a/x11-toolkits/v/pkg-descr b/x11-toolkits/v/pkg-descr
index 53bda2432177..65677a7c3f69 100644
--- a/x11-toolkits/v/pkg-descr
+++ b/x11-toolkits/v/pkg-descr
@@ -8,7 +8,4 @@ toolkits on both environments).
 Full documentation, many code examples, and the V toolkit for Windows
 systems is available at the V web site:
 
-Documentation (in TeX format) will also be installed under
-/usr/X11R6/share/doc/v.
-
-WWW: http://objectcentral.com/
+WWW: http://vgui.sf.net
diff --git a/x11-toolkits/v/pkg-message b/x11-toolkits/v/pkg-message
index 009d341d6eb2..7b95406b790c 100644
--- a/x11-toolkits/v/pkg-message
+++ b/x11-toolkits/v/pkg-message
@@ -2,6 +2,3 @@ Full documentation, many code examples, and the V toolkit for Windows
 systems is available at the V web site:
 
 http://objectcentral.com/
-
-Documentation (in TeX format) is also installed locally under
-/usr/X11R6/share/doc/v.
diff --git a/x11-toolkits/v/pkg-plist b/x11-toolkits/v/pkg-plist
index a46c3ad61068..54de77f12c3a 100644
--- a/x11-toolkits/v/pkg-plist
+++ b/x11-toolkits/v/pkg-plist
@@ -1,9 +1,12 @@
 bin/b2v
-bin/icondemo
-bin/vdraw
-bin/ved
-bin/vgen
-bin/viconed
+bin/icondemox
+bin/protox
+bin/tutappx
+bin/vdrawx
+bin/vdrawexx
+bin/vgenx
+bin/vtestlibx
+bin/viconedx
 include/v/aw3d.h
 include/v/aw3dp.h
 include/v/awcmd3d.h
@@ -25,6 +28,7 @@ include/v/vapp.h
 include/v/vawinfo.h
 include/v/vbaseitm.h
 include/v/vbasewin.h
+include/v/vbglcnv.h
 include/v/vbrush.h
 include/v/vbtncmd.h
 include/v/vcanvas.h
@@ -60,16 +64,21 @@ include/v/vmodald.h
 include/v/vnlprntr.h
 include/v/vnotice.h
 include/v/vnulldc.h
+include/v/vos.h
 include/v/vpane.h
+include/v/vpaneold.h
 include/v/vpen.h
+include/v/vpopmenu.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/vrepldlg.h
 include/v/vreply.h
 include/v/vsliderc.h
+include/v/vslist.h
 include/v/vspinc.h
 include/v/vstatusp.h
 include/v/vtextc.h
@@ -80,184 +89,11 @@ include/v/vtimer.h
 include/v/vtipwin.h
 include/v/vutil.h
 include/v/vwindow.h
+include/v/vx2vkey.cxx
 include/v/vx2vkey.h
 include/v/vxdc.h
 include/v/vxutil.h
 include/v/vynreply.h
-lib/libV.a
-share/doc/v/Makefile
-share/doc/v/cxxstyle.tex
-share/doc/v/fig/boxlabel.eps
-share/doc/v/fig/boxlabel.fig
-share/doc/v/fig/boxlabel.gif
-share/doc/v/fig/boxlabel.xbm
-share/doc/v/fig/btnbar.fig
-share/doc/v/fig/btnbar.gif
-share/doc/v/fig/button.eps
-share/doc/v/fig/button.fig
-share/doc/v/fig/button.gif
-share/doc/v/fig/chkbox.eps
-share/doc/v/fig/chkbox.fig
-share/doc/v/fig/chkbox.gif
-share/doc/v/fig/color.eps
-share/doc/v/fig/color.fig
-share/doc/v/fig/color.gif
-share/doc/v/fig/combobox.eps
-share/doc/v/fig/combobox.fig
-share/doc/v/fig/combobox.gif
-share/doc/v/fig/dialog.eps
-share/doc/v/fig/dialog.fig
-share/doc/v/fig/dialog.gif
-share/doc/v/fig/dlgcmd.eps
-share/doc/v/fig/dlgcmd.fig
-share/doc/v/fig/dlgcmd.gif
-share/doc/v/fig/filesel.eps
-share/doc/v/fig/filesel.fig
-share/doc/v/fig/filesel.gif
-share/doc/v/fig/frame.eps
-share/doc/v/fig/frame.fig
-share/doc/v/fig/frame.gif
-share/doc/v/fig/icon.eps
-share/doc/v/fig/icon.fig
-share/doc/v/fig/icon.gif
-share/doc/v/fig/iconbtn.eps
-share/doc/v/fig/iconbtn.fig
-share/doc/v/fig/iconbtn.gif
-share/doc/v/fig/line.gif
-share/doc/v/fig/list.eps
-share/doc/v/fig/list.fig
-share/doc/v/fig/list.gif
-share/doc/v/fig/menubar.eps
-share/doc/v/fig/menubar.fig
-share/doc/v/fig/menubar.gif
-share/doc/v/fig/mydialog.eps
-share/doc/v/fig/mydialog.fig
-share/doc/v/fig/mydialog.gif
-share/doc/v/fig/notice.eps
-share/doc/v/fig/notice.fig
-share/doc/v/fig/notice.gif
-share/doc/v/fig/objtemplates.fig
-share/doc/v/fig/oonotate.eps
-share/doc/v/fig/oonotate.fig
-share/doc/v/fig/oonotate.gif
-share/doc/v/fig/progress.eps
-share/doc/v/fig/progress.fig
-share/doc/v/fig/progress.gif
-share/doc/v/fig/protoapp.eps
-share/doc/v/fig/protoapp.fig
-share/doc/v/fig/protoapp.gif
-share/doc/v/fig/radiob.eps
-share/doc/v/fig/radiob.fig
-share/doc/v/fig/radiob.gif
-share/doc/v/fig/reply.eps
-share/doc/v/fig/reply.fig
-share/doc/v/fig/reply.gif
-share/doc/v/fig/slider.eps
-share/doc/v/fig/slider.fig
-share/doc/v/fig/slider.gif
-share/doc/v/fig/spinner.eps
-share/doc/v/fig/spinner.fig
-share/doc/v/fig/spinner.gif
-share/doc/v/fig/statbar.eps
-share/doc/v/fig/statbar.fig
-share/doc/v/fig/statbar.gif
-share/doc/v/fig/stdvapp.eps
-share/doc/v/fig/stdvapp.fig
-share/doc/v/fig/stdvapp.gif
-share/doc/v/fig/testclass.fig
-share/doc/v/fig/textbox.eps
-share/doc/v/fig/textbox.fig
-share/doc/v/fig/textbox.gif
-share/doc/v/fig/textin.eps
-share/doc/v/fig/textin.fig
-share/doc/v/fig/textin.gif
-share/doc/v/fig/vapphier.eps
-share/doc/v/fig/vapphier.fig
-share/doc/v/fig/vapphier.gif
-share/doc/v/fig/vprghier.eps
-share/doc/v/fig/vprghier.fig
-share/doc/v/fig/vprghier.gif
-share/doc/v/fig/ynreply.eps
-share/doc/v/fig/ynreply.fig
-share/doc/v/fig/ynreply.gif
-share/doc/v/html/aboutv.bmp
-share/doc/v/html/aboutv.gif
-share/doc/v/html/blank.bmp
-share/doc/v/html/blank.gif
-share/doc/v/html/dnldwin.bmp
-share/doc/v/html/dnldwin.gif
-share/doc/v/html/dnldx.bmp
-share/doc/v/html/dnldx.gif
-share/doc/v/html/drawwin.bmp
-share/doc/v/html/drawwin.gif
-share/doc/v/html/drawx.gif
-share/doc/v/html/filepikx.gif
-share/doc/v/html/fontpikx.gif
-share/doc/v/html/gotoftp.bmp
-share/doc/v/html/gotoftp.gif
-share/doc/v/html/helpwant.bmp
-share/doc/v/html/helpwant.gif
-share/doc/v/html/maillist.bmp
-share/doc/v/html/maillist.gif
-share/doc/v/html/mirrors.bmp
-share/doc/v/html/mirrors.gif
-share/doc/v/html/mswin.bmp
-share/doc/v/html/pickwin.gif
-share/doc/v/html/pickx.gif
-share/doc/v/html/refman.bmp
-share/doc/v/html/refman.gif
-share/doc/v/html/scrnshot.bmp
-share/doc/v/html/scrnshot.gif
-share/doc/v/html/testimon.bmp
-share/doc/v/html/testimon.gif
-share/doc/v/html/vfaq.bmp
-share/doc/v/html/vfaq.gif
-share/doc/v/html/vgui.bmp
-share/doc/v/html/vgui.gif
-share/doc/v/html/vguibtn.bmp
-share/doc/v/html/vguibtn.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/vinstall.tex
-share/doc/v/vlatest.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/wlatest.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/wvrefman.html
-share/doc/v/wvreftut.tex
-share/doc/v/wvtools.tex
-@dirrm share/doc/v/fig
-@dirrm share/doc/v/html
-@dirrm share/doc/v
+lib/libVx.a
+lib/libVxgl.a
 @dirrm include/v