Bump devel/allegro to version 4.2.2 from pkgsrc-wip.

11 files changed, 95 insertions, 297 deletions

diff --git a/devel/allegro/Makefile b/devel/allegro/Makefile
index 0853ffd3898..951fc87f397 100644
--- a/devel/allegro/Makefile
+++ b/devel/allegro/Makefile
@@ -1,58 +1,52 @@
-# $NetBSD: Makefile,v 1.32 2012/01/13 10:54:54 obache Exp $
+# $NetBSD: Makefile,v 1.33 2012/02/20 15:39:37 reinoud Exp $
+#
 
-DISTNAME=	allegro-4.2.2
-PKGREVISION=	1
+DISTNAME=	allegro-4.4.2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=alleg/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://alleg.sourceforge.net/
 COMMENT=	Allegro game programming library
+#LICENSE=	# TODO: (see mk/license.mk)
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-MAKE_JOBS_SAFE=		no
+USE_CMAKE=	yes
+USE_TOOLS+=	pkg-config makeinfo
+USE_LANGUAGES=	c c++
 
-USE_TOOLS+=		gmake makeinfo
-GNU_CONFIGURE=		yes
+INFO_FILES=	yes
 
-MAKE_FILE=		makefile
-BUILD_TARGET=		# there is no 'all' target for some reason
-INFO_FILES=		YES
-INSTALL_TARGET=		install install-info
+.include "../../mk/bsd.prefs.mk"
 
-# NetBSD's OSS midi emulation is non-existent.
-CONFIGURE_ARGS+=	--disable-ossmidi
-
-.include "options.mk"
-
-.if !empty(INSTALL_UNSTRIPPED:Uno:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=	allegro_cv_prog_ld_s=no
+.if ${OPSYS} == "NetBSD"
+SUBST_CLASSES+=		ossmidi
+SUBST_STAGE.ossmidi=	pre-configure
+SUBST_MESSAGE.ossmidi=	NetBSD's OSS midi emulation is non-existent.
+SUBST_FILES.ossmidi=	CMakeLists.txt
+SUBST_SED.ossmidi=	-e 's/ALLEGRO_WITH_OSSMIDI 1/ALLEGRO_WITH_OSSMIDI 0/'
 .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 hardcoded audio device.
-
-SUBST_CLASSES+=		path
-SUBST_STAGE.path=	post-patch
-SUBST_FILES.path=	src/unix/umodules.c src/unix/usystem.c
-SUBST_SED.path=		-e "s,@@PREFIX@@,${PREFIX},g"
-SUBST_MESSAGE.path=	Fixing hardcoded path.
-
-BUILDLINK_DEPMETHOD.libXt?=	build
+PKGCONFIG_OVERRIDE+=	misc/logg.pc.in
+PKGCONFIG_OVERRIDE+=	misc/loadpng.pc.in
+PKGCONFIG_OVERRIDE+=	misc/allegrogl.pc.in
+PKGCONFIG_OVERRIDE+=	misc/jpgalleg.pc.in
+PKGCONFIG_OVERRIDE+=	misc/allegro.pc.in
 
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXcursor/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXcursor/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/libXxf86dga/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../x11/xf86dgaproto/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
+.include "../../x11/libXxf86dga/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../multimedia/libogg/buildlink3.mk"
+.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../x11/libICE/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/allegro/PLIST b/devel/allegro/PLIST
index d927c2510cf..9fa94976f4a 100644
--- a/devel/allegro/PLIST
+++ b/devel/allegro/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2011/03/24 02:00:26 obache Exp $
+@comment $NetBSD: PLIST,v 1.13 2012/02/20 15:39:37 reinoud Exp $
 bin/allegro-config
 bin/colormap
 bin/dat
@@ -10,12 +10,12 @@ bin/pack
 bin/pat2dat
 bin/rgbmap
 bin/textconv
+include/alleggl.h
 include/allegro.h
 include/allegro/3d.h
 include/allegro/3dmaths.h
 include/allegro/alcompat.h
 include/allegro/alinline.h
-include/allegro/alunixac.h
 include/allegro/base.h
 include/allegro/color.h
 include/allegro/compiled.h
@@ -37,7 +37,6 @@ include/allegro/inline/3dmaths.inl
 include/allegro/inline/asm.inl
 include/allegro/inline/color.inl
 include/allegro/inline/draw.inl
-include/allegro/inline/file.inl
 include/allegro/inline/fix.inl
 include/allegro/inline/fmaths.inl
 include/allegro/inline/gfx.inl
@@ -59,6 +58,7 @@ include/allegro/platform/aintdos.h
 include/allegro/platform/aintlnx.h
 include/allegro/platform/aintmac.h
 include/allegro/platform/aintosx.h
+include/allegro/platform/aintpsp.h
 include/allegro/platform/aintqnx.h
 include/allegro/platform/aintunix.h
 include/allegro/platform/aintwin.h
@@ -78,6 +78,8 @@ include/allegro/platform/almsvc.h
 include/allegro/platform/alosx.h
 include/allegro/platform/alosxcfg.h
 include/allegro/platform/alplatf.h
+include/allegro/platform/alpsp.h
+include/allegro/platform/alpspcfg.h
 include/allegro/platform/alqnx.h
 include/allegro/platform/alqnxcfg.h
 include/allegro/platform/alucfg.h
@@ -95,13 +97,58 @@ include/allegro/system.h
 include/allegro/text.h
 include/allegro/timer.h
 include/allegro/unicode.h
-include/linalleg.h
+include/allegrogl/GLext/gl_ext_alias.h
+include/allegrogl/GLext/gl_ext_api.h
+include/allegrogl/GLext/gl_ext_defs.h
+include/allegrogl/GLext/gl_ext_list.h
+include/allegrogl/GLext/glx_ext_alias.h
+include/allegrogl/GLext/glx_ext_api.h
+include/allegrogl/GLext/glx_ext_defs.h
+include/allegrogl/GLext/glx_ext_list.h
+include/allegrogl/GLext/wgl_ext_alias.h
+include/allegrogl/GLext/wgl_ext_api.h
+include/allegrogl/GLext/wgl_ext_defs.h
+include/allegrogl/GLext/wgl_ext_list.h
+include/allegrogl/alleggl_config.h
+include/allegrogl/gl_ext.h
+include/allegrogl/gl_header_detect.h
+include/jpgalleg.h
+include/loadpng.h
+include/logg.h
 include/xalleg.h
 info/allegro.info
-${PLIST.esound}lib/allegro/${PKGVERSION}/alleg-esddigi.so
 lib/allegro/${PKGVERSION}/alleg-dga2.so
 lib/allegro/${PKGVERSION}/modules.lst
-lib/liballeg-${PKGVERSION}.so
-lib/liballeg.so.4.2
-lib/liballeg_unsharable.a
-share/aclocal/allegro.m4
+lib/liballeg.so
+lib/liballeg.so.4.4
+lib/liballeg.so.${PKGVERSION}
+lib/liballeggl.a
+lib/libjpgalleg.a
+lib/libloadpng.a
+lib/liblogg.a
+lib/pkgconfig/allegro.pc
+lib/pkgconfig/allegrogl.pc
+lib/pkgconfig/jpgalleg.pc
+lib/pkgconfig/loadpng.pc
+lib/pkgconfig/logg.pc
+share/doc/${PKGNAME}/AUTHORS
+share/doc/${PKGNAME}/CHANGES
+share/doc/${PKGNAME}/THANKS
+share/doc/${PKGNAME}/abi.txt
+share/doc/${PKGNAME}/addons.txt
+share/doc/${PKGNAME}/ahack.txt
+share/doc/${PKGNAME}/allegro.txt
+share/doc/${PKGNAME}/api.txt
+share/doc/${PKGNAME}/const.txt
+share/doc/${PKGNAME}/dat.txt
+share/doc/${PKGNAME}/dat2c.txt
+share/doc/${PKGNAME}/dat2s.txt
+share/doc/${PKGNAME}/datafile.txt
+share/doc/${PKGNAME}/faq.txt
+share/doc/${PKGNAME}/grabber.txt
+share/doc/${PKGNAME}/help.txt
+share/doc/${PKGNAME}/license.txt
+share/doc/${PKGNAME}/makedoc.txt
+share/doc/${PKGNAME}/mistakes.txt
+share/doc/${PKGNAME}/packfile.txt
+share/doc/${PKGNAME}/readme.txt
diff --git a/devel/allegro/buildlink3.mk b/devel/allegro/buildlink3.mk
index ef0d3b7099c..03d02cd5fda 100644
--- a/devel/allegro/buildlink3.mk
+++ b/devel/allegro/buildlink3.mk
@@ -1,19 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:09 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2012/02/20 15:39:37 reinoud Exp $
 
 BUILDLINK_TREE+=	allegro
 
 .if !defined(ALLEGRO_BUILDLINK3_MK)
 ALLEGRO_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.allegro+=	allegro>=4.1.13
-BUILDLINK_ABI_DEPENDS.allegro?=	allegro>=4.2.0nb1
+BUILDLINK_API_DEPENDS.allegro+=	allegro>=4.4.2
 BUILDLINK_PKGSRCDIR.allegro?=	../../devel/allegro
 
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXcursor/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.endif # ALLEGRO_BUILDLINK3_MK
+.endif	# ALLEGRO_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-allegro
diff --git a/devel/allegro/distinfo b/devel/allegro/distinfo
index 0a62784baf2..9d66e8b05ce 100644
--- a/devel/allegro/distinfo
+++ b/devel/allegro/distinfo
@@ -1,12 +1,8 @@
-$NetBSD: distinfo,v 1.19 2011/08/20 15:28:09 joerg Exp $
+$NetBSD: distinfo,v 1.20 2012/02/20 15:39:37 reinoud Exp $
 
-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) = 8115771ea7f5fd8e0c06f9791229dcbe4e102996
-SHA1 (patch-ac) = 78f99723b095f460f20e8367fffb443a8f3d6ab6
-SHA1 (patch-ad) = 52f694e1b0053cff94c53ee10f603d535eba5fa5
-SHA1 (patch-ae) = 32e5ecd77e58bb6926c207c668755043448457f9
-SHA1 (patch-ax) = b79d1bf82fc0e9bba9b7d81e6d2005f35a217ca0
-SHA1 (patch-de) = 6233472355f49442a5278e1f49dd888f51433a93
-SHA1 (patch-include-allegro-internal-alconfig.h) = 4d6b9453e52f31b7d5ce95458ae087a36e86bc3a
+SHA1 (allegro-4.4.2.tar.gz) = ae0c15d2cb6b0337ef388dc98cefc620883720df
+RMD160 (allegro-4.4.2.tar.gz) = a6f6a03d6748230dfb5f306d1a05ef45ffa49f42
+Size (allegro-4.4.2.tar.gz) = 4674902 bytes
+SHA1 (patch-CMakeLists.txt) = 3909f98a2156085d8462e779c95c8df3b20bd602
+SHA1 (patch-docs_CMakeLists.txt) = a5a8cbfed0721a37a921c481c9c9295b2be62bb7
+SHA1 (patch-xdga2-include) = d2df1ff176b6190f317f02a19f49b7476365188e
diff --git a/devel/allegro/patches/patch-aa b/devel/allegro/patches/patch-aa
deleted file mode 100644
index e771620722a..00000000000
--- a/devel/allegro/patches/patch-aa
+++ /dev/null
@@ -1,84 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2010/09/18 08:02:30 obache Exp $
-
---- makefile.in.orig	2007-07-22 05:55:54.000000000 +0000
-+++ makefile.in
-@@ -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@
--CPPFLAGS = @CPPFLAGS@
-+CPPFLAGS = @CPPFLAGS@ -DINSTPREFIX=\"$(prefix)\"
- override LDFLAGS += @LDFLAGS@
- PROG_LDFLAGS = @PROG_LDFLAGS@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-@@ -400,34 +400,34 @@ examples: $(EXAMPLE_FILES)
- 
- clean:
- 
--   define RM_OBJ_CLEAN_FILES
--      $(foreach file, $(OBJ_CLEAN_FILES), rm -f $(file)
--      )
--   endef
--
--   define RM_OTHER_CLEAN_FILES
--      $(foreach file, $(OTHER_CLEAN_FILES), rm -f $(file)
--      )
--   endef
-+	define RM_OBJ_CLEAN_FILES
-+		$(foreach file, $(OBJ_CLEAN_FILES), rm -f $(file)
-+		)
-+	endef
-+
-+	define RM_OTHER_CLEAN_FILES
-+		$(foreach file, $(OTHER_CLEAN_FILES), rm -f $(file)
-+		)
-+	endef
- 
- 	$(RM_OBJ_CLEAN_FILES)
- 	$(RM_OTHER_CLEAN_FILES)
- 
- distclean: clean
- 
--   define RM_DISTCLEAN_FILES
--      $(foreach file, $(DISTCLEAN_FILES) $(ALLEGRO_LIB_X_EXES), rm -f $(file)
--      )
--   endef
-+	define RM_DISTCLEAN_FILES
-+		$(foreach file, $(DISTCLEAN_FILES) $(ALLEGRO_LIB_X_EXES), rm -f $(file)
-+		)
-+	endef
- 
- 	$(RM_DISTCLEAN_FILES)
- 
- veryclean: distclean
- 
--   define RM_VERYCLEAN_FILES
--      $(foreach file, $(VERYCLEAN_FILES), rm -f $(file)
--      )
--   endef
-+	define RM_VERYCLEAN_FILES
-+		$(foreach file, $(VERYCLEAN_FILES), rm -f $(file)
-+		)
-+	endef
- 
- 	$(RM_VERYCLEAN_FILES)
- 	rm -f makefile
-@@ -480,17 +480,7 @@ install-lib: lib modules
- 	fi
- 	$(mkinstalldirs) $(DESTDIR)$(bindir)
- 	@echo Installing allegro-config to $(DESTDIR)$(bindir)
--	@$(INSTALL_PROGRAM) allegro-config $(DESTDIR)$(bindir)
--	@if test -n "$(LIBDIR)/liball*-$(shared_version).so"; then \
--		(cat /etc/ld.so.conf | grep $(libdir) >/dev/null || \
--		 test $(libdir) = /lib || test $(libdir) = /usr/lib) \
--		&& ($(LDCONFIG) $(libdir) || true) || (\
--			echo "" ; \
--			echo "Warning: shared library destination $(libdir) is not in ldd search path." ; \
--			echo "Unless you add it to /etc/ld.so.conf, you must set LD_LIBRARY_PATH to include"; \
--			echo "$(libdir) each time you want to run an Allegro program." ; \
--		) ; \
--	fi
-+	@$(BSD_INSTALL_SCRIPT) allegro-config $(DESTDIR)$(bindir)
- 	@for l in alleg alld allp; do \
- 	  if test -f $(DESTDIR)$(libdir)/lib$${l}-$(shared_version).so -a \! -h $(DESTDIR)$(libdir)/lib$${l}.so.${shared_major_minor}; then \
- 	    (cd $(DESTDIR)$(libdir); ln -s lib$${l}-$(shared_version).so lib$${l}.so.${shared_major_minor}); \
diff --git a/devel/allegro/patches/patch-ac b/devel/allegro/patches/patch-ac
deleted file mode 100644
index b449a4b2697..00000000000
--- a/devel/allegro/patches/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2004/11/09 10:48:02 adam Exp $
-
---- include/allegro/platform/alunix.h.orig	2004-11-09 11:17:10.000000000 +0000
-+++ include/allegro/platform/alunix.h
-@@ -162,6 +162,7 @@ AL_VAR(GFX_DRIVER, gfx_xdga2_soft);
- /************ Linux-specific ************/
- /****************************************/
- 
-+#ifdef ALLEGRO_LINUX
- #define SYSTEM_LINUX             AL_ID('L','N','X','C')
- 
- #define GFX_VGA                  AL_ID('V','G','A',' ')
-@@ -182,7 +183,6 @@ AL_VAR(GFX_DRIVER, gfx_xdga2_soft);
- #define JOY_TYPE_LINUX_ANALOGUE  AL_ID('L','N','X','A')
- 
- 
--#ifdef ALLEGRO_LINUX
- 
- AL_VAR(SYSTEM_DRIVER, system_linux);
- 
diff --git a/devel/allegro/patches/patch-ad b/devel/allegro/patches/patch-ad
deleted file mode 100644
index 0d606053643..00000000000
--- a/devel/allegro/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2004/11/22 16:39:50 kristerw Exp $
-
---- include/xalleg.h.orig	Mon Nov 22 17:32:18 2004
-+++ include/xalleg.h	Mon Nov 22 17:32:45 2004
-@@ -32,6 +32,10 @@
- #include <X11/cursorfont.h>
- #include <X11/keysym.h>
- 
-+#ifdef ALLEGRO_MULTITHREADED
-+#include <pthread.h>
-+#endif
-+
- #ifdef ALLEGRO_XWINDOWS_WITH_SHM
- #include <sys/ipc.h>
- #include <sys/shm.h>
diff --git a/devel/allegro/patches/patch-ae b/devel/allegro/patches/patch-ae
deleted file mode 100644
index c44dabb4e1e..00000000000
--- a/devel/allegro/patches/patch-ae
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2006/07/04 06:27:40 wiz Exp $
-
---- include/allegro/platform/al386gcc.h.orig	2005-03-09 13:49:46.000000000 -0800
-+++ include/allegro/platform/al386gcc.h	2006-07-01 05:39:49.000000000 -0700
-@@ -208,29 +208,29 @@
-  */
- AL_INLINE(fixed, fixmul, (fixed x, fixed y),
- {
--   fixed edx __attribute__ ((__unused__));
-+   long edx;
-    fixed result;
- 
-    __PRECALCULATE_CONSTANTS(x / 65536.0 * y)
-    {
-       __asm__ (
--	 "  movl %2, %%eax ; "
--	 "  imull %3 ; "                  /* do the multiply */
--	 "  shrdl $16, %%edx, %%eax ; "
-+	 "  movl %1, %%eax ; "
-+	 "  imull %2 ; "                  /* do the multiply */
-+	 "  shrdl $16, %5, %%eax ; "
- 
--	 "  sarl $15, %%edx ; "           /* check for overflow */
-+	 "  sarl $15, %5 ; "           /* check for overflow */
- 	 "  jz 0f ; "
--	 "  cmpl $-1, %%edx ; "
-+	 "  cmpl $-1, %5 ; "
- 	 "  je 0f ; "
- 
--	 "  movl %5, %%eax ; "            /* on overflow, set errno */
--	 "  movl %4, (%%eax) ; "
-+	 "  movl %4, %%eax ; "            /* on overflow, set errno */
-+	 "  movl %3, (%%eax) ; "
- 	 "  movl $0x7FFFFFFF, %%eax ; "   /* and return MAXINT */
--	 "  cmpl $0, %2 ; "
-+	 "  cmpl $0, %1 ; "
- 	 "  jge 1f ; "
- 	 "  negl %%eax ; "
- 	 " 1: "
--	 "  cmpl $0, %3 ; "
-+	 "  cmpl $0, %2 ; "
- 	 "  jge 0f ; "
- 	 "  negl %%eax ; "
- 
-@@ -238,13 +238,13 @@
- 
- 	 " 0: "                           /* finished */
- 
--      : "=&a" (result),                   /* the result has to go in eax */
--	"=&d" (edx)                       /* reliably reserve edx */
-+      : "=&a" (result)                    /* the result has to go in eax */
- 
-       : "mr" (x),                         /* x and y can be regs or mem */
- 	"mr" (y),
- 	"i" (ERANGE),
--	"m" (allegro_errno)
-+	"m" (allegro_errno),
-+	"d" (edx)
- 
-       : "%cc", "memory"                   /* clobbers flags and errno */
-       );
diff --git a/devel/allegro/patches/patch-ax b/devel/allegro/patches/patch-ax
deleted file mode 100644
index 0fbac4a7fa9..00000000000
--- a/devel/allegro/patches/patch-ax
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ax,v 1.4 2007/01/04 00:15:03 wiz Exp $
-
---- src/unix/usystem.c.orig	2005-09-04 16:00:17.000000000 +0000
-+++ 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/ */
-+   /* and @@PREFIX@@/share in NetBSD */
-    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 @@ int _unix_find_resource(char *dest, AL_C
- 	 ustrzcpy(dest, size, buf);
- 	 return 0;
-       }
-+      ustrzcpy(buf, sizeof(buf), uconvert_ascii("@@PREFIX@@/share/allegro/", tmp));
-+      ustrzcat(buf, sizeof(buf), resource);
-+      if (exists(buf)) {
-+	 ustrzcpy(dest, size, buf);
-+	 return 0;
-+      }
-       ustrzcpy(buf, sizeof(buf), uconvert_ascii("/usr/local/share/allegro/", tmp));
-       ustrzcat(buf, sizeof(buf), resource);
-       if (exists(buf)) {
diff --git a/devel/allegro/patches/patch-de b/devel/allegro/patches/patch-de
deleted file mode 100644
index c1973938c17..00000000000
--- a/devel/allegro/patches/patch-de
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-de,v 1.1 2008/02/20 10:04:25 rillig Exp $
-
-Don't install libraries stripped if the user doesn't say.
-
---- misc/deplib.sh.orig	2003-05-17 12:58:09.000000000 +0000
-+++ misc/deplib.sh	2008-02-20 09:44:06.000000000 +0000
-@@ -70,7 +70,7 @@ for file in .. $unsharable_objects; do
- done
- echo "$prev"
- echo ""
--write_code alleg LIBALLEG -s
-+write_code alleg LIBALLEG ""
- echo ""
- echo ""
- 
diff --git a/devel/allegro/patches/patch-include-allegro-internal-alconfig.h b/devel/allegro/patches/patch-include-allegro-internal-alconfig.h
deleted file mode 100644
index 5ffd39b49ba..00000000000
--- a/devel/allegro/patches/patch-include-allegro-internal-alconfig.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-include-allegro-internal-alconfig.h,v 1.1 2011/08/20 15:28:09 joerg Exp $
-
---- include/allegro/internal/alconfig.h.orig	2011-08-19 14:59:33.000000000 +0000
-+++ include/allegro/internal/alconfig.h
-@@ -73,7 +73,7 @@
-    #define ALLEGRO_GCC
- 
-    #ifndef AL_INLINE
--      #ifdef __cplusplus
-+      #if defined(__cplusplus) || (defined(__GNUC_STDC_INLINE__) && __GNUC_STDC_INLINE__)
-          #define AL_INLINE(type, name, args, code)    \
-             static inline type name args;             \
-             static inline type name args code