Update to 2.0b

Approved by:	maintainer

3 files changed, 207 insertions, 7 deletions

diff --git a/games/oneko/Makefile b/games/oneko/Makefile
index 7cc6ac4ebdb8..b92686c5a52d 100644
--- a/games/oneko/Makefile
+++ b/games/oneko/Makefile
@@ -6,17 +6,32 @@
 #
 
 PORTNAME=	oneko
-PORTVERSION=	1.2
+PORTVERSION=	2.0b
 CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.cin.nihon-u.ac.jp/pub/Linux/PJE/PJE-0.1.5/sources/xclt/oneko/ \
-		http://hp.vector.co.jp/authors/VA004959/oneko/
+MASTER_SITES=	http://www02.so-net.ne.jp/~nsasaki/oneko/ \
+		http://www.net24.ne.jp/~ryo2/archives/:ryo2 \
+		http://www2u.biglobe.ne.jp/~hsaka/distfiles/:hsaka
+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
 
 MAINTAINER=	candy@kgc.co.jp
 
-USE_IMAKE=	yes
+GNU_CONFIGURE=	yes
+USE_X_PREFIX=	yes
 MAN6=		oneko.6
+MANLANG=	. ja
+WRKSRC=		${WRKDIR}/${PORTNAME}
+INSTALL_TARGET=	install install.man
+MAKE_ARGS=	MANSUFFIX=6 \
+		MANDIR=${PREFIX}/man/man6 \
+		JMANDIR=${PREFIX}/man/ja/man6
 
-pre-configure:
-	@${ECHO_CMD} "MANSUFFIX=6" >>${WRKSRC}/Imakefile
+do-patch:
+	@(cd ${WRKSRC}; \
+	${PATCH} -p1 < ../oneko-2.0b-pop1.1.patch ; \
+	${PATCH} -p1 < oneko-2.0b-tip1.7.patch ; \
+	${PATCH} -p1 < ../oneko-2.0b-sender0.4.patch )
 
 .include <bsd.port.mk>
diff --git a/games/oneko/distinfo b/games/oneko/distinfo
index 90424a09e68f..9a5685b99202 100644
--- a/games/oneko/distinfo
+++ b/games/oneko/distinfo
@@ -1 +1,4 @@
-MD5 (oneko-1.2.tar.gz) = 890a476b54e13bfd4ab21440c6a5a8e2
+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
diff --git a/games/oneko/pkg-plist b/games/oneko/pkg-plist
index 82faa88c1879..8a65b0e70b32 100644
--- a/games/oneko/pkg-plist
+++ b/games/oneko/pkg-plist
@@ -1 +1,183 @@
 bin/oneko
+lib/X11/oneko/oneko/akubi1.xbm
+lib/X11/oneko/oneko/akubi1_mask.xbm
+lib/X11/oneko/oneko/akubi2.xbm
+lib/X11/oneko/oneko/akubi2_mask.xbm
+lib/X11/oneko/oneko/akubiL.xbm
+lib/X11/oneko/oneko/akubiL_mask.xbm
+lib/X11/oneko/oneko/akubiR.xbm
+lib/X11/oneko/oneko/akubiR_mask.xbm
+lib/X11/oneko/oneko/awake.xbm
+lib/X11/oneko/oneko/awake_mask.xbm
+lib/X11/oneko/oneko/down1.xbm
+lib/X11/oneko/oneko/down1_mask.xbm
+lib/X11/oneko/oneko/down2.xbm
+lib/X11/oneko/oneko/down2_mask.xbm
+lib/X11/oneko/oneko/dtogi1.xbm
+lib/X11/oneko/oneko/dtogi1_mask.xbm
+lib/X11/oneko/oneko/dtogi2.xbm
+lib/X11/oneko/oneko/dtogi2_mask.xbm
+lib/X11/oneko/oneko/dwleft1.xbm
+lib/X11/oneko/oneko/dwleft1_mask.xbm
+lib/X11/oneko/oneko/dwleft2.xbm
+lib/X11/oneko/oneko/dwleft2_mask.xbm
+lib/X11/oneko/oneko/dwright1.xbm
+lib/X11/oneko/oneko/dwright1_mask.xbm
+lib/X11/oneko/oneko/dwright2.xbm
+lib/X11/oneko/oneko/dwright2_mask.xbm
+lib/X11/oneko/oneko/inleft1.xbm
+lib/X11/oneko/oneko/inleft1_mask.xbm
+lib/X11/oneko/oneko/inleft2.xbm
+lib/X11/oneko/oneko/inleft2_mask.xbm
+lib/X11/oneko/oneko/inright1.xbm
+lib/X11/oneko/oneko/inright1_mask.xbm
+lib/X11/oneko/oneko/inright2.xbm
+lib/X11/oneko/oneko/inright2_mask.xbm
+lib/X11/oneko/oneko/jare2.xbm
+lib/X11/oneko/oneko/jare2_mask.xbm
+lib/X11/oneko/oneko/kaki1.xbm
+lib/X11/oneko/oneko/kaki1_mask.xbm
+lib/X11/oneko/oneko/kaki2.xbm
+lib/X11/oneko/oneko/kaki2_mask.xbm
+lib/X11/oneko/oneko/left1.xbm
+lib/X11/oneko/oneko/left1_mask.xbm
+lib/X11/oneko/oneko/left2.xbm
+lib/X11/oneko/oneko/left2_mask.xbm
+lib/X11/oneko/oneko/ltogi1.xbm
+lib/X11/oneko/oneko/ltogi1_mask.xbm
+lib/X11/oneko/oneko/ltogi2.xbm
+lib/X11/oneko/oneko/ltogi2_mask.xbm
+lib/X11/oneko/oneko/maneki1.xbm
+lib/X11/oneko/oneko/maneki1_mask.xbm
+lib/X11/oneko/oneko/maneki2.xbm
+lib/X11/oneko/oneko/maneki2_mask.xbm
+lib/X11/oneko/oneko/mati1.xbm
+lib/X11/oneko/oneko/mati1_mask.xbm
+lib/X11/oneko/oneko/mati2.xbm
+lib/X11/oneko/oneko/mati2_mask.xbm
+lib/X11/oneko/oneko/right1.xbm
+lib/X11/oneko/oneko/right1_mask.xbm
+lib/X11/oneko/oneko/right2.xbm
+lib/X11/oneko/oneko/right2_mask.xbm
+lib/X11/oneko/oneko/rtogi1.xbm
+lib/X11/oneko/oneko/rtogi1_mask.xbm
+lib/X11/oneko/oneko/rtogi2.xbm
+lib/X11/oneko/oneko/rtogi2_mask.xbm
+lib/X11/oneko/oneko/sleep1.xbm
+lib/X11/oneko/oneko/sleep1_mask.xbm
+lib/X11/oneko/oneko/sleep2.xbm
+lib/X11/oneko/oneko/sleep2_mask.xbm
+lib/X11/oneko/oneko/up1.xbm
+lib/X11/oneko/oneko/up1_mask.xbm
+lib/X11/oneko/oneko/up2.xbm
+lib/X11/oneko/oneko/up2_mask.xbm
+lib/X11/oneko/oneko/upleft1.xbm
+lib/X11/oneko/oneko/upleft1_mask.xbm
+lib/X11/oneko/oneko/upleft2.xbm
+lib/X11/oneko/oneko/upleft2_mask.xbm
+lib/X11/oneko/oneko/upright1.xbm
+lib/X11/oneko/oneko/upright1_mask.xbm
+lib/X11/oneko/oneko/upright2.xbm
+lib/X11/oneko/oneko/upright2_mask.xbm
+lib/X11/oneko/oneko/utogi1.xbm
+lib/X11/oneko/oneko/utogi1_mask.xbm
+lib/X11/oneko/oneko/utogi2.xbm
+lib/X11/oneko/oneko/utogi2_mask.xbm
+@dirrm lib/X11/oneko/oneko
+lib/X11/oneko/tora/akubi1.xbm
+lib/X11/oneko/tora/akubi1_mask.xbm
+lib/X11/oneko/tora/akubi2.xbm
+lib/X11/oneko/tora/akubi2_mask.xbm
+lib/X11/oneko/tora/akubiL.xbm
+lib/X11/oneko/tora/akubiL_mask.xbm
+lib/X11/oneko/tora/akubiR.xbm
+lib/X11/oneko/tora/akubiR_mask.xbm
+lib/X11/oneko/tora/awake.xbm
+lib/X11/oneko/tora/awake_mask.xbm
+lib/X11/oneko/tora/down1.xbm
+lib/X11/oneko/tora/down1_mask.xbm
+lib/X11/oneko/tora/down2.xbm
+lib/X11/oneko/tora/down2_mask.xbm
+lib/X11/oneko/tora/dtogi1.xbm
+lib/X11/oneko/tora/dtogi1_mask.xbm
+lib/X11/oneko/tora/dtogi2.xbm
+lib/X11/oneko/tora/dtogi2_mask.xbm
+lib/X11/oneko/tora/dwleft1.xbm
+lib/X11/oneko/tora/dwleft1_mask.xbm
+lib/X11/oneko/tora/dwleft2.xbm
+lib/X11/oneko/tora/dwleft2_mask.xbm
+lib/X11/oneko/tora/dwright1.xbm
+lib/X11/oneko/tora/dwright1_mask.xbm
+lib/X11/oneko/tora/dwright2.xbm
+lib/X11/oneko/tora/dwright2_mask.xbm
+lib/X11/oneko/tora/inleft1.xbm
+lib/X11/oneko/tora/inleft1_mask.xbm
+lib/X11/oneko/tora/inleft2.xbm
+lib/X11/oneko/tora/inleft2_mask.xbm
+lib/X11/oneko/tora/inright1.xbm
+lib/X11/oneko/tora/inright1_mask.xbm
+lib/X11/oneko/tora/inright2.xbm
+lib/X11/oneko/tora/inright2_mask.xbm
+lib/X11/oneko/tora/jare2.xbm
+lib/X11/oneko/tora/jare2_mask.xbm
+lib/X11/oneko/tora/kaki1.xbm
+lib/X11/oneko/tora/kaki1_mask.xbm
+lib/X11/oneko/tora/kaki2.xbm
+lib/X11/oneko/tora/kaki2_mask.xbm
+lib/X11/oneko/tora/left1.xbm
+lib/X11/oneko/tora/left1_mask.xbm
+lib/X11/oneko/tora/left2.xbm
+lib/X11/oneko/tora/left2_mask.xbm
+lib/X11/oneko/tora/ltogi1.xbm
+lib/X11/oneko/tora/ltogi1_mask.xbm
+lib/X11/oneko/tora/ltogi2.xbm
+lib/X11/oneko/tora/ltogi2_mask.xbm
+lib/X11/oneko/tora/maneki1.xbm
+lib/X11/oneko/tora/maneki1_mask.xbm
+lib/X11/oneko/tora/maneki2.xbm
+lib/X11/oneko/tora/maneki2_mask.xbm
+lib/X11/oneko/tora/mati1.xbm
+lib/X11/oneko/tora/mati1_mask.xbm
+lib/X11/oneko/tora/mati2.xbm
+lib/X11/oneko/tora/mati2_mask.xbm
+lib/X11/oneko/tora/right1.xbm
+lib/X11/oneko/tora/right1_mask.xbm
+lib/X11/oneko/tora/right2.xbm
+lib/X11/oneko/tora/right2_mask.xbm
+lib/X11/oneko/tora/rtogi1.xbm
+lib/X11/oneko/tora/rtogi1_mask.xbm
+lib/X11/oneko/tora/rtogi2.xbm
+lib/X11/oneko/tora/rtogi2_mask.xbm
+lib/X11/oneko/tora/sleep1.xbm
+lib/X11/oneko/tora/sleep1_mask.xbm
+lib/X11/oneko/tora/sleep2.xbm
+lib/X11/oneko/tora/sleep2_mask.xbm
+lib/X11/oneko/tora/up1.xbm
+lib/X11/oneko/tora/up1_mask.xbm
+lib/X11/oneko/tora/up2.xbm
+lib/X11/oneko/tora/up2_mask.xbm
+lib/X11/oneko/tora/upleft1.xbm
+lib/X11/oneko/tora/upleft1_mask.xbm
+lib/X11/oneko/tora/upleft2.xbm
+lib/X11/oneko/tora/upleft2_mask.xbm
+lib/X11/oneko/tora/upright1.xbm
+lib/X11/oneko/tora/upright1_mask.xbm
+lib/X11/oneko/tora/upright2.xbm
+lib/X11/oneko/tora/upright2_mask.xbm
+lib/X11/oneko/tora/utogi1.xbm
+lib/X11/oneko/tora/utogi1_mask.xbm
+lib/X11/oneko/tora/utogi2.xbm
+lib/X11/oneko/tora/utogi2_mask.xbm
+@dirrm lib/X11/oneko/tora
+lib/X11/oneko/cursor.xbm
+lib/X11/oneko/cursor_mask.xbm
+lib/X11/oneko/help
+lib/X11/oneko/kotatsu.xbm
+lib/X11/oneko/kotatsu_mask.xbm
+lib/X11/oneko/mari.xbm
+lib/X11/oneko/mari_mask.xbm
+lib/X11/oneko/post.xbm
+lib/X11/oneko/post_mask.xbm
+lib/X11/oneko/sender.xbm
+lib/X11/oneko/sender_mask.xbm
+@dirrm lib/X11/oneko