Update devel/allegro to 4.1.14.

Changes:

# Fixed a couple of problems in dat2c.
# Polished the MacOS X package builder script.
# Added a Jack sound driver to the Unix port.
# Added support for debugging with DMalloc under Unix.
# Fixed detection of the ALSA 1.0 MIDI driver.
# Fixed compilation with --enable-color8=no under Unix.
# Now it is possible to link against the Allegro framework with the
  allegro-config script under MacOS X.
# Fixed a bug in fixbundle with 32bpp icons and alpha channel under MacOS X.
# Restored the compensation code for end-of-frame in the FLI player.

5 files changed, 16 insertions, 74 deletions

diff --git a/devel/allegro/Makefile b/devel/allegro/Makefile
index cb3de7e0afc..ae2c7f7e24b 100644
--- a/devel/allegro/Makefile
+++ b/devel/allegro/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/04/05 05:02:41 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/06/03 23:29:53 xtraeme Exp $
 #
 
-DISTNAME=	allegro-4.1.13
+DISTNAME=	allegro-4.1.14
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=alleg/}
 
@@ -24,7 +24,6 @@ INSTALL_TARGET=		install install-info
 CONFIGURE_ARGS+=	--disable-ossmidi
 
 LIBS+=		${LIBOSSAUDIO}
-CFLAGS+=	-DDEVOSSAUDIO=\"\\\"${DEVOSSAUDIO}\\\"\"
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -35,6 +34,12 @@ CONFIGURE_ARGS+=	--enable-esddigi
 .include "../../audio/esound/buildlink3.mk"
 .endif
 
+SUBST_CLASSES=		oss
+SUBST_STAGE.oss=	post-patch
+SUBST_FILES.oss=	src/unix/uoss.c setup/setup.c
+SUBST_SED.oss=		-e "s,/dev/dsp,${DEVOSSAUDIO},g"
+SUBST_MESSAGE.oss=	"Fixing harcoded audio device."
+
 .include "../../mk/ossaudio.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/allegro/distinfo b/devel/allegro/distinfo
index ff617cffe39..62978face8f 100644
--- a/devel/allegro/distinfo
+++ b/devel/allegro/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/04/05 05:02:41 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2004/06/03 23:29:53 xtraeme Exp $
 
-SHA1 (allegro-4.1.13.tar.gz) = 0238c39abdfe9f9de093576b7c66c37665bb8ce8
-Size (allegro-4.1.13.tar.gz) = 2773434 bytes
-SHA1 (patch-aa) = 9cd0b652ac08d121575fc9209203b213657f5682
-SHA1 (patch-ab) = cd316b805e6f4f33cc156b1242696651f5765d9b
-SHA1 (patch-ac) = 510655ab2fdaf0583e0044d974a5a1007e57d822
+SHA1 (allegro-4.1.14.tar.gz) = 3b2cf8089304f7904ba0e4dfba3ef46bd99b8a37
+Size (allegro-4.1.14.tar.gz) = 2774495 bytes
+SHA1 (patch-aa) = 37d96e45d8271d5605dda962fb8e156de2618baf
diff --git a/devel/allegro/patches/patch-aa b/devel/allegro/patches/patch-aa
index 5f31ac07323..8b0d6dbc30c 100644
--- a/devel/allegro/patches/patch-aa
+++ b/devel/allegro/patches/patch-aa
@@ -1,26 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/04/05 05:02:42 xtraeme Exp $
+$NetBSD: patch-aa,v 1.2 2004/06/03 23:29:53 xtraeme Exp $
 
---- makefile.in.orig	Sun Jun 29 16:27:00 2003
-+++ makefile.in	Wed Jul  2 13:50:49 2003
-@@ -59,7 +59,7 @@
- 
- INCLUDES =
- DEFS = @DEFS@ -Iinclude -Iinclude/allegro -I$(srcdir)/include -I$(srcdir)/include/allegro -I.
--CPPFLAGS = @CPPFLAGS@
-+CPPFLAGS = @CPPFLAGS@ -DDEVOSSAUDIO=\"${DEVOSSAUDIO}\"
- LDFLAGS = @LDFLAGS@
- PROG_LDFLAGS = @PROG_LDFLAGS@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-@@ -82,7 +82,7 @@
- COMPILE_S_PROGRAM = $(@COMPILE_S_PROGRAM@)
- 
- LIBALLEG = @LIBALLEG@
--LINK_LIBALLEG = @LINK_LIBALLEG@
-+LINK_LIBALLEG = @LINK_LIBALLEG@ ${LIBOSSAUDIO}
- ALLEGRO_LIB_TARGETS = @ALLEGRO_LIB_TARGETS@
- ALLEGRO_MODULE_TARGETS = @ALLEGRO_MODULE_TARGETS@
- 
-@@ -417,17 +417,7 @@
+--- makefile.in.orig	2004-06-04 01:24:37.000000000 +0200
++++ makefile.in	2004-06-04 01:25:15.000000000 +0200
+@@ -472,17 +472,7 @@
  	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 325714be295..00000000000
--- a/devel/allegro/patches/patch-ab
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/04/05 05:02:42 xtraeme Exp $
-
---- src/unix/uoss.c.orig	Sun Jun 29 16:27:04 2003
-+++ src/unix/uoss.c	Wed Jul  2 13:25:43 2003
-@@ -176,6 +176,8 @@
- 	 _mix_some_samples((unsigned long) oss_bufdata, 0, oss_signed);
-       }
-    }
-+
-+   yield_timeslice();
- }
- 
- 
-@@ -191,7 +193,7 @@
- 
-    ustrzcpy(_oss_driver, sizeof(_oss_driver), get_config_string(uconvert_ascii("sound", tmp1),
- 					                        uconvert_ascii("oss_driver", tmp2),
--					                        uconvert_ascii("/dev/dsp", tmp3)));
-+					                        uconvert_ascii(DEVOSSAUDIO, tmp3)));
- 
-    ustrzcpy(_oss_mixer_driver, sizeof(_oss_mixer_driver), get_config_string(uconvert_ascii("sound", tmp1),
- 					                                    uconvert_ascii("oss_mixer_driver", tmp2),
-@@ -583,6 +585,7 @@
- 	 p[i] ^= 0x80;
-    }
- 
-+   yield_timeslice();
-    return 1;
- }
- 
diff --git a/devel/allegro/patches/patch-ac b/devel/allegro/patches/patch-ac
deleted file mode 100644
index 08385384e4d..00000000000
--- a/devel/allegro/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/04/05 05:02:42 xtraeme Exp $
-
---- setup/setup.c.orig	Sun Jun 29 16:27:02 2003
-+++ setup/setup.c	Wed Jul  2 13:02:28 2003
-@@ -211,7 +211,7 @@
-  #endif
- 
-  #ifdef DIGI_OSS
--   { "oss_driver",         param_str,     "",      "/dev/dsp", NULL,             "Drv:",     "",         NULL,    "Name of the driver (e.g. /dev/dsp)" },
-+   { "oss_driver",         param_str,     "",      DEVOSSAUDIO, NULL,             "Drv:",     "",         NULL,    "Name of the driver (e.g. /dev/dsp)" },
-    { "oss_numfrags",       param_int,     "",      "-1",       &_oss_numfrags,   "NumFr:",   NULL,       NULL,    "Number of fragments (use 2, other values make little difference)" },
-    { "oss_fragsize",       param_num,     "",      "-1",       &_oss_fragsize,   "Siz:",     NULL,       NULL,    "Size of fragment (small values -- choppy sound, large values -- delayed sound)" },
-  #endif