pkg_install-20091115:

Completely ignore @src in pkg_create. Silently ignore the -L option.
The combination of -I and -p are used by pkgsrc for the same result.

8 files changed, 25 insertions, 57 deletions

diff --git a/pkgtools/pkg_install/files/create/build.c b/pkgtools/pkg_install/files/create/build.c
index 14d84bebf1f..a5818cd8aba 100644
--- a/pkgtools/pkg_install/files/create/build.c
+++ b/pkgtools/pkg_install/files/create/build.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: build.c,v 1.13 2009/08/02 17:56:44 joerg Exp $	*/
+/*	$NetBSD: build.c,v 1.14 2009/11/05 16:22:32 joerg Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -7,7 +7,7 @@
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: build.c,v 1.13 2009/08/02 17:56:44 joerg Exp $");
+__RCSID("$NetBSD: build.c,v 1.14 2009/11/05 16:22:32 joerg Exp $");
 
 /*-
  * Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -298,13 +298,7 @@ make_dist(const char *pkg, const char *suffix, const package_t *plist)
 	for (p = plist->head; p; p = p->next) {
 		if (p->type == PLIST_FILE) {
 			write_normal_file(p->name, archive, resolver, owner, group);
-		} else if (p->type == PLIST_CWD || p->type == PLIST_SRC) {
-			
-			/* XXX let PLIST_SRC override PLIST_CWD */
-			if (p->type == PLIST_CWD && p->next != NULL &&
-			    p->next->type == PLIST_SRC) {
-				continue;
-			}
+		} else if (p->type == PLIST_CWD) {
 			chdir(p->name);
 		} else if (p->type == PLIST_IGNORE) {
 			p = p->next;
diff --git a/pkgtools/pkg_install/files/create/create.h b/pkgtools/pkg_install/files/create/create.h
index 11fd3006b02..6e07915bbe7 100644
--- a/pkgtools/pkg_install/files/create/create.h
+++ b/pkgtools/pkg_install/files/create/create.h
@@ -1,4 +1,4 @@
-/* $NetBSD: create.h,v 1.13 2009/08/02 17:56:44 joerg Exp $ */
+/* $NetBSD: create.h,v 1.14 2009/11/05 16:22:32 joerg Exp $ */
 
 /* from FreeBSD Id: create.h,v 1.13 1997/10/08 07:46:19 charnier Exp */
 
@@ -51,7 +51,6 @@ extern char *BuildInfo;
 extern char *SizePkg;
 extern char *SizeAll;
 extern char *Preserve;
-extern char *SrcDir;
 extern char *realprefix;
 extern char *DefaultOwner;
 extern char *DefaultGroup;
diff --git a/pkgtools/pkg_install/files/create/main.c b/pkgtools/pkg_install/files/create/main.c
index 917d06feb80..b2b62bae163 100644
--- a/pkgtools/pkg_install/files/create/main.c
+++ b/pkgtools/pkg_install/files/create/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.16 2009/08/02 17:56:44 joerg Exp $	*/
+/*	$NetBSD: main.c,v 1.17 2009/11/05 16:22:32 joerg Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -7,7 +7,7 @@
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: main.c,v 1.16 2009/08/02 17:56:44 joerg Exp $");
+__RCSID("$NetBSD: main.c,v 1.17 2009/11/05 16:22:32 joerg Exp $");
 
 /*
  * FreeBSD install - a package for the installation and maintainance
@@ -43,7 +43,6 @@ char   *BuildInfo = NULL;
 char   *SizePkg = NULL;
 char   *SizeAll = NULL;
 char   *Preserve = NULL;
-char   *SrcDir = NULL;
 char   *DefaultOwner = NULL;
 char   *DefaultGroup = NULL;
 char   *realprefix = NULL;
@@ -61,7 +60,7 @@ usage(void)
 	    "usage: pkg_create [-ElOUVv] [-B build-info-file] [-b build-version-file]\n"
             "                  [-C cpkgs] [-D displayfile] [-F compression] \n"
 	    "                  [-I realprefix] [-i iscript]\n"
-            "                  [-K pkg_dbdir] [-k dscript] [-L SrcDir]\n"
+            "                  [-K pkg_dbdir] [-k dscript]\n"
             "                  [-n preserve-file] [-P dpkgs] [-p prefix] [-r rscript]\n"
             "                  [-S size-all-file] [-s size-pkg-file]\n"
 	    "                  [-T buildpkgs] [-u owner] [-g group]\n"
@@ -147,7 +146,7 @@ main(int argc, char **argv)
 			break;
 
 		case 'L':
-			SrcDir = optarg;
+			warnx("Obsolete -L option ignored");
 			break;
 
 		case 'u':
diff --git a/pkgtools/pkg_install/files/create/perform.c b/pkgtools/pkg_install/files/create/perform.c
index b20f8441907..1d4b1585a67 100644
--- a/pkgtools/pkg_install/files/create/perform.c
+++ b/pkgtools/pkg_install/files/create/perform.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: perform.c,v 1.25 2009/08/02 17:56:44 joerg Exp $	*/
+/*	$NetBSD: perform.c,v 1.26 2009/11/05 16:22:32 joerg Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -7,7 +7,7 @@
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: perform.c,v 1.25 2009/08/02 17:56:44 joerg Exp $");
+__RCSID("$NetBSD: perform.c,v 1.26 2009/11/05 16:22:32 joerg Exp $");
 
 /*
  * FreeBSD install - a package for the installation and maintainance
@@ -168,13 +168,6 @@ pkg_perform(const char *pkg)
 
 	plist.head = plist.tail = NULL;
 
-	/* If a SrcDir override is set, add it now */
-	if (SrcDir) {
-		if (Verbose && !PlistOnly)
-			printf("Using SrcDir value of %s\n", (realprefix) ? realprefix : SrcDir);
-		add_plist(&plist, PLIST_SRC, SrcDir);
-	}
-
 	/* Stick the dependencies, if any, at the top */
 	if (Pkgdeps)
 		register_depends(&plist, Pkgdeps, 0);
diff --git a/pkgtools/pkg_install/files/create/pkg_create.1 b/pkgtools/pkg_install/files/create/pkg_create.1
index ecfaa06a214..ea11998e761 100644
--- a/pkgtools/pkg_install/files/create/pkg_create.1
+++ b/pkgtools/pkg_install/files/create/pkg_create.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_create.1,v 1.20 2009/05/13 03:33:50 joerg Exp $
+.\" $NetBSD: pkg_create.1,v 1.21 2009/11/05 16:22:32 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 May 13, 2009
+.Dd November 15, 2009
 .Dt PKG_CREATE 1
 .Os
 .Sh NAME
@@ -64,9 +64,6 @@
 .Op Fl k Ar dscript
 .Ek
 .Bk -words
-.Op Fl L Ar SrcDir
-.Ek
-.Bk -words
 .Op Fl n Ar preserve-file
 .Ek
 .Bk -words
@@ -211,9 +208,6 @@ to be the de-install procedure for the package.
 This can be any executable program (or shell script).
 It will be invoked automatically
 when the package is later (if ever) de-installed.
-.It Fl L Ar SrcDir
-This sets the package's @src directive; see below for a description
-of what this does.
 .It Fl l
 Check that any symbolic links which are to be placed in the package are
 relative to the current prefix.
@@ -333,11 +327,10 @@ 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
+This command is supported for compatibility only.
+It was formerly used to override
 .Cm @cwd
-for package creation but not extraction.
+during package creation.
 .It Cm @exec Ar command
 Execute
 .Ar command
diff --git a/pkgtools/pkg_install/files/create/pkg_create.cat1 b/pkgtools/pkg_install/files/create/pkg_create.cat1
index 4225245b693..03429d2267a 100644
--- a/pkgtools/pkg_install/files/create/pkg_create.cat1
+++ b/pkgtools/pkg_install/files/create/pkg_create.cat1
@@ -7,10 +7,9 @@ SSYYNNOOPPSSIISS
      ppkkgg__ccrreeaattee [--EEllOOUUVVvv] [--BB _b_u_i_l_d_-_i_n_f_o_-_f_i_l_e] [--bb _b_u_i_l_d_-_v_e_r_s_i_o_n_-_f_i_l_e]
                 [--CC _c_p_k_g_s] [--DD _d_i_s_p_l_a_y_f_i_l_e] [--FF _c_o_m_p_r_e_s_s_i_o_n] [--gg _g_r_o_u_p]
                 [--II _r_e_a_l_p_r_e_f_i_x] [--ii _i_s_c_r_i_p_t] [--KK _p_k_g___d_b_d_i_r] [--kk _d_s_c_r_i_p_t]
-                [--LL _S_r_c_D_i_r] [--nn _p_r_e_s_e_r_v_e_-_f_i_l_e] [--PP _d_p_k_g_s] [--TT _b_u_i_l_d_p_k_g_s]
-                [--pp _p_r_e_f_i_x] [--SS _s_i_z_e_-_a_l_l_-_f_i_l_e] [--ss _s_i_z_e_-_p_k_g_-_f_i_l_e]
-                [--tt _t_e_m_p_l_a_t_e] [--uu _o_w_n_e_r] --cc _c_o_m_m_e_n_t --dd _d_e_s_c_r_i_p_t_i_o_n --ff _p_a_c_k_l_i_s_t
-                _p_k_g_-_n_a_m_e
+                [--nn _p_r_e_s_e_r_v_e_-_f_i_l_e] [--PP _d_p_k_g_s] [--TT _b_u_i_l_d_p_k_g_s] [--pp _p_r_e_f_i_x]
+                [--SS _s_i_z_e_-_a_l_l_-_f_i_l_e] [--ss _s_i_z_e_-_p_k_g_-_f_i_l_e] [--tt _t_e_m_p_l_a_t_e] [--uu _o_w_n_e_r]
+                --cc _c_o_m_m_e_n_t --dd _d_e_s_c_r_i_p_t_i_o_n --ff _p_a_c_k_l_i_s_t _p_k_g_-_n_a_m_e
 
 DDEESSCCRRIIPPTTIIOONN
      The ppkkgg__ccrreeaattee command is used to create packages that will subsequently
@@ -96,10 +95,6 @@ OOPPTTIIOONNSS
              invoked automatically when the package is later (if ever) de-
              installed.
 
-     --LL _S_r_c_D_i_r
-             This sets the package's @src directive; see below for a descrip-
-             tion of what this does.
-
      --ll      Check that any symbolic links which are to be placed in the pack-
              age are relative to the current prefix.  This means using
              unlink(2) and symlink(2) to remove and re-link any symbolic links
@@ -179,9 +174,8 @@ PPAACCKKIINNGG LLIISSTT DDEETTAAIILLSS
              subsequent filenames will be assumed relative to this directory.
              Note: @@ccdd is also an alias for this command.
      @@ssrrcc _d_i_r_e_c_t_o_r_y
-             Set the internal directory pointer for _creation only_ to
-             _d_i_r_e_c_t_o_r_y.  That is to say that it overrides @@ccwwdd for package
-             creation but not extraction.
+             This command is supported for compatibility only.  It was for-
+             merly used to override @@ccwwdd during package creation.
      @@eexxeecc _c_o_m_m_a_n_d
              Execute _c_o_m_m_a_n_d as part of the unpacking process.  If _c_o_m_m_a_n_d
              contains any of the following sequences somewhere in it, they
@@ -285,4 +279,4 @@ AAUUTTHHOORRSS
              NetBSD wildcard dependency processing, pkgdb, pkg size recording
              etc.
 
-NetBSD 5.0                       May 13, 2009                       NetBSD 5.0
+NetBSD 5.0                     November 15, 2009                    NetBSD 5.0
diff --git a/pkgtools/pkg_install/files/create/pl.c b/pkgtools/pkg_install/files/create/pl.c
index 429d454b52e..cd01ceea6d9 100644
--- a/pkgtools/pkg_install/files/create/pl.c
+++ b/pkgtools/pkg_install/files/create/pl.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pl.c,v 1.13 2009/04/24 14:00:25 joerg Exp $	*/
+/*	$NetBSD: pl.c,v 1.14 2009/11/05 16:22:32 joerg Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -7,7 +7,7 @@
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: pl.c,v 1.13 2009/04/24 14:00:25 joerg Exp $");
+__RCSID("$NetBSD: pl.c,v 1.14 2009/11/05 16:22:32 joerg Exp $");
 
 /*
  * FreeBSD install - a package for the installation and maintainance
@@ -86,7 +86,6 @@ check_list(package_t *pkg, const char *PkgName)
 	char    target[MaxPathSize + SymlinkHeaderLen];
 	char    name[MaxPathSize];
 	char   *cwd = NULL;
-	char   *srcdir = NULL;
 	char   *pkgname = NULL;
 	int	cc;
 
@@ -105,9 +104,6 @@ check_list(package_t *pkg, const char *PkgName)
 		case PLIST_IGNORE:
 			p = p->next;
 			break;
-		case PLIST_SRC:
-			srcdir = p->name;
-			break;
 		case PLIST_PKGDIR:
 			if (cwd == NULL)
 				errx(2, "@pkgdir without preceding @cwd found");
diff --git a/pkgtools/pkg_install/files/lib/version.h b/pkgtools/pkg_install/files/lib/version.h
index 30c18a3b189..85f7ceb6e1d 100644
--- a/pkgtools/pkg_install/files/lib/version.h
+++ b/pkgtools/pkg_install/files/lib/version.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: version.h,v 1.142 2009/10/22 22:51:29 joerg Exp $	*/
+/*	$NetBSD: version.h,v 1.143 2009/11/05 16:22:32 joerg Exp $	*/
 
 /*
  * Copyright (c) 2001 Thomas Klausner.  All rights reserved.
@@ -27,6 +27,6 @@
 #ifndef _INST_LIB_VERSION_H_
 #define _INST_LIB_VERSION_H_
 
-#define PKGTOOLS_VERSION "20091022"
+#define PKGTOOLS_VERSION "20091115"
 
 #endif /* _INST_LIB_VERSION_H_ */