Attachment #63006 for bug #94063




#

PORTNAME=	v
PORTVERSION=	1.90
PORTREVISION=	1
CATEGORIES=	x11-toolkits devel graphics
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	vgui

MAINTAINER=	ports@FreeBSD.org
COMMENT=	A C++ GUI development framework for X11 and Microsoft Windows

WRKSRC=		${WRKDIR}/home/vgui
BROKEN=		compiler error in function fixup_memory_subreg
.endif

WRKSRC=		${WRKDIR}/v

USE_X_PREFIX=	YES
USE_GMAKE=	YES


.include <bsd.port.pre.mk>

.if ${ARCH} == "alpha"
BROKEN=		compiler error in function fixup_memory_subreg
.endif

do-configure:
	${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/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>

Lines 1-3 Link Here

(-)v/distinfo (-3 / +3 lines)
1	MD5 (v-1.19.tar.gz) = 756be07f6db621672e49c35a00797faf	1	MD5 (v-1.90.tar.gz) = 7eec3b3b72dc78d600eb8d8c2ef03fec
2	SHA256 (v-1.19.tar.gz) = 4296955c80d42ce630a90c4720f0dbb4e1acac73a5027598773d7c9dabfa7d26	2	SHA256 (v-1.90.tar.gz) = c6eacb3b3463e60522d8756abf7c39d30753b595bc110453d40f5f082f69ce40
3	SIZE (v-1.19.tar.gz) = 1036871	3	SIZE (v-1.90.tar.gz) = 1334360

Lines 1-40 Link Here

(-)v/files/patch-aa (-40 lines)
1	--- ConfigX.mk.orig Mon May 4 23:05:52 1998
2	+++ ConfigX.mk Thu Mar 3 01:42:06 2005
3	@@ -28,7 +28,7 @@
4	#---------------------------------------------------------------------
5	# HOMEV info
6	#---------------------------------------------------------------------
7	-HOMEV = $(HOME)/v
8	+#HOMEV = $(HOME)/v
9
10
11	#---------------------------------------------------------------------
12	@@ -51,7 +51,7 @@
13	# User contributed definitions are available for:
14	# hpux, aix, solaris, bsd
15	#---------------------------------------------------------------------
16	-ARCH = linux
17	+#ARCH = linux
18	#ARCH = linuxelf
19	#ARCH = sun4
20	#ARCH = mips
21	@@ -59,8 +59,8 @@
22	#ARCH = hpux
23	#ARCH = aix
24	#ARCH = solaris
25	-#ARCH = bsd
26	-Arch = $(ARCH)
27	+ARCH = bsd
28	+Arch = bsd
29
30
31	#---------------------------------------------------------------------
32	@@ -256,7 +256,7 @@
33	ifeq ($(Arch),bsd)
34	INCDIR += -I/usr/$(X11RV)/include
35	LIBDIR += -L/usr/$(X11RV)/lib
36	-LIBS += -lV -lXaw -lXmu -lXt -lXext -lX11
37	+LIBS += -lV -lXaw -lXmu -lXt -lXext -lX11 -lICE -lSM
38	TARZ =
39	RANLIB = ranlib
40	VGPATH = UNIX




--- 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 -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 -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




--- 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
       },
     };
 




--- 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"




--- 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 <<<====================




--- 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},
    




--- 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,

Lines 1-11 Link Here

(-)v/files/patch-ak (-11 lines)
1	--- examp/mycmdwin.cpp.orig Sun Feb 27 13:23:39 2000
2	+++ examp/mycmdwin.cpp Sun Feb 27 13:27:34 2000
3	@@ -223,7 +223,7 @@
4	{
5	// route all commands through here - menus and buttons
6
7	- static cmdCount = 0;
8	+ static int cmdCount = 0;
9
10	vNoticeDialog note(this); // Used for default actions
11

Line 0 Link Here

(-)v/files/patch-configs::ConfigX.mk (+4 lines)
	1	--- configs/ConfigX.mk.orig Thu Apr 3 18:14:40 2003
	2	+++ configs/ConfigX.mk Sat Mar 4 09:47:42 2006
	3	@@ -51,7 +51,7 @@
	4	# User contributed definitions are available for:

Return to bug 94063

Lines 6-24 Link Here

(-)v/Makefile (-22 / +34 lines)
6	#	6	#
7		7
8	PORTNAME= v	8	PORTNAME= v
9	PORTVERSION= 1.19	9	PORTVERSION= 1.90
10	PORTREVISION= 1
11	CATEGORIES= x11-toolkits devel graphics	10	CATEGORIES= x11-toolkits devel graphics
12	MASTER_SITES= http://programming.ccp14.ac.uk/ftp-mirror/programming/objectcentral/	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
		12	MASTER_SITE_SUBDIR= vgui
13		13
14	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= ports@FreeBSD.org
15	COMMENT= A C++ GUI development framework for X11 and Microsoft Windows	15	COMMENT= A C++ GUI development framework for X11 and Microsoft Windows
16		16
17	.if ${MACHINE_ARCH} == "alpha"	17	WRKSRC= ${WRKDIR}/home/vgui
18	BROKEN= compiler error in function fixup_memory_subreg
19	.endif
20
21	WRKSRC= ${WRKDIR}/v
22		18
23	USE_X_PREFIX= YES	19	USE_X_PREFIX= YES
24	USE_GMAKE= YES	20	USE_GMAKE= YES
Lines 26-53 Link Here
26		22
27	.include <bsd.port.pre.mk>	23	.include <bsd.port.pre.mk>
28		24
29	.if ${OSVERSION} >= 500113	25	.if ${ARCH} == "alpha"
30	BROKEN= "Does not compile (bad C++ code)"	26	BROKEN= compiler error in function fixup_memory_subreg
31	.endif	27	.endif
32		28
33	do-configure:	29	do-configure:
34	${CP} ${WRKSRC}/ConfigX.mk ${WRKSRC}/Config.mk	30	${CP} ${WRKSRC}/configs/ConfigX.mk ${WRKSRC}/Config.mk
35		31
36	pre-build:	32	pre-build:
37	${MKDIR} ${WRKSRC}/obj/bsd ${WRKSRC}/objm/bsd ${WRKSRC}/lib/bsd ${WRKSRC}/bin/bsd	33	${MKDIR} ${WRKSRC}/obj/bsd ${WRKSRC}/objm/bsd ${WRKSRC}/lib/bsd ${WRKSRC}/bin/bsd
38		34
		35	do-install:
		36	${INSTALL_PROGRAM} ${WRKSRC}/bin/viconedx ${PREFIX}/bin
		37	${INSTALL_PROGRAM} ${WRKSRC}/bin/b2v ${PREFIX}/bin
		38	${INSTALL_PROGRAM} ${WRKSRC}/bin/icondemox ${PREFIX}/bin
		39	${INSTALL_PROGRAM} ${WRKSRC}/bin/protox ${PREFIX}/bin
		40	${INSTALL_PROGRAM} ${WRKSRC}/bin/tutappx ${PREFIX}/bin
		41	${INSTALL_PROGRAM} ${WRKSRC}/bin/vdrawx ${PREFIX}/bin
		42	${INSTALL_PROGRAM} ${WRKSRC}/bin/vdrawexx ${PREFIX}/bin
		43	${INSTALL_PROGRAM} ${WRKSRC}/bin/vgenx ${PREFIX}/bin
		44	${INSTALL_PROGRAM} ${WRKSRC}/bin/vtestlibx ${PREFIX}/bin
		45	${INSTALL_DATA} ${WRKSRC}/lib/libVx.a ${PREFIX}/lib
		46	${INSTALL_DATA} ${WRKSRC}/lib/libVxgl.a ${PREFIX}/lib
		47	${MKDIR} ${PREFIX}/include/v
		48	${INSTALL_DATA} ${WRKSRC}/includex/v/* ${PREFIX}/include/v
		49
39	post-install:	50	post-install:
40	${RANLIB} ${PREFIX}/lib/libV.a	51	${RANLIB} ${PREFIX}/lib/libVx.a
41	.ifdef NOPORTDOCS	52	${RANLIB} ${PREFIX}/lib/libVxgl.a
42	@${ECHO_MSG} "==> Extra documentation WILL NOT be installed."	53	#.ifdef NOPORTDOCS
43	.else	54	# @${ECHO_MSG} "==> Extra documentation WILL NOT be installed."
44	@${ECHO_MSG} "==> Installing extra docs under ${PREFIX}/share/doc/v..."	55	#.else
45	${MKDIR} ${PREFIX}/share/doc/v	56	# @${ECHO_MSG} "==> Installing extra docs under ${PREFIX}/share/doc/v..."
46	${CP} -R ${WRKSRC}/doc/* ${PREFIX}/share/doc/v	57	## ${MKDIR} ${PREFIX}/share/doc/v
47	${FIND} ${PREFIX}/share/doc/v -type d -exec ${CHMOD} 755 {} \;	58	# ${CP} -R ${WRKSRC}/doc/* ${PREFIX}/share/doc/v
48	${FIND} ${PREFIX}/share/doc/v -type f -exec ${CHMOD} 644 {} \;	59	# ${FIND} ${PREFIX}/share/doc/v -type d -exec ${CHMOD} 755 {} \;
49	@${ECHO_MSG} "==> Extra docs installed. Note, you will need *tex to read 'em."	60	# ${FIND} ${PREFIX}/share/doc/v -type f -exec ${CHMOD} 644 {} \;
50	.endif	61	# @${ECHO_MSG} "==> Extra docs installed. Note, you will need *tex to read 'em."
		62	#.endif
51	@${CAT} ${PKGMESSAGE}	63	@${CAT} ${PKGMESSAGE}
52		64
53	.include <bsd.port.post.mk>	65	.include <bsd.port.post.mk>

Lines 1-44 Link Here

(-)v/files/patch-ab (-44 lines)
1	--- Makefile.orig Mon May 11 14:20:54 1998
2	+++ Makefile Sat Jul 18 23:03:49 1998
3	@@ -55,13 +55,13 @@
4	# tarfull: everthing, including .o's, etc.
5	# getwin: copy MS-Windows source from /dosc
6	# permissions: make sources readable to world
7	+# install run as root to install in ${INSTALLDIR} (defined below)
8	# installv: run as root to install to /usr/local/v
9	-# installvlinux: run as root to install to /usr/local
10	+# installvlinux: run as root to install to /usr/local (really to /usr)
11	# installunm: install to ../pubv (UNM specific)
12	#
13	#===============================================================
14
15	-
16	#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
17	#
18	# composite targets and targets for builds in subdirs
19	@@ -321,6 +321,25 @@
20	.PHONY: installLinuxElf
21	installLinuxElf:
22	$(MAKE) ARCH=linuxelf installVLinux
23	+
24	+.PHONY: install
25	+install:
26	+ -mkdir -p $(INSTALLDIR)/include/v
27	+ -chmod 755 $(INSTALLDIR)/include/v
28	+ cp includex/v/* $(INSTALLDIR)/include/v
29	+ -chmod 644 $(INSTALLDIR)/include/v/*
30	+
31	+ -mkdir -p $(INSTALLDIR)/lib
32	+ install -c -m 644 $(LibDir)/libV.a $(INSTALLDIR)/lib
33	+ $(RANLIB) $(INSTALLDIR)/lib/libV.a
34	+
35	+ -mkdir -p $(INSTALLDIR)/bin
36	+ install -s -c -m 755 $(Bin)/b2v $(INSTALLDIR)/bin
37	+ install -s -c -m 755 $(Bin)/icondemo $(INSTALLDIR)/bin
38	+ install -s -c -m 755 $(Bin)/vdraw $(INSTALLDIR)/bin
39	+ install -s -c -m 755 $(Bin)/ved $(INSTALLDIR)/bin
40	+ install -s -c -m 755 $(Bin)/vgen $(INSTALLDIR)/bin
41	+ install -s -c -m 755 $(Bin)/viconed $(INSTALLDIR)/bin
42
43	.PHONY: installv
44	installv:

Lines 1-12 Link Here

(-)v/files/patch-ac (-12 lines)
1	diff -ru ./appgen/vgcode.cpp ../patched/appgen/vgcode.cpp
2	--- ./appgen/vgcode.cpp Fri Apr 24 15:19:36 1998
3	+++ ../patched/appgen/vgcode.cpp Tue Jun 16 07:27:50 1998
4	@@ -1291,7 +1291,7 @@
5	of << "\n";
6	of << "HOMEV = " << op.home << "\n";
7	#ifdef V_VersionX
8	-of << "X11INC = /usr/X11/include\n";
9	+of << "X11INC = /usr/X11R6/include\n";
10	of << "X11LIB = /usr/X11R6/lib\n";
11	#endif
12	of << "LIBS = " << DEF_LIBS << "\n";

Lines 1-12 Link Here

(-)v/files/patch-ad (-12 lines)
1	diff -ru ./appgen/vgdefs.h ../patched/appgen/vgdefs.h
2	--- ./appgen/vgdefs.h Mon May 4 19:23:46 1998
3	+++ ../patched/appgen/vgdefs.h Tue Jun 16 09:25:35 1998
4	@@ -23,7 +23,7 @@
5	#ifdef LINUX
6	#define DEF_HOMEV "/usr" // to find libV.a
7	#else
8	-#define DEF_HOMEV "/usr/local/v" // to find libV.a
9	+#define DEF_HOMEV "/usr/X11R6" // to find libV.a
10	#endif
11
12	#ifdef Motif

Lines 1-92 Link Here

(-)v/files/patch-af (-92 lines)
1	--- srcx/vapp.cxx.orig Sun Feb 27 13:02:24 2000
2	+++ srcx/vapp.cxx Sun Feb 27 13:04:42 2000
3	@@ -105,7 +105,7 @@
4	sizeof(Pixel),
5	XtOffsetOf(AppData,copy_fg),
6	XtRString,
7	- XtDefaultForeground
8	+ (XtPointer)XtDefaultForeground
9	},
10	{
11	XtNbackground,
12	@@ -114,7 +114,7 @@
13	sizeof(Pixel),
14	XtOffsetOf(AppData,copy_bg),
15	XtRString,
16	- XtDefaultBackground
17	+ (XtPointer)XtDefaultBackground
18	},
19
20	//--------------------------------------------
21	@@ -125,7 +125,7 @@
22	sizeof(Pixel),
23	XtOffsetOf(AppData,dialogBG),
24	XtRString,
25	- vMedGray
26	+ (XtPointer)vMedGray
27	},
28	{
29	"vStatusBarBG",
30	@@ -134,7 +134,7 @@
31	sizeof(Pixel),
32	XtOffsetOf(AppData,statusBarBG),
33	XtRString,
34	- vLightGray
35	+ (XtPointer)vLightGray
36	},
37	{
38	"vMenuBarBG",
39	@@ -143,7 +143,7 @@
40	sizeof(Pixel),
41	XtOffsetOf(AppData,menuBarBG),
42	XtRString,
43	- vDarkGray
44	+ (XtPointer)vDarkGray
45	},
46	{
47	"vControlBG",
48	@@ -152,7 +152,7 @@
49	sizeof(Pixel),
50	XtOffsetOf(AppData,controlBG),
51	XtRString,
52	- vDarkGray
53	+ (XtPointer)vDarkGray
54	},
55	{
56	"vControlFace",
57	@@ -161,7 +161,7 @@
58	sizeof(Pixel),
59	XtOffsetOf(AppData,controlFace),
60	XtRString,
61	- vMedGray
62	+ (XtPointer)vMedGray
63	},
64	{
65	"vLightControlShadow",
66	@@ -170,7 +170,7 @@
67	sizeof(Pixel),
68	XtOffsetOf(AppData,lightControlShadow),
69	XtRString,
70	- vLightShadow
71	+ (XtPointer)vLightShadow
72	},
73	{
74	"vDarkControlShadow",
75	@@ -179,7 +179,7 @@
76	sizeof(Pixel),
77	XtOffsetOf(AppData,darkControlShadow),
78	XtRString,
79	- vDarkShadow
80	+ (XtPointer)vDarkShadow
81	},
82	//--------------------------------------------
83
84	@@ -190,7 +190,7 @@
85	sizeof(XFontStruct*),
86	XtOffsetOf(AppData, font),
87	XtRString,
88	- XtDefaultFont
89	+ (XtPointer)XtDefaultFont
90	},
91	};
92

Lines 1-12 Link Here

(-)v/files/patch-ag (-12 lines)
1	--- srcx/vpsdc.cxx.orig Sun Feb 27 13:06:07 2000
2	+++ srcx/vpsdc.cxx Sun Feb 27 13:06:48 2000
3	@@ -270,7 +270,8 @@
4	note.Notice(msg);
5	}
6
7	- char* port = (_printer.GetPortrait()) ? "Portrait\n" : "Landscape\n";
8	+ char* port = (_printer.GetPortrait()) ? (char *)"Portrait\n" :
9	+ (char *)"Landscape\n";
10	char* papername = _printer.GetPaperName();
11
12	*pstream << "%!PS-Adobe-2.0\n"

Lines 1-22 Link Here

(-)v/files/patch-ah (-22 lines)
1	--- test/vtcmdwin.cpp.orig Sun Feb 27 13:08:01 2000
2	+++ test/vtcmdwin.cpp Sun Feb 27 13:17:34 2000
3	@@ -352,7 +352,7 @@
4	"Draw colors"},
5	{C_Slider, 888, 4, "",NoList,CA_Horizontal ,isSens,NoFrame, 0, 0, 0,
6	"Slider Test"},
7	- {C_Text, 889, 4, "", " 04",CA_None,isSens,NoFrame, 0, 0},
8	+ {C_Text, 889, 4, "", (void *)" 04",CA_None,isSens,NoFrame, 0, 0},
9	{C_Button, M_Dialog, 0, "Dialog", NoList,CA_None,isSens,NoFrame, 0, 0, 0,
10	"Show Dialog Test"},
11	{C_EndOfList,0,0,0,0,CA_None,0,0,0}
12	@@ -409,8 +409,8 @@
13
14	static vFont gfont(vfDefaultFixed);
15	static long lp_lim = 0;
16	- static memdcValid = 0;
17	- static sliceOn = 0;
18	+ static int memdcValid = 0;
19	+ static int sliceOn = 0;
20
21
22	//====================>>> myTimer::TimerTick <<<====================

Lines 1-20 Link Here

(-)v/files/patch-ai (-20 lines)
1	--- test/vtdialog.cpp.orig Sun Feb 27 13:18:38 2000
2	+++ test/vtdialog.cpp Sun Feb 27 13:20:32 2000
3	@@ -92,7 +92,7 @@
4	{C_CheckBox, 3, 1, "Check 1", NoList,CA_None,isSens,NoFrame, 0, 13},
5	{C_CheckBox, 301, 0, "Check 2 ", NoList,CA_None,isSens,NoFrame, 3, 13},
6
7	- {C_Text, 4, 0, "", "This is an example\nof a two line text. (üä)",
8	+ {C_Text, 4, 0, "", (void *)"This is an example\nof a two line text. (üä)",
9	CA_None,isSens,NoFrame, 301, 13},
10
11	{C_ProgressBar, 76, 50, "", (void*)&prange[0],
12	@@ -101,7 +101,7 @@
13	{C_Frame, 86, 0, "", NoList,CA_None,isSens,NoFrame, 76,10},
14	{C_Label, 87, 0, "Slider", NoList,CA_None,isSens,86,0,0},
15	{C_Slider, 88, 50, "", (void*)&prange[0],CA_Horizontal ,isSens,86, 0, 87},
16	- {C_Text, 89, 50, "", " 50",CA_NoBorder,isSens,86, 88, 87},
17	+ {C_Text, 89, 50, "", (void *)" 50",CA_NoBorder,isSens,86, 88, 87},
18
19	{C_Slider, 85, 50, "", NoList,CA_Vertical ,isSens,0, 86, 10},
20

Lines 1-29 Link Here

(-)v/files/patch-aj (-29 lines)
1	--- iconed/coldlg.cpp.orig Sun Feb 27 13:21:21 2000
2	+++ iconed/coldlg.cpp Sun Feb 27 13:22:42 2000
3	@@ -114,7 +114,7 @@
4	frSliders,0,0, 0, "Click to enter Red value"},
5	{C_Slider, Rslider, 0, "", (void*)&sldR[0], CA_None, isSens, frSliders,
6	iRed, 0, 256, "Set Red Value"},
7	- {C_Text, Rtext, 0, " ", "0 ", CA_None, isSens, frSliders,
8	+ {C_Text, Rtext, 0, " ", (void *)"0 ", CA_None, isSens, frSliders,
9	Rslider, 0},
10
11	// add green slider
12	@@ -122,7 +122,7 @@
13	frSliders,0,Rslider, 0, "Click to enter Green value"},
14	{C_Slider, Gslider, 0, "", (void*)&sldR[0], CA_None, isSens, frSliders,
15	iGreen, Rslider, 256, "Set Green Value"},
16	- {C_Text, Gtext, 0, "", "0 ", CA_None, isSens, frSliders,
17	+ {C_Text, Gtext, 0, "", (void *)"0 ", CA_None, isSens, frSliders,
18	Gslider, Rslider},
19
20	// add blue slider
21	@@ -130,7 +130,7 @@
22	frSliders,0,Gslider, 0, "Click to enter Blue value"},
23	{C_Slider, Bslider, 0, "", (void*)&sldR[0], CA_None, isSens, frSliders,
24	iBlue, Gslider, 256, "Set Blue Value"},
25	- {C_Text, Btext, 0, "", "0 ", CA_None, isSens, frSliders,
26	+ {C_Text, Btext, 0, "", (void *)"0 ", CA_None, isSens, frSliders,
27	Bslider, Gslider},
28
29	{C_Button, btReset, 0, "Reset",NoList, CA_None, isSens, NoFrame,