Update to version 1.0.3.

Patches from Nathan Langford via PR pkg/19580.

Changes:

RELEASE 1.0.3
=============
- All ANSI C incompatibilities should be fixed. Please report any that
  remain.
- Various bugs encountered when building gnuboy on strange compilers
  have been fixed.
- Internal support for decompressing gzipped roms now exists in a
  minimal form. The inflate code used is taken from a quine
  (self-reproducing program) written by David Madore and placed in the
  public domain. This code is very portable but is rather slow and may
  crash when given invalid data; however, there should be no impact on
  security. Currently only gzip files (not pkzip files) are supported.
- HuC3 emultaion has been fixed to some extent. Robopon Sun and Star
  are both playable now, but many features of the HuC3 are still not
  implemented.
- Color filtering to make gnuboy look much more like a real CGB is now
  included, thanks to the work of Jonathan Gevaryahu.
- A new rcvar "gbamode" has been added to unlock the GBA-only features
  present in some newer CGB games. (This has nothing to do with GBA
  emulation, which gnuboy does not do and will not do in the future.)
- Sprite sorting in DMG mode has been fixed. This should improve things
  in various DMG games where sprites previously overlapped in the wrong
  order.

RELEASE 1.0.2
=============
- A minor problem in the frequency sweep function on sound channel 1
  was fixed, correcting the sound of the ice beam and metroid encounter
  sound in Metroid 2.
- Sound channel 3 waveform data is now trashed when the sound is
  played. This makes it more difficult for games and demos to detect
  that they are running on an emulator.
- The channel 3 waveform is now properly initialized in both DMG and
  CGB modes. Before it was incorrectly initialized to have frequency
  16 times too high, and the initial "random noise" pattern exhibited
  by DMG wasn't emulated. R-Type now sounds much better.
- The sound length register for channel 3 now works properly, fixing
  the title screen music in MegaMan 2. No thanks to gbspec.txt for
  having blatently wrong info about this matter.
- Major problems with sound quality on channel 4 (noise) have been
  fixed, and the pseudorandom sequence has been replaced to very
  closely resemble that of a real Gameboy, thanks to the hard work
  of Lord Nightmare. All these changes make a significant improvement
  in many games, notably Metroid 2, Final Fantasy Legend II and III,
  Camp Deadly, and Wario Land.
- Stereo channels are no longer backwards.
- The DMG STAT register write bug, which causes an interrupt if the
  STAT register is written while in HBLANK or VBLANK, is now emulated.
  This fixes Legend of Zerd and probably any other DMG game that will
  not run on a real Gameboy Color.
- A hack/potential fix for a problem that kept Konami Collection Vol
  1 from working has been put in place.
- A major interrupt bug that prevented Amazing Penguin from running
  has been fixed.
- Several bugs that could have resulted in crashes under strange
  circumstances have been fixed.
- Other minor sound issues have been tweaked or fixed.

RELEASE 1.0.1
=============
- Keys that didn't work in the SDL-based ports have now been fixed.
- The --bindir= option to the configure script now works properly.
- Running "make install" no longer fails when the destination
  directory doesn't already exist.
- Various minor cleanups.

RELEASE 1.0.0
=============
- Auto-loading rc files on a per-rom basis.
- Less intense yellow in the default mono palette.
- Default keybindings no longer use modifier keys.
- Lots of new documentation.
- Hardware scaling on matroxfb now looks better.
- Disabled some useless optimizations to work around a bug in gcc
  2.96, which despite being a broken compiler has become rather
  popular since Redhat decided to package it without sufficient
  testing. This will fix the problems lots of people have reported
  when compiling.
- Added --disable-arch option to configure to prevent the binaries
  built from being dependent on the exact host cpu they're built on.
  This will allow distro maintainers to build packages that work even
  on older cpus.

7 files changed, 90 insertions, 270 deletions

diff --git a/emulators/gnuboy/Makefile b/emulators/gnuboy/Makefile
index 842fa060d19..5e87f197742 100644
--- a/emulators/gnuboy/Makefile
+++ b/emulators/gnuboy/Makefile
@@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/05/30 11:13:18 agc Exp $
+# $NetBSD: Makefile,v 1.2 2003/02/14 20:06:00 salo Exp $
 
-DISTNAME=		gnuboy-0.9.13
-CATEGORIES=		emulators
-MASTER_SITES=		http://brightrain.aerifal.cx/~laguna/src/
+DISTNAME=	gnuboy-1.0.3
+CATEGORIES=	emulators
+MASTER_SITES=	http://gnuboy.unix-fu.org/src/
 
-MAINTAINER=		motor@diku.dk
-HOMEPAGE=		http://brightrain.aerifal.cx/~laguna/
-COMMENT=		gameboy emulator
+MAINTAINER=	motor@diku.dk
+HOMEPAGE=	http://gnuboy.unix-fu.org/
+COMMENT=	gameboy emulator
 
-GNU_CONFIGURE= yes
+GNU_CONFIGURE=	yes
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gnuboy
 	${INSTALL_PROGRAM} ${WRKSRC}/xgnuboy ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/etc/sample.rc \
-	   ${WRKSRC}/CREDITS ${PREFIX}/share/doc/gnuboy/
+	   ${WRKSRC}/docs/* ${PREFIX}/share/doc/gnuboy/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/gnuboy/PLIST b/emulators/gnuboy/PLIST
index 412c517fa20..bdad2e0a2be 100644
--- a/emulators/gnuboy/PLIST
+++ b/emulators/gnuboy/PLIST
@@ -1,6 +1,13 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:52:41 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/02/14 20:06:00 salo Exp $
 bin/xgnuboy
+share/doc/gnuboy/CHANGES
+share/doc/gnuboy/CONFIG
+share/doc/gnuboy/CREDITS
+share/doc/gnuboy/FAQ
+share/doc/gnuboy/HACKING
+share/doc/gnuboy/LIBERTY
 share/doc/gnuboy/README
+share/doc/gnuboy/README.old
+share/doc/gnuboy/WHATSNEW
 share/doc/gnuboy/sample.rc
-share/doc/gnuboy/CREDITS
 @dirrm share/doc/gnuboy
diff --git a/emulators/gnuboy/distinfo b/emulators/gnuboy/distinfo
index 691545fcb1f..a524d416e1b 100644
--- a/emulators/gnuboy/distinfo
+++ b/emulators/gnuboy/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/07/22 16:25:10 wiz Exp $
+$NetBSD: distinfo,v 1.3 2003/02/14 20:06:01 salo Exp $
 
-SHA1 (gnuboy-0.9.13.tar.gz) = 0cf8f99f83282fb836da5c87b08213e00453a9fe
-Size (gnuboy-0.9.13.tar.gz) = 159517 bytes
-SHA1 (patch-aa) = 981c4b723bb966a3d5e912c5d5a84cb8ba9ff4f1
-SHA1 (patch-ab) = 2814c8b78b074163310300a3f531180e760eb109
-SHA1 (patch-ac) = f141f58c48ccacb2c549d5c2f6a48f58f0d0de4d
-SHA1 (patch-ad) = a76f88b49ad539f3b71c487259fe7a564905c2e2
+SHA1 (gnuboy-1.0.3.tar.gz) = 4c371445b6599c6636d08ba9c5de7bb9fbf78437
+Size (gnuboy-1.0.3.tar.gz) = 187627 bytes
+SHA1 (patch-aa) = d99a316e40d1249685204f23e66e3709cefc03e3
+SHA1 (patch-ab) = 0941dc1827ed998ee6ff66014239bb30f85124fa
+SHA1 (patch-ac) = 491bad4bd58f99fb72210cda5a6801f48d6c17d8
+SHA1 (patch-ad) = cac88fded5d8422824faf57d8d32ab571a611fc1
diff --git a/emulators/gnuboy/patches/patch-aa b/emulators/gnuboy/patches/patch-aa
index 6fbb1733a11..7fe9103acbb 100644
--- a/emulators/gnuboy/patches/patch-aa
+++ b/emulators/gnuboy/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2001/07/22 16:25:11 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2003/02/14 20:06:01 salo Exp $
 
---- Makefile.in.orig	Sun Mar  4 06:16:31 2001
+--- Makefile.in.orig	Tue Jul  3 12:31:18 2001
 +++ Makefile.in
-@@ -19,6 +19,8 @@
+@@ -20,6 +20,8 @@ SYS_DEFS = @DEFS@ @ENDIAN@ @ASM@ @SYS_DE
  SYS_OBJS = sys/nix/nix.o $(ASM_OBJS)
  SYS_INCS = -I/usr/local/include @XINCS@ -I./sys/nix
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.2 2001/07/22 16:25:11 wiz Exp $
  FB_OBJS = @FB_OBJS@ @JOY@ @SOUND@
  FB_LIBS = 
  
-@@ -30,20 +32,20 @@
+@@ -31,20 +33,20 @@ SDL_LIBS = @SDL_LIBS@
  SDL_CFLAGS = @SDL_CFLAGS@
  
  X11_OBJS = sys/x11/xlib.o sys/x11/keymap.o @JOY@ @SOUND@
@@ -36,7 +36,7 @@ $NetBSD: patch-aa,v 1.2 2001/07/22 16:25:11 wiz Exp $
  
  sys/sdl/sdl.o: sys/sdl/sdl.c
  	$(MYCC) $(SDL_CFLAGS) -c $< -o $@
-@@ -52,7 +54,7 @@
+@@ -53,11 +55,11 @@ sys/sdl/keymap.o: sys/sdl/keymap.c
  	$(MYCC) $(SDL_CFLAGS) -c $< -o $@
  
  xgnuboy: $(OBJS) $(SYS_OBJS) $(X11_OBJS)
@@ -44,4 +44,10 @@ $NetBSD: patch-aa,v 1.2 2001/07/22 16:25:11 wiz Exp $
 +	$(LD) $(LDFLAGS) $(OBJS) $(SYS_OBJS) $(X11_OBJS) -o $@ $(X11_LIBS) $(OSS_LIB)
  
  install: all
- 	$(INSTALL) -m 755 $(TARGETS) $(prefix)$(bindir)
+-	$(INSTALL) -d $(bindir)
+-	$(INSTALL) -m 755 $(TARGETS) $(bindir)
++	$(INSTALL) -d $(prefix)$(bindir)
++	$(INSTALL) -m 755 $(TARGETS) $(prefix)$(bindir)
+ 
+ clean:
+ 	rm -f *gnuboy gmon.out *.o sys/*.o sys/*/*.o asm/*/*.o
diff --git a/emulators/gnuboy/patches/patch-ab b/emulators/gnuboy/patches/patch-ab
index 9ef28372041..844be7893a9 100644
--- a/emulators/gnuboy/patches/patch-ab
+++ b/emulators/gnuboy/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/05/30 11:13:18 agc Exp $
+$NetBSD: patch-ab,v 1.2 2003/02/14 20:06:01 salo Exp $
 
---- configure.in.orig	Sat Mar 24 22:26:19 2001
+--- configure.in.orig	Sun Sep 23 21:09:31 2001
 +++ configure.in
-@@ -53,6 +53,11 @@
+@@ -53,6 +53,11 @@ OpenBSD)
  SYS_DEFS=-DIS_OBSD
  AC_CHECK_HEADERS(soundcard.h, [SOUND=sys/oss/oss.o])
  ;;
@@ -14,7 +14,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/05/30 11:13:18 agc Exp $
  esac
  
  test "$SOUND" || SOUND=sys/dummy/nosound.o
-@@ -196,6 +201,7 @@
+@@ -251,6 +256,7 @@ AC_SUBST(SDL_LIBS)
  AC_SUBST(TARGETS)
  AC_SUBST(XINCS)
  AC_SUBST(XLIBS)
diff --git a/emulators/gnuboy/patches/patch-ac b/emulators/gnuboy/patches/patch-ac
index 7910b9d0d75..e39c78c42b3 100644
--- a/emulators/gnuboy/patches/patch-ac
+++ b/emulators/gnuboy/patches/patch-ac
@@ -1,50 +1,59 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/05/30 11:13:18 agc Exp $
+$NetBSD: patch-ac,v 1.2 2003/02/14 20:06:02 salo Exp $
 
---- configure.orig	Sun Mar 25 11:18:37 2001
+--- configure.orig	Tue Nov  6 03:03:13 2001
 +++ configure
-@@ -1385,6 +1385,50 @@
+@@ -2499,6 +2499,59 @@ fi
  done
  
  ;;
 +NetBSD)
 +SYS_DEFS=-DIS_NBSD
-+for ac_hdr in soundcard.h
++
++for ac_header in soundcard.h
 +do
-+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-+echo "configure:1395: checking for $ac_hdr" >&5
-+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++echo "$as_me:2508: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
 +else
-+  cat > conftest.$ac_ext <<EOF
-+#line 1400 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 2514 "configure"
 +#include "confdefs.h"
-+#include <$ac_hdr>
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:1405: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=yes"
++#include <$ac_header>
++_ACEOF
++if { (eval echo "$as_me:2518: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  egrep -v '^ *\+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:2524: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  eval "$as_ac_Header=yes"
 +else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
 +  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=no"
++  eval "$as_ac_Header=no"
 +fi
-+rm -f conftest*
++rm -f conftest.err conftest.$ac_ext
 +fi
-+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_hdr 1
++echo "$as_me:2543: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++  cat >>confdefs.h <<EOF
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +EOF
 + SOUND=sys/oss/oss.o
-+else
-+  echo "$ac_t""no" 1>&6
 +fi
 +done
 +
@@ -53,213 +62,11 @@ $NetBSD: patch-ac,v 1.1.1.1 2001/05/30 11:13:18 agc Exp $
  esac
  
  test "$SOUND" || SOUND=sys/dummy/nosound.o
-@@ -1402,7 +1446,7 @@
- 
- if test "$with_svgalib" != "no" ; then
- echo $ac_n "checking for vga_init in -lvga""... $ac_c" 1>&6
--echo "configure:1406: checking for vga_init in -lvga" >&5
-+echo "configure:1450: checking for vga_init in -lvga" >&5
- ac_lib_var=`echo vga'_'vga_init | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1410,7 +1454,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lvga  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1414 "configure"
-+#line 1458 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -1421,7 +1465,7 @@
- vga_init()
- ; return 0; }
- EOF
--if { (eval echo configure:1425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -1441,17 +1485,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1445: checking for $ac_hdr" >&5
-+echo "configure:1489: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1450 "configure"
-+#line 1494 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1455: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:1499: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -1491,7 +1535,7 @@
- # Extract the first word of "sdl-config", so it can be a program name with args.
- set dummy sdl-config; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1495: checking for $ac_word" >&5
-+echo "configure:1539: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_SDL_CONFIG'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1523,7 +1567,7 @@
- old_incs="$INCS"
- INCS="$INCS $SDL_CFLAGS"
- echo $ac_n "checking for SDL_Init in -lSDL""... $ac_c" 1>&6
--echo "configure:1527: checking for SDL_Init in -lSDL" >&5
-+echo "configure:1571: checking for SDL_Init in -lSDL" >&5
- ac_lib_var=`echo SDL'_'SDL_Init | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1531,7 +1575,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lSDL $SDL_LIBS $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1535 "configure"
-+#line 1579 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -1542,7 +1586,7 @@
- SDL_Init()
- ; return 0; }
- EOF
--if { (eval echo configure:1546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -1562,17 +1606,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1566: checking for $ac_hdr" >&5
-+echo "configure:1610: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1571 "configure"
-+#line 1615 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1576: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:1620: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -1617,7 +1661,7 @@
- # Uses ac_ vars as temps to allow command line to override cache and checks.
- # --without-x overrides everything else, but does not touch the cache.
- echo $ac_n "checking for X""... $ac_c" 1>&6
--echo "configure:1621: checking for X" >&5
-+echo "configure:1665: checking for X" >&5
- 
- # Check whether --with-x or --without-x was given.
- if test "${with_x+set}" = set; then
-@@ -1679,12 +1723,12 @@
- 
-   # First, try using that file with no special directory specified.
- cat > conftest.$ac_ext <<EOF
--#line 1683 "configure"
-+#line 1727 "configure"
- #include "confdefs.h"
- #include <$x_direct_test_include>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1688: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:1732: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -1753,14 +1797,14 @@
-   ac_save_LIBS="$LIBS"
-   LIBS="-l$x_direct_test_library $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1757 "configure"
-+#line 1801 "configure"
- #include "confdefs.h"
- 
- int main() {
- ${x_direct_test_function}()
- ; return 0; }
- EOF
--if { (eval echo configure:1764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   LIBS="$ac_save_LIBS"
- # We can link X programs with no special library path.
-@@ -1850,7 +1894,7 @@
- if test "$no_x" != "yes" ; then
- with_x=yes
- echo $ac_n "checking for XShmCreateImage in -lXext""... $ac_c" 1>&6
--echo "configure:1854: checking for XShmCreateImage in -lXext" >&5
-+echo "configure:1898: checking for XShmCreateImage in -lXext" >&5
- ac_lib_var=`echo Xext'_'XShmCreateImage | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1858,7 +1902,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lXext  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1862 "configure"
-+#line 1906 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -1869,7 +1913,7 @@
- XShmCreateImage()
- ; return 0; }
- EOF
--if { (eval echo configure:1873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -1900,17 +1944,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1904: checking for $ac_hdr" >&5
-+echo "configure:1948: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1909 "configure"
-+#line 1953 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1914: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:1958: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -2058,6 +2102,7 @@
- 
- 
- 
-+
- trap '' 1 2 15
- cat > confcache <<\EOF
- # This file is a shell script that caches the results of configure
-@@ -2209,6 +2254,7 @@
- s%@TARGETS@%$TARGETS%g
- s%@XINCS@%$XINCS%g
- s%@XLIBS@%$XLIBS%g
-+s%@OSS_LIB@%$OSS_LIB%g
- 
+@@ -3679,6 +3732,7 @@ s,@SDL_LIBS@,$SDL_LIBS,;t t
+ s,@TARGETS@,$TARGETS,;t t
+ s,@XINCS@,$XINCS,;t t
+ s,@XLIBS@,$XLIBS,;t t
++s,@OSS_LIB@,$OSS_LIB,;t t
  CEOF
+ 
  EOF
diff --git a/emulators/gnuboy/patches/patch-ad b/emulators/gnuboy/patches/patch-ad
index 6f34876892a..97a22fba461 100644
--- a/emulators/gnuboy/patches/patch-ad
+++ b/emulators/gnuboy/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/05/30 11:13:18 agc Exp $
+$NetBSD: patch-ad,v 1.2 2003/02/14 20:06:02 salo Exp $
 
---- sys/oss/oss.c.orig	Sun Mar 25 08:17:38 2001
+--- sys/oss/oss.c.orig	Sun Sep 23 14:01:10 2001
 +++ sys/oss/oss.c
-@@ -6,6 +6,12 @@
+@@ -7,6 +7,12 @@ char *strdup();
  #include <sys/stat.h>
  #include <fcntl.h>