From owner-svn-ports-all@freebsd.org Thu Jan 7 14:15:46 2016 Return-Path: Delivered-To: svn-ports-all@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 D44C4A665FF; Thu, 7 Jan 2016 14:15:46 +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 AEE7F180F; Thu, 7 Jan 2016 14:15:46 +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 u07EFjat015582; Thu, 7 Jan 2016 14:15:45 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u07EFjnx015580; Thu, 7 Jan 2016 14:15:45 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201601071415.u07EFjnx015580@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:15:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r405439 - in head/net/ntp: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jan 2016 14:15:47 -0000 Author: koobs Date: Thu Jan 7 14:15:45 2016 New Revision: 405439 URL: https://svnweb.freebsd.org/changeset/ports/405439 Log: net/ntp: 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 - Patch sntp tests to ensure they link correctly to threading library - Pet portlint (*_DEPENDS order, group USE{S} sections, sort OPTIONS) Approved by: cy (maintainer) Differential Revision: D4812 MFH: 2016Q1 Added: head/net/ntp/files/patch-sntp_tests_Makefile.in (contents, props changed) Modified: head/net/ntp/Makefile Modified: head/net/ntp/Makefile ============================================================================== --- head/net/ntp/Makefile Thu Jan 7 14:07:16 2016 (r405438) +++ head/net/ntp/Makefile Thu Jan 7 14:15:45 2016 (r405439) @@ -3,6 +3,7 @@ PORTNAME= ntp PORTVERSION= 4.2.8p4 +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/ \ @@ -12,12 +13,16 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/P/ MAINTAINER= cy@FreeBSD.org COMMENT= The Network Time Protocol Distribution +LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 + CONFLICTS= ntp-rc-* ntp-devel-* -GNU_CONFIGURE= yes -OPTIONS_SUB= yes USES= cpe pathfix shebangfix libedit libtool pkgconfig -LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 + +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-silent-rules + +TEST_TARGET= check SHEBANG_FILES= scripts/ntptrace/ntptrace.in \ scripts/ntp-wait/ntp-wait.in \ @@ -26,20 +31,32 @@ perl_OLD_CMD= @PATH_PERL@ .include "Makefile.inc" -PERL_UTILS_USES= perl5 +OPTIONS_DEFINE+= DEBUG NLS THREADS +OPTIONS_DEFAULT+= THREADS +OPTIONS_SUB= yes -SSL_USE= OPENSSL=yes -SSL_CONFIGURE_OFF= --without-crypto +DEBUG_CONFIGURE_ENABLE= debugging 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 +PERL_UTILS_USES= perl5 + +SSL_USE= OPENSSL=yes SSL_CONFIGURE_ON= --with-openssl-incdir=${OPENSSLINC} \ --with-openssl-libdir=${OPENSSLLIB} +SSL_CONFIGURE_OFF= --without-crypto + +THREADS_CONFIGURE_ENABLE= thread-support +THREADS_CONFIGURE_WITH= threads .for D in ${NTP_DRIVERS} ${D}_CONFIGURE_ON= --enable-${D} @@ -47,12 +64,12 @@ ${D}_CONFIGURE_ON= --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 | \ Added: head/net/ntp/files/patch-sntp_tests_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/ntp/files/patch-sntp_tests_Makefile.in Thu Jan 7 14:15:45 2016 (r405439) @@ -0,0 +1,10 @@ +--- sntp/tests/Makefile.in.orig 2015-10-27 12:47:07 UTC ++++ sntp/tests/Makefile.in +@@ -791,6 +791,7 @@ LDADD = \ + $(base_LDADD) \ + $(top_builddir)/unity/libunity.a \ + $(LIBM) \ ++ $(PTHREAD_LIBS) \ + $(NULL) + + AM_CFLAGS = $(CFLAGS_NTP)