diff options
| -rw-r--r-- | devel/allegro/Makefile | 7 | ||||
| -rw-r--r-- | devel/allegro/PLIST | 15 | ||||
| -rw-r--r-- | devel/allegro/distinfo | 17 | ||||
| -rw-r--r-- | devel/allegro/patches/patch-aa | 6 | ||||
| -rw-r--r-- | devel/allegro/patches/patch-ab | 6 | ||||
| -rw-r--r-- | devel/allegro/patches/patch-ae | 13 | ||||
| -rw-r--r-- | devel/allegro/patches/patch-ax | 22 | ||||
| -rw-r--r-- | devel/allegro/patches/patch-ay | 8 |
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[] = { |