pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install Sync with NetBSD base version:
details: https://anonhg.NetBSD.org/pkgsrc/rev/cfa6396061aa
branches: trunk
changeset: 526474:cfa6396061aa
user: joerg <joerg%pkgsrc.org@localhost>
date: Sun Mar 11 22:05:03 2007 +0000
description:
Sync with NetBSD base version:
- obsolete support for require scripts
- nuke support for the following options of pkg_create:
-X (excludefile)
-r (require script)
-h (Force follow symlink)
- add option for pkg_create to specify additional @blddep packages.
This brings us to version 20070308.
diffstat:
pkgtools/pkg_install/Makefile | 3 +-
pkgtools/pkg_install/files/add/perform.c | 5 +-
pkgtools/pkg_install/files/create/create.h | 6 +--
pkgtools/pkg_install/files/create/main.c | 30 +++++----------
pkgtools/pkg_install/files/create/perform.c | 39 +++++++++++--------
pkgtools/pkg_install/files/create/pkg_create.1 | 46 +++++++---------------
pkgtools/pkg_install/files/create/pkg_create.cat1 | 35 ++++++-----------
pkgtools/pkg_install/files/info/perform.c | 13 ++++--
pkgtools/pkg_install/files/lib/version.h | 4 +-
9 files changed, 77 insertions(+), 104 deletions(-)
diffs (truncated from 492 to 300 lines):
diff -r fb81b98c9004 -r cfa6396061aa pkgtools/pkg_install/Makefile
--- a/pkgtools/pkg_install/Makefile Sun Mar 11 21:05:22 2007 +0000
+++ b/pkgtools/pkg_install/Makefile Sun Mar 11 22:05:03 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.129 2007/02/06 01:30:11 reed Exp $
+# $NetBSD: Makefile,v 1.130 2007/03/11 22:05:03 joerg Exp $
# Notes to package maintainers:
#
@@ -9,7 +9,6 @@
# change in the pkg_* tools that pkgsrc relies on for proper operation.
DISTNAME= pkg_install-${VERSION}
-PKGREVISION= 1
CATEGORIES= pkgtools
MASTER_SITES= # empty
DISTFILES= # empty
diff -r fb81b98c9004 -r cfa6396061aa pkgtools/pkg_install/files/add/perform.c
--- a/pkgtools/pkg_install/files/add/perform.c Sun Mar 11 21:05:22 2007 +0000
+++ b/pkgtools/pkg_install/files/add/perform.c Sun Mar 11 22:05:03 2007 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: perform.c,v 1.43 2006/07/20 11:29:48 gson Exp $ */
+/* $NetBSD: perform.c,v 1.44 2007/03/11 22:05:03 joerg Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
@@ -14,7 +14,7 @@
#if 0
static const char *rcsid = "from FreeBSD Id: perform.c,v 1.44 1997/10/13 15:03:46 jkh Exp";
#else
-__RCSID("$NetBSD: perform.c,v 1.43 2006/07/20 11:29:48 gson Exp $");
+__RCSID("$NetBSD: perform.c,v 1.44 2007/03/11 22:05:03 joerg Exp $");
#endif
#endif
@@ -825,6 +825,7 @@
/* Look for the requirements file */
if (fexists(REQUIRE_FNAME)) {
+ warnx("package %s uses obsoleted require scripts", PkgName);
(void) fexec(CHMOD_CMD, "+x", REQUIRE_FNAME, NULL); /* be sure */
if (Verbose)
printf("Running requirements file first for %s.\n", PkgName);
diff -r fb81b98c9004 -r cfa6396061aa pkgtools/pkg_install/files/create/create.h
--- a/pkgtools/pkg_install/files/create/create.h Sun Mar 11 21:05:22 2007 +0000
+++ b/pkgtools/pkg_install/files/create/create.h Sun Mar 11 22:05:03 2007 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: create.h,v 1.4 2003/09/23 07:13:49 grant Exp $ */
+/* $NetBSD: create.h,v 1.5 2007/03/11 22:05:03 joerg Exp $ */
/* from FreeBSD Id: create.h,v 1.13 1997/10/08 07:46:19 charnier Exp */
@@ -32,10 +32,9 @@
extern char *Install;
extern char *DeInstall;
extern char *Contents;
-extern char *Require;
-extern char *ExcludeFrom;
extern char *Mtree;
extern char *Pkgdeps;
+extern char *BuildPkgdeps;
extern char *Pkgcfl;
extern char *BuildVersion;
extern char *BuildInfo;
@@ -46,7 +45,6 @@
extern char *realprefix;
extern char PlayPen[];
extern size_t PlayPenSize;
-extern int Dereference;
extern int PlistOnly;
extern int RelativeLinks;
extern int ReorderDirs;
diff -r fb81b98c9004 -r cfa6396061aa pkgtools/pkg_install/files/create/main.c
--- a/pkgtools/pkg_install/files/create/main.c Sun Mar 11 21:05:22 2007 +0000
+++ b/pkgtools/pkg_install/files/create/main.c Sun Mar 11 22:05:03 2007 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.7 2006/06/27 23:36:13 hubertf Exp $ */
+/* $NetBSD: main.c,v 1.8 2007/03/11 22:05:03 joerg Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
@@ -11,7 +11,7 @@
#if 0
static const char *rcsid = "from FreeBSD Id: main.c,v 1.17 1997/10/08 07:46:23 charnier Exp";
#else
-__RCSID("$NetBSD: main.c,v 1.7 2006/06/27 23:36:13 hubertf Exp $");
+__RCSID("$NetBSD: main.c,v 1.8 2007/03/11 22:05:03 joerg Exp $");
#endif
#endif
@@ -32,7 +32,7 @@
#include "lib.h"
#include "create.h"
-static const char Options[] = "B:C:D:EFI:K:L:OP:RS:UVX:b:c:d:f:hi:k:lm:n:p:r:s:t:v";
+static const char Options[] = "B:C:D:EFI:K:L:OP:RS:T:UVb:c:d:f:i:k:lm:n:p:r:s:t:v";
char *Prefix = NULL;
char *Comment = NULL;
@@ -41,10 +41,9 @@
char *Install = NULL;
char *DeInstall = NULL;
char *Contents = NULL;
-char *Require = NULL;
-char *ExcludeFrom = NULL;
char *Mtree = NULL;
char *Pkgdeps = NULL;
+char *BuildPkgdeps = NULL;
char *Pkgcfl = NULL;
char *BuildVersion = NULL;
char *BuildInfo = NULL;
@@ -57,7 +56,6 @@
size_t PlayPenSize = sizeof(PlayPen);
int update_pkgdb = 1;
int create_views = 0;
-int Dereference = 0;
int PlistOnly = 0;
int RelativeLinks = 0;
int ReorderDirs = 0;
@@ -67,12 +65,12 @@
usage(void)
{
fprintf(stderr,
- "usage: pkg_create [-EhlORUVv] [-B build-info-file] [-b build-version-file]\n"
+ "usage: pkg_create [-ElORUVv] [-B build-info-file] [-b build-version-file]\n"
" [-C cpkgs] [-D displayfile] [-I realprefix] [-i iscript]\n"
" [-K pkg_dbdir] [-k dscript] [-L SrcDir] [-m mtreefile]\n"
" [-n preserve-file] [-P dpkgs] [-p prefix] [-r rscript]\n"
" [-S size-all-file] [-s size-pkg-file] [-t template]\n"
- " [-X excludefile] -c comment -d description -f packlist\n"
+ " [-T buildpkgs] -c comment -d description -f packlist\n"
" pkg-name\n");
exit(1);
}
@@ -155,22 +153,10 @@
SrcDir = optarg;
break;
- case 'r':
- Require = optarg;
- break;
-
case 't':
strlcpy(PlayPen, optarg, sizeof(PlayPen));
break;
- case 'X':
- ExcludeFrom = optarg;
- break;
-
- case 'h':
- Dereference = 1;
- break;
-
case 'D':
Display = optarg;
break;
@@ -187,6 +173,10 @@
Pkgdeps = optarg;
break;
+ case 'T':
+ BuildPkgdeps = optarg;
+ break;
+
case 'C':
Pkgcfl = optarg;
break;
diff -r fb81b98c9004 -r cfa6396061aa pkgtools/pkg_install/files/create/perform.c
--- a/pkgtools/pkg_install/files/create/perform.c Sun Mar 11 21:05:22 2007 +0000
+++ b/pkgtools/pkg_install/files/create/perform.c Sun Mar 11 22:05:03 2007 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: perform.c,v 1.10 2005/11/22 15:44:59 ben Exp $ */
+/* $NetBSD: perform.c,v 1.11 2007/03/11 22:05:03 joerg Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
@@ -11,7 +11,7 @@
#if 0
static const char *rcsid = "from FreeBSD Id: perform.c,v 1.38 1997/10/13 15:03:51 jkh Exp";
#else
-__RCSID("$NetBSD: perform.c,v 1.10 2005/11/22 15:44:59 ben Exp $");
+__RCSID("$NetBSD: perform.c,v 1.11 2007/03/11 22:05:03 joerg Exp $");
#endif
#endif
@@ -83,12 +83,6 @@
args[nargs++] = "bzip2";
} else if (strchr(suffix, 'z'))/* Compress/gzip? */
args[nargs++] = "-z";
- if (Dereference)
- args[nargs++] = "-h";
- if (ExcludeFrom) {
- args[nargs++] = "-X";
- args[nargs++] = ExcludeFrom;
- }
args[nargs++] = "-T"; /* Take filenames from file instead of args. */
args[nargs++] = "-"; /* Use stdin for the file. */
args[nargs] = NULL;
@@ -106,9 +100,6 @@
if (DeInstall) {
fprintf(totar, "%s\n", DEINSTALL_FNAME);
}
- if (Require) {
- fprintf(totar, "%s\n", REQUIRE_FNAME);
- }
if (Display) {
fprintf(totar, "%s\n", DISPLAY_FNAME);
}
@@ -273,6 +264,27 @@
printf(".\n");
}
+ /*
+ * Put the build dependencies after the dependencies.
+ * This works due to the evaluation order in pkg_add.
+ */
+ if (BuildPkgdeps) {
+ if (Verbose && !PlistOnly)
+ printf("Registering build depends:");
+ while (BuildPkgdeps) {
+ cp = strsep(&BuildPkgdeps, " \t\n");
+ if (*cp) {
+ if (findmatchingname(_pkgdb_getPKGDB_DIR(), cp, note_whats_installed, installed) > 0) {
+ add_plist(&plist, PLIST_BLDDEP, installed);
+ if (Verbose && !PlistOnly)
+ printf(" %s", cp);
+ }
+ }
+ }
+ if (Verbose && !PlistOnly)
+ printf(".\n");
+ }
+
/* Put the conflicts directly after the dependencies, if any */
if (Pkgcfl) {
if (Verbose && !PlistOnly)
@@ -347,11 +359,6 @@
add_plist(&plist, PLIST_IGNORE, NULL);
add_plist(&plist, PLIST_FILE, DEINSTALL_FNAME);
}
- if (Require) {
- copy_file(Home, Require, REQUIRE_FNAME);
- add_plist(&plist, PLIST_IGNORE, NULL);
- add_plist(&plist, PLIST_FILE, REQUIRE_FNAME);
- }
if (Display) {
copy_file(Home, Display, DISPLAY_FNAME);
add_plist(&plist, PLIST_IGNORE, NULL);
diff -r fb81b98c9004 -r cfa6396061aa pkgtools/pkg_install/files/create/pkg_create.1
--- a/pkgtools/pkg_install/files/create/pkg_create.1 Sun Mar 11 21:05:22 2007 +0000
+++ b/pkgtools/pkg_install/files/create/pkg_create.1 Sun Mar 11 22:05:03 2007 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_create.1,v 1.7 2004/08/06 16:57:03 jlam Exp $
+.\" $NetBSD: pkg_create.1,v 1.8 2007/03/11 22:05:03 joerg Exp $
.\"
.\" FreeBSD install - a package for the installation and maintenance
.\" of non-core utilities.
@@ -24,7 +24,7 @@
.\" [jkh] Took John's changes back and made some additional extensions for
.\" better integration with FreeBSD's new ports collection.
.\"
-.Dd September 2, 2003
+.Dd March 8, 2007
.Dt PKG_CREATE 1
.Os
.Sh NAME
@@ -32,7 +32,7 @@
.Nd a utility for creating software package distributions
.Sh SYNOPSIS
.Nm
-.Op Fl EhlORUVv
+.Op Fl ElORUVv
.Bk -words
.Op Fl B Ar build-info-file
.Ek
@@ -70,10 +70,10 @@
.Op Fl P Ar dpkgs
.Ek
.Bk -words
-.Op Fl p Ar prefix
+.Op Fl T Ar buildpkgs
.Ek
.Bk -words
-.Op Fl r Ar rscript
+.Op Fl p Ar prefix
.Ek
.Bk -words
.Op Fl S Ar size-all-file
@@ -85,9 +85,6 @@
.Op Fl t Ar template
.Ek
.Bk -words
-.Op Fl X Ar excludefile
-.Ek
-.Bk -words
.Fl c Ar comment
.Ek
.Bk -words
@@ -172,9 +169,6 @@
Home |
Main Index |
Thread Index |
Old Index