diff options
| author | wiz <wiz@pkgsrc.org> | 2003-09-22 16:18:06 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2003-09-22 16:18:06 +0000 |
| commit | 50d2b98aab4219b9ff02d78605c3a1e5b6b67268 (patch) | |
| tree | d3ef0d52101074c2293450131c58ed0b19a54fbe /net/6tunnel | |
| parent | 7258e92955f690863650b2844ae1dcfa8bad9da6 (diff) | |
| download | pkgsrc-50d2b98aab4219b9ff02d78605c3a1e5b6b67268.tar.gz | |
Fix build with gcc3 or on Solaris. From Jonathan Perkin in PR 22891.
Diffstat (limited to 'net/6tunnel')
| -rw-r--r-- | net/6tunnel/Makefile | 10 | ||||
| -rw-r--r-- | net/6tunnel/distinfo | 3 | ||||
| -rw-r--r-- | net/6tunnel/patches/patch-aa | 52 |
3 files changed, 62 insertions, 3 deletions
diff --git a/net/6tunnel/Makefile b/net/6tunnel/Makefile index c205c0bc73c..f4497d975a6 100644 --- a/net/6tunnel/Makefile +++ b/net/6tunnel/Makefile @@ -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 @@ MASTER_SITES= ftp://amba.bydg.pdi.net/pub/wojtekka/ MAINTAINER= zuntum@NetBSD.org 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 --git a/net/6tunnel/distinfo b/net/6tunnel/distinfo index 5f7fa3c64e1..1aef9d0845e 100644 --- a/net/6tunnel/distinfo +++ b/net/6tunnel/distinfo @@ -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 --git a/net/6tunnel/patches/patch-aa b/net/6tunnel/patches/patch-aa new file mode 100644 index 00000000000..02eb423c1a5 --- /dev/null +++ b/net/6tunnel/patches/patch-aa @@ -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); + + } + |