From owner-svn-ports-all@FreeBSD.ORG Tue Jul 15 20:13:56 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C9C8E10C; Tue, 15 Jul 2014 20:13:56 +0000 (UTC) Received: from apnoea.adamw.org (apnoea.adamw.org [204.109.59.150]) (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 60F742FDE; Tue, 15 Jul 2014 20:13:56 +0000 (UTC) Received: from [192.168.192.25] (dhcp-108-170-169-12.cable.user.start.ca [108.170.169.12]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by apnoea.adamw.org (Postfix) with ESMTPSA id 980D412B116; Tue, 15 Jul 2014 16:13:53 -0400 (EDT) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Subject: Re: svn commit: r361796 - head/net/olsrd From: Adam Weinberger In-Reply-To: <20140715201218.GA84098@zibbi.meraka.csir.co.za> Date: Tue, 15 Jul 2014 16:13:51 -0400 Content-Transfer-Encoding: quoted-printable Message-Id: References: <201407141619.s6EGJoq3052367@svn.freebsd.org> <20140715201218.GA84098@zibbi.meraka.csir.co.za> To: John Hay X-Mailer: Apple Mail (2.1878.6) Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, Adam Weinberger , ports-committers@freebsd.org 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: Tue, 15 Jul 2014 20:13:57 -0000 Oops! Fixed in 362002. # Adam --=20 Adam Weinberger adamw@adamw.org http://www.adamw.org On 15 Jul, 2014, at 16:12, John Hay wrote: > Hi Adam, >=20 > The WITH_MULTI_IF is for IPv4 support, not IPv6. >=20 > If you have suggestions on how to handle prefix better, I'm open to > suggestions. >=20 > John > --=20 > John Hay -- jhay@meraka.csir.co.za / jhay@meraka.org.za / = jhay@FreeBSD.org >=20 > On Mon, Jul 14, 2014 at 04:19:50PM +0000, Adam Weinberger wrote: >> 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/ >>=20 >> Log: >> Turn WITH_MULTI_IF into an OPTION and pet portlint. I am not even >> touching the mysterious .if defined(PREFIX). >>=20 >> Modified: >> head/net/olsrd/Makefile >> head/net/olsrd/pkg-descr >>=20 >> Modified: head/net/olsrd/Makefile >> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D >> --- 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=3D OLSR routing daemon >>=20 >> BUILD_DEPENDS=3D makedepend:${PORTSDIR}/devel/makedepend >>=20 >> -.if defined(WITH_MULTI_IF) >> -LIB_DEPENDS+=3D libnet.so:${PORTSDIR}/net/libnet >> -.endif >> - >> USES=3D bison gmake tar:bzip2 >> USE_LDCONFIG=3D yes >> USE_RC_SUBR=3D olsrd >> @@ -24,13 +20,16 @@ USE_RC_SUBR=3D olsrd >> ALL_TARGET=3D build_all >> INSTALL_TARGET=3D install_all >>=20 >> -.if defined(WITH_MULTI_IF) >> -MAKE_ARGS+=3D LIBNET=3D1 >> -.endif >> +OPTIONS_DEFINE=3D MULTI_IF >> +MULTI_IF_DESC=3D IPv6 multiple interface support >> + >> +MULTI_IF_LIB_DEPENDS=3D libnet.so:${PORTSDIR}/net/libnet >> +MULTI_IF_MAKE_ARGS=3D LIBNET=3D1 >> + >> .if defined(PREFIX) >> MAKE_ARGS+=3D PREFIX=3D${PREFIX} >> .endif >> -MAKE_ARGS+=3D STAGEDIR=3D${STAGEDIR} >> +MAKE_ARGS+=3D STAGEDIR=3D${STAGEDIR} >>=20 >> .include >>=20 >> @@ -38,14 +37,6 @@ MAKE_ARGS+=3D STAGEDIR=3D${STAGEDIR} >> CFLAGS+=3D -fPIC >> .endif >>=20 >> -.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 >>=20 >>=20 >> Modified: head/net/olsrd/pkg-descr >> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D >> --- 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. >>=20 >> WWW: http://www.olsr.org/ >> - >=20