ports/60871: Fix net/pxe on 5.X

[Samy Al Bahra]

>Number:         60871
>Category:       ports
>Synopsis:       Fix net/pxe on 5.X
>Confidential:   no
>Severity:       critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 03 13:10:07 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Samy Al Bahra
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
Kerneled 
>Environment:


System: FreeBSD beastie.freebsd.local 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Wed Aug 20 18:35:24 AST 2003     samy at beastie.freebsd.local:/usr/src/sys/i386/compile/KERNELED i386


>Description:


net/pxe does not build on 5.X systems
due to subset-style decleration being
used (depreciated in gcc 3.X). The
patch that follows fixes this issue by
removing redundant braces and properly
defining array of pointers.


>How-To-Repeat:


Build with gcc 3.X.


>Fix:


--- pxe.patch begins here ---
diff -ruN pxe/Makefile /home/samy/tmp/pxe/Makefile
--- pxe/Makefile	Mon Dec 22 05:07:01 2003
+++ /home/samy/tmp/pxe/Makefile	Sat Jan  3 17:26:37 2004
@@ -21,12 +21,6 @@
 
 DOCS=	Changes INSTALL LICENCE README
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=		"Does not compile on FreeBSD ${OSVERSION}"
-.endif
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pxe ${PREFIX}/sbin/
 	${INSTALL_DATA} ${WRKSRC}/pxe.conf ${PREFIX}/etc/pxe.conf.sample
@@ -37,4 +31,4 @@
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN pxe/files/patch-packetstore.cc /home/samy/tmp/pxe/files/patch-packetstore.cc
--- pxe/files/patch-packetstore.cc	Thu Jan  1 03:00:00 1970
+++ /home/samy/tmp/pxe/files/patch-packetstore.cc	Sat Jan  3 17:26:04 2004
@@ -0,0 +1,15 @@
+--- packetstore.cc.orig	Sat Jan  3 17:24:11 2004
++++ packetstore.cc	Sat Jan  3 17:25:31 2004
+@@ -26,9 +26,9 @@
+ /* some global variables */
+ const char *DHCP_types[DHCP_MAX_TYPES] = 
+ {
+-	{"INVALID"}, {"DHCPDISCOVER"}, {"DHCPOFFER"}, {"DHCPREQUEST"},
+-	{"DHCPDECLINE"}, {"DHCPACK"}, {"DHCPNACK"}, {"DHCPRELEASE"},
+-	{"DHCPINFORM"}
++	"INVALID", "DHCPDISCOVER", "DHCPOFFER", "DHCPREQUEST",
++	"DHCPDECLINE", "DHCPACK", "DHCPNACK", "DHCPRELEASE",
++	"DHCPINFORM"
+ };
+ 
+ /******************************************************************************
--- pxe.patch ends here ---



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