diff options
| author | wiz <wiz> | 2007-01-04 00:15:03 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2007-01-04 00:15:03 +0000 |
| commit | c03950cf7c13e1f3d24d88e01d92adc8499fe438 (patch) | |
| tree | 8c967a242a4e5ca37e3075bed741650e76db0404 /devel/allegro/patches | |
| parent | 5e455829999a6067c3dbc74d2ec031b8e5a15205 (diff) | |
| download | pkgsrc-c03950cf7c13e1f3d24d88e01d92adc8499fe438.tar.gz | |
Look for config files and esd module in pkgsrc path. From Tatsuya
Kobayashi in PR 31236.
Bump PKGREVISION.
Diffstat (limited to 'devel/allegro/patches')
| -rw-r--r-- | devel/allegro/patches/patch-ax | 26 | ||||
| -rw-r--r-- | devel/allegro/patches/patch-ay | 11 |
2 files changed, 21 insertions, 16 deletions
diff --git a/devel/allegro/patches/patch-ax b/devel/allegro/patches/patch-ax index 61e53e69ad8..0fbac4a7fa9 100644 --- a/devel/allegro/patches/patch-ax +++ b/devel/allegro/patches/patch-ax @@ -1,23 +1,25 @@ -$NetBSD: patch-ax,v 1.3 2006/03/22 23:53:33 jlam Exp $ +$NetBSD: patch-ax,v 1.4 2007/01/04 00:15:03 wiz Exp $ ---- src/unix/usystem.c.orig 2005-09-04 12:00:17.000000000 -0400 +--- src/unix/usystem.c.orig 2005-09-04 16:00:17.000000000 +0000 +++ src/unix/usystem.c -@@ -129,15 +129,15 @@ int _unix_find_resource(char *dest, AL_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/ */ -+ /* if it is a .dat, look in ${PREFIX}/share/ and /usr/share/ */ + /* 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)); -+ ustrzcpy(buf, sizeof(buf), uconvert_ascii(INSTPREFIX "/share/allegro/", tmp)); + ustrzcpy(buf, sizeof(buf), uconvert_ascii("/usr/share/allegro/", tmp)); ustrzcat(buf, sizeof(buf), resource); - if (exists(buf)) { +@@ -137,6 +138,12 @@ int _unix_find_resource(char *dest, AL_C ustrzcpy(dest, size, buf); return 0; } -- ustrzcpy(buf, sizeof(buf), uconvert_ascii("/usr/local/share/allegro/", tmp)); -+ ustrzcpy(buf, sizeof(buf), uconvert_ascii("/usr/share/allegro/", tmp)); ++ 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)) { - ustrzcpy(dest, size, buf); diff --git a/devel/allegro/patches/patch-ay b/devel/allegro/patches/patch-ay index 2de2062e081..ba215e29bff 100644 --- a/devel/allegro/patches/patch-ay +++ b/devel/allegro/patches/patch-ay @@ -1,13 +1,16 @@ -$NetBSD: patch-ay,v 1.3 2006/03/22 23:53:33 jlam Exp $ +$NetBSD: patch-ay,v 1.4 2007/01/04 00:15:03 wiz Exp $ ---- src/unix/umodules.c.orig 2005-09-04 12:00:17.000000000 -0400 +--- src/unix/umodules.c.orig 2005-09-04 16:00:17.000000000 +0000 +++ src/unix/umodules.c -@@ -44,7 +44,7 @@ static MODULE *module_list = NULL; +@@ -44,7 +44,10 @@ static MODULE *module_list = NULL; /* where to look for modules.lst */ static char *module_path[] = { - "/usr/local/lib/allegro/", "/usr/lib/allegro/", NULL -+ INSTPREFIX "/lib/allegro/", "/usr/lib/allegro/", NULL ++ "@@PREFIX@@/lib/allegro/", ++ "/usr/local/lib/allegro/", ++ "/usr/lib/allegro/", ++ NULL }; |