From owner-svn-src-all@FreeBSD.ORG Sat May 11 09:51:46 2013 Return-Path: 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 2CA72363; Sat, 11 May 2013 09:51:46 +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 03D21F2; Sat, 11 May 2013 09:51:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4B9pjQu023317; Sat, 11 May 2013 09:51:45 GMT (envelope-from trociny@svn.freebsd.org) Received: (from trociny@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4B9piv0023310; Sat, 11 May 2013 09:51:44 GMT (envelope-from trociny@svn.freebsd.org) Message-Id: <201305110951.r4B9piv0023310@svn.freebsd.org> From: Mikolaj Golub Date: Sat, 11 May 2013 09:51:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r250503 - in head: sbin/hastctl sbin/hastd usr.sbin/bsnmpd/modules/snmp_hast X-SVN-Group: head 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 May 2013 09:51:46 -0000 Author: trociny Date: Sat May 11 09:51:44 2013 New Revision: 250503 URL: http://svnweb.freebsd.org/changeset/base/250503 Log: 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: head/sbin/hastctl/Makefile head/sbin/hastd/Makefile head/sbin/hastd/token.l head/usr.sbin/bsnmpd/modules/snmp_hast/Makefile Modified: head/sbin/hastctl/Makefile ============================================================================== --- head/sbin/hastctl/Makefile Sat May 11 08:15:56 2013 (r250502) +++ head/sbin/hastctl/Makefile Sat May 11 09:51:44 2013 (r250503) @@ -32,8 +32,8 @@ CFLAGS+=-DINET6 CFLAGS+=-DYY_NO_UNPUT CFLAGS+=-DYY_NO_INPUT -DPADD= ${LIBL} ${LIBUTIL} -LDADD= -ll -lutil +DPADD= ${LIBUTIL} +LDADD= -lutil .if ${MK_OPENSSL} != "no" DPADD+= ${LIBCRYPTO} LDADD+= -lcrypto Modified: head/sbin/hastd/Makefile ============================================================================== --- head/sbin/hastd/Makefile Sat May 11 08:15:56 2013 (r250502) +++ head/sbin/hastd/Makefile Sat May 11 09:51:44 2013 (r250503) @@ -31,7 +31,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: head/sbin/hastd/token.l ============================================================================== --- head/sbin/hastd/token.l Sat May 11 08:15:56 2013 (r250502) +++ head/sbin/hastd/token.l Sat May 11 09:51:44 2013 (r250503) @@ -46,6 +46,7 @@ int lineno; %option noinput %option nounput +%option noyywrap %% control { DP; return CONTROL; } Modified: head/usr.sbin/bsnmpd/modules/snmp_hast/Makefile ============================================================================== --- head/usr.sbin/bsnmpd/modules/snmp_hast/Makefile Sat May 11 08:15:56 2013 (r250502) +++ head/usr.sbin/bsnmpd/modules/snmp_hast/Makefile Sat May 11 09:51:44 2013 (r250503) @@ -29,8 +29,8 @@ CFLAGS+=-DYY_NO_UNPUT CFLAGS+=-DYY_NO_INPUT CFLAGS+= -DSNMPTREE_TYPES -DPADD= ${LIBL} ${LIBUTIL} -LDADD= -ll -lutil +DPADD= ${LIBUTIL} +LDADD= -lutil XSYM= begemotHast DEFS= ${MOD}_tree.def