[pkgsrc/trunk]: pkgsrc define _PATH_DEFTAPE in nbcompat.h to avoid redefining...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2f3fe0707c5a
branches:  trunk
changeset: 461327:2f3fe0707c5a
user:      grant <grant%pkgsrc.org@localhost>
date:      Sun Sep 14 14:24:12 2003 +0000

description:
define _PATH_DEFTAPE in nbcompat.h to avoid redefining it when paths.h
is included.

diffstat:

 archivers/pax/files/config.h.in       |  10 ----------
 archivers/pax/files/configure         |   3 ---
 archivers/pax/files/configure.ac      |  10 ----------
 pkgtools/libnbcompat/files/nbcompat.h |  10 +++++++++-
 4 files changed, 9 insertions(+), 24 deletions(-)

diffs (73 lines):

diff -r 791f62f9be53 -r 2f3fe0707c5a archivers/pax/files/config.h.in
--- a/archivers/pax/files/config.h.in   Sun Sep 14 14:16:53 2003 +0000
+++ b/archivers/pax/files/config.h.in   Sun Sep 14 14:24:12 2003 +0000
@@ -86,13 +86,3 @@
 
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
-
-
-#ifndef _PATH_DEFTAPE
-# ifdef DEFTAPE
-#  define _PATH_DEFTAPE DEFTAPE
-# else
-#  define _PATH_DEFTAPE "/dev/tape"
-# endif /* DEFTAPE */
-#endif /* _PATH_DEFTAPE */
-
diff -r 791f62f9be53 -r 2f3fe0707c5a archivers/pax/files/configure
--- a/archivers/pax/files/configure     Sun Sep 14 14:16:53 2003 +0000
+++ b/archivers/pax/files/configure     Sun Sep 14 14:24:12 2003 +0000
@@ -3175,9 +3175,6 @@
 done
 
 
-
-
-
           ac_config_files="$ac_config_files Makefile"
 
 cat >confcache <<\_ACEOF
diff -r 791f62f9be53 -r 2f3fe0707c5a archivers/pax/files/configure.ac
--- a/archivers/pax/files/configure.ac  Sun Sep 14 14:16:53 2003 +0000
+++ b/archivers/pax/files/configure.ac  Sun Sep 14 14:24:12 2003 +0000
@@ -20,15 +20,5 @@
 # Checks for library functions.
 AC_CHECK_FUNCS([getrlimit setrlimit])
 
-AH_BOTTOM([
-#ifndef _PATH_DEFTAPE
-# ifdef DEFTAPE
-#  define _PATH_DEFTAPE DEFTAPE
-# else
-#  define _PATH_DEFTAPE "/dev/tape"
-# endif /* DEFTAPE */
-#endif /* _PATH_DEFTAPE */
-])
-
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff -r 791f62f9be53 -r 2f3fe0707c5a pkgtools/libnbcompat/files/nbcompat.h
--- a/pkgtools/libnbcompat/files/nbcompat.h     Sun Sep 14 14:16:53 2003 +0000
+++ b/pkgtools/libnbcompat/files/nbcompat.h     Sun Sep 14 14:24:12 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nbcompat.h,v 1.22 2003/09/14 14:10:17 grant Exp $      */
+/*     $NetBSD: nbcompat.h,v 1.23 2003/09/14 14:24:12 grant Exp $      */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -249,6 +249,14 @@
 #define _PATH_TMP      "/tmp/"
 #endif
 
+#ifndef _PATH_DEFTAPE
+# ifdef DEFTAPE
+#  define _PATH_DEFTAPE DEFTAPE
+# else
+#  define _PATH_DEFTAPE "/dev/tape"
+# endif /* DEFTAPE */
+#endif /* _PATH_DEFTAPE */
+
 typedef struct _stringlist {
        char    **sl_str;
        size_t    sl_max;