Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 2 Sep 2015 14:54:29 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r395852 - head/net/ntp
Message-ID:  <201509021454.t82EsTnd062312@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Wed Sep  2 14:54:28 2015
New Revision: 395852
URL: https://svnweb.freebsd.org/changeset/ports/395852

Log:
  - Switch to USES=libedit as suggested by stage-qa
  - Switch to options helpers
  
  Approved by:	portmgr blanket

Modified:
  head/net/ntp/Makefile

Modified: head/net/ntp/Makefile
==============================================================================
--- head/net/ntp/Makefile	Wed Sep  2 14:52:19 2015	(r395851)
+++ head/net/ntp/Makefile	Wed Sep  2 14:54:28 2015	(r395852)
@@ -3,6 +3,7 @@
 
 PORTNAME=	ntp
 PORTVERSION=	4.2.8p3
+PORTREVISION=	1
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ \
 		http://archive.ntp.org/ntp4/ntp-4.2/ \
@@ -16,7 +17,7 @@ CONFLICTS=	ntp-rc-* ntp-devel-*
 
 GNU_CONFIGURE=	yes
 OPTIONS_SUB=	yes
-USES=		cpe pathfix shebangfix libtool pkgconfig
+USES=		cpe pathfix shebangfix libedit libtool pkgconfig
 LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
 
 SHEBANG_FILES=	scripts/ntptrace/ntptrace.in \
@@ -37,17 +38,11 @@ NTP_SIGND_CONFIGURE_ENABLE=	ntp-signd
 NTPSNMPD_LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
 NTPSNMPD_CONFIGURE_OFF=	--without-ntpsnmpd
 
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MSSL}
-CONFIGURE_ARGS+=	--with-openssl-incdir=${OPENSSLINC} \
+SSL_CONFIGURE_ON=	--with-openssl-incdir=${OPENSSLINC} \
 			--with-openssl-libdir=${OPENSSLLIB}
-.endif
 
 .for D in ${NTP_DRIVERS}
-.if ${PORT_OPTIONS:M${D}}
-CONFIGURE_ARGS+=	--enable-${D}
-.endif
+${D}_CONFIGURE_ON=	--enable-${D}
 .endfor
 
 # XXX Temporary hack. Remember to remove this next commit.
@@ -63,4 +58,4 @@ post-install:
 	@cd ${WRKSRC}/html && ${FIND} . -print | \
 		${CPIO} -pdu -R ${SHAREOWN}:${SHAREGRP} --quiet ${STAGEDIR}${DOCSDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509021454.t82EsTnd062312>