5 files changed, 15 insertions, 59 deletions

diff --git a/japanese/tgif/Makefile b/japanese/tgif/Makefile
index 923b19a89499..69ce55b46493 100644
--- a/japanese/tgif/Makefile
+++ b/japanese/tgif/Makefile
@@ -1,41 +1,25 @@
 # New ports collection makefile for:	tgif-j
-# Version required:	3.0.18
+# Version required:	4.0.17
 # Date created:		8 Dec 1995
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tgif-3.0.18
-PKGNAME=	ja-tgif-3.0.18
-CATEGORIES=	japanese graphics
-MASTER_SITES=	ftp://bourbon.cs.umd.edu/pub/tgif/ \
-		${MASTER_SITE_XCONTRIB} \
-		${MASTER_SITE_PORTS_JP} \
-		http://www.sunbit.or.jp/users/shin/software/
-MASTER_SITE_SUBDIR=	applications/tgif
-DISTFILES=	tgif-3.0.18.tar.gz tgif-3.0J0.12-p18-PSJISr1.gz
-
-PATCH_SITES=	http://www.venus.dti.ne.jp/~iisaka/
-PATCHFILES=	tgif-3.0J0.12-p18-patch.gz
-PATCH_DIST_STRIP=	-p1
+DISTNAME=	ja-tgif-980222
+PKGNAME=	ja-tgif-4.1.16
+CATEGORIES=	japanese
+MASTER_SITES=	http://home.jp.FreeBSD.org/~mita/LOCAL_PORTS/
 
 MAINTAINER=	mita@jp.FreeBSD.org
 
-RUN_DEPENDS=	giftopnm:${PORTSDIR}/graphics/netpbm \
-		pnmtotiff:${PORTSDIR}/graphics/netpbm \
-		ppmtoxpm:${PORTSDIR}/graphics/netpbm \
-		ppmtogif:${PORTSDIR}/graphics/netpbm \
-		xbmtopbm:${PORTSDIR}/graphics/netpbm \
-		xpmtoppm:${PORTSDIR}/graphics/netpbm
+RUN_DEPENDS=	tgif:${PORTSDIR}/graphics/tgif
 
-USE_IMAKE=	yes
-MAN1=			tgif.1 prtgif.1
-EXTRACT_ONLY=	tgif-3.0.18.tar.gz
-FETCH_CMD=	/usr/bin/fetch -Ab
+NO_BUILD=	yes
+WRKSRC=		${WRKDIR}
+USE_X_PREFIX=	yes
 
-post-patch:
-	 ${SETENV} DISTDIR="${DISTDIR}" GZCAT="${GZCAT}" \
-	 PATCH="${PATCH}" PATCH_DIST_ARGS="${PATCH_DIST_ARGS}" ${SH} ${FILESDIR}/setup.sh
+do-install:
+	${INSTALL_DATA} ${WRKSRC}/Tgif ${PREFIX}/lib/X11/app-defaults/
 
 .include <bsd.port.mk>
diff --git a/japanese/tgif/distinfo b/japanese/tgif/distinfo
index 00cd9ba2b137..522aaea6cc18 100644
--- a/japanese/tgif/distinfo
+++ b/japanese/tgif/distinfo
@@ -1,3 +1 @@
-MD5 (tgif-3.0.18.tar.gz) = 75f18a1287efc456ab9605ae13cfebfa
-MD5 (tgif-3.0J0.12-p18-PSJISr1.gz) = 86ee638da52ab52ead31bd5f0a5bcd9d
-MD5 (tgif-3.0J0.12-p18-patch.gz) = 0b4936b4331122fefcc962a9398bf28a
+MD5 (ja-tgif-980222.tar.gz) = 5396974ce204d3514f14cdb408f9baaf
diff --git a/japanese/tgif/pkg-comment b/japanese/tgif/pkg-comment
index 90e79711d31a..fc79eb9edc84 100644
--- a/japanese/tgif/pkg-comment
+++ b/japanese/tgif/pkg-comment
@@ -1 +1 @@
-2-D drawing facility (Japanese version)
+2-D drawing facility (with Japanese configuration)
diff --git a/japanese/tgif/pkg-descr b/japanese/tgif/pkg-descr
index 8c773a4c51e6..f95699bce4a4 100644
--- a/japanese/tgif/pkg-descr
+++ b/japanese/tgif/pkg-descr
@@ -1,7 +1,2 @@
-tgif-j is  Xlib based interactive 2-D drawing facility under X11.
+tgif is Xlib based interactive 2-D drawing facility under X11.
 It can put out ps, eps, gif, xbm files.
-Japanese input is also available by means of kinput or kinput2.
-Over-the-spot kana-kanji conversion is available by setting X resource:
-Tgif*PreeditType:               OverTheSpot
-
-see /usr/X11R6/lib/X11/tgif/3.0J0.12-p13/ for more information.
diff --git a/japanese/tgif/pkg-plist b/japanese/tgif/pkg-plist
index bccd89f5b44c..23982a381e6e 100644
--- a/japanese/tgif/pkg-plist
+++ b/japanese/tgif/pkg-plist
@@ -1,22 +1 @@
-bin/tgif
-bin/prtgif
-lib/X11/tgif/3.0.18/tgif.Xdefaults
-lib/X11/tgif/3.0.18/tgificon.eps
-lib/X11/tgif/3.0.18/tgificon.obj
-lib/X11/tgif/3.0.18/tgificon.xbm
-lib/X11/tgif/3.0.18/tgificon.xpm
-lib/X11/tgif/3.0.18/tangram.sym
-lib/X11/tgif/3.0.18/keys.obj
-lib/X11/tgif/3.0.18/keys_jpn.obj
-lib/X11/tgif/3.0.18/SCALABLE.ms
-lib/X11/tgif/3.0.18/SCALABLE
-lib/X11/tgif/3.0.18/JAPANESE.ms
-lib/X11/tgif/3.0.18/JAPANESE
-lib/X11/tgif/3.0.18/TO_USERS.ms
-lib/X11/tgif/3.0.18/TO_USERS
-lib/X11/tgif/3.0.18/HISTORY.jp
-lib/X11/tgif/3.0.18/HISTORY-3.0.jp
-lib/X11/tgif/3.0.18/README.jp
-lib/X11/tgif/3.0.18/README-3.0.jp
-@dirrm lib/X11/tgif/3.0.18
-@dirrm lib/X11/tgif
+lib/X11/app-defaults/Tgif