Index: head/sysutils/makefs/Makefile
===================================================================
--- head/sysutils/makefs/Makefile	(revision 203900)
+++ head/sysutils/makefs/Makefile	(revision 203901)
@@ -1,36 +1,32 @@
 # New ports collection makefile for:		NetBSD makefs
 # Date created:					17 December 2003
 # Whom:						cperciva@daemonology.net
 #
 # $FreeBSD$
 #
 
 PORTNAME=	makefs
 PORTVERSION=	20040704
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.daemonology.net/makefs/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Builds FFS images
 
 MAN8=		makefs.8
 PLIST_FILES=	sbin/makefs
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 700042
-BROKEN=		Broken with gcc 4.2
-.endif
-
 do-build:
 	cd ${WRKSRC} && ${SH} -xe build.sh
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/netbsdsrc/tools/makefs/makefs	\
 		${PREFIX}/sbin
 .if !defined(WITHOUT_MAN)
 	${INSTALL_MAN} ${WRKSRC}/netbsdsrc/usr.sbin/makefs/makefs.8	\
 		${PREFIX}/man/man8/
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/sysutils/makefs/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/sysutils/makefs/files/patch-usr.bin-makefs-ffs-ffs_alloc.c
===================================================================
--- head/sysutils/makefs/files/patch-usr.bin-makefs-ffs-ffs_alloc.c	(nonexistent)
+++ head/sysutils/makefs/files/patch-usr.bin-makefs-ffs-ffs_alloc.c	(revision 203901)
@@ -0,0 +1,14 @@
+--- ./netbsdsrc/usr.sbin/makefs/ffs/ffs_alloc.c~	2004-07-04 23:17:39.000000000 -0600
++++ ./netbsdsrc/usr.sbin/makefs/ffs/ffs_alloc.c	2007-12-16 19:44:22.000000000 -0700
+@@ -120,7 +120,10 @@
+ 		cg = dtog(fs, bpref);
+ 	bno = ffs_hashalloc(ip, cg, bpref, size, ffs_alloccg);
+ 	if (bno > 0) {
+-		DIP(ip, blocks) += size / DEV_BSIZE;
++		if (ip->i_fs->fs_magic == FS_UFS1_MAGIC)
++			ip->i_ffs1_blocks += size / DEV_BSIZE;
++		else
++			ip->i_ffs1_blocks += size / DEV_BSIZE;
+ 		*bnp = bno;
+ 		return (0);
+ 	}

Property changes on: head/sysutils/makefs/files/patch-usr.bin-makefs-ffs-ffs_alloc.c
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property