Index: head/net/quagga/Makefile =================================================================== --- head/net/quagga/Makefile (revision 377838) +++ head/net/quagga/Makefile (revision 377839) @@ -1,98 +1,98 @@ # Created by: Bruce M Simpson # $FreeBSD$ PORTNAME= quagga PORTVERSION= 0.99.23.1 PORTREVISION= 2 CATEGORIES= net ipv6 MASTER_SITES= SAVANNAH MAINTAINER= mat@FreeBSD.org COMMENT= Free RIPv1, RIPv2, OSPFv2, BGP4, IS-IS route software LICENSE= GPLv2 BUILD_DEPENDS= gawk:${PORTSDIR}/lang/gawk CONFLICTS= openbgpd-[0-9]* openospfd-[0-9]* zebra-0* quagga-re-[0-9]* GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-exampledir=${PREFIX}/share/examples/quagga INSTALL_TARGET= install-strip -USES= gmake libtool makeinfo perl5 readline autoreconf +USES= gmake libtool makeinfo perl5 readline USE_LDCONFIG= yes USE_PERL5= build INFO= quagga OPTIONS_DEFINE= ISISD PAM OSPF_OPAQUE_LSA RTADV SNMP TCPSOCKETS DLMALLOC \ NO_BGP_ANNOUNCE OSPF_NEXTHOP OPTIONS_SUB= yes ISISD_DESC= Enable experimental ISIS daemon PAM_DESC= PAM authentication for vtysh OSPF_OPAQUE_LSA_DESC= OSPF Opaque-LSA support (RFC2370) 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 ISISD_CONFIGURE_ENABLE= isisd PAM_CONFIGURE_WITH= libpam OSPF_OPAQUE_LSA_CONFIGURE_ENABLE= opaque-lsa RTADV_CONFIGURE_ENABLE= rtadv SNMP_CONFIGURE_ENABLE= snmp SNMP_LIB_DEPENDS= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp TCPSOCKETS_CONFIGURE_ENABLE= tcp-zebra DLMALLOC_LIB_DEPENDS= libdlmalloc.so:${PORTSDIR}/devel/libdlmalloc DLMALLOC_LIBS= -L${LOCALBASE}/lib -ldlmalloc NO_BGP_ANNOUNCE_CONFIGURE_ARGS+=--disable-bgp-announce OSPF_NEXTHOP_EXTRA_PATCH= ${PATCHDIR}/extra-patch-ospf-nexthop 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}${ETCDIR}/* ${STAGEDIR}${EXAMPLESDIR} .include Index: head/net/quagga/files/patch-configure.ac =================================================================== --- head/net/quagga/files/patch-configure.ac (revision 377838) +++ head/net/quagga/files/patch-configure.ac (nonexistent) @@ -1,11 +0,0 @@ ---- configure.ac.orig 2014-08-25 16:56:53 UTC -+++ configure.ac -@@ -1415,7 +1415,7 @@ - dnl ------------------ - dnl check Net-SNMP library - dnl ------------------ --if test "${enable_snmp}" != ""; then -+if test "x${enable_snmp}" != "xno"; then - AC_PATH_TOOL([NETSNMP_CONFIG], [net-snmp-config], [no]) - if test x"$NETSNMP_CONFIG" = x"no"; then - AC_MSG_ERROR([--enable-snmp given but unable to find net-snmp-config]) Property changes on: head/net/quagga/files/patch-configure.ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/quagga/files/patch-configure =================================================================== --- head/net/quagga/files/patch-configure (nonexistent) +++ head/net/quagga/files/patch-configure (revision 377839) @@ -0,0 +1,11 @@ +--- configure.orig 2014-08-25 17:02:06 UTC ++++ configure +@@ -18158,7 +18158,7 @@ fi + + + +-if test "${enable_snmp}" != ""; then ++if test "x${enable_snmp}" != "xno"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}net-snmp-config", so it can be a program name with args. + set dummy ${ac_tool_prefix}net-snmp-config; ac_word=$2 Property changes on: head/net/quagga/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property