[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install Obey CPPFLAGS.

[tv <tv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2303b3269f78
branches:  trunk
changeset: 471531:2303b3269f78
user:      tv <tv%pkgsrc.org@localhost>
date:      Mon Mar 29 02:24:11 2004 +0000

description:
Obey CPPFLAGS.

diffstat:

 pkgtools/pkg_install/Makefile            |  5 +++--
 pkgtools/pkg_install/files/add/perform.c |  8 ++++++--
 pkgtools/pkg_install/files/delete/main.c |  6 ++++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diffs (81 lines):

diff -r 6c072df4bb4b -r 2303b3269f78 pkgtools/pkg_install/Makefile
--- a/pkgtools/pkg_install/Makefile     Mon Mar 29 02:22:32 2004 +0000
+++ b/pkgtools/pkg_install/Makefile     Mon Mar 29 02:24:11 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.98 2004/03/28 02:26:42 grant Exp $
+# $NetBSD: Makefile,v 1.99 2004/03/29 02:24:11 tv Exp $
 
 # Notes to package maintainers:
 #
@@ -69,7 +69,8 @@
        @${CP} -Rp ${FILESDIR} ${WRKSRC}
 
 pre-configure:
-       cd ${LIBNBCOMPAT_SRCDIR} && ${SETENV} CC="${CC}" ./configure && \
+       cd ${LIBNBCOMPAT_SRCDIR} && ${SETENV}                           \
+               CC="${CC}" CPPFLAGS="${CPPFLAGS:M*}" ./configure &&     \
                ${MAKE_PROGRAM}
 
 post-install:
diff -r 6c072df4bb4b -r 2303b3269f78 pkgtools/pkg_install/files/add/perform.c
--- a/pkgtools/pkg_install/files/add/perform.c  Mon Mar 29 02:22:32 2004 +0000
+++ b/pkgtools/pkg_install/files/add/perform.c  Mon Mar 29 02:24:11 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: perform.c,v 1.15 2004/01/14 23:55:29 jlam Exp $        */
+/*     $NetBSD: perform.c,v 1.16 2004/03/29 02:24:11 tv Exp $  */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -11,7 +11,7 @@
 #if 0
 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.44 1997/10/13 15:03:46 jkh Exp";
 #else
-__RCSID("$NetBSD: perform.c,v 1.15 2004/01/14 23:55:29 jlam Exp $");
+__RCSID("$NetBSD: perform.c,v 1.16 2004/03/29 02:24:11 tv Exp $");
 #endif
 #endif
 
@@ -720,9 +720,13 @@
        if (!NoRecord && !Fake) {
                char    contents[FILENAME_MAX];
 
+#ifdef __INTERIX
+               umask(002);
+#else
                umask(022);
                if (getuid() != 0)
                        warnx("not running as root - trying to record install anyway");
+#endif
                if (!PkgName) {
                        warnx("no package name! can't record package, sorry");
                        errc = 1;
diff -r 6c072df4bb4b -r 2303b3269f78 pkgtools/pkg_install/files/delete/main.c
--- a/pkgtools/pkg_install/files/delete/main.c  Mon Mar 29 02:22:32 2004 +0000
+++ b/pkgtools/pkg_install/files/delete/main.c  Mon Mar 29 02:24:11 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.10 2004/01/14 23:55:29 jlam Exp $   */
+/*     $NetBSD: main.c,v 1.11 2004/03/29 02:24:11 tv Exp $     */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -11,7 +11,7 @@
 #if 0
 static char *rcsid = "from FreeBSD Id: main.c,v 1.11 1997/10/08 07:46:48 charnier Exp";
 #else
-__RCSID("$NetBSD: main.c,v 1.10 2004/01/14 23:55:29 jlam Exp $");
+__RCSID("$NetBSD: main.c,v 1.11 2004/03/29 02:24:11 tv Exp $");
 #endif
 #endif
 
@@ -184,9 +184,11 @@
                warnx("missing package name(s)");
                usage();
        }
+#ifndef __INTERIX
        if (!Fake && getuid() != 0) {
                warnx("not running as root - trying to delete anyways");
        }
+#endif
        if (OnlyDeleteFromPkgDB) {
                /* Only delete the given packages' files from pkgdb, do not
                 * touch the pkg itself. Used by "make reinstall" in