4 files changed, 26 insertions, 26 deletions

diff --git a/japanese/groff/Makefile b/japanese/groff/Makefile
index c52b4cf75633..4b3344f776e9 100644
--- a/japanese/groff/Makefile
+++ b/japanese/groff/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	groff
 PORTVERSION=	1.18.1
 DISTVERSIONSUFFIX=	.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_LOCAL:S,%SUBDIR%,okazaki/&,} \
 		${MASTER_SITE_DEBIAN:S,$,:debian,}
@@ -17,7 +17,7 @@ DISTFILES=	${DISTNAME:S,-,_,}.orig${EXTRACT_SUFX}:debian ${TMAC_DISTNAME}.tar.gz
 
 PATCH_SITES=	${MASTER_SITE_DEBIAN}
 PATCH_SITE_SUBDIR=	pool/main/g/groff
-PATCHFILES=	${DISTNAME:S,-,_,}-7.diff.gz
+PATCHFILES=	${DISTNAME:S,-,_,}-12.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	ports@FreeBSD.org
@@ -33,7 +33,6 @@ TMAC_DISTNAME=	tmac-${TMAC_DATE}_2
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
-USE_REINPLACE=	yes
 
 CONFIGURE_ARGS=	--enable-multibyte
 CONFIGURE_ENV=	INSTALL_MAN="${INSTALL_MAN}" \
@@ -44,7 +43,6 @@ TMACBASE=	${WRKDIR}/${TMAC_DISTNAME}
 TMACDIR=	share/groff/${PORTVERSION}/tmac
 SITETMACDIR=	share/groff/site-tmac
 MDOCDIR=	${TMACDIR}/mdoc
-INFODIR=	${PREFIX}/info
 PLIST_SUB=	GROFF_VERSION=${PORTVERSION}
 
 MAN1=		addftinfo.1 afmtodit.1 \
@@ -95,6 +93,7 @@ WITHOUT_INFO=	yes
 .if defined(WITHOUT_INFO)
 PLIST_SUB+=	INFO="@comment "
 .else
+INFO=		groff
 PLIST_SUB+=	INFO=""
 .endif
 
@@ -104,9 +103,6 @@ WITHOUT_WCHAR_H=	yes
 .endif
 
 POST_INSTALL_SEQ=	install-links
-.if !defined(WITHOUT_INFO)
-POST_INSTALL_SEQ+=	install-info
-.endif
 .if !defined(NOPORTDOCS)
 POST_INSTALL_SEQ+=	install-documents
 .endif
@@ -114,6 +110,8 @@ POST_INSTALL_SEQ+=	install-documents
 post-patch:
 	${REINPLACE_CMD} -e 's|\(install_data\)|\1 install_doc|g;' \
 		${WRKSRC}/Makefile.in
+	${REINPLACE_CMD} -E -e 's|^@setfilename +groff|&.info|g;' \
+		${WRKSRC}/doc/groff.texinfo
 .if defined(WITHOUT_WCHAR_H)
 	${REINPLACE_CMD} -e 's|#include <wchar[.]h>||g;' \
 		${WRKSRC}/src/libs/libgroff/encoding.cc
@@ -125,7 +123,9 @@ post-build:
 	cd ${WRKSRC}/doc && makeinfo --no-split groff.texinfo
 .endif
 	cd ${WRKSRC} && ${FIND} font -name DESC \
-	| ${XARGS} ${REINPLACE_CMD} -e 's|pro \(.*\)|pro ${PREFIX}/bin/\1|g;'
+	| ${XARGS} ${REINPLACE_CMD} -E -e 's|pro +(gxditview)|pro ${X11BASE}/bin/\1|g;'
+	cd ${WRKSRC} && ${FIND} font -name DESC \
+	| ${XARGS} ${REINPLACE_CMD} -E -e 's|pro +([^/].*)|pro ${PREFIX}/bin/\1|g;'
 
 post-install: ${POST_INSTALL_SEQ}
 .for F in ${SITETMACFILES}
@@ -143,10 +143,9 @@ install-documents:
 .for F in ${DOCUMENTS}
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/${F} ${DOCSDIR}/${PORTVERSION}
 .endfor
-
-install-info:
-	${INSTALL_DATA} ${WRKSRC}/doc/groff ${INFODIR}
-	install-info ${INFODIR}/groff ${INFODIR}/dir
+.if !defined(WITHOUT_INFO)
+	${INSTALL_DATA} ${WRKSRC}/doc/groff.info ${PREFIX}/${INFO_PATH}
+.endif
 
 install-links:
 .for F in eqn neqn pic tbl
diff --git a/japanese/groff/distinfo b/japanese/groff/distinfo
index 6cda3b50ce8e..15e10759bee5 100644
--- a/japanese/groff/distinfo
+++ b/japanese/groff/distinfo
@@ -4,6 +4,6 @@ SIZE (groff_1.18.1.1.orig.tar.gz) = 2260623
 MD5 (tmac-20030521_2.tar.gz) = 09e930a9690593b5de7118ae43962074
 SHA256 (tmac-20030521_2.tar.gz) = 61813b6fcfd0f4ce1fa5971e2c754eb575a0a3e2f6a460103fd3112476302110
 SIZE (tmac-20030521_2.tar.gz) = 136303
-MD5 (groff_1.18.1.1-7.diff.gz) = 363c4419e76af510948ba6472d0bd75c
-SHA256 (groff_1.18.1.1-7.diff.gz) = db07b57c60f728931b05512d9ae003369a1e140a8ad049bf91359dfae0ef5ebf
-SIZE (groff_1.18.1.1-7.diff.gz) = 126964
+MD5 (groff_1.18.1.1-12.diff.gz) = 5f53631feb4d2a3811d35519e2bc3410
+SHA256 (groff_1.18.1.1-12.diff.gz) = 71b1b7a75ca6f2f2a29b8093c16508841487eae92e2750fb49d297e89d0d3c97
+SIZE (groff_1.18.1.1-12.diff.gz) = 127812
diff --git a/japanese/groff/files/patch-tmac:troffrc b/japanese/groff/files/patch-tmac:troffrc
index 087f2c2bda4b..676ad775260a 100644
--- a/japanese/groff/files/patch-tmac:troffrc
+++ b/japanese/groff/files/patch-tmac:troffrc
@@ -1,6 +1,6 @@
---- tmac/troffrc~	Thu Mar  6 12:33:17 2003
-+++ tmac/troffrc	Thu Mar  6 13:21:54 2003
-@@ -38,7 +38,15 @@
+--- tmac/troffrc.orig	Wed Jan 25 13:04:06 2006
++++ tmac/troffrc	Wed Jan 25 22:35:38 2006
+@@ -38,9 +38,17 @@
  .\" Load hyphenation patterns from `hyphen.us' (in the tmac directory).
  .do hpf hyphen.us
  .
@@ -11,8 +11,10 @@
 +.  nr nl 0-1
 +.  nr % -1
 +.\}
- .\" for Japanese hack
- .if "\V[LANG]"ja_JP.eucJP" .do mso euc-jp.tmac
-+.if "\V[LANG]"ja_JP.EUC" .do mso euc-jp.tmac
- .
- .\" Don't let blank lines creep in here.
+ .\" For CJK hack. The hardcoded list of locales is especially nasty, but
+ .\" getting the locale charmap requires a troff extension.
+ .ie     "\V[LANG]"ja_JP.eucJP" .do mso euc-jp.tmac
++.el .ie "\V[LANG]"ja_JP.EUC"   .do mso euc-jp.tmac
+ .el .ie "\V[LANG]"zh_CN"       .do mso gb.tmac
+ .el .ie "\V[LANG]"zh_CN.GBK"   .do mso gb.tmac
+ .el .ie "\V[LANG]"zh_SG"       .do mso gb.tmac
diff --git a/japanese/groff/pkg-plist b/japanese/groff/pkg-plist
index f7cfd4754e31..b40ec6008626 100644
--- a/japanese/groff/pkg-plist
+++ b/japanese/groff/pkg-plist
@@ -32,9 +32,6 @@ bin/soelim
 bin/tbl
 bin/tfmtodit
 bin/troff
-%%INFO%%@unexec install-info --delete %D/info/groff %D/info/dir
-%%INFO%%info/groff
-%%INFO%%@exec install-info %D/info/groff %D/info/dir
 %%DATADIR%%/%%GROFF_VERSION%%/eign
 %%DATADIR%%/%%GROFF_VERSION%%/font/devX100-12/CB
 %%DATADIR%%/%%GROFF_VERSION%%/font/devX100-12/CBI
@@ -328,6 +325,7 @@ bin/troff
 %%DATADIR%%/%%GROFF_VERSION%%/tmac/an.tmac
 %%DATADIR%%/%%GROFF_VERSION%%/tmac/andoc.tmac
 %%DATADIR%%/%%GROFF_VERSION%%/tmac/andocj.tmac
+%%DATADIR%%/%%GROFF_VERSION%%/tmac/big5.tmac
 %%DATADIR%%/%%GROFF_VERSION%%/tmac/cp1047.tmac
 %%DATADIR%%/%%GROFF_VERSION%%/tmac/doc-old.tmac
 %%DATADIR%%/%%GROFF_VERSION%%/tmac/doc.tmac
@@ -337,6 +335,7 @@ bin/troff
 %%DATADIR%%/%%GROFF_VERSION%%/tmac/ec.tmac
 %%DATADIR%%/%%GROFF_VERSION%%/tmac/eqnrc
 %%DATADIR%%/%%GROFF_VERSION%%/tmac/euc-jp.tmac
+%%DATADIR%%/%%GROFF_VERSION%%/tmac/gb.tmac
 %%DATADIR%%/%%GROFF_VERSION%%/tmac/html.tmac
 %%DATADIR%%/%%GROFF_VERSION%%/tmac/hyphen.us
 %%DATADIR%%/%%GROFF_VERSION%%/tmac/latin1.tmac