 @@ -1,23 +1,22 @@
-# $NetBSD: Makefile,v 1.197 2013/06/05 18:20:55 riastradh Exp $
+# $NetBSD: Makefile,v 1.198 2013/09/02 10:28:44 jperkin Exp $
 # Notes to package maintainers:
+#
 # Updating this package does not automatically necessitate bumping
 # PKGTOOLS_REQD in bsd.pkg.mk. Do so if and only if there is a critical
 # change in the pkg_* tools that pkgsrc relies on for proper operation.
 DISTNAME=		pkg_install-${VERSION}
 PKGREVISION=		1
 CATEGORIES=		pkgtools
 MASTER_SITES=		# empty
 DISTFILES=		# empty
 MAINTAINER=		agc@NetBSD.org
 HOMEPAGE=		http://www.pkgsrc.org/
 COMMENT=		Package management and administration tools for pkgsrc
 LICENSE=		modified-bsd
 BOOTSTRAP_PKG=	yes
 SKIP_LICENSE_CHECK=	yes
 CONFLICTS+=		audit-packages-[0-9]*

 @@ -1,22 +1,22 @@
-/*	$NetBSD: perform.c,v 1.104 2013/08/21 11:46:02 jperkin Exp $	*/
+/*	$NetBSD: perform.c,v 1.105 2013/09/02 10:28:44 jperkin 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.104 2013/08/21 11:46:02 jperkin Exp $");
+__RCSID("$NetBSD: perform.c,v 1.105 2013/09/02 10:28:44 jperkin 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>
  * Copyright (c) 2010 Thomas Klausner <wiz@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:
+ *
 @@ -403,29 +403,26 @@ check_already_installed(struct pkg_task
 		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;
+	}
 	if (Force)
 		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);
+	}
 	return 0;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: version.h,v 1.165 2013/01/31 10:25:30 wiz Exp $	*/
+/*	$NetBSD: version.h,v 1.166 2013/09/02 10:28:44 jperkin 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 20130131
+#define PKGTOOLS_VERSION 20130902
 #endif /* _INST_LIB_VERSION_H_ */