From 363e6cbd2f7b58bf143308d8b3347aeba50424c1 Mon Sep 17 00:00:00 2001 From: Satoshi Asami Date: Sat, 7 Dec 1996 23:16:13 +0000 Subject: Instead of installing its own manpath.config in /usr/local/etc, check the value of ${LANG} or LC_TYPE and look into the appropriate subdirectories of directories specified by /etc/manpath.config. Submitted by: Kumano Tadashi --- japanese/man/Makefile | 3 +- japanese/man/files/patch-aa | 211 ++++++++++++++++++++++++++++++++++++++++++++ japanese/man/pkg-plist | 1 - 3 files changed, 212 insertions(+), 3 deletions(-) create mode 100644 japanese/man/files/patch-aa (limited to 'japanese') diff --git a/japanese/man/Makefile b/japanese/man/Makefile index b4207a0375d9..1ac20be0a61a 100644 --- a/japanese/man/Makefile +++ b/japanese/man/Makefile @@ -3,7 +3,7 @@ # Date created: 4 December 1996 # Whom: Kiriyama Kazuhiko # -# $Id$ +# $Id: Makefile,v 1.1.1.1 1996/12/07 13:24:00 asami Exp $ # DISTNAME= jp-man-1.0 @@ -16,7 +16,6 @@ RUN_DEPENDS= ${PREFIX}/bin/groff:${PORTSDIR}/japanese/groff \ jless:${PORTSDIR}/japanese/less post-install: - @mv ${PREFIX}/etc/manpath.config.sample ${PREFIX}/etc/manpath.config @${INSTALL_DATA} /usr/share/tmac/tmac.an ${PREFIX}/share/groff/tmac @${INSTALL_DATA} /usr/share/tmac/tmac.groff_an ${PREFIX}/share/groff/tmac diff --git a/japanese/man/files/patch-aa b/japanese/man/files/patch-aa new file mode 100644 index 000000000000..078e1e57c518 --- /dev/null +++ b/japanese/man/files/patch-aa @@ -0,0 +1,211 @@ +*** man/man.c.orig Tue May 30 14:02:00 1995 +--- man/man.c Sun Dec 8 03:33:04 1996 +*************** +*** 12,17 **** +--- 12,19 ---- + * Department of Chemical Engineering + * The University of Texas at Austin + * Austin, Texas 78712 ++ * ++ * (LOCALE enhancement by kumano@strl.nhk.or.jp, 1996) + */ + + #define MAN_MAIN +*************** +*** 22,27 **** +--- 24,32 ---- + #include + #include + #include ++ #ifdef LOCALE ++ # include ++ #endif + #include "config.h" + #include "gripes.h" + #include "version.h" +*************** +*** 112,117 **** +--- 117,126 ---- + uid_t egid; + #endif + ++ #ifdef LOCALE ++ static char current_locale[20]; ++ #endif ++ + int + main (argc, argv) + int argc; +*************** +*** 129,134 **** +--- 138,148 ---- + void do_whatis (); + int man (); + ++ #ifdef LOCALE ++ (void)setlocale(LC_CTYPE, ""); ++ strcpy(current_locale, setlocale(LC_CTYPE, NULL)); ++ #endif ++ + prognam = mkprogname (argv[0]); + + man_getopt (argc, argv); +*************** +*** 261,288 **** +--- 275,345 ---- + } + + char ** ++ #ifdef LOCALE ++ add_dir_to_mpath_list (mp, p, locale) ++ #else + add_dir_to_mpath_list (mp, p) ++ #endif + char **mp; + char *p; ++ #ifdef LOCALE ++ int locale; ++ #endif + { + int status; ++ char *pp; ++ ++ #ifdef LOCALE ++ if (locale) ++ { ++ char buf[FILENAME_MAX]; ++ ++ strcpy (buf, p); ++ strcat (buf, "/"); ++ strcat (buf, current_locale); ++ ++ pp = buf; ++ } ++ else ++ { ++ pp = p; ++ } + ++ status = is_directory (pp); ++ #else + status = is_directory (p); ++ #endif + + if (status < 0 && debug) + { ++ #ifdef LOCALE ++ fprintf (stderr, "Warning: couldn't stat file %s!\n", pp); ++ #else + fprintf (stderr, "Warning: couldn't stat file %s!\n", p); ++ #endif + } + else if (status == 0 && debug) + { ++ #ifdef LOCALE ++ fprintf (stderr, "Warning: %s isn't a directory!\n", pp); ++ #else + fprintf (stderr, "Warning: %s isn't a directory!\n", p); ++ #endif + } + else if (status == 1) + { + if (debug) ++ #ifdef LOCALE ++ fprintf (stderr, "adding %s to manpathlist\n", pp); ++ #else + fprintf (stderr, "adding %s to manpathlist\n", p); ++ #endif + ++ #ifdef LOCALE ++ *mp++ = strdup (pp); ++ #else + *mp++ = strdup (p); ++ #endif + } + return mp; + } +*************** +*** 299,304 **** +--- 356,364 ---- + register char *p; + register char *end; + register char **mp; ++ #ifdef LOCALE ++ register int locale; ++ #endif + extern char *optarg; + extern int getopt (); + extern void downcase (); +*************** +*** 409,414 **** +--- 469,478 ---- + * Expand the manpath into a list for easier handling. + */ + mp = manpathlist; ++ #ifdef LOCALE ++ for (locale = 1; locale >= 0; locale--) ++ { ++ #endif + for (p = manp; ; p = end+1) + { + if ((end = strchr (p, ':')) != NULL) +*************** +*** 427,446 **** +--- 491,525 ---- + strcat (buf, "/"); + strcat (buf, alt_system_name); + ++ # ifdef LOCALE ++ mp = add_dir_to_mpath_list (mp, buf, locale); ++ # else + mp = add_dir_to_mpath_list (mp, buf); ++ # endif + } + else + { ++ # ifdef LOCALE ++ mp = add_dir_to_mpath_list (mp, p, locale); ++ # else + mp = add_dir_to_mpath_list (mp, p); ++ # endif + } + #else ++ # ifdef LOCALE ++ mp = add_dir_to_mpath_list (mp, p, locale); ++ # else + mp = add_dir_to_mpath_list (mp, p); ++ # endif + #endif + if (end == NULL) + break; + + *end = ':'; + } ++ #ifdef LOCALE ++ } ++ #endif + *mp = NULL; + } + +*** man/Makefile.orig Wed Dec 4 11:11:09 1996 +--- man/Makefile Sun Dec 8 03:26:31 1996 +*************** +*** 9,14 **** +--- 9,15 ---- + .else + LDADD= -L${.CURDIR}/../lib/ -lman + .endif ++ LDADD+= -lxpg4 + + .if exists(${.CURDIR}/obj) + MAN1= ${.CURDIR}/obj/jman.1 +*************** +*** 19,24 **** +--- 20,26 ---- + DPADD+= ${MAN1} + CFLAGS+= -I${.CURDIR}/../lib -DSTDC_HEADERS -DPOSIX -DHAS_TROFF + CFLAGS+= -DDO_COMPRESS -DALT_SYSTEMS -DSETREUID -DCATMODE=0664 ++ CFLAGS+= -DLOCALE + CLEANFILES+= ${MAN1} + + ${MAN1}: ${.CURDIR}/man.man diff --git a/japanese/man/pkg-plist b/japanese/man/pkg-plist index 93de68948ca9..94da31f4e875 100644 --- a/japanese/man/pkg-plist +++ b/japanese/man/pkg-plist @@ -10,4 +10,3 @@ man/ja_JP.EUC/man1/jmanpath.1.gz man/ja_JP.EUC/man1/japropos.1.gz man/ja_JP.EUC/man1/jwhatis.1.gz man/ja_JP.EUC/man1/jmakewhatis.1.gz -etc/manpath.config -- cgit v1.2.3