Update to 1.17.

5 files changed, 25 insertions, 33 deletions

diff --git a/japanese/gxditview/Makefile b/japanese/gxditview/Makefile
index 6071ee86141c..9611e9b16676 100644
--- a/japanese/gxditview/Makefile
+++ b/japanese/gxditview/Makefile
@@ -6,27 +6,35 @@
 #
 
 PORTNAME=	gxditview
-PORTVERSION=	0.100
+PORTVERSION=	1.17
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	groff
-DISTNAME=	groff-1.15
+DISTNAME=	groff-${PORTVERSION}
 
 PATCH_SITES=	${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR= okazaki
-PATCHFILES=	${DISTNAME}-jgroff-${PORTVERSION}-pl1.diff.gz
-PATCH_DIST_ARGS=	-d ${WRKSRC}/.. --forward --quiet -E -p1
+PATCH_SITE_SUBDIR=	okazaki/groff
+PATCHFILES=	${DISTNAME}-jgroff-0.0.1.diff.gz
+PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	okazaki@FreeBSD.org
 
 RUN_DEPENDS=	${LOCALBASE}/bin/groff:${PORTSDIR}/japanese/groff
 
+USE_AUTOCONF=	yes
+USE_GMAKE=	yes
 USE_IMAKE=	yes
-MAKE_ENV=	NIPPONDEFINES="-DNIPPON"
-WRKSRC=		${WRKDIR}/${DISTNAME}/xditview
+
+CONFIGURE_ARGS=	--program-prefix=g --enable-nippon
+CONFIGURE_ENV=	INSTALL_MAN="${INSTALL_MAN}"
+
+MAKE_ENV=	GROFF_PREFIX=${LOCALBASE} NIPPONDEFINES="-DNIPPON"
+BUILD_WRKSRC=	${WRKDIR}/${DISTNAME}/src/xditview
+INSTALL_WRKSRC=	${WRKDIR}/${DISTNAME}/src/xditview
+
 MAN1=		gxditview.1
 
-post-patch:
-	@${PERL} -pi -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/Imakefile
+post-extract:
+	${CP} ${FILESDIR}/Imakefile ${WRKSRC}
 
 .include <bsd.port.mk>
diff --git a/japanese/gxditview/distinfo b/japanese/gxditview/distinfo
index 7fc601f98e6c..83dbaf20a683 100644
--- a/japanese/gxditview/distinfo
+++ b/japanese/gxditview/distinfo
@@ -1,2 +1,2 @@
-MD5 (groff-1.15.tar.gz) = 0c87c54b39a71da4ad92a67f13b740a2
-MD5 (groff-1.15-jgroff-0.100-pl1.diff.gz) = 6bfa9ec3a3dee8dca3a4f2cf930e8cd9
+MD5 (groff-1.17.tar.gz) = 1e14bb3aa113f1d7b48603bd9ee351a4
+MD5 (groff-1.17-jgroff-0.0.1.diff.gz) = 893c1f97f6e02a722cba31b4545e6447
diff --git a/japanese/gxditview/files/Imakefile b/japanese/gxditview/files/Imakefile
new file mode 100644
index 000000000000..550902e5c395
--- /dev/null
+++ b/japanese/gxditview/files/Imakefile
@@ -0,0 +1,6 @@
+#define IHaveSubdirs
+
+SUBDIRS= src/xditview
+
+MakeSubdirs($(SUBDIRS))
+DependSubdirs($(SUBDIRS))
diff --git a/japanese/gxditview/files/patch-aa b/japanese/gxditview/files/patch-aa
deleted file mode 100644
index 378dd44e02ff..000000000000
--- a/japanese/gxditview/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/share/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/files/patch-ab b/japanese/gxditview/files/patch-ab
deleted file mode 100644
index a885f3d2d180..000000000000
--- a/japanese/gxditview/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- Dvi.c.orig	Sun Dec 12 23:53:23 1999
-+++ Dvi.c	Sun Dec 26 08:22:52 1999
-@@ -353,7 +353,7 @@
- 	dw->dvi.tmpFile = 0;
- 	if (!dw->dvi.seek) {
- 		strcpy (tmpName, "/tmp/dviXXXXXX");
--		mktemp (tmpName);
-+		mkstemp (tmpName);
- 		dw->dvi.tmpFile = fopen (tmpName, "w+");
- 		unlink (tmpName);
- 	}