pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/allegro PR 31268 by Tatsuya Kobayashi:
details: https://anonhg.NetBSD.org/pkgsrc/rev/9ee607fc807a
branches: trunk
changeset: 499148:9ee607fc807a
user: wiz <wiz%pkgsrc.org@localhost>
date: Sun Sep 11 14:17:44 2005 +0000
description:
PR 31268 by Tatsuya Kobayashi:
* The search paths for allegro's cfg files and modules are hardcoded,
add the proper pkgsrc paths to them.
* allegro uses 'ps' internally with '-f'. NetBSD doesn't have a '-f'.
Remove it from the ps flags on NetBSD.
Bump PKGREVISION.
diffstat:
devel/allegro/Makefile | 9 +++++++--
devel/allegro/distinfo | 4 +++-
devel/allegro/patches/patch-ax | 37 +++++++++++++++++++++++++++++++++++++
devel/allegro/patches/patch-ay | 16 ++++++++++++++++
4 files changed, 63 insertions(+), 3 deletions(-)
diffs (105 lines):
diff -r 52e04b2c1b55 -r 9ee607fc807a devel/allegro/Makefile
--- a/devel/allegro/Makefile Sun Sep 11 14:00:38 2005 +0000
+++ b/devel/allegro/Makefile Sun Sep 11 14:17:44 2005 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:42 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/09/11 14:17:44 wiz Exp $
DISTNAME= allegro-4.1.18
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=alleg/}
@@ -24,11 +25,15 @@
.include "options.mk"
-SUBST_CLASSES= oss
+SUBST_CLASSES= oss path
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_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"
.include "../../mk/ossaudio.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff -r 52e04b2c1b55 -r 9ee607fc807a devel/allegro/distinfo
--- a/devel/allegro/distinfo Sun Sep 11 14:00:38 2005 +0000
+++ b/devel/allegro/distinfo Sun Sep 11 14:17:44 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2005/05/23 12:05:46 wiz Exp $
+$NetBSD: distinfo,v 1.8 2005/09/11 14:17:44 wiz Exp $
SHA1 (allegro-4.1.18.tar.gz) = 6bfed4fc3e5cfcd8ad8ab1dc1744023f0b5e702e
RMD160 (allegro-4.1.18.tar.gz) = 05dc8ca8783487c9cca694bc22f95a06e77d64fe
@@ -8,3 +8,5 @@
SHA1 (patch-ac) = 78f99723b095f460f20e8367fffb443a8f3d6ab6
SHA1 (patch-ad) = 52f694e1b0053cff94c53ee10f603d535eba5fa5
SHA1 (patch-ae) = 89839ee94e798c08d4121521a64a549d46535f74
+SHA1 (patch-ax) = 7c7e2dce2e1ab388832e56262686876dc52d3d42
+SHA1 (patch-ay) = 7f6d3d14acde2bbccb2d74062e3fd99f4c63011a
diff -r 52e04b2c1b55 -r 9ee607fc807a devel/allegro/patches/patch-ax
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/allegro/patches/patch-ax Sun Sep 11 14:17:44 2005 +0000
@@ -0,0 +1,37 @@
+$NetBSD: patch-ax,v 1.1 2005/09/11 14:17:44 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 @@
+ }
+
+ /* 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 @@
+ 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)) {
+@@ -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 -r 52e04b2c1b55 -r 9ee607fc807a devel/allegro/patches/patch-ay
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/allegro/patches/patch-ay Sun Sep 11 14:17:44 2005 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-ay,v 1.1 2005/09/11 14:17:44 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 @@
+ /* 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
+ };
+
+
Home |
Main Index |
Thread Index |
Old Index