From 307a42886523a127918a9cb474997a8e1e191f04 Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Tue, 5 May 2015 16:20:37 +0000 Subject: Rework r385426: - The include/event2 directory was being created improperly due to the lack of a pkgconfig dependency. Add it to USES. - Remove WRKSRC from SHEBANG list. Reported by: many --- net/ntp-devel/Makefile | 10 +++++----- net/ntp-devel/pkg-plist | 1 - net/ntp/Makefile | 10 +++++----- net/ntp/pkg-plist | 1 - 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/net/ntp-devel/Makefile b/net/ntp-devel/Makefile index 5942c0419889..1a7c1e946314 100644 --- a/net/ntp-devel/Makefile +++ b/net/ntp-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= ntp PORTVERSION= 4.3.20 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net ipv6 MASTER_SITES= http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-dev/ \ http://archive.ntp.org/ntp4/ntp-dev/ @@ -17,12 +17,12 @@ CONFLICTS= ntp-[0-9].* ntp-rc-* GNU_CONFIGURE= yes OPTIONS_SUB= yes -USES= cpe pathfix shebangfix libtool +USES= cpe pathfix shebangfix libtool pkgconfig LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 -SHEBANG_FILES= ${WRKSRC}/scripts/ntptrace/ntptrace.in \ - ${WRKSRC}/scripts/ntp-wait/ntp-wait.in \ - ${WRKSRC}/scripts/update-leap/update-leap +SHEBANG_FILES= scripts/ntptrace/ntptrace.in \ + scripts/ntp-wait/ntp-wait.in \ + scripts/update-leap/update-leap perl_OLD_CMD= @PATH_PERL@ .include "Makefile.inc" diff --git a/net/ntp-devel/pkg-plist b/net/ntp-devel/pkg-plist index 7d1a7c0de7ac..a2d9109de8b7 100644 --- a/net/ntp-devel/pkg-plist +++ b/net/ntp-devel/pkg-plist @@ -497,4 +497,3 @@ sbin/update-leap %%EXAMPLESDIR%%/malarky.conf %%EXAMPLESDIR%%/pogo.conf %%EXAMPLESDIR%%/rackety.conf -@dir include/event2 diff --git a/net/ntp/Makefile b/net/ntp/Makefile index f5fee542449b..d72e8ab77e07 100644 --- a/net/ntp/Makefile +++ b/net/ntp/Makefile @@ -3,7 +3,7 @@ PORTNAME= ntp PORTVERSION= 4.2.8p2 -PORTREVISION= 1 +PORTREVISION= 2 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/ \ @@ -17,12 +17,12 @@ CONFLICTS= ntp-rc-* ntp-devel-* GNU_CONFIGURE= yes OPTIONS_SUB= yes -USES= cpe pathfix shebangfix libtool +USES= cpe pathfix shebangfix libtool pkgconfig LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 -SHEBANG_FILES= ${WRKSRC}/scripts/ntptrace/ntptrace.in \ - ${WRKSRC}/scripts/ntp-wait/ntp-wait.in \ - ${WRKSRC}/scripts/update-leap/update-leap +SHEBANG_FILES= scripts/ntptrace/ntptrace.in \ + scripts/ntp-wait/ntp-wait.in \ + scripts/update-leap/update-leap perl_OLD_CMD= @PATH_PERL@ .include "Makefile.inc" diff --git a/net/ntp/pkg-plist b/net/ntp/pkg-plist index 7d1a7c0de7ac..a2d9109de8b7 100644 --- a/net/ntp/pkg-plist +++ b/net/ntp/pkg-plist @@ -497,4 +497,3 @@ sbin/update-leap %%EXAMPLESDIR%%/malarky.conf %%EXAMPLESDIR%%/pogo.conf %%EXAMPLESDIR%%/rackety.conf -@dir include/event2 -- cgit v1.2.3