curses from modernish NetBSD is fine. Don't (incorrectly) hard-code

/usr/pkg references for NetBSD.

4 files changed, 36 insertions, 4 deletions

diff --git a/net/wap-utils/Makefile b/net/wap-utils/Makefile
index 470ebf90914..b9028e03816 100644
--- a/net/wap-utils/Makefile
+++ b/net/wap-utils/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2012/10/23 17:19:18 asau Exp $
+# $NetBSD: Makefile,v 1.21 2013/10/20 17:59:30 joerg Exp $
 #
 
 DISTNAME=	ap-utils-1.3.2
 PKGNAME=	w${DISTNAME}
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ap-utils/}
 EXTRACT_SUFX=	.tar.bz2
@@ -19,5 +19,5 @@ INCOMPAT_CURSES=	NetBSD-1.5*-* NetBSD-1.6[-_.]*-*
 INCOMPAT_CURSES+=	NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-C]*-*
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/wap-utils/distinfo b/net/wap-utils/distinfo
index ad20425632c..71d56af0271 100644
--- a/net/wap-utils/distinfo
+++ b/net/wap-utils/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.4 2006/03/23 17:09:40 joerg Exp $
+$NetBSD: distinfo,v 1.5 2013/10/20 17:59:30 joerg Exp $
 
 SHA1 (ap-utils-1.3.2.tar.bz2) = 1be90d9e8df214ef422ffd581c2d29c2b961ea8c
 RMD160 (ap-utils-1.3.2.tar.bz2) = ce58feac694a05cb97bd0be9dc5fac99b9432919
 Size (ap-utils-1.3.2.tar.bz2) = 280243 bytes
 SHA1 (patch-aa) = 06ca4b5571d7f1cbf21b73288bc3be02d71b4182
+SHA1 (patch-configure) = 4fadcb86d56d6a0d6ae5a31e8257090541342445
+SHA1 (patch-configure.in) = e9f7650665d35b895358c7bc2c405bd0ff6ee383
diff --git a/net/wap-utils/patches/patch-configure b/net/wap-utils/patches/patch-configure
new file mode 100644
index 00000000000..6e4daf7591e
--- /dev/null
+++ b/net/wap-utils/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2013/10/20 17:59:30 joerg Exp $
+
+--- configure.orig	2013-10-16 12:54:34.000000000 +0000
++++ configure
+@@ -4088,10 +4088,6 @@ EOF
+ 	CC="$CC -qcpluscmt -qmaxmem=16384"
+     esac
+     ;;
+- netbsd*)
+-	ap_config_LDADD="-lncurses"
+-	CC="$CC -R/usr/pkg/lib -L/usr/pkg/lib -I/usr/pkg/include"
+-	;;
+  *qnx)
+ 	LIBS="$LIBS -lsocket"
+ 	INSTALL="config/install-sh"
diff --git a/net/wap-utils/patches/patch-configure.in b/net/wap-utils/patches/patch-configure.in
new file mode 100644
index 00000000000..e843539b48c
--- /dev/null
+++ b/net/wap-utils/patches/patch-configure.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure.in,v 1.1 2013/10/20 17:59:30 joerg Exp $
+
+--- configure.in.orig	2013-10-16 12:54:32.000000000 +0000
++++ configure.in
+@@ -62,10 +62,6 @@ case "$host_os" in
+ 	CC="$CC -qcpluscmt -qmaxmem=16384"
+     esac
+     ;;
+- netbsd*)
+-	ap_config_LDADD="-lncurses"
+-	CC="$CC -R/usr/pkg/lib -L/usr/pkg/lib -I/usr/pkg/include"
+-	;;
+  *qnx)
+ 	LIBS="$LIBS -lsocket"
+ 	INSTALL="config/install-sh"