Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Put support for @src back in.

Browse Source 
For users who use private packages that use it. (Hi Bill!)
This commit is contained in:
hubertf 1999-11-29 20:09:54 +00:00
parent 18e6d486f4
commit ecf89794f5
7 changed files with 39 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.sbin/pkg_install/admin/main.c
View File

@ -1,8 +1,8 @@
/* $NetBSD: main.c,v 1.9 1999/11/29 19:48:44 hubertf Exp $ */
/* $NetBSD: main.c,v 1.10 1999/11/29 20:09:54 hubertf Exp $ */
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: main.c,v 1.9 1999/11/29 19:48:44 hubertf Exp $");
__RCSID("$NetBSD: main.c,v 1.10 1999/11/29 20:09:54 hubertf Exp $");
#endif
/*
@ -117,6 +117,9 @@ check1pkg(const char *pkgdir)
dirp = dir;
}
break;
case PLIST_SRC:
warnx("@src is deprecated - please send-pr for %s!\n", PkgName);
break;
case PLIST_IGNORE:
p = p->next;
break;
@ -225,6 +228,9 @@ rebuild(void)
dirp = dir;
}
break;
case PLIST_SRC:
warnx("@src is deprecated - please send-pr for %s!\n", PkgName);
break;
case PLIST_IGNORE:
p = p->next;
break;

6
usr.sbin/pkg_install/create/perform.c
View File

@ -1,11 +1,11 @@
/* $NetBSD: perform.c,v 1.20 1999/11/29 19:48:45 hubertf Exp $ */
/* $NetBSD: perform.c,v 1.21 1999/11/29 20:09:55 hubertf Exp $ */
#include <sys/cdefs.h>
#ifndef lint
#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.20 1999/11/29 19:48:45 hubertf Exp $");
__RCSID("$NetBSD: perform.c,v 1.21 1999/11/29 20:09:55 hubertf Exp $");
#endif
#endif
@ -137,7 +137,7 @@ make_dist(char *home, char *pkg, char *suffix, package_t *plist)
for (p = plist->head; p; p = p->next) {
if (p->type == PLIST_FILE)
fprintf(totar, "%s\n", p->name);
else if (p->type == PLIST_CWD)
else if (p->type == PLIST_CWD || p->type == PLIST_SRC)
fprintf(totar, "-C\n%s\n", p->name);
else if (p->type == PLIST_IGNORE)
p = p->next;

8
usr.sbin/pkg_install/create/pkg_create.1
View File

@ -1,4 +1,4 @@
.\" $NetBSD: pkg_create.1,v 1.19 1999/11/29 19:48:45 hubertf Exp $
.\" $NetBSD: pkg_create.1,v 1.20 1999/11/29 20:09:55 hubertf Exp $
.\"
.\" FreeBSD install - a package for the installation and maintainance
.\" of non-core utilities.
@ -288,6 +288,12 @@ All subsequent filenames will be assumed relative to this directory.
Note:
.Cm @cd
is also an alias for this command.
.It Cm @src Ar directory
Set the internal directory pointer for _creation only_ to
.Ar directory .
That is to say that it overrides
.Cm @cwd
for package creation but not extraction.
.It Cm @exec Ar command
Execute
.Ar command

7
usr.sbin/pkg_install/create/pl.c
View File

@ -1,11 +1,11 @@
/* $NetBSD: pl.c,v 1.17 1999/11/29 19:48:45 hubertf Exp $ */
/* $NetBSD: pl.c,v 1.18 1999/11/29 20:09:55 hubertf Exp $ */
#include <sys/cdefs.h>
#ifndef lint
#if 0
static const char *rcsid = "from FreeBSD Id: pl.c,v 1.11 1997/10/08 07:46:35 charnier Exp";
#else
__RCSID("$NetBSD: pl.c,v 1.17 1999/11/29 19:48:45 hubertf Exp $");
__RCSID("$NetBSD: pl.c,v 1.18 1999/11/29 20:09:55 hubertf Exp $");
#endif
#endif
@ -133,6 +133,9 @@ check_list(char *home, package_t *pkg, const char *PkgName)
case PLIST_IGNORE:
p = p->next;
break;
case PLIST_SRC:
srcdir = p->name;
break;
case PLIST_DIR_RM:
dirc++;
break;

6
usr.sbin/pkg_install/info/show.c
View File

@ -1,11 +1,11 @@
/* $NetBSD: show.c,v 1.17 1999/11/29 19:48:47 hubertf Exp $ */
/* $NetBSD: show.c,v 1.18 1999/11/29 20:09:55 hubertf Exp $ */
#include <sys/cdefs.h>
#ifndef lint
#if 0
static const char *rcsid = "from FreeBSD Id: show.c,v 1.11 1997/10/08 07:47:38 charnier Exp";
#else
__RCSID("$NetBSD: show.c,v 1.17 1999/11/29 19:48:47 hubertf Exp $");
__RCSID("$NetBSD: show.c,v 1.18 1999/11/29 20:09:55 hubertf Exp $");
#endif
#endif
@ -84,6 +84,7 @@ static show_t showv[] = {
{PLIST_IGNORE, NULL, NULL},
{PLIST_NAME, "@name %s", "\tPackage name: %s"},
{PLIST_UNEXEC, "@unexec %s", "\tUNEXEC '%s'"},
{PLIST_SRC, "@src: %s", "\tSRC to: %s"},
{PLIST_DISPLAY, "@display %s", "\tInstall message file: %s"},
{PLIST_PKGDEP, "@pkgdep %s", "\tPackage depends on: %s"},
{PLIST_MTREE, "@mtree %s", "\tPackage mtree file: %s"},
@ -182,6 +183,7 @@ show_plist(char *title, package_t *plist, pl_ent_t type)
break;
case PLIST_CWD:
case PLIST_CMD:
case PLIST_SRC:
case PLIST_UNEXEC:
case PLIST_COMMENT:
case PLIST_NAME:

17
usr.sbin/pkg_install/lib/lib.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: lib.h,v 1.27 1999/11/29 19:48:47 hubertf Exp $ */
/* $NetBSD: lib.h,v 1.28 1999/11/29 20:09:56 hubertf Exp $ */
/* from FreeBSD Id: lib.h,v 1.25 1997/10/08 07:48:03 charnier Exp */
@ -111,13 +111,14 @@ typedef enum pl_ent_t {
PLIST_IGNORE, /* 7 */
PLIST_NAME, /* 8 */
PLIST_UNEXEC, /* 9 */
PLIST_DISPLAY, /* 10 */
PLIST_PKGDEP, /* 11 */
PLIST_MTREE, /* 12 */
PLIST_DIR_RM, /* 13 */
PLIST_IGNORE_INST, /* 14 */
PLIST_OPTION, /* 15 */
PLIST_PKGCFL /* 16 */
PLIST_SRC, /* 10 */
PLIST_DISPLAY, /* 11 */
PLIST_PKGDEP, /* 12 */
PLIST_MTREE, /* 13 */
PLIST_DIR_RM, /* 14 */
PLIST_IGNORE_INST, /* 15 */
PLIST_OPTION, /* 16 */
PLIST_PKGCFL /* 17 */
} pl_ent_t;
/* Types */

5
usr.sbin/pkg_install/lib/plist.c
View File

@ -1,11 +1,11 @@
/* $NetBSD: plist.c,v 1.23 1999/11/29 19:48:48 hubertf Exp $ */
/* $NetBSD: plist.c,v 1.24 1999/11/29 20:09:56 hubertf Exp $ */
#include <sys/cdefs.h>
#ifndef lint
#if 0
static const char *rcsid = "from FreeBSD Id: plist.c,v 1.24 1997/10/08 07:48:15 charnier Exp";
#else
__RCSID("$NetBSD: plist.c,v 1.23 1999/11/29 19:48:48 hubertf Exp $");
__RCSID("$NetBSD: plist.c,v 1.24 1999/11/29 20:09:56 hubertf Exp $");
#endif
#endif
@ -44,6 +44,7 @@ typedef struct cmd_t {
/* Commands to recognise */
static cmd_t cmdv[] = {
{"cwd", PLIST_CWD, 1},
{"src", PLIST_SRC, 1},
{"cd", PLIST_CWD, 1},
{"exec", PLIST_CMD, 1},
{"unexec", PLIST_UNEXEC, 1},