ports/117821: fix emulators/vxtools build with gcc4

[Juergen Lock]

>Number:         117821
>Category:       ports
>Synopsis:       fix emulators/vxtools build with gcc4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 04 17:30:01 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator:     Juergen Lock
>Release:        FreeBSD 6.2-RELEASE-p8 i386
>Organization:
me?  organized??
>Environment:
System: FreeBSD saturn 6.2-RELEASE-p8 FreeBSD 6.2-RELEASE-p8 #0: Wed Oct 17 18:53:56 CEST 2007 nox at saturn:/usr/obj/usr/home/nox/62new/usr/src/sys/GENERICua i386


>Description:
	This fixes the build with gcc4.
>How-To-Repeat:
	http://pointyhat.freebsd.org/errorlogs/amd64-errorlogs/e.7.2007101603/vxtools-0.2_1.log
>Fix:

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/emulators/vxtools/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile	2 Oct 2007 05:20:32 -0000	1.5
+++ Makefile	4 Nov 2007 16:39:57 -0000
@@ -34,10 +34,4 @@
 	@ ${INSTALL_MAN} ${WRKSRC}/vxmount.1 ${PREFIX}/man/man1
 	@ ${INSTALL_MAN} ${WRKSRC}/vxumount.1 ${PREFIX}/man/man1
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-BROKEN=		Does not compile with GCC 4.2
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: files/patch-olt.c
@@ -0,0 +1,10 @@
+Index: olt.c
+@@ -85,7 +85,7 @@
+ 				case VXFS_OLTSB:
+ 					break;
+ 				}
+-			(int) ent += ent->oltcommon.size;
++			ent = (union vxfs_oltent *) ((unsigned long) ent) + ent->oltcommon.size;
+ 		}
+ 
+ 	if (vxdebug)
Index: files/patch-dir.c
@@ -0,0 +1,10 @@
+Index: dir.c
+@@ -105,7 +105,7 @@
+ 					if (direct->ino)
+ 						filldir (dir, direct->name, direct->namelen, direct->ino);
+ 
+-					(char *) direct += direct->reclen;
++					direct = (struct vxfs_direct *) ((char *) direct) + direct->reclen;
+ 				}
+ 
+ 			free (block);
>Release-Note:
>Audit-Trail:
>Unformatted: