Lots of misc tweaks, support for arbitrary separators in pkg_info, more

intelligent name handling in pkg_create.  Most of these files are changed
because of rcsid's being different in my cvs tree and freefall's (foo).

6 files changed, 15 insertions, 7 deletions

diff --git a/usr.sbin/pkg_install/create/Makefile b/usr.sbin/pkg_install/create/Makefile
index 01e6b20..795ec24 100644
--- a/usr.sbin/pkg_install/create/Makefile
+++ b/usr.sbin/pkg_install/create/Makefile
@@ -1,6 +1,6 @@
 PROG= pkg_create
 
-CFLAGS+=	-I${.CURDIR}/../lib
+CFLAGS+=	${DEBUG} -I${.CURDIR}/../lib
 LDADD+=		-L${.CURDIR}/../lib -linstall
 
 SRCS= main.c perform.c pl.c
diff --git a/usr.sbin/pkg_install/create/create.h b/usr.sbin/pkg_install/create/create.h
index 2e1e73c..4db51db 100644
--- a/usr.sbin/pkg_install/create/create.h
+++ b/usr.sbin/pkg_install/create/create.h
@@ -1,4 +1,4 @@
-/* $Id: create.h,v 1.3 1993/08/24 09:23:32 jkh Exp $ */
+/* $Id: create.h,v 1.4 1993/09/04 05:06:32 jkh Exp $ */
 
 /*
  * FreeBSD install - a package for the installation and maintainance
diff --git a/usr.sbin/pkg_install/create/main.c b/usr.sbin/pkg_install/create/main.c
index 63f6699..4697c6f 100644
--- a/usr.sbin/pkg_install/create/main.c
+++ b/usr.sbin/pkg_install/create/main.c
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char *rcsid = "$Id: main.c,v 1.3 1993/08/20 08:52:39 jkh Exp $";
+static const char *rcsid = "$Id: main.c,v 1.4 1993/09/04 05:06:33 jkh Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pkg_install/create/perform.c b/usr.sbin/pkg_install/create/perform.c
index 634188b..91102a0 100644
--- a/usr.sbin/pkg_install/create/perform.c
+++ b/usr.sbin/pkg_install/create/perform.c
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char *rcsid = "$Id: perform.c,v 1.4 1993/08/26 08:12:52 jkh Exp $";
+static const char *rcsid = "$Id: perform.c,v 1.5 1993/09/04 05:06:33 jkh Exp $";
 #endif
 
 /*
@@ -62,14 +62,19 @@ pkg_perform(char **pkgs)
     else
 	suffix = "tgz";
 
-    /* Register the package name (base part) */
-    add_plist(&plist, PLIST_NAME, pkg);
     if (Prefix)
 	add_plist(&plist, PLIST_CWD, Prefix);
 
     /* Slurp in the packing list */
     read_plist(&plist, pkg_in);
 
+    /*
+     * Run down the list and see if we've named it, if not stick in a name
+     * at the top.
+     */
+    if (!in_plist(&plist, PLIST_NAME))
+	add_plist_top(&plist, PLIST_NAME, pkg);
+
     /* Make a directory to stomp around in */
     home = make_playpen();
     signal(SIGINT, cleanup);
diff --git a/usr.sbin/pkg_install/create/pkg_create.1 b/usr.sbin/pkg_install/create/pkg_create.1
index dd0e967..6822065 100644
--- a/usr.sbin/pkg_install/create/pkg_create.1
+++ b/usr.sbin/pkg_install/create/pkg_create.1
@@ -121,6 +121,9 @@ in the packing list. Briefly described, these sequences are:
 Sets the internal directory pointer to point to
 .I directory.
 All subsequent filenames will be assumed relative to this directory.
+Note:
+.BI @cd
+is also an alias for this command.
 .TP
 .BI "@exec\ " command
 Execute
diff --git a/usr.sbin/pkg_install/create/pl.c b/usr.sbin/pkg_install/create/pl.c
index 3b9a2d0..e1b6e36 100644
--- a/usr.sbin/pkg_install/create/pl.c
+++ b/usr.sbin/pkg_install/create/pl.c
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char *rcsid = "$Id: pl.c,v 1.4 1993/08/26 08:12:53 jkh Exp $";
+static const char *rcsid = "$Id: pl.c,v 1.5 1993/09/04 05:06:34 jkh Exp $";
 #endif
 
 /*