From 1338a9cf15bee08e98e9a5ea98d8dec264de9d7f Mon Sep 17 00:00:00 2001 From: wiz Date: Tue, 22 Oct 2002 11:35:39 +0000 Subject: Install catted man pages with proper suffix. Bump PKGREVISION to 4.1nb1. Closes PR 18758. --- sysutils/findutils/Makefile | 5 +++-- sysutils/findutils/PLIST | 12 ++++++------ sysutils/findutils/distinfo | 6 ++++-- sysutils/findutils/patches/patch-aa | 35 +++++++++++++++++++++++++++-------- sysutils/findutils/patches/patch-ac | 22 ++++++++++++++++++++++ sysutils/findutils/patches/patch-ad | 22 ++++++++++++++++++++++ 6 files changed, 84 insertions(+), 18 deletions(-) create mode 100644 sysutils/findutils/patches/patch-ac create mode 100644 sysutils/findutils/patches/patch-ad (limited to 'sysutils/findutils') diff --git a/sysutils/findutils/Makefile b/sysutils/findutils/Makefile index a32a63a4b50..f63d2877751 100644 --- a/sysutils/findutils/Makefile +++ b/sysutils/findutils/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2002/02/18 15:14:41 seb Exp $ -# FreeBSD Id: Makefile,v 1.13 1999/01/27 07:41:14 fenner Exp $ +# $NetBSD: Makefile,v 1.5 2002/10/22 11:35:39 wiz Exp $ +# DISTNAME= findutils-4.1 +PKGREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_GNU:=findutils/} diff --git a/sysutils/findutils/PLIST b/sysutils/findutils/PLIST index f739ebabd8f..668b8899dd1 100644 --- a/sysutils/findutils/PLIST +++ b/sysutils/findutils/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:41 seb Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/10/22 11:35:40 wiz Exp $ bin/gfind bin/gxargs bin/glocate @@ -11,11 +11,11 @@ info/find.info info/find.info-1 info/find.info-2 @exec ${INSTALL_INFO} %D/info/find.info %D/info/dir -man/cat1/gfind.1 -man/cat1/gxargs.1 -man/cat1/glocate.1 -man/cat1/gupdatedb.1 -man/cat5/glocatedb.5 +man/cat1/gfind.0 +man/cat1/gxargs.0 +man/cat1/glocate.0 +man/cat1/gupdatedb.0 +man/cat5/glocatedb.0 man/man1/gfind.1 man/man1/gxargs.1 man/man1/glocate.1 diff --git a/sysutils/findutils/distinfo b/sysutils/findutils/distinfo index 24ef369e198..40dfb986ff8 100644 --- a/sysutils/findutils/distinfo +++ b/sysutils/findutils/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.3 2001/07/24 09:59:40 wiz Exp $ +$NetBSD: distinfo,v 1.4 2002/10/22 11:35:40 wiz Exp $ SHA1 (findutils-4.1.tar.gz) = b91cd03ca4c9659b3e5d40e841c64bfd2e7f25d8 Size (findutils-4.1.tar.gz) = 294494 bytes -SHA1 (patch-aa) = a72421de9eec395143ce39da109eb53e85dfc468 +SHA1 (patch-aa) = 5449d631e14c202ad626fc2b96c64a7cd878ee81 SHA1 (patch-ab) = 13664baa3e9348413416c920776be659d5dc59c3 +SHA1 (patch-ac) = 2443dab53a9bc738cdb16e46b5aa7893ee7c13aa +SHA1 (patch-ad) = 4f28e677b099e60b0097b0f7358dc4c51f07e1aa diff --git a/sysutils/findutils/patches/patch-aa b/sysutils/findutils/patches/patch-aa index 320b4208047..bb320ef9055 100644 --- a/sysutils/findutils/patches/patch-aa +++ b/sysutils/findutils/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.2 2001/07/24 09:59:41 wiz Exp $ +$NetBSD: patch-aa,v 1.3 2002/10/22 11:35:40 wiz Exp $ ---- locate/Makefile.in.orig Sat Nov 5 09:44:08 1994 +--- locate/Makefile.in.orig Sat Nov 5 15:44:08 1994 +++ locate/Makefile.in -@@ -29,7 +29,7 @@ +@@ -29,7 +29,7 @@ libexecdir = $(exec_prefix)/libexec datadir = $(prefix)/share sysconfdir = $(prefix)/etc sharedstatedir = $(prefix)/com @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.2 2001/07/24 09:59:41 wiz Exp $ libdir = $(exec_prefix)/lib infodir = $(prefix)/info mandir = $(prefix)/man -@@ -38,6 +38,7 @@ +@@ -38,6 +38,7 @@ oldincludedir = /usr/include INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -19,7 +19,7 @@ $NetBSD: patch-aa,v 1.2 2001/07/24 09:59:41 wiz Exp $ INSTALL_DATA = @INSTALL_DATA@ transform = @program_transform_name@ -@@ -68,7 +69,7 @@ +@@ -68,7 +69,7 @@ DIST_CONF = Makefile.am Makefile.in DIST_FILES = $(DIST_CONF) $(SOURCES) $(TEXINFOS) $(INFOS) $(MANS) $(DIST_OTHER) # The default database to build and search. @@ -28,16 +28,35 @@ $NetBSD: patch-aa,v 1.2 2001/07/24 09:59:41 wiz Exp $ PROGRAMS = locate LIBPROGRAMS = frcode code bigram -@@ -96,8 +97,11 @@ +@@ -96,9 +97,12 @@ install:: install-programs install-programs: $(PROGRAMS) $(SCRIPTS) $(top_srcdir)/mkinstalldirs $(bindir) - for p in $(PROGRAMS) $(SCRIPTS); do \ + for p in $(PROGRAMS); do \ $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \ -+ done + done + for p in $(SCRIPTS); do \ + $(INSTALL_SCRIPT) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \ - done ++ done uninstall:: uninstall-programs + +@@ -140,14 +144,15 @@ install-man: + for man in $(MANS); do \ + sect=`echo $$man|sed 's%.*\.\([0-9][a-z]*\)$$%\1%'`; \ + inst=`basename $$man $$sect|sed '$(transform)'`$$sect; \ ++ inst0=`basename $$man $$sect|sed '$(transform)'`0; \ + mdir=$(mandir)/man$$sect; \ + $(top_srcdir)/mkinstalldirs $$mdir; \ + echo installing $$man as $$mdir/$$inst; \ + $(INSTALL_DATA) $(srcdir)/$$man $$mdir/$$inst; \ + cdir=$(mandir)/cat$$sect; \ + if test -d $$cdir; then \ +- echo formatting $$man as $$cdir/$$inst; \ +- $(NROFF) -man $(srcdir)/$$man > $$cdir/$$inst; \ ++ echo formatting $$man as $$cdir/$$inst0; \ ++ $(NROFF) -man $(srcdir)/$$man > $$cdir/$$inst0; \ + fi; \ + done + diff --git a/sysutils/findutils/patches/patch-ac b/sysutils/findutils/patches/patch-ac new file mode 100644 index 00000000000..28aece041a7 --- /dev/null +++ b/sysutils/findutils/patches/patch-ac @@ -0,0 +1,22 @@ +$NetBSD: patch-ac,v 1.1 2002/10/22 11:35:40 wiz Exp $ + +--- find/Makefile.in.orig Sat Nov 5 15:43:52 1994 ++++ find/Makefile.in +@@ -98,14 +98,15 @@ install-man: + for man in $(MANS); do \ + sect=`echo $$man|sed 's%.*\.\([0-9][a-z]*\)$$%\1%'`; \ + inst=`basename $$man $$sect|sed '$(transform)'`$$sect; \ ++ inst0=`basename $$man $$sect|sed '$(transform)'`0; \ + mdir=$(mandir)/man$$sect; \ + $(top_srcdir)/mkinstalldirs $$mdir; \ + echo installing $$man as $$mdir/$$inst; \ + $(INSTALL_DATA) $(srcdir)/$$man $$mdir/$$inst; \ + cdir=$(mandir)/cat$$sect; \ + if test -d $$cdir; then \ +- echo formatting $$man as $$cdir/$$inst; \ +- $(NROFF) -man $(srcdir)/$$man > $$cdir/$$inst; \ ++ echo formatting $$man as $$cdir/$$inst0; \ ++ $(NROFF) -man $(srcdir)/$$man > $$cdir/$$inst0; \ + fi; \ + done + diff --git a/sysutils/findutils/patches/patch-ad b/sysutils/findutils/patches/patch-ad new file mode 100644 index 00000000000..ec26455e350 --- /dev/null +++ b/sysutils/findutils/patches/patch-ad @@ -0,0 +1,22 @@ +$NetBSD: patch-ad,v 1.1 2002/10/22 11:35:40 wiz Exp $ + +--- xargs/Makefile.in.orig Sat Nov 5 15:44:18 1994 ++++ xargs/Makefile.in +@@ -97,14 +97,15 @@ install-man: + for man in $(MANS); do \ + sect=`echo $$man|sed 's%.*\.\([0-9][a-z]*\)$$%\1%'`; \ + inst=`basename $$man $$sect|sed '$(transform)'`$$sect; \ ++ inst0=`basename $$man $$sect|sed '$(transform)'`0; \ + mdir=$(mandir)/man$$sect; \ + $(top_srcdir)/mkinstalldirs $$mdir; \ + echo installing $$man as $$mdir/$$inst; \ + $(INSTALL_DATA) $(srcdir)/$$man $$mdir/$$inst; \ + cdir=$(mandir)/cat$$sect; \ + if test -d $$cdir; then \ +- echo formatting $$man as $$cdir/$$inst; \ +- $(NROFF) -man $(srcdir)/$$man > $$cdir/$$inst; \ ++ echo formatting $$man as $$cdir/$$inst0; \ ++ $(NROFF) -man $(srcdir)/$$man > $$cdir/$$inst0; \ + fi; \ + done + -- cgit v1.2.3