diff options
Diffstat (limited to 'devel')
-rw-r--r-- | devel/allegro/Makefile | 18 | ||||
-rw-r--r-- | devel/allegro/PLIST | 4 | ||||
-rw-r--r-- | devel/allegro/distinfo | 8 | ||||
-rw-r--r-- | devel/allegro/patches/patch-aa | 13 | ||||
-rw-r--r-- | devel/allegro/patches/patch-ax | 26 | ||||
-rw-r--r-- | devel/allegro/patches/patch-ay | 11 |
6 files changed, 39 insertions, 41 deletions
diff --git a/devel/allegro/Makefile b/devel/allegro/Makefile index 9faac8d26ff..aef9425227c 100644 --- a/devel/allegro/Makefile +++ b/devel/allegro/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.17 2006/03/09 21:04:42 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2006/03/22 23:53:33 jlam Exp $ DISTNAME= allegro-4.2.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=alleg/} @@ -14,27 +14,19 @@ GNU_CONFIGURE= yes MAKEFILE= makefile BUILD_TARGET= # there is no 'all' target for some reason -INFO_FILES= allegro.info +INFO_FILES= # PLIST INSTALL_TARGET= install install-info # NetBSD's OSS midi emulation is non-existent. CONFIGURE_ARGS+= --disable-ossmidi -LIBS+= ${LIBOSSAUDIO} - .include "options.mk" 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." - -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 harcoded path" +SUBST_SED.oss= -e "s,/dev/dsp,"${DEVOSSAUDIO:Q}",g" +SUBST_MESSAGE.oss= Fixing harcoded audio device. .include "../../mk/oss.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/devel/allegro/PLIST b/devel/allegro/PLIST index 8f6d750fa0a..8196f3ce8d7 100644 --- a/devel/allegro/PLIST +++ b/devel/allegro/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2006/01/22 13:55:20 wiz Exp $ +@comment $NetBSD: PLIST,v 1.6 2006/03/22 23:53:33 jlam Exp $ bin/allegro-config bin/colormap bin/dat @@ -96,7 +96,9 @@ include/allegro/timer.h 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/liballeg-${PKGVERSION}.so lib/liballeg.so.4.2 diff --git a/devel/allegro/distinfo b/devel/allegro/distinfo index 6d5a7058246..07b56c048d6 100644 --- a/devel/allegro/distinfo +++ b/devel/allegro/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.9 2006/01/22 13:55:20 wiz Exp $ +$NetBSD: distinfo,v 1.10 2006/03/22 23:53:33 jlam 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) = 8e1c2caad03c4f7840a75a38675d234d95410056 +SHA1 (patch-aa) = 9d821fdcb556c67c70aba0714b7756c54a3861d7 SHA1 (patch-ab) = 839ae8fb1544e967be1923fa1d316df339a120bd SHA1 (patch-ac) = 78f99723b095f460f20e8367fffb443a8f3d6ab6 SHA1 (patch-ad) = 52f694e1b0053cff94c53ee10f603d535eba5fa5 -SHA1 (patch-ax) = 43c692d763666b0666f9932fd1f09cd4476a65e4 -SHA1 (patch-ay) = 79bf537f81b8df52438c07fbaf990a36678f4e28 +SHA1 (patch-ax) = e01206c35df3b951d686c22f3e0ebf6ec2196e20 +SHA1 (patch-ay) = 66813e0b018db01a34bf014962e9a4630d8aec0d diff --git a/devel/allegro/patches/patch-aa b/devel/allegro/patches/patch-aa index c8d00bda699..64e70ad674f 100644 --- a/devel/allegro/patches/patch-aa +++ b/devel/allegro/patches/patch-aa @@ -1,7 +1,16 @@ -$NetBSD: patch-aa,v 1.5 2006/01/22 13:55:20 wiz Exp $ +$NetBSD: patch-aa,v 1.6 2006/03/22 23:53:33 jlam Exp $ ---- makefile.in.orig 2005-09-10 22:17:51.000000000 +0200 +--- makefile.in.orig 2005-09-10 16:17:51.000000000 -0400 +++ makefile.in +@@ -59,7 +59,7 @@ ACLOCAL_M4 = aclocal.m4 + + INCLUDES = -I. -Iinclude -Iinclude/allegro -I$(srcdir)/include -I$(srcdir)/include/allegro + DEFS = @DEFS@ +-CPPFLAGS = @CPPFLAGS@ ++CPPFLAGS = @CPPFLAGS@ -DINSTPREFIX=\"$(prefix)\" + override LDFLAGS += @LDFLAGS@ + PROG_LDFLAGS = @PROG_LDFLAGS@ + COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @@ -481,17 +481,7 @@ install-lib: lib modules fi $(mkinstalldirs) $(DESTDIR)$(bindir) diff --git a/devel/allegro/patches/patch-ax b/devel/allegro/patches/patch-ax index 191e3d5e28c..61e53e69ad8 100644 --- a/devel/allegro/patches/patch-ax +++ b/devel/allegro/patches/patch-ax @@ -1,25 +1,23 @@ -$NetBSD: patch-ax,v 1.2 2006/01/22 13:55:20 wiz Exp $ +$NetBSD: patch-ax,v 1.3 2006/03/22 23:53:33 jlam Exp $ ---- src/unix/usystem.c.orig 2005-09-04 18:00:17.000000000 +0200 +--- src/unix/usystem.c.orig 2005-09-04 12:00:17.000000000 -0400 +++ src/unix/usystem.c -@@ -130,6 +130,7 @@ int _unix_find_resource(char *dest, AL_C +@@ -129,15 +129,15 @@ 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 it is a .dat, look in /usr/share/ and /usr/local/share/ */ ++ /* if it is a .dat, look in ${PREFIX}/share/ and /usr/share/ */ if (ustricmp(get_extension(resource), uconvert_ascii("dat", tmp)) == 0) { - ustrzcpy(buf, sizeof(buf), uconvert_ascii("/usr/share/allegro/", tmp)); +- ustrzcpy(buf, sizeof(buf), uconvert_ascii("/usr/share/allegro/", tmp)); ++ ustrzcpy(buf, sizeof(buf), uconvert_ascii(INSTPREFIX "/share/allegro/", tmp)); ustrzcat(buf, sizeof(buf), resource); -@@ -137,6 +138,12 @@ int _unix_find_resource(char *dest, AL_C + if (exists(buf)) { 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)); +- ustrzcpy(buf, sizeof(buf), uconvert_ascii("/usr/local/share/allegro/", tmp)); ++ ustrzcpy(buf, sizeof(buf), uconvert_ascii("/usr/share/allegro/", tmp)); ustrzcat(buf, sizeof(buf), resource); if (exists(buf)) { + ustrzcpy(dest, size, buf); diff --git a/devel/allegro/patches/patch-ay b/devel/allegro/patches/patch-ay index b66696d5978..2de2062e081 100644 --- a/devel/allegro/patches/patch-ay +++ b/devel/allegro/patches/patch-ay @@ -1,16 +1,13 @@ -$NetBSD: patch-ay,v 1.2 2006/01/22 13:55:20 wiz Exp $ +$NetBSD: patch-ay,v 1.3 2006/03/22 23:53:33 jlam Exp $ ---- src/unix/umodules.c.orig 2005-09-04 18:00:17.000000000 +0200 +--- src/unix/umodules.c.orig 2005-09-04 12:00:17.000000000 -0400 +++ src/unix/umodules.c -@@ -44,7 +44,10 @@ static MODULE *module_list = NULL; +@@ -44,7 +44,7 @@ static MODULE *module_list = NULL; /* where to look for modules.lst */ static char *module_path[] = { - "/usr/local/lib/allegro/", "/usr/lib/allegro/", NULL -+ "@@PREFIX@@/lib/allegro/", -+ "/usr/local/lib/allegro/", -+ "/usr/lib/allegro/", -+ NULL ++ INSTPREFIX "/lib/allegro/", "/usr/lib/allegro/", NULL }; |