From 0a1967266ac16f52ede4774a68ca735a1042b4fc Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 16 Mar 2003 00:17:23 +0000 Subject: Honour GNU_PROGRAM_PREFIX. From Jeremy C. Reed. Bump PKGREVISION. --- archivers/gcpio/Makefile | 11 +++- archivers/gcpio/PLIST | 6 +- archivers/gcpio/distinfo | 6 +- archivers/gcpio/patches/patch-aa | 6 +- archivers/gcpio/patches/patch-ab | 136 ++++----------------------------------- 5 files changed, 30 insertions(+), 135 deletions(-) diff --git a/archivers/gcpio/Makefile b/archivers/gcpio/Makefile index 2914f4857ef..082981afbd1 100644 --- a/archivers/gcpio/Makefile +++ b/archivers/gcpio/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.14 2002/08/25 21:49:04 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2003/03/16 00:17:23 wiz Exp $ # DISTNAME= cpio-2.4.2 PKGNAME= gcpio-2.4.2 +PKGREVISION= 1 CATEGORIES= archivers MASTER_SITES= ${MASTER_SITE_GNU:=cpio/} @@ -16,5 +17,13 @@ LIBS+= -lgnumalloc INFO_FILES= cpio.info +.include "../../mk/bsd.prefs.mk" + +.if defined(GNU_PROGRAM_PREFIX) +CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX} +.endif +PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX} +BUILD_DEFS+= GNU_PROGRAM_PREFIX + .include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/archivers/gcpio/PLIST b/archivers/gcpio/PLIST index d1caad074b0..30ad08c1129 100644 --- a/archivers/gcpio/PLIST +++ b/archivers/gcpio/PLIST @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:00 seb Exp $ -bin/gcpio +@comment $NetBSD: PLIST,v 1.3 2003/03/16 00:17:23 wiz Exp $ +bin/${GNU_PROGRAM_PREFIX}cpio @unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/cpio.info info/cpio.info @exec ${INSTALL_INFO} --info-dir=%D/info %D/info/cpio.info -man/man1/gcpio.1.gz +man/man1/${GNU_PROGRAM_PREFIX}cpio.1 diff --git a/archivers/gcpio/distinfo b/archivers/gcpio/distinfo index 940febbfacc..e8f76139bb2 100644 --- a/archivers/gcpio/distinfo +++ b/archivers/gcpio/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2001/07/15 11:34:38 jlam Exp $ +$NetBSD: distinfo,v 1.4 2003/03/16 00:17:23 wiz Exp $ SHA1 (cpio-2.4.2.tar.gz) = 88e557b2e14ad7b575554473e4ef4624a993b71f Size (cpio-2.4.2.tar.gz) = 185281 bytes -SHA1 (patch-aa) = 30d3b6c6e9e6eb579f93328325cc89108d6a32d4 -SHA1 (patch-ab) = 89dbeb8276a94831e9d792915df66bbc3733ca71 +SHA1 (patch-aa) = 36f3287ea0a64ac0eb085335ef0ab6661e1458c7 +SHA1 (patch-ab) = aa50963702198b42345aa906f387b89adad2b9b0 SHA1 (patch-ac) = 372b5fe8bb22a609c22089c78f67387e66436372 diff --git a/archivers/gcpio/patches/patch-aa b/archivers/gcpio/patches/patch-aa index 7fbe3c6763f..d6d61a564c2 100644 --- a/archivers/gcpio/patches/patch-aa +++ b/archivers/gcpio/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2001/07/15 11:34:38 jlam Exp $ +$NetBSD: patch-aa,v 1.4 2003/03/16 00:17:24 wiz Exp $ --- Makefile.in.orig Wed Dec 20 11:28:30 1995 +++ Makefile.in @@ -7,10 +7,10 @@ $NetBSD: patch-aa,v 1.3 2001/07/15 11:34:38 jlam Exp $ # Prefix for each installed program, normally empty or `g'. -binprefix = -+binprefix = g ++binprefix = @program_prefix@ # Prefix for each installed man page, normally empty or `g'. -manprefix = -+manprefix = g ++manprefix = @program_prefix@ # Where to install the cpio and mt executables. diff --git a/archivers/gcpio/patches/patch-ab b/archivers/gcpio/patches/patch-ab index 2e93db7f652..024ebeb0bf7 100644 --- a/archivers/gcpio/patches/patch-ab +++ b/archivers/gcpio/patches/patch-ab @@ -1,126 +1,12 @@ -$NetBSD: patch-ab,v 1.2 1998/08/07 10:35:48 agc Exp $ +$NetBSD: patch-ab,v 1.3 2003/03/16 00:17:24 wiz Exp $ ---- cpio.1.orig Wed Nov 30 19:23:38 1994 -+++ cpio.1 Tue Mar 3 14:11:31 1998 -@@ -1,8 +1,8 @@ - .TH CPIO 1L \" -*- nroff -*- - .SH NAME --cpio \- copy files to and from archives -+gcpio \- GNU cpio, copy files to and from archives - .SH SYNOPSIS --.B cpio -+.B gcpio - {\-o|\-\-create} [\-0acvABLV] [\-C bytes] [\-H format] [\-M message] - [\-O [[user@]host:]archive] [\-F [[user@]host:]archive] - [\-\-file=[[user@]host:]archive] [\-\-format=format] [\-\-message=message] -@@ -10,7 +10,7 @@ - [\-\-block-size=blocks] [\-\-dereference] [\-\-io-size=bytes] [\-\-quiet] - [\-\-force\-local] [\-\-help] [\-\-version] < name-list [> archive] - --.B cpio -+.B gcpio - {\-i|\-\-extract} [\-bcdfmnrtsuvBSV] [\-C bytes] [\-E file] [\-H format] - [\-M message] [\-R [user][:.][group]] [\-I [[user@]host:]archive] - [\-F [[user@]host:]archive] [\-\-file=[[user@]host:]archive] -@@ -22,7 +22,7 @@ - [\-\-force\-local] [\-\-no\-absolute\-filenames] [\-\-sparse] [\-\-only\-verify\-crc] - [\-\-quiet] [\-\-help] [\-\-version] [pattern...] [< archive] - --.B cpio -+.B gcpio - {\-p|\-\-pass-through} [\-0adlmuvLV] [\-R [user][:.][group]] - [\-\-null] [\-\-reset-access-time] [\-\-make-directories] [\-\-link] [\-\-quiet] - [\-\-preserve-modification-time] [\-\-unconditional] [\-\-verbose] [\-\-dot] -@@ -32,16 +32,16 @@ - This manual page - documents the GNU version of - .BR cpio . --.B cpio -+.B gcpio - copies files into or out of a cpio or tar archive, which is a file that - contains other files plus information about them, such as their - file name, owner, timestamps, and access permissions. The archive can - be another file on the disk, a magnetic tape, or a pipe. --.B cpio -+.B gcpio - has three operating modes. - .PP - In copy-out mode, --.B cpio -+.B gcpio - copies files into an archive. It reads a list of filenames, one per - line, on the standard input, and writes the archive onto the standard - output. A typical way to generate the list of filenames is with the -@@ -52,7 +52,7 @@ - directories that are unwritable or not searchable. - .PP - In copy-in mode, --.B cpio -+.B gcpio - copies files out of an archive or lists the archive contents. It - reads the archive from the standard input. Any non-option command - line arguments are shell globbing patterns; only files in the archive -@@ -63,14 +63,14 @@ - extracted. - .PP - In copy-pass mode, --.B cpio -+.B gcpio - copies files from one directory tree to another, combining the - copy-out and copy-in steps without actually using an archive. - It reads the list of files to copy from the standard input; the - directory into which it will copy them is given as a non-option - argument. - .PP --.B cpio -+.B gcpio - supports the following archive formats: binary, old ASCII, new - ASCII, crc, HPUX binary, HPUX old ASCII, old tar, and POSIX.1 tar. - The binary format -@@ -86,7 +86,7 @@ - The crc format is - like the new ASCII format, but also contains a checksum for each file - which --.B cpio -+.B gcpio - calculates when creating an archive - and verifies when the file is extracted from the archive. - The HPUX formats are provided for compatibility with HPUX's cpio which -@@ -102,18 +102,18 @@ - than 255 characters (less unless they have a "/" in just the right place). - .PP - By default, --.B cpio -+.B gcpio - creates binary format archives, for compatibility with - older - .B cpio - programs. - When extracting from archives, --.B cpio -+.B gcpio - automatically recognizes which kind of archive it is reading and can - read archives created on machines with a different byte-order. - .PP - Some of the options to --.B cpio -+.B gcpio - apply only to certain operating modes; see the SYNOPSIS section for a - list of which options are allowed in which modes. - .SS OPTIONS -@@ -164,7 +164,7 @@ - In copy-in mode, read additional patterns specifying filenames to - extract or list from FILE. The lines of FILE are treated as if they - had been non-option arguments to --.BR cpio . -+.BR gcpio . - .TP - .I "\-f, \-\-nonmatching" - Only copy files that do not match any of the given patterns. -@@ -322,5 +322,5 @@ - .TP - .I "\-\-version" - Print the --.B cpio -+.B gcpio - program version number and exit. +--- configure.orig Thu Dec 26 15:00:22 2002 ++++ configure Thu Dec 26 15:01:33 2002 +@@ -2117,6 +2117,7 @@ + s%@LIBS@%$LIBS%g + s%@exec_prefix@%$exec_prefix%g + s%@prefix@%$prefix%g ++s%@program_prefix@%$program_prefix%g + s%@program_transform_name@%$program_transform_name%g + s%@bindir@%$bindir%g + s%@sbindir@%$sbindir%g -- cgit v1.2.3