From 0ddb3260860cc9dcccaea767bf5091a6d9e0a1d6 Mon Sep 17 00:00:00 2001 From: abs Date: Thu, 27 Nov 2003 17:27:29 +0000 Subject: Update tightvnc to 1.2.9 to match tightvncviewer Changelog since 1.2.6 seems to mainly list const fixes. --- net/tightvnc/Makefile | 14 ++---- net/tightvnc/PLIST | 103 +----------------------------------------- net/tightvnc/distinfo | 32 ++++++------- net/tightvnc/patches/patch-ab | 38 +++++++--------- net/tightvnc/patches/patch-ac | 51 ++++++++++----------- net/tightvnc/patches/patch-ad | 23 +++++----- net/tightvnc/patches/patch-ae | 39 +++++++++++----- net/tightvnc/patches/patch-af | 31 +++++-------- net/tightvnc/patches/patch-ag | 25 ++++------ net/tightvnc/patches/patch-ah | 13 ++++++ net/tightvnc/patches/patch-ai | 13 ++++++ net/tightvnc/patches/patch-aj | 13 ++++++ net/tightvnc/patches/patch-ak | 22 +++++++++ net/tightvnc/patches/patch-al | 18 ++++++++ net/tightvnc/patches/patch-ba | 14 ------ net/tightvnc/patches/patch-bb | 13 ------ net/tightvnc/patches/patch-bc | 13 ------ net/tightvnc/patches/patch-bd | 27 ----------- net/tightvnc/patches/patch-be | 13 ------ net/tightvnc/patches/patch-bf | 28 ------------ net/tightvnc/patches/patch-bg | 12 ----- 21 files changed, 200 insertions(+), 355 deletions(-) create mode 100644 net/tightvnc/patches/patch-ah create mode 100644 net/tightvnc/patches/patch-ai create mode 100644 net/tightvnc/patches/patch-aj create mode 100644 net/tightvnc/patches/patch-ak create mode 100644 net/tightvnc/patches/patch-al delete mode 100644 net/tightvnc/patches/patch-ba delete mode 100644 net/tightvnc/patches/patch-bb delete mode 100644 net/tightvnc/patches/patch-bc delete mode 100644 net/tightvnc/patches/patch-bd delete mode 100644 net/tightvnc/patches/patch-be delete mode 100644 net/tightvnc/patches/patch-bf delete mode 100644 net/tightvnc/patches/patch-bg (limited to 'net') diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile index 864a65ae047..12e3f35c794 100644 --- a/net/tightvnc/Makefile +++ b/net/tightvnc/Makefile @@ -1,13 +1,11 @@ -# $NetBSD: Makefile,v 1.9 2003/10/11 12:20:19 grant Exp $ +# $NetBSD: Makefile,v 1.10 2003/11/27 17:27:29 abs Exp $ # -DISTNAME= tightvnc-1.2.6 +DISTNAME= tightvnc-1.2.9 WRKSRC= ${WRKDIR}/vnc_unixsrc CATEGORIES= net x11 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vnc-tight/} \ - ftp://ftp.uk.research.att.com/pub/vnc/dist/ -DISTFILES= tightvnc-1.2.6_unixsrc.tar.bz2 \ - vnc-3.3.2r2_doc.tgz +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vnc-tight/} +DISTFILES= ${DISTNAME}_unixsrc.tar.bz2 MAINTAINER= mycroft@NetBSD.org HOMEPAGE= http://www.tightvnc.com/ @@ -47,10 +45,6 @@ post-install: ${INSTALL_SCRIPT} ${WRKSRC}/vncserver.local ${PREFIX}/bin/vncserver ${INSTALL_MAN} ${WRKSRC}/vncserver.man \ ${PREFIX}/man/man1/vncserver.1 - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vnc - cd ${WRKDIR} && \ - ${INSTALL_DATA} *.GIF *.css *.gif *.jpg *.htm *.html *.pdf \ - ${PREFIX}/share/doc/vnc .include "../../devel/zlib/buildlink2.mk" .include "../../graphics/jpeg/buildlink2.mk" diff --git a/net/tightvnc/PLIST b/net/tightvnc/PLIST index 869d281ae19..013febe57ff 100644 --- a/net/tightvnc/PLIST +++ b/net/tightvnc/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/10/20 14:33:53 lukem Exp $ +@comment $NetBSD: PLIST,v 1.3 2003/11/27 17:27:29 abs Exp $ bin/Xvnc bin/vncconnect bin/vncpasswd @@ -7,104 +7,3 @@ man/man1/Xvnc.1 man/man1/vncconnect.1 man/man1/vncpasswd.1 man/man1/vncserver.1 -share/doc/vnc/Xvnc.gif -share/doc/vnc/ach.jpg -share/doc/vnc/backbutton.gif -share/doc/vnc/badgeshad.gif -share/doc/vnc/bluepix.gif -share/doc/vnc/cdplay.gif -share/doc/vnc/cevncviewer.html -share/doc/vnc/cim.jpg -share/doc/vnc/clientserver.gif -share/doc/vnc/collage.gif -share/doc/vnc/collagesmaller.gif -share/doc/vnc/conndlg.gif -share/doc/vnc/contribbutton.gif -share/doc/vnc/contribs.html -share/doc/vnc/docbutton.gif -share/doc/vnc/docs.html -share/doc/vnc/download.htm -share/doc/vnc/downloadbutton.gif -share/doc/vnc/extras.html -share/doc/vnc/faq.html -share/doc/vnc/faqbutton.gif -share/doc/vnc/free.html -share/doc/vnc/freebutton.gif -share/doc/vnc/gpl.html -share/doc/vnc/help.html -share/doc/vnc/helpbutton.gif -share/doc/vnc/homebutton.gif -share/doc/vnc/howitworks.html -share/doc/vnc/ie1.gif -share/doc/vnc/ie1_small.gif -share/doc/vnc/iemacwin.gif -share/doc/vnc/iemacwin_small.gif -share/doc/vnc/iemacx.gif -share/doc/vnc/iemacx_small.gif -share/doc/vnc/index.html -share/doc/vnc/internalversion.html -share/doc/vnc/intouch.html -share/doc/vnc/intouchbutton.gif -share/doc/vnc/invalid-download.html -share/doc/vnc/javavncviewer.html -share/doc/vnc/jnw.jpg -share/doc/vnc/krw.jpg -share/doc/vnc/macshot.gif -share/doc/vnc/macshot_small.gif -share/doc/vnc/macvnc.html -share/doc/vnc/macvncviewer.html -share/doc/vnc/mailinglist.html -share/doc/vnc/newlogosmall2.gif -share/doc/vnc/ns1.gif -share/doc/vnc/ns1_small.gif -share/doc/vnc/oldcontribs.html -share/doc/vnc/oldfaq.html -share/doc/vnc/orlbutton.gif -share/doc/vnc/platforms.html -share/doc/vnc/pmw.jpg -share/doc/vnc/protocol.html -share/doc/vnc/qsf.jpg -share/doc/vnc/rfbcounter.gif -share/doc/vnc/rfbcounter.html -share/doc/vnc/rfbproto.pdf -share/doc/vnc/rfbprotoheader.pdf -share/doc/vnc/screenbutton.gif -share/doc/vnc/screenshots.html -share/doc/vnc/searchbutton.gif -share/doc/vnc/sidebarbg.gif -share/doc/vnc/sideblank.gif -share/doc/vnc/sidelogo.gif -share/doc/vnc/spacer.gif -share/doc/vnc/start.html -share/doc/vnc/startbutton.gif -share/doc/vnc/styles.css -share/doc/vnc/template.html -share/doc/vnc/tjr.jpg -share/doc/vnc/twmideas.html -share/doc/vnc/videos.html -share/doc/vnc/videos1.jpg -share/doc/vnc/videos2.jpg -share/doc/vnc/videos3.jpg -share/doc/vnc/viewertray.gif -share/doc/vnc/vinci1.gif -share/doc/vnc/vinci1_small.gif -share/doc/vnc/vnc.gif -share/doc/vnc/vncce1.jpg -share/doc/vnc/vncce1_medium.jpg -share/doc/vnc/vncce1_small.jpg -share/doc/vnc/vncce2.jpg -share/doc/vnc/vncce2_small.jpg -share/doc/vnc/vncce3.jpg -share/doc/vnc/vncce3_small.jpg -share/doc/vnc/vnchistory.html -share/doc/vnc/vncpeople.html -share/doc/vnc/vncpeoplebutton.gif -share/doc/vnc/winhistory.html -share/doc/vnc/winviewer1.gif -share/doc/vnc/winviewer1_small.gif -share/doc/vnc/winvnc.html -share/doc/vnc/winvnctray.GIF -share/doc/vnc/winvncviewer.html -share/doc/vnc/xvnc.html -share/doc/vnc/xvncviewer.html -@dirrm share/doc/vnc diff --git a/net/tightvnc/distinfo b/net/tightvnc/distinfo index 491bb219cce..fab37157db9 100644 --- a/net/tightvnc/distinfo +++ b/net/tightvnc/distinfo @@ -1,20 +1,16 @@ -$NetBSD: distinfo,v 1.7 2002/10/20 16:32:25 lukem Exp $ +$NetBSD: distinfo,v 1.8 2003/11/27 17:27:29 abs Exp $ -SHA1 (tightvnc-1.2.6_unixsrc.tar.bz2) = 3ff266a89d12cf49855fbeee3c7c6a8c6c2f07bd -Size (tightvnc-1.2.6_unixsrc.tar.bz2) = 1717851 bytes -SHA1 (vnc-3.3.2r2_doc.tgz) = 857b05c4d8de8b00bfd1ab06a408d9d9a5bb4a6b -Size (vnc-3.3.2r2_doc.tgz) = 1009890 bytes +SHA1 (tightvnc-1.2.9_unixsrc.tar.bz2) = 62b55237676bbdc7f08771e6ff72c0f70264f4ee +Size (tightvnc-1.2.9_unixsrc.tar.bz2) = 1738256 bytes SHA1 (patch-aa) = 3445af5bc4b85f7a45049378f5806a5c993503f4 -SHA1 (patch-ab) = f31282e99502dc50b53c660472aa297ef25e0772 -SHA1 (patch-ac) = 71f7dcf81e731263b2bc0b9ea87326d1da2ff1a9 -SHA1 (patch-ad) = fa346a71945facf9537a700267ebdfdb3f250453 -SHA1 (patch-ae) = e6c4d10dfdebb9e52636ec93bf78a6c91ae792fc -SHA1 (patch-af) = 629c054da4003a6811838e90ba3e4ea2a697a51c -SHA1 (patch-ag) = e8cb0ee74739d05c2f7b376db1026de3b85cc31a -SHA1 (patch-ba) = 051a6f89ce03fcd6cdd5e6cd87671d171262c94f -SHA1 (patch-bb) = 5c16b81e57acfcc0dabce4ee3f429dd9be322d89 -SHA1 (patch-bc) = a7f399320d3c06fa5c6ee940a8ede4c6422c7937 -SHA1 (patch-bd) = eea7eb3a690212c54667c68b72ecb1df9c667a68 -SHA1 (patch-be) = 3f26eaebfa2b6d62123676e4d3a4f43bff5592c0 -SHA1 (patch-bf) = f1aa671b82e56cb7f5dfdd3cda70dbf3c4725474 -SHA1 (patch-bg) = 840931f1097780cea5e469b35622f2d401a4922e +SHA1 (patch-ab) = 1ddbc0fef0f5ea4798537365bafcce15b5698b27 +SHA1 (patch-ac) = 7068947b76270e858c66d1c46a8ebb8675ecdbbd +SHA1 (patch-ad) = 9606ffc253ea40fa03058cf40c4eab447adafa61 +SHA1 (patch-ae) = f541c3d7f143145798eb2d3eca3d2a1992619a50 +SHA1 (patch-af) = 372b8ca93a93dab938363c6b9408ab82155a172d +SHA1 (patch-ag) = 675c42780888ff471109521de0a358ba40a6b8f3 +SHA1 (patch-ah) = 013acd16171cdfdc4b97529af60978afb9b4d861 +SHA1 (patch-ai) = c95caf348ad41e2fd0954119d23c17e1c73795af +SHA1 (patch-aj) = bac4b0703f86f10a8a39a2de255694517330af22 +SHA1 (patch-ak) = ad1b7cec677dec76f2808b4c4ddc550749cf0882 +SHA1 (patch-al) = 4a45378b53b0e550c87ddc0b244b7a03f518bfb4 diff --git a/net/tightvnc/patches/patch-ab b/net/tightvnc/patches/patch-ab index 9ff2935b483..87c6168ad75 100644 --- a/net/tightvnc/patches/patch-ab +++ b/net/tightvnc/patches/patch-ab @@ -1,12 +1,8 @@ -$NetBSD: patch-ab,v 1.1 2001/09/23 01:34:30 mycroft Exp $ +$NetBSD: patch-ab,v 1.2 2003/11/27 17:27:29 abs Exp $ -Sync this with what we shipped with NetBSD-1.5 with the exception that -HasXdmAuth is set to NO (since vnc doesn't have the Wraphelp.c file). -This fixes problems on pmax, alpha, and maybe others. - ---- Xvnc/config/cf/NetBSD.cf.orig Sat Jul 26 06:30:39 1997 -+++ Xvnc/config/cf/NetBSD.cf Sat Sep 22 17:59:51 2001 -@@ -2,9 +2,37 @@ +--- Xvnc/config/cf/NetBSD.cf.orig 2000-06-11 13:00:51.000000000 +0100 ++++ Xvnc/config/cf/NetBSD.cf +@@ -2,9 +2,37 @@ XCOMM platform: $XConsortium: NetBSD.cf @@ -45,7 +41,7 @@ This fixes problems on pmax, alpha, and maybe others. #ifndef OSName #define OSName DefaultOSName OSBinaryType #endif -@@ -14,24 +42,34 @@ +@@ -14,24 +42,34 @@ XCOMM platform: $XFree86: xc/config/cf/ #ifndef OSMinorVersion #define OSMinorVersion DefaultOSMinorVersion #endif @@ -82,7 +78,7 @@ This fixes problems on pmax, alpha, and maybe others. #define HasNdbm YES #define HasPutenv YES #define HasSnprintf YES -@@ -61,7 +99,20 @@ +@@ -61,7 +99,20 @@ XCOMM operating system: OSName (OSMajor (OSMajorVersion == 1 && OSMinorVersion == 2 && OSTeenyVersion < 2)) # define HasDlsymBug YES #endif @@ -104,7 +100,7 @@ This fixes problems on pmax, alpha, and maybe others. #if (!(OSMajorVersion == 0 || \ (OSMajorVersion == 1 && OSMinorVersion < 2))) #define HasMkstemp YES -@@ -85,6 +136,7 @@ +@@ -85,6 +136,7 @@ XCOMM operating system: OSName (OSMajor #define NeedVarargsPrototypes YES #define NeedWidePrototypes NO @@ -112,7 +108,7 @@ This fixes problems on pmax, alpha, and maybe others. #define MkdirHierCmd mkdir -p #define CppCmd /usr/libexec/cpp -@@ -96,13 +148,15 @@ +@@ -96,13 +148,15 @@ XCOMM operating system: OSName (OSMajor #define CcCmd gcc #if defined(UseInstalled) && (!defined(XF86LinkKit) || !XF86LinkKit) #define DefaultCCOptions /**/ @@ -129,7 +125,7 @@ This fixes problems on pmax, alpha, and maybe others. /* UseElfFormat defaults to YES if __ELF__ set */ #ifndef UseElfFormat # ifdef __ELF__ -@@ -114,60 +168,234 @@ +@@ -114,60 +168,234 @@ XCOMM operating system: OSName (OSMajor #endif /* @@ -386,7 +382,7 @@ This fixes problems on pmax, alpha, and maybe others. #endif #define StandardDefines -DCSRG_BASED -@@ -177,7 +405,18 @@ +@@ -177,7 +405,18 @@ XCOMM operating system: OSName (OSMajor #define ExtraLibraries /**/ #endif #ifndef UseGnuMalloc @@ -405,7 +401,7 @@ This fixes problems on pmax, alpha, and maybe others. #endif #ifndef GnuMallocLibrary #define GnuMallocLibrary -lgnumalloc -@@ -191,6 +430,13 @@ +@@ -191,6 +430,13 @@ XCOMM operating system: OSName (OSMajor #endif #endif @@ -419,7 +415,7 @@ This fixes problems on pmax, alpha, and maybe others. #define AdmDir /var/log /* -@@ -200,8 +446,17 @@ +@@ -200,8 +446,17 @@ XCOMM operating system: OSName (OSMajor #define StripInstalledPrograms YES #define CompressAllFonts YES #define GzipFontCompression YES @@ -439,7 +435,7 @@ This fixes problems on pmax, alpha, and maybe others. #ifdef InstallCmd # undef InstallCmd -@@ -212,11 +467,23 @@ +@@ -212,11 +467,23 @@ XCOMM operating system: OSName (OSMajor # define ExtraFilesToClean *.core #endif @@ -465,7 +461,7 @@ This fixes problems on pmax, alpha, and maybe others. #define EqnCmd eqn -Tps #define TroffCmd groff -Tps -@@ -264,7 +531,10 @@ +@@ -264,7 +531,10 @@ install.man:: -@if [ -f file.0 ]; \ @@\ then \ @@\ $(INSTALL) -c $(INSTMANFLAGS) file.0 $(DESTDIR)destdir/dest.0; \@@\ @@ -477,7 +473,7 @@ This fixes problems on pmax, alpha, and maybe others. #define InstallGenManPageLong(file,destdir,dest,suffix) @@\ InstallManPageLong(file,destdir,dest) -@@ -281,7 +551,16 @@ +@@ -281,7 +551,16 @@ install.man:: @@\ done #define InstallMultipleMan(list,dest) @@\ @@ -495,7 +491,7 @@ This fixes problems on pmax, alpha, and maybe others. #define InstallManPageAliases(file,destdir,aliases) @@\ install.man:: @@\ -@@ -299,13 +578,10 @@ +@@ -299,13 +578,10 @@ install.man:: @@\ /* * Shared libraries supported starting in 1.0 on a.out platforms, * and on all ELF platforms. @@ -511,7 +507,7 @@ This fixes problems on pmax, alpha, and maybe others. # ifndef HasSharedLibraries # define HasSharedLibraries YES # endif -@@ -327,51 +603,179 @@ +@@ -327,51 +603,179 @@ install.man:: @@\ #include #endif /* HasSharedLibraries */ diff --git a/net/tightvnc/patches/patch-ac b/net/tightvnc/patches/patch-ac index 5af28c02d8c..4c86f03fe7f 100644 --- a/net/tightvnc/patches/patch-ac +++ b/net/tightvnc/patches/patch-ac @@ -1,30 +1,27 @@ -$NetBSD: patch-ac,v 1.2 2002/02/19 00:02:29 mycroft Exp $ +$NetBSD: patch-ac,v 1.3 2003/11/27 17:27:29 abs Exp $ ---- Xvnc/config/imake/imakemdep.h.orig Sun Jun 11 12:00:51 2000 -+++ Xvnc/config/imake/imakemdep.h Tue Feb 19 00:00:15 2002 -@@ -253,9 +253,12 @@ - #ifdef _CRAY - #define DEFAULT_CPP "/lib/pcpp" - #endif --#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) -+#if defined(__386BSD__) - #define DEFAULT_CPP "/usr/libexec/cpp" - #endif -+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) -+#define USE_CC_E -+#endif - #if defined(__sgi) && defined(__ANSI_CPP__) - #define USE_CC_E - #endif -@@ -286,6 +289,11 @@ - * Note that you may define more than one symbol (useful for platforms - * that support multiple operating systems). +--- Xvnc/config/cf/vnc.def.orig 2003-07-31 15:19:37.000000000 +0100 ++++ Xvnc/config/cf/vnc.def +@@ -10,8 +10,6 @@ + + #ifdef BeforeVendorCF + +-#include "platform.def" +- + /*****************************************************************************/ + /* + * First try to switch off all the extras that we don't want. This includes +@@ -117,13 +115,7 @@ + * You may need to change this. */ -+ -+#ifdef __NetBSD__ -+#undef unix -+#define unix 42 -+#endif - #define ARGUMENTS 50 /* number of arguments in various arrays */ - char *cpp_argv[ARGUMENTS] = { +-#ifdef SunArchitecture +-#define ProjectRoot /usr/openwin +-#else +-#ifdef LinuxArchitecture + #define ProjectRoot /usr/X11R6 +-#endif +-#endif + + #endif /* BeforeVendorCF */ + diff --git a/net/tightvnc/patches/patch-ad b/net/tightvnc/patches/patch-ad index 9154a9779ab..4b9860b4f4c 100644 --- a/net/tightvnc/patches/patch-ad +++ b/net/tightvnc/patches/patch-ad @@ -1,13 +1,14 @@ -$NetBSD: patch-ad,v 1.2 2002/10/20 14:33:54 lukem Exp $ +$NetBSD: patch-ad,v 1.3 2003/11/27 17:27:29 abs Exp $ ---- Xvnc/programs/Xserver/cfb/stipsparc.s.orig Wed Mar 20 16:16:03 2002 -+++ Xvnc/programs/Xserver/cfb/stipsparc.s -@@ -85,7 +85,7 @@ in this Software without prior written a - #define ForEachBits LY4 - #define NextBits LY5 - --#if defined(SVR4) || ( defined(linux) && defined(__ELF__) ) -+#if defined(SVR4) || defined(__ELF__) - #ifdef TETEXT - #define _cfbStippleStack cfbStippleStackTE +--- Xvnc/config/cf/vnclibs.def.orig 2002-06-28 06:53:19.000000000 +0100 ++++ Xvnc/config/cf/vnclibs.def +@@ -11,7 +11,7 @@ VNCLIBS = $(TOP)/../libvncauth/libvncaut + /* Avoid linking with different libjpeg in /usr/shlib under Tru64. */ + VNCSYSLIBS = /usr/local/lib/libjpeg.a /usr/local/lib/libz.a #else +-VNCSYSLIBS = -L/usr/local/lib -ljpeg -lz ++VNCSYSLIBS = ${BUILDLINK_LDFLAGS} -ljpeg -lz + #endif + +-VNCCPPFLAGS = -I$(TOP)/../include -I/usr/local/include ++VNCCPPFLAGS = -I$(TOP)/../include ${BUILDLINK_CPPFLAGS} diff --git a/net/tightvnc/patches/patch-ae b/net/tightvnc/patches/patch-ae index fece0d20e2f..c78f8802a43 100644 --- a/net/tightvnc/patches/patch-ae +++ b/net/tightvnc/patches/patch-ae @@ -1,13 +1,30 @@ -$NetBSD: patch-ae,v 1.2 2002/10/20 14:33:54 lukem Exp $ +$NetBSD: patch-ae,v 1.3 2003/11/27 17:27:29 abs Exp $ ---- Xvnc/programs/Xserver/cfb/stipsprc32.s.orig Wed Mar 20 16:16:03 2002 -+++ Xvnc/programs/Xserver/cfb/stipsprc32.s -@@ -81,7 +81,7 @@ in this Software without prior written a - #define ForEachBits LY4 - #define NextBits LY5 +--- Xvnc/config/imake/imakemdep.h.orig 2003-02-19 16:39:54.000000000 +0000 ++++ Xvnc/config/imake/imakemdep.h +@@ -253,9 +253,12 @@ in this Software without prior written a + #ifdef _CRAY + #define DEFAULT_CPP "/lib/pcpp" + #endif +-#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) ++#if defined(__386BSD__) + #define DEFAULT_CPP "/usr/libexec/cpp" + #endif ++#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) ++#define USE_CC_E ++#endif + #if defined(__sgi) && defined(__ANSI_CPP__) + #define USE_CC_E + #endif +@@ -290,6 +293,11 @@ in this Software without prior written a + * that support multiple operating systems). + */ --#if defined(SVR4) || ( defined(linux) && defined(__ELF__) ) -+#if defined(SVR4) || defined(__ELF__) - #ifdef TETEXT - #define _cfb32StippleStack cfb32StippleStackTE - #else ++#ifdef __NetBSD__ ++#undef unix ++#define unix 42 ++#endif ++ + #define ARGUMENTS 50 /* number of arguments in various arrays */ + char *cpp_argv[ARGUMENTS] = { + "cc", /* replaced by the actual program to exec */ diff --git a/net/tightvnc/patches/patch-af b/net/tightvnc/patches/patch-af index 2f6dab6f084..0ec0ce73c47 100644 --- a/net/tightvnc/patches/patch-af +++ b/net/tightvnc/patches/patch-af @@ -1,22 +1,13 @@ -$NetBSD: patch-af,v 1.2 2002/10/20 14:33:54 lukem Exp $ +$NetBSD: patch-af,v 1.3 2003/11/27 17:27:29 abs Exp $ ---- Xvnc/programs/Xserver/include/servermd.h.orig Wed Aug 7 21:42:53 2002 -+++ Xvnc/programs/Xserver/include/servermd.h -@@ -132,7 +132,7 @@ SOFTWARE. +--- Xvnc/configure.orig 2003-02-19 16:39:30.000000000 +0000 ++++ Xvnc/configure +@@ -25,7 +25,7 @@ else + else + if [ "$SYSNAME" != Darwin ] + then +- REV=`echo $REV | sed -e 's/^V//' -e 's/-.*$//'` ++ REV=`echo $REV | sed -e 's/^V//' -e 's/[-_].*$//'` + fi + fi - #endif /* vax */ - --#if (defined(Lynx) && defined(__powerpc__)) -+#if ((defined(__NetBSD__) || defined(Lynx)) && defined(__powerpc__)) - - /* For now this is for Xvfb only */ - #define IMAGE_BYTE_ORDER MSBFirst -@@ -341,7 +341,7 @@ SOFTWARE. - #define BITMAP_BIT_ORDER MSBFirst - #endif /* (__s390__ || __s390x__) && linux */ - --#if (defined(i386) && (defined(SVR4) || defined(SYSV) || (defined(sun) && defined(SVR4))) || defined(__bsdi__) || (defined(__NetBSD__) && defined(__i386__)) || (defined(__OpenBSD__) && defined(__i386__)) || defined(__FreeBSD__) || defined(MACH386) || (defined(linux) && !defined(__mc68000__)) || (defined(AMOEBA) && defined(i80386)) || defined(MINIX) || defined(__EMX__) || (defined(Lynx) && defined(__i386__))) -+#if (defined(i386) && (defined(SVR4) || defined(SYSV) || (defined(sun) && defined(SVR4))) || defined(__bsdi__) || (defined(__NetBSD__) && (defined(__i386__) || defined(__arm32__))) || (defined(__OpenBSD__) && defined(__i386__)) || defined(__FreeBSD__) || defined(MACH386) || (defined(linux) && !defined(__mc68000__)) || (defined(AMOEBA) && defined(i80386)) || defined(MINIX) || defined(__EMX__) || (defined(Lynx) && defined(__i386__))) - - #ifndef IMAGE_BYTE_ORDER - #define IMAGE_BYTE_ORDER LSBFirst diff --git a/net/tightvnc/patches/patch-ag b/net/tightvnc/patches/patch-ag index 243d411765d..b63cb44b75b 100644 --- a/net/tightvnc/patches/patch-ag +++ b/net/tightvnc/patches/patch-ag @@ -1,18 +1,13 @@ -$NetBSD: patch-ag,v 1.2 2002/10/20 14:33:54 lukem Exp $ +$NetBSD: patch-ag,v 1.3 2003/11/27 17:27:29 abs Exp $ ---- vncserver.orig Tue Aug 27 22:19:38 2002 -+++ vncserver -@@ -41,10 +41,11 @@ $vncUserDir = "$ENV{HOME}/.vnc"; - $fontPath = "unix/:7100"; +--- Xvnc/programs/Xserver/Imakefile.orig 2000-06-11 13:00:51.000000000 +0100 ++++ Xvnc/programs/Xserver/Imakefile +@@ -1712,7 +1712,7 @@ XVNCOBJS = + XVNC = hw/vnc/libvnc.a $(VNCLIBS) + XVNCLIBS = PreFbLibs $(XVNC) $(CFB) PostFbLibs + XVNCSYSLIBS = $(SYSLIBS) $(VNCSYSLIBS) +-ServerTarget(Xvnc,$(XVNCDIRS),$(XVNCOBJS),$(XVNCLIBS),$(XVNCSYSLIBS)) ++ServerTarget(Xvnc,$(XVNCDIRS),$(XVNCOBJS),,$(XVNCLIBS) $(XVNCSYSLIBS)) + #endif /* XvncServer */ - # Here is another example of setting the font path: --# $fontPath = "/usr/lib/X11/fonts/misc/,/usr/lib/X11/fonts/75dpi/"; -+# $fontPath = "/usr/X11R6/lib/X11/fonts/misc/,/usr/X11R6/lib/X11/fonts/75dpi/"; -+$fontPath = "/usr/X11R6/lib/X11/fonts/misc/,/usr/X11R6/lib/X11/fonts/75dpi/"; - # X colors database path is optional, uncomment and edit to use: --# $colorPath = "/usr/lib/X11/rgb"; -+# $colorPath = "/usr/X11R6/lib/X11/rgb"; - - # You might wish to make your vnc directory under /tmp, to make sure - # passwords are always kept on the local filesystem. To do that, just diff --git a/net/tightvnc/patches/patch-ah b/net/tightvnc/patches/patch-ah new file mode 100644 index 00000000000..273c1eab933 --- /dev/null +++ b/net/tightvnc/patches/patch-ah @@ -0,0 +1,13 @@ +$NetBSD: patch-ah,v 1.1 2003/11/27 17:27:29 abs Exp $ + +--- Xvnc/programs/Xserver/cfb/stipsparc.s.orig 2002-03-20 05:16:03.000000000 +0000 ++++ Xvnc/programs/Xserver/cfb/stipsparc.s +@@ -85,7 +85,7 @@ in this Software without prior written a + #define ForEachBits LY4 + #define NextBits LY5 + +-#if defined(SVR4) || ( defined(linux) && defined(__ELF__) ) ++#if defined(SVR4) || defined(__ELF__) + #ifdef TETEXT + #define _cfbStippleStack cfbStippleStackTE + #else diff --git a/net/tightvnc/patches/patch-ai b/net/tightvnc/patches/patch-ai new file mode 100644 index 00000000000..8c37b4629c4 --- /dev/null +++ b/net/tightvnc/patches/patch-ai @@ -0,0 +1,13 @@ +$NetBSD: patch-ai,v 1.1 2003/11/27 17:27:29 abs Exp $ + +--- Xvnc/programs/Xserver/cfb/stipsprc32.s.orig 2002-03-20 05:16:03.000000000 +0000 ++++ Xvnc/programs/Xserver/cfb/stipsprc32.s +@@ -81,7 +81,7 @@ in this Software without prior written a + #define ForEachBits LY4 + #define NextBits LY5 + +-#if defined(SVR4) || ( defined(linux) && defined(__ELF__) ) ++#if defined(SVR4) || defined(__ELF__) + #ifdef TETEXT + #define _cfb32StippleStack cfb32StippleStackTE + #else diff --git a/net/tightvnc/patches/patch-aj b/net/tightvnc/patches/patch-aj new file mode 100644 index 00000000000..a7cb0c19adb --- /dev/null +++ b/net/tightvnc/patches/patch-aj @@ -0,0 +1,13 @@ +$NetBSD: patch-aj,v 1.1 2003/11/27 17:27:29 abs Exp $ + +--- Xvnc/programs/Xserver/hw/vnc/Imakefile.orig 2002-04-30 14:07:31.000000000 +0100 ++++ Xvnc/programs/Xserver/hw/vnc/Imakefile +@@ -12,7 +12,7 @@ OBJS = init.o sockets.o kbdptr.o cmap.o + #include + INCLUDES = -I. -I$(XBUILDINCDIR) -I$(FONTINCSRC) -I$(XINCLUDESRC) \ + -I../../cfb -I../../mfb -I../../mi -I../../include -I../../os \ +- $(VNCCPPFLAGS) ++ ${BUILDLINK_CPPFLAGS} $(VNCCPPFLAGS) + + DEFINES = ServerOSDefines + diff --git a/net/tightvnc/patches/patch-ak b/net/tightvnc/patches/patch-ak new file mode 100644 index 00000000000..e7c5a6fb44c --- /dev/null +++ b/net/tightvnc/patches/patch-ak @@ -0,0 +1,22 @@ +$NetBSD: patch-ak,v 1.1 2003/11/27 17:27:29 abs Exp $ + +--- Xvnc/programs/Xserver/include/servermd.h.orig 2003-02-19 16:39:54.000000000 +0000 ++++ Xvnc/programs/Xserver/include/servermd.h +@@ -132,7 +132,7 @@ SOFTWARE. + + #endif /* vax */ + +-#if (defined(Lynx) && defined(__powerpc__)) ++#if ((defined(__NetBSD__) || defined(Lynx)) && defined(__powerpc__)) + + /* For now this is for Xvfb only */ + #define IMAGE_BYTE_ORDER MSBFirst +@@ -341,7 +341,7 @@ SOFTWARE. + #define BITMAP_BIT_ORDER MSBFirst + #endif /* (__s390__ || __s390x__) && linux */ + +-#if (defined(i386) && (defined(SVR4) || defined(SYSV) || (defined(sun) && defined(SVR4))) || defined(__bsdi__) || (defined(__NetBSD__) && defined(__i386__)) || (defined(__OpenBSD__) && defined(__i386__)) || defined(__FreeBSD__) || defined(MACH386) || (defined(linux) && !defined(__mc68000__)) || (defined(AMOEBA) && defined(i80386)) || defined(MINIX) || defined(__EMX__) || (defined(Lynx) && defined(__i386__))) ++#if (defined(i386) && (defined(SVR4) || defined(SYSV) || (defined(sun) && defined(SVR4))) || defined(__bsdi__) || (defined(__NetBSD__) && (defined(__i386__) || defined(__arm32__))) || (defined(__OpenBSD__) && defined(__i386__)) || defined(__FreeBSD__) || defined(MACH386) || (defined(linux) && !defined(__mc68000__)) || (defined(AMOEBA) && defined(i80386)) || defined(MINIX) || defined(__EMX__) || (defined(Lynx) && defined(__i386__))) + + #ifndef IMAGE_BYTE_ORDER + #define IMAGE_BYTE_ORDER LSBFirst diff --git a/net/tightvnc/patches/patch-al b/net/tightvnc/patches/patch-al new file mode 100644 index 00000000000..9f7a37b406e --- /dev/null +++ b/net/tightvnc/patches/patch-al @@ -0,0 +1,18 @@ +$NetBSD: patch-al,v 1.1 2003/11/27 17:27:29 abs Exp $ + +--- vncserver.orig 2003-07-31 15:19:37.000000000 +0100 ++++ vncserver +@@ -41,10 +41,11 @@ $vncUserDir = "$ENV{HOME}/.vnc"; + $fontPath = "unix/:7100"; + + # Here is another example of setting the font path: +-# $fontPath = "/usr/lib/X11/fonts/misc/,/usr/lib/X11/fonts/75dpi/"; ++# $fontPath = "/usr/X11R6/lib/X11/fonts/misc/,/usr/X11R6/lib/X11/fonts/75dpi/"; ++$fontPath = "/usr/X11R6/lib/X11/fonts/misc/,/usr/X11R6/lib/X11/fonts/75dpi/"; + + # X colors database path is optional, uncomment and edit to use: +-# $colorPath = "/usr/lib/X11/rgb"; ++# $colorPath = "/usr/X11R6/lib/X11/rgb"; + + # You might wish to make your vnc directory under /tmp, to make sure + # passwords are always kept on the local filesystem. To do that, just diff --git a/net/tightvnc/patches/patch-ba b/net/tightvnc/patches/patch-ba deleted file mode 100644 index 4969ce89e03..00000000000 --- a/net/tightvnc/patches/patch-ba +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ba,v 1.3 2002/10/20 14:33:54 lukem Exp $ - ---- Xvnc/config/cf/vnclibs.def.orig Fri Jun 28 15:53:19 2002 -+++ Xvnc/config/cf/vnclibs.def -@@ -11,7 +11,7 @@ VNCLIBS = $(TOP)/../libvncauth/libvncaut - /* Avoid linking with different libjpeg in /usr/shlib under Tru64. */ - VNCSYSLIBS = /usr/local/lib/libjpeg.a /usr/local/lib/libz.a - #else --VNCSYSLIBS = -L/usr/local/lib -ljpeg -lz -+VNCSYSLIBS = ${BUILDLINK_LDFLAGS} -ljpeg -lz - #endif - --VNCCPPFLAGS = -I$(TOP)/../include -I/usr/local/include -+VNCCPPFLAGS = -I$(TOP)/../include ${BUILDLINK_CPPFLAGS} diff --git a/net/tightvnc/patches/patch-bb b/net/tightvnc/patches/patch-bb deleted file mode 100644 index 62c4c49994f..00000000000 --- a/net/tightvnc/patches/patch-bb +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bb,v 1.1 2001/09/23 01:34:31 mycroft Exp $ - ---- Xvnc/programs/Xserver/Imakefile.orig Sun Sep 23 01:20:33 2001 -+++ Xvnc/programs/Xserver/Imakefile Sun Sep 23 01:22:28 2001 -@@ -1712,7 +1712,7 @@ - XVNC = hw/vnc/libvnc.a $(VNCLIBS) - XVNCLIBS = PreFbLibs $(XVNC) $(CFB) PostFbLibs - XVNCSYSLIBS = $(SYSLIBS) $(VNCSYSLIBS) --ServerTarget(Xvnc,$(XVNCDIRS),$(XVNCOBJS),$(XVNCLIBS),$(XVNCSYSLIBS)) -+ServerTarget(Xvnc,$(XVNCDIRS),$(XVNCOBJS),,$(XVNCLIBS) $(XVNCSYSLIBS)) - #endif /* XvncServer */ - - diff --git a/net/tightvnc/patches/patch-bc b/net/tightvnc/patches/patch-bc deleted file mode 100644 index 730e4003536..00000000000 --- a/net/tightvnc/patches/patch-bc +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bc,v 1.1 2001/09/23 01:34:31 mycroft Exp $ - ---- Xvnc/programs/Xserver/hw/vnc/Imakefile.orig Tue Jan 16 08:16:38 2001 -+++ Xvnc/programs/Xserver/hw/vnc/Imakefile Sun Sep 23 01:23:34 2001 -@@ -12,7 +12,7 @@ - #include - INCLUDES = -I. -I$(XBUILDINCDIR) -I$(FONTINCSRC) -I$(XINCLUDESRC) \ - -I../../cfb -I../../mfb -I../../mi -I../../include -I../../os \ -- $(VNCCPPFLAGS) -+ ${BUILDLINK_CPPFLAGS} $(VNCCPPFLAGS) - - DEFINES = ServerOSDefines - diff --git a/net/tightvnc/patches/patch-bd b/net/tightvnc/patches/patch-bd deleted file mode 100644 index 3be64bbd32e..00000000000 --- a/net/tightvnc/patches/patch-bd +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-bd,v 1.1 2002/10/20 14:33:54 lukem Exp $ - ---- Xvnc/config/cf/vnc.def.orig Tue Aug 27 22:19:38 2002 -+++ Xvnc/config/cf/vnc.def -@@ -10,8 +10,6 @@ - - #ifdef BeforeVendorCF - --#include "platform.def" -- - /*****************************************************************************/ - /* - * First try to switch off all the extras that we don't want. This includes -@@ -117,13 +115,7 @@ - * You may need to change this. - */ - --#ifdef SunArchitecture --#define ProjectRoot /usr/openwin --#else --#ifdef LinuxArchitecture - #define ProjectRoot /usr/X11R6 --#endif --#endif - - #endif /* BeforeVendorCF */ - diff --git a/net/tightvnc/patches/patch-be b/net/tightvnc/patches/patch-be deleted file mode 100644 index c494de2910b..00000000000 --- a/net/tightvnc/patches/patch-be +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-be,v 1.1 2002/10/20 14:33:54 lukem Exp $ - ---- Xvnc/configure.orig Tue Apr 30 23:07:30 2002 -+++ Xvnc/configure -@@ -24,7 +24,7 @@ else - MINOR=`echo $REV | awk -F. 'NF < 2 {print "0"} {print $2}'` - TEENY=0 - else -- REV=`uname -r | sed -e 's/^V//' -e 's/-.*$//'` -+ REV=`uname -r | sed -e 's/^V//' -e 's/[-_].*$//'` - MAJOR=`echo $REV | awk -F. 'NF < 1 {print "0"} {print $1}'` - MINOR=`echo $REV | awk -F. 'NF < 2 {print "0"} {print $2}'` - TEENY=`echo $REV | awk -F. 'NF < 3 {print "0"} {print $3}'` diff --git a/net/tightvnc/patches/patch-bf b/net/tightvnc/patches/patch-bf deleted file mode 100644 index 1dedfa8542a..00000000000 --- a/net/tightvnc/patches/patch-bf +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-bf,v 1.1 2002/10/20 16:32:25 lukem Exp $ - ---- Xvnc/programs/Xserver/hw/vnc/sockets.c.orig Wed Mar 20 04:59:22 2002 -+++ Xvnc/programs/Xserver/hw/vnc/sockets.c -@@ -491,6 +491,7 @@ ListenOnTCPPort(port) - int sock; - int one = 1; - -+ memset(&addr, 0, sizeof(addr)); - addr.sin_family = AF_INET; - addr.sin_port = htons(port); - addr.sin_addr.s_addr = interface.s_addr; -@@ -525,6 +526,7 @@ ConnectToTcpAddr(host, port) - int sock; - struct sockaddr_in addr; - -+ memset(&addr, 0, sizeof(addr)); - addr.sin_family = AF_INET; - addr.sin_port = htons(port); - -@@ -558,6 +560,7 @@ ListenOnUDPPort(port) - int sock; - int one = 1; - -+ memset(&addr, 0, sizeof(addr)); - addr.sin_family = AF_INET; - addr.sin_port = htons(port); - addr.sin_addr.s_addr = interface.s_addr; diff --git a/net/tightvnc/patches/patch-bg b/net/tightvnc/patches/patch-bg deleted file mode 100644 index 7e387b7008d..00000000000 --- a/net/tightvnc/patches/patch-bg +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-bg,v 1.1 2002/10/20 16:32:25 lukem Exp $ - ---- Xvnc/programs/Xserver/hw/vnc/init.c.orig Wed Aug 7 22:25:01 2002 -+++ Xvnc/programs/Xserver/hw/vnc/init.c -@@ -733,6 +733,7 @@ static Bool CheckDisplayNumber(int n) - struct sockaddr_in addr; - - sock = socket(AF_INET, SOCK_STREAM, 0); -+ memset(&addr, 0, sizeof(addr)); - addr.sin_family = AF_INET; - addr.sin_addr.s_addr = htonl(INADDR_ANY); - addr.sin_port = htons(6000+n); -- cgit v1.2.3