[Midnightbsd-cvs] mports [16936] fix build
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Sep 7 12:12:13 EDT 2014
Revision: 16936
http://svnweb.midnightbsd.org/mports/?rev=16936
Author: laffer1
Date: 2014-09-07 12:12:12 -0400 (Sun, 07 Sep 2014)
Log Message:
-----------
fix build
Modified Paths:
--------------
trunk/net/zebra/Makefile
trunk/net/zebra/files/patch-ioctl.c
trunk/net/zebra/files/patch-ospfd_ospf_lsa.c
trunk/net/zebra/files/patch-zebra-kernel_socket.c
trunk/net/zebra/files/zebractl.in
trunk/net/zebra/pkg-plist
Property Changed:
----------------
trunk/net/zebra/files/patch-configure
trunk/net/zebra/files/patch-ioctl.c
trunk/net/zebra/files/patch-ospfd__ospf_spf.c
trunk/net/zebra/files/patch-ospfd_ospf_lsa.c
trunk/net/zebra/files/patch-zebra-kernel_socket.c
trunk/net/zebra/files/patch-zebra_Makefile.in
trunk/net/zebra/files/pkg-message.in
trunk/net/zebra/files/zebractl.in
Modified: trunk/net/zebra/Makefile
===================================================================
--- trunk/net/zebra/Makefile 2014-09-07 16:06:47 UTC (rev 16935)
+++ trunk/net/zebra/Makefile 2014-09-07 16:12:12 UTC (rev 16936)
@@ -2,7 +2,7 @@
PORTNAME= zebra
PORTVERSION= 0.95a
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net ipv6
MASTER_SITES= ftp://ftp.pop-pr.rnp.br/pub/GNU/ftp.zebra.org/zebra/ \
ftp://ftp.ripe.net/mirrors/sites/ftp.zebra.org/pub/zebra/ \
@@ -11,7 +11,8 @@
MAINTAINER= ports at MidnightBSD.org
COMMENT= Free RIPv1, RIPv2, OSPFv2, BGP4 route software (server/reflector)
-LICENSE= gpl2
+LICENSE= gpl2 lgpl2.1
+LICENSE_COMB= multi
CONFLICTS= openbgpd-[0-9]* quagga-[0-9]* quagga-re-[0-9]* openospfd-[0-9]*
@@ -24,11 +25,13 @@
ZEBRAARGS=${ZEBRAARGS}
USE_SUBMAKE= yes
GNU_CONFIGURE= yes
+USES= readline
CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc/zebra
-MAKE_JOBS_SAFE= yes
-SCRIPTS_ENV= WRKDIRPREFIX=${WRKDIRPREFIX}
+PORTSCOUT= ignore:1
+SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}"
+
OPTIONS_DEFINE= IPV6 PAM OSPFNSSA SNMP TCPZEBRA BGPD OSPF6D OSPFD RIPD RIPNGD VTYSH
PAM_DESC= PAM authentication for vtysh
@@ -42,10 +45,22 @@
VTYSH_DESC= VTYSH support
OPTIONS_DEFAULT= IPV6 BGPD OSPF6D OSPFD RIPD RIPNGD VTYSH
+OPTIONS_SUB= yes
NO_OPTIONS_SORT= yes
-MAN1= vtysh.1
-MAN8= bgpd.8 ospf6d.8 ospfd.8 ripd.8 ripngd.8 zebra.8
+PAM_CONFIGURE_WITH= pam
+OSPFNSSA_CONFIGURE_ENABLE= nssa
+SNMP_CONFIGURE_ENABLE= snmp
+SNMP_LIB_DEPENDS+= libsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+TCPZEBRA_CONFIGURE_ENABLE= tcp-zebra
+BGPD_CONFIGURE_ENABLE= bgpd
+OSPF6D_CONFIGURE_ENABLE= ospf6d
+OSPFD_CONFIGURE_ENABLE= ospfd
+RIPD_CONFIGURE_ENABLE= ripd
+RIPNGD_CONFIGURE_ENABLE= ripngd
+VTYSH_CONFIGURE_ENABLE= vtysh
+IPV6_CONFIGURE_ENABLE= ipv6
+
INFO= zebra
BGPDARGS?= -d
@@ -57,77 +72,15 @@
.include <bsd.mport.options.mk>
-.if empty(PORT_OPTIONS:MIPV6)
-CONFIGURE_ARGS+=--disable-ipv6
-WITHOUT_OSPF6D= yes
-WITHOUT_RIPNGD= yes
+.if !${PORT_OPTIONS:MIPV6} && ${PORT_OPTIONS:MOSPF6D}
+IGNORE= OSPF6D requires IPV6 option.
.endif
-
-.if ${PORT_OPTIONS:MPAM}
-CONFIGURE_ARGS+=--with-libpam
+.if !${PORT_OPTIONS:MIPV6} && ${PORT_OPTIONS:MRIPNGD}
+IGNORE= RIPNGD requires IPV6 option.
.endif
-.if ${PORT_OPTIONS:MOSPFNSSA}
-CONFIGURE_ARGS+=--enable-nssa
-.endif
-
-.if ${PORT_OPTIONS:MSNMP}
-CONFIGURE_ARGS+=--enable-snmp
-LIB_DEPENDS+= snmp:${PORTSDIR}/net-mgmt/net-snmp
-.endif
-
-.if ${PORT_OPTIONS:MTCPZEBRA}
-CONFIGURE_ARGS+=--enable-tcp-zebra
-.endif
-
-.if ${PORT_OPTIONS:MBGPD}
-PLIST_SUB+= BGPD=""
-.else
-CONFIGURE_ARGS+=--disable-bgpd
-PLIST_SUB+= BGPD="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MOSPF6D}
-PLIST_SUB+= OSPF6D=""
-.else
-CONFIGURE_ARGS+=--disable-ospf6d
-PLIST_SUB+= OSPF6D="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MOSPFD}
-PLIST_SUB+= OSPF6D=""
-PLIST_SUB+= OSPFD=""
-.else
-CONFIGURE_ARGS+=--disable-ospfd
-PLIST_SUB+= OSPFD="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MRIPD}
-PLIST_SUB+= RIPD=""
-.else
-CONFIGURE_ARGS+=--disable-ripd
-PLIST_SUB+= RIPD="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MRIPNGD}
-PLIST_SUB+= RIPNGD=""
-.else
-CONFIGURE_ARGS+=--disable-ripngd
-PLIST_SUB+= RIPNGD="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MVTYSH}
-PLIST_SUB+= VTYSH=""
-CONFIGURE_ARGS+=--enable-vtysh
-.else
-PLIST_SUB+= VTYSH="@comment "
-.endif
-
post-install:
@( cd ${WRKSRC}/doc; ${RM} -f zebra*info*; ${MAKE} ${FAKE_MAKEARGS} zebra.info install )
- @${SED} -e "s=!!PREFIX!!=${TRUE_PREFIX}=" \
- < ${FILESDIR}/zebractl.sh \
- > ${PREFIX}/sbin/zebractl
- @${CHMOD} 555 ${PREFIX}/sbin/zebractl
+ ${INSTALL_SCRIPT} ${WRKDIR}/zebractl ${STAGEDIR}${PREFIX}/sbin/zebractl
.include <bsd.port.mk>
Index: trunk/net/zebra/files/patch-configure
===================================================================
--- trunk/net/zebra/files/patch-configure 2014-09-07 16:06:47 UTC (rev 16935)
+++ trunk/net/zebra/files/patch-configure 2014-09-07 16:12:12 UTC (rev 16936)
Property changes on: trunk/net/zebra/files/patch-configure
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/net/zebra/files/patch-ioctl.c
===================================================================
--- trunk/net/zebra/files/patch-ioctl.c 2014-09-07 16:06:47 UTC (rev 16935)
+++ trunk/net/zebra/files/patch-ioctl.c 2014-09-07 16:12:12 UTC (rev 16936)
@@ -1,5 +1,5 @@
-$FreeBSD$
+$FreeBSD: head/net/zebra/files/patch-ioctl.c 340725 2014-01-22 17:40:44Z mat $
--- zebra/ioctl.c.orig Tue Oct 23 11:31:29 2001
+++ zebra/ioctl.c Fri Oct 4 19:45:04 2002
Property changes on: trunk/net/zebra/files/patch-ioctl.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/net/zebra/files/patch-ospfd__ospf_spf.c
===================================================================
--- trunk/net/zebra/files/patch-ospfd__ospf_spf.c 2014-09-07 16:06:47 UTC (rev 16935)
+++ trunk/net/zebra/files/patch-ospfd__ospf_spf.c 2014-09-07 16:12:12 UTC (rev 16936)
Property changes on: trunk/net/zebra/files/patch-ospfd__ospf_spf.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/net/zebra/files/patch-ospfd_ospf_lsa.c
===================================================================
--- trunk/net/zebra/files/patch-ospfd_ospf_lsa.c 2014-09-07 16:06:47 UTC (rev 16935)
+++ trunk/net/zebra/files/patch-ospfd_ospf_lsa.c 2014-09-07 16:12:12 UTC (rev 16936)
@@ -1,6 +1,6 @@
---- ospfd/ospf_lsa.c.orig Mon Feb 28 03:09:10 2005
-+++ ospfd/ospf_lsa.c Thu May 19 17:59:09 2005
-@@ -3324,6 +3324,7 @@
+--- ./ospfd/ospf_lsa.c.orig 2005-05-26 11:40:19.000000000 -0500
++++ ./ospfd/ospf_lsa.c 2014-04-09 15:16:46.751621976 -0500
+@@ -3247,6 +3247,7 @@
listnode node;
struct ospf *ospf = THREAD_ARG (t);
int i;
@@ -8,7 +8,7 @@
list lsa_to_refresh = list_new ();
if (IS_DEBUG_OSPF (lsa, LSA_REFRESH))
-@@ -3331,15 +3332,25 @@
+@@ -3254,16 +3255,26 @@
i = ospf->lsa_refresh_queue.index;
@@ -27,11 +27,12 @@
if (IS_DEBUG_OSPF (lsa, LSA_REFRESH))
zlog_info ("LSA[Refresh]: ospf_lsa_refresh_walker(): next index %d",
ospf->lsa_refresh_queue.index);
-+
+
+ if (ospf->lsa_refresh_queue.index >= OSPF_LSA_REFRESHER_SLOTS) {
+ zlog_info ("LSA[Refresh]: ospf_lsa_refresh_walker(): HACK: fixing index: %hu -> 0", ospf->lsa_refresh_queue.index);
+ ospf->lsa_refresh_queue.index = 0;
+ }
-
++
for (;i != ospf->lsa_refresh_queue.index;
i = (i + 1) % OSPF_LSA_REFRESHER_SLOTS)
+ {
Property changes on: trunk/net/zebra/files/patch-ospfd_ospf_lsa.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/net/zebra/files/patch-zebra-kernel_socket.c
===================================================================
--- trunk/net/zebra/files/patch-zebra-kernel_socket.c 2014-09-07 16:06:47 UTC (rev 16935)
+++ trunk/net/zebra/files/patch-zebra-kernel_socket.c 2014-09-07 16:12:12 UTC (rev 16936)
@@ -1,6 +1,19 @@
---- zebra/kernel_socket.c.orig 2003-11-28 01:35:50.000000000 +0900
-+++ zebra/kernel_socket.c 2010-01-26 15:13:19.000000000 +0900
-@@ -91,9 +91,13 @@
+--- ./zebra/kernel_socket.c.orig 2003-11-27 10:35:50.000000000 -0600
++++ ./zebra/kernel_socket.c 2014-06-13 12:53:05.553677585 -0500
+@@ -58,8 +58,12 @@
+ {RTM_REDIRECT, "RTM_REDIRECT"},
+ {RTM_MISS, "RTM_MISS"},
+ {RTM_LOCK, "RTM_LOCK"},
++#ifdef RTM_OLDADD
+ {RTM_OLDADD, "RTM_OLDADD"},
++#endif
++#ifdef RTM_OLDDEL
+ {RTM_OLDDEL, "RTM_OLDDEL"},
++#endif
+ {RTM_RESOLVE, "RTM_RESOLVE"},
+ {RTM_NEWADDR, "RTM_NEWADDR"},
+ {RTM_DELADDR, "RTM_DELADDR"},
+@@ -91,9 +95,13 @@
#ifdef RTF_MASK
{RTF_MASK, "MASK"},
#endif /* RTF_MASK */
@@ -14,7 +27,7 @@
{RTF_STATIC, "STATIC"},
{RTF_BLACKHOLE, "BLACKHOLE"},
{RTF_PROTO1, "PROTO1"},
-@@ -593,9 +597,11 @@
+@@ -593,9 +601,11 @@
if (gate && message == RTM_ADD)
msg.rtm.rtm_flags |= RTF_GATEWAY;
Property changes on: trunk/net/zebra/files/patch-zebra-kernel_socket.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/net/zebra/files/patch-zebra_Makefile.in
===================================================================
--- trunk/net/zebra/files/patch-zebra_Makefile.in 2014-09-07 16:06:47 UTC (rev 16935)
+++ trunk/net/zebra/files/patch-zebra_Makefile.in 2014-09-07 16:12:12 UTC (rev 16936)
Property changes on: trunk/net/zebra/files/patch-zebra_Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/net/zebra/files/pkg-message.in
===================================================================
--- trunk/net/zebra/files/pkg-message.in 2014-09-07 16:06:47 UTC (rev 16935)
+++ trunk/net/zebra/files/pkg-message.in 2014-09-07 16:12:12 UTC (rev 16936)
Property changes on: trunk/net/zebra/files/pkg-message.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/net/zebra/files/zebractl.in
===================================================================
--- trunk/net/zebra/files/zebractl.in 2014-09-07 16:06:47 UTC (rev 16935)
+++ trunk/net/zebra/files/zebractl.in 2014-09-07 16:12:12 UTC (rev 16936)
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $MidnightBSD$
+# $FreeBSD: /tmp/pcvs/ports/net/zebra/files/zebractl.in,v 1.1 2010-01-26 06:53:20 sumikawa Exp $
#
# zebra start/stop script by "Andreas Klemm <andreas at FreeBSD.ORG>"
#
Property changes on: trunk/net/zebra/files/zebractl.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/net/zebra/pkg-plist
===================================================================
--- trunk/net/zebra/pkg-plist 2014-09-07 16:06:47 UTC (rev 16935)
+++ trunk/net/zebra/pkg-plist 2014-09-07 16:12:12 UTC (rev 16936)
@@ -14,4 +14,11 @@
%%RIPNGD%%etc/zebra/ripngd.conf.sample
%%VTYSH%%etc/zebra/vtysh.conf.sample
etc/zebra/zebra.conf.sample
+man/man1/vtysh.1.gz
+man/man8/bgpd.8.gz
+man/man8/ospf6d.8.gz
+man/man8/ospfd.8.gz
+man/man8/ripd.8.gz
+man/man8/ripngd.8.gz
+man/man8/zebra.8.gz
@dirrm etc/zebra
More information about the Midnightbsd-cvs
mailing list