Update to 4.2.0:

========================================================================
============ Changes from 4.2.0 RC2 to 4.2.0 (October 2005) ============
========================================================================

   Peter Wang made fixmul() detect overflows as it used to do in the 4.0.x
   branch.

   Dennis Busch found a bug where d_clear_proc would not work properly if the
   GUI target bitmap is different from screen.

   Grzegorz Adam Hankiewicz made Allegro log all TRACE output with a prefix
   in the format "al-system level: ". This makes it easier to grep debug logs.

   Grzegorz Adam Hankiewicz made dialogs with MSG_CHAR/MSG_UCHAR handlers
   honor a D_CLOSE return flag without a D_USED_CHAR.

   Peter Hull fixed problems with the mouse position as reported by Allegro and
   the mouse position as known to OS X.

   Peter Hull made Command-Q not close the application if no exit-button
   callback is registered.

   Peter Hull fixed problems with joysticks under MacOS X as reported by
   Thomas Harte.

   Peter Hull fixed a bug preventing more than one Allegro application from
   being run at a time on Mac OS X. Reported by Thomas Harte.

   Peter Hull did a lot of other things for the MacOS X port too.

   Jiri Gabriel fixed loading of multiple ranges in a single bitmap with txt
   fonts.

   Milan Mimica and Jiri Gabriel fixed several bugs in extract_font_range.

   Dennis Busch fixed a Unicode bug in the mode selector.

   Evert Glebbeek added FA_ALL and FA_NONE file attribute flags.

   Peter Hull fixed a deadlock in OS X when calling vsync() while the screen
   was acquired.

   Robert Alfonso fixed a grabber crash when importing a new font range into an
   existing font. Reported by Milan Mimica.

   Chris Robinson fixed the fileselector in UNIXnot properly recognising
   filenames containing UTF-8 characters.

   Hrvoje Ban and Peter Wang wrote a documentation section that explains
   several common mistakes.

   Elias Pschernig disabled DGA auto-detection under X11

   i_am_drv added support for .rmi midis to the midi reader

   Elias Pschernig fixed a fix-point overflow in pivot_sprite.

   Michal Molhanec fixed several problems with the Watcom compiler.

   Peter Hull fixed an error with 'make uninstall' on MacOS X.

   Matthew Leverton added a programs: makefile target.

   Many small fixes and improvements by Michal Molhanec, Peter Hull, Chris
   Robinson, Peter Wang and Elias Pschernig.

   Documentation improvements by Grzegorz Adam Hankiewicz, Tore Halse and
   Peter Hull.


===========================================================================
============ Changes from 4.2.0 RC1 to 4.2.0 RC2 (August 2005) ============
===========================================================================

   Grady Martin made the grabber consider deleting object properties as a
   change to the datafile.

   Milan Mimica fixed numerous bugs in extract_font_range().

   Peter Hull moved the 'magic chdir' in the MacOS X port to earlier in the
   startup process, so that the config file will be looked for in the
   resource directory if is present.

   Chris Robinson made create_bitmap(0,0) not return a bitmap that would
   later crash destroy_bitmap().  Zero-sized bitmaps are still not allowed so
   the assertions for debug mode have not changed.

   Elias Pschernig patched the Windows keyboard driver to get key_shifts
   working again with KB_SHIFT_FLAG, KB_CTRL_FLAG, KB_ALT_FLAG on Win98.

   Peter Wang changed hline and vline into aliases for internal symbols to
   avoid a conflict with the curses API. This change should be transparent
   for users.

   Matthew Leverton and Michal Molhanec updated the build system for MSVC 8.

   Grzegorz Adam Hankiewicz prevented make_relative_filename() from crashing
   with malformed parameters.

   Hrvoje Ban made ASSERT() actually abort in Windows.

   Chris Robinson made GUI menus work with gui_screen.

   Evert Glebbeek fixed reading of 32 bit Windows .bmp files, which was not
   supported.  These files seem to be not very standard though, so it's
   unclear if it will always do the right thing.  Alpha channels also seem
   not to be standard in 32 bit BMP files, so it's possible they're not read
   in correctly.

   Peter Wang and Peter Hull updated the ABI compatibility document.  This
   documents our policy for the 4.2.x series.

   Extensive documentation updates from Grzegorz Adam Hankiewicz and minor
   updates due to Michael Faerber, Robert Ohannessian and Milan Mimica.


==============================================================================
============ Changes from 4.2.0 beta 4 to 4.2.0 RC1 (August 2005) ============
==============================================================================

   Peter Hull fixed the MacOS X port to avoid an issue with the dead bootstrap
   context and cleaned up the dock notification. This means command line
   apps (with SYSTEM_NONE) run without the dock being notified.

   Peter Wang Added a COLORCONV_KEEP_ALPHA flag, as suggested by Gideon Weems.

   Peter Wang fixed issues with OSS in OpenBSD and made the configure script
   print a warning if Allegro is compiled without X11 support.

   Peter Hull set the compatibility version to 4.2.0 for MacOS X and added a
   MacOS X help file.

   Peter Wang made the Mode-X and VBE/AF drivers fail if Allegro is compiled
   as a C-only library in Linux and made the Unix port install liballeg*.so
   and the alleg-*.so modules with the execute permission enabled.

   Grady Martin standardised some of the grabber dialog boxes and added a `move'
   command to the grabber.

   Evert Glebbeek fixed a bug when loading some old datafiles containing
   monochrome fonts.

   Evert Glebbeek fixed a bug that prevented system cursors from working
   correctly in Windows.

   Olivier Blin fixed compilation problems for the ModeX driver with newer
   binutils.

   Shawn Walker fixed a bug in get_executable_name under some UNIX systems.

   Shawn Walker worked around a problem with some versions of GNU AS and fixed
   some errors in the configure script when not using GCC.

   Elias Pschernig made create_sample not unnecessarily clear the sample to 0.

   Bobby Ferris fixed the makedoc SciTE API output.

   Elias Pschernig fixed a too strict assert that prevented set_volume from
   working in debug mode.

   Paavo Ahola helped fix a problem with BCC and the C implementations of
   fixmul.

   Elias Pschernig fixed a cosmetic bug where the listbox was drawing a too big
   selection rectangle, reported by dthompson.

   Documentation and example updates by Grzegorz Adam Hankiewicz, Peter
   Wang, Elias Pschernig Michal Molhanec and Evert Glebbeek.


===============================================================================
============ Changes from 4.2.0 beta 3 to 4.2.0 beta 4 (June 2005) ============
===============================================================================

   Matthew Leverton changed the default behavior of the grabber: default color
   depth is now the desktop, default mode is windowed and if fullscreen is
   specified, then desktop resolution is used by default.

   Peter Wang fixed compilation problems related to get_modex_screen() on
   UNIX and deprecated it.

   Robert Ohannessian fixed compilation problems for the assembler code with
   newer binutils.

   Peter Wang, Thomas Harte and Evert Glebbeek optimised fixmul() for different
   platforms.

   Robert Alfonso fixed a couple of warnings that with DJGPP.

   Grzegorz Adam Hankiewicz made the FLIC player yield.

   Miran Amon fixed an arbitrary limit in get_config_argv(). Evert Glebbeek
   fixed a memory leak in same.

   Thomas Klausner fixed a problem in allegro.m4 and automake 1.8+.

   Charles Wardlaw fixed some warnings with gcc 4 on MacOS X.

   Elias Pschernig removed the `256 items' limit from the dat utility.

   Julien Cugniere fixed a crash in the GUI if a new dialog was opened while
   a menu was still open.

   Shawn Walker fixed crashes with the keyboard driver under Solaris.

   Elias Pschernig split the demo game into multiple files and made the
   makefile handle a multi-file demo game.

   Evert Glebbeek fixed a bug where the hardware mouse wasn't displayed in
   Windows until the mouse was moved.

   J.P. Morris fixed rest_callback() under UNIX.

   Shawn Walker and Evert Glebbeek fixed get_executable_name() under
   Solaris and OpenBSD.

   Peter Hull fixed compilation problems with setAppleMenu under Tiger.

   Peter Hull fixed a deadlock on MacOS X related to mouse updating.

   Peter Wang fixed a problem with compiling the VBE/AF driver using newer
   binutils.

   Evert Glebbeek fixed a bug with colour conversions when loading a font from
   a datafile.

   Many code, example and documentation updates by Grzegorz Adam Hankiewicz,
   Elias Pschernig, Peter Wang, Evert Glebbeek, Andrei Ellman,
   Victor Williams Stafusa da Silva, Matthew Leverton, AJ, Michal Molhanec
   and Hrvoje Ban.


==============================================================================
============ Changes from 4.2.0 beta 2 to 4.2.0 beta 3 (May 2005) ============
==============================================================================

   Grzegorz Adam Hankiewicz did several documentation updates.

   Evert Glebbeek cleaned up some of the global namespace pollution in the
   Windows port.

   Chris Robinson made improvements to the Windows sound driver.

   Chris Robinson made the GUI multi-selection box behave a bit nicer.

   Grzegorz Adam Hankiewicz added a bunch of ASSERTs to the code to check for
   out-of-range arguments.

   Jakub Wasilewski fixed a bug when loading greyscale TGA images.

   Evert Glebbeek fixed a bug where the bottom and right line of pixels was
   not updated on show_video_bitmap, as pointed out by Thomas Harte.

   Evert Glebbeek documented JOY_TYPE_* defines for Windows and Linux.

   Dark Nation restored the ability to read old-style encrypted packfiles,
   i.e. those produced before Allegro 3.9.30.  This was silently removed
   from 4.1.18 when custom packfile support / decoupled compression routines
   were added.

   Evert Glebbeek made the grabber and dat utilities now use Allegro's builtin
   load_font() function and made datafiles properly store truecolour fonts and
   added a datedit_select() callback to datedit.

   Evert Glebbeek fixed some unsafe assumptions on the size of integer
   datatypes.

   Arthur Huillet fixed a typo in the docs.

   Elias Pschernig restored Alt+key = ASCII code 0 behavior for the Windows
   keyboard driver

   Evert Glebbeek fixed a bug that caused a crash when loading Allegro 1.x
   datafiles containing 4 bit bitmaps.

   Peter Wang clarified the mode select documentation and made the mode
   selector clear the input variables before passing them on to the filter.

   Peter Wang fixed a bug in the mode selector where disabled drivers were
   still shown with empty resolution lists. Pointed out by Hrvoje Ban.

   Elias Pschernig fixed Allegro's internal multithreading in Windows. This
   fixes a deadlock on exit.

   Robert Alfonso made the MSVC makefile call `link /lib' rather than `lib',
   which doesn't work for the free toolkit.

   Peter Hull fixed a problem with hardware cursors not working properly in
   MacOS X.

   Peter Hull added a missing enable_hardware_cursor vtable entry and added OS
   native cursors for the MacOS X port.

   Grzegorz Adam Hankiewicz documented the online Allegro patch generator.

   Evert Glebbeek renamed datafiles._tx -> datafile._tx

   StApostol updated the FAQ to use rest(0) instead of the deprecated yield_timeslice().

   Evert Glebbeek silenced some GCC4 warnings in MacOS X.

   Peter Wang fixed warnings and errors with gcc 4.0.0 on the Unix port;
   reported by Milan Mimica.

   Peter Wang added the preprocessor symbol ALLEGRO_NO_FIX_CLASS that the user
   can define to not pull in the `fix' class in C++ programs.

   Peter Wang removed the exdodgy example.

   Elias Pschernig fixed another X11 async reply bug.

   Elias Pschernig made the seek in expackf test work with CR/LF line endings.

   Evert Glebbeek fixed a small bug that prevented the Allegro template for
   Project Builder from installing correctly on MacOSX.

   Elias Pschernig enabled warnings about unused variables with
   --enable-strictwarn in unix.

   Peter Wang fixed a warning with Watcom 1.3.


================================================================================
============ Changes from 4.2.0 beta 1 to 4.2.0 beta 2 (April 2005) ============
================================================================================

   Daniel Schlyder fixed a problem with the makefile in Windows.

   Evert Glebbeek fixed a bug that prevented true colour fonts from working.

   Peter Wang fixed a possible deadlock in dialog_message.

   Elias Pschernig fixed a bug where the DJGPP version would choke on a missing
   variable.

   Peter Hull made makedoc return an error code if it failed to build the
   SciTE documentation.

   Evert Glebbeek fixed a problem with incorrect dependencies being generated
   for MacOS X.

   Tobi Vollebregt fixed a problem in X11 if the XRGBACursor extension was
   missing.

   Evert Glebbeek made configure use k8 rather than athlon64 as a compiler
   switch on AMD64.

   Peter Wang and Elias Pschernig added a packfile example.

   Michal Molhanec fixed a problem in the MSVC makefile.

   Evert Glebbeek removed void*-arithmetic from the colour converter.

   Evert Glebbeek fixed a bug where hardware cursors would stop working.

   Elias Pschernig, Andrew Chew fixed and Tobi Vollebregt fixed several
   problems with the Windows keyboard driver.

   Elias Pschernig fixed bug in unix dependency generation.

   Elias Pschernig made the GUI not mess up the hardware cursor.

   Elias Pschernig removed pckeys.c and keyconf from the windows port, since
   the dinput driver no longer needs pckeys.c nor uses keyboard.dat.

   Daniel Schlyder fixed a problem with the -mtune switch on older gcc based
   compilers.

   Matthew Leverton figured out which versions of Watcom have inttypes.h and
   stdint.h.

   V Karthik Kumar added a password to the Windows screensaver example.

   Cosmetic fixes, example bugfixes and spelling corrections by Jon Rafkind,
   Evert Glebbeek, Peter Wang, StApostol and Elias Pschernig.


========================================================================
============ Changes from 4.1.18 to 4.2.0 beta (March 2005) ============
========================================================================

   Peter Wang fixed many problems on AMD64 in Linux - it should now work fine.

   Peter Hull added CPU detection to the MacOS X port.

   Peter Hull fixed some problems related to /usr/local/bin not existing in
   recent versions of MacOS X.

   Elias Pschernig and Peter Wang rewrote the Windows keyboard driver so it
   no longer needs keyboard.dat.

   Elias Pschernig added a show_os_cursor function as an alternative to
   show_mouse() for system cursors.

   Evert Glebbeek and Peter Wang added an example programme for system cursors.

   Elias Pschernig fixed a deadlocks in X11 related to scare_mouse() and
   keyboard repeats and fixed async replies.

   Daniel Schlyder fixed the gcc -mcpu is deprecated warnings.

   Peter Wang added an astdint.h, which provides C99 typedefs for pre-C99
   compilers.

   AJ added detection for DirectX 8 and 9 to the Windows port.

   Evert Glebbeek added detection for AMD64 to the UNIX port and test
   programme.

   Elias Pschernig added a get_midi_length function and a midi_time variable.

   Elias Pschernig fixed a problem where Allegro would ignore a user-specified
   configuration file if set_config_file() was called before allegro_init().

   Evert Glebbeek added a transpose_font function.

   Evert Glebbeek added support for true colour fonts and a font example.

   Elias Pschernig fixed a problem in shutdown_dialog() reported by Tobi
   Vollebregt.

   Marcio Fialho fixed some issues with displaying author names in the demo
   game.

   Andrei Ellman fixed a problem in the MSVC makefile when building Allegro
   with Cygwin.

   Daniel Schlyder fixed (again) problems with creating directories in
   different setups in Windows.

   Elias Pschernig added documentation for the custom packfile functions.

   Jeff Mitchell fixed the location of grabber.txt in the spec file.

   Harshavardhana Reddy added a Kannada greeting to exunicod.

   Elias Pschernig cleaned up the example programmes.

   Peter Wang made it possible to disable the hardware cursor in X by passing
   an option to the configure script.

   AJ and Michal Molhanec added an MSVC 7 configure option and added an msvc7
   switch to fix.bat. Karthik Kumar did the same for the Intel compiler icl.

   Mr_Bones fixed compilation of setup.c when --disable-ossdigi is used

   AJ fixed a beep being generated in Windows when alt+character was pressed
   in Windowed mode.

   Peter Wang fixed many oversights and problems in the library and examples and
   allowed the code to be build with stricter warnings.

   Peter Wang fixed problems compiling the Windows port with WARNMODE=1

   Tore Halse fixed compilation problems in Windows related to TITLEBARINFO.

   Daniel Schlyder made the Windows port use TITLEBARINFO if it is available.

   Grzegorz Adam Hankiewicz made many improvements to the documentation.

8 files changed, 34 insertions, 60 deletions

diff --git a/devel/allegro/Makefile b/devel/allegro/Makefile
index 1b11396978b..c2f51ff1de0 100644
--- a/devel/allegro/Makefile
+++ b/devel/allegro/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:02 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2006/01/22 13:55:20 wiz Exp $
 
-DISTNAME=	allegro-4.1.18
-PKGREVISION=	1
+DISTNAME=	allegro-4.2.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=alleg/}
 
@@ -18,7 +17,7 @@ USE_MAKEINFO=		yes
 INFO_FILES=		allegro.info
 INSTALL_TARGET=		install install-info
 
-# NetBSD's OSS midi emulation is non-existant.
+# NetBSD's OSS midi emulation is non-existent.
 CONFIGURE_ARGS+=	--disable-ossmidi
 
 LIBS+=		${LIBOSSAUDIO}
diff --git a/devel/allegro/PLIST b/devel/allegro/PLIST
index ec648fb5844..8f6d750fa0a 100644
--- a/devel/allegro/PLIST
+++ b/devel/allegro/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2005/02/09 20:16:34 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/01/22 13:55:20 wiz Exp $
 bin/allegro-config
 bin/colormap
 bin/dat
@@ -49,6 +49,7 @@ include/allegro/internal/aintvga.h
 include/allegro/internal/alconfig.h
 include/allegro/joystick.h
 include/allegro/keyboard.h
+include/allegro/lzss.h
 include/allegro/matrix.h
 include/allegro/midi.h
 include/allegro/mouse.h
@@ -83,6 +84,7 @@ include/allegro/platform/alunix.h
 include/allegro/platform/alunixac.h
 include/allegro/platform/alwatcom.h
 include/allegro/platform/alwin.h
+include/allegro/platform/astdint.h
 include/allegro/platform/macdef.h
 include/allegro/quat.h
 include/allegro/rle.h
@@ -94,16 +96,15 @@ include/allegro/timer.h
 include/allegro/unicode.h
 include/linalleg.h
 include/xalleg.h
-lib/allegro/4.1/alleg-dga2.so
-lib/allegro/4.1/modules.lst
-${ESOUND}lib/allegro/4.1/alleg-esddigi.so
+lib/allegro/4.2/alleg-dga2.so
+lib/allegro/4.2/modules.lst
 lib/liballeg-${PKGVERSION}.so
-lib/liballeg.so.4.1
+lib/liballeg.so.4.2
 lib/liballeg_unsharable.a
 share/aclocal/allegro.m4
+@dirrm lib/allegro/4.2
+@dirrm lib/allegro
 @dirrm include/allegro/platform
 @dirrm include/allegro/internal
 @dirrm include/allegro/inline
 @dirrm include/allegro
-@dirrm lib/allegro/4.1
-@dirrm lib/allegro
diff --git a/devel/allegro/distinfo b/devel/allegro/distinfo
index 293adba3f39..6d5a7058246 100644
--- a/devel/allegro/distinfo
+++ b/devel/allegro/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.8 2005/09/11 14:17:44 wiz Exp $
+$NetBSD: distinfo,v 1.9 2006/01/22 13:55:20 wiz Exp $
 
-SHA1 (allegro-4.1.18.tar.gz) = 6bfed4fc3e5cfcd8ad8ab1dc1744023f0b5e702e
-RMD160 (allegro-4.1.18.tar.gz) = 05dc8ca8783487c9cca694bc22f95a06e77d64fe
-Size (allegro-4.1.18.tar.gz) = 2900486 bytes
-SHA1 (patch-aa) = d296878f4120ddf4eca3c6eff76493755c817cec
-SHA1 (patch-ab) = a6681a0ef54a50db4726071ae75d88e33bee8fba
+SHA1 (allegro-4.2.0.tar.gz) = 5b4a542c038ee196564f9107de59fe30a8caeaf5
+RMD160 (allegro-4.2.0.tar.gz) = e1602ea2f8bc1761be0ee34001e9d77d3a6ea3ff
+Size (allegro-4.2.0.tar.gz) = 3056173 bytes
+SHA1 (patch-aa) = 8e1c2caad03c4f7840a75a38675d234d95410056
+SHA1 (patch-ab) = 839ae8fb1544e967be1923fa1d316df339a120bd
 SHA1 (patch-ac) = 78f99723b095f460f20e8367fffb443a8f3d6ab6
 SHA1 (patch-ad) = 52f694e1b0053cff94c53ee10f603d535eba5fa5
-SHA1 (patch-ae) = 89839ee94e798c08d4121521a64a549d46535f74
-SHA1 (patch-ax) = 7c7e2dce2e1ab388832e56262686876dc52d3d42
-SHA1 (patch-ay) = 7f6d3d14acde2bbccb2d74062e3fd99f4c63011a
+SHA1 (patch-ax) = 43c692d763666b0666f9932fd1f09cd4476a65e4
+SHA1 (patch-ay) = 79bf537f81b8df52438c07fbaf990a36678f4e28
diff --git a/devel/allegro/patches/patch-aa b/devel/allegro/patches/patch-aa
index a9f38908d8a..c8d00bda699 100644
--- a/devel/allegro/patches/patch-aa
+++ b/devel/allegro/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2005/05/23 12:05:31 wiz Exp $
+$NetBSD: patch-aa,v 1.5 2006/01/22 13:55:20 wiz Exp $
 
---- makefile.in.orig	2004-12-02 02:02:14.000000000 +0100
+--- makefile.in.orig	2005-09-10 22:17:51.000000000 +0200
 +++ makefile.in
-@@ -480,17 +480,7 @@ install-lib: lib modules
+@@ -481,17 +481,7 @@ install-lib: lib modules
  	fi
  	$(mkinstalldirs) $(DESTDIR)$(bindir)
  	@echo Installing allegro-config to $(DESTDIR)$(bindir)
diff --git a/devel/allegro/patches/patch-ab b/devel/allegro/patches/patch-ab
index 4f68320d5e1..5d9ae0ce8a3 100644
--- a/devel/allegro/patches/patch-ab
+++ b/devel/allegro/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2005/05/23 12:05:31 wiz Exp $
+$NetBSD: patch-ab,v 1.5 2006/01/22 13:55:20 wiz Exp $
 
---- configure.orig	2005-01-24 18:46:54.000000000 +0100
+--- configure.orig	2005-11-06 10:54:00.000000000 +0100
 +++ configure
-@@ -10111,9 +10111,7 @@ if test -n "GCC"; then
+@@ -11368,9 +11368,7 @@ if test -n "$GCC"; then
    fi
    ALLEGRO_PROFILE_CFLAGS="$CFLAGS -pg $TARGET_ARCH -O2 -funroll-loops -ffast-math $WFLAGS"
    if test "X$allegro_cv_support_fomit_frame_pointer" = "Xyes"; then
diff --git a/devel/allegro/patches/patch-ae b/devel/allegro/patches/patch-ae
deleted file mode 100644
index c159230192b..00000000000
--- a/devel/allegro/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/05/23 12:05:46 wiz Exp $
-
---- misc/allegro.m4.orig	2004-07-15 10:10:01.000000000 +0200
-+++ misc/allegro.m4
-@@ -11,7 +11,7 @@
- dnl AM_PATH_allegro([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
- dnl Test for allegro, and define allegro_CFLAGS and allegro_LIBS
- dnl
--AC_DEFUN(AM_PATH_ALLEGRO,[ 
-+AC_DEFUN([AM_PATH_ALLEGRO],[ 
- AC_ARG_WITH(allegro-prefix,
-             [  --with-allegro-prefix=PFX   Prefix where liballegro is installed (optional)],
-             ALLEGRO_CONFIG_prefix="$withval", ALLEGRO_CONFIG_prefix="")
diff --git a/devel/allegro/patches/patch-ax b/devel/allegro/patches/patch-ax
index d5352f0b38e..191e3d5e28c 100644
--- a/devel/allegro/patches/patch-ax
+++ b/devel/allegro/patches/patch-ax
@@ -1,8 +1,8 @@
-$NetBSD: patch-ax,v 1.1 2005/09/11 14:17:44 wiz Exp $
+$NetBSD: patch-ax,v 1.2 2006/01/22 13:55:20 wiz Exp $
 
---- src/unix/usystem.c.orig	2005-09-08 11:51:43.000000000 +0900
-+++ src/unix/usystem.c	2005-09-08 11:53:54.000000000 +0900
-@@ -130,6 +130,7 @@
+--- src/unix/usystem.c.orig	2005-09-04 18:00:17.000000000 +0200
++++ src/unix/usystem.c
+@@ -130,6 +130,7 @@ int _unix_find_resource(char *dest, AL_C
     }
  
     /* if it is a .dat, look in /usr/share/ and /usr/local/share/ */
@@ -10,7 +10,7 @@ $NetBSD: patch-ax,v 1.1 2005/09/11 14:17:44 wiz Exp $
     if (ustricmp(get_extension(resource), uconvert_ascii("dat", tmp)) == 0) {
        ustrzcpy(buf, sizeof(buf), uconvert_ascii("/usr/share/allegro/", tmp));
        ustrzcat(buf, sizeof(buf), resource);
-@@ -137,6 +138,12 @@
+@@ -137,6 +138,12 @@ int _unix_find_resource(char *dest, AL_C
  	 ustrzcpy(dest, size, buf);
  	 return 0;
        }
@@ -23,15 +23,3 @@ $NetBSD: patch-ax,v 1.1 2005/09/11 14:17:44 wiz Exp $
        ustrzcpy(buf, sizeof(buf), uconvert_ascii("/usr/local/share/allegro/", tmp));
        ustrzcat(buf, sizeof(buf), resource);
        if (exists(buf)) {
-@@ -376,7 +376,11 @@
-    
-    /* Last resort: try using the output of the ps command to at least find */
-    /* the name of the file if not the full path */
-+#ifdef __NetBSD__
-+   uszprintf (linkname, sizeof(linkname), "ps -p %d", pid);
-+#else
-    uszprintf (linkname, sizeof(linkname), "ps -f -p %d", pid);
-+#endif
-    do_uconvert (linkname, U_CURRENT, filename, U_ASCII, size);
-    pipe = popen(filename, "r");
-    if (pipe) {
diff --git a/devel/allegro/patches/patch-ay b/devel/allegro/patches/patch-ay
index 47e454ba99c..b66696d5978 100644
--- a/devel/allegro/patches/patch-ay
+++ b/devel/allegro/patches/patch-ay
@@ -1,8 +1,8 @@
-$NetBSD: patch-ay,v 1.1 2005/09/11 14:17:44 wiz Exp $
+$NetBSD: patch-ay,v 1.2 2006/01/22 13:55:20 wiz Exp $
 
---- src/unix/umodules.c.orig	2005-09-08 11:48:35.000000000 +0900
-+++ src/unix/umodules.c	2005-09-08 11:53:04.000000000 +0900
-@@ -43,7 +43,10 @@
+--- src/unix/umodules.c.orig	2005-09-04 18:00:17.000000000 +0200
++++ src/unix/umodules.c
+@@ -44,7 +44,10 @@ static MODULE *module_list = NULL;
  /* where to look for modules.lst */
  static char *module_path[] =
  {