[pkgsrc/trunk]: pkgsrc/net/kismet Fixed "test ==" and a lot of pkglint warnings.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/970a2b64183b
branches:  trunk
changeset: 520028:970a2b64183b
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Oct 14 01:27:43 2006 +0000

description:
Fixed "test ==" and a lot of pkglint warnings.

diffstat:

 net/kismet/Makefile         |  11 +++++++----
 net/kismet/distinfo         |   5 +++--
 net/kismet/patches/patch-aa |  24 +++++++++++++++++++++---
 net/kismet/patches/patch-ah |  20 ++++++++++++++++++++
 4 files changed, 51 insertions(+), 9 deletions(-)

diffs (119 lines):

diff -r bbff9fceeac0 -r 970a2b64183b net/kismet/Makefile
--- a/net/kismet/Makefile       Sat Oct 14 01:14:15 2006 +0000
+++ b/net/kismet/Makefile       Sat Oct 14 01:27:43 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/09/01 20:58:48 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2006/10/14 01:27:43 rillig Exp $
 
 DISTNAME=              kismet-2006-04-R1
 PKGNAME=               kismet-2006.04.01
@@ -12,19 +12,22 @@
 
 GNU_CONFIGURE=         yes
 USE_LANGUAGES=         c c++
-USE_NCURSES=           # needs libpanel
+USE_NCURSES=           yes # needs libpanel
 USE_TOOLS+=            gmake perl:run
 REPLACE_PERL+=         scripts/gpsmap-helper-earthamaps
 
 # might be appended to in options.mk
 PLIST_SRC=             PLIST
 
+.include "../../mk/bsd.prefs.mk"
+
 KISMET_USER?=          kismet
 KISMET_GROUP?=         kismet
 PKG_GROUPS=            ${KISMET_GROUP}
 PKG_USERS=             ${KISMET_USER}:${KISMET_GROUP}::Kismet\ user:${VARBASE}/log/kismet
+BUILD_DEFS+=           KISMET_USER KISMET_GROUP VARBASE
 
-PKG_SYSCONFSUBDIR?=    ${PKGBASE}
+PKG_SYSCONFSUBDIR=     ${PKGBASE}
 EGDIR=                 ${PREFIX}/share/examples/${PKGBASE}
 CONF_FILES+=           ${EGDIR}/ap_manuf ${PKG_SYSCONFDIR}/ap_manuf
 CONF_FILES+=           ${EGDIR}/client_manuf ${PKG_SYSCONFDIR}/client_manuf
@@ -42,7 +45,7 @@
 SUBST_MESSAGE.user=    Fixing user name.
 SUBST_STAGE.user=      pre-configure
 SUBST_FILES.user=      conf/kismet.conf.in
-SUBST_SED.user=                's/your_user_here/${KISMET_USER}/'
+SUBST_SED.user=                -e 's/your_user_here/${KISMET_USER}/'
 
 post-install:
        ${INSTALL_DATA_DIR} ${EGDIR}
diff -r bbff9fceeac0 -r 970a2b64183b net/kismet/distinfo
--- a/net/kismet/distinfo       Sat Oct 14 01:14:15 2006 +0000
+++ b/net/kismet/distinfo       Sat Oct 14 01:27:43 2006 +0000
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.2 2006/10/09 18:48:35 joerg Exp $
+$NetBSD: distinfo,v 1.3 2006/10/14 01:27:43 rillig Exp $
 
 SHA1 (kismet-2006-04-R1.tar.gz) = e48ce08e96328bfdac98152df6b5759c27ed9169
 RMD160 (kismet-2006-04-R1.tar.gz) = b709256198820d5ac650ce40dea637716427a8b7
 Size (kismet-2006-04-R1.tar.gz) = 1005068 bytes
-SHA1 (patch-aa) = 4023dc19876daab6f7eeffe215f05e371eea0a36
+SHA1 (patch-aa) = b8544ebae5378fbcd787c619174fc7887b1f83f7
 SHA1 (patch-ab) = a77adf2212909b18f7afb65cdfb19539ee3b2f0b
 SHA1 (patch-ac) = cb02c5d97b22a49e8c59ae2d62537a6cbdd899da
 SHA1 (patch-ad) = 6442e2f571cb266560eaa8dc5e6500ff1b9db4fb
 SHA1 (patch-ae) = d99c33d5db327c33024f316133c1da8c602ab508
 SHA1 (patch-af) = 960246131eda2d8b4a70711b751b1fce9609d2fa
 SHA1 (patch-ag) = 92f302f26abaa1882277c56af4a8c072d4f7db7d
+SHA1 (patch-ah) = 4b7368576edd66df1783d52c0136c7a21dec138d
diff -r bbff9fceeac0 -r 970a2b64183b net/kismet/patches/patch-aa
--- a/net/kismet/patches/patch-aa       Sat Oct 14 01:14:15 2006 +0000
+++ b/net/kismet/patches/patch-aa       Sat Oct 14 01:27:43 2006 +0000
@@ -1,8 +1,26 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/08/03 15:09:49 salo Exp $
+$NetBSD: patch-aa,v 1.2 2006/10/14 01:27:44 rillig Exp $
 
 --- configure.orig     2006-01-04 16:53:37.000000000 +0100
-+++ configure  2006-08-03 16:18:04.000000000 +0200
-@@ -7084,6 +7084,7 @@
++++ configure  2006-10-14 03:22:26.000000000 +0200
+@@ -5689,7 +5689,7 @@ fi
+ 
+ 
+ # Do we use uclibc++?
+-if test "$foundcxxl"x == "x"; then
++if test "$foundcxxl"x = "x"; then
+       echo "$as_me:$LINENO: checking for main in -lstdc++" >&5
+ echo $ECHO_N "checking for main in -lstdc++... $ECHO_C" >&6
+ if test "${ac_cv_lib_stdcpp_main+set}" = set; then
+@@ -5757,7 +5757,7 @@ fi
+ 
+ fi
+ 
+-if test "$foundcxxl"x == "x"; then
++if test "$foundcxxl"x = "x"; then
+       { { echo "$as_me:$LINENO: error: Neither uclibc uClibc++ or standard gcc stdc++ libraries found." >&5
+ echo "$as_me: error: Neither uclibc uClibc++ or standard gcc stdc++ libraries found." >&2;}
+    { (exit 1); exit 1; }; }
+@@ -7084,6 +7084,7 @@ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
            #include <stdio.h>
diff -r bbff9fceeac0 -r 970a2b64183b net/kismet/patches/patch-ah
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/kismet/patches/patch-ah       Sat Oct 14 01:27:43 2006 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-ah,v 1.1 2006/10/14 01:27:44 rillig Exp $
+
+--- configure.in.orig  2006-01-04 16:53:37.000000000 +0100
++++ configure.in       2006-10-14 03:22:35.000000000 +0200
+@@ -261,13 +261,13 @@ AC_CHECK_LIB([uClibc++], [main], 
+                        AC_MSG_WARN([uclibc++ not available on this system]))
+ 
+ # Do we use uclibc++?
+-if test "$foundcxxl"x == "x"; then
++if test "$foundcxxl"x = "x"; then
+       AC_CHECK_LIB([stdc++], [main], 
+                                foundcxxl="stdc++" LIBS="$LIBS -lstdc++",
+                                AC_MSG_WARN([libstdc++ not available on this system]))
+ fi
+ 
+-if test "$foundcxxl"x == "x"; then
++if test "$foundcxxl"x = "x"; then
+       AC_MSG_ERROR(Neither uclibc uClibc++ or standard gcc stdc++ libraries found.)
+ fi
+