svn commit: r251005 - in stable/8/sbin: hastctl hastd

[Mikolaj Golub]

Author: trociny
Date: Sun May 26 18:30:07 2013
New Revision: 251005
URL: http://svnweb.freebsd.org/changeset/base/251005

Log:
  MFC r250503:
  
  Get rid of libl dependency.  We needed it only to provide yywrap.  But
  yywrap is not necessary when parsing a single hast.conf file.
  
  Suggested by:	kib
  Reviewed by:	pjd

Modified:
  stable/8/sbin/hastctl/Makefile
  stable/8/sbin/hastd/Makefile
  stable/8/sbin/hastd/token.l
Directory Properties:
  stable/8/sbin/hastctl/   (props changed)
  stable/8/sbin/hastd/   (props changed)

Modified: stable/8/sbin/hastctl/Makefile
==============================================================================
--- stable/8/sbin/hastctl/Makefile	Sun May 26 18:28:36 2013	(r251004)
+++ stable/8/sbin/hastctl/Makefile	Sun May 26 18:30:07 2013	(r251005)
@@ -29,8 +29,8 @@ CFLAGS+=-DINET6
 # This is needed to have WARNS > 1.
 CFLAGS+=-DYY_NO_UNPUT
 
-DPADD=	${LIBL} ${LIBUTIL}
-LDADD=	-ll -lutil
+DPADD=	${LIBUTIL}
+LDADD=	-lutil
 .if ${MK_OPENSSL} != "no"
 DPADD+=	${LIBCRYPTO}
 LDADD+=	-lcrypto

Modified: stable/8/sbin/hastd/Makefile
==============================================================================
--- stable/8/sbin/hastd/Makefile	Sun May 26 18:28:36 2013	(r251004)
+++ stable/8/sbin/hastd/Makefile	Sun May 26 18:30:07 2013	(r251005)
@@ -29,7 +29,7 @@ CFLAGS+=-DINET6
 .endif
 
 DPADD=	${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} ${LIBL} ${LIBPTHREAD} ${LIBUTIL}
-LDADD=	-lgeom -lbsdxml -lsbuf -ll -lpthread -lutil
+LDADD=	-lgeom -lbsdxml -lsbuf -lpthread -lutil
 .if ${MK_OPENSSL} != "no"
 DPADD+=	${LIBCRYPTO}
 LDADD+=	-lcrypto

Modified: stable/8/sbin/hastd/token.l
==============================================================================
--- stable/8/sbin/hastd/token.l	Sun May 26 18:28:36 2013	(r251004)
+++ stable/8/sbin/hastd/token.l	Sun May 26 18:30:07 2013	(r251005)
@@ -46,6 +46,7 @@ int lineno;
 
 %option noinput
 %option nounput
+%option noyywrap
 
 %%
 control			{ DP; return CONTROL; }