Author: sjg
Date: Tue May 27 18:39:13 2014
New Revision: 266760
URL: http://svnweb.freebsd.org/changeset/base/266760
Log:
Portmgr no longer need the UL hack.
Reviewed by: obrien
Modified:
head/contrib/bmake/var.c
Modified: head/contrib/bmake/var.c
==============================================================================
--- head/contrib/bmake/var.c Tue May 27 18:27:51 2014 (r266759)
+++ head/contrib/bmake/var.c Tue May 27 18:39:13 2014 (r266760)
@@ -141,17 +141,6 @@ __RCSID("$NetBSD: var.c,v 1.184 2013/09/
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 *va
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 *t
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 *t
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;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
