[pkgsrc/trunk]: pkgsrc/net/udptunnel Not everything has YP. Make it autoconf...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a94059294f26
branches:  trunk
changeset: 502126:a94059294f26
user:      tv <tv%pkgsrc.org@localhost>
date:      Wed Nov 02 15:08:44 2005 +0000

description:
Not everything has YP.  Make it autoconf-conditional.

Install documentation (only available in HTML).  Bump PKGREVISION.

diffstat:

 net/udptunnel/Makefile         |   9 +++++++--
 net/udptunnel/PLIST            |   3 ++-
 net/udptunnel/distinfo         |   5 ++++-
 net/udptunnel/patches/patch-aa |  13 +++++++++++++
 net/udptunnel/patches/patch-ab |  13 +++++++++++++
 net/udptunnel/patches/patch-ac |  39 +++++++++++++++++++++++++++++++++++++++
 6 files changed, 78 insertions(+), 4 deletions(-)

diffs (123 lines):

diff -r dddf613e7fc7 -r a94059294f26 net/udptunnel/Makefile
--- a/net/udptunnel/Makefile    Wed Nov 02 15:07:46 2005 +0000
+++ b/net/udptunnel/Makefile    Wed Nov 02 15:08:44 2005 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 22:51:58 grant Exp $
+# $NetBSD: Makefile,v 1.4 2005/11/02 15:08:44 tv Exp $
 #
 
 DISTNAME=      udptunnel-1.1
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  ftp://ftp.cs.columbia.edu/pub/lennox/udptunnel/
 
@@ -9,6 +10,10 @@
 HOMEPAGE=      http://www.cs.columbia.edu/~lennox/udptunnel/
 COMMENT=       Tunnel UDP packets over a TCP connection
 
-GNU_CONFIGURE= YES
+GNU_CONFIGURE=         YES
+INSTALLATION_DIRS=     bin share/doc/html
+
+post-install:
+       ${INSTALL_DATA} ${WRKSRC}/udptunnel.html ${PREFIX}/share/doc/html/
 
 .include "../../mk/bsd.pkg.mk"
diff -r dddf613e7fc7 -r a94059294f26 net/udptunnel/PLIST
--- a/net/udptunnel/PLIST       Wed Nov 02 15:07:46 2005 +0000
+++ b/net/udptunnel/PLIST       Wed Nov 02 15:08:44 2005 +0000
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/02/16 17:21:57 grant Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/11/02 15:08:44 tv Exp $
 bin/udptunnel
+share/doc/html/udptunnel.html
diff -r dddf613e7fc7 -r a94059294f26 net/udptunnel/distinfo
--- a/net/udptunnel/distinfo    Wed Nov 02 15:07:46 2005 +0000
+++ b/net/udptunnel/distinfo    Wed Nov 02 15:08:44 2005 +0000
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 12:14:06 agc Exp $
+$NetBSD: distinfo,v 1.3 2005/11/02 15:08:44 tv Exp $
 
 SHA1 (udptunnel-1.1.tar.gz) = c768097d9bca23d6be35931b010b75a451f34eb8
 RMD160 (udptunnel-1.1.tar.gz) = af8e1b15447fdae52b6140c549849e56d43106f0
 Size (udptunnel-1.1.tar.gz) = 30910 bytes
+SHA1 (patch-aa) = cf6fe0651c6d1437ec81fbbcb8fbbbf6b05ebc41
+SHA1 (patch-ab) = 5888e42ede82e3e12c31c8ed2a38a3796dc08baa
+SHA1 (patch-ac) = a587390b4c88e5828c0e41d3a0594842407321c3
diff -r dddf613e7fc7 -r a94059294f26 net/udptunnel/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/udptunnel/patches/patch-aa    Wed Nov 02 15:08:44 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2005/11/02 15:08:44 tv Exp $
+
+--- configure.in.orig  2001-09-06 15:07:21.000000000 -0400
++++ configure.in
+@@ -18,7 +18,7 @@ AC_CHECK_LIB(socket, socket)
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC
+-AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h)
++AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h rpcsvc/ypclnt.h)
+ 
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_CHECK_SIZEOF(short)
diff -r dddf613e7fc7 -r a94059294f26 net/udptunnel/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/udptunnel/patches/patch-ab    Wed Nov 02 15:08:44 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2005/11/02 15:08:44 tv Exp $
+
+--- configure.orig     2005-11-02 10:01:10.000000000 -0500
++++ configure
+@@ -1309,7 +1309,7 @@ EOF
+ 
+ fi
+ 
+-for ac_hdr in fcntl.h sys/time.h unistd.h
++for ac_hdr in fcntl.h sys/time.h unistd.h rpcsvc/ypclnt.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
diff -r dddf613e7fc7 -r a94059294f26 net/udptunnel/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/udptunnel/patches/patch-ac    Wed Nov 02 15:08:44 2005 +0000
@@ -0,0 +1,39 @@
+$NetBSD: patch-ac,v 1.1 2005/11/02 15:08:44 tv Exp $
+
+--- host2ip.c.orig     1999-05-19 15:58:25.000000000 -0400
++++ host2ip.c
+@@ -1,10 +1,13 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>      /* struct sockaddr */
+ #include <stdlib.h>
++#include <string.h>
+ #include <netdb.h>           /* gethostbyname() */
+ #include <netinet/in.h>      /* sockaddr_in */
+ #include <arpa/inet.h>       /* inet_addr() */
++#if HAVE_RPCSVC_YPCLNT_H
+ #include <rpcsvc/ypclnt.h>   /* YP */
++#endif
+ #include <ctype.h>           /* isspace() */
+ 
+ #include "host2ip.h"
+@@ -39,6 +42,7 @@ struct in_addr host2ip(char *host)
+   }
+   /* As a last resort, try YP. */
+   else {
++#if HAVE_RPCSVC_YPCLNT_H
+     static char *domain = 0;  /* YP domain */
+     char *value;              /* key value */
+     int value_len;            /* length of returned value */
+@@ -47,9 +51,12 @@ struct in_addr host2ip(char *host)
+     if (yp_match(domain, "hosts.byname", host, strlen(host), &value, &value_len) == 0) {
+       in.s_addr = inet_addr(value);
+     } else {
++#endif
+       /* Everything failed */
+       in.s_addr = INADDR_ANY;
++#if HAVE_RPCSVC_YPCLNT_H
+     }
++#endif
+   }
+   return in;
+ } /* host2ip */