svn commit: r385426 - in head/net: ntp ntp-devel
Bryan Drewery
bdrewery at FreeBSD.org
Mon May 4 19:10:19 UTC 2015
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
More information about the svn-ports-all
mailing list