[pkgsrc/trunk]: pkgsrc/net/6tunnel Fix build with gcc3 or on Solaris. From Jo...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/79530472f149
branches:  trunk
changeset: 461845:79530472f149
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Sep 22 16:18:06 2003 +0000

description:
Fix build with gcc3 or on Solaris. From Jonathan Perkin in PR 22891.

diffstat:

 net/6tunnel/Makefile         |  10 ++++++-
 net/6tunnel/distinfo         |   3 +-
 net/6tunnel/patches/patch-aa |  52 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 62 insertions(+), 3 deletions(-)

diffs (91 lines):

diff -r d5c34beb1bf8 -r 79530472f149 net/6tunnel/Makefile
--- a/net/6tunnel/Makefile      Mon Sep 22 14:47:00 2003 +0000
+++ b/net/6tunnel/Makefile      Mon Sep 22 16:18:06 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 22:50:56 grant Exp $
+# $NetBSD: Makefile,v 1.5 2003/09/22 16:18:06 wiz Exp $
 #
 
 DISTNAME=      6tunnel-0.09
@@ -9,8 +9,14 @@
 MAINTAINER=    zuntum%NetBSD.org@localhost
 COMMENT=       v4/v6 protocol translation
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+LDFLAGS+=      -lsocket -lnsl
+.endif
+
 do-build:
-       ${CC} ${CFLAGS} -o ${WRKSRC}/6tunnel ${WRKSRC}/6tunnel.c
+       ${CC} ${CFLAGS} -o ${WRKSRC}/6tunnel ${WRKSRC}/6tunnel.c ${LDFLAGS}
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/6tunnel ${PREFIX}/bin
diff -r d5c34beb1bf8 -r 79530472f149 net/6tunnel/distinfo
--- a/net/6tunnel/distinfo      Mon Sep 22 14:47:00 2003 +0000
+++ b/net/6tunnel/distinfo      Mon Sep 22 16:18:06 2003 +0000
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.3 2001/10/23 20:23:09 zuntum Exp $
+$NetBSD: distinfo,v 1.4 2003/09/22 16:18:07 wiz Exp $
 
 SHA1 (6tunnel-0.09.tar.gz) = 6af871f4f225372c5f41c2bc097fd173e16ae683
 Size (6tunnel-0.09.tar.gz) = 7389 bytes
+SHA1 (patch-aa) = a3c79786326afcdd65c99aa8284ec05e54e0654e
diff -r d5c34beb1bf8 -r 79530472f149 net/6tunnel/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/6tunnel/patches/patch-aa      Mon Sep 22 16:18:06 2003 +0000
@@ -0,0 +1,52 @@
+$NetBSD: patch-aa,v 1.1 2003/09/22 16:18:08 wiz Exp $
+
+--- 6tunnel.c.orig     Mon Sep 22 14:57:59 2003
++++ 6tunnel.c  Mon Sep 22 15:02:38 2003
+@@ -429,27 +429,27 @@
+ 
+ void usage(char *a0)
+ {
+-  fprintf(stderr, "\
+-usage: %s [-146dqvh] [-s sourcehost] [-l localhost] [-i pass]
+-           [-I pass] [-m mapfile] [-L limit] [-A filename]
+-         localport remotehost [remoteport]
+-         
+-  -1  allow only one connection and quit
+-  -4  preffer IPv4 endpoints
+-  -6  bind to IPv6 address
+-  -v  be verbose
+-  -d  don't detach
+-  -f  force tunneling (even if remotehost isn't resolvable)
+-  -s  connect using specified address
+-  -l  bind to specified address
+-  -i  act like irc proxy and ask for password
+-  -I  send specified password to the irc server
+-  -h  print hex dump of packets
+-  -m  map specified IPv4 addresses to different IPv6 addresses (see manpage)
+-  -L  limit simultanous connections
+-  -A  create apache-like log file
++  fprintf(stderr, "\n"
++"usage: %s [-146dqvh] [-s sourcehost] [-l localhost] [-i pass]\n"
++"           [-I pass] [-m mapfile] [-L limit] [-A filename]\n"
++"        localport remotehost [remoteport]\n"
++"\n"
++"  -1  allow only one connection and quit\n"
++"  -4  preffer IPv4 endpoints\n"
++"  -6  bind to IPv6 address\n"
++"  -v  be verbose\n"
++"  -d  don't detach\n"
++"  -f  force tunneling (even if remotehost isn't resolvable)\n"
++"  -s  connect using specified address\n"
++"  -l  bind to specified address\n"
++"  -i  act like irc proxy and ask for password\n"
++"  -I  send specified password to the irc server\n"
++"  -h  print hex dump of packets\n"
++"  -m  map specified IPv4 addresses to different IPv6 addresses (see manpage)\n"
++"  -L  limit simultanous connections\n"
++"  -A  create apache-like log file\n"
++"\n", a0);
+ 
+-", a0);
+ 
+ }
+