diff --git a/usr.sbin/pkg_install/Makefile.inc b/usr.sbin/pkg_install/Makefile.inc
index 2319244be560..715c75a43d75 100644
--- a/usr.sbin/pkg_install/Makefile.inc
+++ b/usr.sbin/pkg_install/Makefile.inc
@@ -1,20 +1,12 @@
-# $NetBSD: Makefile.inc,v 1.3 1997/10/17 12:03:44 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.4 1997/10/17 14:53:18 lukem Exp $
 # Original from Freebsd, no rcs id.
 
-WARNS?=	0
-
-# Figure out what to use for libinstall
-INSTALLLIBDIR=		${.CURDIR}/../lib
-
-.if exists(${INSTALLLIBDIR}/obj.${MACHINE})
-INSTALLOBJDIR=		${INSTALLLIBDIR}/obj.${MACHINE}
-.else
-.if exists(${INSTALLLIBDIR}/obj)
-INSTALLOBJDIR=		${INSTALLLIBDIR}/obj
-.else
-INSTALLOBJDIR=		${INSTALLLIBDIR}
-.endif
-.endif
+LIBINSTALL != cd ${.CURDIR}/../lib;\
+    printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
+CFLAGS+=-I${.CURDIR}/../lib
+CPPFLAGS+=${DEBUG}
+DPADD+=	${LIBINSTALL}/libinstall.a
+LDADD+=	-L${LIBINSTALL} -linstall
 
 .if exists(${.CURDIR}/../../Makefile.inc)
 .include "${.CURDIR}/../../Makefile.inc"
diff --git a/usr.sbin/pkg_install/add/Makefile b/usr.sbin/pkg_install/add/Makefile
index 95dd3bd0583d..b1abe2bfa7e7 100644
--- a/usr.sbin/pkg_install/add/Makefile
+++ b/usr.sbin/pkg_install/add/Makefile
@@ -1,13 +1,7 @@
-# $NetBSD: Makefile,v 1.3 1997/10/17 12:03:52 lukem Exp $
+# $NetBSD: Makefile,v 1.4 1997/10/17 14:53:27 lukem Exp $
 # Original from FreeBSD, no rcs id.
 
 PROG= pkg_add
-
-CFLAGS+=	${DEBUG} -I${.CURDIR}/../lib
-
-LDADD+=		-L${INSTALLOBJDIR} -linstall
-DPADD+=		${INSTALLOBJDIR}/libinstall.a
-
 SRCS= main.c perform.c futil.c extract.c
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/pkg_install/add/extract.c b/usr.sbin/pkg_install/add/extract.c
index 29e2839c8604..909a41075b6f 100644
--- a/usr.sbin/pkg_install/add/extract.c
+++ b/usr.sbin/pkg_install/add/extract.c
@@ -1,10 +1,11 @@
-/* $NetBSD: extract.c,v 1.5 1997/10/16 00:50:20 hubertf Exp $ */
+/*	$NetBSD: extract.c,v 1.6 1997/10/17 14:53:31 lukem Exp $	*/
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static const char *rcsid = "FreeBSD - Id: extract.c,v 1.17 1997/10/08 07:45:35 charnier Exp";
 #else
-static const char *rcsid = "$NetBSD: extract.c,v 1.5 1997/10/16 00:50:20 hubertf Exp $";
+__RCSID("$NetBSD: extract.c,v 1.6 1997/10/17 14:53:31 lukem Exp $");
 #endif
 #endif
 
@@ -226,6 +227,9 @@ extract_plist(char *home, Package *pkg)
 	case PLIST_IGNORE:
 	    p = p->next;
 	    break;
+
+	default:
+	    break;
 	}
 	p = p->next;
     }
diff --git a/usr.sbin/pkg_install/add/futil.c b/usr.sbin/pkg_install/add/futil.c
index 11b14aa747e9..545becce29c2 100644
--- a/usr.sbin/pkg_install/add/futil.c
+++ b/usr.sbin/pkg_install/add/futil.c
@@ -1,10 +1,11 @@
-/* $NetBSD: futil.c,v 1.3 1997/10/16 00:31:36 hubertf Exp $ */
+/*	$NetBSD: futil.c,v 1.4 1997/10/17 14:53:34 lukem Exp $	*/
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static const char *rcsid = "from FreeBSD Id: futil.c,v 1.7 1997/10/08 07:45:39 charnier Exp";
 #else
-static const char *rcsid = "$NetBSD: futil.c,v 1.3 1997/10/16 00:31:36 hubertf Exp $";
+__RCSID("$NetBSD: futil.c,v 1.4 1997/10/17 14:53:34 lukem Exp $");
 #endif
 #endif
 
diff --git a/usr.sbin/pkg_install/add/main.c b/usr.sbin/pkg_install/add/main.c
index e2e25e3c099d..2ceafbeb8854 100644
--- a/usr.sbin/pkg_install/add/main.c
+++ b/usr.sbin/pkg_install/add/main.c
@@ -1,10 +1,11 @@
-/* $NetBSD: main.c,v 1.3 1997/10/16 00:31:38 hubertf Exp $ */
+/*	$NetBSD: main.c,v 1.4 1997/10/17 14:53:37 lukem Exp $	*/
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char *rcsid = "from FreeBSD Id: main.c,v 1.16 1997/10/08 07:45:43 charnier Exp";
 #else
-static char *rcsid = "$NetBSD: main.c,v 1.3 1997/10/16 00:31:38 hubertf Exp $";
+__RCSID("$NetBSD: main.c,v 1.4 1997/10/17 14:53:37 lukem Exp $");
 #endif
 #endif
 
diff --git a/usr.sbin/pkg_install/add/perform.c b/usr.sbin/pkg_install/add/perform.c
index eb431f12029b..51e560e03279 100644
--- a/usr.sbin/pkg_install/add/perform.c
+++ b/usr.sbin/pkg_install/add/perform.c
@@ -1,10 +1,11 @@
-/* $NetBSD: perform.c,v 1.6 1997/10/16 00:55:01 hubertf Exp $ */
+/*	$NetBSD: perform.c,v 1.7 1997/10/17 14:53:40 lukem Exp $	*/
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.44 1997/10/13 15:03:46 jkh Exp";
 #else
-static const char *rcsid = "$NetBSD: perform.c,v 1.6 1997/10/16 00:55:01 hubertf Exp $";
+__RCSID("$NetBSD: perform.c,v 1.7 1997/10/17 14:53:40 lukem Exp $");
 #endif
 #endif
 
@@ -129,7 +130,8 @@ pkg_do(char *pkg)
 	    }
 	    Home = make_playpen(playpen, sb.st_size * 4);
 	    if (!Home)
-		warnx("unable to make playpen for %d bytes", sb.st_size * 4);
+		warnx("unable to make playpen for %ld bytes",
+		    (long)(sb.st_size * 4));
 	    where_to = Home;
 	    if (unpack(pkg_fullname, extract)) {
 		warnx(
@@ -180,9 +182,9 @@ pkg_do(char *pkg)
 	     */
 
 	    if (!inPlace && min_free(playpen) < sb.st_size * 4) {
-		warnx("projected size of %d exceeds available free space.\n"
+		warnx("projected size of %ld exceeds available free space.\n"
 "Please set your PKG_TMPDIR variable to point to a location with more\n"
-		       "free space and try again", sb.st_size * 4);
+		       "free space and try again", (long)(sb.st_size * 4));
 		warnx("not extracting %s\ninto %s, sorry!",
 			pkg_fullname, where_to);
 		goto bomb;
diff --git a/usr.sbin/pkg_install/create/Makefile b/usr.sbin/pkg_install/create/Makefile
index e72af175f4a1..1196886fa4f2 100644
--- a/usr.sbin/pkg_install/create/Makefile
+++ b/usr.sbin/pkg_install/create/Makefile
@@ -1,13 +1,7 @@
-# $NetBSD: Makefile,v 1.3 1997/10/17 12:03:57 lukem Exp $
+# $NetBSD: Makefile,v 1.4 1997/10/17 14:53:47 lukem Exp $
 # Original from FreeBSD, no rcs id.
 
 PROG= pkg_create
-
-CFLAGS+=	${DEBUG} -I${.CURDIR}/../lib
-
-LDADD+=		-L${INSTALLOBJDIR} -linstall
-DPADD+=		${INSTALLOBJDIR}/libinstall.a
-
 SRCS= main.c perform.c pl.c
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/pkg_install/create/main.c b/usr.sbin/pkg_install/create/main.c
index 109704bd9470..b5d7ffa52a4d 100644
--- a/usr.sbin/pkg_install/create/main.c
+++ b/usr.sbin/pkg_install/create/main.c
@@ -1,10 +1,11 @@
-/* $NetBSD: main.c,v 1.4 1997/10/16 00:50:31 hubertf Exp $ */
+/*	$NetBSD: main.c,v 1.5 1997/10/17 14:53:50 lukem 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
-static const char *rcsid = "$NetBSD: main.c,v 1.4 1997/10/16 00:50:31 hubertf Exp $";
+__RCSID("$NetBSD: main.c,v 1.5 1997/10/17 14:53:50 lukem Exp $");
 #endif
 #endif
 
diff --git a/usr.sbin/pkg_install/create/perform.c b/usr.sbin/pkg_install/create/perform.c
index 2c41292ca387..53db897a7237 100644
--- a/usr.sbin/pkg_install/create/perform.c
+++ b/usr.sbin/pkg_install/create/perform.c
@@ -1,10 +1,11 @@
-/* $NetBSD: perform.c,v 1.4 1997/10/16 00:50:34 hubertf Exp $ */
+/*	$NetBSD: perform.c,v 1.5 1997/10/17 14:53:52 lukem 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
-static const char *rcsid = "$NetBSD: perform.c,v 1.4 1997/10/16 00:50:34 hubertf Exp $";
+__RCSID("$NetBSD: perform.c,v 1.5 1997/10/17 14:53:52 lukem Exp $");
 #endif
 #endif
 
diff --git a/usr.sbin/pkg_install/create/pl.c b/usr.sbin/pkg_install/create/pl.c
index e6e02c834e84..ade2a2736992 100644
--- a/usr.sbin/pkg_install/create/pl.c
+++ b/usr.sbin/pkg_install/create/pl.c
@@ -1,10 +1,11 @@
-/* $NetBSD: pl.c,v 1.3 1997/10/16 00:31:58 hubertf Exp $ */
+/*	$NetBSD: pl.c,v 1.4 1997/10/17 14:53:55 lukem 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
-static const char *rcsid = "$NetBSD: pl.c,v 1.3 1997/10/16 00:31:58 hubertf Exp $";
+__RCSID("$NetBSD: pl.c,v 1.4 1997/10/17 14:53:55 lukem Exp $");
 #endif
 #endif
 
diff --git a/usr.sbin/pkg_install/delete/Makefile b/usr.sbin/pkg_install/delete/Makefile
index 14159ead8107..208fa3d6984a 100644
--- a/usr.sbin/pkg_install/delete/Makefile
+++ b/usr.sbin/pkg_install/delete/Makefile
@@ -1,12 +1,7 @@
-# $NetBSD: Makefile,v 1.3 1997/10/17 12:04:04 lukem Exp $
+# $NetBSD: Makefile,v 1.4 1997/10/17 14:53:59 lukem Exp $
 # Original from FreeBSD, no rcs id.
 
 PROG= pkg_delete
-CFLAGS+=	${DEBUG} -I${.CURDIR}/../lib
-
-LDADD+=		-L${INSTALLOBJDIR} -linstall
-DPADD+=		${INSTALLOBJDIR}/libinstall.a
-
 SRCS= main.c perform.c
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/pkg_install/delete/main.c b/usr.sbin/pkg_install/delete/main.c
index beb8d89a9ca7..590cf5a88e05 100644
--- a/usr.sbin/pkg_install/delete/main.c
+++ b/usr.sbin/pkg_install/delete/main.c
@@ -1,10 +1,11 @@
-/* $NetBSD: main.c,v 1.4 1997/10/16 00:32:02 hubertf Exp $ */
+/*	$NetBSD: main.c,v 1.5 1997/10/17 14:54:02 lukem Exp $	*/
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char *rcsid = "from FreeBSD Id: main.c,v 1.11 1997/10/08 07:46:48 charnier Exp";
 #else
-static char *rcsid = "$NetBSD: main.c,v 1.4 1997/10/16 00:32:02 hubertf Exp $";
+__RCSID("$NetBSD: main.c,v 1.5 1997/10/17 14:54:02 lukem Exp $");
 #endif
 #endif
 
diff --git a/usr.sbin/pkg_install/delete/perform.c b/usr.sbin/pkg_install/delete/perform.c
index 80a488d86698..8f301752127f 100644
--- a/usr.sbin/pkg_install/delete/perform.c
+++ b/usr.sbin/pkg_install/delete/perform.c
@@ -1,10 +1,11 @@
-/* $NetBSD: perform.c,v 1.3 1997/10/16 00:32:04 hubertf Exp $ */
+/*	$NetBSD: perform.c,v 1.4 1997/10/17 14:54:05 lukem Exp $	*/
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.15 1997/10/13 15:03:52 jkh Exp";
 #else
-static const char *rcsid = "$NetBSD: perform.c,v 1.3 1997/10/16 00:32:04 hubertf Exp $";
+__RCSID("$NetBSD: perform.c,v 1.4 1997/10/17 14:54:05 lukem Exp $");
 #endif
 #endif
 
diff --git a/usr.sbin/pkg_install/info/Makefile b/usr.sbin/pkg_install/info/Makefile
index 7624242eb4ce..7dc977f999be 100644
--- a/usr.sbin/pkg_install/info/Makefile
+++ b/usr.sbin/pkg_install/info/Makefile
@@ -1,12 +1,7 @@
-# $NetBSD: Makefile,v 1.3 1997/10/17 12:04:11 lukem Exp $
+# $NetBSD: Makefile,v 1.4 1997/10/17 14:54:09 lukem Exp $
 # Original from FreeBSD, no rcs id
 
 PROG= pkg_info
-CFLAGS+=	${DEBUG} -I${.CURDIR}/../lib
-
-LDADD+=		-L${INSTALLOBJDIR} -linstall
-DPADD+=		${INSTALLOBJDIR}/libinstall.a
-
 SRCS= main.c perform.c show.c
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/pkg_install/info/main.c b/usr.sbin/pkg_install/info/main.c
index aad44035ae14..5456e3b8d2df 100644
--- a/usr.sbin/pkg_install/info/main.c
+++ b/usr.sbin/pkg_install/info/main.c
@@ -1,10 +1,11 @@
-/* $NetBSD: main.c,v 1.3 1997/10/16 00:32:08 hubertf Exp $ */
+/*	$NetBSD: main.c,v 1.4 1997/10/17 14:54:13 lukem Exp $	*/
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char *rcsid = "from FreeBSD Id: main.c,v 1.14 1997/10/08 07:47:26 charnier Exp";
 #else
-static char *rcsid = "$NetBSD: main.c,v 1.3 1997/10/16 00:32:08 hubertf Exp $";
+__RCSID("$NetBSD: main.c,v 1.4 1997/10/17 14:54:13 lukem Exp $");
 #endif
 #endif
 
diff --git a/usr.sbin/pkg_install/info/perform.c b/usr.sbin/pkg_install/info/perform.c
index 38a155f0791a..1a9d2d972f89 100644
--- a/usr.sbin/pkg_install/info/perform.c
+++ b/usr.sbin/pkg_install/info/perform.c
@@ -1,10 +1,11 @@
-/* $NetBSD: perform.c,v 1.3 1997/10/16 00:32:09 hubertf Exp $ */
+/*	$NetBSD: perform.c,v 1.4 1997/10/17 14:54:17 lukem Exp $	*/
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.23 1997/10/13 15:03:53 jkh Exp";
 #else
-static const char *rcsid = "$NetBSD: perform.c,v 1.3 1997/10/16 00:32:09 hubertf Exp $";
+__RCSID("$NetBSD: perform.c,v 1.4 1997/10/17 14:54:17 lukem Exp $");
 #endif
 #endif
 
@@ -31,6 +32,7 @@ static const char *rcsid = "$NetBSD: perform.c,v 1.3 1997/10/16 00:32:09 hubertf
 #include "lib.h"
 #include "info.h"
 
+#include <err.h>
 #include <signal.h>
 
 static int pkg_do(char *);
diff --git a/usr.sbin/pkg_install/info/show.c b/usr.sbin/pkg_install/info/show.c
index 1d390b2bad5b..26a5802f1cc7 100644
--- a/usr.sbin/pkg_install/info/show.c
+++ b/usr.sbin/pkg_install/info/show.c
@@ -1,10 +1,11 @@
-/* $NetBSD: show.c,v 1.4 1997/10/16 00:32:12 hubertf Exp $ */
+/*	$NetBSD: show.c,v 1.5 1997/10/17 14:54:20 lukem 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
-static const char *rcsid = "$NetBSD: show.c,v 1.4 1997/10/16 00:32:12 hubertf Exp $";
+__RCSID("$NetBSD: show.c,v 1.5 1997/10/17 14:54:20 lukem Exp $");
 #endif
 #endif
 
@@ -28,6 +29,8 @@ static const char *rcsid = "$NetBSD: show.c,v 1.4 1997/10/16 00:32:12 hubertf Ex
  *
  */
 
+#include <err.h>
+
 #include "lib.h"
 #include "info.h"
 
@@ -198,6 +201,9 @@ show_files(char *title, Package *plist)
 	case PLIST_IGNORE:
 	    ign = TRUE;
 	    break;
+
+	default:
+	    break;
 	}
 	p = p->next;
     }
diff --git a/usr.sbin/pkg_install/lib/Makefile b/usr.sbin/pkg_install/lib/Makefile
index 7b67bbe8b097..13fbd3414885 100644
--- a/usr.sbin/pkg_install/lib/Makefile
+++ b/usr.sbin/pkg_install/lib/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 1997/06/05 20:43:28 thorpej Exp $
+# $NetBSD: Makefile,v 1.5 1997/10/17 14:54:24 lukem Exp $
 # Original from FreeBSD, no rcs id.
 
 LIB=		install
-CFLAGS+=	-I${.CURDIR} ${DEBUG}
 SRCS=		exec.c file.c global.c msg.c pen.c plist.c str.c
 SRCS+=		ftpio.c ftperr.c 
 CLEANFILES+=	ftperr.c
diff --git a/usr.sbin/pkg_install/lib/exec.c b/usr.sbin/pkg_install/lib/exec.c
index 40974c59b204..ff56d6a756d6 100644
--- a/usr.sbin/pkg_install/lib/exec.c
+++ b/usr.sbin/pkg_install/lib/exec.c
@@ -1,10 +1,11 @@
-/* $NetBSD: exec.c,v 1.3 1997/10/16 00:32:17 hubertf Exp $ */
+/*	$NetBSD: exec.c,v 1.4 1997/10/17 14:54:26 lukem Exp $	*/
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static const char *rcsid = "from FreeBSD Id: exec.c,v 1.6 1997/10/08 07:47:50 charnier Exp";
 #else
-static const char *rcsid = "$NetBSD: exec.c,v 1.3 1997/10/16 00:32:17 hubertf Exp $";
+__RCSID("$NetBSD: exec.c,v 1.4 1997/10/17 14:54:26 lukem Exp $");
 #endif
 #endif
 
diff --git a/usr.sbin/pkg_install/lib/file.c b/usr.sbin/pkg_install/lib/file.c
index 654a92448bd6..916eae9ad80d 100644
--- a/usr.sbin/pkg_install/lib/file.c
+++ b/usr.sbin/pkg_install/lib/file.c
@@ -1,10 +1,11 @@
-/* $NetBSD: file.c,v 1.5 1997/10/16 00:55:08 hubertf Exp $ */
+/*	$NetBSD: file.c,v 1.6 1997/10/17 14:54:29 lukem Exp $	*/
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static const char *rcsid = "from FreeBSD Id: file.c,v 1.29 1997/10/08 07:47:54 charnier Exp";
 #else
-static const char *rcsid = "$NetBSD: file.c,v 1.5 1997/10/16 00:55:08 hubertf Exp $";
+__RCSID("$NetBSD: file.c,v 1.6 1997/10/17 14:54:29 lukem Exp $");
 #endif
 #endif
 
diff --git a/usr.sbin/pkg_install/lib/ftpio.c b/usr.sbin/pkg_install/lib/ftpio.c
index cf47172e349f..72a0a3c8e76c 100644
--- a/usr.sbin/pkg_install/lib/ftpio.c
+++ b/usr.sbin/pkg_install/lib/ftpio.c
@@ -1,3 +1,8 @@
+/*	$NetBSD: ftpio.c,v 1.3 1997/10/17 14:54:32 lukem Exp $	*/
+#include <sys/cdefs.h>
+#ifndef lint
+__RCSID("$NetBSD: ftpio.c,v 1.3 1997/10/17 14:54:32 lukem Exp $");
+#endif
 /*
  * ----------------------------------------------------------------------------
  * "THE BEER-WARE LICENSE" (Revision 42):
@@ -15,7 +20,7 @@
  * `state' of FTP_t
  *
  * from FreeBSD Id: ftpio.c,v 1.25 1997/02/22 15:06:50 peter Exp
- * $NetBSD: ftpio.c,v 1.2 1997/06/05 12:59:48 agc Exp $
+ * $NetBSD: ftpio.c,v 1.3 1997/10/17 14:54:32 lukem Exp $
  *
  */
 
@@ -66,6 +71,7 @@ static int	get_url_info(char *url_in, char *host_ret, int *port_ret, char *name_
 static void	ftp_timeout(int sig);
 static void	ftp_set_timeout(void);
 static void	ftp_clear_timeout(void);
+int		networkInit(void);
 
 
 /* Global status variable - ick */
diff --git a/usr.sbin/pkg_install/lib/global.c b/usr.sbin/pkg_install/lib/global.c
index ea3f4c28a3c0..eae0b3d14b2e 100644
--- a/usr.sbin/pkg_install/lib/global.c
+++ b/usr.sbin/pkg_install/lib/global.c
@@ -1,10 +1,11 @@
-/* $NetBSD: global.c,v 1.3 1997/10/16 00:32:20 hubertf Exp $ */
+/*	$NetBSD: global.c,v 1.4 1997/10/17 14:54:35 lukem Exp $	*/
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static const char *rcsid = "from FreeBSD Id: global.c,v 1.6 1997/10/08 07:47:58 charnier Exp";
 #else
-static const char *rcsid = "$NetBSD: global.c,v 1.3 1997/10/16 00:32:20 hubertf Exp $";
+__RCSID("$NetBSD: global.c,v 1.4 1997/10/17 14:54:35 lukem Exp $");
 #endif
 #endif
 
diff --git a/usr.sbin/pkg_install/lib/lib.h b/usr.sbin/pkg_install/lib/lib.h
index 9d0cf395ee65..45d033a80f7e 100644
--- a/usr.sbin/pkg_install/lib/lib.h
+++ b/usr.sbin/pkg_install/lib/lib.h
@@ -1,4 +1,4 @@
-/* $NetBSD: lib.h,v 1.3 1997/10/16 00:32:22 hubertf Exp $ */
+/* $NetBSD: lib.h,v 1.4 1997/10/17 14:54:38 lukem Exp $ */
 
 /* from FreeBSD Id: lib.h,v 1.25 1997/10/08 07:48:03 charnier Exp */
 
@@ -135,6 +135,7 @@ char		*fileURLFilename(char *, char *, int);
 char		*fileURLHost(char *, char *, int);
 char		*fileFindByPath(char *, char *);
 char		*fileGetContents(char *);
+Boolean		make_preserve_name(char *, int, char *, char *);
 void		write_file(char *, char *);
 void		copy_file(char *, char *, char *);
 void		move_file(char *, char *, char *);
diff --git a/usr.sbin/pkg_install/lib/msg.c b/usr.sbin/pkg_install/lib/msg.c
index e47ca7a74cba..c3e500c53c35 100644
--- a/usr.sbin/pkg_install/lib/msg.c
+++ b/usr.sbin/pkg_install/lib/msg.c
@@ -1,10 +1,11 @@
-/* $NetBSD: msg.c,v 1.3 1997/10/16 00:32:24 hubertf Exp $ */
+/*	$NetBSD: msg.c,v 1.4 1997/10/17 14:54:41 lukem Exp $	*/
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static const char *rcsid = "from FreeBSD Id: msg.c,v 1.10 1997/10/13 15:03:55 jkh Exp";
 #else
-static const char *rcsid = "$NetBSD: msg.c,v 1.3 1997/10/16 00:32:24 hubertf Exp $";
+__RCSID("$NetBSD: msg.c,v 1.4 1997/10/17 14:54:41 lukem Exp $");
 #endif
 #endif
 
diff --git a/usr.sbin/pkg_install/lib/pen.c b/usr.sbin/pkg_install/lib/pen.c
index 6a53d4e0e07f..691308c73bee 100644
--- a/usr.sbin/pkg_install/lib/pen.c
+++ b/usr.sbin/pkg_install/lib/pen.c
@@ -1,10 +1,11 @@
-/* $NetBSD: pen.c,v 1.3 1997/10/16 00:32:26 hubertf Exp $ */
+/*	$NetBSD: pen.c,v 1.4 1997/10/17 14:54:46 lukem Exp $	*/
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static const char *rcsid = "from FreeBSD Id: pen.c,v 1.25 1997/10/08 07:48:12 charnier Exp";
 #else
-static const char *rcsid = "$NetBSD: pen.c,v 1.3 1997/10/16 00:32:26 hubertf Exp $";
+__RCSID("$NetBSD: pen.c,v 1.4 1997/10/17 14:54:46 lukem Exp $");
 #endif
 #endif
 
diff --git a/usr.sbin/pkg_install/lib/plist.c b/usr.sbin/pkg_install/lib/plist.c
index 8477afca595e..e5396bd3a994 100644
--- a/usr.sbin/pkg_install/lib/plist.c
+++ b/usr.sbin/pkg_install/lib/plist.c
@@ -1,10 +1,11 @@
-/* $NetBSD: plist.c,v 1.4 1997/10/16 00:50:46 hubertf Exp $ */
+/*	$NetBSD: plist.c,v 1.5 1997/10/17 14:54:47 lukem 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
-static const char *rcsid = "$NetBSD: plist.c,v 1.4 1997/10/16 00:50:46 hubertf Exp $";
+__RCSID("$NetBSD: plist.c,v 1.5 1997/10/17 14:54:47 lukem Exp $");
 #endif
 #endif
 
@@ -450,6 +451,8 @@ delete_package(Boolean ign_err, Boolean nukedirs, Package *pkg)
 	    }
 	    last_file = p->name;
 	    break;
+	default:
+	    break;
 	}
     }
     return fail;
diff --git a/usr.sbin/pkg_install/lib/str.c b/usr.sbin/pkg_install/lib/str.c
index 25551c0a7260..33b872e7e4f8 100644
--- a/usr.sbin/pkg_install/lib/str.c
+++ b/usr.sbin/pkg_install/lib/str.c
@@ -1,10 +1,11 @@
-/* $NetBSD: str.c,v 1.3 1997/10/16 00:32:30 hubertf Exp $ */
+/*	$NetBSD: str.c,v 1.4 1997/10/17 14:54:50 lukem Exp $	*/
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static const char *rcsid = "Id: str.c,v 1.5 1997/10/08 07:48:21 charnier Exp";
 #else
-static const char *rcsid = "$NetBSD: str.c,v 1.3 1997/10/16 00:32:30 hubertf Exp $";
+__RCSID("$NetBSD: str.c,v 1.4 1997/10/17 14:54:50 lukem Exp $");
 #endif
 #endif