svn commit: r385479 - in head/net: ntp ntp-devel

[Bryan Drewery]

Author: bdrewery
Date: Tue May  5 16:20:37 2015
New Revision: 385479
URL: https://svnweb.freebsd.org/changeset/ports/385479

Log:
  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

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	Tue May  5 16:16:31 2015	(r385478)
+++ head/net/ntp-devel/Makefile	Tue May  5 16:20:37 2015	(r385479)
@@ -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"

Modified: head/net/ntp-devel/pkg-plist
==============================================================================
--- head/net/ntp-devel/pkg-plist	Tue May  5 16:16:31 2015	(r385478)
+++ head/net/ntp-devel/pkg-plist	Tue May  5 16:20:37 2015	(r385479)
@@ -497,4 +497,3 @@ 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	Tue May  5 16:16:31 2015	(r385478)
+++ head/net/ntp/Makefile	Tue May  5 16:20:37 2015	(r385479)
@@ -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"

Modified: head/net/ntp/pkg-plist
==============================================================================
--- head/net/ntp/pkg-plist	Tue May  5 16:16:31 2015	(r385478)
+++ head/net/ntp/pkg-plist	Tue May  5 16:20:37 2015	(r385479)
@@ -497,4 +497,3 @@ sbin/update-leap
 %%EXAMPLESDIR%%/malarky.conf
 %%EXAMPLESDIR%%/pogo.conf
 %%EXAMPLESDIR%%/rackety.conf
- at dir include/event2