[pkgsrc/trunk]: pkgsrc/emulators/vice Fixed "test ==" and a few pkglint warni...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3977104a3e3f
branches:  trunk
changeset: 520035:3977104a3e3f
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Oct 14 02:13:04 2006 +0000

description:
Fixed "test ==" and a few pkglint warnings.

diffstat:

 emulators/vice/Makefile         |  15 ++++++++-------
 emulators/vice/distinfo         |   5 +++--
 emulators/vice/patches/patch-ag |  40 ++++++++++++++++++++++++++++++++++++++--
 emulators/vice/patches/patch-ai |  31 +++++++++++++++++++++++++++++++
 4 files changed, 80 insertions(+), 11 deletions(-)

diffs (146 lines):

diff -r 5082c8c28ee2 -r 3977104a3e3f emulators/vice/Makefile
--- a/emulators/vice/Makefile   Sat Oct 14 02:03:50 2006 +0000
+++ b/emulators/vice/Makefile   Sat Oct 14 02:13:04 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2006/06/29 23:01:43 wiz Exp $
+# $NetBSD: Makefile,v 1.69 2006/10/14 02:13:04 rillig Exp $
 #
 
 DISTNAME=              vice-1.19
@@ -20,7 +20,7 @@
 
 USE_PKGLOCALEDIR=      YES
 USE_TOOLS+=            bdftopcf gmake mkfontdir msgfmt
-USE_LANGUAGES+=                c c++
+USE_LANGUAGES=         c c++
 GNU_CONFIGURE=         YES
 CONFIGURE_ARGS+=       --enable-fullscreen
 
@@ -39,16 +39,17 @@
 
 # These changes are rather common, so sed instead of patch:
 post-patch:
+       set -e;                                                         \
        for file in `${FIND} ${WRKSRC} -name Makefile.in -print`        \
                        ${WRKSRC}/src/arch/unix/archdep.h; do           \
-               ${SED}  -e "s|/lib/vice/doc|/share/doc/vice|g"          \
+               sed  -e "s|/lib/vice/doc|/share/doc/vice|g"             \
                        -e "s|/lib/vice|/share/vice|g"                  \
                        -e "/^pkglibdir/s|(libdir)|(datadir)|g"         \
-                       $$file > $$file.new;                            \
-               if ${CMP} -s $$file $$file.new; then                    \
-                       ${RM} -f $$file.new;                            \
+                       "$$file" > "$$file".new;                        \
+               if cmp -s "$$file" "$$file".new; then                   \
+                       rm -f "$$file".new;                             \
                else                                                    \
-                       ${MV} -f $$file.new $$file;                     \
+                       mv -f "$$file".new "$$file";                    \
                fi;                                                     \
        done
 
diff -r 5082c8c28ee2 -r 3977104a3e3f emulators/vice/distinfo
--- a/emulators/vice/distinfo   Sat Oct 14 02:03:50 2006 +0000
+++ b/emulators/vice/distinfo   Sat Oct 14 02:13:04 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2006/07/06 08:37:27 dillo Exp $
+$NetBSD: distinfo,v 1.26 2006/10/14 02:13:04 rillig Exp $
 
 SHA1 (vice-1.19.tar.gz) = 8620d891fa9de29eb21e334f3c7c8254e89e80a9
 RMD160 (vice-1.19.tar.gz) = d0a62750c30e3cf8645117a8e8536a8061c260ea
@@ -12,5 +12,6 @@
 SHA1 (patch-ad) = 5c1510a66d775b8a5a1b0a7d596aa111218993be
 SHA1 (patch-ae) = 9528bc0da7af5a0c74f5f0d2a8bf30b71802850c
 SHA1 (patch-af) = 524913b7bc753dafde909bb26ace8f0500be14d5
-SHA1 (patch-ag) = 79c27bf784041792f04f09c6cd967d0c6cafc1ce
+SHA1 (patch-ag) = 337920d6dec8cbe04086f5b7049f27631bdfed14
 SHA1 (patch-ah) = 3f92ef4e5f64b254c3d52f9bbd9921dd25ee0aeb
+SHA1 (patch-ai) = b05efe271c893f375a5396b358bdc78a96cd3e16
diff -r 5082c8c28ee2 -r 3977104a3e3f emulators/vice/patches/patch-ag
--- a/emulators/vice/patches/patch-ag   Sat Oct 14 02:03:50 2006 +0000
+++ b/emulators/vice/patches/patch-ag   Sat Oct 14 02:13:04 2006 +0000
@@ -1,7 +1,34 @@
-$NetBSD: patch-ag,v 1.5 2006/07/06 08:37:27 dillo Exp $
+$NetBSD: patch-ag,v 1.6 2006/10/14 02:13:04 rillig Exp $
 
 --- configure.orig     2006-01-08 21:31:51.000000000 +0100
-+++ configure
++++ configure  2006-10-14 04:08:10.000000000 +0200
+@@ -1319,7 +1319,7 @@ VICE_VERSION_BUILD=0
+ 
+ 
+ 
+-if test x"$VICE_VERSION_BUILD" == "x" -o x"$VICE_VERSION_BUILD" == "x0" ; then
++if test x"$VICE_VERSION_BUILD" = "x" -o x"$VICE_VERSION_BUILD" = "x0" ; then
+   VICE_VERSION=$VICE_VERSION_MAJOR"."$VICE_VERSION_MINOR
+ else
+   VICE_VERSION=$VICE_VERSION_MAJOR"."$VICE_VERSION_MINOR"."$VICE_VERSION_BUILD
+@@ -1719,7 +1719,7 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(inst
+           ac_config_headers="$ac_config_headers src/config.h"
+ 
+ 
+-if test x"$VICE_VERSION_BUILD" == "x" -o x"$VICE_VERSION_BUILD" == "x0" ; then
++if test x"$VICE_VERSION_BUILD" = "x" -o x"$VICE_VERSION_BUILD" = "x0" ; then
+   VERSION_RC=$VICE_VERSION_MAJOR","$VICE_VERSION_MINOR",0,0"
+ else
+   VERSION_RC=$VICE_VERSION_MAJOR","$VICE_VERSION_MINOR","$VICE_VERSION_BUILD",0"
+@@ -10937,7 +10937,7 @@ done
+   fi
+ fi
+ 
+-if test x"$is_beos" == "xyes"; then
++if test x"$is_beos" = "xyes"; then
+ 
+ 
+   BEOS_NETWORK_HEADERS_PRESENT=yes
 @@ -19748,7 +19748,7 @@ _ACEOF
  
  elif [ x"${enable_gnomeui}" = x"yes" ] ; then
@@ -20,3 +47,12 @@
    fi
  
  
+@@ -21899,6 +21899,8 @@ do
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++      : Avoid regenerating within pkgsrc
++      exit 0
+     ac_cs_recheck=: ;;
+   --version | --vers* | -V )
+     echo "$ac_cs_version"; exit 0 ;;
diff -r 5082c8c28ee2 -r 3977104a3e3f emulators/vice/patches/patch-ai
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/vice/patches/patch-ai   Sat Oct 14 02:13:04 2006 +0000
@@ -0,0 +1,31 @@
+$NetBSD: patch-ai,v 1.3 2006/10/14 02:13:04 rillig Exp $
+
+--- configure.in.orig  2006-01-08 20:32:11.000000000 +0100
++++ configure.in       2006-10-14 04:07:48.000000000 +0200
+@@ -17,7 +17,7 @@ AC_SUBST(VICE_VERSION_BUILD)
+ 
+ dnl AC_DEFINE(UNSTABLE,,[Define if this version is unstable.])
+ 
+-if test x"$VICE_VERSION_BUILD" == "x" -o x"$VICE_VERSION_BUILD" == "x0" ; then
++if test x"$VICE_VERSION_BUILD" = "x" -o x"$VICE_VERSION_BUILD" = "x0" ; then
+   VICE_VERSION=$VICE_VERSION_MAJOR"."$VICE_VERSION_MINOR
+ else
+   VICE_VERSION=$VICE_VERSION_MAJOR"."$VICE_VERSION_MINOR"."$VICE_VERSION_BUILD
+@@ -27,7 +27,7 @@ AC_SUBST(VICE_VERSION)
+ AM_INIT_AUTOMAKE(vice, $VICE_VERSION)
+ AM_CONFIG_HEADER(src/config.h)
+ 
+-if test x"$VICE_VERSION_BUILD" == "x" -o x"$VICE_VERSION_BUILD" == "x0" ; then
++if test x"$VICE_VERSION_BUILD" = "x" -o x"$VICE_VERSION_BUILD" = "x0" ; then
+   VERSION_RC=$VICE_VERSION_MAJOR","$VICE_VERSION_MINOR",0,0"
+ else
+   VERSION_RC=$VICE_VERSION_MAJOR","$VICE_VERSION_MINOR","$VICE_VERSION_BUILD",0"
+@@ -680,7 +680,7 @@ if test x"$is_win32" != "xyes" -a x"$is_
+   fi
+ fi
+ 
+-if test x"$is_beos" == "xyes"; then
++if test x"$is_beos" = "xyes"; then
+ 
+   dnl Check for needed network headers
+