8 files changed, 28 insertions, 5 deletions

diff --git a/emulators/mupen64plus-audio-sdl/Makefile b/emulators/mupen64plus-audio-sdl/Makefile
index 0b473d741cc9..eb28b0bed3c1 100644
--- a/emulators/mupen64plus-audio-sdl/Makefile
+++ b/emulators/mupen64plus-audio-sdl/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+PORTREVISION=	1
+
 PKGNAMESUFFIX=	-audio-sdl
 
 COMMENT=	Mupen64plus audio sdl plugin
diff --git a/emulators/mupen64plus-core/Makefile b/emulators/mupen64plus-core/Makefile
index 166ef65997bd..31274c2259a9 100644
--- a/emulators/mupen64plus-core/Makefile
+++ b/emulators/mupen64plus-core/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mupen64plus
 PORTVERSION?=	1.99.4
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PKGNAMESUFFIX?=	-core
@@ -17,7 +17,7 @@ MAINTAINER?=	acm@FreeBSD.org
 COMMENT?=	A fork of Mupen64 Nintendo 64 emulator
 
 USE_GL?=	yes
-USE_SDL?=	#
+USE_SDL?=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG?=	yes
 ONLY_FOR_ARCHS=	i386 amd64
diff --git a/emulators/mupen64plus-core/Makefile.common b/emulators/mupen64plus-core/Makefile.common
index 232a816eaf60..36ad55645a42 100644
--- a/emulators/mupen64plus-core/Makefile.common
+++ b/emulators/mupen64plus-core/Makefile.common
@@ -9,8 +9,6 @@ EXTRACT_AFTER_ARGS=	| ${TAR} -xf - "${DISTNAME}/source/${PORTNAME}-core/*" \
 				"${DISTNAME}/source/${PORTNAME}${PKGNAMESUFFIX}/*"
 
 .if ${PKGNAMESUFFIX} == "-core"
-USE_SDL=		sdl
-
 LIB_DEPENDS+=		freetype.9:${PORTSDIR}/print/freetype2 \
 			png.6:${PORTSDIR}/graphics/png
 .else
@@ -42,7 +40,8 @@ pre-install:
 .	endif
 
 .	if ${PKGNAMESUFFIX} != "-ui-console"
-		@${ECHO_CMD} "lib/${PORTNAME}${PKGNAMESUFFIX}.so" >> ${PLIST}
+		@${ECHO_CMD} "lib/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}.so" >> ${PLIST}
+		@${ECHO_CMD} "@dirrmtry lib/${PORTNAME}" >> ${PLIST}
 		@${ECHO_CMD} "@dirrmtry %%DATADIR%%" >> ${PLIST}
 .	else
 		@${ECHO_CMD} "bin/${PORTNAME}" >> ${PLIST}
@@ -84,6 +83,7 @@ do-install:
 .	endif
 
 .	if ${PKGNAMESUFFIX} != "-ui-console"
+		@${MKDIR} ${PREFIX}/lib/${PORTNAME}
 		${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}.so ${PREFIX}/lib
 .	else
 		${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${PREFIX}/bin
diff --git a/emulators/mupen64plus-input-sdl/Makefile b/emulators/mupen64plus-input-sdl/Makefile
index f1e32e2e0b3b..590f9ef59c2b 100644
--- a/emulators/mupen64plus-input-sdl/Makefile
+++ b/emulators/mupen64plus-input-sdl/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+PORTREVISION=	1
+
 PKGNAMESUFFIX=	-input-sdl
 
 COMMENT=	Input plugin for Mupen64plus
diff --git a/emulators/mupen64plus-rsp-hle/Makefile b/emulators/mupen64plus-rsp-hle/Makefile
index 8e0d5d2e5471..ed23ab4d37ec 100644
--- a/emulators/mupen64plus-rsp-hle/Makefile
+++ b/emulators/mupen64plus-rsp-hle/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+PORTREVISION=	1
+
 PKGNAMESUFFIX=	-rsp-hle
 
 COMMENT=	RSP plugin for Mupen64plus
diff --git a/emulators/mupen64plus-video-rice/Makefile b/emulators/mupen64plus-video-rice/Makefile
index 30c3a277b005..5805644e3e01 100644
--- a/emulators/mupen64plus-video-rice/Makefile
+++ b/emulators/mupen64plus-video-rice/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+PORTREVISION=	1
+
 PKGNAMESUFFIX=	-video-rice
 
 COMMENT=	The rice graphics plugin for Mupen64plus
diff --git a/emulators/mupen64plus-video-rice/files/patch-source_mupen64plus-video-rice_projects_unix_Makefile b/emulators/mupen64plus-video-rice/files/patch-source_mupen64plus-video-rice_projects_unix_Makefile
new file mode 100644
index 000000000000..942bcf807051
--- /dev/null
+++ b/emulators/mupen64plus-video-rice/files/patch-source_mupen64plus-video-rice_projects_unix_Makefile
@@ -0,0 +1,14 @@
+--- source/mupen64plus-video-rice/projects/unix/Makefile	2010-12-17 00:32:33.000000000 -0500
++++ source/mupen64plus-video-rice/projects/unix/Makefile	2010-12-17 00:34:09.000000000 -0500
+@@ -111,6 +111,11 @@
+ ifeq ($(OS),FREEBSD)
+   LDFLAGS += -lGL $(shell pkg-config --libs libpng)
+   CFLAGS += $(shell pkg-config --cflags libpng)
++  ifeq ($(CPU), X86)
++    ifeq ($(ARCH_DETECTED), 32BITS)
++      CFLAGS += -pipe -mmmx -msse -fomit-frame-pointer
++    endif
++  endif
+ endif
+ ifeq ($(OS), LINUX)
+   LDFLAGS += -ldl -lGL
diff --git a/emulators/mupen64plus/Makefile b/emulators/mupen64plus/Makefile
index f4ef35d7fea6..44197a479534 100644
--- a/emulators/mupen64plus/Makefile
+++ b/emulators/mupen64plus/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mupen64plus
 PORTVERSION=	1.99.4
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	# empty
 DISTFILES=	# empty