Revert "man: various fixes:"

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: Revert "man: various fixes:"
From: Jonathan Perkin <jperkin%joyent.com@localhost>
Date: Wed, 07 Jun 2017 10:59:26 +0000
Module Name:	pkgsrc-wip
Committed By:	Jonathan Perkin <jperkin%joyent.com@localhost>
Pushed By:	jperkin
Date:		Wed Jun 7 11:59:26 2017 +0100
Changeset:	b106ea222331db5c2faf3dfa190d6f0bb7c1b367

Modified Files:
	man/Makefile
	man/PLIST
	man/distinfo
Removed Files:
	man/patches/patch-configure
	man/patches/patch-gencat_gencat.c
	man/patches/patch-src_man.c
	man/patches/patch-src_man.conf.in

Log Message:
Revert "man: various fixes:"

This reverts commit 988254f4ff9952c536737aa85c7ad0634f0cdaad.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b106ea222331db5c2faf3dfa190d6f0bb7c1b367

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 man/Makefile                      |  15 +-----
 man/PLIST                         | 103 ++++++++++++++++++++++++++++++++++++++
 man/distinfo                      |   4 --
 man/patches/patch-configure       |  36 -------------
 man/patches/patch-gencat_gencat.c |  13 -----
 man/patches/patch-src_man.c       |  13 -----
 man/patches/patch-src_man.conf.in |  67 -------------------------
 7 files changed, 104 insertions(+), 147 deletions(-)

diffs:
diff --git a/man/Makefile b/man/Makefile
index 93c5a92ec5..da50a27923 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -21,7 +21,7 @@ USE_TOOLS+=		groff:run
 PKGMANDIR?=		man
 USE_PKGLOCALEDIR=	yes
 HAS_CONFIGURE=		yes
-CONFIGURE_ARGS+=	-confdir ${PKG_SYSCONFDIR} +sgid +traditional
+CONFIGURE_ARGS+=	-confdir ${PKG_SYSCONFDIR} +sgid +fhs +lang all
 CONFIGURE_ARGS+=	-prefix=${PREFIX:Q}
 CONFIGURE_ARGS+=	-mandir=${PREFIX}/${PKGMANDIR}
 CONFIGURE_ENV+=		deflocale=${PREFIX}/${PKGLOCALEDIR}/locale/
@@ -33,19 +33,6 @@ PKG_GROUPS=		${MAN_GROUP}
 EXAMPLESDIR=		${PREFIX}/share/examples/man/
 CONF_FILES=		${EXAMPLESDIR}/man.conf ${PKG_SYSCONFDIR}/man.conf
 
-SUBST_CLASSES+=		path
-SUBST_MESSAGE.path=	Fixing default tool search path.
-SUBST_STAGE.path=	post-patch
-SUBST_FILES.path=	configure src/man.conf.in
-SUBST_SED.path=		-e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.path+=	-e 's,@PKGMANDIR@,${PKGMANDIR},g'
-
-SUBST_CLASSES+=		awk
-SUBST_MESSAGE.awk=	Fixing default awk
-SUBST_STAGE.awk=	pre-patch
-SUBST_FILES.awk=	src/makewhatis.sh
-SUBST_SED.awk=		-e 's,@awk@,${AWK},g'
-
 post-install:
 	${INSTALL_DATA_DIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/src/man.conf ${EXAMPLESDIR}
diff --git a/man/PLIST b/man/PLIST
index 452f488f17..7be3624f16 100644
--- a/man/PLIST
+++ b/man/PLIST
@@ -4,11 +4,114 @@ bin/man
 bin/man2dvi
 bin/man2html
 bin/whatis
+man/bg/man1/apropos.1
+man/bg/man1/man.1
+man/bg/man1/whatis.1
+man/bg/man5/man.conf.5
+man/bg/man8/makewhatis.8
+man/cs/man1/apropos.1
+man/cs/man1/man.1
+man/cs/man1/whatis.1
+man/cs/man5/man.conf.5
+man/da/man1/apropos.1
+man/da/man1/man.1
+man/da/man1/whatis.1
+man/da/man5/man.conf.5
+man/de/man1/apropos.1
+man/de/man1/man.1
+man/de/man1/whatis.1
+man/de/man5/man.conf.5
+man/el/man1/apropos.1
+man/el/man1/man.1
+man/el/man1/whatis.1
+man/el/man5/man.conf.5
+man/el/man8/makewhatis.8
+man/es/man1/apropos.1
+man/es/man1/man.1
+man/es/man1/whatis.1
+man/es/man5/man.conf.5
+man/es/man8/makewhatis.8
+man/fi/man1/apropos.1
+man/fi/man1/man.1
+man/fi/man1/whatis.1
+man/fi/man5/man.conf.5
+man/fr/man1/apropos.1
+man/fr/man1/man.1
+man/fr/man1/whatis.1
+man/fr/man5/man.conf.5
+man/fr/man8/makewhatis.8
+man/hr/man1/apropos.1
+man/hr/man1/man.1
+man/hr/man1/whatis.1
+man/hr/man5/man.conf.5
+man/it/man1/apropos.1
+man/it/man1/man.1
+man/it/man1/whatis.1
+man/it/man5/man.conf.5
+man/it/man8/makewhatis.8
+man/ja/man1/apropos.1
+man/ja/man1/man.1
+man/ja/man1/whatis.1
+man/ja/man5/man.conf.5
+man/ko/man1/apropos.1
+man/ko/man1/man.1
+man/ko/man1/whatis.1
+man/ko/man5/man.conf.5
 man/man1/apropos.1
 man/man1/man.1
 man/man1/man2html.1
 man/man1/whatis.1
 man/man5/man.conf.5
 man/man8/makewhatis.8
+man/nl/man1/apropos.1
+man/nl/man1/man.1
+man/nl/man1/whatis.1
+man/nl/man5/man.conf.5
+man/pl/man1/apropos.1
+man/pl/man1/man.1
+man/pl/man1/whatis.1
+man/pl/man5/man.conf.5
+man/pt/man1/apropos.1
+man/pt/man1/man.1
+man/pt/man1/whatis.1
+man/pt/man5/man.conf.5
+man/ro/man1/apropos.1
+man/ro/man1/man.1
+man/ro/man1/whatis.1
+man/ro/man5/man.conf.5
+man/ro/man8/makewhatis.8
+man/sl/man1/apropos.1
+man/sl/man1/man.1
+man/sl/man1/whatis.1
+man/sl/man5/man.conf.5
 sbin/makewhatis
 share/examples/man/man.conf
+share/locale/mess.bg.cat
+share/locale/mess.cs.cat
+share/locale/mess.da.cat
+share/locale/mess.de.cat
+share/locale/mess.el.cat
+share/locale/mess.en.cat
+share/locale/mess.es.cat
+share/locale/mess.fi.cat
+share/locale/mess.fr.cat
+share/locale/mess.hr.cat
+share/locale/mess.it.cat
+share/locale/mess.ja.cat
+share/locale/mess.ko.cat
+share/locale/mess.nl.cat
+share/locale/mess.pl.cat
+share/locale/mess.pt.cat
+share/locale/mess.ro.cat
+share/locale/mess.ru.cat
+share/locale/mess.sl.cat
+@exec ${MKDIR} %D/man/sl/man8
+@exec ${MKDIR} %D/man/pt/man8
+@exec ${MKDIR} %D/man/nl/man8
+@exec ${MKDIR} %D/man/ko/man8
+@exec ${MKDIR} %D/man/hr/man8
+@exec ${MKDIR} %D/man/fi/man8
+@exec ${MKDIR} %D/man/de/man8
+@exec ${MKDIR} %D/man/da/man8
+@exec ${MKDIR} %D/man/cs/man8
+@exec ${MKDIR} %D/man/bg/man8
diff --git a/man/distinfo b/man/distinfo
index fd0c4f104d..9d91a3cd36 100644
--- a/man/distinfo
+++ b/man/distinfo
@@ -9,7 +9,3 @@ SHA1 (patch-ac) = f4281f4f2dd35ded4f8ab38c52181da385263df4
 SHA1 (patch-ad) = 81748bf4839f69e98b05525e529e4e86769fecec
 SHA1 (patch-ae) = 1f2a8c8894ad51c2b5d84d08a4f33eaf6496f62f
 SHA1 (patch-af) = 0d611a641927dd07719fb4d874ce9daaf9126b7c
-SHA1 (patch-configure) = 5c8dd6d5e867a90869a62c04a30de88a20bf6ac7
-SHA1 (patch-gencat_gencat.c) = 50563fd665b5f8916ffdb51339d3fcd02e106772
-SHA1 (patch-src_man.c) = 7512d0e273448656bf917a6234c74a547456fb6f
-SHA1 (patch-src_man.conf.in) = beea07007f36fe2fe84bab78085dd514bd180e56
diff --git a/man/patches/patch-configure b/man/patches/patch-configure
deleted file mode 100644
index dbe42b7ab8..0000000000
--- a/man/patches/patch-configure
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD$
-
---- configure.orig	2006-05-01 17:56:14.000000000 +0000
-+++ configure
-@@ -362,7 +362,7 @@ rm -f conftest
- #   for i in /bin:/usr/bin:$PATH
- # does not work everywhere.)
- # Some people might prefer having $PATH first in PREPATH
--PREPATH=/bin:/usr/bin:/usr/ucb:/usr/local/bin:$PATH
-+PREPATH=@PREFIX@/bin:/bin:/usr/bin:/usr/ucb:/usr/local/bin:$PATH
- IFS0="$IFS"
- IFS=":$IFS"
- for i in $PREPATH
-@@ -476,18 +476,18 @@ else
-   then
-     if test $Fnroff = "missing"
-     then
--      nroff="nroff -Tlatin1 -mandoc"
-+      nroff="nroff -mandoc"
-     else
--      nroff="$Fnroff -Tlatin1 -mandoc"
-+      nroff="$Fnroff -mandoc"
-     fi
-     troff="troff -mandoc"
-     echo "Warning: could not find groff"
-   else
-     if test $Fnroff = "missing"
-     then
--      nroff="$Fgroff -Tlatin1 -mandoc"
-+      nroff="$Fgroff -mandoc"
-     else
--      nroff="$Fnroff -Tlatin1 -mandoc"
-+      nroff="$Fnroff -mandoc"
-     fi
-     troff="$Fgroff -Tps -mandoc"
-     jnroff="$Fgroff -Tnippon -mandocj"
diff --git a/man/patches/patch-gencat_gencat.c b/man/patches/patch-gencat_gencat.c
deleted file mode 100644
index 6891972c5f..0000000000
--- a/man/patches/patch-gencat_gencat.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- gencat/gencat.c.orig	2006-08-02 18:11:44.000000000 +0000
-+++ gencat/gencat.c
-@@ -43,7 +43,7 @@ up-to-date.  Many thanks.
- #include <stdio.h>
- #include <stdlib.h>
- #include <sys/types.h>
--#ifdef SYSV
-+#if defined(SYSV) || defined(__sun)
- #include <sys/fcntl.h>
- #include <string.h>
- #else
diff --git a/man/patches/patch-src_man.c b/man/patches/patch-src_man.c
deleted file mode 100644
index d05c54643a..0000000000
--- a/man/patches/patch-src_man.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- src/man.c.orig	2006-05-01 20:34:22.000000000 +0000
-+++ src/man.c
-@@ -594,7 +594,7 @@ make_roff_command (const char *path, con
-		 the current position plus 10 lines.  This plus setpl()
-		 gives us a single page that just contains the whole
-		 man page. (William Webber, wew%cs.rmit.edu.au@localhost) */
--	      strcat(buft, "; echo \".\\\\\\\"\"; echo \".pl \\n(nlu+10\"");
-+	      strcat(buft, "; echo \".\\\\\\\"\"; echo \".pl \\\\\\n(n;lu+10\"");
- #if 0
-	      /* In case this doesnt work for some reason,
-		 michaelkjohnson suggests: I've got a simple
diff --git a/man/patches/patch-src_man.conf.in b/man/patches/patch-src_man.conf.in
deleted file mode 100644
index 4bb0621517..0000000000
--- a/man/patches/patch-src_man.conf.in
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD$
-
---- src/man.conf.in.orig	2005-08-20 23:26:06.000000000 +0000
-+++ src/man.conf.in
-@@ -32,14 +32,14 @@
- # This file is also read by man in order to find how to call nroff, less, etc.,
- # and to determine the correspondence between extensions and decompressors.
- #
--# MANBIN		/usr/local/bin/man
-+# MANBIN		@PREFIX@/bin/@PKGMANDIR@
- #
- # Every automatically generated MANPATH includes these fields
- #
-+MANPATH	@PREFIX@/gcc*/@PKGMANDIR@
-+MANPATH	@PREFIX@/@PKGMANDIR@
- MANPATH	/usr/man
- MANPATH	/usr/share/man
--MANPATH	/usr/local/man
--MANPATH	/usr/local/share/man
- MANPATH	/usr/X11R6/man
- #
- # Uncomment if you want to include one of these by default
-@@ -58,26 +58,24 @@ MANPATH	/usr/X11R6/man
- # in the mandatory manpath already, but will keep man from statting
- # lots of other nearby files and directories.
- #
--MANPATH_MAP	/bin			/usr/share/man
--MANPATH_MAP	/sbin			/usr/share/man
--MANPATH_MAP	/usr/bin		/usr/share/man
--MANPATH_MAP	/usr/sbin		/usr/share/man
--MANPATH_MAP	/usr/local/bin		/usr/local/share/man
--MANPATH_MAP	/usr/local/sbin		/usr/local/share/man
--MANPATH_MAP	/usr/X11R6/bin		/usr/X11R6/man
--MANPATH_MAP	/usr/bin/X11		/usr/X11R6/man
--MANPATH_MAP	/usr/bin/mh		/usr/share/man
-+# MANPATH_MAP	/bin			/usr/share/man
-+# MANPATH_MAP	/sbin			/usr/share/man
-+# MANPATH_MAP	/usr/bin		/usr/share/man
-+# MANPATH_MAP	/usr/sbin		/usr/share/man
-+# MANPATH_MAP	/usr/X11R6/bin		/usr/X11R6/man
-+# MANPATH_MAP	/usr/bin/X11		/usr/X11R6/man
-+# MANPATH_MAP	/usr/bin/mh		/usr/share/man
- #
- # NOAUTOPATH keeps man from automatically adding directories that look like
- # manual page directories to the path.
- #
--#NOAUTOPATH
-+NOAUTOPATH
- #
- # NOCACHE keeps man from creating cache pages ("cat pages")
- # (generally one enables/disable cat page creation by creating/deleting
- # the directory they would live in - man never does mkdir)
- #
--#NOCACHE
-+NOCACHE
- #
- # Useful paths - note that COL should not be defined when
- # NROFF is defined as "groff -Tascii" or "groff -Tlatin1";
-@@ -119,7 +117,7 @@ COMPRESS_EXT	@compress_ext@
- # Default manual sections (and order) to search if -S is not specified
- # and the MANSECT environment variable is not set.
- #
--MANSECT		@sections@
-+MANSECT		1:2:3:4:5:7:8:9:1m:3bsm:3c:3c_db:3cfgadm:3commputil:3contract:3cpc:3curses:3dat:3devid:3devinfo:3dlpi:3dns_sd:3elf:3exacct:3ext:3fcoe:3fstyp:3gen:3gss:3head:3kstat:3kvm:3layout:3ldap:3lgrp:3lib:3libucb:3m:3malloc:3mms:3mp:3mpapi:3mvec:3nsl:3nvpair:3pam:3papi:3perl:3picl:3picltree:3plot:3pool:3proc:3project:3resolv:3rpc:3rsm:3sasl:3scf:3sec:3secdb:3sip:3slp:3snmp:3socket:3stmf:3sysevent:3tecla:3tnf:3ucb:3uuid:3volmgt:3x11:3xau:3xaw:3xcurses:3xext:3xmu:3xnet:4b:7d:7fs:9e:9f:9p:9s
- #
- # Default options to use when man is invoked without options
- # This is mainly for the benefit of those that think -a should be the default
Prev by Date: Revert "Various: Multi-MySQL/Percona support."
Next by Date: Revert "riak: various patches:"
Previous by Thread: Revert "Various: Multi-MySQL/Percona support."
Next by Thread: Revert "riak: various patches:"
Indexes:
Home | Main Index | Thread Index | Old Index