6 files changed, 60 insertions, 65 deletions

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