--- /kirby/shared/zsnes/Makefile	Wed Sep 20 21:00:52 2006
+++ /kirby/shared/zsnes/Makefile	Fri Dec 22 20:11:51 2006
@@ -6,8 +6,7 @@ 
 #
 
 PORTNAME=	zsnes
-PORTVERSION=	1.42
-PORTREVISION=	4
+PORTVERSION=	1.50
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -27,14 +26,16 @@ 
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION:S/./_/}/src
 
 OPTIONS=	X11	"Enable X11 video driver"	on	\
-		OPENGL	"Enable OpenGL video driver"	off
+		OPENGL	"Enable OpenGL video driver"	off	\
+		DEBUGGER	"Enable ZSNES debugger"	on	\
+		JMA	"Enable JMA support"		on
 
+USE_BZIP2=	yes
 USE_SDL=	sdl
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-ALL_TARGET=	ALL
 
 MAN1=		zsnes.1
 PLIST_FILES=	bin/zsnes
@@ -62,14 +63,34 @@ 
 CONFIGURE_ARGS+=--disable-opengl
 .endif
 
+.if defined(WITH_DEBUGGER)
+CONFIGURE_ARGS+=--enable-debugger
+.else
+CONFIGURE_ARGS+=--disable-debugger
+.endif
+
+.if defined(WITH_JMA)
+CONFIGURE_ARGS+=--enable-jma
+.else
+CONFIGURE_ARGS+=--disable-jma
+.endif
+
+.if defined(PACKAGE_BUILDING)
+CONFIGURE_ARGS+=--enable-release --disable-cpucheck force_arch=i586
+.endif
+
+pre-everything::
+	@${GREP} "#define ZLIB_VERSION" /usr/include/zlib.h | \
+		${AWK} '{print substr($$3, 2, length($$3) - 2)}' | \
+		${SED} 's/\./ /g' | \
+		${AWK} '{printf("%02d%02d%02d", $$1, $$2, $$3)}' | \
+		${AWK} '{if ($$1 > 010202) {exit 0} else {exit 1}}'
+	@if [ 0 -ne $$? ] ; then \
+		@${ECHO} "This port requires zlib >= 1.2.3" ; \
+		@${FALSE} ; \
+	fi
+
 post-patch:
-	@${REINPLACE_CMD} -e \
-		's| -pipe||g ; \
-		 s| -I/usr/local/include||g ; \
-		 s|^VERSION=1.41|VERSION=${PORTVERSION}|; \
-		 s| -D__FreeBSD__||g; \
-		 s| -I/usr/include||g ; \
-		 s| -O3 .* -s||g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
 		's|@CXX@ @CFLAGS@ -o|@CXX@ @CXXFLAGS@ @CPPFLAGS@ -o|g ; \
 		 s|@CC@ @CFLAGS@ -o|@CC@ @CFLAGS@ @CPPFLAGS@ -o|g' \
--- /kirby/shared/zsnes/distinfo	Thu Nov 24 16:01:04 2005
+++ /kirby/shared/zsnes/distinfo	Fri Dec 22 17:32:52 2006
@@ -1,3 +1,3 @@ 
-MD5 (zsnes142src.tar.gz) = e3fcc13061e169194ec31c27ace1b6e7
-SHA256 (zsnes142src.tar.gz) = f06ef14db8d3fdae9d7c12442a52e535a5feee1cb18c78b51a74ed282ed874be
-SIZE (zsnes142src.tar.gz) = 1102840
+MD5 (zsnes150src.tar.bz2) = f0612e27b1c3dd821044525be5cf4450
+SHA256 (zsnes150src.tar.bz2) = 2ddaaff892d511c717d3e270cc035b208ba2eca04cdf3e749c5739df78ba9aba
+SIZE (zsnes150src.tar.bz2) = 1058671
--- /kirby/shared/zsnes/files/patch-linux-zfilew.c	Thu Jun  2 23:13:02 2005
+++ /kirby/shared/zsnes/files/patch-linux-zfilew.c	Wed Dec 31 19:00:00 1969
@@ -1,21 +0,0 @@ 
-$FreeBSD: ports/emulators/zsnes/files/patch-linux-zfilew.c,v 1.1 2005/06/03 03:13:02 petef Exp $
-
---- linux/zfilew.c	Fri Jan 14 06:11:19 2005
-+++ linux/zfilew.c.new	Thu Jun  2 19:29:43 2005
-@@ -474,11 +474,12 @@
- 
-   if ((homedir = (char *)getenv("HOME")) == 0)
-   {
--    homedir = (char *)malloc(ZCFG_DIR_LEN);
--    getcwd(homedir, ZCFG_DIR_LEN);
-+    getcwd(zcfgdir, ZCFG_DIR_LEN);
-+  }
-+  else
-+  {
-+    strcpy(zcfgdir, homedir);
-   }
--  strcpy(zcfgdir, homedir);
--  free(homedir);
-   strcat(zcfgdir, ZCFG_DIR);
-   tmp = opendir(zcfgdir);
-   if (tmp == NULL)