Change helper paths from /usr/local/bin to ${PREFIX}/bin

4 files changed, 36 insertions, 4 deletions

diff --git a/games/fkiss/Makefile b/games/fkiss/Makefile
index d0aefcda3fb..5dfc8799f67 100644
--- a/games/fkiss/Makefile
+++ b/games/fkiss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/12/04 00:28:02 ben Exp $
+# $NetBSD: Makefile,v 1.9 2003/12/04 03:22:49 ben Exp $
 #
 
 DISTNAME=		fkiss-0.33
@@ -24,6 +24,15 @@ CFLAGS+=		-DUSE_STDARG -DHAVE_STDARG_H
 CFLAGS+=		-DDEV_SOUND=\"\\\"${DEVOSSSOUND}\\\"\"
 ALL_TARGET=		fkiss
 
+post-patch:
+	${MV} ${WRKSRC}/sound.c ${WRKSRC}/sound.c.bak
+	${SED} -e "s,XXXPREFIXXXX,${PREFIX},g" \
+		<${WRKSRC}/sound.c.bak >${WRKSRC}/sound.c
+	${MV} ${WRKSRC}/fkiss.man ${WRKSRC}/fkiss.man.bak
+	${SED} -e "s,XXXPREFIXXXX,${PREFIX},g" \
+		<${WRKSRC}/fkiss.man.bak >${WRKSRC}/fkiss.man
+
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/fkiss ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/fkiss.man ${PREFIX}/man/man6/fkiss.6
diff --git a/games/fkiss/distinfo b/games/fkiss/distinfo
index 744bd6943f0..fc98706726a 100644
--- a/games/fkiss/distinfo
+++ b/games/fkiss/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2003/12/04 00:28:02 ben Exp $
+$NetBSD: distinfo,v 1.5 2003/12/04 03:22:49 ben Exp $
 
 SHA1 (fkiss-0.33.tar.gz) = df07895a6b2053ca505dce49f5a6ac3f745f4386
 Size (fkiss-0.33.tar.gz) = 164697 bytes
@@ -6,4 +6,5 @@ SHA1 (fkiss-0.33a.diff) = 03c686ab8282cfc6bd5bc07bad28e8718339b3ab
 Size (fkiss-0.33a.diff) = 8909 bytes
 SHA1 (patch-ab) = b22fcd06b72b85ae413ecb970e43d76532ecc65e
 SHA1 (patch-ac) = db3e28fec1a4b1a7ff620023bbf6cf70b6dd99af
-SHA1 (patch-ad) = 7ad3e72cd7aa1f055cfbc3fd348953df843d2bfa
+SHA1 (patch-ad) = b6d7f79864a48e4dfb52c30cd9d31c1bbe069a34
+SHA1 (patch-ae) = 4eafc6445da6d2512cfc66df88015287320a6fc6
diff --git a/games/fkiss/patches/patch-ad b/games/fkiss/patches/patch-ad
index a41c1d3cb1c..fb3708d2f6f 100644
--- a/games/fkiss/patches/patch-ad
+++ b/games/fkiss/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.3 2003/12/04 00:28:02 ben Exp $
+$NetBSD: patch-ad,v 1.4 2003/12/04 03:22:49 ben Exp $
 
 --- sound.c.orig	2001-11-11 23:05:37.000000000 -0800
 +++ sound.c
@@ -24,3 +24,12 @@ $NetBSD: patch-ad,v 1.3 2003/12/04 00:28:02 ben Exp $
    if (sound_debug >= 2)
      fputs(" ", stderr);
  }
+@@ -464,7 +470,7 @@ void decide_midi_player()
+   char *midilist[] = {
+     "/usr/bin/midiplay", "",
+     "/usr/bin/playmidi", "",
+-    "/usr/local/bin/timidity", "-idq",
++    "XXXPREFIXXXX/bin/timidity", "-idq",
+     NULL
+   };
+   
diff --git a/games/fkiss/patches/patch-ae b/games/fkiss/patches/patch-ae
new file mode 100644
index 00000000000..5e323be1ca4
--- /dev/null
+++ b/games/fkiss/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.3 2003/12/04 03:22:49 ben Exp $
+
+--- fkiss.man.orig	2001-11-11 22:59:51.000000000 -0800
++++ fkiss.man
+@@ -284,7 +284,7 @@ Not use EsounD, use /dev/dsp.
+ Set external MIDI player \fIprogram\fP.
+ Default "/usr/bin/midiplay" or
+  "/usr/bin/playmidi" or
+- "/usr/local/bin/timidity -idq".
++ "XXXPREFIXXXX/bin/timidity -idq".
+ .SH "KEY BINDINGS"
+ .TP
+ .B Button1