- Update to 1.53r81.

- Remove the ASM and MMX option as the configure script does not recognize
  "--with-assembler" and "--with-mmx" anymore.
- Support staging.

PR:		ports/

4 files changed, 41 insertions, 24 deletions

diff --git a/emulators/snes9x-gtk/Makefile b/emulators/snes9x-gtk/Makefile
index 1b01a4160044..27ae1e8383d2 100644
--- a/emulators/snes9x-gtk/Makefile
+++ b/emulators/snes9x-gtk/Makefile
@@ -2,12 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	snes9x
-PORTVERSION=	1.52r79
-PORTREVISION=	4
+PORTVERSION=	1.53r81
 CATEGORIES=	emulators
 MASTER_SITES=	http://snes9x-gtk.googlecode.com/files/
 PKGNAMESUFFIX=	-gtk
-DISTNAME=	snes9x-1.52-src
+DISTNAME=	snes9x-1.53-src
 
 MAINTAINER=	root@cooltrainer.org
 COMMENT=	Super Nintendo Entertainment System(SNES) Emulator
@@ -23,19 +22,17 @@ USE_SDL=	sdl
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--without-alsa
+#USE_AUTOTOOLS=	autoconf aclocal
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/gtk
 
 OPTIONS_DEFINE=	DEBUG OPENGL JMA NETPLAY XV XRANDR
 OPTIONS_DEFAULT=	JMA NETPLAY XV XRANDR
-OPTIONS_DEFINE_i386=	ASM MMX
-OPTIONS_DEFAULT_i386=	ASM
 JMA_DESC=	Enable JMA archive decompression support
 NETPLAY_DESC=	Enable network support
 XV_DESC=	Enable XVideo output on GTK
 XRANDR_DESC=	Enable XRandR support on GTK
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MDEBUG}
@@ -44,19 +41,6 @@ CONFIGURE_ARGS+=	--with-debug
 CONFIGURE_ARGS+=	--without-debug
 .endif
 
-.if ${PORT_OPTIONS:MASM}
-BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
-CONFIGURE_ARGS+=	--with-assembler
-.else
-CONFIGURE_ARGS+=	--without-assembler
-.endif
-
-.if ${PORT_OPTIONS:MMMX} && !defined(PACKAGE_BUILDING)
-CONFIGURE_ARGS+=	--with-mmx
-.else
-CONFIGURE_ARGS+=	--without-mmx
-.endif
-
 .if ${PORT_OPTIONS:MOPENGL}
 CONFIGURE_ARGS+=	--with-opengl
 USE_GL=	glu
@@ -97,9 +81,12 @@ CONFIGURE_ARGS+=	--without-joystick
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX} ${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}
-	${INSTALL_DATA} ${WRKSRC}/data/snes9x.svg ${PREFIX}/share/pixmaps
-	${INSTALL_DATA} ${WRKSRC}/data/snes9x.desktop ${PREFIX}/share/applications
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX} \
+		${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}
+	${INSTALL_DATA} ${WRKSRC}/data/snes9x.svg \
+		${STAGEDIR}${PREFIX}/share/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/data/snes9x.desktop \
+		${STAGEDIR}${PREFIX}/share/applications
 
 post-install:
 	-@update-desktop-database
diff --git a/emulators/snes9x-gtk/distinfo b/emulators/snes9x-gtk/distinfo
index 3f5673094f30..27e9fcca799f 100644
--- a/emulators/snes9x-gtk/distinfo
+++ b/emulators/snes9x-gtk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (snes9x-1.52-src.tar.bz2) = 36e09b2da62b9210feb224cfd183047a151a71c1d5e5f92749dc28bd4b7ff1cb
-SIZE (snes9x-1.52-src.tar.bz2) = 1720137
+SHA256 (snes9x-1.53-src.tar.bz2) = 9f7c5d2d0fa3fe753611cf94e8879b73b8bb3c0eab97cdbcb6ab7376efa78dc3
+SIZE (snes9x-1.53-src.tar.bz2) = 1838746
diff --git a/emulators/snes9x-gtk/files/patch-gtk-configure b/emulators/snes9x-gtk/files/patch-gtk-configure
new file mode 100644
index 000000000000..1262b4d4818b
--- /dev/null
+++ b/emulators/snes9x-gtk/files/patch-gtk-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2013-10-25 02:52:16.000000000 -0700
++++ configure	2013-10-25 02:52:43.000000000 -0700
+@@ -6316,7 +6316,7 @@
+   CFLAGS="$CFLAGS -fomit-frame-pointer"
+ fi
+ 
+-LIBS="$LIBS -lX11 -ldl -lXext"
++LIBS="$LIBS -lX11 -lXext"
+ 
+ ZSNESFX='#ZSNESFX=yes'
+ ZSNESC4='#ZSNESC4=yes'
diff --git a/emulators/snes9x-gtk/files/patch-gtk-src-gtk__s9x.cpp b/emulators/snes9x-gtk/files/patch-gtk-src-gtk__s9x.cpp
new file mode 100644
index 000000000000..0397c8de9332
--- /dev/null
+++ b/emulators/snes9x-gtk/files/patch-gtk-src-gtk__s9x.cpp
@@ -0,0 +1,19 @@
+--- src/gtk_s9x.cpp.orig	2013-10-25 03:47:08.000000000 -0700
++++ src/gtk_s9x.cpp	2013-10-25 03:47:32.000000000 -0700
+@@ -44,6 +44,7 @@
+ 
+     g_thread_init (NULL);
+     gdk_threads_init ();
++    gdk_threads_enter();
+ 
+     gtk_init (&argc, &argv);
+ 
+@@ -127,6 +128,8 @@
+ 
+     gtk_main ();
+ 
++    gdk_threads_leave();
++    
+     return 0;
+ }
+