diff -ruN flobopuyo.orig/Makefile flobopuyo/Makefile
--- flobopuyo.orig/Makefile	Tue Oct 30 02:10:50 2007
+++ flobopuyo/Makefile	Tue Oct 30 02:25:20 2007
@@ -7,7 +7,7 @@
 
 PORTNAME=	flobopuyo
 PORTVERSION=	0.20
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://www.ios-software.com/flobopuyo/ \
 		http://www.amdmi3.ru/distfiles/
@@ -20,12 +20,6 @@
 USE_GMAKE=	yes
 USE_SDL=	sdl mixer image
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64" && ${OSVERSION} >= 700000
-BROKEN=		Doesn't build
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's|g++|${CXX}|' ${WRKSRC}/Makefile
@@ -34,4 +28,4 @@
 	@${REINPLACE_CMD} -e 's|^INSTALL_DATADIR=.*$$|INSTALL_DATADIR=${DATADIR}|' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's|^INSTALL_BINDIR=.*$$|INSTALL_BINDIR=${PREFIX}/bin|' ${WRKSRC}/Makefile
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN flobopuyo.orig/files/patch-IosVector.cpp flobopuyo/files/patch-IosVector.cpp
--- flobopuyo.orig/files/patch-IosVector.cpp	Thu Jan  1 03:00:00 1970
+++ flobopuyo/files/patch-IosVector.cpp	Tue Oct 30 02:22:59 2007
@@ -0,0 +1,10 @@
+--- IosVector.cpp.orig	Sat Oct  9 02:41:12 2004
++++ IosVector.cpp	Tue Oct 30 02:20:35 2007
+@@ -102,6 +102,6 @@
+ void IosVector::dumpVector() const {
+ 	fprintf(stderr, "Size: %d\n", getSize());
+ 	for (int i = 0, j = getSize() ; i < j ; i++)
+-		fprintf(stderr, "elt[%d]=%d ", i, (int)getElementAt(i));
++		fprintf(stderr, "elt[%d]=%p ", i, getElementAt(i));
+ 	fprintf(stderr, "\n");
+ }
diff -ruN flobopuyo.orig/files/patch-PuyoGame.cpp flobopuyo/files/patch-PuyoGame.cpp
--- flobopuyo.orig/files/patch-PuyoGame.cpp	Thu Jan  1 03:00:00 1970
+++ flobopuyo/files/patch-PuyoGame.cpp	Tue Oct 30 02:20:00 2007
@@ -0,0 +1,11 @@
+--- PuyoGame.cpp.orig	Sat Oct  9 02:41:13 2004
++++ PuyoGame.cpp	Tue Oct 30 02:12:27 2007
+@@ -45,7 +45,7 @@
+ 		return (PuyoState)newItem;
+ 	}
+ 	else
+-		return (PuyoState)(int)(sequenceItems.getElementAt(sequence));
++		return (PuyoState)(long)(sequenceItems.getElementAt(sequence));
+ }
+ 
+ PuyoPuyo::PuyoPuyo(PuyoState state)