10 files changed, 63 insertions, 24 deletions

diff --git a/emulators/mupen64plus-audio-sdl/Makefile b/emulators/mupen64plus-audio-sdl/Makefile
index eb28b0bed3c1..0b473d741cc9 100644
--- a/emulators/mupen64plus-audio-sdl/Makefile
+++ b/emulators/mupen64plus-audio-sdl/Makefile
@@ -5,8 +5,6 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
-
 PKGNAMESUFFIX=	-audio-sdl
 
 COMMENT=	Mupen64plus audio sdl plugin
diff --git a/emulators/mupen64plus-core/Makefile b/emulators/mupen64plus-core/Makefile
index 31274c2259a9..3c4dcb8a7cbe 100644
--- a/emulators/mupen64plus-core/Makefile
+++ b/emulators/mupen64plus-core/Makefile
@@ -7,15 +7,17 @@
 
 PORTNAME=	mupen64plus
 PORTVERSION?=	1.99.4
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	emulators
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
+		${MASTER_SITE_LOCAL:S,$,acm/${PORTNAME}/,}
 PKGNAMESUFFIX?=	-core
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER?=	acm@FreeBSD.org
 COMMENT?=	A fork of Mupen64 Nintendo 64 emulator
 
+PROJECTHOST=	bsdistfiles
 USE_GL?=	yes
 USE_SDL?=	yes
 USE_GMAKE=	yes
diff --git a/emulators/mupen64plus-core/distinfo b/emulators/mupen64plus-core/distinfo
index 2098c76d7eaf..943dc7475ce8 100644
--- a/emulators/mupen64plus-core/distinfo
+++ b/emulators/mupen64plus-core/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mupen64plus/mupen64plus-bundle-src-1.99.4.tar.gz) = 28868b299372a7b6a1628ee7340656748ed6316fd210d52b82f27518cec7ab8e
-SIZE (mupen64plus/mupen64plus-bundle-src-1.99.4.tar.gz) = 1703878
+SHA256 (mupen64plus/mupen64plus-bundle-src-1.99.4.tar.gz) = 07f69ccefdf7224cb29a39c0525daa87807b44846ca14fcad97728d6a22f4da2
+SIZE (mupen64plus/mupen64plus-bundle-src-1.99.4.tar.gz) = 1699177
diff --git a/emulators/mupen64plus-core/files/patch-source_mupen64plus-core_projects_unix_Makefile b/emulators/mupen64plus-core/files/patch-source_mupen64plus-core_projects_unix_Makefile
new file mode 100644
index 000000000000..f6ef06d6942e
--- /dev/null
+++ b/emulators/mupen64plus-core/files/patch-source_mupen64plus-core_projects_unix_Makefile
@@ -0,0 +1,30 @@
+--- source/mupen64plus-core/projects/unix/Makefile	2011-12-17 20:37:23.000000000 -0500
++++ source/mupen64plus-core/projects/unix/Makefile	2011-12-17 20:39:06.000000000 -0500
+@@ -170,8 +170,10 @@
+ ifeq ($(shell pkg-config --modversion libpng 2>/dev/null),)
+   $(error No libpng development libraries found!)
+ endif
+-ifeq ($(shell pkg-config --modversion zlib 2>/dev/null),)
+-  $(error No zlib development libraries found!)
++ifneq ($(OS), FREEBSD)
++  ifeq ($(shell pkg-config --modversion zlib 2>/dev/null),)
++    $(error No zlib development libraries found!)
++  endif
+ endif
+ ifeq ($(shell pkg-config --modversion freetype2 2>/dev/null),)
+   $(error No FreeType 2 development libraries found!)
+@@ -182,8 +184,14 @@
+ ifeq ($(shell pkg-config --modversion glu 2>/dev/null),)
+   $(error No OpenGL utility development libraries found!)
+ endif
++
++ifeq ($(OS), FREEBSD)
++CFLAGS += $(shell pkg-config --cflags libpng freetype2 gl glu)
++LDLIBS +=  $(shell pkg-config --libs libpng freetype2 gl glu)
++else
+ CFLAGS += $(shell pkg-config --cflags libpng zlib freetype2 gl glu)
+ LDLIBS +=  $(shell pkg-config --libs libpng zlib freetype2 gl glu)
++endif
+ 
+ # test for presence of SDL
+ ifeq ($(shell which sdl-config 2>/dev/null),)
diff --git a/emulators/mupen64plus-core/files/patch-source_mupen64plus-core_src_main_zip_ioapi.h b/emulators/mupen64plus-core/files/patch-source_mupen64plus-core_src_main_zip_ioapi.h
new file mode 100644
index 000000000000..801d20e1a864
--- /dev/null
+++ b/emulators/mupen64plus-core/files/patch-source_mupen64plus-core_src_main_zip_ioapi.h
@@ -0,0 +1,15 @@
+--- source/mupen64plus-core/src/main/zip/ioapi.h	2011-12-17 21:07:15.000000000 -0500
++++ source/mupen64plus-core/src/main/zip/ioapi.h	2011-12-17 21:08:43.000000000 -0500
+@@ -61,6 +61,12 @@
+ #endif
+ #endif
+ 
++#if defined(__FreeBSD__)
++#define fopen64 fopen
++#define ftello64 ftello
++#define fseeko64 fseeko
++#endif
++
+ /*
+ #ifndef ZPOS64_T
+   #ifdef _WIN32
diff --git a/emulators/mupen64plus-input-sdl/Makefile b/emulators/mupen64plus-input-sdl/Makefile
index 590f9ef59c2b..f1e32e2e0b3b 100644
--- a/emulators/mupen64plus-input-sdl/Makefile
+++ b/emulators/mupen64plus-input-sdl/Makefile
@@ -5,8 +5,6 @@
 # $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 ed23ab4d37ec..8e0d5d2e5471 100644
--- a/emulators/mupen64plus-rsp-hle/Makefile
+++ b/emulators/mupen64plus-rsp-hle/Makefile
@@ -5,8 +5,6 @@
 # $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 5805644e3e01..30c3a277b005 100644
--- a/emulators/mupen64plus-video-rice/Makefile
+++ b/emulators/mupen64plus-video-rice/Makefile
@@ -5,8 +5,6 @@
 # $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
index 942bcf807051..4a5a47c183a9 100644
--- 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
@@ -1,14 +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 @@
+--- source/mupen64plus-video-rice/projects/unix/Makefile	2011-12-17 20:14:08.000000000 -0500
++++ source/mupen64plus-video-rice/projects/unix/Makefile	2011-12-17 20:34:47.000000000 -0500
+@@ -171,6 +171,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
+     CFLAGS  += $(shell sdl-config --cflags)
+     LDLIBS += $(shell sdl-config --libs)
++    ifeq ($(CPU), X86)
++      ifeq ($(ARCH_DETECTED), 32BITS)
++        CFLAGS += -pipe -mmmx -msse -fomit-frame-pointer
++      endif
 +    endif
-+  endif
  endif
- ifeq ($(OS), LINUX)
-   LDFLAGS += -ldl -lGL
+ ifeq ($(OS),OSX)
+     CFLAGS  += $(shell sdl-config --cflags)
diff --git a/emulators/mupen64plus/Makefile b/emulators/mupen64plus/Makefile
index 1c27951e0ff7..160a05087d79 100644
--- a/emulators/mupen64plus/Makefile
+++ b/emulators/mupen64plus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mupen64plus
 PORTVERSION=	1.99.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	# empty
 DISTFILES=	# empty