* remove patch-aa, one patch for multple files, not registerd in distinfo.

  split to multiple patches with new style patch file name, and regist.
* set LICENSE=modified-bsd.
* dependency on devel/check is just a build-depend, for test only.

7 files changed, 101 insertions, 79 deletions

diff --git a/net/libdnet/Makefile b/net/libdnet/Makefile
index 5fc54d4bb42..cfc5f952f04 100644
--- a/net/libdnet/Makefile
+++ b/net/libdnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2011/02/06 14:22:29 mlelstv Exp $
+# $NetBSD: Makefile,v 1.18 2011/02/07 05:45:17 obache Exp $
 #
 
 DISTNAME=	libdnet-1.12
@@ -10,6 +10,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://code.google.com/p/libdnet/
 COMMENT=	C interface to several low-level networking routines
+LICENSE=	modified-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -27,6 +28,7 @@ PKG_SUPPORTED_OPTIONS=	libdnetcheck
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mlibdnetcheck)
+BUILDLINK_DEPMETHOD.check=	build
 .include "../../devel/check/buildlink3.mk"
 TEST_TARGET=	check
 .else
diff --git a/net/libdnet/distinfo b/net/libdnet/distinfo
index e0e2618e6b6..5e6d4044505 100644
--- a/net/libdnet/distinfo
+++ b/net/libdnet/distinfo
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.7 2007/03/02 10:52:23 drochner Exp $
+$NetBSD: distinfo,v 1.8 2011/02/07 05:45:17 obache Exp $
 
 SHA1 (libdnet-1.12.tgz) = 71302be302e84fc19b559e811951b5d600d976f8
 RMD160 (libdnet-1.12.tgz) = 4b849f07c3513522fda65af067928b7e6d504aab
 Size (libdnet-1.12.tgz) = 970125 bytes
+SHA1 (patch-aclocal.m4) = b3d2989ecaccdd73d9d753e8ba8bdb2e6c023af6
+SHA1 (patch-configure.in) = 9da072731a91a586818ab19a5bfbf6f728c436b9
+SHA1 (patch-include_config.h.in) = fb1e5aa999d3fadbbc175cb24ffdb9050d0523fa
+SHA1 (patch-src_intf.c) = 642f535103706581439658a89f824048aff5b88b
diff --git a/net/libdnet/patches/patch-aa b/net/libdnet/patches/patch-aa
deleted file mode 100644
index 583c2aa2a43..00000000000
--- a/net/libdnet/patches/patch-aa
+++ /dev/null
@@ -1,77 +0,0 @@
---- configure.in.orig	2011-02-06 14:20:17.000000000 +0100
-+++ configure.in	2011-02-06 14:20:51.000000000 +0100
-@@ -186,6 +186,9 @@
- if test "$ac_cv_header_sys_socket_h" = yes ; then
- 	AC_DNET_SOCKADDR_SA_LEN
- fi
-+if test "$ac_cv_header_net_if_h" = yes ; then
-+	AC_DNET_IFREQ_IFR_SPACE
-+fi
- if test "$ac_cv_header_net_if_arp_h" = yes ; then
- 	AC_DNET_ARPREQ_ARP_DEV
- fi
---- aclocal.m4.orig	2011-02-06 14:02:01.000000000 +0100
-+++ aclocal.m4	2011-02-06 14:08:47.000000000 +0100
-@@ -6776,6 +6776,30 @@
-     fi])
- 
- dnl
-+dnl Check for NetBSD ifreq structure
-+dnl
-+dnl usage:	AC_DNET_IFREQ_IFR_SPACE
-+dnl results:	HAVE_IFREQ_IFR_SPACE (defined)
-+dnl
-+AC_DEFUN(AC_DNET_IFREQ_IFR_SPACE,
-+    [AC_MSG_CHECKING(for ifr_space in ifreq struct)
-+    AC_CACHE_VAL(ac_cv_dnet_ifreq_has_ifr_space,
-+        AC_TRY_COMPILE([
-+# ifndef _IFREQ_IFR_SPACE
-+#	define _IFREQ_IFR_SPACE 1 
-+# endif
-+#       include <sys/types.h>
-+#       include <net/if.h>],
-+        [u_int i = sizeof(((struct ifreq *)0)->ifr_space)],
-+        ac_cv_dnet_ifreq_has_ifr_space=yes,
-+        ac_cv_dnet_ifreq_has_ifr_space=no))
-+    AC_MSG_RESULT($ac_cv_dnet_ifreq_has_ifr_space)
-+    if test $ac_cv_dnet_ifreq_has_ifr_space = yes ; then
-+            AC_DEFINE(HAVE_IFREQ_IFR_SPACE, 1,
-+                      [Define if ifreq struct has ifr_space.])
-+    fi])
-+
-+dnl
- dnl Check for sockaddr_in6 struct in <netinet/in.h>
- dnl
- dnl usage:	AC_DNET_SOCKADDR_IN6
---- include/config.h.in.orig	2011-02-06 14:54:20.000000000 +0100
-+++ include/config.h.in	2011-02-06 14:55:18.000000000 +0100
-@@ -142,6 +142,9 @@
- /* Define if sockaddr struct has sa_len. */
- #undef HAVE_SOCKADDR_SA_LEN
- 
-+/* Define if ifreq struct has ifr_space. */
-+#undef HAVE_IFREQ_IFR_SPACE
-+
- /* Define to 1 if you have the <stdint.h> header file. */
- #undef HAVE_STDINT_H
-
---- src/intf.c.orig	2011-02-06 14:08:54.000000000 +0100
-+++ src/intf.c	2011-02-06 14:09:57.000000000 +0100
-@@ -55,6 +55,9 @@
- # define ifr_mtu	ifr_metric
- #endif
- 
-+#ifdef HAVE_IFREQ_IFR_SPACE
-+# define NEXTIFR(i)	(i + 1)
-+#else
- #ifdef HAVE_SOCKADDR_SA_LEN
- # define NEXTIFR(i)	((struct ifreq *)((u_char *)&i->ifr_addr + \
- 				(i->ifr_addr.sa_len ? i->ifr_addr.sa_len : \
-@@ -62,6 +65,7 @@
- #else
- # define NEXTIFR(i)	(i + 1)
- #endif
-+#endif
- 
- /* XXX - superset of ifreq, for portable SIOC{A,D}IFADDR */
- struct dnet_ifaliasreq {
diff --git a/net/libdnet/patches/patch-aclocal.m4 b/net/libdnet/patches/patch-aclocal.m4
new file mode 100644
index 00000000000..d3ee36e1d1a
--- /dev/null
+++ b/net/libdnet/patches/patch-aclocal.m4
@@ -0,0 +1,37 @@
+$NetBSD: patch-aclocal.m4,v 1.1 2011/02/07 05:45:17 obache Exp $
+
+* Add support for SIOCGIFCONF interface
+
+--- aclocal.m4.orig	2007-01-12 22:01:42.000000000 +0000
++++ aclocal.m4
+@@ -6776,6 +6776,30 @@ AC_DEFUN(AC_DNET_SOCKADDR_SA_LEN,
+     fi])
+ 
+ dnl
++dnl Check for NetBSD ifreq structure
++dnl
++dnl usage:	AC_DNET_IFREQ_IFR_SPACE
++dnl results:	HAVE_IFREQ_IFR_SPACE (defined)
++dnl
++AC_DEFUN(AC_DNET_IFREQ_IFR_SPACE,
++    [AC_MSG_CHECKING(for ifr_space in ifreq struct)
++    AC_CACHE_VAL(ac_cv_dnet_ifreq_has_ifr_space,
++        AC_TRY_COMPILE([
++# ifndef _IFREQ_IFR_SPACE
++#	define _IFREQ_IFR_SPACE 1 
++# endif
++#       include <sys/types.h>
++#       include <net/if.h>],
++        [u_int i = sizeof(((struct ifreq *)0)->ifr_space)],
++        ac_cv_dnet_ifreq_has_ifr_space=yes,
++        ac_cv_dnet_ifreq_has_ifr_space=no))
++    AC_MSG_RESULT($ac_cv_dnet_ifreq_has_ifr_space)
++    if test $ac_cv_dnet_ifreq_has_ifr_space = yes ; then
++            AC_DEFINE(HAVE_IFREQ_IFR_SPACE, 1,
++                      [Define if ifreq struct has ifr_space.])
++    fi])
++
++dnl
+ dnl Check for sockaddr_in6 struct in <netinet/in.h>
+ dnl
+ dnl usage:	AC_DNET_SOCKADDR_IN6
diff --git a/net/libdnet/patches/patch-configure.in b/net/libdnet/patches/patch-configure.in
new file mode 100644
index 00000000000..c511f89fb7f
--- /dev/null
+++ b/net/libdnet/patches/patch-configure.in
@@ -0,0 +1,16 @@
+$NetBSD: patch-configure.in,v 1.1 2011/02/07 05:45:17 obache Exp $
+
+* Add support for SIOCGIFCONF interface
+
+--- configure.in.orig	2007-01-20 11:39:21.000000000 +0000
++++ configure.in
+@@ -186,6 +186,9 @@ AC_DNET_SOCKADDR_IN6
+ if test "$ac_cv_header_sys_socket_h" = yes ; then
+ 	AC_DNET_SOCKADDR_SA_LEN
+ fi
++if test "$ac_cv_header_net_if_h" = yes ; then
++	AC_DNET_IFREQ_IFR_SPACE
++fi
+ if test "$ac_cv_header_net_if_arp_h" = yes ; then
+ 	AC_DNET_ARPREQ_ARP_DEV
+ fi
diff --git a/net/libdnet/patches/patch-include_config.h.in b/net/libdnet/patches/patch-include_config.h.in
new file mode 100644
index 00000000000..71005ba015b
--- /dev/null
+++ b/net/libdnet/patches/patch-include_config.h.in
@@ -0,0 +1,16 @@
+$NetBSD: patch-include_config.h.in,v 1.1 2011/02/07 05:45:18 obache Exp $
+
+* Add support for SIOCGIFCONF interface
+
+--- include/config.h.in.orig	2006-01-19 06:14:02.000000000 +0000
++++ include/config.h.in
+@@ -142,6 +142,9 @@
+ /* Define if sockaddr struct has sa_len. */
+ #undef HAVE_SOCKADDR_SA_LEN
+ 
++/* Define if ifreq struct has ifr_space. */
++#undef HAVE_IFREQ_IFR_SPACE
++
+ /* Define to 1 if you have the <stdint.h> header file. */
+ #undef HAVE_STDINT_H
+ 
diff --git a/net/libdnet/patches/patch-src_intf.c b/net/libdnet/patches/patch-src_intf.c
new file mode 100644
index 00000000000..4b27adf8a60
--- /dev/null
+++ b/net/libdnet/patches/patch-src_intf.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_intf.c,v 1.1 2011/02/07 05:45:18 obache Exp $
+
+* Add support for SIOCGIFCONF interface
+
+--- src/intf.c.orig	2006-01-09 07:09:49.000000000 +0000
++++ src/intf.c
+@@ -55,6 +55,9 @@
+ # define ifr_mtu	ifr_metric
+ #endif
+ 
++#ifdef HAVE_IFREQ_IFR_SPACE
++# define NEXTIFR(i)	(i + 1)
++#else
+ #ifdef HAVE_SOCKADDR_SA_LEN
+ # define NEXTIFR(i)	((struct ifreq *)((u_char *)&i->ifr_addr + \
+ 				(i->ifr_addr.sa_len ? i->ifr_addr.sa_len : \
+@@ -62,6 +65,7 @@
+ #else
+ # define NEXTIFR(i)	(i + 1)
+ #endif
++#endif
+ 
+ /* XXX - superset of ifreq, for portable SIOC{A,D}IFADDR */
+ struct dnet_ifaliasreq {