Apply modification by Toshihiro Kanda, to be upgraded to 1.2.

New animal(?): BSD Daemon.

6 files changed, 30 insertions, 44 deletions

diff --git a/x11/oneko/Makefile b/x11/oneko/Makefile
index bae083b232b..3d7100108d6 100644
--- a/x11/oneko/Makefile
+++ b/x11/oneko/Makefile
@@ -1,9 +1,14 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/09/10 00:39:25 tron Exp $
+# $NetBSD: Makefile,v 1.2 2000/05/18 22:51:42 itohy Exp $
 
 DISTNAME=		oneko-1.1b
+PKGNAME=		oneko-1.2
 CATEGORIES=		x11 games
 MASTER_SITES=		${MASTER_SITE_XCONTRIB:S/contrib/R5contrib/}
 
+PATCHFILES=		oneko-1.2.diff.gz
+PATCH_SITES=		http://hp.vector.co.jp/authors/VA004959/oneko/
+PATCH_DIST_STRIP=	-p1
+
 MAINTAINER=		johnam@mail.kemper.org
 
 USE_IMAKE=		yes
diff --git a/x11/oneko/files/md5 b/x11/oneko/files/md5
index dcdf4aecd72..a7f6382dbf8 100644
--- a/x11/oneko/files/md5
+++ b/x11/oneko/files/md5
@@ -1,3 +1,4 @@
-$NetBSD: md5,v 1.1.1.1 1999/09/10 00:39:25 tron Exp $
+$NetBSD: md5,v 1.2 2000/05/18 22:51:42 itohy Exp $
 
 MD5 (oneko-1.1b.tar.gz) = 245dc70338104d56477a2d1189174021
+MD5 (oneko-1.2.diff.gz) = a110827ba993ab377e4f0c75fb426df6
diff --git a/x11/oneko/files/patch-sum b/x11/oneko/files/patch-sum
index 0293182804d..36889e04145 100644
--- a/x11/oneko/files/patch-sum
+++ b/x11/oneko/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.2 1999/09/13 01:23:23 itohy Exp $
+$NetBSD: patch-sum,v 1.3 2000/05/18 22:51:42 itohy Exp $
 
-MD5 (patch-aa) = 4d18f16a353291ee340478355aacbf27
-MD5 (patch-ab) = 358994dff275fb891a21798b72898b73
+MD5 (patch-aa) = 00c3bd167b4271b90c0a2f1e1ce1bd8d
+MD5 (patch-ab) = 642c48cdf4250b10a258cc7ad614738d
diff --git a/x11/oneko/patches/patch-aa b/x11/oneko/patches/patch-aa
index f05562b35c8..28e7294dda3 100644
--- a/x11/oneko/patches/patch-aa
+++ b/x11/oneko/patches/patch-aa
@@ -1,31 +1,11 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/09/10 00:39:25 tron Exp $
+$NetBSD: patch-aa,v 1.2 2000/05/18 22:51:42 itohy Exp $
 
---- Imakefile.orig	Thu Oct 31 14:09:31 1991
-+++ Imakefile	Fri Sep 10 02:35:38 1999
-@@ -1,23 +1,10 @@
- /**/# Cannot compile in using Gcc
-              CC = cc
- 
--LOCAL_LIBRARIES = -L/usr/local/lib $(XLIB)
-+LOCAL_LIBRARIES = $(XLIB)
-   SYS_LIBRARIES = -lm
-         DEPLIBS = $(DEPXLIB)
--        DEFINES = -DSHAPE -I/usr/local/include
--
--CP = /bin/cp
--STRIP = /bin/strip
--RM = /bin/rm -f
-+        DEFINES = -DSHAPE
+--- Imakefile.orig	Wed May 17 18:53:54 2000
++++ Imakefile	Wed May 17 18:57:22 2000
+@@ -7,5 +7,4 @@
+         DEFINES = -DSHAPE
  
  SimpleProgramTarget(oneko)
 -
--DESTDIR = /afs/andrew/system/dest/@sys/contributed/neko/011
--
--install::
--	$(RM) $(DESTDIR)/bin/oneko $(DESTDIR)/man/man1/oneko.man
--	$(CP) oneko $(DESTDIR)/bin/oneko
--	$(STRIP) $(DESTDIR)/bin/oneko
--	$(CP) oneko.man $(DESTDIR)/man/man1/oneko.1
--
 -/* InstallAppDefaults(Oneko) */
 +InstallManPage(oneko,$(MANDIR))
diff --git a/x11/oneko/patches/patch-ab b/x11/oneko/patches/patch-ab
index 677c213b8c5..a59a5011c95 100644
--- a/x11/oneko/patches/patch-ab
+++ b/x11/oneko/patches/patch-ab
@@ -1,14 +1,14 @@
-$NetBSD: patch-ab,v 1.1 1999/09/13 01:23:24 itohy Exp $
+$NetBSD: patch-ab,v 1.2 2000/05/18 22:51:42 itohy Exp $
 
---- oneko.h.orig	Thu Oct 31 21:38:52 1991
-+++ oneko.h	Sat Sep 11 19:34:29 1999
-@@ -17,6 +17,9 @@
- #include <signal.h>
- #include <math.h>
- #include <sys/time.h>
-+#ifndef X_NOT_STDC_ENV
-+#include <stdlib.h>
-+#endif
- 
- 
- /*
+--- oneko.man.orig	Wed May 17 19:06:06 2000
++++ oneko.man	Wed May 17 19:40:26 2000
+@@ -99,6 +99,9 @@
+ .SH AUTHOR
+ Original xneko is written by Masayuki Koba and modified by Tatsuya Kato
+ (kato@ntts.co.jp).  Send bug fixes and enhancements to kato@ntts.co.jp
++.PP
++BSD Daemon Copyright 1988 by Marshall Kirk McKusick.
++All Rights Reserved.
+ .SH MAINTAINER
+ Send questions or problems to ea08@andrew.cmu.edu
+ .ad b
diff --git a/x11/oneko/pkg/DESCR b/x11/oneko/pkg/DESCR
index af01437e9b7..eadc855b6ce 100644
--- a/x11/oneko/pkg/DESCR
+++ b/x11/oneko/pkg/DESCR
@@ -1,6 +1,6 @@
 Oneko  displays a cat that chases your ``mouse'' cursor around
 the desktop.  Command line options let you select an optional
-dog or tora (cat with stripes).
+dog, tora (cat with stripes), or BSD Daemon.
 
 The word ``neko'' means ``cat'' in Japanese.