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.

5 files changed, 47 insertions, 30 deletions

diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile
index c2147302b8d..ff908f96e04 100644
--- a/net/tightvnc/Makefile
+++ b/net/tightvnc/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2009/04/27 18:35:30 tron Exp $
+# $NetBSD: Makefile,v 1.31 2009/06/08 15:23:26 tnn Exp $
 
-DISTNAME=		tightvnc-1.3.9
-PKGREVISION=		3
+DISTNAME=		tightvnc-1.3.10
 CATEGORIES=		net x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=vnc-tight/}
 DISTFILES=		${DISTNAME}_unixsrc.tar.bz2
@@ -11,12 +10,12 @@ HOMEPAGE=		http://www.tightvnc.com/
 COMMENT=		Display X and Win32 desktops on remote X/Win32/Java displays
 
 CONFLICTS=		vnc-[0-9]* vncviewer-[0-9]*
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=			${WRKDIR}/vnc_unixsrc
 CRYPTO=			yes
 USE_IMAKE=		yes
 USE_TOOLS+=		perl:run
-NO_INSTALL_MANPAGES=	yes
 MAKE_JOBS_SAFE=		no
 
 BUILD_TARGET=		World
@@ -40,8 +39,9 @@ FONTPATH=		${X11BASE}/lib/X11/fonts/misc,${X11BASE}/lib/X11/fonts/75dpi
 SUBST_CLASSES+=		hpath
 SUBST_STAGE.hpath=	pre-configure
 SUBST_MESSAGE.hpath=	fixing hardcoded paths
-SUBST_FILES.hpath=	vncserver
+SUBST_FILES.hpath=	vncserver tightvncserver.conf
 SUBST_SED.hpath+=	-e 's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g'
+SUBST_SED.hpath+=	-e 's|/etc/tightvncserver.conf|${PKG_SYSCONFDIR}/tightvncserver.conf|g'
 
 REPLACE_PERL=		vncserver
 
@@ -50,24 +50,29 @@ post-extract:
 	 ${ECHO} "#define DefaultFontPath ${FONTPATH}")\
 	>> ${WRKSRC}/Xvnc/config/cf/site.def
 
-# We have to frob a few things, and we want our own permissions, so it's easier
-# to do the install ourselves.
-post-install:
+CONF_FILES+=		${PREFIX}/share/examples/tightvnc/tightvncserver.conf \
+			    ${PKG_SYSCONFDIR}/tightvncserver.conf
+
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/examples/tightvnc
+
+do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/Xvnc/programs/Xserver/Xvnc \
-	    ${PREFIX}/bin/Xvnc
+	    ${DESTDIR}${PREFIX}/bin/Xvnc
 	${INSTALL_MAN} ${WRKSRC}/Xvnc/programs/Xserver/Xvnc.man \
-	    ${PREFIX}/${PKGMANDIR}/man1/Xvnc.1
+	    ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/Xvnc.1
 	${INSTALL_PROGRAM} ${WRKSRC}/vncconnect/vncconnect \
-	    ${PREFIX}/bin/vncconnect
+	    ${DESTDIR}${PREFIX}/bin/vncconnect
 	${INSTALL_MAN} ${WRKSRC}/vncconnect/vncconnect.man \
-	    ${PREFIX}/${PKGMANDIR}/man1/vncconnect.1
+	    ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/vncconnect.1
 	${INSTALL_PROGRAM} ${WRKSRC}/vncpasswd/vncpasswd \
-	    ${PREFIX}/bin/vncpasswd
+	    ${DESTDIR}${PREFIX}/bin/vncpasswd
 	${INSTALL_MAN} ${WRKSRC}/vncpasswd/vncpasswd.man \
-	    ${PREFIX}/${PKGMANDIR}/man1/vncpasswd.1
-	${INSTALL_SCRIPT} ${WRKSRC}/vncserver ${PREFIX}/bin/vncserver
+	    ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/vncpasswd.1
+	${INSTALL_SCRIPT} ${WRKSRC}/vncserver ${DESTDIR}${PREFIX}/bin/vncserver
 	${INSTALL_MAN} ${WRKSRC}/vncserver.man \
-	    ${PREFIX}/${PKGMANDIR}/man1/vncserver.1
+	    ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/vncserver.1
+	${INSTALL_DATA} ${WRKSRC}/tightvncserver.conf \
+	    ${DESTDIR}${PREFIX}/share/examples/tightvnc/tightvncserver.conf
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
diff --git a/net/tightvnc/PLIST b/net/tightvnc/PLIST
index 013febe57ff..590c40906f6 100644
--- a/net/tightvnc/PLIST
+++ b/net/tightvnc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/11/27 17:27:29 abs Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/06/08 15:23:26 tnn Exp $
 bin/Xvnc
 bin/vncconnect
 bin/vncpasswd
@@ -7,3 +7,5 @@ man/man1/Xvnc.1
 man/man1/vncconnect.1
 man/man1/vncpasswd.1
 man/man1/vncserver.1
+share/examples/tightvnc/tightvncserver.conf
+@dirrm share/examples/tightvnc
diff --git a/net/tightvnc/distinfo b/net/tightvnc/distinfo
index fc5ebb40079..63240e8e029 100644
--- a/net/tightvnc/distinfo
+++ b/net/tightvnc/distinfo
@@ -1,18 +1,18 @@
-$NetBSD: distinfo,v 1.14 2007/07/01 00:13:31 tnn Exp $
+$NetBSD: distinfo,v 1.15 2009/06/08 15:23:26 tnn Exp $
 
-SHA1 (tightvnc-1.3.9_unixsrc.tar.bz2) = a9529a262a060517402fb9845ef63a0d18c3141f
-RMD160 (tightvnc-1.3.9_unixsrc.tar.bz2) = 79d858466b7fab740b4d66d6b0963533f48a5163
-Size (tightvnc-1.3.9_unixsrc.tar.bz2) = 1792459 bytes
+SHA1 (tightvnc-1.3.10_unixsrc.tar.bz2) = ab4ed3d8e9d5188edf0ff27fce3027495f1a8851
+RMD160 (tightvnc-1.3.10_unixsrc.tar.bz2) = 0c24207ec13c1d41f445ccbdea16ce2b5d0729a7
+Size (tightvnc-1.3.10_unixsrc.tar.bz2) = 1780510 bytes
 SHA1 (patch-aa) = 3445af5bc4b85f7a45049378f5806a5c993503f4
 SHA1 (patch-ab) = b610979131497edae24119961bb56122e9d5a5c4
 SHA1 (patch-ac) = 7068947b76270e858c66d1c46a8ebb8675ecdbbd
 SHA1 (patch-ad) = ea79684c715de8a8364c391b5df38945b0a56ad1
 SHA1 (patch-ae) = f541c3d7f143145798eb2d3eca3d2a1992619a50
 SHA1 (patch-af) = 372b8ca93a93dab938363c6b9408ab82155a172d
-SHA1 (patch-ag) = 675c42780888ff471109521de0a358ba40a6b8f3
+SHA1 (patch-ag) = 1a70437d0ad5ace5565d35010617ed0c319e304e
 SHA1 (patch-ah) = 013acd16171cdfdc4b97529af60978afb9b4d861
 SHA1 (patch-ai) = c95caf348ad41e2fd0954119d23c17e1c73795af
 SHA1 (patch-aj) = bac4b0703f86f10a8a39a2de255694517330af22
 SHA1 (patch-ak) = f79238fabee0dfcf6c8ffa29c269d0d70d2f362f
-SHA1 (patch-al) = 0a77ae744d81661cbb698690d93d395aea39e8ec
+SHA1 (patch-al) = 4a5cbb99b4ddde6ac64050f1efd3005548828442
 SHA1 (patch-am) = 2de40589cc8ff7401086d6400655123f0eaeff3a
diff --git a/net/tightvnc/patches/patch-ag b/net/tightvnc/patches/patch-ag
index b63cb44b75b..0bc9194e5c0 100644
--- a/net/tightvnc/patches/patch-ag
+++ b/net/tightvnc/patches/patch-ag
@@ -1,8 +1,18 @@
-$NetBSD: patch-ag,v 1.3 2003/11/27 17:27:29 abs Exp $
+$NetBSD: patch-ag,v 1.4 2009/06/08 15:23:26 tnn Exp $
 
---- Xvnc/programs/Xserver/Imakefile.orig	2000-06-11 13:00:51.000000000 +0100
+--- Xvnc/programs/Xserver/Imakefile.orig	2000-06-11 14:00:51.000000000 +0200
 +++ Xvnc/programs/Xserver/Imakefile
-@@ -1712,7 +1712,7 @@ XVNCOBJS = 
+@@ -11,7 +11,8 @@ XCOMM $XFree86: xc/programs/Xserver/Imak
+ INSTPGMFLAGS = 
+ #endif
+ 
+-#define PreFbLibs $(DIX) $(OS) $(FONT) $(XPDDX)
++/* XXX libos and libdix seem to cross-depend on eachother, what about ordering? */
++#define PreFbLibs $(DIX) $(OS) $(DIX) $(FONT) $(XPDDX)
+ #define BarePostFbLibs $(MFB) $(XPFBLIBS) $(MI)
+ #define PostFbLibs BarePostFbLibs $(EXTENSIONS)
+ #define NoMfbBarePostFbLibs $(XPFBLIBS) $(MI)
+@@ -1712,7 +1713,7 @@ XVNCOBJS = 
  XVNC = hw/vnc/libvnc.a $(VNCLIBS)
  XVNCLIBS = PreFbLibs $(XVNC) $(CFB) PostFbLibs
  XVNCSYSLIBS = $(SYSLIBS) $(VNCSYSLIBS)
diff --git a/net/tightvnc/patches/patch-al b/net/tightvnc/patches/patch-al
index 0e24fc2e0d8..f071f6976da 100644
--- a/net/tightvnc/patches/patch-al
+++ b/net/tightvnc/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.3 2007/07/01 00:13:32 tnn Exp $
+$NetBSD: patch-al,v 1.4 2009/06/08 15:23:26 tnn Exp $
 
---- vncserver.orig	2007-06-30 23:05:23.000000000 +0200
+--- vncserver.orig	2009-02-12 05:27:18.000000000 +0100
 +++ vncserver
-@@ -38,7 +38,7 @@ $depth = 24;
+@@ -34,7 +34,7 @@ $depth = 24;
  $desktopName = "X";
  $vncClasses = "/usr/local/vnc/classes";
  $vncUserDir = "$ENV{HOME}/.vnc";
@@ -10,4 +10,4 @@ $NetBSD: patch-al,v 1.3 2007/07/01 00:13:32 tnn Exp $
 +#$fontPath = "unix/:7100";
  $authType = "-rfbauth $vncUserDir/passwd";
  
- # Here is another example of setting the font path:
+ # Read configuration from the system-wide and user files if present.