From d4df837ed4f11b5a53b294eb67dd400026171029 Mon Sep 17 00:00:00 2001
From: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
Date: Tue, 6 Jan 2009 21:54:58 +0000
Subject: [PATCH] - Update to 1.4.1

---
 emulators/mupen64plus-base/Makefile           |  4 +-
 emulators/mupen64plus-base/Makefile.common    | 19 ++++-
 emulators/mupen64plus-base/distinfo           |  6 +-
 .../mupen64plus-base/files/patch-Makefile     | 33 ++++----
 emulators/mupen64plus-base/files/patch-pre.mk | 60 ++++++--------
 emulators/mupen64plus-base/pkg-plist          |  3 +-
 emulators/mupen64plus-core/Makefile           |  4 +-
 emulators/mupen64plus-core/Makefile.common    | 19 ++++-
 emulators/mupen64plus-core/distinfo           |  6 +-
 .../mupen64plus-core/files/patch-Makefile     | 33 ++++----
 emulators/mupen64plus-core/files/patch-pre.mk | 60 ++++++--------
 emulators/mupen64plus-core/pkg-plist          |  3 +-
 .../files/patch-glide64_Makefile              | 38 +++++----
 .../files/patch-glN64_Config_linux.cpp        | 40 ++++-----
 .../files/patch-blight_input_SDL_ttf.c        | 19 -----
 .../files/patch-blight_input_plugin.c         | 82 +++++++++++++++++++
 .../files/patch-rice_video_Makefile           |  8 +-
 .../files/patch-blight_input_SDL_ttf.c        | 19 -----
 .../files/patch-blight_input_plugin.c         | 82 +++++++++++++++++++
 .../files/patch-rice_video_Makefile           |  8 +-
 emulators/mupen64plus/Makefile                |  4 +-
 21 files changed, 335 insertions(+), 215 deletions(-)
 delete mode 100644 emulators/mupen64plus-input-sdl/files/patch-blight_input_SDL_ttf.c
 create mode 100644 emulators/mupen64plus-input-sdl/files/patch-blight_input_plugin.c
 delete mode 100644 emulators/mupen64plus-sdlinput/files/patch-blight_input_SDL_ttf.c
 create mode 100644 emulators/mupen64plus-sdlinput/files/patch-blight_input_plugin.c

diff --git a/emulators/mupen64plus-base/Makefile b/emulators/mupen64plus-base/Makefile
index 4c269a65a719..fade28b000fc 100644
--- a/emulators/mupen64plus-base/Makefile
+++ b/emulators/mupen64plus-base/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	mupen64plus
-PORTVERSION?=	1.3
-PORTREVISION?=	1
+PORTVERSION?=	1.4.1
+PORTREVISION?=	0
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PKGNAMESUFFIX?=	-base
diff --git a/emulators/mupen64plus-base/Makefile.common b/emulators/mupen64plus-base/Makefile.common
index d6e7dca44c54..af5571da5940 100644
--- a/emulators/mupen64plus-base/Makefile.common
+++ b/emulators/mupen64plus-base/Makefile.common
@@ -1,17 +1,20 @@
 USE_DOS2UNIX=		*.c *.cpp *.h *.H *.ini *.conf
 
-DISTNAME=		${PORTNAME:S/m/M/:S/pl/Pl/}-${PORTVERSION:S/./-/}-src
+DISTNAME=		${PORTNAME:S/m/M/:S/pl/Pl/}-${PORTVERSION:S/./-/g}-src
 PATCHDIR=		${.CURDIR}/files
 WRKSRC?=		${WRKDIR}/${DISTNAME}
 
 EXTRACT_AFTER_ARGS=	"${DISTNAME}/Makefile" ${DISTNAME}/pre.mk ${DISTNAME}/release.mk \
-				"${DISTNAME}/config/*" "${DISTNAME}/main/*" "${DISTNAME}/plugins/*"
+				"${DISTNAME}/config/*" "${DISTNAME}/main/*" "${DISTNAME}/plugins/*" \
+					"${DISTNAME}/opengl/*"
 
 .if ${PKGNAMESUFFIX} == "-base"
 USE_GL=		yes
 USE_SDL=	sdl
+
+LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
 .	if defined(HAVE_VCR)
-LIB_DEPENDS=	aviplay.0:${PORTSDIR}/multimedia/avifile
+LIB_DEPENDS+=	aviplay.0:${PORTSDIR}/multimedia/avifile
 MAKE_ENV+=	VCR=1
 .	endif
 .	if defined(HAVE_NOGUI)
@@ -21,6 +24,7 @@ MAKE_ENV+=	NOGUI_ONLY=1
 ALL_TARGET=		mupen64plus
 EXTRACT_AFTER_ARGS+=	"${DISTNAME}/RELEASE" "${DISTNAME}/README.vcr" "${DISTNAME}/doc/*" "${DISTNAME}/lang/*" \
 				"${DISTNAME}/icons/*" "${DISTNAME}/memory/*" "${DISTNAME}/r4300/*" "${DISTNAME}/debugger/*"
+MAN1=			mupen64plus.1
 .else
 EXTRA_PATCHES?=		${.CURDIR}/../mupen64plus-base/files/patch-Makefile \
 			${.CURDIR}/../mupen64plus-base/files/patch-pre.mk
@@ -86,6 +90,11 @@ post-configure:
 	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' ${WRKSRC}/${f}
 .endfor
 
+post-extract:
+.if ${PKGNAMESUFFIX} == "-base"
+	${GUNZIP_CMD} ${WRKSRC}/doc/${MAN1}.gz
+.endif
+
 .if ${PKGNAMESUFFIX} != "-base"
 pre-install:
 	@${RM} -f ${PLIST}
@@ -135,11 +144,13 @@ do-install:
 	@${MKDIR} ${DATADIR}/icons
 	${INSTALL_DATA} ${WRKSRC}/icons/* ${DATADIR}/icons/
 
+	${INSTALL_MAN} ${WRKSRC}/doc/${MAN1} ${PREFIX}/man/man1/
+
+
 .	if !defined(NOPORTDOCS)
 		${MKDIR} ${DOCSDIR}
 		${INSTALL_DATA} ${WRKSRC}/RELEASE ${DOCSDIR}/RELEASE
 		${INSTALL_DATA} ${WRKSRC}/README.vcr ${DOCSDIR}/README.vcr
-		${INSTALL_DATA} ${WRKSRC}/doc/readme.pdf ${DOCSDIR}/readme.pdf
 .	endif
 .else
 	@${MKDIR} ${DATADIR}/plugins
diff --git a/emulators/mupen64plus-base/distinfo b/emulators/mupen64plus-base/distinfo
index 299313c428b7..274850df573e 100644
--- a/emulators/mupen64plus-base/distinfo
+++ b/emulators/mupen64plus-base/distinfo
@@ -1,3 +1,3 @@
-MD5 (mupen64plus/Mupen64Plus-1-3-src.zip) = 578d4712e9617e229c2da44d472eb159
-SHA256 (mupen64plus/Mupen64Plus-1-3-src.zip) = 9327afd94696138bfa6559a02f61689b8107f221b34c26ac11e07c96fe65e6cc
-SIZE (mupen64plus/Mupen64Plus-1-3-src.zip) = 2845612
+MD5 (mupen64plus/Mupen64Plus-1-4-1-src.zip) = bd59542e17107844e6b3b139a1177551
+SHA256 (mupen64plus/Mupen64Plus-1-4-1-src.zip) = 846698b2066c59970fb9e13ce278b7e04365deb8a2643f42a2661ab410c1a9ae
+SIZE (mupen64plus/Mupen64Plus-1-4-1-src.zip) = 2499700
diff --git a/emulators/mupen64plus-base/files/patch-Makefile b/emulators/mupen64plus-base/files/patch-Makefile
index 6becc5b95fe9..31700c2b363d 100644
--- a/emulators/mupen64plus-base/files/patch-Makefile
+++ b/emulators/mupen64plus-base/files/patch-Makefile
@@ -1,25 +1,20 @@
---- Makefile	2008-03-29 14:41:03.000000000 -0500
-+++ Makefile	2008-05-20 10:56:58.000000000 -0500
-@@ -83,7 +83,7 @@
- 	r4300/tlb.o
- 
- ifeq ($(CPU), X86)
--  ifeq ($(ARCH), 64BITS)
-+  ifeq ($(ARCH_DETECTED), 64BITS)
-     DYNAREC = x86_64
-   else
-     DYNAREC = x86
-@@ -205,11 +205,11 @@
+--- Makefile.orig	2008-12-13 14:53:49.000000000 -0500
++++ Makefile	2008-12-14 23:40:23.000000000 -0500
+@@ -97,7 +97,7 @@
+ # handle dynamic recompiler objects
+ ifneq ($(NO_ASM), 1)
+   ifeq ($(CPU), X86)
+-    ifeq ($(ARCH), 64BITS)
++    ifeq ($(ARCH_DETECTED), 64BITS)
+       DYNAREC = x86_64
+     else
+       DYNAREC = x86
+@@ -274,7 +274,7 @@
  all: $(ALL)
  
  mupen64plus: $(OBJECTS)
--	$(CC) $^ $(LDFLAGS) $(LIBS) -Wl,-export-dynamic -lpthread -ldl -o $@
-+	$(CC) $^ $(LDFLAGS) $(LIBS) -Wl,-export-dynamic ${PTHREAD_LIBS} -o $@
+-	$(MUPENCC) $^ $(LDFLAGS) $(LIBS) -Wl,-export-dynamic -lpthread -ldl -o $@
++	$(MUPENCC) $^ $(LDFLAGS) $(LIBS) -Wl,-export-dynamic ${PTHREAD_LIBS} -o $@
  	$(STRIP) $@
  
- mupen64plus_dbg: $(OBJECTS) main/main_gtk.o
--	$(CC) $^ $(LDFLAGS) $(LIBS) -Wl,-export-dynamic -lpthread -ldl -o $@
-+	$(CC) $^ $(LDFLAGS) $(LIBS) -Wl,-export-dynamic ${PTHREAD_LIBS} -o $@
- 
  install:
- 	./install.sh $(PREFIX)
diff --git a/emulators/mupen64plus-base/files/patch-pre.mk b/emulators/mupen64plus-base/files/patch-pre.mk
index ef4c10350fe4..b1f982798129 100644
--- a/emulators/mupen64plus-base/files/patch-pre.mk
+++ b/emulators/mupen64plus-base/files/patch-pre.mk
@@ -1,8 +1,7 @@
---- pre.mk	2008-03-29 14:41:03.000000000 -0500
-+++ pre.mk	2008-05-20 10:56:16.000000000 -0500
-@@ -1,53 +1,28 @@
--# detect system architecture: i386, x86_64, or PPC/PPC64
-+# detect system architecture: i386, amd64, or PPC/PPC64
+--- pre.mk.orig	2008-12-14 22:42:29.000000000 -0500
++++ pre.mk	2008-12-14 23:37:19.000000000 -0500
+@@ -1,45 +1,28 @@
+ # detect system architecture: i386, x86_64, or PPC/PPC64
  UNAME = $(shell uname -m)
 -ifeq ("$(UNAME)","x86_64")
 +ifeq ("$(UNAME)","amd64")
@@ -24,47 +23,37 @@
    CPU = PPC
 -  ARCH = 32BITS
 +  ARCH_DETECTED = 32BITS
+   NO_ASM = 1
  endif
  ifeq ("$(UNAME)","ppc64")
    CPU = PPC
 -  ARCH = 64BITS
 +  ARCH_DETECTED = 64BITS
+   NO_ASM = 1
  endif
  
--# find installed assembler: yasm or nasm
--ifneq ("$(shell which yasm 2>&1 | head -c 9)", "which: no")
--  ASM=yasm
--else
--  ifneq ("$(shell which nasm 2>&1 | head -c 9)", "which: no")
--    ASM=nasm
--  else
--    # throw error
--    $(error No yasm or nasm found!)
--  endif
--endif
 -
 -# test for presence of SDL
--ifeq ("$(shell which sdl-config 2>&1 | head -c 9)", "which: no")
+-ifeq ($(shell which sdl-config 2>/dev/null),)
 -  # throw error
 -  $(error No SDL development libraries found!)
 -endif
 -
 -# test for presence of GTK 2.0
--ifeq ("$(shell which pkg-config 2>&1 | head -c 9)", "which: no")
+-ifeq ($(shell which pkg-config 2>/dev/null),)
 -  # throw error
--  $(error No GTK 2.x development libraries found!)
+-  $(error pkg-config not installed!)
 -endif
 -ifneq ("$(shell pkg-config gtk+-2.0 --modversion | head -c 2)", "2.")
 -  # throw error
 -  $(error No GTK 2.x development libraries found!)
 -endif
-+# set assembler program
-+ASM	?=	$(LOCALBASE)/bin/nasm
- 
+-
  # set GTK flags and libraries
- GTK_FLAGS	= `pkg-config gtk+-2.0 --cflags` -D_GTK2
-@@ -55,36 +30,36 @@
- GTHREAD_LIBS	= `pkg-config gthread-2.0 --libs`
+ GTK_FLAGS	= $(shell pkg-config gtk+-2.0 --cflags) -D_GTK2
+ GTK_LIBS	= $(shell pkg-config gtk+-2.0 --libs)
+@@ -74,36 +57,36 @@
+ 
  
  # set base program pointers and flags
 -CC      = gcc
@@ -80,7 +69,7 @@
 -INSTALL = ginstall
 +CC      ?= gcc
 +CXX     ?= g++
-+LD      ?= $(CXX)
++LD      ?= g++
 +STRIP   ?= strip --strip-all
 +RM      ?= rm
 +MV      ?= mv
@@ -92,9 +81,8 @@
  
  # set base CFLAGS and LDFLAGS for all systems
 -CFLAGS = -pipe -O3 -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing
--LDFLAGS =
 +CFLAGS += -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing
-+LDFLAGS +=
+ LDFLAGS =
  
  # set special flags per-system
  ifeq ($(CPU), X86)
@@ -119,21 +107,21 @@
    endif
  endif
  ifeq ($(CPU), PPC)
-@@ -105,8 +80,8 @@
+@@ -129,8 +112,8 @@
  
  # set CFLAGS, LIBS, and LDFLAGS for external dependencies
  
--SDL_FLAGS	= `sdl-config --cflags`
--SDL_LIBS	= `sdl-config --libs`
+-SDL_FLAGS	= $(shell sdl-config --cflags)
+-SDL_LIBS	= $(shell sdl-config --libs)
 +SDL_FLAGS	= `${SDL_CONFIG} --cflags`
 +SDL_LIBS	= `${SDL_CONFIG} --libs`
  
- AVIFILE_FLAGS	= `avifile-config --cflags`
- AVIFILE_LIBS	= `avifile-config --libs`
-@@ -116,5 +91,5 @@
+ ifeq ($(VCR), 1)
+   # test for presence of avifile
+@@ -148,5 +131,5 @@
  
  PLUGIN_LDFLAGS	= -Wl,-Bsymbolic -shared
  
--LIBGL_LIBS	= -L/usr/X11R6/lib -lGL
-+LIBGL_LIBS	= -L${LOCALBASE}/lib -lGL
+-LIBGL_LIBS	= -L/usr/X11R6/lib -lGL -lGLU
++LIBGL_LIBS	= -L${LOCALBASE}/lib -lGL -lGLU
  
diff --git a/emulators/mupen64plus-base/pkg-plist b/emulators/mupen64plus-base/pkg-plist
index 0d39a3bc03e7..54a61922029a 100644
--- a/emulators/mupen64plus-base/pkg-plist
+++ b/emulators/mupen64plus-base/pkg-plist
@@ -9,6 +9,7 @@ bin/mupen64plus
 %%DATADIR%%/lang/italian.lng
 %%DATADIR%%/lang/pt_BR.lng
 %%DATADIR%%/lang/spanish.lng
+%%DATADIR%%/lang/swedish.lng
 %%DATADIR%%/icons/australia.png
 %%DATADIR%%/icons/configure-small.png
 %%DATADIR%%/icons/configure.png
@@ -21,6 +22,7 @@ bin/mupen64plus
 %%DATADIR%%/icons/input.png
 %%DATADIR%%/icons/italy.png
 %%DATADIR%%/icons/japan.png
+%%DATADIR%%/icons/japanusa.png
 %%DATADIR%%/icons/logo.png
 %%DATADIR%%/icons/logo.xpm
 %%DATADIR%%/icons/messagebox-error.png
@@ -42,7 +44,6 @@ bin/mupen64plus
 %%DATADIR%%/icons/usa.png
 %%PORTDOCS%%%%DOCSDIR%%/README.vcr
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE
-%%PORTDOCS%%%%DOCSDIR%%/readme.pdf
 @dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%/lang
 @dirrmtry %%DATADIR%%/config
diff --git a/emulators/mupen64plus-core/Makefile b/emulators/mupen64plus-core/Makefile
index 4c269a65a719..fade28b000fc 100644
--- a/emulators/mupen64plus-core/Makefile
+++ b/emulators/mupen64plus-core/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	mupen64plus
-PORTVERSION?=	1.3
-PORTREVISION?=	1
+PORTVERSION?=	1.4.1
+PORTREVISION?=	0
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PKGNAMESUFFIX?=	-base
diff --git a/emulators/mupen64plus-core/Makefile.common b/emulators/mupen64plus-core/Makefile.common
index d6e7dca44c54..af5571da5940 100644
--- a/emulators/mupen64plus-core/Makefile.common
+++ b/emulators/mupen64plus-core/Makefile.common
@@ -1,17 +1,20 @@
 USE_DOS2UNIX=		*.c *.cpp *.h *.H *.ini *.conf
 
-DISTNAME=		${PORTNAME:S/m/M/:S/pl/Pl/}-${PORTVERSION:S/./-/}-src
+DISTNAME=		${PORTNAME:S/m/M/:S/pl/Pl/}-${PORTVERSION:S/./-/g}-src
 PATCHDIR=		${.CURDIR}/files
 WRKSRC?=		${WRKDIR}/${DISTNAME}
 
 EXTRACT_AFTER_ARGS=	"${DISTNAME}/Makefile" ${DISTNAME}/pre.mk ${DISTNAME}/release.mk \
-				"${DISTNAME}/config/*" "${DISTNAME}/main/*" "${DISTNAME}/plugins/*"
+				"${DISTNAME}/config/*" "${DISTNAME}/main/*" "${DISTNAME}/plugins/*" \
+					"${DISTNAME}/opengl/*"
 
 .if ${PKGNAMESUFFIX} == "-base"
 USE_GL=		yes
 USE_SDL=	sdl
+
+LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
 .	if defined(HAVE_VCR)
-LIB_DEPENDS=	aviplay.0:${PORTSDIR}/multimedia/avifile
+LIB_DEPENDS+=	aviplay.0:${PORTSDIR}/multimedia/avifile
 MAKE_ENV+=	VCR=1
 .	endif
 .	if defined(HAVE_NOGUI)
@@ -21,6 +24,7 @@ MAKE_ENV+=	NOGUI_ONLY=1
 ALL_TARGET=		mupen64plus
 EXTRACT_AFTER_ARGS+=	"${DISTNAME}/RELEASE" "${DISTNAME}/README.vcr" "${DISTNAME}/doc/*" "${DISTNAME}/lang/*" \
 				"${DISTNAME}/icons/*" "${DISTNAME}/memory/*" "${DISTNAME}/r4300/*" "${DISTNAME}/debugger/*"
+MAN1=			mupen64plus.1
 .else
 EXTRA_PATCHES?=		${.CURDIR}/../mupen64plus-base/files/patch-Makefile \
 			${.CURDIR}/../mupen64plus-base/files/patch-pre.mk
@@ -86,6 +90,11 @@ post-configure:
 	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' ${WRKSRC}/${f}
 .endfor
 
+post-extract:
+.if ${PKGNAMESUFFIX} == "-base"
+	${GUNZIP_CMD} ${WRKSRC}/doc/${MAN1}.gz
+.endif
+
 .if ${PKGNAMESUFFIX} != "-base"
 pre-install:
 	@${RM} -f ${PLIST}
@@ -135,11 +144,13 @@ do-install:
 	@${MKDIR} ${DATADIR}/icons
 	${INSTALL_DATA} ${WRKSRC}/icons/* ${DATADIR}/icons/
 
+	${INSTALL_MAN} ${WRKSRC}/doc/${MAN1} ${PREFIX}/man/man1/
+
+
 .	if !defined(NOPORTDOCS)
 		${MKDIR} ${DOCSDIR}
 		${INSTALL_DATA} ${WRKSRC}/RELEASE ${DOCSDIR}/RELEASE
 		${INSTALL_DATA} ${WRKSRC}/README.vcr ${DOCSDIR}/README.vcr
-		${INSTALL_DATA} ${WRKSRC}/doc/readme.pdf ${DOCSDIR}/readme.pdf
 .	endif
 .else
 	@${MKDIR} ${DATADIR}/plugins
diff --git a/emulators/mupen64plus-core/distinfo b/emulators/mupen64plus-core/distinfo
index 299313c428b7..274850df573e 100644
--- a/emulators/mupen64plus-core/distinfo
+++ b/emulators/mupen64plus-core/distinfo
@@ -1,3 +1,3 @@
-MD5 (mupen64plus/Mupen64Plus-1-3-src.zip) = 578d4712e9617e229c2da44d472eb159
-SHA256 (mupen64plus/Mupen64Plus-1-3-src.zip) = 9327afd94696138bfa6559a02f61689b8107f221b34c26ac11e07c96fe65e6cc
-SIZE (mupen64plus/Mupen64Plus-1-3-src.zip) = 2845612
+MD5 (mupen64plus/Mupen64Plus-1-4-1-src.zip) = bd59542e17107844e6b3b139a1177551
+SHA256 (mupen64plus/Mupen64Plus-1-4-1-src.zip) = 846698b2066c59970fb9e13ce278b7e04365deb8a2643f42a2661ab410c1a9ae
+SIZE (mupen64plus/Mupen64Plus-1-4-1-src.zip) = 2499700
diff --git a/emulators/mupen64plus-core/files/patch-Makefile b/emulators/mupen64plus-core/files/patch-Makefile
index 6becc5b95fe9..31700c2b363d 100644
--- a/emulators/mupen64plus-core/files/patch-Makefile
+++ b/emulators/mupen64plus-core/files/patch-Makefile
@@ -1,25 +1,20 @@
---- Makefile	2008-03-29 14:41:03.000000000 -0500
-+++ Makefile	2008-05-20 10:56:58.000000000 -0500
-@@ -83,7 +83,7 @@
- 	r4300/tlb.o
- 
- ifeq ($(CPU), X86)
--  ifeq ($(ARCH), 64BITS)
-+  ifeq ($(ARCH_DETECTED), 64BITS)
-     DYNAREC = x86_64
-   else
-     DYNAREC = x86
-@@ -205,11 +205,11 @@
+--- Makefile.orig	2008-12-13 14:53:49.000000000 -0500
++++ Makefile	2008-12-14 23:40:23.000000000 -0500
+@@ -97,7 +97,7 @@
+ # handle dynamic recompiler objects
+ ifneq ($(NO_ASM), 1)
+   ifeq ($(CPU), X86)
+-    ifeq ($(ARCH), 64BITS)
++    ifeq ($(ARCH_DETECTED), 64BITS)
+       DYNAREC = x86_64
+     else
+       DYNAREC = x86
+@@ -274,7 +274,7 @@
  all: $(ALL)
  
  mupen64plus: $(OBJECTS)
--	$(CC) $^ $(LDFLAGS) $(LIBS) -Wl,-export-dynamic -lpthread -ldl -o $@
-+	$(CC) $^ $(LDFLAGS) $(LIBS) -Wl,-export-dynamic ${PTHREAD_LIBS} -o $@
+-	$(MUPENCC) $^ $(LDFLAGS) $(LIBS) -Wl,-export-dynamic -lpthread -ldl -o $@
++	$(MUPENCC) $^ $(LDFLAGS) $(LIBS) -Wl,-export-dynamic ${PTHREAD_LIBS} -o $@
  	$(STRIP) $@
  
- mupen64plus_dbg: $(OBJECTS) main/main_gtk.o
--	$(CC) $^ $(LDFLAGS) $(LIBS) -Wl,-export-dynamic -lpthread -ldl -o $@
-+	$(CC) $^ $(LDFLAGS) $(LIBS) -Wl,-export-dynamic ${PTHREAD_LIBS} -o $@
- 
  install:
- 	./install.sh $(PREFIX)
diff --git a/emulators/mupen64plus-core/files/patch-pre.mk b/emulators/mupen64plus-core/files/patch-pre.mk
index ef4c10350fe4..b1f982798129 100644
--- a/emulators/mupen64plus-core/files/patch-pre.mk
+++ b/emulators/mupen64plus-core/files/patch-pre.mk
@@ -1,8 +1,7 @@
---- pre.mk	2008-03-29 14:41:03.000000000 -0500
-+++ pre.mk	2008-05-20 10:56:16.000000000 -0500
-@@ -1,53 +1,28 @@
--# detect system architecture: i386, x86_64, or PPC/PPC64
-+# detect system architecture: i386, amd64, or PPC/PPC64
+--- pre.mk.orig	2008-12-14 22:42:29.000000000 -0500
++++ pre.mk	2008-12-14 23:37:19.000000000 -0500
+@@ -1,45 +1,28 @@
+ # detect system architecture: i386, x86_64, or PPC/PPC64
  UNAME = $(shell uname -m)
 -ifeq ("$(UNAME)","x86_64")
 +ifeq ("$(UNAME)","amd64")
@@ -24,47 +23,37 @@
    CPU = PPC
 -  ARCH = 32BITS
 +  ARCH_DETECTED = 32BITS
+   NO_ASM = 1
  endif
  ifeq ("$(UNAME)","ppc64")
    CPU = PPC
 -  ARCH = 64BITS
 +  ARCH_DETECTED = 64BITS
+   NO_ASM = 1
  endif
  
--# find installed assembler: yasm or nasm
--ifneq ("$(shell which yasm 2>&1 | head -c 9)", "which: no")
--  ASM=yasm
--else
--  ifneq ("$(shell which nasm 2>&1 | head -c 9)", "which: no")
--    ASM=nasm
--  else
--    # throw error
--    $(error No yasm or nasm found!)
--  endif
--endif
 -
 -# test for presence of SDL
--ifeq ("$(shell which sdl-config 2>&1 | head -c 9)", "which: no")
+-ifeq ($(shell which sdl-config 2>/dev/null),)
 -  # throw error
 -  $(error No SDL development libraries found!)
 -endif
 -
 -# test for presence of GTK 2.0
--ifeq ("$(shell which pkg-config 2>&1 | head -c 9)", "which: no")
+-ifeq ($(shell which pkg-config 2>/dev/null),)
 -  # throw error
--  $(error No GTK 2.x development libraries found!)
+-  $(error pkg-config not installed!)
 -endif
 -ifneq ("$(shell pkg-config gtk+-2.0 --modversion | head -c 2)", "2.")
 -  # throw error
 -  $(error No GTK 2.x development libraries found!)
 -endif
-+# set assembler program
-+ASM	?=	$(LOCALBASE)/bin/nasm
- 
+-
  # set GTK flags and libraries
- GTK_FLAGS	= `pkg-config gtk+-2.0 --cflags` -D_GTK2
-@@ -55,36 +30,36 @@
- GTHREAD_LIBS	= `pkg-config gthread-2.0 --libs`
+ GTK_FLAGS	= $(shell pkg-config gtk+-2.0 --cflags) -D_GTK2
+ GTK_LIBS	= $(shell pkg-config gtk+-2.0 --libs)
+@@ -74,36 +57,36 @@
+ 
  
  # set base program pointers and flags
 -CC      = gcc
@@ -80,7 +69,7 @@
 -INSTALL = ginstall
 +CC      ?= gcc
 +CXX     ?= g++
-+LD      ?= $(CXX)
++LD      ?= g++
 +STRIP   ?= strip --strip-all
 +RM      ?= rm
 +MV      ?= mv
@@ -92,9 +81,8 @@
  
  # set base CFLAGS and LDFLAGS for all systems
 -CFLAGS = -pipe -O3 -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing
--LDFLAGS =
 +CFLAGS += -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing
-+LDFLAGS +=
+ LDFLAGS =
  
  # set special flags per-system
  ifeq ($(CPU), X86)
@@ -119,21 +107,21 @@
    endif
  endif
  ifeq ($(CPU), PPC)
-@@ -105,8 +80,8 @@
+@@ -129,8 +112,8 @@
  
  # set CFLAGS, LIBS, and LDFLAGS for external dependencies
  
--SDL_FLAGS	= `sdl-config --cflags`
--SDL_LIBS	= `sdl-config --libs`
+-SDL_FLAGS	= $(shell sdl-config --cflags)
+-SDL_LIBS	= $(shell sdl-config --libs)
 +SDL_FLAGS	= `${SDL_CONFIG} --cflags`
 +SDL_LIBS	= `${SDL_CONFIG} --libs`
  
- AVIFILE_FLAGS	= `avifile-config --cflags`
- AVIFILE_LIBS	= `avifile-config --libs`
-@@ -116,5 +91,5 @@
+ ifeq ($(VCR), 1)
+   # test for presence of avifile
+@@ -148,5 +131,5 @@
  
  PLUGIN_LDFLAGS	= -Wl,-Bsymbolic -shared
  
--LIBGL_LIBS	= -L/usr/X11R6/lib -lGL
-+LIBGL_LIBS	= -L${LOCALBASE}/lib -lGL
+-LIBGL_LIBS	= -L/usr/X11R6/lib -lGL -lGLU
++LIBGL_LIBS	= -L${LOCALBASE}/lib -lGL -lGLU
  
diff --git a/emulators/mupen64plus-core/pkg-plist b/emulators/mupen64plus-core/pkg-plist
index 0d39a3bc03e7..54a61922029a 100644
--- a/emulators/mupen64plus-core/pkg-plist
+++ b/emulators/mupen64plus-core/pkg-plist
@@ -9,6 +9,7 @@ bin/mupen64plus
 %%DATADIR%%/lang/italian.lng
 %%DATADIR%%/lang/pt_BR.lng
 %%DATADIR%%/lang/spanish.lng
+%%DATADIR%%/lang/swedish.lng
 %%DATADIR%%/icons/australia.png
 %%DATADIR%%/icons/configure-small.png
 %%DATADIR%%/icons/configure.png
@@ -21,6 +22,7 @@ bin/mupen64plus
 %%DATADIR%%/icons/input.png
 %%DATADIR%%/icons/italy.png
 %%DATADIR%%/icons/japan.png
+%%DATADIR%%/icons/japanusa.png
 %%DATADIR%%/icons/logo.png
 %%DATADIR%%/icons/logo.xpm
 %%DATADIR%%/icons/messagebox-error.png
@@ -42,7 +44,6 @@ bin/mupen64plus
 %%DATADIR%%/icons/usa.png
 %%PORTDOCS%%%%DOCSDIR%%/README.vcr
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE
-%%PORTDOCS%%%%DOCSDIR%%/readme.pdf
 @dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%/lang
 @dirrmtry %%DATADIR%%/config
diff --git a/emulators/mupen64plus-glide/files/patch-glide64_Makefile b/emulators/mupen64plus-glide/files/patch-glide64_Makefile
index e73d1e8526c7..6937a95debca 100644
--- a/emulators/mupen64plus-glide/files/patch-glide64_Makefile
+++ b/emulators/mupen64plus-glide/files/patch-glide64_Makefile
@@ -1,5 +1,5 @@
---- glide64/Makefile	2008-03-29 14:41:03.000000000 -0500
-+++ glide64/Makefile	2008-05-20 11:01:10.000000000 -0500
+--- glide64/Makefile	2008-10-13 21:31:47.000000000 -0500
++++ glide64/Makefile	2008-12-15 01:10:56.000000000 -0500
 @@ -4,7 +4,7 @@
  include ../pre.mk
  
@@ -9,15 +9,14 @@
    BITS=64
    MOPT=-m amd64
  else
-@@ -13,15 +13,16 @@
+@@ -13,15 +13,15 @@
  endif
  
  # local CFLAGS, LIBS, and LDFLAGS
--CFLAGS = -O2 -Wall -g -DGCC -DUSE_GTK $(SDL_CFLAGS) $(GTK_FLAGS) -Iwrapper/ -ffast-math -funroll-loops
+-CFLAGS = -O3 -Wall -g -DGCC -DUSE_GTK $(SDL_CFLAGS) $(GTK_FLAGS) -Iwrapper/ -ffast-math -funroll-loops
 -LDFLAGS	= -shared -Wl,-Bsymbolic -lGL -lGLU -L/usr/X11R6/lib $(SDL_LIBS)
 +CFLAGS += -DGCC -DUSE_GTK $(SDL_CFLAGS) $(GTK_FLAGS) -Iwrapper/ -ffast-math -funroll-loops
 +LDFLAGS	+= -shared -Wl,-Bsymbolic -lGL -lGLU -L${LOCALBASE}/lib $(SDL_LIBS)
-+LD = $(CXX)
  
  # set special flags per-system
  ifeq ($(CPU), X86)
@@ -27,11 +26,11 @@
 +    CFLAGS += -fPIC
    else
 -    CFLAGS += -march=i686 -mtune=pentium-m -mmmx -msse
-+    CFLAGS += 
++    CFLAGS += -mmmx -msse
      ifneq ($(PROFILE), 1)
      ifneq ($(VPDEBUG), 1)
        CFLAGS += -fomit-frame-pointer
-@@ -29,9 +30,9 @@
+@@ -29,9 +29,9 @@
      endif
    endif
    # tweak flags for 32-bit build on 64-bit system
@@ -44,14 +43,21 @@
    endif
  endif
  ifeq ($(CPU), PPC)
-@@ -129,9 +130,7 @@
- cursor.h: compiletex
- 	./compiletex cursor.tex cursor.h cursor
+@@ -122,7 +122,7 @@
+ all: $(TARGET)
  
--compiletex: compiletex.c
--	@rm -f compiletex compiletex.o
--	$(CC) -o compiletex.o -c $<
-+compiletex: compiletex.o
- 	$(LD) -o $@ compiletex.o
+ $(TARGET): $(OBJECTS)
+-	$(LD) $(OBJECTS) $(GTK_LIBS) $(LDFLAGS) -o $@
++	$(CC) $(OBJECTS) $(LDFLAGS) $(GTK_LIBS) -o $@
+ 	$(STRIP) --strip-all $@
+ 
+ Main.o: font.h cursor.h
+@@ -135,7 +135,7 @@
+ compiletex: compiletex.c
+ 	@rm -f compiletex compiletex.o
+ 	$(CC) -o compiletex.o -c $<
+-	$(LD) -o $@ compiletex.o
++	$(CC) -o $@ compiletex.o
+ 
+ rdp.o: ucode06.h
  
- Tmem_nasm.o: Tmem_nasm.asm
diff --git a/emulators/mupen64plus-gln64/files/patch-glN64_Config_linux.cpp b/emulators/mupen64plus-gln64/files/patch-glN64_Config_linux.cpp
index afaf0fbc94ca..75456d9a4ad0 100644
--- a/emulators/mupen64plus-gln64/files/patch-glN64_Config_linux.cpp
+++ b/emulators/mupen64plus-gln64/files/patch-glN64_Config_linux.cpp
@@ -1,39 +1,39 @@
---- glN64/Config_linux.cpp	2008-05-16 17:58:34.000000000 -0500
-+++ glN64/Config_linux.cpp	2008-05-16 18:00:13.000000000 -0500
+--- glN64/Config_gtk2.cpp	2008-12-15 01:42:14.000000000 -0500
++++ glN64/Config_gtk2.cpp	2008-12-15 01:50:17.000000000 -0500
 @@ -1,4 +1,3 @@
 -#include <features.h>
  #include <dlfcn.h>
  #include <unistd.h>
  #include "../main/winlnxdefs.h"
 @@ -44,29 +43,8 @@
- 	}
- 	else
- 	{
+     }
+     else
+     {
 -#ifdef __USE_GNU
 -                Dl_info info;
 -                void *addr = (void*)GetPluginDir;
 -                if(dladdr(addr, &info) != 0)
 -                {
-- 	               strncpy(path, info.dli_fname, PATH_MAX);
-- 	               *(strrchr(path, '/')) = '\0';
+-                   strncpy(path, info.dli_fname, PATH_MAX);
+-                   *(strrchr(path, '/')) = '\0';
 -                }
 -                else
 -                {
-- 	               fprintf(stderr, "(WW) Couldn't get path of .so, trying to get emulator's path\n");
+-                   fprintf(stderr, "(WW) Couldn't get path of .so, trying to get emulator's path\n");
 -#endif // __USE_GNU
--	               if(readlink("/proc/self/exe", path, PATH_MAX) == -1)
--	               {
--	                       fprintf(stderr, "(WW) readlink() /proc/self/exe failed: %s\n", strerror(errno));
--	 	              path[0] = '.';
--	 	              path[1] = '\0';
--	               }
--	               *(strrchr(path, '/')) = '\0';
--	               strncat(path, "/plugins", PATH_MAX);
+-                   if(readlink("/proc/self/exe", path, PATH_MAX) == -1)
+-                   {
+-                           fprintf(stderr, "(WW) readlink() /proc/self/exe failed: %s\n", strerror(errno));
+-                      path[0] = '.';
+-                      path[1] = '\0';
+-                   }
+-                   *(strrchr(path, '/')) = '\0';
+-                   strncat(path, "/plugins", PATH_MAX);
 -#ifdef __USE_GNU
--		}
+-        }
 -#endif
-+		strcpy(path, getenv("HOME"));
-+		strncat(path, "/.mupen64plus/plugins", PATH_MAX);
- 	}
++	strcpy(path, getenv("HOME"));
++	strncat(path, "/.mupen64plus/plugins", PATH_MAX);
+     }
          return path;
  }
diff --git a/emulators/mupen64plus-input-sdl/files/patch-blight_input_SDL_ttf.c b/emulators/mupen64plus-input-sdl/files/patch-blight_input_SDL_ttf.c
deleted file mode 100644
index 54d968d417df..000000000000
--- a/emulators/mupen64plus-input-sdl/files/patch-blight_input_SDL_ttf.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- blight_input/SDL_ttf.c	2007-10-08 01:36:42.000000000 -0500
-+++ blight_input/SDL_ttf.c	2007-10-08 01:39:03.000000000 -0500
-@@ -48,7 +48,6 @@
- #include <freetype/ftoutln.h>
- #include <freetype/ttnameid.h>
- */
--#include <freetype/internal/ftobjs.h>
- 
- #ifndef FT_OPEN_STREAM
- #define FT_OPEN_STREAM ft_open_stream
-@@ -275,7 +274,7 @@
- 	}
- 	memset(stream, 0, sizeof(*stream));
- 
--	stream->memory = library->memory;
-+	stream->memory = NULL;
- 	stream->read = RWread;
- 	stream->descriptor.pointer = src;
- 	stream->pos = (unsigned long)position;
diff --git a/emulators/mupen64plus-input-sdl/files/patch-blight_input_plugin.c b/emulators/mupen64plus-input-sdl/files/patch-blight_input_plugin.c
new file mode 100644
index 000000000000..3737bc204b3b
--- /dev/null
+++ b/emulators/mupen64plus-input-sdl/files/patch-blight_input_plugin.c
@@ -0,0 +1,82 @@
+--- blight_input/plugin.c	2008-10-13 21:31:47.000000000 -0500
++++ blight_input/plugin.c	2008-12-15 02:11:02.000000000 -0500
+@@ -20,7 +20,9 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <dirent.h>
++#ifdef __linux__
+ #include <linux/input.h>
++#endif
+ 
+ #include "plugin.h"
+ 
+@@ -453,9 +455,11 @@
+ 
+ BYTE lastCommand[6];
+ 
++#ifdef __linux__
+ struct ff_effect ffeffect[3];
+ struct ff_effect ffstrong[3];
+ struct ff_effect ffweak[3];
++#endif
+ 
+ BYTE DataCRC( BYTE *Data, int iLenght )
+ {
+@@ -513,6 +517,7 @@
+ void
+ ControllerCommand(int Control, BYTE *Command)
+ {
++#ifdef __linux__
+     BYTE *Data = &Command[5];
+     struct input_event play;
+ 
+@@ -580,6 +585,7 @@
+             /*printf( "Write eeprom\n" );*/
+             break;
+         }
++#endif
+ }
+ 
+ /******************************************************************
+@@ -860,7 +866,9 @@
+ void
+ GetKeys( int Control, BUTTONS *Keys )
+ {
++#ifdef __linux__
+     struct input_event play;
++#endif
+     int b, axis_val, axis_max_val, axis_val_tmp;
+     SDL_Event event;
+     Uint8 *keystate = SDL_GetKeyState( NULL );
+@@ -1086,6 +1094,7 @@
+ #endif
+     *(int *)Keys = *(int *)&controller[Control].buttons;
+ 
++#ifdef __linux__
+     /* handle mempack / rumblepak switching (only if rumble is active on joystick) */
+     if (controller[Control].event_joystick != 0)
+     {
+@@ -1108,6 +1117,7 @@
+                 perror("Error starting rumble effect");
+         }
+     }
++#endif
+ }
+ 
+ int InitiateRumble(int cntrl)
+@@ -1165,6 +1175,7 @@
+         return 0;
+     }
+ 
++#ifdef __linux__
+     if (ioctl(controller[cntrl].event_joystick, EVIOCGBIT(EV_FF, sizeof(unsigned long) * 4), features) == -1)
+     {
+         printf("["PLUGIN_NAME"]: Linux kernel communication failed for force feedback (rumble).\n", temp);
+@@ -1205,6 +1216,7 @@
+     ioctl(controller[cntrl].event_joystick, EVIOCSFF, &ffweak[cntrl]);
+ 
+     printf("["PLUGIN_NAME"]: Rumble activated on N64 joystick #%i\n", cntrl + 1);
++#endif
+ }
+ 
+ /******************************************************************
diff --git a/emulators/mupen64plus-rice/files/patch-rice_video_Makefile b/emulators/mupen64plus-rice/files/patch-rice_video_Makefile
index c637a3f04771..67f1add0d455 100644
--- a/emulators/mupen64plus-rice/files/patch-rice_video_Makefile
+++ b/emulators/mupen64plus-rice/files/patch-rice_video_Makefile
@@ -1,12 +1,12 @@
---- rice_video/Makefile	2008-03-29 14:41:03.000000000 -0500
-+++ rice_video/Makefile	2008-05-17 09:40:34.000000000 -0500
+--- rice_video/Makefile	2008-10-13 21:31:48.000000000 -0500
++++ rice_video/Makefile	2008-12-15 01:54:25.000000000 -0500
 @@ -4,8 +4,8 @@
  include ../pre.mk
  
  # local CFLAGS, LIBS, and LDFLAGS
--CFLAGS += -DUSE_GTK `sdl-config --cflags` $(GTK_FLAGS) -fpic -DPIC
+-CFLAGS += -DUSE_GTK `sdl-config --cflags` $(GTK_FLAGS) -fpic -DPIC -Wall
 -LDFLAGS	+= -L/usr/X11R6/lib `sdl-config --libs` -lGL -shared -Wl,-Bsymbolic
-+CFLAGS += -DUSE_GTK $(SDL_FLAGS) $(GTK_FLAGS) -fpic -DPIC
++CFLAGS += -DUSE_GTK  $(SDL_FLAGS) $(GTK_FLAGS) -fpic -DPIC -Wall
 +LDFLAGS	+= -L$(LOCALBASE)/lib $(SDL_LIBS) -lGL -shared -Wl,-Bsymbolic
  
  # set options
diff --git a/emulators/mupen64plus-sdlinput/files/patch-blight_input_SDL_ttf.c b/emulators/mupen64plus-sdlinput/files/patch-blight_input_SDL_ttf.c
deleted file mode 100644
index 54d968d417df..000000000000
--- a/emulators/mupen64plus-sdlinput/files/patch-blight_input_SDL_ttf.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- blight_input/SDL_ttf.c	2007-10-08 01:36:42.000000000 -0500
-+++ blight_input/SDL_ttf.c	2007-10-08 01:39:03.000000000 -0500
-@@ -48,7 +48,6 @@
- #include <freetype/ftoutln.h>
- #include <freetype/ttnameid.h>
- */
--#include <freetype/internal/ftobjs.h>
- 
- #ifndef FT_OPEN_STREAM
- #define FT_OPEN_STREAM ft_open_stream
-@@ -275,7 +274,7 @@
- 	}
- 	memset(stream, 0, sizeof(*stream));
- 
--	stream->memory = library->memory;
-+	stream->memory = NULL;
- 	stream->read = RWread;
- 	stream->descriptor.pointer = src;
- 	stream->pos = (unsigned long)position;
diff --git a/emulators/mupen64plus-sdlinput/files/patch-blight_input_plugin.c b/emulators/mupen64plus-sdlinput/files/patch-blight_input_plugin.c
new file mode 100644
index 000000000000..3737bc204b3b
--- /dev/null
+++ b/emulators/mupen64plus-sdlinput/files/patch-blight_input_plugin.c
@@ -0,0 +1,82 @@
+--- blight_input/plugin.c	2008-10-13 21:31:47.000000000 -0500
++++ blight_input/plugin.c	2008-12-15 02:11:02.000000000 -0500
+@@ -20,7 +20,9 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <dirent.h>
++#ifdef __linux__
+ #include <linux/input.h>
++#endif
+ 
+ #include "plugin.h"
+ 
+@@ -453,9 +455,11 @@
+ 
+ BYTE lastCommand[6];
+ 
++#ifdef __linux__
+ struct ff_effect ffeffect[3];
+ struct ff_effect ffstrong[3];
+ struct ff_effect ffweak[3];
++#endif
+ 
+ BYTE DataCRC( BYTE *Data, int iLenght )
+ {
+@@ -513,6 +517,7 @@
+ void
+ ControllerCommand(int Control, BYTE *Command)
+ {
++#ifdef __linux__
+     BYTE *Data = &Command[5];
+     struct input_event play;
+ 
+@@ -580,6 +585,7 @@
+             /*printf( "Write eeprom\n" );*/
+             break;
+         }
++#endif
+ }
+ 
+ /******************************************************************
+@@ -860,7 +866,9 @@
+ void
+ GetKeys( int Control, BUTTONS *Keys )
+ {
++#ifdef __linux__
+     struct input_event play;
++#endif
+     int b, axis_val, axis_max_val, axis_val_tmp;
+     SDL_Event event;
+     Uint8 *keystate = SDL_GetKeyState( NULL );
+@@ -1086,6 +1094,7 @@
+ #endif
+     *(int *)Keys = *(int *)&controller[Control].buttons;
+ 
++#ifdef __linux__
+     /* handle mempack / rumblepak switching (only if rumble is active on joystick) */
+     if (controller[Control].event_joystick != 0)
+     {
+@@ -1108,6 +1117,7 @@
+                 perror("Error starting rumble effect");
+         }
+     }
++#endif
+ }
+ 
+ int InitiateRumble(int cntrl)
+@@ -1165,6 +1175,7 @@
+         return 0;
+     }
+ 
++#ifdef __linux__
+     if (ioctl(controller[cntrl].event_joystick, EVIOCGBIT(EV_FF, sizeof(unsigned long) * 4), features) == -1)
+     {
+         printf("["PLUGIN_NAME"]: Linux kernel communication failed for force feedback (rumble).\n", temp);
+@@ -1205,6 +1216,7 @@
+     ioctl(controller[cntrl].event_joystick, EVIOCSFF, &ffweak[cntrl]);
+ 
+     printf("["PLUGIN_NAME"]: Rumble activated on N64 joystick #%i\n", cntrl + 1);
++#endif
+ }
+ 
+ /******************************************************************
diff --git a/emulators/mupen64plus-video-rice/files/patch-rice_video_Makefile b/emulators/mupen64plus-video-rice/files/patch-rice_video_Makefile
index c637a3f04771..67f1add0d455 100644
--- a/emulators/mupen64plus-video-rice/files/patch-rice_video_Makefile
+++ b/emulators/mupen64plus-video-rice/files/patch-rice_video_Makefile
@@ -1,12 +1,12 @@
---- rice_video/Makefile	2008-03-29 14:41:03.000000000 -0500
-+++ rice_video/Makefile	2008-05-17 09:40:34.000000000 -0500
+--- rice_video/Makefile	2008-10-13 21:31:48.000000000 -0500
++++ rice_video/Makefile	2008-12-15 01:54:25.000000000 -0500
 @@ -4,8 +4,8 @@
  include ../pre.mk
  
  # local CFLAGS, LIBS, and LDFLAGS
--CFLAGS += -DUSE_GTK `sdl-config --cflags` $(GTK_FLAGS) -fpic -DPIC
+-CFLAGS += -DUSE_GTK `sdl-config --cflags` $(GTK_FLAGS) -fpic -DPIC -Wall
 -LDFLAGS	+= -L/usr/X11R6/lib `sdl-config --libs` -lGL -shared -Wl,-Bsymbolic
-+CFLAGS += -DUSE_GTK $(SDL_FLAGS) $(GTK_FLAGS) -fpic -DPIC
++CFLAGS += -DUSE_GTK  $(SDL_FLAGS) $(GTK_FLAGS) -fpic -DPIC -Wall
 +LDFLAGS	+= -L$(LOCALBASE)/lib $(SDL_LIBS) -lGL -shared -Wl,-Bsymbolic
  
  # set options
diff --git a/emulators/mupen64plus/Makefile b/emulators/mupen64plus/Makefile
index bb859e64f321..d557cc2d6a4b 100644
--- a/emulators/mupen64plus/Makefile
+++ b/emulators/mupen64plus/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mupen64plus
-PORTVERSION=	1.3
-PORTREVISION=	1
+PORTVERSION=	1.4.1
 CATEGORIES=	emulators
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -21,7 +20,6 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/mupen64plus:${PORTSDIR}/emulators/mupen64plus-bas
 
 # Audio plugins
 RUN_DEPENDS+=	${PLUGINDIR}/dummyaudio.so:${PORTSDIR}/emulators/mupen64plus-dummyaudio
-RUN_DEPENDS+=	${PLUGINDIR}/mupen64_audio.so:${PORTSDIR}/emulators/mupen64plus-sound
 RUN_DEPENDS+=	${PLUGINDIR}/jttl_audio.so:${PORTSDIR}/emulators/mupen64plus-sdlaudio
 
 # Input plugins