ports/71853: [PATCH] security/bro: unbreak

[Yen-Ming Lee]

>Number:         71853
>Category:       ports
>Synopsis:       [PATCH] security/bro: unbreak
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Sep 18 07:50:12 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Yen-Ming Lee
>Release:        FreeBSD 5.3-BETA4 i386
>Organization:
FreeBSD Taiwan
>Environment:
System: FreeBSD utopia.leeym.com 5.3-BETA4 FreeBSD 5.3-BETA4 #7: Mon Sep 13 05:12:30 CST 2004
>Description:

- unbreak this port on 5.x

Added file(s):
- files/patch-Conn.h

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- bro-0.8_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/security/bro/Makefile,v
retrieving revision 1.25
diff -u -u -r1.25 Makefile
--- Makefile	17 Sep 2004 23:02:58 -0000	1.25
+++ Makefile	18 Sep 2004 07:47:18 -0000
@@ -26,20 +26,18 @@
 USE_BISON=	yes
 USE_PERL5=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 502126
-BROKEN=		"Does not compile on FreeBSD >= 5.x"
-.endif
-
 post-extract:
-	@(cd ${WRKSRC} && ${TAR} xfvz libedit.src.tar.gz > /dev/null)
+	@cd ${WRKSRC} && ${TAR} xfz libedit.src.tar.gz
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|CFLAGS+=-g -O0||g; \
 		s|CC=gcc||' \
 		${WRKSRC}/libedit/Makefile.in \
 		${WRKSRC}/libedit/Makefile
+	@${REINPLACE_CMD} -e "s,tr '\[a-z\]' '\[A-Z\]',tr 'a-z' 'A-Z',g" \
+		${WRKSRC}/libedit/makelist
+	@${REINPLACE_CMD} -E -e 's,(const char\*) const (helpstring),\1 \2,g' \
+		${WRKSRC}/DebugCmds.h
 
 pre-configure:
 	@${ECHO_CMD} "Configure libedit..."
@@ -61,4 +59,4 @@
 	@${GZIP_CMD} ${DOCSDIR}/bro-CN99.ps
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: files/patch-Conn.h
===================================================================
RCS file: files/patch-Conn.h
diff -N files/patch-Conn.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-Conn.h	18 Sep 2004 07:47:18 -0000
@@ -0,0 +1,20 @@
+--- Conn.h.orig	Sat Sep 18 15:42:16 2004
++++ Conn.h	Sat Sep 18 15:42:30 2004
+@@ -223,6 +223,8 @@
+ 		return 1;
+ 		}
+ 
++	void DeleteTimer(double t);
++
+ protected:
+ 	virtual void UpdateEndpointVal(RecordVal* endp, int is_orig) = 0;
+ 
+@@ -235,8 +237,6 @@
+ 
+ 	friend class ConnectionTimer;
+ 	void RemoveTimer(Timer* t);
+-
+-	void DeleteTimer(double t);
+ 
+ 	void InactivityTimer(double t);
+ 
--- bro-0.8_1.patch ends here ---

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