diff options
author | jlam <jlam> | 2006-03-20 18:05:22 +0000 |
---|---|---|
committer | jlam <jlam> | 2006-03-20 18:05:22 +0000 |
commit | 1b93078315e95c045f3727e76ebef9ca8387a9fe (patch) | |
tree | fe01ae69c65729cab532f54167e50f9c5f0fc0ca | |
parent | de1db504a60bc88cd64a66b9e04640ead260b363 (diff) | |
download | pkgsrc-1b93078315e95c045f3727e76ebef9ca8387a9fe.tar.gz |
* Honor PKGINFODIR and PKGMANDIR, and remove use of obsolete INFO_DIR.
* List info files directly in the PLIST.
* Don't install the catman pages at all to fix PLIST problems.
Bump the PKGREVISION to 6.
-rw-r--r-- | sysutils/findutils/Makefile | 15 | ||||
-rw-r--r-- | sysutils/findutils/PLIST | 8 | ||||
-rw-r--r-- | sysutils/findutils/distinfo | 9 | ||||
-rw-r--r-- | sysutils/findutils/patches/patch-aa | 23 | ||||
-rw-r--r-- | sysutils/findutils/patches/patch-ac | 23 | ||||
-rw-r--r-- | sysutils/findutils/patches/patch-ad | 23 | ||||
-rw-r--r-- | sysutils/findutils/patches/patch-al | 13 |
7 files changed, 32 insertions, 82 deletions
diff --git a/sysutils/findutils/Makefile b/sysutils/findutils/Makefile index 187bc58e15e..2b0bd14b474 100644 --- a/sysutils/findutils/Makefile +++ b/sysutils/findutils/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.23 2006/02/05 23:10:49 joerg Exp $ +# $NetBSD: Makefile,v 1.24 2006/03/20 18:05:22 jlam Exp $ DISTNAME= findutils-4.1 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_GNU:=findutils/} @@ -13,19 +13,14 @@ USE_TOOLS+= nroff GNU_CONFIGURE= YES CONFIGURE_HAS_INFODIR= NO CONFIGURE_HAS_MANDIR= NO -MAKE_ENV+= INFO_DIR=${INFO_DIR:Q} +MAKE_FLAGS+= infodir=${GNU_CONFIGURE_INFODIR:Q} +MAKE_FLAGS+= mandir=${GNU_CONFIGURE_MANDIR:Q} LDFLAGS.IRIX+= -lgen -INFO_FILES= find.info +INFO_FILES= # PLIST .include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "IRIX" -PLIST_SUBST+= USE_CATMAN="@comment " -.else -PLIST_SUBST+= USE_CATMAN="" -.endif - .if defined(GNU_PROGRAM_PREFIX) CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX:Q} .endif diff --git a/sysutils/findutils/PLIST b/sysutils/findutils/PLIST index 0779523ed10..4b263f224f3 100644 --- a/sysutils/findutils/PLIST +++ b/sysutils/findutils/PLIST @@ -1,16 +1,12 @@ -@comment $NetBSD: PLIST,v 1.6 2004/03/10 01:16:18 seb Exp $ +@comment $NetBSD: PLIST,v 1.7 2006/03/20 18:05:22 jlam Exp $ bin/${GNU_PROGRAM_PREFIX}find bin/${GNU_PROGRAM_PREFIX}xargs bin/${GNU_PROGRAM_PREFIX}locate bin/${GNU_PROGRAM_PREFIX}updatedb +info/find.info libexec/${GNU_PROGRAM_PREFIX}frcode libexec/${GNU_PROGRAM_PREFIX}code libexec/${GNU_PROGRAM_PREFIX}bigram -man/cat1/${GNU_PROGRAM_PREFIX}find.0 -man/cat1/${GNU_PROGRAM_PREFIX}xargs.0 -man/cat1/${GNU_PROGRAM_PREFIX}locate.0 -man/cat1/${GNU_PROGRAM_PREFIX}updatedb.0 -man/cat5/${GNU_PROGRAM_PREFIX}locatedb.0 man/man1/${GNU_PROGRAM_PREFIX}find.1 man/man1/${GNU_PROGRAM_PREFIX}xargs.1 man/man1/${GNU_PROGRAM_PREFIX}locate.1 diff --git a/sysutils/findutils/distinfo b/sysutils/findutils/distinfo index da7d06398cd..83b2a626318 100644 --- a/sysutils/findutils/distinfo +++ b/sysutils/findutils/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.11 2005/10/13 18:19:14 rillig Exp $ +$NetBSD: distinfo,v 1.12 2006/03/20 18:05:22 jlam Exp $ SHA1 (findutils-4.1.tar.gz) = b91cd03ca4c9659b3e5d40e841c64bfd2e7f25d8 RMD160 (findutils-4.1.tar.gz) = b66c0aa2e72d378e8c3cb9968ceb68d9138af874 Size (findutils-4.1.tar.gz) = 294494 bytes -SHA1 (patch-aa) = 529831ee424d6b09524c228c8d35eeca6ff378db +SHA1 (patch-aa) = d0c4c9f1dcc9471290f170ee3262a77906af996a SHA1 (patch-ab) = 13664baa3e9348413416c920776be659d5dc59c3 -SHA1 (patch-ac) = b0101730bb62563fa8cd0aba18c3f948ba6ff7e8 -SHA1 (patch-ad) = 1438225542b2870dd7bc0e1ae6feab2b410bb338 +SHA1 (patch-ac) = 4a0657f15cb72cbcddc782723943da089434b259 +SHA1 (patch-ad) = 4548d91fe4fc5bc02a7b4f7b85ffa4e83a413219 SHA1 (patch-ae) = db0debddba28d04954cf96c72e197408c9e6c3ad SHA1 (patch-af) = 0ae11b085ebe08d49a13fb1c1211fdb938391f5b SHA1 (patch-ag) = 17216ad95a59ba9bdcc8e52f0a99f05d263a9ba3 @@ -14,5 +14,4 @@ SHA1 (patch-ah) = 64ccdeebbb70694d45d16c41a4137bbe125df23b SHA1 (patch-ai) = 59c8872a9cef3bb94e35c7eb97a9878bcdb11c51 SHA1 (patch-aj) = 5fd1d20f75fafa01063982e2ef49f123d4cb4c7d SHA1 (patch-ak) = 5e47cf75a7f3bdfad6cfead06bb1643ebeee178d -SHA1 (patch-al) = 2b75b8fc967aad1bcabee529d796bbf1b4b5a327 SHA1 (patch-am) = 48abd78b11347cdeaa1057d85cab1931feada8e9 diff --git a/sysutils/findutils/patches/patch-aa b/sysutils/findutils/patches/patch-aa index 38522744e7f..ca213710aee 100644 --- a/sysutils/findutils/patches/patch-aa +++ b/sysutils/findutils/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.4 2005/10/11 02:03:18 jschauma Exp $ +$NetBSD: patch-aa,v 1.5 2006/03/20 18:05:22 jlam Exp $ ---- locate/Makefile.in.orig Sat Nov 5 15:44:08 1994 +--- locate/Makefile.in.orig 1994-11-05 09:44:08.000000000 -0500 +++ locate/Makefile.in @@ -29,7 +29,7 @@ libexecdir = $(exec_prefix)/libexec datadir = $(prefix)/share @@ -42,21 +42,12 @@ $NetBSD: patch-aa,v 1.4 2005/10/11 02:03:18 jschauma Exp $ 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; \ +@@ -145,7 +149,7 @@ install-man: 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 || true; \ +- if test -d $$cdir; then \ ++ if false && test -d $$cdir; then \ + echo formatting $$man as $$cdir/$$inst; \ + $(NROFF) -man $(srcdir)/$$man > $$cdir/$$inst; \ fi; \ - done - diff --git a/sysutils/findutils/patches/patch-ac b/sysutils/findutils/patches/patch-ac index 106fc349ee4..adb968b0601 100644 --- a/sysutils/findutils/patches/patch-ac +++ b/sysutils/findutils/patches/patch-ac @@ -1,22 +1,13 @@ -$NetBSD: patch-ac,v 1.2 2005/10/11 02:03:18 jschauma Exp $ +$NetBSD: patch-ac,v 1.3 2006/03/20 18:05:22 jlam Exp $ ---- find/Makefile.in.orig Sat Nov 5 15:43:52 1994 +--- find/Makefile.in.orig 1994-11-05 09:43:52.000000000 -0500 +++ 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; \ +@@ -103,7 +103,7 @@ install-man: 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 || true; \ +- if test -d $$cdir; then \ ++ if false && test -d $$cdir; then \ + echo formatting $$man as $$cdir/$$inst; \ + $(NROFF) -man $(srcdir)/$$man > $$cdir/$$inst; \ fi; \ - done - diff --git a/sysutils/findutils/patches/patch-ad b/sysutils/findutils/patches/patch-ad index 270c9623b24..b7ae20a0f11 100644 --- a/sysutils/findutils/patches/patch-ad +++ b/sysutils/findutils/patches/patch-ad @@ -1,22 +1,13 @@ -$NetBSD: patch-ad,v 1.2 2005/10/11 02:03:18 jschauma Exp $ +$NetBSD: patch-ad,v 1.3 2006/03/20 18:05:22 jlam Exp $ ---- xargs/Makefile.in.orig Sat Nov 5 15:44:18 1994 +--- xargs/Makefile.in.orig 1994-11-05 09:44:18.000000000 -0500 +++ 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; \ +@@ -102,7 +102,7 @@ install-man: 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 || true; \ +- if test -d $$cdir; then \ ++ if false && test -d $$cdir; then \ + echo formatting $$man as $$cdir/$$inst; \ + $(NROFF) -man $(srcdir)/$$man > $$cdir/$$inst; \ fi; \ - done - diff --git a/sysutils/findutils/patches/patch-al b/sysutils/findutils/patches/patch-al deleted file mode 100644 index 67c1c9380d8..00000000000 --- a/sysutils/findutils/patches/patch-al +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-al,v 1.1 2004/05/08 01:24:12 reed Exp $ - ---- doc/Makefile.in.orig Sat Nov 5 06:44:12 1994 -+++ doc/Makefile.in Fri May 7 17:47:16 2004 -@@ -31,7 +31,7 @@ - sharedstatedir = $(prefix)/com - localstatedir = $(prefix)/var - libdir = $(exec_prefix)/lib --infodir = $(prefix)/info -+infodir = $(prefix)/$(INFO_DIR) - mandir = $(prefix)/man - includedir = $(prefix)/include - oldincludedir = /usr/include |