From owner-svn-ports-all@FreeBSD.ORG Wed Oct 17 16:33:50 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4FEEEE63; Wed, 17 Oct 2012 16:33:50 +0000 (UTC) (envelope-from sem@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 340D58FC0A; Wed, 17 Oct 2012 16:33:50 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9HGXoiG013062; Wed, 17 Oct 2012 16:33:50 GMT (envelope-from sem@svn.freebsd.org) Received: (from sem@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9HGXoK5013060; Wed, 17 Oct 2012 16:33:50 GMT (envelope-from sem@svn.freebsd.org) Message-Id: <201210171633.q9HGXoK5013060@svn.freebsd.org> From: Sergey Matveychuk Date: Wed, 17 Oct 2012 16:33:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r306023 - head/net/quagga-re X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Oct 2012 16:33:50 -0000 Author: sem Date: Wed Oct 17 16:33:49 2012 New Revision: 306023 URL: http://svn.freebsd.org/changeset/ports/306023 Log: - Add LICENSE and LICENSE_FILE - Convert to a new OPTIONS format Feature safe: yes Modified: head/net/quagga-re/Makefile Modified: head/net/quagga-re/Makefile ============================================================================== --- head/net/quagga-re/Makefile Wed Oct 17 16:30:56 2012 (r306022) +++ head/net/quagga-re/Makefile Wed Oct 17 16:33:49 2012 (r306023) @@ -14,6 +14,9 @@ PKGNAMESUFFIX= -re MAINTAINER= sem@FreeBSD.org COMMENT= A branch of popular quagga software pointed at stability +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + CONFLICTS= openbgpd-[0-9]* openospfd-[0-9]* zebra-0* quagga-[0-9]* USE_AUTOTOOLS= libtool autoheader @@ -28,17 +31,20 @@ MAN1= vtysh.1 MAN8= bgpd.8 ospf6d.8 ospfd.8 ripd.8 ripngd.8 zebra.8 INFO= quagga -OPTIONS= ISISD "Enable experimental ISIS daemon" off \ - PAM "PAM authentication for vtysh" off \ - OSPF_NSSA "NSSA support (RFC1587)" off \ - OSPF_OPAQUE_LSA "OSPF Opaque-LSA support (RFC2370)" off \ - RTADV "IPv6 Router Advertisements" off \ - SNMP "SNMP support" off \ - TCPSOCKETS "Use TCP/IP sockets for protocol daemons" off \ - DLMALLOC "Use dlmalloc (makes bgpd much faster)" off \ - NO_BGP_ANNOUNCE "Turn off BGP route announcement" off +OPTIONS_DEFINE= ISISD PAM OSPF_NSSA OSPF_OPAQUE_LSA RTADV SNMP TCPSOCKETS \ + DLMALLOC NO_BGP_ANNOUNCE + +ISISD_DESC= Enable experimental ISIS daemon +PAM_DESC= PAM authentication for vtysh +OSPF_NSSA_DESC= NSSA support (RFC1587) +OSPF_OPAQUE_LSA_DESC= OSPF Opaque-LSA support (RFC2370) +RTADV_DESC= IPv6 Router Advertisements +SNMP_DESC= SNMP support +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 -.include +.include CFLAGS+= -I${LOCALBASE}/include .if ${OSVERSION} >= 800000 @@ -79,7 +85,7 @@ SCRIPTS_ENV= PREFIX=${PREFIX} PKG_PREFIX SYSCONF_DIR=${SYSCONF_DIR} SYSSTATE_DIR=${SYSSTATE_DIR} \ ENABLE_USER=${ENABLE_USER} ENABLE_GROUP=${ENABLE_GROUP} -.if defined(WITH_ISISD) +.if ${PORT_OPTIONS:MISISD} CONFIGURE_ARGS+=--enable-isisd PLIST_SUB+= ISISD="" .else @@ -87,15 +93,15 @@ PLIST_SUB+= ISISD="@comment " .endif MAN8+= isisd.8 -.if defined(WITH_PAM) +.if ${PORT_OPTIONS:MPAM} CONFIGURE_ARGS+=--with-libpam .endif -.if defined(WITH_OSPFNSSA) +.if ${PORT_OPTIONS:MOSPFNSSA} CONFIGURE_ARGS+=--enable-nssa .endif -.if defined(WITH_OSPF_OPAQUE_LSA) +.if ${PORT_OPTIONS:MOSPF_OPAQUE_LSA} CONFIGURE_ARGS+=--enable-opaque-lsa PLIST_SUB+= OSPFAPI="" .else @@ -103,20 +109,20 @@ CONFIGURE_ARGS+=--disable-opaque-lsa PLIST_SUB+= OSPFAPI="@comment " .endif -.if defined(WITH_RTADV) +.if ${PORT_OPTIONS:MRTADV} CONFIGURE_ARGS+=--enable-rtadv .endif -.if defined(WITH_SNMP) +.if ${PORT_OPTIONS:MSNMP} CONFIGURE_ARGS+=--enable-snmp LIB_DEPENDS+=netsnmp:${PORTSDIR}/net-mgmt/net-snmp .endif -.if defined(WITH_TCPSOCKETS) +.if ${PORT_OPTIONS:MTCPSOCKETS} CONFIGURE_ARGS+=--enable-tcp-zebra .endif -.if defined(WITH_DLMALLOC) +.if ${PORT_OPTIONS:MDLMALLOC} LIB_DEPENDS+=dlmalloc:${PORTSDIR}/devel/libdlmalloc LDFLAGS+=-ldlmalloc SUB_LIST= RCLDCONFIG=ldconfig @@ -124,7 +130,7 @@ SUB_LIST= RCLDCONFIG=ldconfig SUB_LIST= RCLDCONFIG= .endif -.if defined(WITH_NO_BGP_ANNOUNCE) +.if ${PORT_OPTIONS:MNO_BGP_ANNOUNCE} CONFIGURE_ARGS+=--disable-bgp-announce .endif @@ -148,16 +154,6 @@ pre-everything:: @${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" - @${ECHO} - @${ECHO} "The following options may be configured interactively:" - @${ECHO} " WITH_PAM PAM authentication for vtysh" - @${ECHO} " WITH_OSPF_NSSA NSSA support (RFC1587)" - @${ECHO} " WITH_OSPF_OPAQUE_LSA OSPF Opaque-LSA with OSPFAPI support (RFC2370)" - @${ECHO} " WITH_RTADV IPv6 Router Advertisements" - @${ECHO} " WITH_SNMP SNMP support" - @${ECHO} " WITH_TCPSOCKETS Use TCP/IP sockets for protocol daemons" - @${ECHO} " WITH_DLMALLOC Use dlmalloc (makes bgpd much faster)" - @${ECHO} " WITH_NO_BGP_ANNOUNCE Turn off BGP route announcement" post-install: @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @@ -181,4 +177,4 @@ post-clean: @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc .endif -.include +.include