 @@ -1,23 +1,23 @@
-/*	$NetBSD: main.c,v 1.23 2010/01/22 13:30:41 joerg Exp $	*/
+/*	$NetBSD: main.c,v 1.24 2010/01/30 20:09:34 joerg Exp $	*/
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: main.c,v 1.23 2010/01/22 13:30:41 joerg Exp $");
+__RCSID("$NetBSD: main.c,v 1.24 2010/01/30 20:09:34 joerg Exp $");
 /*
+ *
  * FreeBSD install - a package for the installation and maintainance
  * of non-core utilities.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -29,41 +29,42 @@ __RCSID("$NetBSD: main.c,v 1.23 2010/01/
  * This is the add module.
+ *
  */
 #if HAVE_ERR_H
 #include <err.h>
 #endif
 #if HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
 #include "lib.h"
 #include "add.h"
-static char Options[] = "AIK:LP:RVW:fhm:np:t:uvw:";
+static char Options[] = "AIK:LP:RVW:fhm:np:t:Uuvw:";
 char   *Destdir = NULL;
 char   *OverrideMachine = NULL;
 char   *Prefix = NULL;
 char   *View = NULL;
 char   *Viewbase = NULL;
 Boolean NoView = FALSE;
 Boolean NoInstall = FALSE;
 Boolean NoRecord = FALSE;
 Boolean Automatic = FALSE;
 Boolean ForceDepends = FALSE;
 int	LicenseCheck = 0;
 int     Replace = 0;
 int	ReplaceSame = 0;
 static void
 usage(void)
+{
 	(void) fprintf(stderr, "%s\n%s\n%s\n%s\n",
 	    "usage: pkg_add [-AfhILnRuVv] [-C config] [-P destdir] [-K pkg_dbdir]",
 	    "               [-m machine] [-p prefix] [-s verification-type",
 	    "               [-W viewbase] [-w view]\n",
 	    "               [[ftp|http]://[user[:password]@]host[:port]][/path/]pkg-name ...");
 	exit(1);
+}
 int
 @@ -110,26 +111,32 @@ main(int argc, char **argv)
 		case 'm':
 			OverrideMachine = optarg;
 			break;
 		case 'n':
 			Fake = TRUE;
 			Verbose = TRUE;
 			break;
 		case 'p':
 			Prefix = optarg;
 			break;
 		case 'U':
 			ReplaceSame = 1;
 			if (!Replace)
 				Replace = 1;
 			break;
 		case 'u':
 			Replace++;
 			break;
 		case 'V':
 			show_version();
 			/* NOTREACHED */
 		case 'v':
 			Verbose = TRUE;
 			break;
 		case 'W':

 @@ -1,22 +1,22 @@
-/*	$NetBSD: perform.c,v 1.92 2010/01/22 13:30:41 joerg Exp $	*/
+/*	$NetBSD: perform.c,v 1.93 2010/01/30 20:09:34 joerg Exp $	*/
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: perform.c,v 1.92 2010/01/22 13:30:41 joerg Exp $");
+__RCSID("$NetBSD: perform.c,v 1.93 2010/01/30 20:09:34 joerg Exp $");
 /*-
  * Copyright (c) 2003 Grant Beattie <grant@NetBSD.org>
  * Copyright (c) 2005 Dieter Baron <dillo@NetBSD.org>
  * Copyright (c) 2007 Roland Illig <rillig@NetBSD.org>
  * Copyright (c) 2008, 2009 Joerg Sonnenberger <joerg@NetBSD.org>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * 1. Redistributions of source code must retain the above copyright
 @@ -74,26 +74,27 @@ struct pkg_meta {
 	char *meta_preserve;
 	char *meta_views;
 	char *meta_installed_info;
 };
 struct pkg_task {
 	char *pkgname;
 	const char *prefix;
 	char *install_prefix;
 	char *logdir;
 	char *install_logdir;
 	char *install_logdir_real;
 	char *other_version;
 	package_t plist;
 	struct pkg_meta meta_data;
 	struct archive *archive;
 	struct archive_entry *entry;
 	char *buildinfo[BI_ENUM_COUNT];
 	size_t dep_length, dep_allocated;
 	char **dependencies;
 @@ -328,33 +329,47 @@ dup_value(const char *line, const char *
 	val = xmalloc(eol - key);
 	memcpy(val, key + 1, eol - key - 1);
 	val[eol - key - 1] = '\0';
 	return val;
+}
 static int
 check_already_installed(struct pkg_task *pkg)
+{
 	char *filename;
 	int fd;
 	if (Force)
-		return -1;
+		return 1;
 	filename = pkgdb_pkg_file(pkg->pkgname, CONTENTS_FNAME);
 	fd = open(filename, O_RDONLY);
 	free(filename);
 	if (fd == -1)
-		return -1;
+		return 1;
 	if (ReplaceSame) {
 		struct stat sb;
 		pkg->install_logdir_real = pkg->install_logdir;
 		pkg->install_logdir = xasprintf("%s.xxxxxx", pkg->install_logdir);
 		if (stat(pkg->install_logdir, &sb) == 0) {
 			warnx("package `%s' already has a temporary update "
 			    "directory `%s', remove it manually",
 			    pkg->pkgname, pkg->install_logdir);
 			return -1;
+		}
 		return 1;
+	}
 	/* We can only arrive here for explicitly requested packages. */
 	if (!Automatic && is_automatic_installed(pkg->pkgname)) {
 		if (Fake ||
 		    mark_as_automatic_installed(pkg->pkgname, 0) == 0)
 			warnx("package `%s' was already installed as "
 			      "dependency, now marked as installed "
 			      "manually", pkg->pkgname);
 	} else {
 		warnx("package `%s' already recorded as installed",
 		      pkg->pkgname);
+	}
 	close(fd);
 @@ -362,26 +377,31 @@ check_already_installed(struct pkg_task
+}
 static int
 check_other_installed(struct pkg_task *pkg)
+{
 	FILE *f, *f_pkg;
 	size_t len;
 	char *pkgbase, *iter, *filename;
 	package_t plist;
 	plist_t *p;
 	int status;
 	if (pkg->install_logdir_real) {
 		pkg->other_version = xstrdup(pkg->pkgname);
 		return 0;
+	}
 	pkgbase = xstrdup(pkg->pkgname);
 	if ((iter = strrchr(pkgbase, '-')) == NULL) {
 		free(pkgbase);
 		warnx("Invalid package name %s", pkg->pkgname);
 		return -1;
+	}
 	*iter = '\0';
 	pkg->other_version = find_best_matching_installed_pkg(pkgbase);
 	free(pkgbase);
 	if (pkg->other_version == NULL)
 		return 0;
 @@ -1100,27 +1120,27 @@ pkg_register_views(struct pkg_task *pkg)
 			(void *)NULL);
+}
 static int
 preserve_meta_data_file(struct pkg_task *pkg, const char *name)
+{
 	char *old_file, *new_file;
 	int rv;
 	if (Fake)
 		return 0;
 	old_file = pkgdb_pkg_file(pkg->other_version, name);
-	new_file = pkgdb_pkg_file(pkg->pkgname, name);
+	new_file = xasprintf("%s/%s", pkg->install_logdir, name);
 	rv = 0;
 	if (rename(old_file, new_file) == -1 && errno != ENOENT) {
 		warn("Can't move %s from %s to %s", name, old_file, new_file);
 		rv = -1;
+	}
 	free(old_file);
 	free(new_file);
 	return rv;
+}
 static int
 start_replacing(struct pkg_task *pkg)
+{
 @@ -1343,55 +1363,67 @@ pkg_do(const char *pkgpath, int mark_aut
 		tmpdir = getenv("TMPDIR");
 		if (tmpdir == NULL)
 			tmpdir = "/tmp";
 		free(pkg->install_logdir);
 		pkg->install_logdir = xasprintf("%s/pkg_install.XXXXXX", tmpdir);
 		/* XXX pkg_add -u... */
 		if (mkdtemp(pkg->install_logdir) == NULL) {
 			warn("mkdtemp failed");
 			goto clean_memory;
+		}
+	}
-	if (check_already_installed(pkg) == 0) {
+	switch (check_already_installed(pkg)) {
 	case 0:
 		status = 0;
 		goto clean_memory;
 	case 1:
 		break;
 	case -1:
 		goto clean_memory;
+	}
 	if (check_platform(pkg))
 		goto clean_memory;
 	if (check_other_installed(pkg))
 		goto clean_memory;
 	if (check_explicit_conflict(pkg))
 		goto clean_memory;
 	if (check_implicit_conflict(pkg))
 		goto clean_memory;
 	if (pkg->other_version != NULL) {
 		/*
 		 * Replacing an existing package.
 		 * Write meta-data, get rid of the old version,
 		 * install/update dependencies and finally extract.
 		 */
 		if (write_meta_data(pkg))
 			goto nuke_pkgdb;
 		if (start_replacing(pkg))
 			goto nuke_pkgdb;
 		if (pkg->install_logdir_real) {
 			rename(pkg->install_logdir, pkg->install_logdir_real);
 			free(pkg->install_logdir);
 			pkg->install_logdir = pkg->install_logdir_real;
 			pkg->install_logdir_real = NULL;
+		}
 		if (check_dependencies(pkg))
 			goto nuke_pkgdb;
 	} else {
 		/*
 		 * Normal installation.
 		 * Install/update dependencies first and
 		 * write the current package to disk afterwards.
 		 */
 		if (check_dependencies(pkg))
 			goto clean_memory;
 		if (write_meta_data(pkg))
 			goto nuke_pkgdb;
 @@ -1428,38 +1460,41 @@ nuke_pkg:
 	if (!Fake) {
 		if (pkg->other_version) {
 			warnx("Updating of %s to %s failed.",
 			    pkg->other_version, pkg->pkgname);
 			warnx("Remember to run pkg_admin rebuild-tree after fixing this.");
+		}
 		delete_package(FALSE, &pkg->plist, FALSE, Destdir);
+	}
 nuke_pkgdb:
 	if (!Fake) {
 		if (recursive_remove(pkg->install_logdir, 1))
 			warn("Couldn't remove %s", pkg->install_logdir);
 		free(pkg->install_logdir_real);
 		free(pkg->install_logdir);
 		free(pkg->logdir);
 		pkg->install_logdir_real = NULL;
 		pkg->install_logdir = NULL;
 		pkg->logdir = NULL;
+	}
 clean_memory:
 	if (pkg->logdir != NULL && NoRecord && !Fake) {
 		if (recursive_remove(pkg->install_logdir, 1))
 			warn("Couldn't remove %s", pkg->install_logdir);
+	}
 	free(pkg->install_prefix);
 	free(pkg->install_logdir_real);
 	free(pkg->install_logdir);
 	free(pkg->logdir);
 	free_buildinfo(pkg);
 	free_plist(&pkg->plist);
 	free_meta_data(pkg);
 	if (pkg->archive)
 		archive_read_finish(pkg->archive);
 	free(pkg->other_version);
 	free(pkg->pkgname);
 clean_find_archive:
 	free(pkg);
 	return status;
+}

 @@ -1,41 +1,41 @@
-.\" $NetBSD: pkg_add.1,v 1.41 2010/01/22 13:30:41 joerg Exp $
+.\" $NetBSD: pkg_add.1,v 1.42 2010/01/30 20:09:34 joerg Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintenance
 .\" of non-core utilities.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\" Jordan K. Hubbard
 .\"
 .\"
 .\"     @(#)pkg_add.1
 .\"
-.Dd January 22, 2010
+.Dd January 30, 2010
 .Dt PKG_ADD 1
 .Os
 .Sh NAME
 .Nm pkg_add
 .Nd a utility for installing and upgrading software package distributions
 .Sh SYNOPSIS
 .Nm
-.Op Fl AfILnRuVv
+.Op Fl AfILnRUuVv
 .Op Fl K Ar pkg_dbdir
 .Op Fl m Ar machine
 .Op Fl P Ar destdir
 .Op Fl p Ar prefix
 .Op Fl W Ar viewbase
 .Op Fl w Ar view
 .Ar Oo Oo Li ftp|http Oc Ns Li :// Ns Oo Ar user Oc Ns \
 Oo Li \&: Ns Ar password Oc \
 Ns Li @ Oc Ns Ar host Ns Oo Li \&: Ns Ar port Oc Ns \
 Oo Li / Ns Ar path/ Oc Ns Ar pkg-name ...
 .Sh DESCRIPTION
 The
 .Nm
 @@ -145,30 +145,33 @@ Prefix all file and directory names with
 .Ar destdir .
 For packages without install scripts this has the same behavior as
 using
 .Xr chroot 8 .
 .It Fl p Ar prefix
 Override the prefix stored in the package with
 .Ar prefix .
 .It Fl R
 Do not record the installation of a package.
 This implies
 .Fl I .
 This means that you cannot deinstall it later, so only use this option if
 you know what you are doing!
 .It Fl U
 Replace an already installed version from a package.
 Implies
 .Fl u .
 .It Fl u
 If the package that's being installed is already installed,
 an update is performed.
 It is currently not possible to update to an identical version.
 If this is specified twice, then any dependent packages that are
 too old will also be updated to fulfill the dependency.
 See below for a more detailed description of the process.
 .It Fl V
 Print version number and exit.
 .It Fl v
 Turn on verbose output.
 .It Fl W Ar viewbase
 Passed down to
 .Xr pkg_view 1
 for managed views.
 .It Fl w Ar view
 Passed down to

 @@ -1,14 +1,14 @@
-/*	$NetBSD: version.h,v 1.147 2010/01/26 15:48:13 joerg Exp $	*/
+/*	$NetBSD: version.h,v 1.148 2010/01/30 20:09:34 joerg Exp $	*/
 /*
  * Copyright (c) 2001 Thomas Klausner.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -17,16 +17,16 @@
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef _INST_LIB_VERSION_H_
 #define _INST_LIB_VERSION_H_
-#define PKGTOOLS_VERSION "20100126"
+#define PKGTOOLS_VERSION "20100130"
 #endif /* _INST_LIB_VERSION_H_ */

 @@ -1,14 +1,14 @@
-/* $NetBSD: add.h,v 1.17 2010/01/22 13:30:41 joerg Exp $ */
+/* $NetBSD: add.h,v 1.18 2010/01/30 20:09:34 joerg Exp $ */
 /* from FreeBSD Id: add.h,v 1.8 1997/02/22 16:09:15 peter Exp  */
 /*
  * FreeBSD install - a package for the installation and maintainance
  * of non-core utilities.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -27,22 +27,23 @@
 extern char *Destdir;
 extern char *OverrideMachine;
 extern char *Prefix;
 extern char *View;
 extern char *Viewbase;
 extern Boolean NoView;
 extern Boolean NoInstall;
 extern Boolean NoRecord;
 extern Boolean Force;
 extern Boolean Automatic;
 extern int LicenseCheck;
 extern int Replace;
 extern int ReplaceSame;
 extern Boolean ForceDepends;
 int     make_hierarchy(char *);
 void    apply_perms(char *, char **, int);
 int     pkg_perform(lpkg_head_t *);
 #endif				/* _INST_ADD_H_INCLUDE */