Sun Oct 20 17:59:30 2013 UTC ()
curses from modernish NetBSD is fine. Don't (incorrectly) hard-code
/usr/pkg references for NetBSD.


(joerg)
diff -r1.20 -r1.21 pkgsrc/net/wap-utils/Makefile
diff -r1.4 -r1.5 pkgsrc/net/wap-utils/distinfo
diff -r0 -r1.1 pkgsrc/net/wap-utils/patches/patch-configure
diff -r0 -r1.1 pkgsrc/net/wap-utils/patches/patch-configure.in
cvs diff -r1.20 -r1.21 pkgsrc/net/wap-utils/Makefile (expand / switch to unified diff)

--- pkgsrc/net/wap-utils/Makefile 2012/10/23 17:19:18 1.20
+++ pkgsrc/net/wap-utils/Makefile 2013/10/20 17:59:30 1.21
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1# $NetBSD: Makefile,v 1.20 2012/10/23 17:19:18 asau Exp $ 1# $NetBSD: Makefile,v 1.21 2013/10/20 17:59:30 joerg Exp $
2# 2#
3 3
4DISTNAME= ap-utils-1.3.2 4DISTNAME= ap-utils-1.3.2
5PKGNAME= w${DISTNAME} 5PKGNAME= w${DISTNAME}
6PKGREVISION= 6 6PKGREVISION= 7
7CATEGORIES= net 7CATEGORIES= net
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ap-utils/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ap-utils/}
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= wojtek@tensor.3miasto.net 11MAINTAINER= wojtek@tensor.3miasto.net
12HOMEPAGE= http://ap-utils.polesye.net/ 12HOMEPAGE= http://ap-utils.polesye.net/
13COMMENT= Wireless access points UNIX management tool 13COMMENT= Wireless access points UNIX management tool
14 14
15GNU_CONFIGURE= YES 15GNU_CONFIGURE= YES
16USE_PKGLOCALEDIR= YES 16USE_PKGLOCALEDIR= YES
17 17
18INCOMPAT_CURSES= NetBSD-1.5*-* NetBSD-1.6[-_.]*-* 18INCOMPAT_CURSES= NetBSD-1.5*-* NetBSD-1.6[-_.]*-*
19INCOMPAT_CURSES+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-C]*-* 19INCOMPAT_CURSES+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-C]*-*
20 20
21.include "../../devel/gettext-lib/buildlink3.mk" 21.include "../../devel/gettext-lib/buildlink3.mk"
22.include "../../devel/ncurses/buildlink3.mk" 22.include "../../mk/curses.buildlink3.mk"
23.include "../../mk/bsd.pkg.mk" 23.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/net/wap-utils/distinfo (expand / switch to unified diff)

--- pkgsrc/net/wap-utils/distinfo 2006/03/23 17:09:40 1.4
+++ pkgsrc/net/wap-utils/distinfo 2013/10/20 17:59:30 1.5
@@ -1,6 +1,8 @@ @@ -1,6 +1,8 @@
1$NetBSD: distinfo,v 1.4 2006/03/23 17:09:40 joerg Exp $ 1$NetBSD: distinfo,v 1.5 2013/10/20 17:59:30 joerg Exp $
2 2
3SHA1 (ap-utils-1.3.2.tar.bz2) = 1be90d9e8df214ef422ffd581c2d29c2b961ea8c 3SHA1 (ap-utils-1.3.2.tar.bz2) = 1be90d9e8df214ef422ffd581c2d29c2b961ea8c
4RMD160 (ap-utils-1.3.2.tar.bz2) = ce58feac694a05cb97bd0be9dc5fac99b9432919 4RMD160 (ap-utils-1.3.2.tar.bz2) = ce58feac694a05cb97bd0be9dc5fac99b9432919
5Size (ap-utils-1.3.2.tar.bz2) = 280243 bytes 5Size (ap-utils-1.3.2.tar.bz2) = 280243 bytes
6SHA1 (patch-aa) = 06ca4b5571d7f1cbf21b73288bc3be02d71b4182 6SHA1 (patch-aa) = 06ca4b5571d7f1cbf21b73288bc3be02d71b4182
 7SHA1 (patch-configure) = 4fadcb86d56d6a0d6ae5a31e8257090541342445
 8SHA1 (patch-configure.in) = e9f7650665d35b895358c7bc2c405bd0ff6ee383
File Added: pkgsrc/net/wap-utils/patches/patch-configure
$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"
File Added: pkgsrc/net/wap-utils/patches/patch-configure.in
$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"