[pkgsrc/trunk]: pkgsrc/net/vnc Add inet6 option (on by default)

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f192b1e134d1
branches:  trunk
changeset: 610851:f192b1e134d1
user:      sborrill <sborrill%pkgsrc.org@localhost>
date:      Thu Nov 08 10:58:07 2012 +0000

description:
Add inet6 option (on by default)

diffstat:

 net/vnc/Makefile              |  23 ++++++++++++++++++-----
 net/vnc/distinfo              |   3 +--
 net/vnc/files/patch-sockets.c |  16 ++++++++++++++++
 net/vnc/patches/patch-ai      |  16 ----------------
 4 files changed, 35 insertions(+), 23 deletions(-)

diffs (101 lines):

diff -r 552d4e7afa73 -r f192b1e134d1 net/vnc/Makefile
--- a/net/vnc/Makefile  Thu Nov 08 10:43:50 2012 +0000
+++ b/net/vnc/Makefile  Thu Nov 08 10:58:07 2012 +0000
@@ -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 @@
 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@localhost
 HOMEPAGE=              http://www.uk.research.att.com/vnc/
 COMMENT=               Display X and Win32 desktops on remote X/Win32/Java displays
@@ -31,6 +27,23 @@
 
 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 -r 552d4e7afa73 -r f192b1e134d1 net/vnc/distinfo
--- a/net/vnc/distinfo  Thu Nov 08 10:43:50 2012 +0000
+++ b/net/vnc/distinfo  Thu Nov 08 10:58:07 2012 +0000
@@ -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-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 -r 552d4e7afa73 -r f192b1e134d1 net/vnc/files/patch-sockets.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/vnc/files/patch-sockets.c     Thu Nov 08 10:58:07 2012 +0000
@@ -0,0 +1,16 @@
+$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
+@@ -512,9 +512,9 @@
+ #else
+     addr.su_len = sizeof(struct sockaddr_in);
+     if (rfbLocalhostOnly)
+-        addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
++        addr.su_sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+     else
+-        addr.sin_addr.s_addr = htonl(INADDR_ANY);
++        addr.su_sin.sin_addr.s_addr = htonl(INADDR_ANY);
+ #endif
+ 
+     if ((sock = socket(addr.su_family, SOCK_STREAM, 0)) < 0) {
diff -r 552d4e7afa73 -r f192b1e134d1 net/vnc/patches/patch-ai
--- a/net/vnc/patches/patch-ai  Thu Nov 08 10:43:50 2012 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2002/10/23 18:16:59 bouyer 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
-@@ -512,9 +512,9 @@
- #else
-     addr.su_len = sizeof(struct sockaddr_in);
-     if (rfbLocalhostOnly)
--        addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-+        addr.su_sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-     else
--        addr.sin_addr.s_addr = htonl(INADDR_ANY);
-+        addr.su_sin.sin_addr.s_addr = htonl(INADDR_ANY);
- #endif
- 
-     if ((sock = socket(addr.su_family, SOCK_STREAM, 0)) < 0) {