Update XMascot to 2.6a.

97/10/24 Ver 2.6 Release
 * fixes contrib
 * some trivial fixes

97/10/16 Ver 2.6 Pre
 * start to release
 * trivial fixes for doument
 * minor fixes.

97/08/10 Ver 2.6alpha (COMIKET Version)
 * Various fixes but vaguely remember
 * improve imagelib drastically
 * support gif and bmp
 * temporary delete pnm/tif
 * introduce PixCore
 * remove various global variables.
 * DUMMY_SETLOCALE
 * cut off cursor pattern (resource addressable)
 * move settings to config.tmpl
 * remove transparent color related options
  (involve with changing standard data to GIF-lize. when absolutely necessary,
   specify resource with -xrm option)
 * add option -drawtiming for skip drawing

 * since COMIKET Version, with adjunct data. no redistributable.

4 files changed, 49 insertions, 42 deletions

diff --git a/x11/xmascot/Makefile b/x11/xmascot/Makefile
index 32a0ee4fe54..d78eb411900 100644
--- a/x11/xmascot/Makefile
+++ b/x11/xmascot/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2008/04/16 06:13:57 obache Exp $
+# $NetBSD: Makefile,v 1.21 2008/05/11 05:24:50 obache Exp $
 
-DISTNAME=	xmascot2.5p2
-PKGNAME=	xmascot-2.5p2
-PKGREVISION=	2
+DISTNAME=	xmascot2.6a
+PKGNAME=	xmascot-2.6a
 CATEGORIES=	x11
 MASTER_SITES=	http://cclub-flying.dsl.gr.jp/products/xmascot/
 
@@ -10,11 +9,12 @@ MAINTAINER=	Nakai@Mlab.t.u-tokyo.ac.jp
 HOMEPAGE=	http://cclub-flying.dsl.gr.jp/products/xmascot/
 COMMENT=	Moving mascot on your X-Window screen
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_IMAKE=	yes
 
-.include "../../mk/bsd.prefs.mk"
+INSTALL_MAKE_FLAGS+=	LANG=ja_JP.eucJP
 
 .include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xmascot/PLIST b/x11/xmascot/PLIST
index 5f246be24c4..cc2eaf8eac7 100644
--- a/x11/xmascot/PLIST
+++ b/x11/xmascot/PLIST
@@ -1,26 +1,47 @@
-@comment $NetBSD: PLIST,v 1.2 2003/03/03 04:17:34 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/05/11 05:24:50 obache Exp $
 bin/xmascot
-lib/X11/xmascot/pin.mag
-lib/X11/xmascot/chain.mag
-lib/X11/xmascot/mail_r.mag
-lib/X11/xmascot/kuma.mag
-lib/X11/xmascot/inu.mag
-lib/X11/xmascot/neko.mag
-lib/X11/xmascot/neko2.mag
-lib/X11/xmascot/teru.mag
-lib/X11/xmascot/pen.mag
-lib/X11/xmascot/saru.mag
-lib/X11/xmascot/rabi.mag
-lib/X11/xmascot/fish.mag
-lib/X11/xmascot/monohosi.mag
-lib/X11/xmascot/logo.mag
-lib/X11/xmascot/pipipipi.au
+lib/X11/ja_JP.eucJP/app-defaults/XMascot
+lib/X11/app-defaults/XMascot
+lib/X11/xmascot/aquarius.gif
+lib/X11/xmascot/aries.gif
+lib/X11/xmascot/canser.gif
+lib/X11/xmascot/capric.gif
+lib/X11/xmascot/chain.gif
+lib/X11/xmascot/fish.gif
+lib/X11/xmascot/gemini.gif
+lib/X11/xmascot/icon.xbm
+lib/X11/xmascot/inu.gif
+lib/X11/xmascot/kuma.gif
+lib/X11/xmascot/leo.gif
+lib/X11/xmascot/libra.gif
+lib/X11/xmascot/logo.gif
+lib/X11/xmascot/mail_r.gif
 lib/X11/xmascot/mi.au
 lib/X11/xmascot/mi.raw
 lib/X11/xmascot/mi2.au
 lib/X11/xmascot/mi2.raw
 lib/X11/xmascot/mitime.au
 lib/X11/xmascot/mitime.raw
+lib/X11/xmascot/monohosi.gif
+lib/X11/xmascot/neko.gif
+lib/X11/xmascot/neko2.gif
+lib/X11/xmascot/osu.xbm
+lib/X11/xmascot/osu.xbmmsk
+lib/X11/xmascot/pen.gif
+lib/X11/xmascot/pin.gif
+lib/X11/xmascot/pipipipi.au
+lib/X11/xmascot/pisces.gif
+lib/X11/xmascot/rabi.gif
+lib/X11/xmascot/sagitt.gif
+lib/X11/xmascot/saru.gif
+lib/X11/xmascot/scorpio.gif
+lib/X11/xmascot/select.xbm
+lib/X11/xmascot/taurus.gif
+lib/X11/xmascot/teru.gif
+lib/X11/xmascot/tumamu.xbm
+lib/X11/xmascot/tumamu.xbmmsk
+lib/X11/xmascot/virgo.gif
+lib/X11/xmascot/yubi.xbm
+lib/X11/xmascot/yubi.xbmmsk
+${IMAKE_MAN_DIR}/xmascot.${IMAKE_MAN_SUFFIX}
 @dirrm lib/X11/xmascot
-${IMAKE_MAN_DIR}/xmascot.${IMAKE_MANNEWSUFFIX}
-lib/X11/app-defaults/XMascot
diff --git a/x11/xmascot/distinfo b/x11/xmascot/distinfo
index b05a2d64373..c9233d07194 100644
--- a/x11/xmascot/distinfo
+++ b/x11/xmascot/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.4 2006/01/23 14:39:55 hira Exp $
+$NetBSD: distinfo,v 1.5 2008/05/11 05:24:50 obache Exp $
 
-SHA1 (xmascot2.5p2.tar.gz) = b1ea9ef38b3f10fef7a597930568b0e2b9921bf9
-RMD160 (xmascot2.5p2.tar.gz) = 323b47b46da681a2580188bdbcf18183995e2b34
-Size (xmascot2.5p2.tar.gz) = 191672 bytes
-SHA1 (patch-aa) = 5a018514e00aef499c23be20d9717a843dfbaa00
+SHA1 (xmascot2.6a.tar.gz) = 413d9352451e76cfc554cfcf92732c1f6a45cd6b
+RMD160 (xmascot2.6a.tar.gz) = 0e4c18ce075f89e8ce372bea4694fae45df69afb
+Size (xmascot2.6a.tar.gz) = 238536 bytes
diff --git a/x11/xmascot/patches/patch-aa b/x11/xmascot/patches/patch-aa
deleted file mode 100644
index 1682480c5f6..00000000000
--- a/x11/xmascot/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/01/23 14:39:55 hira Exp $
-
---- Imakefile.orig	2006-01-06 02:00:13.000000000 +0900
-+++ Imakefile	2006-01-06 02:00:32.000000000 +0900
-@@ -188,6 +188,8 @@
- InstallNonExec(sounds/mitime.au,$(XMASDIR))
- InstallNonExec(sounds/mitime.raw,$(XMASDIR))
- 
-+AllTarget(XMascot.ad)
-+
- XMascot.ad:: XMascot.ad.sed
- 	sed 's!SOUND_COMMAND_NAME!$(SOUND_COMMAND)!' XMascot.ad.sed>XMascot.ad
- clean::