Hi,
Here is an update of emulators/openmsx to 2.8.2. Removes a couple patches
that have been committed upstream. naddy@ also pointed out that CXX, etc
were not being respected.
ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/emulators/openmsx/Makefile,v
retrieving revision 1.6
diff -N -u -p -u -p Makefile
--- Makefile 26 Dec 2011 08:53:11 -0000 1.6
+++ Makefile 12 Apr 2012 05:29:30 -0000
@@ -4,8 +4,7 @@ BROKEN-powerpc =CPUCore.cc:2347: error: insn does not
COMMENT = MSX home computer emulator
-DISTNAME = openmsx-0.8.1
-REVISION = 2
+DISTNAME = openmsx-0.8.2
CATEGORIES = emulators
@@ -24,10 +23,11 @@ MAKE_ENV += INSTALL_BASE=${PREFIX}/share/openmsx \
INSTALL_SHARE_DIR=${PREFIX}/share/openmsx \
INSTALL_DOC_DIR=${PREFIX}/share/doc/openmsx
-WANTLIB += GL c freetype m pthread stdc++ z ${MODTCL_LIB}
+WANTLIB += GL c freetype m pthread stdc++ z ${MODTCL_LIB} ao
WANTLIB += GLEW SDL SDL_ttf ogg png theoradec vorbis xml2
-LIB_DEPENDS = audio/libvorbis \
+LIB_DEPENDS = audio/libao \
+ audio/libvorbis \
devel/sdl-ttf \
graphics/glew \
graphics/png \
@@ -44,6 +44,9 @@ MODULES = converters/libiconv \
MODPY_RUNDEP = No
MAKE_FILE = GNUmakefile
USE_GMAKE = Yes
+
+MAKE_FLAGS = CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" \
+ CXXFLAGS="${CXXFLAGS}"
pre-configure:
${SUBST_CMD} ${WRKSRC}/build/python-search.sh
Index: distinfo
===================================================================
RCS file: /cvs/ports/emulators/openmsx/distinfo,v
retrieving revision 1.1.1.1
diff -N -u -p -u -p distinfo
--- distinfo 28 Aug 2011 18:57:50 -0000 1.1.1.1
+++ distinfo 12 Apr 2012 05:29:30 -0000
@@ -1,5 +1,5 @@
-MD5 (openmsx-0.8.1.tar.gz) = +xUMvpCrmAlUX4dGTuJSFg==
-RMD160 (openmsx-0.8.1.tar.gz) = Kit+h0B+XSPDEba0N5DO9i2A800=
-SHA1 (openmsx-0.8.1.tar.gz) = COveuttnuMMmCAxYG/yRJELrKr8=
-SHA256 (openmsx-0.8.1.tar.gz) = Wogt/B+qm8MMBV4WRfZ1xlK4FzkImR7SltvHNZypAeU=
-SIZE (openmsx-0.8.1.tar.gz) = 2834894
+MD5 (openmsx-0.8.2.tar.gz) = QrzqvdiaSYbnRfdKxE2mMQ==
+RMD160 (openmsx-0.8.2.tar.gz) = 8jgBnvkkawFGVV0kZxrVyY9IIOQ=
+SHA1 (openmsx-0.8.2.tar.gz) = Br+zxknsyC0Sm74ljSFn6onrrPo=
+SHA256 (openmsx-0.8.2.tar.gz) = Q3xDzaQ62334TirmGAtudqnf2S0XeYGwx9EL8WzDJBE=
+SIZE (openmsx-0.8.2.tar.gz) = 2881089
Index: patches/patch-build_detectsys_py
===================================================================
RCS file: /cvs/ports/emulators/openmsx/patches/patch-build_detectsys_py,v
retrieving revision 1.1
diff -N -u -p -u -p patches/patch-build_detectsys_py
--- patches/patch-build_detectsys_py 21 Oct 2011 13:04:17 -0000 1.1
+++ patches/patch-build_detectsys_py 12 Apr 2012 05:29:30 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-build_detectsys_py,v 1.1 2011/10/21 13:04:17 ajacoutot Exp $
-Recognize macppc, socppc.
+Recognize macppc, socppc. Added to upstream in r12471.
--- build/detectsys.py.orig Fri Oct 21 03:19:41 2011
+++ build/detectsys.py Fri Oct 21 03:19:05 2011
Index: patches/patch-build_libraries_py
===================================================================
RCS file: /cvs/ports/emulators/openmsx/patches/patch-build_libraries_py,v
retrieving revision 1.1.1.1
diff -N -u -p -u -p patches/patch-build_libraries_py
--- patches/patch-build_libraries_py 28 Aug 2011 18:57:51 -0000 1.1.1.1
+++ /dev/null 12 Apr 2012 04:31:01 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-build_libraries_py,v 1.1.1.1 2011/08/28 18:57:51 bentley Exp $
-
-Correctly find our tclConfig.sh. From upstream r12183.
-
---- build/libraries.py.orig Sun Jun 12 13:25:30 2011
-+++ build/libraries.py Sun Jun 12 13:26:13 2011
-@@ -396,7 +396,7 @@ class TCL(Library):
- roots = (distroRoot, )
- for root in roots:
- if isdir(root):
-- for libdir in ('lib', 'lib64'):
-+ for libdir in ('lib', 'lib64',
'lib/tcl'):
- libpath = root + '/' + libdir
- if isdir(libpath):
- yield libpath
Index: patches/patch-src_video_PNG_cc
===================================================================
RCS file: /cvs/ports/emulators/openmsx/patches/patch-src_video_PNG_cc,v
retrieving revision 1.1.1.1
diff -N -u -p -u -p patches/patch-src_video_PNG_cc
--- patches/patch-src_video_PNG_cc 28 Aug 2011 18:57:51 -0000 1.1.1.1
+++ /dev/null 12 Apr 2012 04:31:01 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_video_PNG_cc,v 1.1.1.1 2011/08/28 18:57:51 bentley Exp $
-
-Fix build with libpng 1.5.x. From upstream r12214.
-
---- src/video/PNG.cc.orig Sun Aug 21 10:48:08 2011
-+++ src/video/PNG.cc Sun Aug 21 10:48:29 2011
-@@ -167,7 +167,7 @@ SDLSurfacePtr load(const std::string& filename)
- "Attempted to create a surface with excessive
height: "
- << height << ", max " << MAX_SIZE);
- }
-- int bpp = png.info->channels * 8;
-+ int bpp = png_get_channels(png.ptr, png.info) * 8;
- assert(bpp == 24 || bpp == 32);
- Uint32 redMask, grnMask, bluMask, alpMask;
- if (OPENMSX_BIGENDIAN) {
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/emulators/openmsx/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -N -u -p -u -p pkg/PLIST
--- pkg/PLIST 28 Aug 2011 18:57:51 -0000 1.1.1.1
+++ pkg/PLIST 12 Apr 2012 05:29:31 -0000
@@ -58,6 +58,10 @@ share/openmsx/extensions/Konami_SD-Snatcher_Sound_Cart
share/openmsx/extensions/Konami_SD-Snatcher_Sound_Cartridge/hardwareconfig.xml
share/openmsx/extensions/Konami_Snatcher_Sound_Cartridge/
share/openmsx/extensions/Konami_Snatcher_Sound_Cartridge/hardwareconfig.xml
+share/openmsx/extensions/Lascom_Kanji/
+share/openmsx/extensions/Lascom_Kanji/hardwareconfig.xml
+share/openmsx/extensions/Lascom_Kanji/roms/
+share/openmsx/extensions/Lascom_Kanji/roms/lascom_kanji.rom.gz
share/openmsx/extensions/MegaRAM_Disk/
share/openmsx/extensions/MegaRAM_Disk/hardwareconfig.xml
share/openmsx/extensions/MegaRAM_Disk/roms/
@@ -103,6 +107,10 @@ share/openmsx/extensions/Sony_HBD-F1/
share/openmsx/extensions/Sony_HBD-F1/hardwareconfig.xml
share/openmsx/extensions/Sony_HBD-F1/roms/
share/openmsx/extensions/Sony_HBD-F1/roms/SHA1SUMS
+share/openmsx/extensions/Sony_HBI-232/
+share/openmsx/extensions/Sony_HBI-232/hardwareconfig.xml
+share/openmsx/extensions/Sony_HBI-232/roms/
+share/openmsx/extensions/Sony_HBI-232/roms/SHA1SUMS
share/openmsx/extensions/Sony_HBI-55/
share/openmsx/extensions/Sony_HBI-55/hardwareconfig.xml
share/openmsx/extensions/Sony_HBK-30/
@@ -185,11 +193,12 @@ share/openmsx/machines/Al_Alamiah_AX170/
share/openmsx/machines/Al_Alamiah_AX170/hardwareconfig.xml
share/openmsx/machines/Al_Alamiah_AX170/roms/
share/openmsx/machines/Al_Alamiah_AX170/roms/SHA1SUMS
+share/openmsx/machines/Boosted_MSX2+_JP/
+share/openmsx/machines/Boosted_MSX2+_JP/README
+share/openmsx/machines/Boosted_MSX2+_JP/hardwareconfig.xml
share/openmsx/machines/Boosted_MSX2_EN/
share/openmsx/machines/Boosted_MSX2_EN/README
share/openmsx/machines/Boosted_MSX2_EN/hardwareconfig.xml
-share/openmsx/machines/Boosted_MSX2_EN/roms/
-share/openmsx/machines/Boosted_MSX2_EN/roms/README
share/openmsx/machines/C-BIOS_MSX1/
share/openmsx/machines/C-BIOS_MSX1/hardwareconfig.xml
share/openmsx/machines/C-BIOS_MSX1/roms/
@@ -562,6 +571,14 @@ share/openmsx/machines/Sony_HB-F9P_Russian/
share/openmsx/machines/Sony_HB-F9P_Russian/hardwareconfig.xml
share/openmsx/machines/Sony_HB-F9P_Russian/roms/
share/openmsx/machines/Sony_HB-F9P_Russian/roms/SHA1SUMS
+share/openmsx/machines/Sony_HB-F9S/
+share/openmsx/machines/Sony_HB-F9S/hardwareconfig.xml
+share/openmsx/machines/Sony_HB-F9S/roms/
+share/openmsx/machines/Sony_HB-F9S/roms/SHA1SUMS
+share/openmsx/machines/Sony_HB-G900P/
+share/openmsx/machines/Sony_HB-G900P/hardwareconfig.xml
+share/openmsx/machines/Sony_HB-G900P/roms/
+share/openmsx/machines/Sony_HB-G900P/roms/SHA1SUMS
share/openmsx/machines/Spectravideo_SVI-728/
share/openmsx/machines/Spectravideo_SVI-728/hardwareconfig.xml
share/openmsx/machines/Spectravideo_SVI-728/roms/
