Don't patch multiple times the same file, fixed all pkglint warns.

4 files changed, 49 insertions, 66 deletions

diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index 5c3fcd82aec..b7e8a14b3fa 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2006/12/07 13:50:58 xtraeme Exp $
+$NetBSD: distinfo,v 1.30 2006/12/07 16:06:39 xtraeme Exp $
 
 SHA1 (qemu-0.8.2.tar.gz) = d775239a545e7d0c5b677660a2122df590afde6d
 RMD160 (qemu-0.8.2.tar.gz) = 715c24997330352aa675cd7279731cec251f833a
@@ -7,10 +7,10 @@ SHA1 (patch-aa) = 455575215bad8864da285e1979da9ff7d8476a24
 SHA1 (patch-ab) = 12838d78eed85c575214f4ce632a4b6694c6f97f
 SHA1 (patch-ac) = f1231bcfde687ebe7a7ea4898593cd3818f03142
 SHA1 (patch-af) = c139e919da430c0118dc774587e1e6dd718d7926
-SHA1 (patch-ag) = 78cd16c8e627f8eff9b219e78adfce03f370faa6
+SHA1 (patch-ag) = 3ff150954bc73b3c02670c90df79f79484ea5d20
 SHA1 (patch-ah) = 134f47583dbed94e83671ca6197106805b13f759
 SHA1 (patch-ai) = 480cc80a451488a1376f99ed152a917116759cbf
-SHA1 (patch-aj) = d063a09efe4d1b7047f6a4ec4371aaff0acff159
+SHA1 (patch-aj) = 4972ee341782419114972b91fb6354ee9881b60f
 SHA1 (patch-ak) = 4715a464554469e8dac9cde93db83a90885b8a7e
 SHA1 (patch-al) = d61bce6a4cebae4ba1f87ce9def277c0ffc5843d
 SHA1 (patch-am) = a22a3b23284c377afa8113768d68c8ef40c514f9
@@ -20,4 +20,4 @@ SHA1 (patch-as) = 0df64b325b758a88fe61590e129bab2b3f99ce63
 SHA1 (patch-au) = 29d05fb5f4717fb572491d9d0653ec74ba46ae7e
 SHA1 (patch-aw) = 6299964fb3a747e8f5dfe4354e66722030ee9a75
 SHA1 (patch-ax) = 66b060005ecbf9fd0451f7960e81eccbabf959ca
-SHA1 (patch-ay) = 04d09931cca28169ff6b6b63ebd45c79dcbc9528
+SHA1 (patch-ay) = 45fa8b5720185b5bfe2d1c00f599565f286ea4f5
diff --git a/emulators/qemu/patches/patch-ag b/emulators/qemu/patches/patch-ag
index a662b4e522a..165c56cae27 100644
--- a/emulators/qemu/patches/patch-ag
+++ b/emulators/qemu/patches/patch-ag
@@ -1,27 +1,7 @@
-$NetBSD: patch-ag,v 1.6 2006/12/07 13:50:58 xtraeme Exp $
+$NetBSD: patch-ag,v 1.7 2006/12/07 16:06:39 xtraeme Exp $
 
---- configure.orig	2005-09-04 17:11:31.000000000 +0000
-+++ configure
-@@ -366,7 +366,7 @@ else
- if test -z "$prefix" ; then
-     prefix="/usr/local"
- fi
--mandir="$prefix/share/man"
-+mandir="$prefix/$PKGMANDIR"
- datadir="$prefix/share/qemu"
- docdir="$prefix/share/doc/qemu"
- bindir="$prefix/bin"
-@@ -539,6 +539,8 @@ if test "$mingw32" = "yes" ; then
-   echo "#define CONFIG_WIN32 1" >> $config_h
- elif test -f "/usr/include/byteswap.h" ; then
-   echo "#define HAVE_BYTESWAP_H 1" >> $config_h
-+elif test -f "/usr/include/machine/bswap.h" ; then
-+  echo "#define HAVE_MACHINE_BSWAP_H 1" >> $config_h
- fi
- if test "$darwin" = "yes" ; then
-   echo "CONFIG_DARWIN=yes" >> $config_mak
---- configure.orig	2006-12-05 21:57:48.000000000 +0100
-+++ configure	2006-12-05 21:57:14.000000000 +0100
+--- configure.orig	2006-12-07 16:59:57.000000000 +0100
++++ configure	2006-12-07 17:02:12.000000000 +0100
 @@ -27,7 +27,7 @@
  make="make"
  install="install"
@@ -31,34 +11,37 @@ $NetBSD: patch-ag,v 1.6 2006/12/07 13:50:58 xtraeme Exp $
  target_list=""
  case "$cpu" in
    i386|i486|i586|i686|i86pc|BePC)
-@@ -115,6 +115,10 @@
+@@ -115,6 +115,12 @@
      kqemu="yes"
  fi
  ;;
 +DragonFly)
 +bsd="yes"
 +oss="yes"
++dragonfly="yes"
 +;;
++
  NetBSD)
  bsd="yes"
  oss="yes"
---- configure.orig	2006-12-06 21:56:23.000000000 +0100
-+++ configure	2006-12-06 21:54:07.000000000 +0100
-@@ -118,6 +118,7 @@
- DragonFly)
- bsd="yes"
- oss="yes"
-+dragonfly="yes"
- ;;
- NetBSD)
- bsd="yes"
-@@ -653,6 +654,9 @@
- elif test -f "/usr/include/machine/bswap.h" ; then
-   echo "#define HAVE_MACHINE_BSWAP_H 1" >> $config_h
+@@ -509,7 +515,7 @@
+ if test -z "$prefix" ; then
+     prefix="/usr/local"
  fi
+-mandir="$prefix/share/man"
++mandir="$prefix/$PKGMANDIR"
+ datadir="$prefix/share/qemu"
+ docdir="$prefix/share/doc/qemu"
+ bindir="$prefix/bin"
+@@ -646,6 +652,11 @@
+   echo "#define CONFIG_WIN32 1" >> $config_h
+ elif test -f "/usr/include/byteswap.h" ; then
+   echo "#define HAVE_BYTESWAP_H 1" >> $config_h
++elif test -f "/usr/include/machine/bswap.h" ; then
++  echo "#define HAVE_MACHINE_BSWAP_H 1" >> $config_h
++fi
 +if test "$dragonfly" = "yes" ; then
 +  echo "CONFIG_DRAGONFLY=yes" >> $config_mak
-+fi
+ fi
  if test "$darwin" = "yes" ; then
    echo "CONFIG_DARWIN=yes" >> $config_mak
-   echo "#define CONFIG_DARWIN 1" >> $config_h
diff --git a/emulators/qemu/patches/patch-aj b/emulators/qemu/patches/patch-aj
index a603bdce2b3..94745cabc4b 100644
--- a/emulators/qemu/patches/patch-aj
+++ b/emulators/qemu/patches/patch-aj
@@ -1,7 +1,7 @@
-$NetBSD: patch-aj,v 1.6 2006/12/07 13:50:58 xtraeme Exp $
+$NetBSD: patch-aj,v 1.7 2006/12/07 16:06:39 xtraeme Exp $
 
---- Makefile.target.orig	2006-05-06 19:30:04.000000000 +0200
-+++ Makefile.target	2006-05-06 19:31:21.000000000 +0200
+--- Makefile.target.orig	2006-12-07 17:03:50.000000000 +0100
++++ Makefile.target	2006-12-07 17:05:31.000000000 +0100
 @@ -17,9 +17,9 @@
  VPATH+=:$(SRC_PATH)/linux-user
  DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH)
@@ -14,7 +14,23 @@ $NetBSD: patch-aj,v 1.6 2006/12/07 13:50:58 xtraeme Exp $
  LIBS=
  HELPER_CFLAGS=$(CFLAGS)
  DYNGEN=../dyngen$(EXESUF)
-@@ -411,6 +411,9 @@
+@@ -400,6 +400,7 @@
+ ifndef CONFIG_SOFTMMU
+ VL_LDFLAGS+=-Wl,-T,$(SRC_PATH)/i386-vl.ld 
+ endif
++ifndef CONFIG_DRAGONFLY
+ ifndef CONFIG_DARWIN
+ ifndef CONFIG_WIN32
+ ifndef CONFIG_SOLARIS
+@@ -407,6 +408,7 @@
+ endif
+ endif
+ endif
++endif
+ ifdef TARGET_GPROF
+ vl.o: CFLAGS+=-p
+ VL_LDFLAGS+=-p
+@@ -440,6 +442,9 @@
  sdlaudio.o: sdlaudio.c
  	$(CC) $(CFLAGS) $(DEFINES) $(SDL_CFLAGS) -c -o $@ $<
  
@@ -24,7 +40,7 @@ $NetBSD: patch-aj,v 1.6 2006/12/07 13:50:58 xtraeme Exp $
  depend: $(SRCS)
  	$(CC) -MM $(CFLAGS) $(DEFINES) $^ 1>.depend
  
-@@ -492,7 +495,7 @@
+@@ -530,7 +535,7 @@
  
  install: all 
  ifneq ($(PROGS),)
@@ -33,21 +49,3 @@ $NetBSD: patch-aj,v 1.6 2006/12/07 13:50:58 xtraeme Exp $
  endif
  
  ifneq ($(wildcard .depend),)
---- Makefile.target.orig	2006-12-06 21:54:21.000000000 +0100
-+++ Makefile.target	2006-12-06 21:54:48.000000000 +0100
-@@ -400,6 +400,7 @@
- ifndef CONFIG_SOFTMMU
- VL_LDFLAGS+=-Wl,-T,$(SRC_PATH)/i386-vl.ld 
- endif
-+ifndef CONFIG_DRAGONFLY
- ifndef CONFIG_DARWIN
- ifndef CONFIG_WIN32
- ifndef CONFIG_SOLARIS
-@@ -407,6 +408,7 @@
- endif
- endif
- endif
-+endif
- ifdef TARGET_GPROF
- vl.o: CFLAGS+=-p
- VL_LDFLAGS+=-p
diff --git a/emulators/qemu/patches/patch-ay b/emulators/qemu/patches/patch-ay
index fb8c9261b74..4636f8023a5 100644
--- a/emulators/qemu/patches/patch-ay
+++ b/emulators/qemu/patches/patch-ay
@@ -1,3 +1,5 @@
+$NetBSD: patch-ay,v 1.6 2006/12/07 16:06:39 xtraeme Exp $
+
 --- block.c.orig	2006-12-06 21:23:19.000000000 +0100
 +++ block.c	2006-12-06 21:24:04.000000000 +0100
 @@ -29,8 +29,10 @@