svn commit: r315756 - in head/net: ntp ntp-devel ntp-rc

[Baptiste Daroussin]

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
> 
> 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

> 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 <bsd.port.options.mk>
>  
> -.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 <bsd.port.options.mk>
>  
> -.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 <bsd.port.options.mk>
>  
> -.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 | \

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-head/attachments/20130408/e7e44883/attachment.sig>