From owner-svn-ports-head@FreeBSD.ORG Mon Apr 8 06:39:31 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 0D91CA04 for ; Mon, 8 Apr 2013 06:39:31 +0000 (UTC) (envelope-from bsd-src@helfman.org) Received: from mail-pa0-f53.google.com (mail-pa0-f53.google.com [209.85.220.53]) by mx1.freebsd.org (Postfix) with ESMTP id D96DF36F for ; Mon, 8 Apr 2013 06:39:30 +0000 (UTC) Received: by mail-pa0-f53.google.com with SMTP id bh4so3085131pad.40 for ; Sun, 07 Apr 2013 23:39:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:sender:date:from:to:cc:subject:message-id:references :mime-version:content-type:content-disposition:in-reply-to :x-operating-system:organization:x-living-the-dream :x-pgp-fingerprint:x-pgp-key:user-agent:x-gm-message-state; bh=dl8N7+ec4XUW2FdK1HG3gU4CiGUQA+18s4r+lZNePkA=; b=RFYvFNrw2PcIg1PmQE2+uIbXeubd1B1XfoMxj41a2bR9AGHsiHQsL/DAsBfc7dXsV6 LHIIaoKrOmKCnQRU13De0uL0eOai+lRja4IUtW4MaVXp1Hyj1Xug+L5jar59CEIuuwI8 c9LZW3oMFV1ZMjPN3ji71KJFzYmaN87NIuG1ZOF7wPRZpSBuzc11pjsDI53edrR1cM3p gm9ohA+HBV1ki3t7t0yHk6clrnw4t0SeljXkphe8kz1/Tb9VQaD9LiEcpLIYVQ0HrkVT KxmoEFoUMRRbfvt/S2UOCgMVcecwRRiMhrvYX1CHWk4Sy8HwOgriXIDmdzjJCBCKP5B6 i7qg== X-Received: by 10.66.246.168 with SMTP id xx8mr34152212pac.107.1365403169155; Sun, 07 Apr 2013 23:39:29 -0700 (PDT) Received: from hatter (adsl-64-161-57-202.dsl.snlo01.pacbell.net. [64.161.57.202]) by mx.google.com with ESMTPS id wl5sm19749868pac.18.2013.04.07.23.39.27 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 07 Apr 2013 23:39:28 -0700 (PDT) Sender: Jason Helfman Date: Sun, 7 Apr 2013 23:34:33 -0700 From: Jason Helfman To: Cy Schubert Subject: Re: svn commit: r315756 - in head/net: ntp ntp-devel ntp-rc Message-ID: <20130408063433.GA38357@hatter> References: <201304080510.r385Axhj037385@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="YiEDa0DAkWCtVeE4" Content-Disposition: inline In-Reply-To: <201304080510.r385Axhj037385@svn.freebsd.org> X-Operating-System: FreeBSD 9.0-RELEASE-p3 i386 Organization: The FreeBSD Project, http://www.freebsd.org X-Living-The-Dream: I love the SLO Life! X-PGP-FingerPrint: 8E0D C457 9A0F C91C 23F3 0454 2059 9A63 4150 D3DC X-PGP-Key: http://people.freebsd.org/~jgh/jgh.asc User-Agent: Mutt/1.5.21 (2010-09-15) X-Gm-Message-State: ALoCoQkD4yx4kKXb6awrzO1d86VDwYUgwu/IffTpjoMdPKqWni341Uq9c0p2T77PDVpCO7Nc0Zk1 Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, portmgr@FreeBSD.org, ports-committers@freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Apr 2013 06:39:31 -0000 --YiEDa0DAkWCtVeE4 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline On Mon, Apr 08, 2013 at 05:10:59AM +0000, Cy Schubert thus spake: >Author: cy >Date: Mon Apr 8 05:10:58 2013 >New Revision: 315756 >URL: http://svnweb.freebsd.org/changeset/ports/315756 > >Log: > - Convert to OptionsNG. > - Make NTP_SIGND option default. > - Add libevent2 library dependency to ntp-devel. > > Approved by: portmgr (miwi) > >Modified: > head/net/ntp-devel/Makefile > head/net/ntp-devel/Makefile.inc > head/net/ntp-rc/Makefile > head/net/ntp-rc/Makefile.inc > head/net/ntp/Makefile > head/net/ntp/Makefile.inc Please review the attached patch, as I believe this conversion wasn't complete. The old style of options is still present for conditional checking. Additionally, I have trimmed the historical header and added a tab where a space once was for libevent addition. Thank you for your consideration -jgh -- Jason Helfman FreeBSD Committer | http://people.freebsd.org/~jgh | The Power To Serve --YiEDa0DAkWCtVeE4 Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="ntp.diff" Index: net/ntp/Makefile =================================================================== --- net/ntp/Makefile (revision 315757) +++ net/ntp/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: ntp -# Date created: Di 5 Mai 1998 21:31:03 CEST -# Whom: andreas -# +# Created by: andreas # $FreeBSD$ -# PORTNAME= ntp PORTVERSION?= 4.2.6p5 @@ -34,7 +30,7 @@ .include -.if defined(WITH_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 @@ -42,26 +38,26 @@ CONFIGURE_ARGS+= --without-ntpsnmpd .endif -.if !defined(WITH_SSL) -CONFIGURE_ARGS+= --without-crypto -PLIST_SUB+= SSL="@comment " -.else +.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 !defined(DISABLE_IPV6) +.if ${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+= --enable-ipv6 .endif -.if defined(WITH_NTP_SIGND) +.if ${PORT_OPTIONS:MNTP_SIGND} CONFIGURE_ARGS+= --enable-ntp-signd .endif .for D in ${NTP_DRIVERS} -.if defined(WITH_${D}) +.if ${PORT_OPTIONS:M${D}} CONFIGURE_ARGS+= --enable-${D} .endif .endfor @@ -75,7 +71,7 @@ post-install: @${MKDIR} ${EXAMPLESDIR} @${INSTALL_DATA} ${WRKSRC}/conf/* ${EXAMPLESDIR} -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} @${FIND} ${WRKSRC}/html -type f | ${XARGS} ${CHMOD} ${SHAREMODE} @cd ${WRKSRC}/html && ${FIND} . -print | \ Index: net/ntp-devel/Makefile =================================================================== --- net/ntp-devel/Makefile (revision 315757) +++ net/ntp-devel/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: ntp -# Date created: Di 5 Mai 1998 21:31:03 CEST -# Whom: andreas -# +# Created by: andreas # $FreeBSD$ -# PORTNAME= ntp PORTVERSION= 4.2.7p364 @@ -23,7 +19,7 @@ GNU_CONFIGURE= yes USE_AUTOTOOLS= automake libtool USES= pathfix -LIB_DEPENDS= event-2.0:${PORTSDIR}/devel/libevent2 +LIB_DEPENDS= event-2.0:${PORTSDIR}/devel/libevent2 MAN5= ntp.conf.5 ntp.keys.5 MAN8= ntp-keygen.8 ntpd.8 ntpdc.8 ntpq.8 sntp.8 ntp-wait.8 @@ -32,25 +28,25 @@ .include -.if defined(WITHOUT_SSL) -CONFIGURE_ARGS+= --without-crypto -PLIST_SUB+= SSL="@comment " -.else +.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 !defined(DISABLE_IPV6) +.if ${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+= --enable-ipv6 .endif -.if defined(WITH_NTP_SIGND) +.if ${PORT_OPTIONS:MNTP_SIGND} CONFIGURE_ARGS+= --enable-ntp-signd .endif -.if defined(WITH_NTPSNMPD) +.if ${PORT_OPTIONS:MNTPSNMPD} PLIST_FILES+= sbin/ntpsnmpd MAN8+= ntpsnmpd.8 BUILD_DEPENDS+= ${LOCALBASE}/include/net-snmp/net-snmp-config.h:${PORTSDIR}/net-mgmt/net-snmp @@ -61,12 +57,12 @@ .endif .for D in ${NTP_DRIVERS} -.if defined(WITH_${D}) +.if ${PORT_OPTIONS:M${D}} CONFIGURE_ARGS+= --enable-${D} .endif .endfor -.if defined(WITH_MX4200) +.if ${PORT_OPTIONS:MMX4200} BROKEN= Fails to compile when MX4200 is enabled. .endif @@ -88,7 +84,7 @@ post-install: @${MKDIR} ${EXAMPLESDIR} @${INSTALL_DATA} ${WRKSRC}/conf/* ${EXAMPLESDIR} -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} @${FIND} ${WRKSRC}/html -type f | ${XARGS} ${CHMOD} ${SHAREMODE} @cd ${WRKSRC}/html && ${FIND} . -print | \ Index: net/ntp-rc/Makefile =================================================================== --- net/ntp-rc/Makefile (revision 315757) +++ net/ntp-rc/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: ntp -# Date created: Di 5 Mai 1998 21:31:03 CEST -# Whom: andreas -# +# Created by: andreas # $FreeBSD$ -# PORTNAME= ntp PORTVERSION?= 4.2.6p5.r1 @@ -35,7 +31,7 @@ .include -.if defined(WITH_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 @@ -43,26 +39,26 @@ CONFIGURE_ARGS+= --without-ntpsnmpd .endif -.if !defined(WITH_SSL) -CONFIGURE_ARGS+= --without-crypto -PLIST_SUB+= SSL="@comment " -.else +.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 !defined(DISABLE_IPV6) +.if ${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+= --enable-ipv6 .endif -.if defined(WITH_NTP_SIGND) +.if ${PORT_OPTIONS:MNTP_SIGND} CONFIGURE_ARGS+= --enable-ntp-signd .endif .for D in ${NTP_DRIVERS} -.if defined(WITH_${D}) +.if ${PORT_OPTIONS:M${D}} CONFIGURE_ARGS+= --enable-${D} .endif .endfor @@ -70,7 +66,7 @@ post-install: @${MKDIR} ${EXAMPLESDIR} @${INSTALL_DATA} ${WRKSRC}/conf/* ${EXAMPLESDIR} -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} @${FIND} ${WRKSRC}/html -type f | ${XARGS} ${CHMOD} ${SHAREMODE} @cd ${WRKSRC}/html && ${FIND} . -print | \ --YiEDa0DAkWCtVeE4--