[src/trunk]: src/usr.sbin/pkg_install/create Put back former -s switch to pkg...

[hubertf <hubertf%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/46379bfab647
branches:  trunk
changeset: 479715:46379bfab647
user:      hubertf <hubertf%NetBSD.org@localhost>
date:      Mon Dec 20 03:25:57 1999 +0000

description:
Put back former -s switch to pkg_create as -L now.
Fixes PR 8982 by Eric Schnoebelen <eric%cirr.com@localhost>

diffstat:

 usr.sbin/pkg_install/create/create.h     |   3 ++-
 usr.sbin/pkg_install/create/main.c       |  11 ++++++++---
 usr.sbin/pkg_install/create/perform.c    |  11 +++++++++--
 usr.sbin/pkg_install/create/pkg_create.1 |   8 +++++++-
 4 files changed, 26 insertions(+), 7 deletions(-)

diffs (122 lines):

diff -r f4afd88d9c29 -r 46379bfab647 usr.sbin/pkg_install/create/create.h
--- a/usr.sbin/pkg_install/create/create.h      Mon Dec 20 02:43:58 1999 +0000
+++ b/usr.sbin/pkg_install/create/create.h      Mon Dec 20 03:25:57 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: create.h,v 1.13 1999/11/29 19:48:45 hubertf Exp $ */
+/* $NetBSD: create.h,v 1.14 1999/12/20 03:25:57 hubertf Exp $ */
 
 /* from FreeBSD Id: create.h,v 1.13 1997/10/08 07:46:19 charnier Exp */
 
@@ -41,6 +41,7 @@
 extern char *BuildInfo;
 extern char *SizePkg;
 extern char *SizeAll;
+extern char *SrcDir;
 extern char PlayPen[];
 extern size_t PlayPenSize;
 extern int Dereference;
diff -r f4afd88d9c29 -r 46379bfab647 usr.sbin/pkg_install/create/main.c
--- a/usr.sbin/pkg_install/create/main.c        Mon Dec 20 02:43:58 1999 +0000
+++ b/usr.sbin/pkg_install/create/main.c        Mon Dec 20 03:25:57 1999 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: main.c,v 1.15 1999/11/29 19:48:45 hubertf Exp $        */
+/*     $NetBSD: main.c,v 1.16 1999/12/20 03:25:58 hubertf Exp $        */
 
 #include <sys/cdefs.h>
 #ifndef lint
 #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.15 1999/11/29 19:48:45 hubertf Exp $");
+__RCSID("$NetBSD: main.c,v 1.16 1999/12/20 03:25:58 hubertf Exp $");
 #endif
 #endif
 
@@ -24,7 +24,7 @@
 #include "lib.h"
 #include "create.h"
 
-static char Options[] = "ORhlvFf:p:P:C:c:d:i:k:r:t:X:D:m:s:S:b:B:";
+static char Options[] = "ORhlvFf:p:P:C:c:d:i:k:L:r:t:X:D:m:s:S:b:B:";
 
 char   *Prefix = NULL;
 char   *Comment = NULL;
@@ -42,6 +42,7 @@
 char   *BuildInfo = NULL;
 char   *SizePkg = NULL;
 char   *SizeAll = NULL;
+char   *SrcDir = NULL;
 char    PlayPen[FILENAME_MAX];
 size_t  PlayPenSize = sizeof(PlayPen);
 int     Dereference = 0;
@@ -119,6 +120,10 @@
                        RelativeLinks = 1;
                        break;
 
+               case 'L':
+                       SrcDir = optarg;
+                       break;
+
                case 'r':
                        Require = optarg;
                        break;
diff -r f4afd88d9c29 -r 46379bfab647 usr.sbin/pkg_install/create/perform.c
--- a/usr.sbin/pkg_install/create/perform.c     Mon Dec 20 02:43:58 1999 +0000
+++ b/usr.sbin/pkg_install/create/perform.c     Mon Dec 20 03:25:57 1999 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: perform.c,v 1.21 1999/11/29 20:09:55 hubertf Exp $     */
+/*     $NetBSD: perform.c,v 1.22 1999/12/20 03:25:58 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.21 1999/11/29 20:09:55 hubertf Exp $");
+__RCSID("$NetBSD: perform.c,v 1.22 1999/12/20 03:25:58 hubertf Exp $");
 #endif
 #endif
 
@@ -263,6 +263,13 @@
                        printf(".\n");
        }
 
+       /* If a SrcDir override is set, add it now */
+       if (SrcDir) {
+               if (Verbose && !PlistOnly)
+                       printf("Using SrcDir value of %s\n", SrcDir);
+               add_plist(&plist, PLIST_SRC, SrcDir);
+       }
+
        /* Slurp in the packing list */
        read_plist(&plist, pkg_in);
 
diff -r f4afd88d9c29 -r 46379bfab647 usr.sbin/pkg_install/create/pkg_create.1
--- a/usr.sbin/pkg_install/create/pkg_create.1  Mon Dec 20 02:43:58 1999 +0000
+++ b/usr.sbin/pkg_install/create/pkg_create.1  Mon Dec 20 03:25:57 1999 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_create.1,v 1.20 1999/11/29 20:09:55 hubertf Exp $
+.\" $NetBSD: pkg_create.1,v 1.21 1999/12/20 03:25:58 hubertf Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintainance
 .\" of non-core utilities.
@@ -61,6 +61,9 @@
 .Op Fl k Ar dscript
 .Ek
 .Bk -words
+.Op Fl L Ar SrcDir
+.Ek
+.Bk -words
 .Op Fl m Ar mtreefile
 .Ek
 .Bk -words
@@ -119,6 +122,9 @@
 and is meant as a convenient shorthand for specifying multiple
 .Cm @pkgcfl
 directives in the packing list (see PACKING LIST DETAILS section below).
+.It Fl L Ar SrcDir
+This sets the package's @src directive; see below for a description
+of what this does.
 .It Fl D Ar displayfile
 Display the file after installing the package. Useful for things like
 legal notices on almost-free software, etc.