diff options
author | sjg <sjg@FreeBSD.org> | 2014-05-27 18:39:13 +0000 |
---|---|---|
committer | sjg <sjg@FreeBSD.org> | 2014-05-27 18:39:13 +0000 |
commit | 27d4724b6a3279533f195583219df0d3e3d3671f (patch) | |
tree | c2540bd9262da493cc158d7750ec8ebae1b750ca | |
parent | 6e9f44d85dad21da8c6577e0002adfb2868fa16e (diff) | |
download | FreeBSD-src-27d4724b6a3279533f195583219df0d3e3d3671f.zip FreeBSD-src-27d4724b6a3279533f195583219df0d3e3d3671f.tar.gz |
Portmgr no longer need the UL hack.
Reviewed by: obrien
-rw-r--r-- | contrib/bmake/var.c | 46 |
1 files changed, 1 insertions, 45 deletions
diff --git a/contrib/bmake/var.c b/contrib/bmake/var.c index dd911f9..ef71a81 100644 --- a/contrib/bmake/var.c +++ b/contrib/bmake/var.c @@ -141,17 +141,6 @@ __RCSID("$NetBSD: var.c,v 1.184 2013/09/04 15:38:26 sjg Exp $"); extern int makelevel; /* - * XXX transition hack for FreeBSD ports. - * bsd.port.mk can set .MAKE.FreeBSD_UL=yes - * to cause us to treat :[LU] as aliases for :t[lu] - * To be reverted when ports converts to :t[lu] (when 8.3 is EOL) - */ -#define MAKE_FREEBSD_UL ".MAKE.FreeBSD_UL" -#ifdef MAKE_FREEBSD_UL -static int FreeBSD_UL = FALSE; -#endif - -/* * This lets us tell if we have replaced the original environ * (which we cannot free). */ @@ -990,12 +979,6 @@ Var_Set(const char *name, const char *val, GNode *ctxt, int flags) Var_Append(MAKEOVERRIDES, name, VAR_GLOBAL); } - -#ifdef MAKE_FREEBSD_UL - if (strcmp(MAKE_FREEBSD_UL, name) == 0) { - FreeBSD_UL = getBoolean(MAKE_FREEBSD_UL, FALSE); - } -#endif out: @@ -2689,24 +2672,8 @@ ApplyModifiers(char *nstr, const char *tstr, free(loop.str); break; } - case 'U': -#ifdef MAKE_FREEBSD_UL - if (FreeBSD_UL) { - int nc = tstr[1]; - - /* we have to be careful, since :U is used internally */ - if (nc == ':' || nc == endc) { - char *dp = bmake_strdup(nstr); - for (newStr = dp; *dp; dp++) - *dp = toupper((unsigned char)*dp); - cp = tstr + 1; - termc = *cp; - break; /* yes inside the conditional */ - } - /* FALLTHROUGH */ - } -#endif case 'D': + case 'U': { Buffer buf; /* Buffer for patterns */ int wantit; /* want data in buffer */ @@ -2766,17 +2733,6 @@ ApplyModifiers(char *nstr, const char *tstr, break; } case 'L': -#ifdef MAKE_FREEBSD_UL - if (FreeBSD_UL) { - char *dp = bmake_strdup(nstr); - for (newStr = dp; *dp; dp++) - *dp = tolower((unsigned char)*dp); - cp = tstr + 1; - termc = *cp; - break; - } - /* FALLTHROUGH */ -#endif { if ((v->flags & VAR_JUNK) != 0) v->flags |= VAR_KEEP; |