DESTDIR support. Use SPECIAL_PERMS for Xvnc on Solaris. Not

MAKE_JOBS_SAFE. Fix path to fonts and rgb (PR 35441).
Require xauth (PR 41093). Bump revision.

3 files changed, 25 insertions, 16 deletions

diff --git a/net/vnc/Makefile b/net/vnc/Makefile
index 1533e6333fd..982128e957a 100644
--- a/net/vnc/Makefile
+++ b/net/vnc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2008/06/18 11:12:54 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2009/04/04 20:44:58 joerg Exp $
 
 DISTNAME=		vnc-3.3.3r2
 PKGNAME=		vnc-3.3.3.2
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		net x11
 MASTER_SITES=		ftp://ftp.uk.research.att.com/pub/vnc/dist/
 DISTFILES=		vnc-3.3.3r2_unixsrc.tgz \
@@ -16,13 +16,16 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.uk.research.att.com/vnc/
 COMMENT=		Display X and Win32 desktops on remote X/Win32/Java displays
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+MAKE_JOBS_SAFE=		no
+
 DEPENDS+=		vncviewer-[0-9]*:../../net/vncviewer
 
 WRKSRC=			${WRKDIR}/vnc_unixsrc
 CRYPTO=			yes
 NO_INSTALL_MANPAGES=	yes
 USE_IMAKE=		yes
-USE_TOOLS+=		perl:run
+USE_TOOLS+=		perl:run xauth:run
 BUILD_DEFS+=		IPV6_READY
 
 BUILD_TARGET=		World
@@ -34,22 +37,28 @@ MAKE_ENV+= CC=${CC:Q}	#for make imake in Xvnc/config/imake
 
 .include "../../mk/bsd.prefs.mk"
 
-post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/Xvnc/programs/Xserver/Xvnc ${PREFIX}/bin/Xvnc
+SUBST_CLASSES+=		paths
+SUBST_FILES.paths=	vncserver
+SUBST_SED.paths+=	-e 's,@X11BASE@,${X11BASE},g'
+SUBST_STAGE.paths=	pre-configure
+
+INSTALLATION_DIRS=	bin share/doc/vnc
+
 .if ${OPSYS} == "SunOS"
-	${CHOWN} ${ROOT_USER}:${ROOT_GROUP} ${PREFIX}/bin/Xvnc
-	${CHMOD} 2555 ${PREFIX}/bin/Xvnc
+SPECIAL_PERMS+=	bin/Xvnc ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 2555
 .endif
-	${INSTALL_PROGRAM} ${WRKSRC}/vncconnect/vncconnect ${PREFIX}/bin/vncconnect
+
+post-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/Xvnc/programs/Xserver/Xvnc ${DESTDIR}${PREFIX}/bin/Xvnc
+	${INSTALL_PROGRAM} ${WRKSRC}/vncconnect/vncconnect ${DESTDIR}${PREFIX}/bin/vncconnect
 	${SED} -e 's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g' \
 		-e 's|/usr/bin/perl|${PERL5}|g' \
 		< ${WRKSRC}/vncserver \
 		> ${WRKSRC}/vncserver.local
-	${INSTALL_SCRIPT} ${WRKSRC}/vncserver.local ${PREFIX}/bin/vncserver
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vnc
+	${INSTALL_SCRIPT} ${WRKSRC}/vncserver.local ${DESTDIR}${PREFIX}/bin/vncserver
 	cd ${WRKDIR}; \
 	${INSTALL_DATA} *.GIF *.css *.gif *.jpg *.htm *.html *.pdf \
-	  ${PREFIX}/share/doc/vnc
+	  ${DESTDIR}${PREFIX}/share/doc/vnc
 
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/vnc/distinfo b/net/vnc/distinfo
index de6cabf5174..cbdbc9108ae 100644
--- a/net/vnc/distinfo
+++ b/net/vnc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2008/07/10 12:44:59 joerg Exp $
+$NetBSD: distinfo,v 1.11 2009/04/04 20:44:58 joerg Exp $
 
 SHA1 (vnc-3.3.3r2_unixsrc.tgz) = 98e9d2e2c2d0f4f9cb9cafee22d21a868189b176
 RMD160 (vnc-3.3.3r2_unixsrc.tgz) = 3c70c386065d8b0254b1a0627455fb7bc03846ae
@@ -15,7 +15,7 @@ SHA1 (patch-ac) = 78afbdab02d08a292db7790e9d9db2fb719620bc
 SHA1 (patch-ad) = a524db9a403428bd750819d25e6157d4c3cb96f7
 SHA1 (patch-ae) = 399ff1527ff75eee7d181dd4f90f95edab028bd7
 SHA1 (patch-af) = 3cd09807c4226bf51ec15e5844f730a9aebde405
-SHA1 (patch-ag) = 89ce8a6ac8d51ffd4d4be4588e59b7dd53366716
+SHA1 (patch-ag) = 917a14ec15a0903f3d80c9d442b0281d23523fb8
 SHA1 (patch-ah) = 0f9f3f3c9b167a2743e8dab2df430b0526346867
 SHA1 (patch-ai) = 0e8e49a44fbe2cf8f371a1224e0064b7cb28597c
 SHA1 (patch-aj) = 46f177a1dd199e72a0a8f02801941ab99e6f55d1
diff --git a/net/vnc/patches/patch-ag b/net/vnc/patches/patch-ag
index e8ed4dcf96b..fbe6af4f264 100644
--- a/net/vnc/patches/patch-ag
+++ b/net/vnc/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.1 2000/11/13 14:34:41 abs Exp $
+$NetBSD: patch-ag,v 1.2 2009/04/04 20:44:58 joerg Exp $
 
 --- vncserver.orig	Thu Oct 26 16:16:37 2000
 +++ vncserver
@@ -8,8 +8,8 @@ $NetBSD: patch-ag,v 1.1 2000/11/13 14:34:41 abs Exp $
  #
 -# $cmd .= " -fp /usr/lib/X11/fonts/misc/,/usr/lib/X11/fonts/75dpi/";
 -# $cmd .= " -co /usr/lib/X11/rgb";
-+$cmd .= " -fp /usr/X11R6/lib/X11/fonts/misc/,/usr/X11R6/lib/X11/fonts/75dpi/";
-+$cmd .= " -co /usr/X11R6/lib/X11/rgb";
++$cmd .= " -fp @X11BASE@/lib/X11/fonts/misc/,@X11BASE@/lib/X11/fonts/75dpi/";
++$cmd .= " -co @X11BASE@/lib/X11/rgb";
  #
  
  foreach $arg (@ARGV) {