* Fix PLIST in the "esound" PKG_OPTION case.

* Avoid hardcoding paths with sed when using the preprocessor is much nicer.

* We don't need to explicitly add ${LIBOSSAUDIO} to LIBS since the
  configure script already knows to search for -lossaudio.

* Directly list the info files in the PLIST.

Bump PKGREVISION to 2.

3 files changed, 27 insertions, 23 deletions

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
  };