From 302878302d884122365ca995aa4d0332cc7d6960 Mon Sep 17 00:00:00 2001
From: Dima Dorfman
Date: Fri, 12 Apr 2002 02:25:10 +0000
Subject: The regexp used to change T_USER to T_USERNAME only works if the
symbol is preceded by whitespace. However, on line 64 of servscan.l, the
symbol is preceded by a parenthesis, so it is left alone. On i386, T_USER is
defined, so the build proceeds, but there may still be adverse side effects
due to that routine returning the wrong thing in some cases. The bandaid is
to fix the regexp to catch the case where T_USER is used after a
parenthesis--this is what's being committed. The real fix is either to make
the author use T_USERNAME for us, or, preferably, don't define T_USER when
sys/param.h is included since T_USER is in the application namespace.
Approved by: maintainer timeout
---
net/dictd/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'net/dictd')
diff --git a/net/dictd/Makefile b/net/dictd/Makefile
index 71ac387c32da..d75ffd806a50 100644
--- a/net/dictd/Makefile
+++ b/net/dictd/Makefile
@@ -34,7 +34,7 @@ post-patch:
@${PERL} -pi -e "s|/usr|${PREFIX}|g" ${WRKSRC}/$i
.endfor
@${PERL} -pi -e "s|%%CFLAGS%%|${CFLAGS}|g" ${WRKSRC}/zlib/Makefile
- @${PERL} -pi -e "s|[\ \t]T_USER| T_USERNAME|g" ${WRKSRC}/*.[chly]
+ @${PERL} -pi -e "s|([\ \t(])T_USER|\1T_USERNAME|g" ${WRKSRC}/*.[chly]
post-install:
@${MKDIR} ${DATADIR}
--
cgit v1.2.3