5 files changed, 27 insertions, 27 deletions

diff --git a/japanese/gxditview/Makefile b/japanese/gxditview/Makefile
index fe1834652a25..3c66d3deb0b2 100644
--- a/japanese/gxditview/Makefile
+++ b/japanese/gxditview/Makefile
@@ -1,41 +1,31 @@
 # New ports collection makefile for:	gxditview (part of ja-groff)
-# Version required:	1.09+0.98
+# Version required:	1.10+0.99
 # Date created:		14 April 1995
 # Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	groff-1.09
-PKGNAME=	ja-gxditview-0.98
+DISTNAME=	groff-1.10
+PKGNAME=	ja-gxditview-0.99
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	groff
 
+PATCH_SITES=	ftp://ftp.ae.keio.ac.jp/pub/GNU/ \
+		ftp://ftp.hipecs.hokudai.ac.jp/pub/GNU/jp/
+PATCHFILES=	jgroff-0.99.diff.gz
+PATCH_DIST_ARGS=?	-d ${WRKSRC}/.. --forward --quiet -E -p1
+
 MAINTAINER=	ports@FreeBSD.org
 
-PATCH_SITES=	ftp://ftp.iij.ad.jp/pub/NetNews/fj.sources/volume95/Apr/
-PATCHFILES=	jgroff-0.98.diff.gz
-DISTPATCHES=	950414.01.Z 950414.02.Z
-PATCH_DIST_ARGS?=	-d ${WRKSRC}/.. --forward --quiet -E -p1
+RUN_DEPENDS=	groff:${PORTSDIR}/japanese/groff
 
 USE_IMAKE=	yes
-WRKSRC=		${WRKDIRPREFIX}${.CURDIR}/work/${DISTNAME}/xditview
+WRKSRC=		${WRKDIR}/${DISTNAME}/xditview
+MAN1=		gxditview.1
 
-pre-fetch: 
-	@(cd ${DISTDIR}; \
-	 if [ ! -f ${PATCHFILES} ]; then \
-	    ${ECHO_MSG} ">> ${PATCHFILES} doesn't seem to exist on this system."; \
-	    for file in ${DISTPATCHES} ; do \
-		for site in ${PATCH_SITES} ; do \
-		    if ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${site}$${file} ${FETCH_AFTER_ARGS}; then \
-			break; \
-		    fi \
-		done; \
-	    done; \
-	    for file in ${DISTPATCHES} ; do zcat $${file}; done | \
-		${SED} '/^END -----/,/^BEGIN ----/d' | uudecode; \
-	    ${RM} -f ${DISTPATCHES};\
-	 fi)
+post-patch:
+	@${PERL} -pi -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/Imakefile
 
 .include <bsd.port.mk>
diff --git a/japanese/gxditview/distinfo b/japanese/gxditview/distinfo
index 275c56adac1b..4ed910f07ca9 100644
--- a/japanese/gxditview/distinfo
+++ b/japanese/gxditview/distinfo
@@ -1,2 +1,2 @@
-MD5 (groff-1.09.tar.gz) = 759cb03fbccce45ce59478a26325480d
-MD5 (jgroff-0.98.diff.gz) = 84147e01b4c3a30eb05dfe2196972d40
+MD5 (groff-1.10.tar.gz) = cc58a06abafe82ada7c02f0f2b2c8509
+MD5 (jgroff-0.99.diff.gz) = 0055c596a6cb641e3a8e844465e81623
diff --git a/japanese/gxditview/files/patch-aa b/japanese/gxditview/files/patch-aa
new file mode 100644
index 000000000000..f87afbf5e638
--- /dev/null
+++ b/japanese/gxditview/files/patch-aa
@@ -0,0 +1,11 @@
+--- Imakefile.orig	Wed Oct 28 22:19:59 1992
++++ Imakefile	Thu Oct 28 07:55:00 1999
+@@ -1,6 +1,6 @@
+-GROFF_LIBDIR = /usr/local/lib/groff
++GROFF_LIBDIR = %%LOCALBASE%%/share/groff
+ GROFF_FONTDIR = $(GROFF_LIBDIR)/font
+-GROFF_FONTPATH = .:$(GROFF_FONTDIR):/usr/local/lib/font:/usr/lib/font
++GROFF_FONTPATH = .:$(GROFF_FONTDIR):/usr/share/groff_font
+ DPIS = 75 100
+ 
+ PROGRAMS = gxditview xtotroff
diff --git a/japanese/gxditview/pkg-descr b/japanese/gxditview/pkg-descr
index f35981264d5e..f642217289ee 100644
--- a/japanese/gxditview/pkg-descr
+++ b/japanese/gxditview/pkg-descr
@@ -1,2 +1,2 @@
 This is Japanized gxditview, a X11 previewer for jgroff which
-based on MIT's xditview and GNU's modication.
+based on MIT's xditview and GNU's modification.
diff --git a/japanese/gxditview/pkg-plist b/japanese/gxditview/pkg-plist
index 17e3d7cd45b5..2a69adab1dfd 100644
--- a/japanese/gxditview/pkg-plist
+++ b/japanese/gxditview/pkg-plist
@@ -1,3 +1,2 @@
 bin/gxditview
 lib/X11/app-defaults/GXditview
-man/man1/gxditview.1.gz