Date: Mon, 8 Apr 2013 09:03:07 +0200 From: Baptiste Daroussin <bapt@FreeBSD.org> To: Jason Helfman <jgh@FreeBSD.org> Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org, portmgr@FreeBSD.org, Cy Schubert <cy@FreeBSD.org> Subject: Re: svn commit: r315756 - in head/net: ntp ntp-devel ntp-rc Message-ID: <20130408070307.GB81897@ithaqua.etoilebsd.net> In-Reply-To: <20130408063433.GA38357@hatter> References: <201304080510.r385Axhj037385@svn.freebsd.org> <20130408063433.GA38357@hatter>
next in thread | previous in thread | raw e-mail | index | archive | help
--98e8jtXdkpgskNou Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Yes conversion wasn't complete, this patch makes it completes so if cy@ is = ok with it, you get the portmgr approval. regards, Bapt On Sun, Apr 07, 2013 at 11:34:33PM -0700, Jason Helfman wrote: > 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 >=20 > Please review the attached patch, as I believe this conversion wasn't > complete. The old style of options is still present for conditional > checking. >=20 > Additionally, I have trimmed the historical header and added a tab where a > space once was for libevent addition. >=20 > Thank you for your consideration >=20 > -jgh >=20 > --=20 > Jason Helfman > FreeBSD Committer | http://people.freebsd.org/~jgh | The Power To Serve > Index: net/ntp/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- 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$ > -# > =20 > PORTNAME=3D ntp > PORTVERSION?=3D 4.2.6p5 > @@ -34,7 +30,7 @@ > =20 > .include <bsd.port.options.mk> > =20 > -.if defined(WITH_NTPSNMPD) > +.if ${PORT_OPTIONS:MNTPSNMPD} > PLIST_FILES+=3D bin/ntpsnmpd > BUILD_DEPENDS+=3D ${LOCALBASE}/include/net-snmp/net-snmp-config.h:${POR= TSDIR}/net-mgmt/net-snmp > RUN_DEPENDS+=3D ${LOCALBASE}/include/net-snmp/net-snmp-config.h:${PORTS= DIR}/net-mgmt/net-snmp > @@ -42,26 +38,26 @@ > CONFIGURE_ARGS+=3D --without-ntpsnmpd > .endif > =20 > -.if !defined(WITH_SSL) > -CONFIGURE_ARGS+=3D --without-crypto > -PLIST_SUB+=3D SSL=3D"@comment " > -.else > +.if ${PORT_OPTIONS:MSSL} > USE_OPENSSL=3D yes > CONFIGURE_ARGS+=3D --with-openssl-incdir=3D${OPENSSLINC} \ > --with-openssl-libdir=3D${OPENSSLLIB} > PLIST_SUB+=3D SSL=3D"" > +.else > +CONFIGURE_ARGS+=3D --without-crypto > +PLIST_SUB+=3D SSL=3D"@comment " > .endif > =20 > -.if !defined(DISABLE_IPV6) > +.if ${PORT_OPTIONS:MIPV6} > CONFIGURE_ARGS+=3D --enable-ipv6 > .endif > =20 > -.if defined(WITH_NTP_SIGND) > +.if ${PORT_OPTIONS:MNTP_SIGND} > CONFIGURE_ARGS+=3D --enable-ntp-signd > .endif > =20 > .for D in ${NTP_DRIVERS} > -.if defined(WITH_${D}) > +.if ${PORT_OPTIONS:M${D}} > CONFIGURE_ARGS+=3D --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 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- 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$ > -# > =20 > PORTNAME=3D ntp > PORTVERSION=3D 4.2.7p364 > @@ -23,7 +19,7 @@ > GNU_CONFIGURE=3D yes > USE_AUTOTOOLS=3D automake libtool > USES=3D pathfix > -LIB_DEPENDS=3D event-2.0:${PORTSDIR}/devel/libevent2 > +LIB_DEPENDS=3D event-2.0:${PORTSDIR}/devel/libevent2 > =20 > MAN5=3D ntp.conf.5 ntp.keys.5 > MAN8=3D ntp-keygen.8 ntpd.8 ntpdc.8 ntpq.8 sntp.8 ntp-wait.8 > @@ -32,25 +28,25 @@ > =20 > .include <bsd.port.options.mk> > =20 > -.if defined(WITHOUT_SSL) > -CONFIGURE_ARGS+=3D --without-crypto > -PLIST_SUB+=3D SSL=3D"@comment " > -.else > +.if ${PORT_OPTIONS:MSSL} > USE_OPENSSL=3D yes > CONFIGURE_ARGS+=3D --with-openssl-incdir=3D${OPENSSLINC} \ > --with-openssl-libdir=3D${OPENSSLLIB} > PLIST_SUB+=3D SSL=3D"" > +.else > +CONFIGURE_ARGS+=3D --without-crypto > +PLIST_SUB+=3D SSL=3D"@comment " > .endif > =20 > -.if !defined(DISABLE_IPV6) > +.if ${PORT_OPTIONS:MIPV6} > CONFIGURE_ARGS+=3D --enable-ipv6 > .endif > =20 > -.if defined(WITH_NTP_SIGND) > +.if ${PORT_OPTIONS:MNTP_SIGND} > CONFIGURE_ARGS+=3D --enable-ntp-signd > .endif > =20 > -.if defined(WITH_NTPSNMPD) > +.if ${PORT_OPTIONS:MNTPSNMPD} > PLIST_FILES+=3D sbin/ntpsnmpd > MAN8+=3D ntpsnmpd.8 > BUILD_DEPENDS+=3D ${LOCALBASE}/include/net-snmp/net-snmp-config.h:${POR= TSDIR}/net-mgmt/net-snmp > @@ -61,12 +57,12 @@ > .endif > =20 > .for D in ${NTP_DRIVERS} > -.if defined(WITH_${D}) > +.if ${PORT_OPTIONS:M${D}} > CONFIGURE_ARGS+=3D --enable-${D} > .endif > .endfor > =20 > -.if defined(WITH_MX4200) > +.if ${PORT_OPTIONS:MMX4200} > BROKEN=3D Fails to compile when MX4200 is enabled. > .endif > =20 > @@ -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 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- 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$ > -# > =20 > PORTNAME=3D ntp > PORTVERSION?=3D 4.2.6p5.r1 > @@ -35,7 +31,7 @@ > =20 > .include <bsd.port.options.mk> > =20 > -.if defined(WITH_NTPSNMPD) > +.if ${PORT_OPTIONS:MNTPSNMPD} > PLIST_FILES+=3D bin/ntpsnmpd > BUILD_DEPENDS+=3D ${LOCALBASE}/include/net-snmp/net-snmp-config.h:${POR= TSDIR}/net-mgmt/net-snmp > RUN_DEPENDS+=3D ${LOCALBASE}/include/net-snmp/net-snmp-config.h:${PORTS= DIR}/net-mgmt/net-snmp > @@ -43,26 +39,26 @@ > CONFIGURE_ARGS+=3D --without-ntpsnmpd > .endif > =20 > -.if !defined(WITH_SSL) > -CONFIGURE_ARGS+=3D --without-crypto > -PLIST_SUB+=3D SSL=3D"@comment " > -.else > +.if ${PORT_OPTIONS:MSSL} > USE_OPENSSL=3D yes > CONFIGURE_ARGS+=3D --with-openssl-incdir=3D${OPENSSLINC} \ > --with-openssl-libdir=3D${OPENSSLLIB} > PLIST_SUB+=3D SSL=3D"" > +.else > +CONFIGURE_ARGS+=3D --without-crypto > +PLIST_SUB+=3D SSL=3D"@comment " > .endif > =20 > -.if !defined(DISABLE_IPV6) > +.if ${PORT_OPTIONS:MIPV6} > CONFIGURE_ARGS+=3D --enable-ipv6 > .endif > =20 > -.if defined(WITH_NTP_SIGND) > +.if ${PORT_OPTIONS:MNTP_SIGND} > CONFIGURE_ARGS+=3D --enable-ntp-signd > .endif > =20 > .for D in ${NTP_DRIVERS} > -.if defined(WITH_${D}) > +.if ${PORT_OPTIONS:M${D}} > CONFIGURE_ARGS+=3D --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 | \ --98e8jtXdkpgskNou Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iEYEARECAAYFAlFia6sACgkQ8kTtMUmk6EwkbwCeKlSADYTeFWuSWSPttSZb7YHB V/UAnii0XgEYCySpglccTzKfr/Ib8S3C =FX1K -----END PGP SIGNATURE----- --98e8jtXdkpgskNou--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130408070307.GB81897>