From owner-svn-ports-all@FreeBSD.ORG Mon May 4 19:10:19 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 02C6B7EE; Mon, 4 May 2015 19:10:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 E48FF1736; Mon, 4 May 2015 19:10:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t44JAIYb083614; Mon, 4 May 2015 19:10:18 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t44JAHY1083608; Mon, 4 May 2015 19:10:17 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201505041910.t44JAHY1083608@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Mon, 4 May 2015 19:10:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r385426 - in head/net: ntp 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-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: Mon, 04 May 2015 19:10:19 -0000 Author: bdrewery Date: Mon May 4 19:10:17 2015 New Revision: 385426 URL: https://svnweb.freebsd.org/changeset/ports/385426 Log: - Fix orphaned include/event2 dir (likely an upstream error that it is created) - Fix shebang QA error when not using PERL_UTILS. This was broken in r374987. Error: '-w' is an invalid shebang you need USES=shebangfix for 'sbin/ntptrace' Must replace @PERL_PATH@ before install or it becomes a blank: '#! -w' Sponsored by: EMC / Isilon Storage Division Modified: head/net/ntp-devel/Makefile head/net/ntp-devel/pkg-plist head/net/ntp/Makefile head/net/ntp/pkg-plist Modified: head/net/ntp-devel/Makefile ============================================================================== --- head/net/ntp-devel/Makefile Mon May 4 18:36:04 2015 (r385425) +++ head/net/ntp-devel/Makefile Mon May 4 19:10:17 2015 (r385426) @@ -3,6 +3,7 @@ PORTNAME= ntp PORTVERSION= 4.3.20 +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/ @@ -19,7 +20,10 @@ OPTIONS_SUB= yes USES= cpe pathfix shebangfix libtool LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 -NTP_SHEBANG_FILES= sbin/ntp-wait sbin/ntptrace sbin/update-leap +SHEBANG_FILES= ${WRKSRC}/scripts/ntptrace/ntptrace.in \ + ${WRKSRC}/scripts/ntp-wait/ntp-wait.in \ + ${WRKSRC}/scripts/update-leap/update-leap +perl_OLD_CMD= @PATH_PERL@ .include "Makefile.inc" @@ -60,7 +64,5 @@ post-install: @${FIND} ${WRKSRC}/html -type f | ${XARGS} ${CHMOD} ${SHAREMODE} @cd ${WRKSRC}/html && ${FIND} . -print | \ ${CPIO} -pdu -R ${SHAREOWN}:${SHAREGRP} --quiet ${STAGEDIR}${DOCSDIR} - @cd ${STAGEDIR}${PREFIX}; \ - ${ECHO_CMD} ${NTP_SHEBANG_FILES} | ${XARGS} ${SED} -i '' ${_SHEBANG_REINPLACE_ARGS} .include Modified: head/net/ntp-devel/pkg-plist ============================================================================== --- head/net/ntp-devel/pkg-plist Mon May 4 18:36:04 2015 (r385425) +++ head/net/ntp-devel/pkg-plist Mon May 4 19:10:17 2015 (r385426) @@ -497,3 +497,4 @@ sbin/update-leap %%EXAMPLESDIR%%/malarky.conf %%EXAMPLESDIR%%/pogo.conf %%EXAMPLESDIR%%/rackety.conf +@dir include/event2 Modified: head/net/ntp/Makefile ============================================================================== --- head/net/ntp/Makefile Mon May 4 18:36:04 2015 (r385425) +++ head/net/ntp/Makefile Mon May 4 19:10:17 2015 (r385426) @@ -3,6 +3,7 @@ PORTNAME= ntp PORTVERSION= 4.2.8p2 +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/ \ @@ -19,7 +20,10 @@ OPTIONS_SUB= yes USES= cpe pathfix shebangfix libtool LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 -NTP_SHEBANG_FILES= sbin/ntp-wait sbin/ntptrace sbin/update-leap +SHEBANG_FILES= ${WRKSRC}/scripts/ntptrace/ntptrace.in \ + ${WRKSRC}/scripts/ntp-wait/ntp-wait.in \ + ${WRKSRC}/scripts/update-leap/update-leap +perl_OLD_CMD= @PATH_PERL@ .include "Makefile.inc" @@ -60,7 +64,5 @@ post-install: @${FIND} ${WRKSRC}/html -type f | ${XARGS} ${CHMOD} ${SHAREMODE} @cd ${WRKSRC}/html && ${FIND} . -print | \ ${CPIO} -pdu -R ${SHAREOWN}:${SHAREGRP} --quiet ${STAGEDIR}${DOCSDIR} - @cd ${STAGEDIR}${PREFIX}; \ - ${ECHO_CMD} ${NTP_SHEBANG_FILES} | ${XARGS} ${SED} -i '' ${_SHEBANG_REINPLACE_ARGS} .include Modified: head/net/ntp/pkg-plist ============================================================================== --- head/net/ntp/pkg-plist Mon May 4 18:36:04 2015 (r385425) +++ head/net/ntp/pkg-plist Mon May 4 19:10:17 2015 (r385426) @@ -497,3 +497,4 @@ sbin/update-leap %%EXAMPLESDIR%%/malarky.conf %%EXAMPLESDIR%%/pogo.conf %%EXAMPLESDIR%%/rackety.conf +@dir include/event2