From owner-svn-ports-head@FreeBSD.ORG Tue May 5 07:32:13 2015 Return-Path: Delivered-To: svn-ports-head@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 C8CFAF99; Tue, 5 May 2015 07:32:13 +0000 (UTC) Received: from dec.sakura.ne.jp (dec.sakura.ne.jp [210.188.226.8]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 76D9F177E; Tue, 5 May 2015 07:32:13 +0000 (UTC) Received: from fortune.joker.local (180-199-46-187.nagoya1.commufa.jp [180.199.46.187]) (authenticated bits=0) by dec.sakura.ne.jp (8.14.3/8.14.2/[SAKURA-WEB]/20080708) with ESMTP id t456dpNx022752; Tue, 5 May 2015 15:39:52 +0900 (JST) (envelope-from junchoon@dec.sakura.ne.jp) Date: Tue, 5 May 2015 15:39:50 +0900 From: Tomoaki AOKI To: svn-ports-head@freebsd.org Cc: bdrewery@freebsd.org Subject: Re: svn commit: r385426 - in head/net: ntp ntp-devel Message-Id: <20150505153950.6e83d83656ed1088d59419c9@dec.sakura.ne.jp> Organization: Junchoon corps X-Mailer: Sylpheed 3.4.2 (GTK+ 2.24.27; amd64-portbld-freebsd10.1) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit 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: Tue, 05 May 2015 07:32:13 -0000 Hi. This broke install for me. My case is net/ntp, but net/ntp-devel would be affected, too. Fix: Remove last 1 line in pkg-plist (Added by this commit). In other words, revert pkg-plist. Detail: *net/ntp/work/stage/usr/local/include/event2 and its contents aren't created. This actual broke install. *net/ntp depends on devel/libevent2 and devel/libevent2 installs /usr/local/include/event2/*, mostly the same names as files in net/ntp/work/ntp-4.2.8p2/sntp/libevent/include/event2. So net/ntp should conflict with devel/libevent2 if net/ntp/work/stage/usr/local/include/event2 is created and installed. *devel/libevent2 is required by other ports (my case, www/libxul, www/firefox and www/chromium, together with net/ntp. So reverting pkg-plist should be preferred. > 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 > + at 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 > + at dir include/event2 -- Tomoaki AOKI junchoon@dec.sakura.ne.jp