Fix build problem on NetBSD 4.0. Should be fix PR pkg/41721.

4 files changed, 45 insertions, 2 deletions

diff --git a/net/md-whois/Makefile b/net/md-whois/Makefile
index 1892f6bbdcc..2da9ebe69f5 100644
--- a/net/md-whois/Makefile
+++ b/net/md-whois/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2008/11/19 14:35:34 taca Exp $
+# $NetBSD: Makefile,v 1.22 2009/09/26 05:48:02 taca Exp $
 #
 # todo: set location of [md-]whois.conf and fix in man page too
 # todo: build and install the po/ files and add to PLIST
@@ -22,6 +22,12 @@ USE_TOOLS+=	gmake perl
 INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+.include "../../mk/bsd.prefs.mk"
+
+.if (${OPSYS} == "NetBSD" && !empty(OS_VERSION:M4.*))
+MAKE_ENV+=	NEED_OPTARG=YES
+.endif
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/whois ${DESTDIR}${PREFIX}/bin/md-whois
 	${INSTALL_MAN} ${WRKSRC}/whois.1 \
diff --git a/net/md-whois/distinfo b/net/md-whois/distinfo
index f24bdb15bda..0defe8958f7 100644
--- a/net/md-whois/distinfo
+++ b/net/md-whois/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.9 2008/11/19 14:35:34 taca Exp $
+$NetBSD: distinfo,v 1.10 2009/09/26 05:48:02 taca Exp $
 
 SHA1 (whois_4.7.28.tar.gz) = 22b29d24e511114be0b5ffded325dedf3d9beaa6
 RMD160 (whois_4.7.28.tar.gz) = 988fd7ddd0d5ff5ad5451a1f6fa211c5d075a310
 Size (whois_4.7.28.tar.gz) = 68070 bytes
+SHA1 (patch-aa) = 304488d58850ae60a643884d3f0f7c207c3b319f
+SHA1 (patch-ab) = 558dcf05381b637582eb10df6ec27e976773be96
diff --git a/net/md-whois/patches/patch-aa b/net/md-whois/patches/patch-aa
new file mode 100644
index 00000000000..470accefc5c
--- /dev/null
+++ b/net/md-whois/patches/patch-aa
@@ -0,0 +1,17 @@
+$NetBSD: patch-aa,v 1.1 2009/09/26 05:48:02 taca Exp $
+
+* Fix for NetBSD 4.*.
+
+--- Makefile.orig	2008-05-06 18:41:16.000000000 +0900
++++ Makefile
+@@ -31,6 +31,10 @@ else
+ mkpasswd_LDADD += -lcrypt
+ endif
+ 
++ifdef NEED_OPTARG
++DEFS += -DNEED_OPTARG
++endif
++
+ all: Makefile.depend whois mkpasswd #pos
+ 
+ whois_OBJECTS := whois.o utils.o
diff --git a/net/md-whois/patches/patch-ab b/net/md-whois/patches/patch-ab
new file mode 100644
index 00000000000..7beb3a4c4f6
--- /dev/null
+++ b/net/md-whois/patches/patch-ab
@@ -0,0 +1,18 @@
+$NetBSD: patch-ab,v 1.1 2009/09/26 05:48:02 taca Exp $
+
+* Fix for NetBSD 4.*.
+
+--- mkpasswd.c.orig	2008-07-17 07:43:47.000000000 +0900
++++ mkpasswd.c
+@@ -56,6 +56,11 @@ static const struct option longopts[] = 
+ };
+ #endif
+ 
++#ifdef NEED_OPTARG
++extern char *optarg;
++extern int optind;
++#endif
++
+ static const char valid_salts[] = "abcdefghijklmnopqrstuvwxyz"
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789./";
+