Actually import the bmake src into files, and apply pkgsrc patches.

Also provide an import script to help keep imports consistent.

4 files changed, 36 insertions, 27 deletions

diff --git a/devel/bmake/distinfo b/devel/bmake/distinfo
index 9874a66859c..a8183bbc57b 100644
--- a/devel/bmake/distinfo
+++ b/devel/bmake/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.21 2005/11/01 00:07:20 reed Exp $
+$NetBSD: distinfo,v 1.22 2005/12/02 00:14:56 sjg Exp $
 
 SHA1 (bmake-20050901.tar.gz) = 167e9d637030d4125907b943a3e08d7976018e4f
 RMD160 (bmake-20050901.tar.gz) = e77305eead0fec601c0436158d4dc81a8fd7dd0e
 Size (bmake-20050901.tar.gz) = 343100 bytes
-SHA1 (patch-aa) = 32df79c50ee516f3ec7c006f5c38fad11b909a82
-SHA1 (patch-ab) = 47c40c6af0746d61ea567b55ebd4e0298051663c
diff --git a/devel/bmake/files/var.c b/devel/bmake/files/var.c
index ead8dbaac59..16f97def0f2 100644
--- a/devel/bmake/files/var.c
+++ b/devel/bmake/files/var.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: var.c,v 1.1.1.1 2005/12/02 00:03:00 sjg Exp $	*/
+/*	$NetBSD: var.c,v 1.2 2005/12/02 00:14:56 sjg Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.1.1.1 2005/12/02 00:03:00 sjg Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.2 2005/12/02 00:14:56 sjg Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)var.c	8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: var.c,v 1.1.1.1 2005/12/02 00:03:00 sjg Exp $");
+__RCSID("$NetBSD: var.c,v 1.2 2005/12/02 00:14:56 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -125,7 +125,16 @@ __RCSID("$NetBSD: var.c,v 1.1.1.1 2005/12/02 00:03:00 sjg Exp $");
 
 #ifndef NO_REGEX
 #include    <sys/types.h>
+#include    <nbcompat/nbconfig.h>
+/* bmake supplies its own <sys/cdefs.h> so this header is always present. */
+#ifndef HAVE_SYS_CDEFS_H
+#define HAVE_SYS_CDEFS_H 1
+#endif
+#if HAVE_REGEX_H
 #include    <regex.h>
+#else
+#include    <nbcompat/regex.h>
+#endif
 #endif
 #include    <ctype.h>
 #include    <stdlib.h>
diff --git a/devel/bmake/import-bmake-sh b/devel/bmake/import-bmake-sh
new file mode 100755
index 00000000000..1e03866d94c
--- /dev/null
+++ b/devel/bmake/import-bmake-sh
@@ -0,0 +1,23 @@
+:
+# $Id: import-bmake-sh,v 1.1 2005/12/02 00:14:56 sjg Exp $
+
+# Nice and simple, but make sure it is done consistently...
+# Simply unpack bmake-<version>.tar.gz 
+# cd bmake
+# then run this script.
+
+[ -s make-conf.h -a ! -d CVS ] || {
+    echo "Must be in top level dir of bmake distribution" >&2
+    exit 1
+}
+
+# what version are we importing
+eval `sed -n "/^[A-Z]*AKE_VER/s/^\([A-Z][A-Z_]*\)[ :=][ :=]*\([^ ][^ ]*\).*/\1='\2'/p" Makefile.in`
+version=`eval echo $MAKE_VERSION`
+version_tag=`echo $version | tr '.' '-'`
+
+CVSROOT=cvs.netbsd.org:/cvsroot
+set -x
+$ECHO ${CVS:-cvs} -d $CVSROOT import -m "Import $version" \
+	pkgsrc/devel/bmake/files BMAKE $version_tag
+
diff --git a/devel/bmake/patches/patch-aa b/devel/bmake/patches/patch-aa
deleted file mode 100644
index bec4827bf74..00000000000
--- a/devel/bmake/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2005/10/31 21:34:24 reed Exp $
-
---- bmake/var.c	2005-09-03 15:15:09.000000000 -0700
-+++ var.c	2005-09-16 16:48:52.000000000 -0700
-@@ -125,7 +125,16 @@
- 
- #ifndef NO_REGEX
- #include    <sys/types.h>
-+#include    <nbcompat/nbconfig.h>
-+/* bmake supplies its own <sys/cdefs.h> so this header is always present. */
-+#ifndef HAVE_SYS_CDEFS_H
-+#define HAVE_SYS_CDEFS_H 1
-+#endif
-+#if HAVE_REGEX_H
- #include    <regex.h>
-+#else
-+#include    <nbcompat/regex.h>
-+#endif
- #endif
- #include    <ctype.h>
- #include    <stdlib.h>