Update I18N patch.

Obtained from:	debian

Update `operating-system' to FreeBSD 4.9.
Use %%DOCSDIR%% in pkg-plist.

4 files changed, 66 insertions, 65 deletions

diff --git a/japanese/groff/Makefile b/japanese/groff/Makefile
index 88d3f39c3723..fc31ac589ef1 100644
--- a/japanese/groff/Makefile
+++ b/japanese/groff/Makefile
@@ -7,15 +7,16 @@
 
 PORTNAME=	groff
 PORTVERSION=	1.18.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_LOCAL:S,%SUBDIR%,okazaki/&,} \
 		${MASTER_SITE_GNU:S,$,:gnu,}
 MASTER_SITE_SUBDIR=	groff/:DEFAULT,gnu
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:gnu ${TMAC_DISTNAME}.tar.gz
 
-PATCH_SITES=	http://people.debian.org/~ukai/groff/
-PATCHFILES=	${DISTNAME:S,-,_,}-7.diff.gz
+PATCH_SITES=	${MASTER_SITE_DEBIAN}
+PATCH_SITE_SUBDIR=	pool/main/g/groff
+PATCHFILES=	${DISTNAME:S,-,_,}-10.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	okazaki@FreeBSD.org
@@ -26,7 +27,7 @@ BUILD_DEPENDS=	pnmcut:${PORTSDIR}/graphics/netpbm
 RUN_DEPENDS=	pnmcut:${PORTSDIR}/graphics/netpbm
 
 TMAC_DATE=	20030521
-TMAC_DISTNAME=	tmac-${TMAC_DATE}
+TMAC_DISTNAME=	tmac-${TMAC_DATE}_1
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/japanese/groff/distinfo b/japanese/groff/distinfo
index ebdcca3c609d..50a6e5c94088 100644
--- a/japanese/groff/distinfo
+++ b/japanese/groff/distinfo
@@ -1,3 +1,3 @@
 MD5 (groff-1.18.1.tar.gz) = 4c7a1b478d230696f14743772f31639f
-MD5 (tmac-20030521.tar.gz) = ad347ceec0b0b3c4e1d9aa1446a29b0a
-MD5 (groff_1.18.1-7.diff.gz) = 957fad244caa648fdf3d6395ca27aa2e
+MD5 (tmac-20030521_1.tar.gz) = d5b84c01ae5345b609ddf669770d0676
+MD5 (groff_1.18.1-10.diff.gz) = 55339b98e384f49a76e32c234ba21f65
diff --git a/japanese/groff/files/patch-src:libs:libgroff:encoding.cc b/japanese/groff/files/patch-src:libs:libgroff:encoding.cc
index 5d8197a4f8bc..9c9bc2ceec17 100644
--- a/japanese/groff/files/patch-src:libs:libgroff:encoding.cc
+++ b/japanese/groff/files/patch-src:libs:libgroff:encoding.cc
@@ -1,6 +1,6 @@
---- src/libs/libgroff/encoding.cc.bak	Tue Mar  4 20:26:04 2003
-+++ src/libs/libgroff/encoding.cc	Tue Mar  4 21:33:16 2003
-@@ -177,7 +177,8 @@
+--- src/libs/libgroff/encoding.cc.bak	Wed Sep 10 03:45:14 2003
++++ src/libs/libgroff/encoding.cc	Wed Sep 10 11:31:11 2003
+@@ -179,7 +179,8 @@
    inline wchar make_wchar(unsigned char c0, encoding_istream& eis) {
      wchar wc = 0;
      char inbuf[8], outbuf[8];
@@ -10,7 +10,7 @@
      size_t inbytesleft, outbytesleft;
      int i = 0;
      
-@@ -212,7 +213,8 @@
+@@ -214,7 +215,8 @@
  
    inline int put_wchar(wchar wc, encoding_ostream& eos) {
      char inbuf[4], outbuf[4];
@@ -20,13 +20,13 @@
      size_t inbytesleft, outbytesleft;
  
      if (!is_wchar_code(wc)) {
-@@ -377,6 +379,9 @@
+@@ -382,6 +384,9 @@
  #if HAVE_LANGINFO_CODESET
-   locale = nl_langinfo(CODESET);
- #endif
-+  if (strcmp(locale, "ja_JP.EUC") == 0 || strcmp(locale, "ja_JP.eucJP") == 0) {
-+	  locale = "EUC-JP";
+   charset = nl_langinfo(CODESET);
+ #else
++  if (strcmp(locale, "ja_JP.EUC") == 0) {
++    locale = "ja_JP.eucJP";
 +  }
-   select_input_encoding_handler(locale);
-   select_output_encoding_handler(locale);
- #endif
+   charset = strchr(locale, '.');
+   if (charset)
+     ++charset;
diff --git a/japanese/groff/pkg-plist b/japanese/groff/pkg-plist
index 3427c16a4a44..a5af18da8c63 100644
--- a/japanese/groff/pkg-plist
+++ b/japanese/groff/pkg-plist
@@ -384,53 +384,53 @@ share/groff/%%GROFF_VERSION%%/tmac/tty.tmac
 share/groff/%%GROFF_VERSION%%/tmac/www.tmac
 share/groff/site-tmac/man.local
 share/groff/site-tmac/mdoc.local
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/examples/README.mom
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/examples/elvis_syntax
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/examples/grnexmpl.g
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/examples/grnexmpl.me
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/examples/grnexmpl.ps
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/examples/letter.mom
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/examples/letter.ps
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/examples/macros.mom
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/examples/macros.ps
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/examples/penguin.ps
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/examples/typeset.mom
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/examples/typeset.ps
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/examples/typewrite.mom
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/examples/typewrite.ps
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/examples/webpage.ms
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/examples/webpage.ps
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/html/momdoc/appendices.html
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/html/momdoc/cover.html
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/html/momdoc/definitions.html
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/html/momdoc/docelement.html
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/html/momdoc/docprocessing.html
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/html/momdoc/goodies.html
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/html/momdoc/headfootpage.html
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/html/momdoc/inlines.html
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/html/momdoc/intro.html
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/html/momdoc/letters.html
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/html/momdoc/rectoverso.html
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/html/momdoc/reserved.html
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/html/momdoc/toc.html
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/html/momdoc/typemacdoc.html
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/html/momdoc/typesetting.html
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/html/momdoc/using.html
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/meintro.me
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/meintro.ps
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/meref.me
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/meref.ps
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/pic.ms
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/pic.ps
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/ChangeLog.jp
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/NEWS
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/PROBLEMS
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/README
-%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/README.jp
-%%PORTDOCS%%@dirrm share/doc/groff/%%GROFF_VERSION%%/examples
-%%PORTDOCS%%@dirrm share/doc/groff/%%GROFF_VERSION%%/html/momdoc
-%%PORTDOCS%%@dirrm share/doc/groff/%%GROFF_VERSION%%/html
-%%PORTDOCS%%@dirrm share/doc/groff/%%GROFF_VERSION%%
+%%PORTDOCS%%%%DOCSDIR%%/examples/README.mom
+%%PORTDOCS%%%%DOCSDIR%%/examples/elvis_syntax
+%%PORTDOCS%%%%DOCSDIR%%/examples/grnexmpl.g
+%%PORTDOCS%%%%DOCSDIR%%/examples/grnexmpl.me
+%%PORTDOCS%%%%DOCSDIR%%/examples/grnexmpl.ps
+%%PORTDOCS%%%%DOCSDIR%%/examples/letter.mom
+%%PORTDOCS%%%%DOCSDIR%%/examples/letter.ps
+%%PORTDOCS%%%%DOCSDIR%%/examples/macros.mom
+%%PORTDOCS%%%%DOCSDIR%%/examples/macros.ps
+%%PORTDOCS%%%%DOCSDIR%%/examples/penguin.ps
+%%PORTDOCS%%%%DOCSDIR%%/examples/typeset.mom
+%%PORTDOCS%%%%DOCSDIR%%/examples/typeset.ps
+%%PORTDOCS%%%%DOCSDIR%%/examples/typewrite.mom
+%%PORTDOCS%%%%DOCSDIR%%/examples/typewrite.ps
+%%PORTDOCS%%%%DOCSDIR%%/examples/webpage.ms
+%%PORTDOCS%%%%DOCSDIR%%/examples/webpage.ps
+%%PORTDOCS%%%%DOCSDIR%%/html/momdoc/appendices.html
+%%PORTDOCS%%%%DOCSDIR%%/html/momdoc/cover.html
+%%PORTDOCS%%%%DOCSDIR%%/html/momdoc/definitions.html
+%%PORTDOCS%%%%DOCSDIR%%/html/momdoc/docelement.html
+%%PORTDOCS%%%%DOCSDIR%%/html/momdoc/docprocessing.html
+%%PORTDOCS%%%%DOCSDIR%%/html/momdoc/goodies.html
+%%PORTDOCS%%%%DOCSDIR%%/html/momdoc/headfootpage.html
+%%PORTDOCS%%%%DOCSDIR%%/html/momdoc/inlines.html
+%%PORTDOCS%%%%DOCSDIR%%/html/momdoc/intro.html
+%%PORTDOCS%%%%DOCSDIR%%/html/momdoc/letters.html
+%%PORTDOCS%%%%DOCSDIR%%/html/momdoc/rectoverso.html
+%%PORTDOCS%%%%DOCSDIR%%/html/momdoc/reserved.html
+%%PORTDOCS%%%%DOCSDIR%%/html/momdoc/toc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/momdoc/typemacdoc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/momdoc/typesetting.html
+%%PORTDOCS%%%%DOCSDIR%%/html/momdoc/using.html
+%%PORTDOCS%%%%DOCSDIR%%/meintro.me
+%%PORTDOCS%%%%DOCSDIR%%/meintro.ps
+%%PORTDOCS%%%%DOCSDIR%%/meref.me
+%%PORTDOCS%%%%DOCSDIR%%/meref.ps
+%%PORTDOCS%%%%DOCSDIR%%/pic.ms
+%%PORTDOCS%%%%DOCSDIR%%/pic.ps
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.jp
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/PROBLEMS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.jp
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/momdoc
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PORTDOCS%%@dirrm share/doc/groff
 @exec mkdir -p %D/lib/groff/site-tmac
 @dirrm lib/groff/site-tmac