[pkgsrc/trunk]: pkgsrc/wm/icewm Fixed "test ==" in the configure script.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bdf35df4ac1b
branches:  trunk
changeset: 519502:bdf35df4ac1b
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Wed Oct 04 19:38:05 2006 +0000

description:
Fixed "test ==" in the configure script.

Fixed some pkglint warnings.

diffstat:

 wm/icewm/Makefile         |   3 +--
 wm/icewm/Makefile.common  |   9 +++++----
 wm/icewm/distinfo         |   5 +++--
 wm/icewm/patches/patch-aj |   8 ++++----
 wm/icewm/patches/patch-ak |  13 +++++++++++++
 5 files changed, 26 insertions(+), 12 deletions(-)

diffs (95 lines):

diff -r efa12d24c6f4 -r bdf35df4ac1b wm/icewm/Makefile
--- a/wm/icewm/Makefile Wed Oct 04 18:48:04 2006 +0000
+++ b/wm/icewm/Makefile Wed Oct 04 19:38:05 2006 +0000
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.34 2006/08/06 05:20:40 kristerw Exp $
+# $NetBSD: Makefile,v 1.35 2006/10/04 19:38:05 rillig Exp $
 
-PKGNAME=               ${DISTNAME}
 COMMENT=               Small, fast and light-weight window manager
 
 CONFLICTS+=            icewm-gnome-[0-9]* icewm-imlib-[0-9]*
diff -r efa12d24c6f4 -r bdf35df4ac1b wm/icewm/Makefile.common
--- a/wm/icewm/Makefile.common  Wed Oct 04 18:48:04 2006 +0000
+++ b/wm/icewm/Makefile.common  Wed Oct 04 19:38:05 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.54 2006/10/02 11:13:22 ghen Exp $
+# $NetBSD: Makefile.common,v 1.55 2006/10/04 19:38:06 rillig Exp $
 
 DISTNAME=              icewm-1.2.27
 CATEGORIES=            x11 wm
@@ -50,13 +50,14 @@
 INSTALL_TARGET=                install-base install-nls
 
 post-extract:
-       @${CP} ${FILESDIR}/bsd-daemon.xpm ${WRKSRC}/lib/taskbar
+       cp ${FILESDIR}/bsd-daemon.xpm ${WRKSRC}/lib/taskbar
 
 post-install:
        ${INSTALL_DATA_DIR} ${DOCDIR}
        ${INSTALL_DATA_DIR} ${HTMLDIR}
-       for file in BUGS CHANGES COPYING README README.wm-session TODO; do\
-               ${INSTALL_DATA} ${WRKSRC}/$${file} ${DOCDIR}; \
+       set -e; \
+       for file in BUGS CHANGES COPYING README README.wm-session TODO; do \
+               ${INSTALL_DATA} ${WRKSRC}/"$${file}" ${DOCDIR}; \
        done
        ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${HTMLDIR}
 
diff -r efa12d24c6f4 -r bdf35df4ac1b wm/icewm/distinfo
--- a/wm/icewm/distinfo Wed Oct 04 18:48:04 2006 +0000
+++ b/wm/icewm/distinfo Wed Oct 04 19:38:05 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2006/10/02 11:13:22 ghen Exp $
+$NetBSD: distinfo,v 1.32 2006/10/04 19:38:06 rillig Exp $
 
 SHA1 (icewm-1.2.27.tar.gz) = bb5821dbe46833804197012aee176b2c191de392
 RMD160 (icewm-1.2.27.tar.gz) = a04feda8c04f6aa15be5160e58179802d5308a64
@@ -6,4 +6,5 @@
 SHA1 (patch-aa) = 1f2655454d567c0c794d36ae0834503f9259ea65
 SHA1 (patch-ac) = 2da6c567f809db9292e123f7233e4bd767ddb26c
 SHA1 (patch-ad) = 8efab7cb50ce5bdb7d218caa232ae501dd064424
-SHA1 (patch-aj) = 280a46700bdcfda4517bebac867c422c42ac2c5b
+SHA1 (patch-aj) = 63e57e67a4a450c3ff6a6aa1e467c35ccc66d42b
+SHA1 (patch-ak) = 6f6dfa9a8310e3f6b05720c5190a02ffbd3b8377
diff -r efa12d24c6f4 -r bdf35df4ac1b wm/icewm/patches/patch-aj
--- a/wm/icewm/patches/patch-aj Wed Oct 04 18:48:04 2006 +0000
+++ b/wm/icewm/patches/patch-aj Wed Oct 04 19:38:05 2006 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-aj,v 1.1 2006/05/13 17:01:11 ghen Exp $
+$NetBSD: patch-aj,v 1.2 2006/10/04 19:38:06 rillig Exp $
 
---- src/aapm.cc.orig   2006-02-03 07:24:27.000000000 +0100
-+++ src/aapm.cc
+--- src/aapm.cc.orig   2006-08-06 20:38:16.000000000 +0200
++++ src/aapm.cc        2006-10-04 21:23:18.000000000 +0200
 @@ -38,8 +38,12 @@
  #include <sys/file.h>
  #include <sys/ioctl.h>
@@ -10,8 +10,8 @@
 +#include <sparc/apmvar.h>
 +#else
  #include <machine/apmvar.h>
+ #endif
 +#endif
- #endif
  
  YColor *YApm::apmBg = 0;
  YColor *YApm::apmFg = 0;
diff -r efa12d24c6f4 -r bdf35df4ac1b wm/icewm/patches/patch-ak
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/icewm/patches/patch-ak Wed Oct 04 19:38:05 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2006/10/04 19:38:06 rillig Exp $
+
+--- configure.orig     2006-10-04 21:23:23.000000000 +0200
++++ configure  2006-10-04 21:24:12.000000000 +0200
+@@ -10354,7 +10354,7 @@ else
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-    if test "${XFT_CONFIG}" == ""; then
++    if test "${XFT_CONFIG}" = ""; then
+       # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5