* Fix mouse cursor in bsd daemon mode.

(Previous commit includes bsd daemon mode already.)
* Add color pixmap image experimentally. Use it by
 oneko -bsd -pixmapdir %/bsd -kotatsupixmap %/bsd/kotatsu.xpm

Approved by: maintainer
Special thanks to: hsaka@mth.biglobe.ne.jp (Hironori SAKAMOTO)

3 files changed, 48 insertions, 10 deletions

diff --git a/games/oneko/Makefile b/games/oneko/Makefile
index 5a21003b8a39..04f1320929da 100644
--- a/games/oneko/Makefile
+++ b/games/oneko/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	oneko
 PORTVERSION=	2.0b
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www02.so-net.ne.jp/~nsasaki/oneko/ \
 		http://www.net24.ne.jp/~ryo2/archives/:ryo2 \
@@ -15,13 +15,10 @@ MASTER_SITES=	http://www02.so-net.ne.jp/~nsasaki/oneko/ \
 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
+		oneko-2.0b-sender0.5.tar.gz:hsaka \
+		oneko-2.0b-bsd0.2.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
@@ -36,10 +33,11 @@ MAKE_ARGS=	MANSUFFIX=6 \
 		MANDIR=${PREFIX}/man/man6 \
 		JMANDIR=${PREFIX}/man/ja/man6
 
-pre-patch:
+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 )
+	${PATCH} -p1 < ../oneko-2.0b-sender0.5.patch ; \
+	${PATCH} -p1 < ../oneko-2.0b-bsd0.2.patch )
 
 .include <bsd.port.mk>
diff --git a/games/oneko/distinfo b/games/oneko/distinfo
index 91e30baacdfa..9e70f199ab73 100644
--- a/games/oneko/distinfo
+++ b/games/oneko/distinfo
@@ -1,5 +1,5 @@
 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
+MD5 (oneko/oneko-2.0b-sender0.5.tar.gz) = 46e115e48dd41c27fab8faa79b54b9b9
+MD5 (oneko/oneko-2.0b-bsd0.2.tar.gz) = 8407eb4383863fcd70d19680ebcb3fc2
diff --git a/games/oneko/pkg-plist b/games/oneko/pkg-plist
index 583c671cc99b..0ab36fd57818 100644
--- a/games/oneko/pkg-plist
+++ b/games/oneko/pkg-plist
@@ -1,85 +1,125 @@
 bin/oneko
 lib/X11/oneko/bsd/akubi1.xbm
+lib/X11/oneko/bsd/akubi1.xpm
 lib/X11/oneko/bsd/akubi1_mask.xbm
 lib/X11/oneko/bsd/akubi2.xbm
+lib/X11/oneko/bsd/akubi2.xpm
 lib/X11/oneko/bsd/akubi2_mask.xbm
 lib/X11/oneko/bsd/akubiL.xbm
+lib/X11/oneko/bsd/akubiL.xpm
 lib/X11/oneko/bsd/akubiL_mask.xbm
 lib/X11/oneko/bsd/akubiR.xbm
+lib/X11/oneko/bsd/akubiR.xpm
 lib/X11/oneko/bsd/akubiR_mask.xbm
 lib/X11/oneko/bsd/awake.xbm
+lib/X11/oneko/bsd/awake.xpm
 lib/X11/oneko/bsd/awake_mask.xbm
 lib/X11/oneko/bsd/cursor.xbm
+lib/X11/oneko/bsd/cursor.xpm
 lib/X11/oneko/bsd/cursor_mask.xbm
 lib/X11/oneko/bsd/down1.xbm
+lib/X11/oneko/bsd/down1.xpm
 lib/X11/oneko/bsd/down1_mask.xbm
 lib/X11/oneko/bsd/down2.xbm
+lib/X11/oneko/bsd/down2.xpm
 lib/X11/oneko/bsd/down2_mask.xbm
 lib/X11/oneko/bsd/dtogi1.xbm
+lib/X11/oneko/bsd/dtogi1.xpm
 lib/X11/oneko/bsd/dtogi1_mask.xbm
 lib/X11/oneko/bsd/dtogi2.xbm
+lib/X11/oneko/bsd/dtogi2.xpm
 lib/X11/oneko/bsd/dtogi2_mask.xbm
 lib/X11/oneko/bsd/dwleft1.xbm
+lib/X11/oneko/bsd/dwleft1.xpm
 lib/X11/oneko/bsd/dwleft1_mask.xbm
 lib/X11/oneko/bsd/dwleft2.xbm
+lib/X11/oneko/bsd/dwleft2.xpm
 lib/X11/oneko/bsd/dwleft2_mask.xbm
 lib/X11/oneko/bsd/dwright1.xbm
+lib/X11/oneko/bsd/dwright1.xpm
 lib/X11/oneko/bsd/dwright1_mask.xbm
 lib/X11/oneko/bsd/dwright2.xbm
+lib/X11/oneko/bsd/dwright2.xpm
 lib/X11/oneko/bsd/dwright2_mask.xbm
 lib/X11/oneko/bsd/jare2.xbm
+lib/X11/oneko/bsd/jare2.xpm
 lib/X11/oneko/bsd/jare2_mask.xbm
 lib/X11/oneko/bsd/kaki1.xbm
+lib/X11/oneko/bsd/kaki1.xpm
 lib/X11/oneko/bsd/kaki1_mask.xbm
 lib/X11/oneko/bsd/kaki2.xbm
+lib/X11/oneko/bsd/kaki2.xpm
 lib/X11/oneko/bsd/kaki2_mask.xbm
 lib/X11/oneko/bsd/kotatsu.xbm
+lib/X11/oneko/bsd/kotatsu.xpm
 lib/X11/oneko/bsd/kotatsu_mask.xbm
 lib/X11/oneko/bsd/left1.xbm
+lib/X11/oneko/bsd/left1.xpm
 lib/X11/oneko/bsd/left1_mask.xbm
 lib/X11/oneko/bsd/left2.xbm
+lib/X11/oneko/bsd/left2.xpm
 lib/X11/oneko/bsd/left2_mask.xbm
 lib/X11/oneko/bsd/ltogi1.xbm
+lib/X11/oneko/bsd/ltogi1.xpm
 lib/X11/oneko/bsd/ltogi1_mask.xbm
 lib/X11/oneko/bsd/ltogi2.xbm
+lib/X11/oneko/bsd/ltogi2.xpm
 lib/X11/oneko/bsd/ltogi2_mask.xbm
 lib/X11/oneko/bsd/maneki1.xbm
+lib/X11/oneko/bsd/maneki1.xpm
 lib/X11/oneko/bsd/maneki1_mask.xbm
 lib/X11/oneko/bsd/maneki2.xbm
+lib/X11/oneko/bsd/maneki2.xpm
 lib/X11/oneko/bsd/maneki2_mask.xbm
 lib/X11/oneko/bsd/mati1.xbm
+lib/X11/oneko/bsd/mati1.xpm
 lib/X11/oneko/bsd/mati1_mask.xbm
 lib/X11/oneko/bsd/mati2.xbm
+lib/X11/oneko/bsd/mati2.xpm
 lib/X11/oneko/bsd/mati2_mask.xbm
 lib/X11/oneko/bsd/right1.xbm
+lib/X11/oneko/bsd/right1.xpm
 lib/X11/oneko/bsd/right1_mask.xbm
 lib/X11/oneko/bsd/right2.xbm
+lib/X11/oneko/bsd/right2.xpm
 lib/X11/oneko/bsd/right2_mask.xbm
 lib/X11/oneko/bsd/rtogi1.xbm
+lib/X11/oneko/bsd/rtogi1.xpm
 lib/X11/oneko/bsd/rtogi1_mask.xbm
 lib/X11/oneko/bsd/rtogi2.xbm
+lib/X11/oneko/bsd/rtogi2.xpm
 lib/X11/oneko/bsd/rtogi2_mask.xbm
 lib/X11/oneko/bsd/sleep1.xbm
+lib/X11/oneko/bsd/sleep1.xpm
 lib/X11/oneko/bsd/sleep1_mask.xbm
 lib/X11/oneko/bsd/sleep2.xbm
+lib/X11/oneko/bsd/sleep2.xpm
 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.xpm
 lib/X11/oneko/bsd/up1_mask.xbm
 lib/X11/oneko/bsd/up2.xbm
+lib/X11/oneko/bsd/up2.xpm
 lib/X11/oneko/bsd/up2_mask.xbm
 lib/X11/oneko/bsd/upleft1.xbm
+lib/X11/oneko/bsd/upleft1.xpm
 lib/X11/oneko/bsd/upleft1_mask.xbm
 lib/X11/oneko/bsd/upleft2.xbm
+lib/X11/oneko/bsd/upleft2.xpm
 lib/X11/oneko/bsd/upleft2_mask.xbm
 lib/X11/oneko/bsd/upright1.xbm
+lib/X11/oneko/bsd/upright1.xpm
 lib/X11/oneko/bsd/upright1_mask.xbm
 lib/X11/oneko/bsd/upright2.xbm
+lib/X11/oneko/bsd/upright2.xpm
 lib/X11/oneko/bsd/upright2_mask.xbm
 lib/X11/oneko/bsd/utogi1.xbm
+lib/X11/oneko/bsd/utogi1.xpm
 lib/X11/oneko/bsd/utogi1_mask.xbm
 lib/X11/oneko/bsd/utogi2.xbm
+lib/X11/oneko/bsd/utogi2.xpm
 lib/X11/oneko/bsd/utogi2_mask.xbm
 @dirrm lib/X11/oneko/bsd
 lib/X11/oneko/oneko/akubi1.xbm