Fix a bug that jman always searched "ja" subdirectory ignoring LC_ALL,

LC_CTYPE, and LANG.

Submitted by:	horikawa@jp.FreeBSD.org, MORI Kouji <moriko@hh.iij4u.or.jp>

5 files changed, 4 insertions, 43 deletions

diff --git a/japanese/man/Makefile b/japanese/man/Makefile
index 87e7927cc277..14697bfb7647 100644
--- a/japanese/man/Makefile
+++ b/japanese/man/Makefile
@@ -7,14 +7,15 @@
 
 PORTNAME=	man
 PORTVERSION=	1.1j
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://daemon.jp.freebsd.org/pub/FreeBSD-jp/man-jp/ \
 		${MASTER_SITE_PORTS_JP}
 DISTNAME=	jp-${PORTNAME}-${PORTVERSION}
 
 PATCH_SITES=	ftp://daemon.jp.freebsd.org/pub/FreeBSD-jp/man-jp/
-PATCHFILES=	jp-man-1.1j-ex-20010827.patch
+PATCHFILES=	jp-man-1.1j-ex-20020115.patch
+PATCH_DIST_STRIP=-p1
 
 MAINTAINER=	kuriyama@FreeBSD.org
 
@@ -22,7 +23,6 @@ RUN_DEPENDS=	${LOCALBASE}/bin/groff:${PORTSDIR}/japanese/groff \
 		jless:${PORTSDIR}/japanese/less
 
 MAKE_ENV=	GZCAT=${GZCAT} GZIP_CMD="${GZIP_CMD}"
-PATCH_DIST_STRIP=-p1
 
 MANLANG=	"" ja
 MAN1=		jman.1 jmanpath.1 japropos.1 \
diff --git a/japanese/man/distinfo b/japanese/man/distinfo
index cc9053e72adf..0ffe55587890 100644
--- a/japanese/man/distinfo
+++ b/japanese/man/distinfo
@@ -1,2 +1,2 @@
 MD5 (jp-man-1.1j.tar.gz) = ec22da41bcefe05cf17b67e9a5af3e69
-MD5 (jp-man-1.1j-ex-20010827.patch) = bcc2ed43b71e6e126f3a5e4cb1b112eb
+MD5 (jp-man-1.1j-ex-20020115.patch) = d34816527799823a20a945cb5b48d9c7
diff --git a/japanese/man/files/patch-locale.c b/japanese/man/files/patch-locale.c
deleted file mode 100644
index ac4e2157bac2..000000000000
--- a/japanese/man/files/patch-locale.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- man/locale.c	2001/08/27 00:01:55
-+++ man/locale.c	2001/12/13 03:00:32
-@@ -12,7 +12,6 @@
- 
- int debug;
- int insecure = 0;
--int findall;
- char *search_lang_path = "ja%en";
- 
- typedef struct {
-@@ -259,7 +258,7 @@
-   return found;
- }
- 
--int man_ml(char *name)
-+int man_ml(char *name, int findall)
- {
-   static man_lang_env_t ***root = NULL;
-   man_lang_env_t ***p;
diff --git a/japanese/man/files/patch-locale.h b/japanese/man/files/patch-locale.h
deleted file mode 100644
index 36ee7957ac20..000000000000
--- a/japanese/man/files/patch-locale.h
+++ /dev/null
@@ -1,9 +0,0 @@
---- man/locale.h	2001/07/17 01:42:54
-+++ man/locale.h	2001/12/13 02:17:39
-@@ -20,5 +20,5 @@
- char *directive(int);
- int try_section_ml(char *, char *, char *, int, int);
- int try_section(char *, char *, char *, int);
--int man_ml(char *);
-+int man_ml(char *, int);
- int man(char *);
diff --git a/japanese/man/files/patch-man.c b/japanese/man/files/patch-man.c
deleted file mode 100644
index 6839bdc4cbd5..000000000000
--- a/japanese/man/files/patch-man.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- man/man.c	2001/07/30 08:49:20
-+++ man/man.c	2001/12/13 02:16:57
-@@ -222,7 +222,7 @@
-       }
-       else
- 	{
--	  status = man_ml (nextarg);
-+	  status = man_ml (nextarg, findall);
- 
- 	  if (status == 0)
- 	    gripe_not_found (nextarg, section);