[pkgsrc/trunk]: pkgsrc/net/tightvnc Update tightvnc to 1.2.9 to match tightvn...

[abs <abs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/020995f522a0
branches:  trunk
changeset: 463820:020995f522a0
user:      abs <abs%pkgsrc.org@localhost>
date:      Thu Nov 27 17:27:29 2003 +0000

description:
Update tightvnc to 1.2.9 to match tightvncviewer
        Changelog since 1.2.6 seems to mainly list const fixes.

diffstat:

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

diffs (truncated from 769 to 300 lines):

diff -r dd58514dcdf3 -r 020995f522a0 net/tightvnc/Makefile
--- a/net/tightvnc/Makefile     Thu Nov 27 17:02:25 2003 +0000
+++ b/net/tightvnc/Makefile     Thu Nov 27 17:27:29 2003 +0000
@@ -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@localhost
 HOMEPAGE=              http://www.tightvnc.com/
@@ -47,10 +45,6 @@
        ${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 -r dd58514dcdf3 -r 020995f522a0 net/tightvnc/PLIST
--- a/net/tightvnc/PLIST        Thu Nov 27 17:02:25 2003 +0000
+++ b/net/tightvnc/PLIST        Thu Nov 27 17:27:29 2003 +0000
@@ -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/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 -r dd58514dcdf3 -r 020995f522a0 net/tightvnc/distinfo
--- a/net/tightvnc/distinfo     Thu Nov 27 17:02:25 2003 +0000
+++ b/net/tightvnc/distinfo     Thu Nov 27 17:27:29 2003 +0000
@@ -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 -r dd58514dcdf3 -r 020995f522a0 net/tightvnc/patches/patch-ab
--- a/net/tightvnc/patches/patch-ab     Thu Nov 27 17:02:25 2003 +0000
+++ b/net/tightvnc/patches/patch-ab     Thu Nov 27 17:27:29 2003 +0000
@@ -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 @@
  #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 @@
  #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 @@
  #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 @@
  #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 @@
  /* 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 @@
  #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 @@
  #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 @@
  #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 @@
  
  #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 @@
  #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 @@
  
  #define InstallGenManPageLong(file,destdir,dest,suffix)                       @@\
        InstallManPageLong(file,destdir,dest)
-@@ -281,7 +551,16 @@
+@@ -281,7 +551,16 @@ install.man::                                                             @@\