aboutsummaryrefslogtreecommitdiffstats
path: root/net/olsrd
diff options
context:
space:
mode:
authoradamw <adamw@FreeBSD.org>2014-07-15 00:19:49 +0800
committeradamw <adamw@FreeBSD.org>2014-07-15 00:19:49 +0800
commite768f4941ea21b872a612c1d28bb6c36b57c9c68 (patch)
tree9b2a3f8a0242898a238f9a79a6a62f9490330482 /net/olsrd
parent8e7e9392b4d17d445a8f439ae5b422dbc60e241e (diff)
downloadfreebsd-ports-gnome-e768f4941ea21b872a612c1d28bb6c36b57c9c68.tar.gz
freebsd-ports-gnome-e768f4941ea21b872a612c1d28bb6c36b57c9c68.tar.zst
freebsd-ports-gnome-e768f4941ea21b872a612c1d28bb6c36b57c9c68.zip
Turn WITH_MULTI_IF into an OPTION and pet portlint. I am not even
touching the mysterious .if defined(PREFIX).
Diffstat (limited to 'net/olsrd')
-rw-r--r--net/olsrd/Makefile23
-rw-r--r--net/olsrd/pkg-descr1
2 files changed, 7 insertions, 17 deletions
diff --git a/net/olsrd/Makefile b/net/olsrd/Makefile
index e859231890d8..3fd97dc63587 100644
--- a/net/olsrd/Makefile
+++ b/net/olsrd/Makefile
@@ -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
diff --git a/net/olsrd/pkg-descr b/net/olsrd/pkg-descr
index ae5894fcab3f..d8bfef6f6b4c 100644
--- a/net/olsrd/pkg-descr
+++ b/net/olsrd/pkg-descr
@@ -6,4 +6,3 @@ networks. The protocol is pro-active, table driven and utilizes a
technique called multipoint relaying for message flooding.
WWW: http://www.olsr.org/
-