Fix the version number of the package in the configure script, and modify

the Makefiles so that they can be built by really basic make programs.
Move the awk script in the Makefile into a separate file for clarity, and
so that really basick make programs won't choke on the continuation lines.

4 files changed, 38 insertions, 32 deletions

diff --git a/pkgtools/libnbcompat/files/Makefile.in b/pkgtools/libnbcompat/files/Makefile.in
index 4f3ac1e8421..0ac426a02cf 100644
--- a/pkgtools/libnbcompat/files/Makefile.in
+++ b/pkgtools/libnbcompat/files/Makefile.in
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.25 2004/08/16 17:24:56 jlam Exp $
+# $NetBSD: Makefile.in,v 1.26 2004/08/21 06:36:13 jlam Exp $
 #
 
 srcdir=		@srcdir@
@@ -54,8 +54,6 @@ OBJS=		glob.o @LIBOBJS@
 LINK=		$(CCLD) $(CFLAGS) $(LDFLAGS) -o $@
 COMPILE=	$(CC) $(CPPFLAGS) $(CFLAGS)
 
-.PHONY: all install clean distclean
-
 all: nbcompat/nbtypes.h nbcompat/nbconfig.h $(LIB)
 
 .c.o: nbcompat/nbtypes.h
@@ -65,24 +63,8 @@ $(LIB): $(OBJS)
 	$(AR) cr $@ $(OBJS)
 	$(RANLIB) $@
 
-nbcompat/nbconfig.h: nbcompat/config.h
-	$(AWK) '							\
-		BEGIN { process = 1 }					\
-		/NBCOMPAT template section follows\./ { process = 0 }	\
-		/^\#[ 	]*define[ 	]+PACKAGE_.*/ { next }		\
-		/^\#[ 	]*define[ 	]+/ {				\
-			if (process == 1) {				\
-				guard = $$0;				\
-				sub("^#[ 	]*define[ 	]+", "", guard); \
-				sub("[ 	]+.*", "", guard);		\
-				print "#ifndef " guard;			\
-				print $$0;				\
-				print "#endif";				\
-				next;					\
-			}						\
-		}							\
-		{ print }						\
-	' nbcompat/config.h > $@
+nbcompat/nbconfig.h: nbcompat/config.h nbcompat.awk
+	$(AWK) -f nbcompat.awk nbcompat/config.h > $@
 
 nbcompat/nbtypes.h: bits
 	./bits $@
diff --git a/pkgtools/libnbcompat/files/configure b/pkgtools/libnbcompat/files/configure
index 8813813c888..e72df39d5e8 100755
--- a/pkgtools/libnbcompat/files/configure
+++ b/pkgtools/libnbcompat/files/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for libnbcompat 20030916.
+# Generated by GNU Autoconf 2.59 for libnbcompat 20040814.
 #
 # Report bugs to <grant@NetBSD.org>.
 #
@@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='libnbcompat'
 PACKAGE_TARNAME='libnbcompat'
-PACKAGE_VERSION='20030916'
-PACKAGE_STRING='libnbcompat 20030916'
+PACKAGE_VERSION='20040814'
+PACKAGE_STRING='libnbcompat 20040814'
 PACKAGE_BUGREPORT='grant@NetBSD.org'
 
 # Factoring default headers for most tests.
@@ -779,7 +779,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libnbcompat 20030916 to adapt to many kinds of systems.
+\`configure' configures libnbcompat 20040814 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -845,7 +845,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libnbcompat 20030916:";;
+     short | recursive ) echo "Configuration of libnbcompat 20040814:";;
    esac
   cat <<\_ACEOF
 
@@ -957,7 +957,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-libnbcompat configure 20030916
+libnbcompat configure 20040814
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -971,7 +971,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libnbcompat $as_me 20030916, which was
+It was created by libnbcompat $as_me 20040814, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -10912,7 +10912,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by libnbcompat $as_me 20030916, which was
+This file was extended by libnbcompat $as_me 20040814, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -10972,7 +10972,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-libnbcompat config.status 20030916
+libnbcompat config.status 20040814
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/pkgtools/libnbcompat/files/configure.ac b/pkgtools/libnbcompat/files/configure.ac
index 74288e0258c..a7721a6dc91 100644
--- a/pkgtools/libnbcompat/files/configure.ac
+++ b/pkgtools/libnbcompat/files/configure.ac
@@ -1,8 +1,8 @@
-dnl $NetBSD: configure.ac,v 1.47 2004/08/16 17:24:56 jlam Exp $
+dnl $NetBSD: configure.ac,v 1.48 2004/08/21 06:36:13 jlam Exp $
 
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
-AC_INIT([libnbcompat], [20030916], [grant@NetBSD.org])
+AC_INIT([libnbcompat], [20040814], [grant@NetBSD.org])
 AC_CONFIG_HEADER(nbcompat/config.h)
 AC_ARG_PROGRAM
 
diff --git a/pkgtools/libnbcompat/files/nbcompat.awk b/pkgtools/libnbcompat/files/nbcompat.awk
new file mode 100644
index 00000000000..147739009bc
--- /dev/null
+++ b/pkgtools/libnbcompat/files/nbcompat.awk
@@ -0,0 +1,24 @@
+BEGIN { process = 1 }
+
+/NBCOMPAT template section follows\./ { process = 0 }
+
+/^\#[ 	]*define[ 	]+PACKAGE_.*/ {
+	if (process == 0)
+		next;
+	print "/* " $0 " */";
+	next;
+}
+
+/^\#[ 	]*define[ 	]+/ {
+	if (process == 0)
+		next;
+	guard = $0;
+	sub("^#[ 	]*define[ 	]+", "", guard);
+	sub("[ 	]+.*", "", guard);
+	print "#ifndef " guard;
+	print $0;
+	print "#endif";
+	next;
+}
+
+{ print }