From 088c85c467b43373218cf0af66a62e5e70d2d6f0 Mon Sep 17 00:00:00 2001 From: ben Date: Thu, 4 Dec 2003 00:28:02 +0000 Subject: Update fkiss to fkiss-0.33a and remove now unnecessary patches. --- games/fkiss/Makefile | 11 ++++++++--- games/fkiss/PLIST | 3 ++- games/fkiss/distinfo | 17 ++++++++--------- games/fkiss/patches/patch-ab | 6 +++--- games/fkiss/patches/patch-ac | 14 +++----------- games/fkiss/patches/patch-ad | 35 ++++------------------------------- games/fkiss/patches/patch-ae | 16 ---------------- games/fkiss/patches/patch-af | 13 ------------- games/fkiss/patches/patch-ag | 15 --------------- 9 files changed, 28 insertions(+), 102 deletions(-) delete mode 100644 games/fkiss/patches/patch-ae delete mode 100644 games/fkiss/patches/patch-af delete mode 100644 games/fkiss/patches/patch-ag (limited to 'games') diff --git a/games/fkiss/Makefile b/games/fkiss/Makefile index 7dc6e257f7b..d0aefcda3fb 100644 --- a/games/fkiss/Makefile +++ b/games/fkiss/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2003/12/03 23:45:29 ben Exp $ +# $NetBSD: Makefile,v 1.8 2003/12/04 00:28:02 ben Exp $ # -DISTNAME= fkiss-0.32 -PKGREVISION= 1 +DISTNAME= fkiss-0.33 +PKGNAME= fkiss-0.33a CATEGORIES= games MASTER_SITES= http://www.oersted.co.jp/~yav/soft/fkiss/ @@ -10,6 +10,10 @@ MAINTAINER= collver1@comcast.net HOMEPAGE= http://www.oersted.co.jp/~yav/soft/indexe.html#fkiss COMMENT= Kisekae viewer +PATCH_SITES= ${MASTER_SITES} +PATCHFILES= fkiss-0.33a.diff +PATCH_DIST_STRIP= -p1 + DEPENDS+= lha-[0-9]*:../../archivers/lha USE_BUILDLINK2= yes @@ -18,6 +22,7 @@ USE_GMAKE= yes GNU_CONFIGURE= yes CFLAGS+= -DUSE_STDARG -DHAVE_STDARG_H CFLAGS+= -DDEV_SOUND=\"\\\"${DEVOSSSOUND}\\\"\" +ALL_TARGET= fkiss do-install: ${INSTALL_PROGRAM} ${WRKSRC}/fkiss ${PREFIX}/bin diff --git a/games/fkiss/PLIST b/games/fkiss/PLIST index c1cb8a3d159..59193be81bf 100644 --- a/games/fkiss/PLIST +++ b/games/fkiss/PLIST @@ -1,6 +1,7 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/07/14 09:40:30 rh Exp $ +@comment $NetBSD: PLIST,v 1.2 2003/12/04 00:28:02 ben Exp $ bin/fkiss man/man6/fkiss.6 +share/doc/fkiss/fkiss.doc share/doc/fkiss/fkissex.doc share/doc/fkiss/fkissex1.doc share/doc/fkiss/fkissex2.doc diff --git a/games/fkiss/distinfo b/games/fkiss/distinfo index 9dcb224d8d4..744bd6943f0 100644 --- a/games/fkiss/distinfo +++ b/games/fkiss/distinfo @@ -1,10 +1,9 @@ -$NetBSD: distinfo,v 1.3 2003/12/03 23:45:29 ben Exp $ +$NetBSD: distinfo,v 1.4 2003/12/04 00:28:02 ben Exp $ -SHA1 (fkiss-0.32.tar.gz) = 401cfddfbe117de15c1ff36de404a2c360f17d97 -Size (fkiss-0.32.tar.gz) = 160128 bytes -SHA1 (patch-ab) = 4b387d82c310bb3d256fff9b1ba7e8f90cc610a8 -SHA1 (patch-ac) = 40e190d4d40dd3bcbc7f803e1f0e0c8155e69bf1 -SHA1 (patch-ad) = c0aa04ce5b030fb82af325d739197149d37766b3 -SHA1 (patch-ae) = 517086e4a5273725b6e4c0928b8bb01804e33b55 -SHA1 (patch-af) = c5104a21e9935a4d44741341f792dabb59f09382 -SHA1 (patch-ag) = 2732e7a219a8002686e10abe9c0688da24d4d4f5 +SHA1 (fkiss-0.33.tar.gz) = df07895a6b2053ca505dce49f5a6ac3f745f4386 +Size (fkiss-0.33.tar.gz) = 164697 bytes +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 diff --git a/games/fkiss/patches/patch-ab b/games/fkiss/patches/patch-ab index 838a0ae77b1..a8edecad1c2 100644 --- a/games/fkiss/patches/patch-ab +++ b/games/fkiss/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.2 2002/09/21 12:55:08 jlam Exp $ +$NetBSD: patch-ab,v 1.3 2003/12/04 00:28:02 ben Exp $ ---- Makefile.in.orig Mon Oct 16 22:34:46 2000 +--- Makefile.in.orig 2001-11-12 00:29:39.000000000 -0800 +++ Makefile.in @@ -68,8 +68,8 @@ x_libraries = @x_libraries@ bin_PROGRAMS = fkiss @@ -12,4 +12,4 @@ $NetBSD: patch-ab,v 1.2 2002/09/21 12:55:08 jlam Exp $ +LDADD = -lX11 $(LIBOSSAUDIO) INCLUDES = -I@x_includes@ - EXTRA_DIST = fkiss.man fkissrc.smp english.sed japanese.sed README.euc README.sjis kissgs.doc fkissex.doc fkissex1.doc fkissex2.doc fkissex3.doc frkismi4.lzh + EXTRA_DIST = fkiss.man fkissrc.smp english.sed japanese.sed fkiss.doc README.euc README.sjis kissgs.doc fkissex.doc fkissex1.doc fkissex2.doc fkissex3.doc frkismi4.lzh diff --git a/games/fkiss/patches/patch-ac b/games/fkiss/patches/patch-ac index f5710298f65..2f6d883f4d4 100644 --- a/games/fkiss/patches/patch-ac +++ b/games/fkiss/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.1.1.1 2002/07/14 09:40:30 rh Exp $ +$NetBSD: patch-ac,v 1.2 2003/12/04 00:28:02 ben Exp $ ---- fkiss.c.orig Mon Oct 16 22:10:18 2000 +--- fkiss.c.orig 2001-11-11 22:56:51.000000000 -0800 +++ fkiss.c -@@ -71,11 +71,11 @@ +@@ -85,11 +85,11 @@ static ARTBL artype[] = { * Document file browse command * Uncomment only one line in following #define DOC_COMMAND lines. */ @@ -16,11 +16,3 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/07/14 09:40:30 rh Exp $ /* #define DOC_COMMAND "kterm -e less" */ /* #define DOC_COMMAND "(cd %A; kterm -km sjis -e jless %F) &" */ -@@ -1846,6 +1846,7 @@ - OPTTBL("-nosuffix", OPT_FUNC, opt_del_doc_suffix, 1), - OPTTBL("-autoadjust", OPT_GET_INT, &auto_adjust, 0), - OPTTBL("-alpha", OPT_GET_INT, &alpha_level, 0), -+ OPTTBL("-midiplayer", OPT_GET_STR, &midi_player, 0), - OPTTBL(NULL, 0, NULL, 0) - }; - diff --git a/games/fkiss/patches/patch-ad b/games/fkiss/patches/patch-ad index 69907d1464c..a41c1d3cb1c 100644 --- a/games/fkiss/patches/patch-ad +++ b/games/fkiss/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.2 2003/12/03 23:45:29 ben Exp $ +$NetBSD: patch-ad,v 1.3 2003/12/04 00:28:02 ben Exp $ ---- sound.c.orig 2000-10-16 22:10:55.000000000 -0700 +--- sound.c.orig 2001-11-11 23:05:37.000000000 -0800 +++ sound.c -@@ -43,6 +43,12 @@ +@@ -57,6 +57,12 @@ char id_sound[] = "$Id: sound.c,v 1.21 2 # include #endif @@ -15,16 +15,7 @@ $NetBSD: patch-ad,v 1.2 2003/12/03 23:45:29 ben Exp $ #ifndef DEV_SOUND # define DEV_SOUND "/dev/audio" #endif -@@ -61,7 +67,7 @@ - - #include "ulaw.h" - -- -+char *midi_player = "/usr/bin/midiplay"; - char *sound_device = DEV_SOUND; - int sound_debug = 1; /* debug information print level - * 0: print nothing, silent -@@ -218,7 +224,7 @@ +@@ -235,7 +241,7 @@ void play_sync(fd) { if (sound_debug >= 2) fputs("sync", stderr); @@ -33,21 +24,3 @@ $NetBSD: patch-ad,v 1.2 2003/12/03 23:45:29 ben Exp $ if (sound_debug >= 2) fputs(" ", stderr); } -@@ -640,6 +646,17 @@ - if (!sound_enable) - return 0; - -+ bufp = name; -+ while (strstr(bufp + 1, ".mid") != NULL) bufp = strstr(bufp + 1, ".mid"); -+ while (strstr(bufp + 1, ".MID") != NULL) bufp = strstr(bufp + 1, ".MID"); -+ if ((!strncmp(bufp, ".mid", 4) || !strncmp(bufp, ".MID", 4)) && -+ strlen(bufp) < 6) -+ { -+ snprintf(buf, sizeof(buf), "%s %s", midi_player, name); -+ ks_system2(buf); -+ return 0; -+ } -+ - bzero(&sf, sizeof(sf)); - bzero(buf, sizeof(buf)); - if (name == NULL) { diff --git a/games/fkiss/patches/patch-ae b/games/fkiss/patches/patch-ae deleted file mode 100644 index 26bcd0d177a..00000000000 --- a/games/fkiss/patches/patch-ae +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ae,v 1.1.1.1 2002/07/14 09:40:31 rh Exp $ - ---- sub.c.orig Tue Oct 3 01:52:27 2000 -+++ sub.c -@@ -38,6 +38,11 @@ - } - if (dsp != NULL) - XCloseDisplay(dsp); -+ -+ /* kill outstanding subprocesses ie: external audio players */ -+ signal(15, NULL); -+ killpg(0, 15); -+ - exit(code); - } - diff --git a/games/fkiss/patches/patch-af b/games/fkiss/patches/patch-af deleted file mode 100644 index 8e6fce4dfa5..00000000000 --- a/games/fkiss/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.1.1.1 2002/07/14 09:40:31 rh Exp $ - ---- work.h.orig Tue Oct 3 01:52:27 2000 -+++ work.h -@@ -70,6 +70,8 @@ - extern COLOR *kcflist; - extern SETINFO kset[]; - -+extern char *midi_player; -+ - extern Colormap cmap; - extern int gray_mode; - extern int colcnt; diff --git a/games/fkiss/patches/patch-ag b/games/fkiss/patches/patch-ag deleted file mode 100644 index d4ce493b485..00000000000 --- a/games/fkiss/patches/patch-ag +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ag,v 1.1.1.1 2002/07/14 09:40:31 rh Exp $ - ---- fkiss.man.orig Mon Oct 16 22:16:48 2000 -+++ fkiss.man -@@ -265,6 +265,10 @@ - .TP - .B \-noesd - Not use EsounD, use /dev/dsp. -+.TP -+.BI \-midiplayer " program" -+Set external MIDI player \fIprogram\fP. -+Default /usr/bin/midiplay. - .SH "KEY BINDINGS" - .TP - .B Button1 -- cgit v1.2.3