ports/75320: Patch to allow building on 6.0-CURRENT

[Thomas Quinot]

>Number:         75320
>Category:       ports
>Synopsis:       Patch to allow building on 6.0-CURRENT
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 20 17:20:27 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Thomas Quinot
>Release:        FreeBSD 5.2.1-RELEASE-p5 i386
>Organization:
>Environment:
System: FreeBSD melusine.cuivre.fr.eu.org 5.2.1-RELEASE-p5 FreeBSD 5.2.1-RELEASE-p5 #1: Sat May 22 22:28:16 CEST 2004 thomas at melusine.cuivre.fr.eu.org:/usr2/obj/usr2/src/RELENG_5_2/sys/MELUSINE i386


	
>Description:
	This change unbreaks the build of proxy-suite on 6.0-CURRENT.
>How-To-Repeat:
	
>Fix:

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/net/proxy-suite/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- Makefile	18 Nov 2004 22:24:55 -0000	1.16
+++ Makefile	20 Dec 2004 17:10:59 -0000
@@ -59,10 +59,6 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 600000
-BROKEN=		"Does not build on FreeBSD >= 6.x"
-.endif
-
 pre-install:
 	@${STRIP_CMD} ${WRKSRC}/ftp-proxy/ftp-proxy
 
Index: files/patch-com-socket.c
===================================================================
RCS file: files/patch-com-socket.c
diff -N files/patch-com-socket.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-com-socket.c	20 Dec 2004 17:10:59 -0000
@@ -0,0 +1,12 @@
+--- common/com-socket.c	Tue Mar 30 12:31:32 2004
++++ common/com-socket.c	Mon Dec 20 17:33:39 2004
+@@ -84,6 +84,9 @@
+ #if defined(HAVE_STROPTS_H)
+ #   include <stropts.h>
+ #endif
++#if defined(HAVE_SYS_PARAM_H)
++#   include <sys/param.h>
++#endif
+ #if defined(HAVE_SYS_CONF_H)
+ #   include <sys/conf.h>
+ #endif
Index: files/patch-config.h.in
===================================================================
RCS file: files/patch-config.h.in
diff -N files/patch-config.h.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-config.h.in	20 Dec 2004 17:10:59 -0000
@@ -0,0 +1,12 @@
+--- config.h.in.dist	Mon Dec 20 17:44:59 2004
++++ config.h.in	Mon Dec 20 17:44:36 2004
+@@ -157,6 +157,9 @@
+ /* Define to 1 if you have the <syslog.h> header file. */
+ #undef HAVE_SYSLOG_H
+ 
++/* Define to 1 if you have the <sys/param.h> header file. */
++#undef HAVE_SYS_PARAM_H
++
+ /* Define to 1 if you have the <sys/conf.h> header file. */
+ #undef HAVE_SYS_CONF_H
+ 
Index: files/patch-configure.in
===================================================================
RCS file: /home/pcvs/ports/net/proxy-suite/files/patch-configure.in,v
retrieving revision 1.1
diff -u -r1.1 patch-configure.in
--- files/patch-configure.in	23 Mar 2004 08:56:57 -0000	1.1
+++ files/patch-configure.in	20 Dec 2004 17:10:59 -0000
@@ -1,7 +1,11 @@
---- configure.in.orig	Fri Mar 19 00:41:20 2004
-+++ configure.in	Fri Mar 19 00:41:36 2004
-@@ -204,7 +204,7 @@
- AC_CHECK_HEADERS(sys/filio.h sys/conf.h paths.h stropts.h)
+--- configure.in	Tue Mar 30 12:31:31 2004
++++ configure.in	Mon Dec 20 17:35:02 2004
+@@ -201,10 +201,10 @@
+ AC_HEADER_TIME
+ AC_CHECK_HEADERS(sys/time.h sys/select.h fcntl.h sys/fcntl.h)
+ 
+-AC_CHECK_HEADERS(sys/filio.h sys/conf.h paths.h stropts.h)
++AC_CHECK_HEADERS(sys/filio.h sys/param.h sys/conf.h paths.h stropts.h)
  AC_CHECK_HEADERS(sys/sockio.h)
  
 -AC_CHECK_HEADERS(net/if.h net/pfvar.h netinet/in_systm.h)


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