ports/57003: Update port: emulators/snes9x to 1.41.1

[KATO Tsuguru]

>Number:         57003
>Category:       ports
>Synopsis:       Update port: emulators/snes9x to 1.41.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 19 07:50:20 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.8-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
- Update to version 1.14.1

New file:
files/patch-3d.h

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/emulators/snes9x/Makefile emulators/snes9x/Makefile
--- /usr/ports/emulators/snes9x/Makefile	Sun Aug 10 04:26:39 2003
+++ emulators/snes9x/Makefile	Fri Sep 12 02:20:21 2003
@@ -6,31 +6,43 @@
 #
 
 PORTNAME=	snes9x
-PORTVERSION=	1.40
+PORTVERSION=	1.41.1
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.lysator.liu.se/snes9x/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-src-2
+DISTNAME=	${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}-src
 
 MAINTAINER=	green at FreeBSD.org
 COMMENT=	Super Nintendo Entertainment System(SNES) Emulator
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-src/snes9x
+WRKSRC=		${WRKDIR}/${DISTNAME}/snes9x
 
 USE_X_PREFIX=	YES
 USE_GMAKE=	YES
-MAKE_ARGS=	CC="${CC} ${CFLAGS}" CCC="${CXX} ${CXXFLAGS}" \
-		INCLUDES="-I${X11BASE}/include ${PTHREAD_CFLAGS}" \
-		LDLIBS="-L${X11BASE}/lib ${PTHREAD_LIBS}" \
+MAKE_ARGS=	CC="${CC} ${CFLAGS} " CCC="${CXX} ${CXXFLAGS} " \
+		INCLUDES="-I${X11BASE}/include ${PTHREAD_CFLAGS} ${CPPFLAGS}" \
+		LDLIBS="-L${X11BASE}/lib ${PTHREAD_LIBS} ${LDFLAGS}" \
 		THREAD_SOUND=1 NETPLAY=1 UNZIP=1
 
+CPPFLAGS=	-DUSE_DGA_EXTENSION -DUSE_VIDMODE_EXTENSION
+LDFLAGS=	-lXxf86dga -lXxf86vm
+
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "i386"
+.if ${ARCH} == "i386" && !defined(WITHOUT_X86_ASM)
 BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
 MAKE_ARGS+=	ZSNESFX=1 ZSNESC4=1 ASMCPU=1 NASM="nasm" I386SPC="i386/SPC.O"
 .if defined(WITH_MMX)
 MAKE_ARGS+=	ASMKREED=1
 .endif
+.else
+CPPFLAGS+=	-DNOASM
+.endif
+
+.if defined(WITH_OPENGL)
+MAKE_ARGS+=	OPENGL=1 OPENGLLIBS="-lGL -lGLU"
+SNES9X_BIN=	osnes9x
+.else
+SNES9X_BIN=	snes9x
 .endif
 
 .if exists(/usr/lib/libusbhid.a)
@@ -64,6 +76,6 @@
 		 s: \.\./zlib/libz\.a::g' < Makefile.in > Makefile
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/snes9x ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/${SNES9X_BIN} ${PREFIX}/bin/snes9x
 
 .include <bsd.port.post.mk>
diff -urN /usr/ports/emulators/snes9x/distinfo emulators/snes9x/distinfo
--- /usr/ports/emulators/snes9x/distinfo	Sun Aug 10 04:26:40 2003
+++ emulators/snes9x/distinfo	Thu Sep 11 23:43:28 2003
@@ -1 +1 @@
-MD5 (snes9x-1.40-src-2.tar.gz) = 81c1f8c687fb45fc20d631dd17702a20
+MD5 (snes9x-1.41-1-src.tar.gz) = 9b3f0a07484379a8d276c08ab1bbdb87
diff -urN /usr/ports/emulators/snes9x/files/patch-3d.h emulators/snes9x/files/patch-3d.h
--- /usr/ports/emulators/snes9x/files/patch-3d.h	Thu Jan  1 09:00:00 1970
+++ emulators/snes9x/files/patch-3d.h	Fri Sep 12 00:06:10 2003
@@ -0,0 +1,11 @@
+--- 3d.h.orig	Wed Aug 13 06:27:16 2003
++++ 3d.h	Fri Sep 12 00:05:49 2003
+@@ -80,7 +80,7 @@
+ #include <GL/gl.h>
+ #include <GL/glu.h>
+ 
+-#ifdef __linux__
++#if defined(__linux__) || defined(__FreeBSD__)
+ #include <GL/glx.h>
+ #endif
+ 
>Release-Note:
>Audit-Trail:
>Unformatted: