diff -urN /usr/ports/emulators/mess/Makefile emulators/mess/Makefile
--- /usr/ports/emulators/mess/Makefile	2012-06-08 20:58:48.000000000 +0900
+++ emulators/mess/Makefile	2012-06-11 17:03:11.000000000 +0900
@@ -6,24 +6,28 @@
 #
 
 PORTNAME=	mess
-PORTVERSION=	0.145
+PORTVERSION=	0.146${PATCHSUFFIX}
 CATEGORIES=	emulators
-MASTER_SITES=	http://www.mess.org/_media/downloads:/
-DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}s
+#MASTER_SITES=	http://www.mess.org/_media/downloads:/
+MASTER_SITES=	http://ompldr.org/vZHV6ag/ \
+		http://distfiles.exherbo.org/distfiles/ \
+		http://www.umich.edu/~archive/apollo/
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.//:C/p[0-9]*$//}s
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${UPDATE_PATCHES:C/$/.zip/}
 DIST_SUBDIR=	mame
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The popular MESS (Multiple Emulator Super System)
 
-LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
-		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS=	FLAC:${PORTSDIR}/audio/flac \
+		jpeg:${PORTSDIR}/graphics/jpeg \
+		expat:${PORTSDIR}/textproc/expat2 \
+		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
 RUN_DEPENDS=	liberation-fonts-ttf>=0:${PORTSDIR}/x11-fonts/liberation-fonts-ttf
 
-OPTIONS_DEFINE=	BUILTIN_DEBUGGER DOCS
-
-BUILTIN_DEBUGGER_DESCR=	Enable builtin debugger support
-
-ONLY_FOR_ARCHS=	i386 amd64
+OPTIONS_DEFINE=	BUILTIN_DEBUGGER DEBUG DOCS EXAMPLES
+BUILTIN_DEBUGGER_DESC=	Enable builtin debugger support
 
 NO_WRKSUBDIR=	yes
 
@@ -31,16 +35,24 @@
 USE_XORG=	xext xi xinerama xrender
 USE_GL=		gl
 USE_SDL=	sdl ttf
-USE_GCC=	4.4+
+USE_GCC=	4.6+
 USE_GMAKE=	yes
-MAKE_ENV=	NOWERROR=1 OPT_FLAGS="${CXXFLAGS}" GCC_LDFLAGS="${LDFLAGS}"
+MAKE_ENV=	NOWERROR=1 OPTIMIZE=0 USE_NETWORK=1 \
+		OPT_FLAGS="${CXXFLAGS}" GCC_LDFLAGS="${LDFLAGS}"
 MAKEFILE=	makefile
 MAKE_JOBS_SAFE=	yes
 
-CXXFLAGS+=	-fpermissive
-
 SUB_FILES=	pkg-message
 
+PATCHLEVEL=	# none
+
+.if defined(PATCHLEVEL) && ${PATCHLEVEL}
+PATCHSUFFIX=	p${PATCHLEVEL}
+UPDATE_PATCHES!=	/usr/bin/jot -s " " \
+		-w ${PORTNAME}${PORTVERSION:S/.//:C/\.p[0-9]*$//}u%d_diff \
+		${PATCHLEVEL} 1 ${PATCHLEVEL}
+.endif
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MBUILTIN_DEBUGGER}
@@ -55,21 +67,37 @@
 		GTK_LIBS=""
 .endif
 
+.if ${PORT_OPTIONS:MDEBUG}
+MAKE_ENV+=	DEBUG=1
+.endif
+
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "amd64"
-MAKE_ENV+=	PTR64=1
+.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
+BROKEN=		Does not install on ia64, powerpc, or sparc64
+.endif
+
+post-extract:
+# Use post-extract target to get in before dos2unix-isation
+.if defined(UPDATE_PATCHES)
+. for patch in ${UPDATE_PATCHES:S/_/./}
+	@${ECHO_MSG} -n "===> Applying upstream development patch ${patch}... "
+	@${PATCH} ${PATCH_ARGS} < ${WRKSRC}/${patch}
+	@${ECHO_MSG} "[DONE]"
+. endfor
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|^BUILD_EXPAT|# BUILD_EXPAT| ; \
 		 s|^BUILD_ZLIB|# BUILD_ZLIB| ; \
-		 /--warn-common/s|= -Wl,|= $$(GCC_LDFLAGS) -Wl,| ; \
-		 /LDFLAGS/s|-s|| ; \
+		 s|^BUILD_FLAC|# BUILD_FLAC| ; \
+		 s|^BUILD_JPEGLIB|# BUILD_JPEGLIB| ; \
 		 s| = @gcc| := $$(CC)| ; \
 		 s| = @g++| := $$(CXX)| ; \
-		 s|^FULLNAME =.*|FULLNAME = $$(NAME)|' ${WRKSRC}/makefile
+		 s|^FULLNAME =.*|FULLNAME = $$(NAME)| ; \
+		 /--warn-common/s|= -Wl,|= $$(GCC_LDFLAGS) -Wl,| ; \
+		 /LDFLAGS/s|-s||' ${WRKSRC}/makefile
 	@${REINPLACE_CMD} -e \
 		'/-system/s|/usr/local/|${LOCALBASE}/| ; \
 		 /--cflags-only-I gtk+-2.0/s|=.*|= $$(GTK_INCPATH)| ; \
diff -urN /usr/ports/emulators/mess/distinfo emulators/mess/distinfo
--- /usr/ports/emulators/mess/distinfo	2012-02-20 08:25:04.000000000 +0900
+++ emulators/mess/distinfo	2012-05-24 13:47:26.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (mame/mess0145s.zip) = 36f871148454e5113b8d7a04c2bd086f7e39f218ea4dc7c612bfc424ea406d4e
-SIZE (mame/mess0145s.zip) = 61648176
+SHA256 (mame/mess0146s.zip) = bdebfdcdef8f4d7a6e87ff80af00446a68d374c7f279fe8b5a63cf87f2b7ee28
+SIZE (mame/mess0146s.zip) = 62626787
diff -urN /usr/ports/emulators/mess/pkg-plist emulators/mess/pkg-plist
--- /usr/ports/emulators/mess/pkg-plist	2012-02-20 08:25:04.000000000 +0900
+++ emulators/mess/pkg-plist	2012-05-28 03:55:36.000000000 +0900
@@ -129,6 +129,7 @@
 %%DATADIR%%/hash/gmaster.xml
 %%DATADIR%%/hash/gx4000.xml
 %%DATADIR%%/hash/ibm5140.xml
+%%DATADIR%%/hash/ibm5150.xml
 %%DATADIR%%/hash/ibm5170.xml
 %%DATADIR%%/hash/ibmpcjr_cart.xml
 %%DATADIR%%/hash/ibmpcjr_flop.xml
@@ -148,6 +149,7 @@
 %%DATADIR%%/hash/m5.xml
 %%DATADIR%%/hash/mac_flop.xml
 %%DATADIR%%/hash/mac_hdd.xml
+%%DATADIR%%/hash/mbc55x.xml
 %%DATADIR%%/hash/megacd.xml
 %%DATADIR%%/hash/megacdj.xml
 %%DATADIR%%/hash/megadriv.xml
@@ -214,10 +216,12 @@
 %%DATADIR%%/hash/tandy200.xml
 %%DATADIR%%/hash/tdv2324.xml
 %%DATADIR%%/hash/tg16.xml
+%%DATADIR%%/hash/ti99_cart.xml
 %%DATADIR%%/hash/tiki100.xml
 %%DATADIR%%/hash/trs80m2.xml
 %%DATADIR%%/hash/trsm100.xml
 %%DATADIR%%/hash/tutor.xml
+%%DATADIR%%/hash/tvc_cart.xml
 %%DATADIR%%/hash/uzebox.xml
 %%DATADIR%%/hash/v1050.xml
 %%DATADIR%%/hash/vboy.xml
@@ -233,6 +237,7 @@
 %%DATADIR%%/hash/vsmile.xml
 %%DATADIR%%/hash/wscolor.xml
 %%DATADIR%%/hash/wswan.xml
+%%DATADIR%%/hash/x07_card.xml
 %%DATADIR%%/hash/x1_cass.xml
 %%DATADIR%%/hash/x1_flop.xml
 %%DATADIR%%/hash/x68k_flop.xml