3 files changed, 97 insertions, 5 deletions

diff --git a/games/oneko/Makefile b/games/oneko/Makefile
index b92686c5a52d..5a21003b8a39 100644
--- a/games/oneko/Makefile
+++ b/games/oneko/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	oneko
 PORTVERSION=	2.0b
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www02.so-net.ne.jp/~nsasaki/oneko/ \
 		http://www.net24.ne.jp/~ryo2/archives/:ryo2 \
@@ -15,9 +16,16 @@ DISTFILES=	oneko-2.0b.tar.gz \
 		oneko-2.0b-pop1.1-patch.tar.gz \
 		oneko-2.0b-tip1.7.tar.gz:ryo2 \
 		oneko-2.0b-sender0.4.tar.gz:hsaka
+DIST_SUBDIR=	${PORTNAME}
+
+PATCH_SITES=	http://www2u.biglobe.ne.jp/~hsaka/distfiles/
+PATCHFILES=	oneko-2.0b-bsd0.1.patch.gz
+PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	candy@kgc.co.jp
 
+BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
+
 GNU_CONFIGURE=	yes
 USE_X_PREFIX=	yes
 MAN6=		oneko.6
@@ -28,7 +36,7 @@ MAKE_ARGS=	MANSUFFIX=6 \
 		MANDIR=${PREFIX}/man/man6 \
 		JMANDIR=${PREFIX}/man/ja/man6
 
-do-patch:
+pre-patch:
 	@(cd ${WRKSRC}; \
 	${PATCH} -p1 < ../oneko-2.0b-pop1.1.patch ; \
 	${PATCH} -p1 < oneko-2.0b-tip1.7.patch ; \
diff --git a/games/oneko/distinfo b/games/oneko/distinfo
index 9a5685b99202..91e30baacdfa 100644
--- a/games/oneko/distinfo
+++ b/games/oneko/distinfo
@@ -1,4 +1,5 @@
-MD5 (oneko-2.0b.tar.gz) = 1b7e9d6d9ac59314b8b5a48b4424db1d
-MD5 (oneko-2.0b-pop1.1-patch.tar.gz) = 756ccf57bfea7c8fc09ac18d94033786
-MD5 (oneko-2.0b-tip1.7.tar.gz) = 0a1c6035932899504f4c9990b3cb981b
-MD5 (oneko-2.0b-sender0.4.tar.gz) = 320779269294166bb055efe5bdef6b41
+MD5 (oneko/oneko-2.0b.tar.gz) = 1b7e9d6d9ac59314b8b5a48b4424db1d
+MD5 (oneko/oneko-2.0b-pop1.1-patch.tar.gz) = 756ccf57bfea7c8fc09ac18d94033786
+MD5 (oneko/oneko-2.0b-tip1.7.tar.gz) = 0a1c6035932899504f4c9990b3cb981b
+MD5 (oneko/oneko-2.0b-sender0.4.tar.gz) = 320779269294166bb055efe5bdef6b41
+MD5 (oneko/oneko-2.0b-bsd0.1.patch.gz) = 8a48c98f0226e74379295d76ca7bf58b
diff --git a/games/oneko/pkg-plist b/games/oneko/pkg-plist
index 8a65b0e70b32..583c671cc99b 100644
--- a/games/oneko/pkg-plist
+++ b/games/oneko/pkg-plist
@@ -1,4 +1,87 @@
 bin/oneko
+lib/X11/oneko/bsd/akubi1.xbm
+lib/X11/oneko/bsd/akubi1_mask.xbm
+lib/X11/oneko/bsd/akubi2.xbm
+lib/X11/oneko/bsd/akubi2_mask.xbm
+lib/X11/oneko/bsd/akubiL.xbm
+lib/X11/oneko/bsd/akubiL_mask.xbm
+lib/X11/oneko/bsd/akubiR.xbm
+lib/X11/oneko/bsd/akubiR_mask.xbm
+lib/X11/oneko/bsd/awake.xbm
+lib/X11/oneko/bsd/awake_mask.xbm
+lib/X11/oneko/bsd/cursor.xbm
+lib/X11/oneko/bsd/cursor_mask.xbm
+lib/X11/oneko/bsd/down1.xbm
+lib/X11/oneko/bsd/down1_mask.xbm
+lib/X11/oneko/bsd/down2.xbm
+lib/X11/oneko/bsd/down2_mask.xbm
+lib/X11/oneko/bsd/dtogi1.xbm
+lib/X11/oneko/bsd/dtogi1_mask.xbm
+lib/X11/oneko/bsd/dtogi2.xbm
+lib/X11/oneko/bsd/dtogi2_mask.xbm
+lib/X11/oneko/bsd/dwleft1.xbm
+lib/X11/oneko/bsd/dwleft1_mask.xbm
+lib/X11/oneko/bsd/dwleft2.xbm
+lib/X11/oneko/bsd/dwleft2_mask.xbm
+lib/X11/oneko/bsd/dwright1.xbm
+lib/X11/oneko/bsd/dwright1_mask.xbm
+lib/X11/oneko/bsd/dwright2.xbm
+lib/X11/oneko/bsd/dwright2_mask.xbm
+lib/X11/oneko/bsd/jare2.xbm
+lib/X11/oneko/bsd/jare2_mask.xbm
+lib/X11/oneko/bsd/kaki1.xbm
+lib/X11/oneko/bsd/kaki1_mask.xbm
+lib/X11/oneko/bsd/kaki2.xbm
+lib/X11/oneko/bsd/kaki2_mask.xbm
+lib/X11/oneko/bsd/kotatsu.xbm
+lib/X11/oneko/bsd/kotatsu_mask.xbm
+lib/X11/oneko/bsd/left1.xbm
+lib/X11/oneko/bsd/left1_mask.xbm
+lib/X11/oneko/bsd/left2.xbm
+lib/X11/oneko/bsd/left2_mask.xbm
+lib/X11/oneko/bsd/ltogi1.xbm
+lib/X11/oneko/bsd/ltogi1_mask.xbm
+lib/X11/oneko/bsd/ltogi2.xbm
+lib/X11/oneko/bsd/ltogi2_mask.xbm
+lib/X11/oneko/bsd/maneki1.xbm
+lib/X11/oneko/bsd/maneki1_mask.xbm
+lib/X11/oneko/bsd/maneki2.xbm
+lib/X11/oneko/bsd/maneki2_mask.xbm
+lib/X11/oneko/bsd/mati1.xbm
+lib/X11/oneko/bsd/mati1_mask.xbm
+lib/X11/oneko/bsd/mati2.xbm
+lib/X11/oneko/bsd/mati2_mask.xbm
+lib/X11/oneko/bsd/right1.xbm
+lib/X11/oneko/bsd/right1_mask.xbm
+lib/X11/oneko/bsd/right2.xbm
+lib/X11/oneko/bsd/right2_mask.xbm
+lib/X11/oneko/bsd/rtogi1.xbm
+lib/X11/oneko/bsd/rtogi1_mask.xbm
+lib/X11/oneko/bsd/rtogi2.xbm
+lib/X11/oneko/bsd/rtogi2_mask.xbm
+lib/X11/oneko/bsd/sleep1.xbm
+lib/X11/oneko/bsd/sleep1_mask.xbm
+lib/X11/oneko/bsd/sleep2.xbm
+lib/X11/oneko/bsd/sleep2_mask.xbm
+lib/X11/oneko/bsd/space.xbm
+lib/X11/oneko/bsd/space_mask.xbm
+lib/X11/oneko/bsd/up1.xbm
+lib/X11/oneko/bsd/up1_mask.xbm
+lib/X11/oneko/bsd/up2.xbm
+lib/X11/oneko/bsd/up2_mask.xbm
+lib/X11/oneko/bsd/upleft1.xbm
+lib/X11/oneko/bsd/upleft1_mask.xbm
+lib/X11/oneko/bsd/upleft2.xbm
+lib/X11/oneko/bsd/upleft2_mask.xbm
+lib/X11/oneko/bsd/upright1.xbm
+lib/X11/oneko/bsd/upright1_mask.xbm
+lib/X11/oneko/bsd/upright2.xbm
+lib/X11/oneko/bsd/upright2_mask.xbm
+lib/X11/oneko/bsd/utogi1.xbm
+lib/X11/oneko/bsd/utogi1_mask.xbm
+lib/X11/oneko/bsd/utogi2.xbm
+lib/X11/oneko/bsd/utogi2_mask.xbm
+@dirrm lib/X11/oneko/bsd
 lib/X11/oneko/oneko/akubi1.xbm
 lib/X11/oneko/oneko/akubi1_mask.xbm
 lib/X11/oneko/oneko/akubi2.xbm