From owner-svn-src-all@FreeBSD.ORG  Sun May 26 18:30:07 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id EC17CE22;
 Sun, 26 May 2013 18:30:07 +0000 (UTC)
 (envelope-from trociny@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id DE4C4791;
 Sun, 26 May 2013 18:30:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4QIU7LY025574;
 Sun, 26 May 2013 18:30:07 GMT (envelope-from trociny@svn.freebsd.org)
Received: (from trociny@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4QIU7V5025567;
 Sun, 26 May 2013 18:30:07 GMT (envelope-from trociny@svn.freebsd.org)
Message-Id: <201305261830.r4QIU7V5025567@svn.freebsd.org>
From: Mikolaj Golub <trociny@FreeBSD.org>
Date: Sun, 26 May 2013 18:30:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r251005 - in stable/8/sbin: hastctl hastd
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 May 2013 18:30:08 -0000

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; }