- don't build with -O3
- downgrade other plugins' lib dep on core plugin to build dep
- fix some MAKE_FLAGS overwriting that snuck in
- remove old post-patch targets
- update wantlib
- take maintainership
ok?
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/emulators/mupen64plus/Makefile.inc,v
retrieving revision 1.3
diff -N -u -p -u -p Makefile.inc
--- Makefile.inc 13 Aug 2012 06:53:55 -0000 1.3
+++ Makefile.inc 13 Nov 2012 05:36:31 -0000
@@ -8,18 +8,22 @@ PKGNAME ?=
mupen64plus-${MUPEN64PLUS_MOD}-${VERSION}
HOMEPAGE ?= http://code.google.com/p/mupen64plus/
CATEGORIES ?= emulators games
MASTER_SITES ?=
https://bitbucket.org/richard42/mupen64plus-${MUPEN64PLUS_MOD}/downloads/
+MAINTAINER ?= Anthony J. Bentley <anth...@cathet.us>
CONFIGURE_STYLE ?= none
USE_GMAKE ?= Yes
-MAKE_FLAGS ?= CC=${CC} CXX=${CXX} V=1
+MAKE_FLAGS += CC=${CC} \
+ CXX=${CXX} \
+ V=1 \
+ OPTFLAGS=
FAKE_FLAGS ?= PREFIX=${PREFIX} LDCONFIG=true
.if ${MUPEN64PLUS_MOD} != "core"
MAKE_FLAGS += APIDIR=${LOCALBASE}/include/mupen64plus
-LIB_DEPENDS += emulators/mupen64plus/core>=1.99.5
+BUILD_DEPENDS += emulators/mupen64plus/core>=1.99.5
.endif
-WRKBUILD ?= ${WRKDIST}/projects/unix
+WRKBUILD ?= ${WRKDIST}/projects/unix
NO_REGRESS ?= Yes
Index: audio-sdl/Makefile
===================================================================
RCS file: /cvs/ports/emulators/mupen64plus/audio-sdl/Makefile,v
retrieving revision 1.2
diff -N -u -p -u -p audio-sdl/Makefile
--- audio-sdl/Makefile 26 Dec 2011 22:58:48 -0000 1.2
+++ audio-sdl/Makefile 13 Nov 2012 05:36:31 -0000
@@ -2,20 +2,18 @@
COMMENT = n64 emulator sdl audio plugin
+REVISION = 0
+
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
-WANTLIB = SDL samplerate
+WANTLIB = SDL pthread samplerate
LIB_DEPENDS = devel/sdl \
audio/libsamplerate
MUPEN64PLUS_MOD = audio-sdl
-
-# resolve 'no newline at end of file' warning
-post-patch:
- echo >> ${WRKSRC}/src/osal_preproc.h
.include <bsd.port.mk>
Index: core/Makefile
===================================================================
RCS file: /cvs/ports/emulators/mupen64plus/core/Makefile,v
retrieving revision 1.3
diff -N -u -p -u -p core/Makefile
--- core/Makefile 13 Aug 2012 06:53:55 -0000 1.3
+++ core/Makefile 13 Nov 2012 05:36:31 -0000
@@ -3,20 +3,21 @@
COMMENT = n64 emulator core
SHARED_LIBS = mupen64plus 2.1 # 2.0
+REVISION = 0
+
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
-WANTLIB = GL GLU c m stdc++ z freetype png SDL
+WANTLIB = GL GLU c m stdc++ z freetype png pthread SDL
LIB_DEPENDS = devel/sdl \
graphics/png \
print/freetype
MUPEN64PLUS_MOD = core
-MAKE_FLAGS = TARGET=libmupen64plus.so.${LIBmupen64plus_VERSION} \
- V=1
+MAKE_FLAGS += TARGET=libmupen64plus.so.${LIBmupen64plus_VERSION}
.include <bsd.port.mk>
Index: input-sdl/Makefile
===================================================================
RCS file: /cvs/ports/emulators/mupen64plus/input-sdl/Makefile,v
retrieving revision 1.2
diff -N -u -p -u -p input-sdl/Makefile
--- input-sdl/Makefile 26 Dec 2011 22:58:48 -0000 1.2
+++ input-sdl/Makefile 13 Nov 2012 05:36:31 -0000
@@ -2,19 +2,17 @@
COMMENT = n64 emulator input plugin
+REVISION = 0
+
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
-WANTLIB = SDL
+WANTLIB = SDL pthread
LIB_DEPENDS = devel/sdl
MUPEN64PLUS_MOD = input-sdl
-
-# resolve 'no newline at end of file' warning
-post-patch:
- echo >> ${WRKSRC}/src/osal_preproc.h
.include <bsd.port.mk>
Index: rsp-hle/Makefile
===================================================================
RCS file: /cvs/ports/emulators/mupen64plus/rsp-hle/Makefile,v
retrieving revision 1.2
diff -N -u -p -u -p rsp-hle/Makefile
--- rsp-hle/Makefile 26 Dec 2011 22:58:48 -0000 1.2
+++ rsp-hle/Makefile 13 Nov 2012 05:36:31 -0000
@@ -2,6 +2,8 @@
COMMENT = n64 emulator signal co-processor plugin
+REVISION = 0
+
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
Index: ui-console/Makefile
===================================================================
RCS file: /cvs/ports/emulators/mupen64plus/ui-console/Makefile,v
retrieving revision 1.4
diff -N -u -p -u -p ui-console/Makefile
--- ui-console/Makefile 31 Aug 2012 18:25:16 -0000 1.4
+++ ui-console/Makefile 13 Nov 2012 05:36:31 -0000
@@ -2,9 +2,8 @@
COMMENT = n64 emulator command-line ui plugin
-REVISION = 0
+REVISION = 1
-#
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
@@ -15,7 +14,8 @@ WANTLIB = c pthread
MUPEN64PLUS_MOD = ui-console
-MAKE_FLAGS = MANDIR=${PREFIX}/man PIE=1
+MAKE_FLAGS += MANDIR=${PREFIX}/man \
+ PIE=1
post-install:
gunzip ${PREFIX}/man/man6/mupen64plus.6.gz
Index: video-rice/Makefile
===================================================================
RCS file: /cvs/ports/emulators/mupen64plus/video-rice/Makefile,v
retrieving revision 1.3
diff -N -u -p -u -p video-rice/Makefile
--- video-rice/Makefile 13 Aug 2012 06:53:56 -0000 1.3
+++ video-rice/Makefile 13 Nov 2012 05:36:31 -0000
@@ -2,18 +2,16 @@
COMMENT = n64 emulator opengl video plugin
+REVISION = 0
+
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
-WANTLIB = GL m stdc++ z SDL png
+WANTLIB = GL SDL m png pthread stdc++ z
LIB_DEPENDS = devel/sdl graphics/png
MUPEN64PLUS_MOD = video-rice
-
-# resolve 'no newline at end of file' warning
-post-patch:
- echo >> ${WRKSRC}/src/osal_preproc.h
.include <bsd.port.mk>
