Update to 4.2.1:

=========================================================================
============ Changes from 4.2.1 RC1 to 4.2.1 (November 2006) ============
=========================================================================

   Peter Wang made the Unix ports query the memory page size with sysconf()
   when necessary, instead of using the PAGE_SIZE constant, which seems to be
   Linux-specific.

   Matthew Leverton gave the STATICRUNTIME builds of MSVC new names by
   appending _crt (c run time) to the libraries. He also fixed the problem of
   incorrectly setting the EMBED_MANIFEST variable when using the
   STATICRUNTIME.

   Andrei Ellman fixed an inverted test in pack_fopen_chunk on Windows.

   Peter Hull made 32-bit icon generation by fixbundle endian-independent
   (colours were incorrect on Intel Macs).

   Peter Wang fixed a long standing bug where some compressed packfiles would not
   be read back properly (premature EOF).  Reported by jman2050.

   Andrei Ellman spotted a free() of an internal buffer returned by tmpnam().

   Peter Hull fixed a problem with mouse-related deadlock on MacOS X as
   reported by Mike Farrell.

   Peter Hull implemented simulation of video bitmaps on MacOS X, so that
   page flipping will work.

   Peter Hull fixed an endian problem in the digital sound driver on MacOS X.

   Elias Pschernig and Chris Robinson fixed problems with UTF-8 filenames
   under Unix, as reported by Grzegorz.  Non-ASCII non-UTF-8 filenames remain
   broken.

   Chris Robinson fixed some problems with non-ASCII filenames under Windows.

   Elias Pschernig made the X11 driver call XInitThreads, to make Mesa-OpenGL
   work together with Allegro.  It can be disabled at runtime through a config
   variable.

   Andrei Ellman fixed a bug in datedit.c that could crash the grabber.

   Elias Pschernig added file_size_ex(), which returns a 64 bit integer
   to handle large files.

   Ron Novy made improvements to the test program.

   Peter Hull fixed problems with set_mouse_sprite() on Intel Macs.

   Peter Hull added universal binary support to the MacOS X port.

   Peter Wang and Evert Glebbeek independently fixed a problem with dependency
   generation for MacOS X on non-Mac systems.

   Many smaller fixes and updates by Peter Hull, Elias Pschernig, Peter Wang
   and Milan Mimica.


====================================================================
============ Changes from 4.2.0 to 4.2.1 RC1 (May 2006) ============
====================================================================

   Michal Molhanec made msvchelp.exe work on Cygwin, where there was a
   problem with the case-insensitivity of environment variables. Reported by
   Milan Mimica.

   Peter Hull fixed a bug where Allegro detected keypresses on
   KEY_MINUS_PAD as KEY_PLUS_PAD.

   Peter Hull made OSX work correctly with Logitech sticks, as discussed
   with Ultio.

   Milan Mimica fixed some spin loops in the test program.

   Chris Robinson added UTF8/Unicode support for filenames in Windows.

   Milan Mimica made the Linux console driver more robust:
   set_gfx_mode used to get stuck in a infinite loop when there wasn't a
   console available.

   Evert Glebbeek made the C blitter use memmove for normal blits, with a bugfix
   by Milan Mimica. This can be disabled by removing a #define USE_MEMMOVE at
   the top of cblit.h so that it can easliy be tested against the older versions
   of the code.

   Christer Sandberg worked around a problem where one-line high bitmaps would
   crash with  Electric Fence.

   Chris Robinson fixed a crash that occurred if the sound mixer quality
   level was set to 0 after the mixer was already initialised.

   Evert Glebbeek fixed the window title under X11, which was broken by a
   previous change.

   Peter Hull updated the endian detection under OSX as recommended by Apple.

   Miguel A. Gavidia and Jay Bernardo made qtmidi.m work on both PPC and Intel.

   Milan Mimica fixed a crash when vsync() on certain drivers.

   Elias Pschernig replaced the ALLEGRO_USE_C define with ALLEGRO_NO_ASM.

   Peter Wang restored the JACK driver to compiling state.

   Milan Mimica made the new transparent fonts be recognized as color fonts
   with is_color_font.

   Elias Pschernig made the modules path WIP version specific, for enhanced
   binary compatibility.

   Stijn Wolters clarified the documentation of init_dialog.

   Hans de Goede fixed a problem with dynamically generated stretcher code not
   being properly marked as executable on Linux (esp. SELinux).

   Hans de Goede fixed a busy wait in the X11 vsync simulation.

   Elias Pschernig makde it so modules under Unix are now searched in libdir
   as passed by the build machinery. Closes bug #1401840 from SF, reported by
   Paul Eipper.

   Milan Mimica added a get_volume and a get_hardware_volume function, to
   work as pendants to set_volume and set_hardware_volume.

   Milan Mimica corrected a case where a wrong structure on the stack was
   being cleared in the DirectSound input driver.

   Hans de Goede added a fullscreen driver for X11 which does not need
   XVidMode extension, and instead simply centers the window on the desktop
   and draws a black border around.

   Hans de Goede fixed a problem where switching to fullscreen mode under X11.

   Serge Semashko added Enter as a fire key in the demo game.

   Serge Semashko added fixed problems with Allegro working on Nokia 770.

   Peter Wang fixed some problems with binary compatibility checking in the
   4.2 branch.

   Catatonic Porpoise added OpenBSD detection (in addition to FreeBSD and
   NetBSD) and fixed an issue with executable rights not set on the memory
   for the i386 stretcher on UNIX systems.

   Hans de Goede fixed a bug preventing the ALSA driver to work on big endian
   systems.

   Elias Pschernig and Chris Robinson fixed binary compatibility checking in
   allegro_init and install_allegro.

   Catatonic Porpoise fixed the example in the documentation of
   stretch_sprite.

   Hans de Goede made DIGMID work with absolute paths in the patches.cfg file.

   Peter Hull added code to make Allegro work better with user-supplied Nibs
   under OSX, as discussed with Thomas Harte.

   Matthew Leverton added embedding of manifests to the MSVC 8 build process.

   Neil Walker and Thomas Harte implemented a hardware accelerated
   stretch_blit() for the Windows DX port.

   Evert Glebbeek corrected a bug when destroying sub-bitmaps under Windows.

   Evert Glebbeek fixed a bug in pack_fopen_chunk() where a temporary file
   would be created in a non-writable location.

   Peter Wang changed a "/lib" option to MSVC's link utility to "-lib" as
   reported to be problematic by Karthik Kumar.

   Peter Wang fixed a crash in dat and grabber due to the return value of
   pack_fopen_chunk() not being checked.

   Elias Pschernig added support for anti-aliased bitmap fonts.

   Dennis Busch fixed the short description of add_clip_rect.

   Thomas Harte and Neil Walker fixed a problem with draw_sprite() and
   sub-bitmaps.

   Peter Wang fixed scancode_to_name(KEY_NUMLOCK) returning "PAUSE" in Windows.

   Peter Wang fixed page flipping and triple buffering in the demo game.

   Elias Pschernig added list_config_sections and list_config_entries
   functions.

   Hrvoje Ban added create_datafile_index and load_datafile_object_indexed
   functions.

   Peter Hull allowed use of "mingw" instead of  "mingw32" in fix.bat and
   fix.sh.

   Peter Wang fixed a bug with SWITCH_BACKAMNESIA mode with the fbcon graphics
   driver.

   Peter Wang made the svgalib driver save and restore the palette on VT
   switches.

   Peter Wang fixed a problem with the fbcon driver and VT switching.

   Milan Mimica delayed Linux console initialisation until it is required.
   This way the user can write command-line programs using timers  without
   needing a real console.

   Chris Jones fixed behavior of numeric keys when NumLock is on.

   Vincent Penecherc'h worked around a problem with 24-bit bitmaps in
   the assembler code.

   Tobias Dammers fixed a problem with the DirectSound input driver.

   Matthew Leverton fixed Ctrl-Alt-Del mistakenly being captured by Allegro
   under Windows

   Vincent Penecherc'h improved the implementation of set_ramp_cmap in the
   fbcon driver.

   Vincent Penecherc'h implemented get_refresh_rate for the fbcon driver.

   Vincent Penecherc'h fixed problems with the fbcon driver not restoring the
   original video mode when the driver exits.

   Victor Williams Stafusa da Silva made OS type detection handle Windows 2003
   and Windows Vista.

   Chris Jones and Vincent Penecherc'h fixed load_wav to handle degenerate
   stereo wave files with an odd length.

   Annie Testes fixed all sorts of problems with the linux evdev mouse driver
   when using a tablet as the mouse.

   Annie Testes made the linux evdev mouse driver use the correct device files.

   Vincent Penecherc'h made the linux fbcon driver set a ramp colourmap for
   directcolor modes, otherwise colours in those modes were all wrong.

   Vincent Penecherc'h fixed a problem with the linux fbcon driver, where it
   would keep using the old pitch after changing resolutions.

   Serge Semashko fixed a typo causing crashs in
   _linear_draw_trans_rgba_rle_sprite24.

   Annie Testes fixed cursor speed and incorrect mickey computation bugs in
   the Linux evdev mouse driver.

   Vincent Penecherc'h made the Linux PS/2 mouse driver try /dev/input/mice
   by default, in addition to /dev/mouse.

   Warnings, code formatting and minor changes to code and build system
   by Milan Mimica, Evert Glebbeek, Elias Pschernig, Peter Wang, Peter
   Hull, Thomas Harte, Vincent Penecherc'h and Chris Robinson.

   Documentation updates by Tore Halse, Elias Pschernig, Milan Mimica,
   Peter Wang, Physics Dave, Ryan Patterson, Grzegorz Adam Hankiewicz,
   Andrei Ellman and Evert Glebbeek.

5 files changed, 25 insertions, 27 deletions

diff --git a/devel/allegro/Makefile b/devel/allegro/Makefile
index 5836e5254c6..53c0141f429 100644
--- a/devel/allegro/Makefile
+++ b/devel/allegro/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2007/02/20 19:09:06 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2007/03/15 22:38:55 wiz Exp $
 
-DISTNAME=	allegro-4.2.0
-PKGREVISION=	3
+DISTNAME=	allegro-4.2.1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=alleg/}
 
diff --git a/devel/allegro/PLIST b/devel/allegro/PLIST
index 8196f3ce8d7..44c973ace74 100644
--- a/devel/allegro/PLIST
+++ b/devel/allegro/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2006/03/22 23:53:33 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2007/03/15 22:38:55 wiz Exp $
 bin/allegro-config
 bin/colormap
 bin/dat
@@ -97,14 +97,14 @@ include/allegro/unicode.h
 include/linalleg.h
 include/xalleg.h
 info/allegro.info
-lib/allegro/4.2/alleg-dga2.so
-${ESOUND}lib/allegro/4.2/alleg-esddigi.so
-lib/allegro/4.2/modules.lst
+lib/allegro/4.2.1/alleg-dga2.so
+${ESOUND}lib/allegro/4.2.1/alleg-esddigi.so
+lib/allegro/4.2.1/modules.lst
 lib/liballeg-${PKGVERSION}.so
 lib/liballeg.so.4.2
 lib/liballeg_unsharable.a
 share/aclocal/allegro.m4
-@dirrm lib/allegro/4.2
+@dirrm lib/allegro/4.2.1
 @dirrm lib/allegro
 @dirrm include/allegro/platform
 @dirrm include/allegro/internal
diff --git a/devel/allegro/distinfo b/devel/allegro/distinfo
index d8a6f0ef604..84832307d1b 100644
--- a/devel/allegro/distinfo
+++ b/devel/allegro/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.14 2007/01/04 00:15:03 wiz Exp $
+$NetBSD: distinfo,v 1.15 2007/03/15 22:38:55 wiz Exp $
 
-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) = 9d821fdcb556c67c70aba0714b7756c54a3861d7
-SHA1 (patch-ab) = f33f1a96394f16398246d3bc1d5cab89df4860e8
+SHA1 (allegro-4.2.1.tar.gz) = 1593f24fe92eae58512447145511c84398ca8926
+RMD160 (allegro-4.2.1.tar.gz) = acbc976409b9db92d5588b41cb389c06b6d4d2ea
+Size (allegro-4.2.1.tar.gz) = 3107022 bytes
+SHA1 (patch-aa) = 34099d9308088bd70f8a7d5a80ac7aed04ac59b7
+SHA1 (patch-ab) = 532f0abb9a85d759fc43c922f4e6d5fc2bef0892
 SHA1 (patch-ac) = 78f99723b095f460f20e8367fffb443a8f3d6ab6
 SHA1 (patch-ad) = 52f694e1b0053cff94c53ee10f603d535eba5fa5
 SHA1 (patch-ae) = 32e5ecd77e58bb6926c207c668755043448457f9
 SHA1 (patch-ax) = b79d1bf82fc0e9bba9b7d81e6d2005f35a217ca0
-SHA1 (patch-ay) = 61f13ecf46da56e396039d8ecfda6e822d80fb04
diff --git a/devel/allegro/patches/patch-aa b/devel/allegro/patches/patch-aa
index 64e70ad674f..5408a7602b9 100644
--- a/devel/allegro/patches/patch-aa
+++ b/devel/allegro/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.6 2006/03/22 23:53:33 jlam Exp $
+$NetBSD: patch-aa,v 1.7 2007/03/15 22:38:55 wiz Exp $
 
---- makefile.in.orig	2005-09-10 16:17:51.000000000 -0400
+--- makefile.in.orig	2006-04-08 17:07:28.000000000 +0000
 +++ makefile.in
 @@ -59,7 +59,7 @@ ACLOCAL_M4 = aclocal.m4
  
  INCLUDES = -I. -Iinclude -Iinclude/allegro -I$(srcdir)/include -I$(srcdir)/include/allegro
- DEFS = @DEFS@
+ DEFS = -DALLEGRO_MODULES_PATH=\"$(libdir)/allegro\" @DEFS@
 -CPPFLAGS = @CPPFLAGS@
 +CPPFLAGS = @CPPFLAGS@ -DINSTPREFIX=\"$(prefix)\"
  override LDFLAGS += @LDFLAGS@
diff --git a/devel/allegro/patches/patch-ab b/devel/allegro/patches/patch-ab
index 15406e57e98..7406a5940b6 100644
--- a/devel/allegro/patches/patch-ab
+++ b/devel/allegro/patches/patch-ab
@@ -1,17 +1,17 @@
-$NetBSD: patch-ab,v 1.6 2006/10/12 17:20:19 rillig Exp $
+$NetBSD: patch-ab,v 1.7 2007/03/15 22:38:56 wiz Exp $
 
---- configure.orig	2005-11-06 10:54:00.000000000 +0100
-+++ configure	2006-10-12 19:19:26.000000000 +0200
-@@ -1560,7 +1560,7 @@ fi
- # Check whether --enable-magicmain or --disable-magicmain was given.
+--- configure.orig	2006-11-26 06:41:09.000000000 +0000
++++ configure
+@@ -1979,7 +1979,7 @@ fi
+ 
+ # Check whether --enable-magicmain was given.
  if test "${enable_magicmain+set}" = set; then
-   enableval="$enable_magicmain"
--  test "X$enableval" == "Xyes" &&
-+  test "X$enableval" = "Xyes" &&
+-  enableval=$enable_magicmain; test "X$enableval" == "Xyes" &&
++  enableval=$enable_magicmain; test "X$enableval" = "Xyes" &&
  cat >>confdefs.h <<\_ACEOF
  #define ALLEGRO_WITH_MAGIC_MAIN 1
  _ACEOF
-@@ -11368,9 +11368,7 @@ if test -n "$GCC"; then
+@@ -13126,9 +13126,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