3 files changed, 28 insertions, 38 deletions

diff --git a/japanese/gxditview/Makefile b/japanese/gxditview/Makefile
index 743b8d46f68b..89baf9d81dd9 100644
--- a/japanese/gxditview/Makefile
+++ b/japanese/gxditview/Makefile
@@ -6,16 +6,14 @@
 #
 
 PORTNAME=	gxditview
-PORTVERSION=	1.17.2
-PORTREVISION=	1
+PORTVERSION=	1.18.1
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	groff
 DISTNAME=	groff-${PORTVERSION}
 
-PATCH_SITES=	${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR=	okazaki/groff
-PATCHFILES=	${DISTNAME}-jgroff-0.0.2.diff.gz
+PATCH_SITES=	http://people.debian.org/~ukai/groff/
+PATCHFILES=	${DISTNAME:S,-,_,}-7.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	okazaki@FreeBSD.org
@@ -23,45 +21,37 @@ COMMENT=	Japanese enhancement of GNU xditview
 
 RUN_DEPENDS=	${LOCALBASE}/bin/groff:${PORTSDIR}/japanese/groff
 
-# declare USE_AUTOCONF_VER as 213 until bsd.port.mk supports 252 (or later)
-USE_AUTOCONF_VER=	213
-.if ${USE_AUTOCONF_VER} == 213
-USE_REINPLACE=	yes
-.endif
-USE_GMAKE=	yes
+BROKEN=		"Unidentified in the ability to build"
+
+GNU_CONFIGURE=	yes
+#USE_GMAKE=	yes
 USE_IMAKE=	yes
+USE_REINPLACE=	yes
 
-CONFIGURE_ARGS=	--program-prefix=g --enable-nippon
-CONFIGURE_ENV=	INSTALL_MAN="${INSTALL_MAN}"
+CONFIGURE_ARGS=	--program-prefix=g --enable-multibyte
+CONFIGURE_ENV=	INSTALL_MAN="${INSTALL_MAN}" \
+		LIBS="-L${LOCALBASE}/lib -liconv"
+CFLAGS+=	-I${LOCALBASE}/include
 
-MAKE_ENV=	GROFF_PREFIX=${LOCALBASE} NIPPONDEFINES="-DNIPPON"
-BUILD_WRKSRC=	${WRKDIR}/${DISTNAME}/src/xditview
-INSTALL_WRKSRC=	${WRKDIR}/${DISTNAME}/src/xditview
+MAKE_ENV=	GROFF_PREFIX=${LOCALBASE}
+XDITVIEW_WRKSRC=${WRKDIR}/${DISTNAME}/src/xditview
+BUILD_WRKSRC=	${XDITVIEW_WRKSRC}
+INSTALL_WRKSRC=	${XDITVIEW_WRKSRC}
 
 MAN1=		gxditview.1
 
 .include <bsd.port.pre.mk>
 
-# workaround for autoconf-2.13
-
-CONFIGUREIN_FILTER=	\
-		-e 's|AC_INIT|dnl|g;' \
-		-e 's|AC_CONFIG_SRCDIR|AC_INIT|g;' \
-		-e 's|AC_OUTPUT|dnl|g;' \
-		-e 's|AC_CONFIG_FILES|AC_OUTPUT|g;'
-
-ACLOCAL_FILTER=	\
-	-e 's/AC_LANG_POP[(]C[+][+][)]/AC_LANG_RESTORE/g;' \
-	-e 's/AC_LANG_PUSH[(]C[+][+][)]/AC_LANG_SAVE[]AC_LANG_CPLUSPLUS/g;'
-
 post-extract:
 	${CP} ${FILESDIR}/Imakefile ${WRKSRC}
 
 post-patch:
-.if ${USE_AUTOCONF_VER} == 213
-	${CP} -p ${WRKSRC}/configure.ac ${WRKSRC}/configure.in
-	${REINPLACE_CMD} ${CONFIGUREIN_FILTER} ${WRKSRC}/configure.in
-	${REINPLACE_CMD} ${ACLOCAL_FILTER} ${WRKSRC}/aclocal.m4
-.endif
+	${REINPLACE_CMD} -e 's|^\(GROFF_PREFIX =\) @prefix@|\1 ${LOCALBASE}|g;' \
+		${XDITVIEW_WRKSRC}/Imakefile.in
+	${REINPLACE_CMD} -e 's|-I$$(TOOLKITSRC)|-I${LOCALBASE}/include|g;' \
+		${XDITVIEW_WRKSRC}/Imakefile.in
+
+post-configure:
+	(cd ${XDITVIEW_WRKSRC}; ${SETENV} ${MAKE_ENV} ${XMKMF})
 
 .include <bsd.port.post.mk>
diff --git a/japanese/gxditview/distinfo b/japanese/gxditview/distinfo
index 4953e183304f..f0c8cbd02cc5 100644
--- a/japanese/gxditview/distinfo
+++ b/japanese/gxditview/distinfo
@@ -1,2 +1,2 @@
-MD5 (groff-1.17.2.tar.gz) = 9564e58e553e7a8d4c6e73a782f296ce
-MD5 (groff-1.17.2-jgroff-0.0.2.diff.gz) = 31bb837203310c7c590c72b0cc656ca2
+MD5 (groff-1.18.1.tar.gz) = 4c7a1b478d230696f14743772f31639f
+MD5 (groff_1.18.1-7.diff.gz) = 957fad244caa648fdf3d6395ca27aa2e
diff --git a/japanese/gxditview/files/Imakefile b/japanese/gxditview/files/Imakefile
index 550902e5c395..d24d0397dd59 100644
--- a/japanese/gxditview/files/Imakefile
+++ b/japanese/gxditview/files/Imakefile
@@ -1,6 +1,6 @@
 #define IHaveSubdirs
 
-SUBDIRS= src/xditview
+#SUBDIRS= src/xditview
 
-MakeSubdirs($(SUBDIRS))
-DependSubdirs($(SUBDIRS))
+#MakeSubdirs($(SUBDIRS))
+#DependSubdirs($(SUBDIRS))