Attachment 149155 Details for Bug 194877 – Update to 4.0

[patch] Update to 4.0

patch-fmsx.txt (text/plain), 7.18 KB, created by Alex Kozlov on 2014-11-07 10:06:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Kozlov

Created: 2014-11-07 10:06:41 UTC

Size: 7.18 KB

patch

obsolete

>Index: emulators/fmsx/Makefile
>===================================================================
>--- emulators/fmsx/Makefile	(revision 372249)
>+++ emulators/fmsx/Makefile	(working copy)
>@@ -2,24 +2,20 @@
> # $FreeBSD$
> 
> PORTNAME=	fmsx
>-PORTVERSION=	3.7
>+PORTVERSION=	4.0
> CATEGORIES=	emulators
> MASTER_SITES=	http://fms.komkon.org/fMSX/:code \
> 		http://fms.komkon.org/fMSX/src/:rom
>-DISTFILES=	fMSX37.zip:code \
>+DISTFILES=	fMSX40.zip:code \
> 		MSX.ROM:rom MSX2.ROM:rom MSX2EXT.ROM:rom MSX2P.ROM:rom \
> 		MSX2PEXT.ROM:rom FMPAC.ROM:rom DISK.ROM:rom MSXDOS2.ROM:rom \
> 		PAINTER.ROM:rom KANJI.ROM:rom
>-DIST_SUBDIR=	fmsx37
>-EXTRACT_ONLY=	fMSX37.zip
>+DIST_SUBDIR=	fmsx4
>+EXTRACT_ONLY=	fMSX40.zip
> 
> MAINTAINER=	dk@farm.org
> COMMENT=	Portable MSX/MSX2/MSX2+ Emulator
> 
>-BROKEN=		Unfetchable
>-DEPRECATED=	Broken for more than 6 months
>-EXPIRATION_DATE=	2014-11-26
>-
> USE_XORG=	xi x11
> USES=		gmake dos2unix zip
> DOS2UNIX_FILES=	EMULib/Unix/LibUnix.c EMULib/Unix/NetUnix.c EMULib/Rules.gcc \
>@@ -34,38 +30,36 @@
> BPP24_DESC=	With BPP24
> BPP32_DESC=	With BPP32 (see pkg-message)
> 
>-.include <bsd.port.pre.mk>
>+.include <bsd.port.options.mk>
> 
> post-patch:
>-	${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},' \
>+	@${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},' \
> 		${WRKSRC}/fMSX/Unix/Makefile \
> 		${WRKSRC}/EMULib/Rules.Unix
>-.if ${PORT_OPTIONS:MBPP32} || defined(PACKAGE_BUILDING) || defined(BATCH)
>-	${REINPLACE_CMD} -e 's/BPP16/BPP32/' ${WRKSRC}/fMSX/Unix/Makefile
>+.if ${PORT_OPTIONS:MBPP32}
>+	@${REINPLACE_CMD} -e 's/BPP16/BPP32/' ${WRKSRC}/fMSX/Unix/Makefile
> .endif
> .if ${PORT_OPTIONS:MBPP24}
>-	${REINPLACE_CMD} -e 's/BPP16/BPP24/' ${WRKSRC}/fMSX/Unix/Makefile
>+	@${REINPLACE_CMD} -e 's/BPP16/BPP24/' ${WRKSRC}/fMSX/Unix/Makefile
> .endif
> .if ${PORT_OPTIONS:MBPP16}
>-	${REINPLACE_CMD} -e 's/BPP16/BPP16/' ${WRKSRC}/fMSX/Unix/Makefile
>+	@${REINPLACE_CMD} -e 's/BPP16/BPP16/' ${WRKSRC}/fMSX/Unix/Makefile
> .endif
> .if ${PORT_OPTIONS:MBPP8}
>-	${REINPLACE_CMD} -e 's/BPP16/BPP8/' ${WRKSRC}/fMSX/Unix/Makefile
>+	@${REINPLACE_CMD} -e 's/BPP16/BPP8/' ${WRKSRC}/fMSX/Unix/Makefile
> .endif
> 
> do-build:
>-	cd ${WRKSRC}/fMSX/Unix && ${MAKE_CMD} DEBUG_FLAGS=${DEBUG_FLAGS}
>+	(cd ${WRKSRC}/fMSX/Unix && ${MAKE_CMD} DEBUG_FLAGS=${DEBUG_FLAGS})
> 
> do-install:
> 	${INSTALL_SCRIPT} ${FILESDIR}/fmsx ${STAGEDIR}${PREFIX}/bin
>-	${REINPLACE_CMD} -i "" -e "s,PREFIX,${PREFIX},g" ${STAGEDIR}${PREFIX}/bin/fmsx
>+	@${REINPLACE_CMD} -i "" -e "s,PREFIX,${PREFIX},g" ${STAGEDIR}${PREFIX}/bin/fmsx
> 	${INSTALL_PROGRAM} ${WRKSRC}/fMSX/Unix/fmsx ${STAGEDIR}${PREFIX}/bin/fmsx.bin
>-	${MKDIR} ${STAGEDIR}${PREFIX}/share/fmsx
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/fmsx
> 	${INSTALL_DATA} ${WRKSRC}/fMSX/ROMs/*.FNT ${STAGEDIR}${DATADIR}
> 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/*.ROM ${STAGEDIR}${DATADIR}
>-.if ${PORT_OPTIONS:MDOCS}
>-	${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	${INSTALL_DATA} ${WRKSRC}/fMSX/*.html ${STAGEDIR}${DOCSDIR}
>-.endif
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>Index: emulators/fmsx/distinfo
>===================================================================
>--- emulators/fmsx/distinfo	(revision 372249)
>+++ emulators/fmsx/distinfo	(working copy)
>@@ -1,22 +1,22 @@
>-SHA256 (fmsx37/fMSX37.zip) = 39443e9ceeaf5b2e34b1b54ef691083555bbf4aae9075e8d331023b1ab86c987
>-SIZE (fmsx37/fMSX37.zip) = 564969
>-SHA256 (fmsx37/MSX.ROM) = 999564a371dd2fdf7fbe8d853e82a68d557c27b7d87417639b2fa17704b83f78
>-SIZE (fmsx37/MSX.ROM) = 32768
>-SHA256 (fmsx37/MSX2.ROM) = 4bc4ae85ca5f28246cd3e7b7e017d298ddd375603657f84ef2c7954bc2d9b919
>-SIZE (fmsx37/MSX2.ROM) = 32768
>-SHA256 (fmsx37/MSX2EXT.ROM) = 6c6f421a10c428d960b7ecc990f99af1c638147f747bddca7b0bf0e2ab738300
>-SIZE (fmsx37/MSX2EXT.ROM) = 16384
>-SHA256 (fmsx37/MSX2P.ROM) = 9501a609be7d92e53fbd75fa65c8317563035d617744664892863ed54463db51
>-SIZE (fmsx37/MSX2P.ROM) = 32768
>-SHA256 (fmsx37/MSX2PEXT.ROM) = 36000685128f95ff515a128973f8d439116c1a1a8e38c1777293a428894434a2
>-SIZE (fmsx37/MSX2PEXT.ROM) = 16384
>-SHA256 (fmsx37/FMPAC.ROM) = 3cfe44646b69a622656b96305f1b975f48ca018839f7946895f7a1352d9720aa
>-SIZE (fmsx37/FMPAC.ROM) = 65536
>-SHA256 (fmsx37/DISK.ROM) = 31740a761447d7590c304338d389b0ae114546a8b9f79c9ffd5e374f80b7d354
>-SIZE (fmsx37/DISK.ROM) = 16384
>-SHA256 (fmsx37/MSXDOS2.ROM) = 08d582fda65f22e4397353855e828539a64df08a540e5d64706b3362ea09be17
>-SIZE (fmsx37/MSXDOS2.ROM) = 65536
>-SHA256 (fmsx37/PAINTER.ROM) = 62e646cc9f0d50422016f12a77995be5547649b5961b58c883ff4d48baac280f
>-SIZE (fmsx37/PAINTER.ROM) = 65536
>-SHA256 (fmsx37/KANJI.ROM) = 56785703b14f252ce77be586716dbf5d94125e93b9e6069ff26f7686566cd91a
>-SIZE (fmsx37/KANJI.ROM) = 131072
>+SHA256 (fmsx4/fMSX40.zip) = 9ce21d69ccff09c1b886660eca28c34d9da92f142b469b7f76e5f853d50f7c1f
>+SIZE (fmsx4/fMSX40.zip) = 572095
>+SHA256 (fmsx4/MSX.ROM) = 999564a371dd2fdf7fbe8d853e82a68d557c27b7d87417639b2fa17704b83f78
>+SIZE (fmsx4/MSX.ROM) = 32768
>+SHA256 (fmsx4/MSX2.ROM) = 4bc4ae85ca5f28246cd3e7b7e017d298ddd375603657f84ef2c7954bc2d9b919
>+SIZE (fmsx4/MSX2.ROM) = 32768
>+SHA256 (fmsx4/MSX2EXT.ROM) = 6c6f421a10c428d960b7ecc990f99af1c638147f747bddca7b0bf0e2ab738300
>+SIZE (fmsx4/MSX2EXT.ROM) = 16384
>+SHA256 (fmsx4/MSX2P.ROM) = 9501a609be7d92e53fbd75fa65c8317563035d617744664892863ed54463db51
>+SIZE (fmsx4/MSX2P.ROM) = 32768
>+SHA256 (fmsx4/MSX2PEXT.ROM) = 36000685128f95ff515a128973f8d439116c1a1a8e38c1777293a428894434a2
>+SIZE (fmsx4/MSX2PEXT.ROM) = 16384
>+SHA256 (fmsx4/FMPAC.ROM) = 3cfe44646b69a622656b96305f1b975f48ca018839f7946895f7a1352d9720aa
>+SIZE (fmsx4/FMPAC.ROM) = 65536
>+SHA256 (fmsx4/DISK.ROM) = 31740a761447d7590c304338d389b0ae114546a8b9f79c9ffd5e374f80b7d354
>+SIZE (fmsx4/DISK.ROM) = 16384
>+SHA256 (fmsx4/MSXDOS2.ROM) = 08d582fda65f22e4397353855e828539a64df08a540e5d64706b3362ea09be17
>+SIZE (fmsx4/MSXDOS2.ROM) = 65536
>+SHA256 (fmsx4/PAINTER.ROM) = 62e646cc9f0d50422016f12a77995be5547649b5961b58c883ff4d48baac280f
>+SIZE (fmsx4/PAINTER.ROM) = 65536
>+SHA256 (fmsx4/KANJI.ROM) = 56785703b14f252ce77be586716dbf5d94125e93b9e6069ff26f7686566cd91a
>+SIZE (fmsx4/KANJI.ROM) = 131072
>Index: emulators/fmsx/files/patch-EMULib_NetUnix.c
>===================================================================
>--- emulators/fmsx/files/patch-EMULib_NetUnix.c	(revision 372249)
>+++ emulators/fmsx/files/patch-EMULib_NetUnix.c	(working copy)
>@@ -1,22 +0,0 @@
>---- EMULib/Unix/NetUnix.c.orig	2014-01-30 23:33:17.000000000 +0700
>-+++ EMULib/Unix/NetUnix.c	2014-01-30 23:34:48.000000000 +0700
>-@@ -19,6 +19,8 @@
>- #include <stdio.h>
>- #include <netdb.h>
>- #include <errno.h>
>-+#include <netinet/in.h>
>-+#include <sys/types.h>
>- #include <sys/ioctl.h>
>- #include <sys/socket.h>
>- #include <netinet/in.h>
>-@@ -30,6 +32,10 @@
>- #define printf LOGI
>- #endif
>- 
>-+#ifndef SOL_TCP
>-+#define SOL_TCP IPPROTO_TCP
>-+#endif
>-+
>- static volatile int IsServer  = 0;
>- static volatile int Socket    = -1;
>- static volatile int Blocking  = 1;
>Index: emulators/fmsx/files/patch-EMULib_Rules.gcc
>===================================================================
>--- emulators/fmsx/files/patch-EMULib_Rules.gcc	(revision 372249)
>+++ emulators/fmsx/files/patch-EMULib_Rules.gcc	(working copy)
>@@ -13,7 +13,7 @@
>  MOC	= moc
>  SDT2GAS	= perl $(EMULIB)/Tools/sdt2gas.pl
> -CFLAGS	= -O2 -pthread -I. -I.. -I$(EMULIB)
>-+CFLAGS	+= -O2 -pthread -I. -I.. -I$(EMULIB)
>++CFLAGS	+= -pthread -I. -I.. -I$(EMULIB)
>  DEFINES = -DZLIB
>  LIBS    = -lz -lpthread
>

Actions: View | Diff

Attachments on bug 194877: 149155