From owner-svn-ports-head@freebsd.org Thu Jan 7 14:17:14 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B6E8DA66670; Thu, 7 Jan 2016 14:17:14 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 8FE9B1975; Thu, 7 Jan 2016 14:17:14 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u07EHDXc015771; Thu, 7 Jan 2016 14:17:13 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u07EHDCT015769; Thu, 7 Jan 2016 14:17:13 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201601071417.u07EHDCT015769@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Thu, 7 Jan 2016 14:17:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r405440 - head/net/ntp-devel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 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: Thu, 07 Jan 2016 14:17:14 -0000 Author: koobs Date: Thu Jan 7 14:17:13 2016 New Revision: 405440 URL: https://svnweb.freebsd.org/changeset/ports/405440 Log: net/ntp-devel: Fix untracked gettext dependency & lots more ntp links against gettext (libintl) if it is installed on the system: - Add an NLS OPTION to explicitly enable, disable and track libintl dependency - Add DEBUG and THREADS OPTIONS. Keep the latter enabled by OPTIONS_DEFAULT to preserve compatibility with existing behaviour. - Explicitly pass OpenSSL include / library dir paths to configure - Unsilence install command - Enable verbose building (--disable-silent-rules) - Use TOUCH variable instead of hardcoded command - Add TEST_TARGET to enable test suite - Pet portlint (*_DEPENDS order, group USE{S} sections, sort OPTIONS) Approved by: cy (maintainer) MFH: 2016Q1 Differential Revision: D4812 Modified: head/net/ntp-devel/Makefile head/net/ntp-devel/pkg-plist Modified: head/net/ntp-devel/Makefile ============================================================================== --- head/net/ntp-devel/Makefile Thu Jan 7 14:15:45 2016 (r405439) +++ head/net/ntp-devel/Makefile Thu Jan 7 14:17:13 2016 (r405440) @@ -3,6 +3,7 @@ PORTNAME= ntp PORTVERSION= 4.3.88 +PORTREVISION= 1 CATEGORIES= net ipv6 MASTER_SITES= http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-dev/ \ http://archive.ntp.org/ntp4/ntp-dev/ @@ -12,12 +13,19 @@ DISTNAME= ${PORTNAME}-dev-${PORTVERSION: MAINTAINER= cy@FreeBSD.org COMMENT= The Network Time Protocol Distribution +LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 + CONFLICTS= ntp-[0-9].* ntp-rc-* -GNU_CONFIGURE= yes -OPTIONS_SUB= yes USES= cpe pathfix shebangfix libedit libtool pkgconfig -LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 + +USE_OPENSSL= yes +USES+= gettext-runtime + +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-silent-rules + +TEST_TARGET= check SHEBANG_FILES= scripts/ntptrace/ntptrace.in \ scripts/ntp-wait/ntp-wait.in \ @@ -26,24 +34,32 @@ perl_OLD_CMD= @PATH_PERL@ .include "Makefile.inc" -PERL_UTILS_USES= perl5 - -SSL_USE= OPENSSL=yes -SSL_CONFIGURE_OFF= --without-crypto +OPTIONS_DEFINE+= DEBUG NLS THREADS +OPTIONS_DEFAULT+= THREADS +OPTIONS_SUB= yes IPV6_CONFIGURE_ENABLE= ipv6 +NLS_CONFIGURE_ENABLE= nls +NLS_CONFIGURE_OFF= ac_cv_lib_intl_gettext=no +NLS_USES= gettext-runtime + NTP_SIGND_CONFIGURE_ENABLE= ntp-signd NTPSNMPD_LIB_DEPENDS= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp NTPSNMPD_CONFIGURE_OFF= --without-ntpsnmpd -.include +PERL_UTILS_USES= perl5 -.if ${PORT_OPTIONS:MSSL} -CONFIGURE_ARGS+= --with-openssl-incdir=${OPENSSLINC} \ +SSL_USE= OPENSSL=yes +SSL_CONFIGURE_ON= --with-openssl-incdir=${OPENSSLINC} \ --with-openssl-libdir=${OPENSSLLIB} -.endif +SSL_CONFIGURE_OFF= --without-crypto + +THREADS_CONFIGURE_ENABLE= thread-support +THREADS_CONFIGURE_WITH= threads + +.include .for D in ${NTP_DRIVERS} .if ${PORT_OPTIONS:M${D}} @@ -53,12 +69,12 @@ CONFIGURE_ARGS+= --enable-${D} # XXX Temporary hack. Remember to remove this next commit. post-extract: - @/usr/bin/touch ${WRKSRC}/scripts/build/checkHtmlFileDates + @${TOUCH} ${WRKSRC}/scripts/build/checkHtmlFileDates @${CHMOD} +x ${WRKSRC}/scripts/build/checkHtmlFileDates post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - @${INSTALL_DATA} ${WRKSRC}/conf/* ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/conf/* ${STAGEDIR}${EXAMPLESDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR} @${FIND} ${WRKSRC}/html -type f | ${XARGS} ${CHMOD} ${SHAREMODE} @cd ${WRKSRC}/html && ${FIND} . -print | \ Modified: head/net/ntp-devel/pkg-plist ============================================================================== --- head/net/ntp-devel/pkg-plist Thu Jan 7 14:15:45 2016 (r405439) +++ head/net/ntp-devel/pkg-plist Thu Jan 7 14:17:13 2016 (r405440) @@ -499,4 +499,3 @@ sbin/update-leap %%EXAMPLESDIR%%/malarky.conf %%EXAMPLESDIR%%/pogo.conf %%EXAMPLESDIR%%/rackety.conf -