Date: Tue, 5 May 2015 15:39:50 +0900 From: Tomoaki AOKI <junchoon@dec.sakura.ne.jp> 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>
next in thread | raw e-mail | index | archive | help
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 <bsd.port.post.mk> > > 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 <bsd.port.post.mk> > > 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20150505153950.6e83d83656ed1088d59419c9>