From owner-svn-ports-all@FreeBSD.ORG Thu Jul 3 17:23:37 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5BC6F41E; Thu, 3 Jul 2014 17:23:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 303C8209E; Thu, 3 Jul 2014 17:23:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s63HNb7t072540; Thu, 3 Jul 2014 17:23:37 GMT (envelope-from adamw@svn.freebsd.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s63HNbjw072539; Thu, 3 Jul 2014 17:23:37 GMT (envelope-from adamw@svn.freebsd.org) Message-Id: <201407031723.s63HNbjw072539@svn.freebsd.org> From: Adam Weinberger Date: Thu, 3 Jul 2014 17:23:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360411 - head/net/ntp 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.18 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: Thu, 03 Jul 2014 17:23:37 -0000 Author: adamw Date: Thu Jul 3 17:23:36 2014 New Revision: 360411 URL: http://svnweb.freebsd.org/changeset/ports/360411 QAT: https://qat.redports.org/buildarchive/r360411/ Log: Use OPTIONS helpers. Approved by: portmgr (blanket) Modified: head/net/ntp/Makefile Modified: head/net/ntp/Makefile ============================================================================== --- head/net/ntp/Makefile Thu Jul 3 17:12:21 2014 (r360410) +++ head/net/ntp/Makefile Thu Jul 3 17:23:36 2014 (r360411) @@ -22,35 +22,27 @@ SHEBANG_FILES= ${WRKSRC}/scripts/ntptrac perl_OLD_CMD= @PATH_PERL@ GNU_CONFIGURE= yes USE_AUTOTOOLS= automake +OPTIONS_SUB= yes .include "Makefile.inc" -.include +NTPSNMPD_PLIST_FILES= bin/ntpsnmpd +NTPSNMPD_BUILD_DEPENDS= ${LOCALBASE}/include/net-snmp/net-snmp-config.h:${PORTSDIR}/net-mgmt/net-snmp +NTPSNMPD_RUN_DEPENDS= ${LOCALBASE}/include/net-snmp/net-snmp-config.h:${PORTSDIR}/net-mgmt/net-snmp +NTPSNMPD_CONFIGURE_OFF= --without-ntpsnmpd -.if ${PORT_OPTIONS:MNTPSNMPD} -PLIST_FILES+= bin/ntpsnmpd -BUILD_DEPENDS+= ${LOCALBASE}/include/net-snmp/net-snmp-config.h:${PORTSDIR}/net-mgmt/net-snmp -RUN_DEPENDS+= ${LOCALBASE}/include/net-snmp/net-snmp-config.h:${PORTSDIR}/net-mgmt/net-snmp -.else -CONFIGURE_ARGS+= --without-ntpsnmpd -.endif +SSL_USE= OPENSSL=yes +SSL_CONFIGURE_OFF= --without-crypto + +IPV6_CONFIGURE_ENABLE= ipv6 + +NTP_SIGND_CONFIGURE_ENABLE= ntp-signd + +.include .if ${PORT_OPTIONS:MSSL} -USE_OPENSSL= yes CONFIGURE_ARGS+= --with-openssl-incdir=${OPENSSLINC} \ --with-openssl-libdir=${OPENSSLLIB} -PLIST_SUB+= SSL="" -.else -CONFIGURE_ARGS+= --without-crypto -PLIST_SUB+= SSL="@comment " -.endif - -.if ${PORT_OPTIONS:MIPV6} -CONFIGURE_ARGS+= --enable-ipv6 -.endif - -.if ${PORT_OPTIONS:MNTP_SIGND} -CONFIGURE_ARGS+= --enable-ntp-signd .endif .for D in ${NTP_DRIVERS} @@ -68,11 +60,9 @@ post-patch: post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} @${INSTALL_DATA} ${WRKSRC}/conf/* ${STAGEDIR}${EXAMPLESDIR} -.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} @${FIND} ${WRKSRC}/html -type f | ${XARGS} ${CHMOD} ${SHAREMODE} @cd ${WRKSRC}/html && ${FIND} . -print | \ ${CPIO} -pdu -R ${SHAREOWN}:${SHAREGRP} --quiet ${STAGEDIR}${DOCSDIR} -.endif .include