ports/72589: [MAINTAINER UPDATE] sysutils/estctrl

[Colin Percival]

>Number:         72589
>Category:       ports
>Synopsis:       [MAINTAINER UPDATE] sysutils/estctrl
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 12 17:40:23 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Colin Percival
>Release:        FreeBSD 5.2.1-SECURITY i386
>Organization:
>Environment:
System: FreeBSD hexahedron.daemonology.net 5.2.1-SECURITY FreeBSD 5.2.1-SECURITY #0: Tue Sep 28 17:27:41 GMT 2004 root at builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386
>Description:

Fix build on 4.x machines.

>How-To-Repeat:
>Fix:

One patch to Makefile, one new file added under files/

--- estctrl.diff begins here ---
Index: Makefile
===================================================================
RCS file: /usr/cvsroot/ports/sysutils/estctrl/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- Makefile	2 Sep 2004 04:16:40 -0000	1.1
+++ Makefile	12 Oct 2004 17:27:46 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	estctrl
 PORTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.daemonology.net/freebsd-est/
 
@@ -25,6 +26,12 @@
 
 MAKE_ENV=	BINDIR=${PREFIX}/sbin
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500101
+EXTRA_PATCHES=	${FILESDIR}/estctrl.c.diff.fbsd4
+.endif
+
 post-extract:
 	${SED}	${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/}	\
 		${FILESDIR}/estctrl.sh > ${WRKDIR}/estctrl.sh
@@ -33,4 +40,4 @@
 	${INSTALL_SCRIPT} ${WRKDIR}/estctrl.sh ${PREFIX}/etc/rc.d/estctrl.sh
 	${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: files/estctrl.c.diff.fbsd4
===================================================================
RCS file: files/estctrl.c.diff.fbsd4
diff -N files/estctrl.c.diff.fbsd4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/estctrl.c.diff.fbsd4	12 Oct 2004 17:03:14 -0000
@@ -0,0 +1,11 @@
+--- estctrl.c.orig	Tue Oct 12 17:46:13 2004
++++ estctrl.c	Tue Oct 12 17:46:21 2004
+@@ -28,7 +28,7 @@
+  */
+ 
+ #include <sys/types.h>
+-#include <sys/resource.h>
++#include <sys/dkstat.h>
+ #include <sys/sysctl.h>
+ 
+ #include<err.h>
--- estctrl.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: