svn commit: r361796 - head/net/olsrd

[Adam Weinberger]

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 <bsd.port.pre.mk>
 
@@ -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/
-