Mon Jun 8 15:23:26 2009 UTC ()
Update to tightvnc-1.3.10.
* Unix Server: Applied fixes for 64-bit Linux issues
* Unix Server: Made the vncserver script read configuration from files
* Other minor improvements and bugfixes.

While here, do the DESTDIR thing.


(tnn)
diff -r1.30 -r1.31 pkgsrc/net/tightvnc/Makefile
diff -r1.3 -r1.4 pkgsrc/net/tightvnc/PLIST
diff -r1.14 -r1.15 pkgsrc/net/tightvnc/distinfo
diff -r1.3 -r1.4 pkgsrc/net/tightvnc/patches/patch-ag
diff -r1.3 -r1.4 pkgsrc/net/tightvnc/patches/patch-al
cvs diff -r1.30 -r1.31 pkgsrc/net/tightvnc/Makefile (expand / switch to unified diff)

--- pkgsrc/net/tightvnc/Makefile 2009/04/27 18:35:30 1.30
+++ pkgsrc/net/tightvnc/Makefile 2009/06/08 15:23:26 1.31
@@ -1,77 +1,82 @@ @@ -1,77 +1,82 @@
1# $NetBSD: Makefile,v 1.30 2009/04/27 18:35:30 tron Exp $ 1# $NetBSD: Makefile,v 1.31 2009/06/08 15:23:26 tnn Exp $
2 2
3DISTNAME= tightvnc-1.3.9 3DISTNAME= tightvnc-1.3.10
4PKGREVISION= 3 
5CATEGORIES= net x11 4CATEGORIES= net x11
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vnc-tight/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vnc-tight/}
7DISTFILES= ${DISTNAME}_unixsrc.tar.bz2 6DISTFILES= ${DISTNAME}_unixsrc.tar.bz2
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.tightvnc.com/ 9HOMEPAGE= http://www.tightvnc.com/
11COMMENT= Display X and Win32 desktops on remote X/Win32/Java displays 10COMMENT= Display X and Win32 desktops on remote X/Win32/Java displays
12 11
13CONFLICTS= vnc-[0-9]* vncviewer-[0-9]* 12CONFLICTS= vnc-[0-9]* vncviewer-[0-9]*
 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15WRKSRC= ${WRKDIR}/vnc_unixsrc 15WRKSRC= ${WRKDIR}/vnc_unixsrc
16CRYPTO= yes 16CRYPTO= yes
17USE_IMAKE= yes 17USE_IMAKE= yes
18USE_TOOLS+= perl:run 18USE_TOOLS+= perl:run
19NO_INSTALL_MANPAGES= yes 
20MAKE_JOBS_SAFE= no 19MAKE_JOBS_SAFE= no
21 20
22BUILD_TARGET= World 21BUILD_TARGET= World
23 22
24.include "../../mk/bsd.prefs.mk" 23.include "../../mk/bsd.prefs.mk"
25 24
26# XXX - this should go into Xvnc's NetBSD.cf, but imake doesn't 25# XXX - this should go into Xvnc's NetBSD.cf, but imake doesn't
27# seem to pick it up. Someone with strong X-fu needs to look at it. 26# seem to pick it up. Someone with strong X-fu needs to look at it.
28.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) 27.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64)
29_WRAP_EXTRA_ARGS.CC+= -DDDXTIME -D_XSERVER64 -DGCCUSESGAS 28_WRAP_EXTRA_ARGS.CC+= -DDDXTIME -D_XSERVER64 -DGCCUSESGAS
30.endif 29.endif
31 30
32.if ${X11_TYPE} == "modular" 31.if ${X11_TYPE} == "modular"
33DEPENDS+= rgb>=1.0.1:../../x11/rgb 32DEPENDS+= rgb>=1.0.1:../../x11/rgb
34RGBPATH= ${PREFIX}/share/X11/rgb 33RGBPATH= ${PREFIX}/share/X11/rgb
35.else 34.else
36RGBPATH= ${X11BASE}/lib/X11/rgb 35RGBPATH= ${X11BASE}/lib/X11/rgb
37.endif 36.endif
38FONTPATH= ${X11BASE}/lib/X11/fonts/misc,${X11BASE}/lib/X11/fonts/75dpi 37FONTPATH= ${X11BASE}/lib/X11/fonts/misc,${X11BASE}/lib/X11/fonts/75dpi
39 38
40SUBST_CLASSES+= hpath 39SUBST_CLASSES+= hpath
41SUBST_STAGE.hpath= pre-configure 40SUBST_STAGE.hpath= pre-configure
42SUBST_MESSAGE.hpath= fixing hardcoded paths 41SUBST_MESSAGE.hpath= fixing hardcoded paths
43SUBST_FILES.hpath= vncserver 42SUBST_FILES.hpath= vncserver tightvncserver.conf
44SUBST_SED.hpath+= -e 's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g' 43SUBST_SED.hpath+= -e 's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g'
 44SUBST_SED.hpath+= -e 's|/etc/tightvncserver.conf|${PKG_SYSCONFDIR}/tightvncserver.conf|g'
45 45
46REPLACE_PERL= vncserver 46REPLACE_PERL= vncserver
47 47
48post-extract: 48post-extract:
49 (${ECHO} "#define DefaultRGBDatabase ${RGBPATH}";\ 49 (${ECHO} "#define DefaultRGBDatabase ${RGBPATH}";\
50 ${ECHO} "#define DefaultFontPath ${FONTPATH}")\ 50 ${ECHO} "#define DefaultFontPath ${FONTPATH}")\
51 >> ${WRKSRC}/Xvnc/config/cf/site.def 51 >> ${WRKSRC}/Xvnc/config/cf/site.def
52 52
53# We have to frob a few things, and we want our own permissions, so it's easier 53CONF_FILES+= ${PREFIX}/share/examples/tightvnc/tightvncserver.conf \
54# to do the install ourselves. 54 ${PKG_SYSCONFDIR}/tightvncserver.conf
55post-install: 55
 56INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/examples/tightvnc
 57
 58do-install:
56 ${INSTALL_PROGRAM} ${WRKSRC}/Xvnc/programs/Xserver/Xvnc \ 59 ${INSTALL_PROGRAM} ${WRKSRC}/Xvnc/programs/Xserver/Xvnc \
57 ${PREFIX}/bin/Xvnc 60 ${DESTDIR}${PREFIX}/bin/Xvnc
58 ${INSTALL_MAN} ${WRKSRC}/Xvnc/programs/Xserver/Xvnc.man \ 61 ${INSTALL_MAN} ${WRKSRC}/Xvnc/programs/Xserver/Xvnc.man \
59 ${PREFIX}/${PKGMANDIR}/man1/Xvnc.1 62 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/Xvnc.1
60 ${INSTALL_PROGRAM} ${WRKSRC}/vncconnect/vncconnect \ 63 ${INSTALL_PROGRAM} ${WRKSRC}/vncconnect/vncconnect \
61 ${PREFIX}/bin/vncconnect 64 ${DESTDIR}${PREFIX}/bin/vncconnect
62 ${INSTALL_MAN} ${WRKSRC}/vncconnect/vncconnect.man \ 65 ${INSTALL_MAN} ${WRKSRC}/vncconnect/vncconnect.man \
63 ${PREFIX}/${PKGMANDIR}/man1/vncconnect.1 66 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/vncconnect.1
64 ${INSTALL_PROGRAM} ${WRKSRC}/vncpasswd/vncpasswd \ 67 ${INSTALL_PROGRAM} ${WRKSRC}/vncpasswd/vncpasswd \
65 ${PREFIX}/bin/vncpasswd 68 ${DESTDIR}${PREFIX}/bin/vncpasswd
66 ${INSTALL_MAN} ${WRKSRC}/vncpasswd/vncpasswd.man \ 69 ${INSTALL_MAN} ${WRKSRC}/vncpasswd/vncpasswd.man \
67 ${PREFIX}/${PKGMANDIR}/man1/vncpasswd.1 70 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/vncpasswd.1
68 ${INSTALL_SCRIPT} ${WRKSRC}/vncserver ${PREFIX}/bin/vncserver 71 ${INSTALL_SCRIPT} ${WRKSRC}/vncserver ${DESTDIR}${PREFIX}/bin/vncserver
69 ${INSTALL_MAN} ${WRKSRC}/vncserver.man \ 72 ${INSTALL_MAN} ${WRKSRC}/vncserver.man \
70 ${PREFIX}/${PKGMANDIR}/man1/vncserver.1 73 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/vncserver.1
 74 ${INSTALL_DATA} ${WRKSRC}/tightvncserver.conf \
 75 ${DESTDIR}${PREFIX}/share/examples/tightvnc/tightvncserver.conf
71 76
72.include "../../devel/zlib/buildlink3.mk" 77.include "../../devel/zlib/buildlink3.mk"
73.include "../../graphics/jpeg/buildlink3.mk" 78.include "../../graphics/jpeg/buildlink3.mk"
74.include "../../security/openssl/buildlink3.mk" 79.include "../../security/openssl/buildlink3.mk"
75.include "../../x11/libX11/buildlink3.mk" 80.include "../../x11/libX11/buildlink3.mk"
76.include "../../x11/libXext/buildlink3.mk" 81.include "../../x11/libXext/buildlink3.mk"
77.include "../../mk/bsd.pkg.mk" 82.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/net/tightvnc/PLIST (expand / switch to unified diff)

--- pkgsrc/net/tightvnc/PLIST 2003/11/27 17:27:29 1.3
+++ pkgsrc/net/tightvnc/PLIST 2009/06/08 15:23:26 1.4
@@ -1,9 +1,11 @@ @@ -1,9 +1,11 @@
1@comment $NetBSD: PLIST,v 1.3 2003/11/27 17:27:29 abs Exp $ 1@comment $NetBSD: PLIST,v 1.4 2009/06/08 15:23:26 tnn Exp $
2bin/Xvnc 2bin/Xvnc
3bin/vncconnect 3bin/vncconnect
4bin/vncpasswd 4bin/vncpasswd
5bin/vncserver 5bin/vncserver
6man/man1/Xvnc.1 6man/man1/Xvnc.1
7man/man1/vncconnect.1 7man/man1/vncconnect.1
8man/man1/vncpasswd.1 8man/man1/vncpasswd.1
9man/man1/vncserver.1 9man/man1/vncserver.1
 10share/examples/tightvnc/tightvncserver.conf
 11@dirrm share/examples/tightvnc
cvs diff -r1.14 -r1.15 pkgsrc/net/tightvnc/distinfo (expand / switch to unified diff)

--- pkgsrc/net/tightvnc/distinfo 2007/07/01 00:13:31 1.14
+++ pkgsrc/net/tightvnc/distinfo 2009/06/08 15:23:26 1.15
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: distinfo,v 1.14 2007/07/01 00:13:31 tnn Exp $ 1$NetBSD: distinfo,v 1.15 2009/06/08 15:23:26 tnn Exp $
2 2
3SHA1 (tightvnc-1.3.9_unixsrc.tar.bz2) = a9529a262a060517402fb9845ef63a0d18c3141f 3SHA1 (tightvnc-1.3.10_unixsrc.tar.bz2) = ab4ed3d8e9d5188edf0ff27fce3027495f1a8851
4RMD160 (tightvnc-1.3.9_unixsrc.tar.bz2) = 79d858466b7fab740b4d66d6b0963533f48a5163 4RMD160 (tightvnc-1.3.10_unixsrc.tar.bz2) = 0c24207ec13c1d41f445ccbdea16ce2b5d0729a7
5Size (tightvnc-1.3.9_unixsrc.tar.bz2) = 1792459 bytes 5Size (tightvnc-1.3.10_unixsrc.tar.bz2) = 1780510 bytes
6SHA1 (patch-aa) = 3445af5bc4b85f7a45049378f5806a5c993503f4 6SHA1 (patch-aa) = 3445af5bc4b85f7a45049378f5806a5c993503f4
7SHA1 (patch-ab) = b610979131497edae24119961bb56122e9d5a5c4 7SHA1 (patch-ab) = b610979131497edae24119961bb56122e9d5a5c4
8SHA1 (patch-ac) = 7068947b76270e858c66d1c46a8ebb8675ecdbbd 8SHA1 (patch-ac) = 7068947b76270e858c66d1c46a8ebb8675ecdbbd
9SHA1 (patch-ad) = ea79684c715de8a8364c391b5df38945b0a56ad1 9SHA1 (patch-ad) = ea79684c715de8a8364c391b5df38945b0a56ad1
10SHA1 (patch-ae) = f541c3d7f143145798eb2d3eca3d2a1992619a50 10SHA1 (patch-ae) = f541c3d7f143145798eb2d3eca3d2a1992619a50
11SHA1 (patch-af) = 372b8ca93a93dab938363c6b9408ab82155a172d 11SHA1 (patch-af) = 372b8ca93a93dab938363c6b9408ab82155a172d
12SHA1 (patch-ag) = 675c42780888ff471109521de0a358ba40a6b8f3 12SHA1 (patch-ag) = 1a70437d0ad5ace5565d35010617ed0c319e304e
13SHA1 (patch-ah) = 013acd16171cdfdc4b97529af60978afb9b4d861 13SHA1 (patch-ah) = 013acd16171cdfdc4b97529af60978afb9b4d861
14SHA1 (patch-ai) = c95caf348ad41e2fd0954119d23c17e1c73795af 14SHA1 (patch-ai) = c95caf348ad41e2fd0954119d23c17e1c73795af
15SHA1 (patch-aj) = bac4b0703f86f10a8a39a2de255694517330af22 15SHA1 (patch-aj) = bac4b0703f86f10a8a39a2de255694517330af22
16SHA1 (patch-ak) = f79238fabee0dfcf6c8ffa29c269d0d70d2f362f 16SHA1 (patch-ak) = f79238fabee0dfcf6c8ffa29c269d0d70d2f362f
17SHA1 (patch-al) = 0a77ae744d81661cbb698690d93d395aea39e8ec 17SHA1 (patch-al) = 4a5cbb99b4ddde6ac64050f1efd3005548828442
18SHA1 (patch-am) = 2de40589cc8ff7401086d6400655123f0eaeff3a 18SHA1 (patch-am) = 2de40589cc8ff7401086d6400655123f0eaeff3a
cvs diff -r1.3 -r1.4 pkgsrc/net/tightvnc/patches/patch-ag (expand / switch to unified diff)

--- pkgsrc/net/tightvnc/patches/patch-ag 2003/11/27 17:27:29 1.3
+++ pkgsrc/net/tightvnc/patches/patch-ag 2009/06/08 15:23:26 1.4
@@ -1,13 +1,23 @@ @@ -1,13 +1,23 @@
1$NetBSD: patch-ag,v 1.3 2003/11/27 17:27:29 abs Exp $ 1$NetBSD: patch-ag,v 1.4 2009/06/08 15:23:26 tnn Exp $
2 2
3--- Xvnc/programs/Xserver/Imakefile.orig 2000-06-11 13:00:51.000000000 +0100 3--- Xvnc/programs/Xserver/Imakefile.orig 2000-06-11 14:00:51.000000000 +0200
4+++ Xvnc/programs/Xserver/Imakefile 4+++ Xvnc/programs/Xserver/Imakefile
5@@ -1712,7 +1712,7 @@ XVNCOBJS =  5@@ -11,7 +11,8 @@ XCOMM $XFree86: xc/programs/Xserver/Imak
 6 INSTPGMFLAGS =
 7 #endif
 8
 9-#define PreFbLibs $(DIX) $(OS) $(FONT) $(XPDDX)
 10+/* XXX libos and libdix seem to cross-depend on eachother, what about ordering? */
 11+#define PreFbLibs $(DIX) $(OS) $(DIX) $(FONT) $(XPDDX)
 12 #define BarePostFbLibs $(MFB) $(XPFBLIBS) $(MI)
 13 #define PostFbLibs BarePostFbLibs $(EXTENSIONS)
 14 #define NoMfbBarePostFbLibs $(XPFBLIBS) $(MI)
 15@@ -1712,7 +1713,7 @@ XVNCOBJS =
6 XVNC = hw/vnc/libvnc.a $(VNCLIBS) 16 XVNC = hw/vnc/libvnc.a $(VNCLIBS)
7 XVNCLIBS = PreFbLibs $(XVNC) $(CFB) PostFbLibs 17 XVNCLIBS = PreFbLibs $(XVNC) $(CFB) PostFbLibs
8 XVNCSYSLIBS = $(SYSLIBS) $(VNCSYSLIBS) 18 XVNCSYSLIBS = $(SYSLIBS) $(VNCSYSLIBS)
9-ServerTarget(Xvnc,$(XVNCDIRS),$(XVNCOBJS),$(XVNCLIBS),$(XVNCSYSLIBS)) 19-ServerTarget(Xvnc,$(XVNCDIRS),$(XVNCOBJS),$(XVNCLIBS),$(XVNCSYSLIBS))
10+ServerTarget(Xvnc,$(XVNCDIRS),$(XVNCOBJS),,$(XVNCLIBS) $(XVNCSYSLIBS)) 20+ServerTarget(Xvnc,$(XVNCDIRS),$(XVNCOBJS),,$(XVNCLIBS) $(XVNCSYSLIBS))
11 #endif /* XvncServer */ 21 #endif /* XvncServer */
12  22
13  23
cvs diff -r1.3 -r1.4 pkgsrc/net/tightvnc/patches/patch-al (expand / switch to unified diff)

--- pkgsrc/net/tightvnc/patches/patch-al 2007/07/01 00:13:32 1.3
+++ pkgsrc/net/tightvnc/patches/patch-al 2009/06/08 15:23:26 1.4
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-al,v 1.3 2007/07/01 00:13:32 tnn Exp $ 1$NetBSD: patch-al,v 1.4 2009/06/08 15:23:26 tnn Exp $
2 2
3--- vncserver.orig 2007-06-30 23:05:23.000000000 +0200 3--- vncserver.orig 2009-02-12 05:27:18.000000000 +0100
4+++ vncserver 4+++ vncserver
5@@ -38,7 +38,7 @@ $depth = 24; 5@@ -34,7 +34,7 @@ $depth = 24;
6 $desktopName = "X"; 6 $desktopName = "X";
7 $vncClasses = "/usr/local/vnc/classes"; 7 $vncClasses = "/usr/local/vnc/classes";
8 $vncUserDir = "$ENV{HOME}/.vnc"; 8 $vncUserDir = "$ENV{HOME}/.vnc";
9-$fontPath = "unix/:7100"; 9-$fontPath = "unix/:7100";
10+#$fontPath = "unix/:7100"; 10+#$fontPath = "unix/:7100";
11 $authType = "-rfbauth $vncUserDir/passwd"; 11 $authType = "-rfbauth $vncUserDir/passwd";
12  12
13 # Here is another example of setting the font path: 13 # Read configuration from the system-wide and user files if present.