From owner-svn-ports-all@FreeBSD.ORG Mon Jul 14 16:19:50 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D1636B33; Mon, 14 Jul 2014 16:19:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A4ED92821; Mon, 14 Jul 2014 16:19:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6EGJoVQ052372; Mon, 14 Jul 2014 16:19:50 GMT (envelope-from adamw@svn.freebsd.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6EGJoq3052367; Mon, 14 Jul 2014 16:19:50 GMT (envelope-from adamw@svn.freebsd.org) Message-Id: <201407141619.s6EGJoq3052367@svn.freebsd.org> From: Adam Weinberger Date: Mon, 14 Jul 2014 16:19:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361796 - head/net/olsrd X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jul 2014 16:19:50 -0000 Author: adamw Date: Mon Jul 14 16:19:49 2014 New Revision: 361796 URL: http://svnweb.freebsd.org/changeset/ports/361796 QAT: https://qat.redports.org/buildarchive/r361796/ Log: Turn WITH_MULTI_IF into an OPTION and pet portlint. I am not even touching the mysterious .if defined(PREFIX). Modified: head/net/olsrd/Makefile head/net/olsrd/pkg-descr Modified: head/net/olsrd/Makefile ============================================================================== --- head/net/olsrd/Makefile Mon Jul 14 16:09:59 2014 (r361795) +++ head/net/olsrd/Makefile Mon Jul 14 16:19:49 2014 (r361796) @@ -13,10 +13,6 @@ COMMENT= OLSR routing daemon BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend -.if defined(WITH_MULTI_IF) -LIB_DEPENDS+= libnet.so:${PORTSDIR}/net/libnet -.endif - USES= bison gmake tar:bzip2 USE_LDCONFIG= yes USE_RC_SUBR= olsrd @@ -24,13 +20,16 @@ USE_RC_SUBR= olsrd ALL_TARGET= build_all INSTALL_TARGET= install_all -.if defined(WITH_MULTI_IF) -MAKE_ARGS+= LIBNET=1 -.endif +OPTIONS_DEFINE= MULTI_IF +MULTI_IF_DESC= IPv6 multiple interface support + +MULTI_IF_LIB_DEPENDS= libnet.so:${PORTSDIR}/net/libnet +MULTI_IF_MAKE_ARGS= LIBNET=1 + .if defined(PREFIX) MAKE_ARGS+= PREFIX=${PREFIX} .endif -MAKE_ARGS+= STAGEDIR=${STAGEDIR} +MAKE_ARGS+= STAGEDIR=${STAGEDIR} .include @@ -38,14 +37,6 @@ MAKE_ARGS+= STAGEDIR=${STAGEDIR} CFLAGS+= -fPIC .endif -.if !defined(WITH_MULTI_IF) -pre-everything:: - @${ECHO_MSG} "" - @${ECHO_MSG} " To enable IPv4 multiple interface support make with" - @${ECHO_MSG} " WITH_MULTI_IF defined" - @${ECHO_MSG} "" -.endif - post-patch: @${REINPLACE_CMD} -e 's|/sbin/ldconfig|:|g' ${WRKSRC}/make/Makefile.fbsd Modified: head/net/olsrd/pkg-descr ============================================================================== --- head/net/olsrd/pkg-descr Mon Jul 14 16:09:59 2014 (r361795) +++ head/net/olsrd/pkg-descr Mon Jul 14 16:19:49 2014 (r361796) @@ -6,4 +6,3 @@ networks. The protocol is pro-active, ta technique called multipoint relaying for message flooding. WWW: http://www.olsr.org/ -