Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2014Q1

Browse Source
This commit is contained in:
Lionel Sambuc
2014-04-17 16:38:45 +02:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgtools/pkg_install/files/add/Makefile.in
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile.in,v 1.27 2012/10/21 09:08:56 joerg Exp $
# $NetBSD: Makefile.in,v 1.28 2013/09/12 11:03:10 jperkin Exp $
srcdir= @srcdir@
@@ -50,5 +50,9 @@ install:
$(INSTALL) -m 444 $(PROG).1 ${DESTDIR}$(man1dir)/$(PROG).1
.if defined(MANINSTALL) && !empty(MANINSTALL:Mcatinstall)
$(INSTALL) -m 755 -d ${DESTDIR}$(cat1dir)
. if defined(CATMAN_SECTION_SUFFIX) && !empty(CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss])
$(INSTALL) -m 444 $(PROG).cat ${DESTDIR}$(cat1dir)/$(PROG).1
. else
$(INSTALL) -m 444 $(PROG).cat ${DESTDIR}$(cat1dir)/$(PROG).0
. endif
.endif

8
pkgtools/pkg_install/files/add/perform.c
View File

@@ -1,4 +1,4 @@
/* $NetBSD: perform.c,v 1.103 2013/01/31 10:25:30 wiz Exp $ */
/* $NetBSD: perform.c,v 1.105 2013/09/02 10:28:44 jperkin Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
#endif
@@ -6,7 +6,7 @@
#if HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
#endif
__RCSID("$NetBSD: perform.c,v 1.103 2013/01/31 10:25:30 wiz Exp $");
__RCSID("$NetBSD: perform.c,v 1.105 2013/09/02 10:28:44 jperkin Exp $");
/*-
* Copyright (c) 2003 Grant Beattie <grant@NetBSD.org>
@@ -413,9 +413,6 @@ check_already_installed(struct pkg_task *pkg)
return 1;
}
if (Force)
return 1;
/* We can only arrive here for explicitly requested packages. */
if (!Automatic && is_automatic_installed(pkg->pkgname)) {
if (Fake ||
@@ -1559,6 +1556,7 @@ nuke_pkg:
nuke_pkgdb:
if (!Fake) {
(void) remove_files(pkg->install_logdir, "+*");
if (recursive_remove(pkg->install_logdir, 1))
warn("Couldn't remove %s", pkg->install_logdir);
free(pkg->install_logdir_real);