summaryrefslogtreecommitdiff
path: root/net/vnc
diff options
context:
space:
mode:
authorsborrill <sborrill@pkgsrc.org>2012-11-08 10:58:07 +0000
committersborrill <sborrill@pkgsrc.org>2012-11-08 10:58:07 +0000
commitd6bd9bc3ed6d2bb915110ab2df2d149eac03e625 (patch)
tree539fe98c948fc05f4ee46d0eb1597c5de6baa14e /net/vnc
parentf99dbd5eb5b7e5fc8896e2f83d15c4bd81c89764 (diff)
downloadpkgsrc-d6bd9bc3ed6d2bb915110ab2df2d149eac03e625.tar.gz
Add inet6 option (on by default)
Diffstat (limited to 'net/vnc')
-rw-r--r--net/vnc/Makefile23
-rw-r--r--net/vnc/distinfo3
-rw-r--r--net/vnc/files/patch-sockets.c (renamed from net/vnc/patches/patch-ai)2
3 files changed, 20 insertions, 8 deletions
diff --git a/net/vnc/Makefile b/net/vnc/Makefile
index 23ec1db0803..d861e81cb4d 100644
--- a/net/vnc/Makefile
+++ b/net/vnc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2012/10/23 17:19:17 asau Exp $
+# $NetBSD: Makefile,v 1.48 2012/11/08 10:58:07 sborrill Exp $
DISTNAME= vnc-3.3.3r2
PKGNAME= vnc-3.3.3.2
@@ -8,10 +8,6 @@ MASTER_SITES= ftp://ftp.uk.research.att.com/pub/vnc/dist/
DISTFILES= vnc-3.3.3r2_unixsrc.tgz \
vnc-3.3.2r2_doc.tgz
-PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/
-PATCHFILES= vnc-3.3.3r2-v6-20010421.diff.gz
-PATCH_DIST_STRIP= -p1
-
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
@@ -31,6 +27,23 @@ BUILD_TARGET= World
MAKE_ENV+= CC=${CC:Q} #for make imake in Xvnc/config/imake
+PKG_OPTIONS_VAR= PKG_OPTIONS.vnc
+PKG_SUPPORTED_OPTIONS= inet6
+PKG_SUGGESTED_OPTIONS= inet6
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minet6)
+PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/
+PATCHFILES= vnc-3.3.3r2-v6-20010421.diff.gz
+PATCH_DIST_STRIP= -p1
+USE_TOOLS+= patch
+post-patch: patch-sockets
+.PHONY: patch-sockets
+patch-sockets:
+ cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-sockets.c
+.endif
+
# We have to frob a few things, and we want our own permissions, so it's easier
# to do the install ourselves.
diff --git a/net/vnc/distinfo b/net/vnc/distinfo
index 6416ce751f7..fa85cea7e8d 100644
--- a/net/vnc/distinfo
+++ b/net/vnc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2009/08/09 00:53:09 smb Exp $
+$NetBSD: distinfo,v 1.13 2012/11/08 10:58:07 sborrill Exp $
SHA1 (vnc-3.3.3r2_unixsrc.tgz) = 98e9d2e2c2d0f4f9cb9cafee22d21a868189b176
RMD160 (vnc-3.3.3r2_unixsrc.tgz) = 3c70c386065d8b0254b1a0627455fb7bc03846ae
@@ -17,7 +17,6 @@ SHA1 (patch-ae) = 399ff1527ff75eee7d181dd4f90f95edab028bd7
SHA1 (patch-af) = 3cd09807c4226bf51ec15e5844f730a9aebde405
SHA1 (patch-ag) = 917a14ec15a0903f3d80c9d442b0281d23523fb8
SHA1 (patch-ah) = 0f9f3f3c9b167a2743e8dab2df430b0526346867
-SHA1 (patch-ai) = 0e8e49a44fbe2cf8f371a1224e0064b7cb28597c
SHA1 (patch-aj) = 46f177a1dd199e72a0a8f02801941ab99e6f55d1
SHA1 (patch-ba) = d179bade6870ff5abbe2322d918e9384fed519d3
SHA1 (patch-bb) = 5601ee04f2287b67dbf94d27ec8706f484ea6ca9
diff --git a/net/vnc/patches/patch-ai b/net/vnc/files/patch-sockets.c
index db9904f8aaa..8ef8cc209c0 100644
--- a/net/vnc/patches/patch-ai
+++ b/net/vnc/files/patch-sockets.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.1 2002/10/23 18:16:59 bouyer Exp $
+$NetBSD: patch-sockets.c,v 1.1 2012/11/08 10:58:08 sborrill Exp $
--- Xvnc/programs/Xserver/hw/vnc/sockets.c.orig Wed Oct 23 19:16:52 2002
+++ Xvnc/programs/Xserver/hw/vnc/sockets.c Wed Oct 23 19:18:31 2002