Index: head/net/quagga/Makefile =================================================================== --- head/net/quagga/Makefile (revision 489675) +++ head/net/quagga/Makefile (revision 489676) @@ -1,109 +1,109 @@ # Created by: Bruce M Simpson # $FreeBSD$ PORTNAME= quagga PORTVERSION= 1.2.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net ipv6 MASTER_SITES= SAVANNAH MAINTAINER= pi@FreeBSD.org COMMENT= Free RIPv1, RIPv2, OSPFv2, BGP4, IS-IS route software LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= gawk:lang/gawk CONFLICTS= frr3 frr4 frr5 frr6 openbgpd pimd zebra USES= compiler:c11 cpe gmake libtool makeinfo \ perl5 readline ssl GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-exampledir=${PREFIX}/share/examples/quagga INSTALL_TARGET= install-strip USE_LDCONFIG= yes USE_PERL5= build INFO= quagga OPTIONS_DEFINE= ISISD PIMD PAM RTADV SNMP TCPSOCKETS DLMALLOC \ NO_BGP_ANNOUNCE OSPF_NEXTHOP ISIS_TOPOLOGY EXAMPLES # IRDP needs something freebsd does not seem to have: # configure: error: 'IRDP requires in_pktinfo at the moment!' OPTIONS_DEFAULT= ISISD PIMD RTADV OPTIONS_SUB= yes PIMD_DESC= PIM-SSM multicast routing IRDP_DESC= Enable IRDP server support ISISD_DESC= Enable ISIS daemon (beta) ISIS_TOPOLOGY_DESC= Enable IS-IS topology generator PAM_DESC= PAM authentication for vtysh RTADV_DESC= IPv6 Router Advertisements TCPSOCKETS_DESC= Use TCP/IP sockets for protocol daemons DLMALLOC_DESC= Use dlmalloc (makes bgpd much faster) NO_BGP_ANNOUNCE_DESC= Turn off BGP route announcement OSPF_NEXTHOP_DESC= Set ip next-hop in OSPF route maps ENABLE_USER?= quagga ENABLE_GROUP?= quagga USERS= ${ENABLE_USER} GROUPS= ${ENABLE_GROUP} SYSCONF_DIR?= ${ETCDIR} LOCALSTATE_DIR?=/var/run/quagga CONFIGURE_ARGS= --enable-user=${ENABLE_USER} \ --enable-group=${ENABLE_GROUP} \ --sysconfdir=${SYSCONF_DIR} \ --localstatedir=${LOCALSTATE_DIR} \ --enable-vtysh .if defined(ENABLE_VTY_GROUP) CONFIGURE_ARGS+=--enable-vty-group=${ENABLE_VTY_GROUP} .endif +EXAMPLES_CONFIGURE_ON= --enable-exampledir=${PREFIX}/share/examples/quagga +EXAMPLES_CONFIGURE_OFF= --disable-exampledir + ISISD_CONFIGURE_ENABLE= isisd ISIS_TOPOLOGY_CONFIGURE_ENABLE= isis-topology PIMD_CONFIGURE_ENABLE= pimd IRDP_CONFIGURE_ENABLE= irdp PAM_CONFIGURE_WITH= libpam RTADV_CONFIGURE_ENABLE= rtadv SNMP_CONFIGURE_ENABLE= snmp SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp TCPSOCKETS_CONFIGURE_ENABLE= tcp-zebra DLMALLOC_LIB_DEPENDS= libdlmalloc.so:devel/libdlmalloc DLMALLOC_LIBS= -L${LOCALBASE}/lib -ldlmalloc OSPF_NEXTHOP_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ospf-nexthop # inverse option. NO_BGP_ANNOUNCE_CONFIGURE_ON= --disable-bgp-announce NO_BGP_ANNOUNCE_CONFIGURE_OFF= --enable-bgp-announce USE_RC_SUBR= quagga watchquagga SUB_LIST+= LOCALSTATE_DIR=${LOCALSTATE_DIR} \ SYSCONF_DIR=${SYSCONF_DIR} PLIST_SUB+= LOCALSTATE_DIR=${LOCALSTATE_DIR} \ SYSCONF_DIR=${SYSCONF_DIR} \ ENABLE_USER=${ENABLE_USER} \ ENABLE_GROUP=${ENABLE_GROUP} pre-everything:: @${ECHO} "=============================================================" @${ECHO} @${ECHO} "You can build ${PORTNAME} with the following options:" @${ECHO} @${ECHO} "ENABLE_USER Specify user to run Quagga suite as" @${ECHO} "ENABLE_GROUP Specify group to run Quagga suite as" @${ECHO} "ENABLE_VTY_GROUP Specify group for vty socket ownership" @${ECHO} "SYSCONF_DIR Specify directory for Quagga configuration files" @${ECHO} "LOCALSTATE_DIR Specify directory for Quagga runtime files" post-install: - ${MKDIR} ${STAGEDIR}${LOCALSTATE_DIR} ${STAGEDIR}${SYSCONF_DIR} \ - ${STAGEDIR}${EXAMPLESDIR} - @${MV} ${STAGEDIR}${SYSCONF_DIR}/* ${STAGEDIR}${EXAMPLESDIR} + ${MKDIR} ${STAGEDIR}${LOCALSTATE_DIR} ${STAGEDIR}${SYSCONF_DIR} .include Index: head/net/quagga/pkg-plist =================================================================== --- head/net/quagga/pkg-plist (revision 489675) +++ head/net/quagga/pkg-plist (revision 489676) @@ -1,109 +1,109 @@ bin/bgp_btoa %%PIMD%%bin/test_igmpv3_join bin/vtysh include/quagga/buffer.h include/quagga/checksum.h include/quagga/command.h include/quagga/distribute.h include/quagga/event_counter.h include/quagga/fifo.h include/quagga/filter.h include/quagga/getopt.h include/quagga/hash.h include/quagga/if.h include/quagga/if_rmap.h include/quagga/jhash.h include/quagga/keychain.h include/quagga/libospf.h include/quagga/linklist.h include/quagga/log.h include/quagga/md5.h include/quagga/memory.h include/quagga/memtypes.h include/quagga/network.h include/quagga/nexthop.h include/quagga/ospfapi/ospf_apiclient.h include/quagga/ospfd/ospf_api.h include/quagga/ospfd/ospf_asbr.h include/quagga/ospfd/ospf_dump.h include/quagga/ospfd/ospf_ism.h include/quagga/ospfd/ospf_lsa.h include/quagga/ospfd/ospf_lsdb.h include/quagga/ospfd/ospf_nsm.h include/quagga/ospfd/ospf_opaque.h include/quagga/ospfd/ospfd.h include/quagga/plist.h include/quagga/pqueue.h include/quagga/prefix.h include/quagga/privs.h include/quagga/route_types.h include/quagga/routemap.h include/quagga/sigevent.h include/quagga/smux.h include/quagga/sockopt.h include/quagga/sockunion.h include/quagga/str.h include/quagga/stream.h include/quagga/table.h include/quagga/thread.h include/quagga/vector.h include/quagga/version.h include/quagga/vrf.h include/quagga/vty.h include/quagga/workqueue.h include/quagga/zassert.h include/quagga/zclient.h include/quagga/zebra.h lib/libfpm_pb.a lib/libfpm_pb.so lib/libfpm_pb.so.0 lib/libfpm_pb.so.0.0.0 lib/libospf.a lib/libospf.so lib/libospf.so.0 lib/libospf.so.0.0.0 lib/libospfapiclient.a lib/libospfapiclient.so lib/libospfapiclient.so.0 lib/libospfapiclient.so.0.0.0 lib/libquagga_pb.a lib/libquagga_pb.so lib/libquagga_pb.so.0 lib/libquagga_pb.so.0.0.0 lib/libzebra.a lib/libzebra.so lib/libzebra.so.1 lib/libzebra.so.1.0.0 man/man1/vtysh.1.gz man/man8/bgpd.8.gz %%ISISD%%man/man8/isisd.8.gz man/man8/ospf6d.8.gz man/man8/ospfclient.8.gz man/man8/ospfd.8.gz %%PIMD%%man/man8/pimd.8.gz man/man8/ripd.8.gz man/man8/ripngd.8.gz man/man8/watchquagga.8.gz man/man8/zebra.8.gz sbin/bgpd %%ISISD%%sbin/isisd sbin/ospf6d sbin/ospfclient sbin/ospfd %%PIMD%%sbin/pimd sbin/ripd sbin/ripngd sbin/watchquagga sbin/zebra -%%EXAMPLESDIR%%/bgpd.conf.sample -%%EXAMPLESDIR%%/bgpd.conf.sample2 -%%ISISD%%%%EXAMPLESDIR%%/isisd.conf.sample -%%EXAMPLESDIR%%/ospf6d.conf.sample -%%EXAMPLESDIR%%/ospfd.conf.sample -%%PIMD%%%%EXAMPLESDIR%%/pimd.conf.sample -%%EXAMPLESDIR%%/ripd.conf.sample -%%EXAMPLESDIR%%/ripngd.conf.sample -%%EXAMPLESDIR%%/vtysh.conf.sample -%%EXAMPLESDIR%%/zebra.conf.sample +%%EXAMPLES%%%%EXAMPLESDIR%%/bgpd.conf.sample +%%EXAMPLES%%%%EXAMPLESDIR%%/bgpd.conf.sample2 +%%EXAMPLES%%%%ISISD%%%%EXAMPLESDIR%%/isisd.conf.sample +%%EXAMPLES%%%%EXAMPLESDIR%%/ospf6d.conf.sample +%%EXAMPLES%%%%EXAMPLESDIR%%/ospfd.conf.sample +%%EXAMPLES%%%%PIMD%%%%EXAMPLESDIR%%/pimd.conf.sample +%%EXAMPLES%%%%EXAMPLESDIR%%/ripd.conf.sample +%%EXAMPLES%%%%EXAMPLESDIR%%/ripngd.conf.sample +%%EXAMPLES%%%%EXAMPLESDIR%%/vtysh.conf.sample +%%EXAMPLES%%%%EXAMPLESDIR%%/zebra.conf.sample @dir(%%ENABLE_USER%%,%%ENABLE_GROUP%%,750) %%LOCALSTATE_DIR%% @dir(%%ENABLE_USER%%,%%ENABLE_GROUP%%,750) %%SYSCONF_DIR%%