diff options
| author | sjg <sjg> | 2005-12-02 00:14:56 +0000 |
|---|---|---|
| committer | sjg <sjg> | 2005-12-02 00:14:56 +0000 |
| commit | eb298668fe1e451b78a2b9694b26b5068e10a645 (patch) | |
| tree | 348c930f342fd4b05becc55cd349eda9463a952f /devel/bmake/files | |
| parent | 8eee74383112008f0d2f337e097e2d1efc9d2689 (diff) | |
| download | pkgsrc-eb298668fe1e451b78a2b9694b26b5068e10a645.tar.gz | |
Actually import the bmake src into files, and apply pkgsrc patches.
Also provide an import script to help keep imports consistent.
Diffstat (limited to 'devel/bmake/files')
| -rw-r--r-- | devel/bmake/files/var.c | 15 |
1 files changed, 12 insertions, 3 deletions
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> |