FreeBSD Bugzilla – Attachment 63006 Details for
Bug 94063
[Update Port] x11-toolkits/v: update to version 1.90 and unbreak
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 14.49 KB, created by
Kay Lehmann
on 2006-03-04 12:50:03 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
Kay Lehmann
Created:
2006-03-04 12:50:03 UTC
Size:
14.49 KB
patch
obsolete
>diff -urN v.orig/Makefile v/Makefile >--- v.orig/Makefile Sat Mar 4 13:14:02 2006 >+++ v/Makefile Sat Mar 4 13:25:47 2006 >@@ -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 @@ > > .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 -urN v.orig/distinfo v/distinfo >--- v.orig/distinfo Sat Mar 4 13:14:02 2006 >+++ v/distinfo Sat Mar 4 13:26:39 2006 >@@ -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 -urN v.orig/files/patch-aa v/files/patch-aa >--- v.orig/files/patch-aa Sat Mar 4 13:14:02 2006 >+++ v/files/patch-aa Thu Jan 1 01:00:00 1970 >@@ -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 -urN v.orig/files/patch-ab v/files/patch-ab >--- v.orig/files/patch-ab Sat Mar 4 13:14:02 2006 >+++ v/files/patch-ab Thu Jan 1 01:00:00 1970 >@@ -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 -urN v.orig/files/patch-ac v/files/patch-ac >--- v.orig/files/patch-ac Sat Mar 4 13:14:02 2006 >+++ v/files/patch-ac Thu Jan 1 01:00:00 1970 >@@ -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 -urN v.orig/files/patch-ad v/files/patch-ad >--- v.orig/files/patch-ad Sat Mar 4 13:14:02 2006 >+++ v/files/patch-ad Thu Jan 1 01:00:00 1970 >@@ -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 -urN v.orig/files/patch-af v/files/patch-af >--- v.orig/files/patch-af Sat Mar 4 13:14:02 2006 >+++ v/files/patch-af Thu Jan 1 01:00:00 1970 >@@ -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 -urN v.orig/files/patch-ag v/files/patch-ag >--- v.orig/files/patch-ag Sat Mar 4 13:14:02 2006 >+++ v/files/patch-ag Thu Jan 1 01:00:00 1970 >@@ -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 -urN v.orig/files/patch-ah v/files/patch-ah >--- v.orig/files/patch-ah Sat Mar 4 13:14:02 2006 >+++ v/files/patch-ah Thu Jan 1 01:00:00 1970 >@@ -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 -urN v.orig/files/patch-ai v/files/patch-ai >--- v.orig/files/patch-ai Sat Mar 4 13:14:02 2006 >+++ v/files/patch-ai Thu Jan 1 01:00:00 1970 >@@ -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 -urN v.orig/files/patch-aj v/files/patch-aj >--- v.orig/files/patch-aj Sat Mar 4 13:14:02 2006 >+++ v/files/patch-aj Thu Jan 1 01:00:00 1970 >@@ -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 -urN v.orig/files/patch-ak v/files/patch-ak >--- v.orig/files/patch-ak Sat Mar 4 13:14:02 2006 >+++ v/files/patch-ak Thu Jan 1 01:00:00 1970 >@@ -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 -urN v.orig/files/patch-configs::ConfigX.mk v/files/patch-configs::ConfigX.mk >--- v.orig/files/patch-configs::ConfigX.mk Thu Jan 1 01:00:00 1970 >+++ v/files/patch-configs::ConfigX.mk Sat Mar 4 09:47:51 2006 >@@ -0,0 +1,32 @@ >+--- configs/ConfigX.mk.orig Thu Apr 3 18:14:40 2003 >++++ configs/ConfigX.mk Sat Mar 4 09:47:42 2006 >+@@ -51,7 +51,7 @@ >+ # User contributed definitions are available for:
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=63006">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 94063
: 63006 |
63007