Fix and updates from KATO Tsuguru.

Submitted by:		"KATO Tsuguru" <tkato@prontomail.ne.jp>

5 files changed, 56 insertions, 27 deletions

diff --git a/x11/xmascot/Makefile b/x11/xmascot/Makefile
index d181fc6bedaa..856a753c1f67 100644
--- a/x11/xmascot/Makefile
+++ b/x11/xmascot/Makefile
@@ -1,21 +1,20 @@
-# New ports collection makefile for:   xmascot
-# Version required:    2.5p2
-# Date created:        20 November 1996
-# Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
+# New ports collection makefile for:	xmascot
+# Version required:	2.6a
+# Date created:		20 November 1996
+# Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xmascot2.5p2
-PKGNAME=	xmascot-2.5p2
+DISTNAME=	xmascot2.6a
+PKGNAME=	xmascot-2.6a
 CATEGORIES=	x11
-MASTER_SITES=	ftp://cclub.tutcc.tut.ac.jp/pub/xmascot/
+MASTER_SITES=	ftp://cclub.tutcc.tut.ac.jp/pub/xmascot/ \
+		http://cclub-flying.dsl.gr.jp/products/xmascot/
 
 MAINTAINER=	nakai@FreeBSD.org
 
-USE_GMAKE=	yes
 USE_IMAKE=	yes
 MAN1=		xmascot.1
-MANCOMPRESSED=	yes
 
 .include <bsd.port.mk>
diff --git a/x11/xmascot/distinfo b/x11/xmascot/distinfo
index 60d80cef7034..22d1fadb3519 100644
--- a/x11/xmascot/distinfo
+++ b/x11/xmascot/distinfo
@@ -1 +1 @@
-MD5 (xmascot2.5p2.tar.gz) = 4e953fbbc347086a12a894bfe8ca440b
+MD5 (xmascot2.6a.tar.gz) = 0841f9448349db6fc89a2201385c2bdc
diff --git a/x11/xmascot/files/patch-aa b/x11/xmascot/files/patch-aa
new file mode 100644
index 000000000000..81dd64266e5f
--- /dev/null
+++ b/x11/xmascot/files/patch-aa
@@ -0,0 +1,10 @@
+--- config.tmpl.orig	Fri Oct 24 01:41:01 1997
++++ config.tmpl	Sat Jan 15 00:00:00 2000
+@@ -97,6 +97,7 @@
+ 
+ #ifdef USE_I18N
+ DEFINES_I18N = -DI18N
++LANG = ja_JP.EUC
+ LOCALEDIR = $(LIBDIR)/$(LANG)/app-defaults
+ #else
+ DEFINES_I18N =
diff --git a/x11/xmascot/pkg-descr b/x11/xmascot/pkg-descr
index 948c8be1f914..c3b7acd09756 100644
--- a/x11/xmascot/pkg-descr
+++ b/x11/xmascot/pkg-descr
@@ -19,5 +19,4 @@ PNM	*.pnm	PPM, PGM, or PBM
 XMascot distinguishes images from their suffix and can load other image formats
 when {suffix}topnm, *topgm, or *topbm commands are found in your system.
 
-WWW: http://cclub.tutcc.tut.ac.jp:1080/xmascot/
-     ftp://cclub.tutcc.tut.ac.jp/pub/xmascot/
+WWW: http://cclub-flying.dsl.gr.jp/products/xmascot/
diff --git a/x11/xmascot/pkg-plist b/x11/xmascot/pkg-plist
index b78ef49e07ce..58894e351453 100644
--- a/x11/xmascot/pkg-plist
+++ b/x11/xmascot/pkg-plist
@@ -1,24 +1,45 @@
 bin/xmascot
 lib/X11/app-defaults/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.EUC/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
 @dirrm lib/X11/xmascot