Update to 4.2.2:

=====================================================================
============ Changes from 4.2.2 RC1 to 4.2.2 (July 2007) ============
=====================================================================

   Matthew Leverton added build instructions for DMC and updated the MSVC
   project files and instructions.

   Matthew Leverton added a shell script wrapper around gcc to build universal
   binaries (i386 + PPC) on Mac OS X and made the Allegro makefile use it.

   Peter Hull reenabled the Quit menu option on Mac OS X when
   set_close_button_callback is used.

   Rikard Peterson fixed the Mac OS X joystick driver so that
   HID_ELEMENT_STANDALONE_AXIS axes correctly got the flag JOYFLAG_UNSIGNED
   and not JOYFLAG_DIGITAL.

   Matthew Leverton fixed a problem with the GDI driver blitting a rectangle
   smaller than the bitmap's height that touches the bottom left corner of a
   bitmap.

   Some minor changes.


=====================================================================
============ Changes from 4.2.1 to 4.2.2 RC1 (July 2007) ============
=====================================================================

   Matthew Leverton added project files for MSVC 6/7/8 (see the build
   directory and Allegro Wiki for instructions).

   Matthew Leverton added initial support for the Digital Mars C compiler
   (for the Windows port).  It only works with the C-only port and
   obj\dmc\plugins.h needs to be built by hand.

   Peter Wang cleaned up most of the autoconf namespace pollution.

   Matthew Smith made a fix for C locking code in GDI.

   Trent Gamblin made the fullscreen DirectX driver save and restore the
   palette when switching away and back in 8-bit video modes.

   Elias Pschernig added missing documentation for pack_ungetc().

   Trent Gamblin fixed the C version of stretch_blit so it now draws
   correctly. He also made it about 20% faster along the way.

   orz and Matthew Leverton made the ALLEGRO_USE_C=1 option to work under
   MinGW and MSVC.

   Erno Schwetter fixed a long-standing bug in polygon() where the
   bottom-most pixels would not be drawn.

   Anthony 'Timorg' Cassidy made d_menu_proc fill up its assigned area with
   the gui_bg_color.

   Phil Krylov fixed a bug that prevented load_bios_font() from loading 8x16
   fonts.

   Etienne Vouga fixed a bug with the reset_controllers MIDI command.

   Milan Mimica fixed a double SWITCH_IN event callback bug when
   de-minimizing an Allegro program in Windows.

   Erno Schwetter fixed a bug where __al_linux_console_fd was used in
   display_switch_lock() without the console being initialized first.

   Erno Schwetter fixed an unbalanced __al_linux_console_graphics() call.

   Ryan Patterson fixed a crash in free_config_entries.

   Elias Pschernig added support for horizontal wheel mice (so far, only the
   X11 driver reports any horizontal wheel movement though). Also increased
   the number of supported mouse buttons from 3 to 5 for the X11 driver.

   Jon Rafkind and Karthik Kumar fixed a problem where allegro-config would
   respect neither --libdir nor --includedir.

   Peter Wang fixed some problems with the ALSA MIDI driver in the case of
   failure.

   torhu fixed a bug in akaitest where an array was indexed with -1.

   Trent Gamblin implemented set_mouse_speed under X11.  Peter Wang made
   setting stick only while the cursor is in the Allegro window.

   Evert Glebbeek added desktop_color_depth and get_desktop_resolution to the
   Linux fbcon driver.

   Matthew Leverton fixed building of universal binaries on MacOS X. This
   currently requires OS X 10.4 on both PPC and Intel.

   Milan Miminca made the fbcon driver initialization fail if an unsupported
   color depth was set.

   Michal Molhanec and Milan Mimica simplified the MSVC build process
   and updated the documentation.

   Andrei Ellman made the MSVC makefile compatible with cygwin port of
   make-3.81 (and newer?). makefile.vc now uses cygpath tool to convert DOS
   8.3 paths to unix-style paths.

   Daniel Schlyder added a functions is_trans_font, font_has_alpha.

   Daniel Schlyder made load_txt_font() additionally search for files
   referenced in the font script in the same directory as the script itself.
   It still searches in the current working directory first (for relative
   paths).

   Daniel Schlyder documented that register_assert_handler() and
   register_trace_handler() can be called before initialising Allegro.

   Daniel Schlyder prevented the Windows port from registering its default
   trace handler on initialisation if the user had previously registered a
   custom trace handler.

   Andrei Ellman modified the 6-to-8 bit value scaling tables to be more
   evenly distributed, and changed the implementation of
   create_blender_table() to create a more evenly distributed distribution of
   the lower 2 bits.  It should be faster as well.

   Other minor bug fixes and documentation updates.

5 files changed, 17 insertions, 40 deletions

diff --git a/devel/allegro/Makefile b/devel/allegro/Makefile
index 27cae690e18..beb84e7b9d8 100644
--- a/devel/allegro/Makefile
+++ b/devel/allegro/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2007/03/23 07:39:47 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2007/11/29 22:45:22 wiz Exp $
 
-DISTNAME=	allegro-4.2.1
+DISTNAME=	allegro-4.2.2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=alleg/}
 
diff --git a/devel/allegro/PLIST b/devel/allegro/PLIST
index 44c973ace74..3d7298b3c39 100644
--- a/devel/allegro/PLIST
+++ b/devel/allegro/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2007/03/15 22:38:55 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2007/11/29 22:45:22 wiz Exp $
 bin/allegro-config
 bin/colormap
 bin/dat
@@ -69,6 +69,7 @@ include/allegro/platform/albcc32.h
 include/allegro/platform/albecfg.h
 include/allegro/platform/albeos.h
 include/allegro/platform/aldjgpp.h
+include/allegro/platform/aldmc.h
 include/allegro/platform/aldos.h
 include/allegro/platform/almac.h
 include/allegro/platform/almaccfg.h
@@ -97,14 +98,14 @@ include/allegro/unicode.h
 include/linalleg.h
 include/xalleg.h
 info/allegro.info
-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/allegro/4.2.2/alleg-dga2.so
+${ESOUND}lib/allegro/4.2.2/alleg-esddigi.so
+lib/allegro/4.2.2/modules.lst
 lib/liballeg-${PKGVERSION}.so
 lib/liballeg.so.4.2
 lib/liballeg_unsharable.a
 share/aclocal/allegro.m4
-@dirrm lib/allegro/4.2.1
+@dirrm lib/allegro/4.2.2
 @dirrm lib/allegro
 @dirrm include/allegro/platform
 @dirrm include/allegro/internal
diff --git a/devel/allegro/distinfo b/devel/allegro/distinfo
index 84832307d1b..e8eadc3f0a3 100644
--- a/devel/allegro/distinfo
+++ b/devel/allegro/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.15 2007/03/15 22:38:55 wiz Exp $
+$NetBSD: distinfo,v 1.16 2007/11/29 22:45:23 wiz Exp $
 
-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 (allegro-4.2.2.tar.gz) = 1526fc87e028db9de0b94fd8d0697e47b91b15b7
+RMD160 (allegro-4.2.2.tar.gz) = 4cefa321f38aa955d857ac3b74e529bc8e044fe9
+Size (allegro-4.2.2.tar.gz) = 3181258 bytes
+SHA1 (patch-aa) = ac2de7641499b91c2b42468248f369ca74af0b79
 SHA1 (patch-ac) = 78f99723b095f460f20e8367fffb443a8f3d6ab6
 SHA1 (patch-ad) = 52f694e1b0053cff94c53ee10f603d535eba5fa5
 SHA1 (patch-ae) = 32e5ecd77e58bb6926c207c668755043448457f9
diff --git a/devel/allegro/patches/patch-aa b/devel/allegro/patches/patch-aa
index 5408a7602b9..5d16580653b 100644
--- a/devel/allegro/patches/patch-aa
+++ b/devel/allegro/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2007/03/15 22:38:55 wiz Exp $
+$NetBSD: patch-aa,v 1.8 2007/11/29 22:45:23 wiz Exp $
 
---- makefile.in.orig	2006-04-08 17:07:28.000000000 +0000
+--- makefile.in.orig	2007-07-22 05:55:54.000000000 +0000
 +++ makefile.in
-@@ -59,7 +59,7 @@ ACLOCAL_M4 = aclocal.m4
+@@ -58,7 +58,7 @@ ACLOCAL_M4 = aclocal.m4
  
  INCLUDES = -I. -Iinclude -Iinclude/allegro -I$(srcdir)/include -I$(srcdir)/include/allegro
  DEFS = -DALLEGRO_MODULES_PATH=\"$(libdir)/allegro\" @DEFS@
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.7 2007/03/15 22:38:55 wiz Exp $
  override LDFLAGS += @LDFLAGS@
  PROG_LDFLAGS = @PROG_LDFLAGS@
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-@@ -481,17 +481,7 @@ install-lib: lib modules
+@@ -480,17 +480,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
deleted file mode 100644
index 7406a5940b6..00000000000
--- a/devel/allegro/patches/patch-ab
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2007/03/15 22:38:56 wiz Exp $
-
---- 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" &&
-+  enableval=$enable_magicmain; test "X$enableval" = "Xyes" &&
- cat >>confdefs.h <<\_ACEOF
- #define ALLEGRO_WITH_MAGIC_MAIN 1
- _ACEOF
-@@ -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
--    CFLAGS="$CFLAGS $TARGET_ARCH -O2 -funroll-loops -ffast-math -fomit-frame-pointer $WFLAGS"
-   else
--    CFLAGS="$CFLAGS $TARGET_ARCH -O2 -funroll-loops -ffast-math $WFLAGS"
-   fi
-   ALLEGRO_SFLAGS="-x assembler-with-cpp"
-   ALLEGRO_SHAREDLIB_CFLAGS="-fPIC -DALLEGRO_SHARED"