- Rename the package name: s/ja-tgif/ja-tgif-resource/.

- Use scalable fonts for Japanese characters.

Approved by:	maintainer

5 files changed, 68 insertions, 19 deletions

diff --git a/japanese/tgif/Makefile b/japanese/tgif/Makefile
index 9adf5d255b1a..fb51fe321c73 100644
--- a/japanese/tgif/Makefile
+++ b/japanese/tgif/Makefile
@@ -5,25 +5,30 @@
 # $FreeBSD$
 #
 
-PORTNAME=	tgif
-PORTVERSION=	4.1.44
-PORTREVISION=	1
-CATEGORIES=	japanese
-MASTER_SITES=	http://home.jp.FreeBSD.org/~mita/LOCAL_PORTS/
-DISTNAME=	ja-${PORTNAME}-980222
+PORTNAME=	tgif-resource
+PORTVERSION=	4.1.45
+CATEGORIES=	japanese graphics
+MASTER_SITES=	# empty
+DISTFILES=	# empty
 
 MAINTAINER=	mita@FreeBSD.org
-COMMENT=	2-D drawing facility (with Japanese configuration)
+COMMENT=	Japanese Resource and Configuration for TGIF
 
-RUN_DEPENDS=	tgif:${PORTSDIR}/graphics/tgif-nls\
-		${PREFIX}/lib/X11/fonts/local/knm12p.pcf.gz:${PORTSDIR}/japanese/k12
+RUN_DEPENDS=	tgif:${PORTSDIR}/graphics/tgif \
+		${LOCALBASE}/share/ipa-ttfonts/fonts/ipag.ttf:${PORTSDIR}/japanese/ipa-ttfonts
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 USE_X_PREFIX=	yes
+PLIST_SUB=	XAPPLRESDIR=${XAPPLRESDIR}
+
+XAPPLRESDIR=	lib/X11/ja_JP.eucJP/app-defaults
 
 do-install:
-	${MKDIR} ${PREFIX}/lib/X11/ja_JP.eucJP/app-defaults
-	${INSTALL_DATA} ${WRKSRC}/Tgif ${PREFIX}/lib/X11/ja_JP.eucJP/app-defaults/
+	${MKDIR} ${PREFIX}/${XAPPLRESDIR}
+	${INSTALL_DATA} ${FILESDIR}/Tgif.in ${PREFIX}/${XAPPLRESDIR}/Tgif.ja-dist
+.if !exists(${PREFIX}/${XAPPLRESDIR}/Tgif)
+	${INSTALL_DATA} ${FILESDIR}/Tgif.in ${PREFIX}/${XAPPLRESDIR}/Tgif
+.endif
 
 .include <bsd.port.mk>
diff --git a/japanese/tgif/distinfo b/japanese/tgif/distinfo
deleted file mode 100644
index 56f1f6eb0cd7..000000000000
--- a/japanese/tgif/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (ja-tgif-980222.tar.gz) = 5396974ce204d3514f14cdb408f9baaf
-SHA256 (ja-tgif-980222.tar.gz) = 7b68a506adbccaf6361f33d6c8cc89eb323287fbc501e7d2d0bf1b60cf615d15
-SIZE (ja-tgif-980222.tar.gz) = 699
diff --git a/japanese/tgif/files/Tgif.in b/japanese/tgif/files/Tgif.in
new file mode 100644
index 000000000000..76782cf95b88
--- /dev/null
+++ b/japanese/tgif/files/Tgif.in
@@ -0,0 +1,45 @@
+! $FreeBSD$
+Tgif.UseNKF:			true
+Tgif.CopyAndPasteJIS:		true
+Tgif.GridSystem:		Metric
+Tgif.PSA4PaperSize:		true
+
+Tgif.FontSizes:			8 9 10 11 12 13 14 16 18 20 24 26 32 34 36 40 44 60 70 100 200 250 300
+
+!Tgif.AdditionalFonts:		\n\
+!	lucidabright-medium-r-normal,iso8859-1,ZapfChancery-Medium\n\
+!	lucidabright-demibold-r-normal,iso8859-1,ZapfChancery-Bold\n\
+!	lucidabright-medium-i-normal,iso8859-1,ZapfChancery-Italic\n\
+!	lucidabright-demibold-i-normal,iso8859-1,ZapfChancery-BoldItalic
+!Tgif.FontNamePrefix:		-*
+!Tgif.ZapfChanceryShowFontChar:	ZC
+
+Tgif.MenuFontSet:		-*-helvetica-bold-r-normal--12-*-*-*-*-*-*-*,-ipa-ipauigothic-medium-r-*--12-*-*-*-c-*-jisx0208.1983-*
+Tgif.MsgFontSet:		-*-helvetica-medium-r-normal--12-*-*-*-*-*-*-*,-ipa-ipauigothic-medium-r-*--12-*-*-*-c-*-jisx0208.1983-*
+Tgif.BoldMsgFontSet:		-*-helvetica-bold-r-normal--12-*-*-*-*-*-*-*,-ipa-ipauigothic-bold-r-*--12-*-*-*-c-*-jisx0208.1983-*
+
+Tgif.DoubleByteInputMethod:	xim
+Tgif.PreeditType:		overthespot
+
+Tgif.RyuminShowFontChar:	\314\300
+Tgif.GothicBBBShowFontChar:	\245\264
+Tgif.SquareDoubleByteFonts: \n\
+-ipa-ipamincho-medium-r-*--%d-*-*-*-c-*-jisx0208.1983-*,H,Ryumin-Light-EUC-H\n\
+-ipa-ipamincho-bold-r-*--%d-*-*-*-c-*-jisx0208.1983-*,H,Ryumin-Light-EUC-H\n\
+-ipa-ipamincho-medium-i-*--%d-*-*-*-c-*-jisx0208.1983-*,H,Ryumin-Light-EUC-H\n\
+-ipa-ipamincho-bold-i-*--%d-*-*-*-c-*-jisx0208.1983-*,H,Ryumin-Light-EUC-H\n\
+\n\
+-ipa-ipagothic-medium-r-*--%d-*-*-*-c-*-jisx0208.1983-*,H,GothicBBB-Medium-EUC-H\n\
+-ipa-ipagothic-bold-r-*--%d-*-*-*-c-*-jisx0208.1983-*,H,GothicBBB-Medium-EUC-H\n\
+-ipa-ipagothic-medium-i-*--%d-*-*-*-c-*-jisx0208.1983-*,H,GothicBBB-Medium-EUC-H\n\
+-ipa-ipagothic-bold-i-*--%d-*-*-*-c-*-jisx0208.1983-*,H,GothicBBB-Medium-EUC-H\n\
+\n\
+-ipa-ipamincho-medium-r-*--%d-*-*-*-c-*-jisx0208.1983-*,V,Ryumin-Light-EUC-V\n\
+-ipa-ipamincho-bold-r-*--%d-*-*-*-c-*-jisx0208.1983-*,V,Ryumin-Light-EUC-V\n\
+-ipa-ipamincho-medium-i-*--%d-*-*-*-c-*-jisx0208.1983-*,V,Ryumin-Light-EUC-V\n\
+-ipa-ipamincho-bold-i-*--%d-*-*-*-c-*-jisx0208.1983-*,V,Ryumin-Light-EUC-V\n\
+\n\
+-ipa-ipagothic-medium-r-*--%d-*-*-*-c-*-jisx0208.1983-*,V,GothicBBB-Medium-EUC-V\n\
+-ipa-ipagothic-bold-r-*--%d-*-*-*-c-*-jisx0208.1983-*,V,GothicBBB-Medium-EUC-V\n\
+-ipa-ipagothic-medium-i-*--%d-*-*-*-c-*-jisx0208.1983-*,V,GothicBBB-Medium-EUC-V\n\
+-ipa-ipagothic-bold-i-*--%d-*-*-*-c-*-jisx0208.1983-*,V,GothicBBB-Medium-EUC-V
diff --git a/japanese/tgif/pkg-descr b/japanese/tgif/pkg-descr
index f95699bce4a4..34858eadc1b2 100644
--- a/japanese/tgif/pkg-descr
+++ b/japanese/tgif/pkg-descr
@@ -1,2 +1 @@
-tgif is Xlib based interactive 2-D drawing facility under X11.
-It can put out ps, eps, gif, xbm files.
+Japanese resource and configuration for TGIF.
diff --git a/japanese/tgif/pkg-plist b/japanese/tgif/pkg-plist
index a1ea67dadc0b..b9900cdded89 100644
--- a/japanese/tgif/pkg-plist
+++ b/japanese/tgif/pkg-plist
@@ -1,3 +1,6 @@
-lib/X11/ja_JP.eucJP/app-defaults/Tgif
-@dirrm lib/X11/ja_JP.eucJP/app-defaults
-@dirrm lib/X11/ja_JP.eucJP
+@comment $FreeBSD$
+@unexec if cmp -s %D/%%XAPPLRESDIR%%/Tgif.ja %D/%%XAPPLRESDIR%%/Tgif; then rm %D/%%XAPPLRESDIR%%/Tgif; fi
+%%XAPPLRESDIR%%/Tgif.ja-dist
+@exec if ! test -r %D/%%XAPPLRESDIR%%/Tgif; then cp %D/%%XAPPLRESDIR%%/Tgif.ja-dist %D/%%XAPPLRESDIR%%/Tgif; fi
+@dirrmtry %%XAPPLRESDIR%%
+@dirrmtry lib/X11/ja_JP.eucJP