Date: Fri, 31 Jan 2014 15:36:17 +0000 (UTC) From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r342008 - in head: . emulators/fmsx emulators/fmsx/files Message-ID: <201401311536.s0VFaHcW070534@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rene Date: Fri Jan 31 15:36:17 2014 New Revision: 342008 URL: http://svnweb.freebsd.org/changeset/ports/342008 QAT: https://qat.redports.org/buildarchive/r342008/ Log: emulators/fmsx: - Update to 3.7 and unbreak - Remove www.mavetju.org as mirror - Stagify - Synchronize LEGAL with port text Deleted: head/emulators/fmsx/files/patch-EMULib_LibUnix.c head/emulators/fmsx/files/patch-fMSX_Unix_Makefile Modified: head/LEGAL head/emulators/fmsx/Makefile head/emulators/fmsx/distinfo head/emulators/fmsx/files/patch-EMULib_NetUnix.c head/emulators/fmsx/files/patch-EMULib_Rules.Unix head/emulators/fmsx/files/patch-EMULib_Rules.gcc head/emulators/fmsx/pkg-plist Modified: head/LEGAL ============================================================================== --- head/LEGAL Fri Jan 31 15:25:03 2014 (r342007) +++ head/LEGAL Fri Jan 31 15:36:17 2014 (r342008) @@ -102,7 +102,7 @@ fasta3* biology/fasta3 May not be sol festival/festlex_OALD* audio/festlex-oald No commercial use festival/OGIlexicon-* audio/festlex-ogi No commercial use festlex-ogi audio/festlex-ogi No commercial use -fmsx*/* emulators/fmsx Unclear legal status of distributed ROMs +fmsx*/* emulators/fmsx Legal status of distributed ROM images unclear foiltex* textproc/foiltex Redistribution on a not-for-profit basis only fp-freebsd-ws-* security/f-prot Free for personal users on personal workstations only fuse-emulator-roms* emulators/fuse-roms No explicit permission to redistribute Modified: head/emulators/fmsx/Makefile ============================================================================== --- head/emulators/fmsx/Makefile Fri Jan 31 15:25:03 2014 (r342007) +++ head/emulators/fmsx/Makefile Fri Jan 31 15:36:17 2014 (r342008) @@ -2,18 +2,16 @@ # $FreeBSD$ PORTNAME= fmsx -PORTVERSION= 3.5.1 -PORTREVISION= 2 +PORTVERSION= 3.7 CATEGORIES= emulators -MASTER_SITES= http://www.mavetju.org/download/adopted/:code \ - http://fms.komkon.org/fMSX/:code \ +MASTER_SITES= http://fms.komkon.org/fMSX/:code \ http://fms.komkon.org/fMSX/src/:rom -DISTFILES= fMSX351.zip:code \ +DISTFILES= fMSX37.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= fmsx351 -EXTRACT_ONLY= fMSX351.zip +DIST_SUBDIR= fmsx37 +EXTRACT_ONLY= fMSX37.zip MAINTAINER= dk@farm.org COMMENT= Portable MSX/MSX2/MSX2+ Emulator @@ -21,13 +19,11 @@ COMMENT= Portable MSX/MSX2/MSX2+ Emulato USE_XORG= xi x11 USE_ZIP= yes USES= gmake dos2unix -DOS2UNIX_FILES= EMULib/LibUnix.c EMULib/NetUnix.c EMULib/Rules.gcc \ +DOS2UNIX_FILES= EMULib/Unix/LibUnix.c EMULib/Unix/NetUnix.c EMULib/Rules.gcc \ EMULib/Rules.Unix RESTRICTED= Legal status of distributed ROM images unclear WRKSRC= ${WRKDIR} -BROKEN= does not build - OPTIONS_DEFINE= BPP8 BPP16 BPP24 BPP32 DOCS OPTIONS_DEFAULT= BPP32 BPP8_DESC= With BPP8 @@ -35,7 +31,6 @@ BPP16_DESC= With BPP16 BPP24_DESC= With BPP24 BPP32_DESC= With BPP32 (see pkg-message) -NO_STAGE= yes .include <bsd.port.pre.mk> post-patch: @@ -56,18 +51,18 @@ post-patch: .endif do-build: - cd ${WRKSRC}/fMSX/Unix && ${GMAKE} + cd ${WRKSRC}/fMSX/Unix && ${GMAKE} DEBUG_FLAGS=${DEBUG_FLAGS} do-install: - ${INSTALL_SCRIPT} ${FILESDIR}/fmsx ${PREFIX}/bin - ${REINPLACE_CMD} -i "" -e "s,PREFIX,${PREFIX},g" ${PREFIX}/bin/fmsx - ${INSTALL_PROGRAM} ${WRKSRC}/fMSX/Unix/fmsx ${PREFIX}/bin/fmsx.bin - ${MKDIR} ${PREFIX}/share/fmsx - ${INSTALL_DATA} ${WRKSRC}/fMSX/ROMs/*.FNT ${DATADIR} - ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/*.ROM ${DATADIR} + ${INSTALL_SCRIPT} ${FILESDIR}/fmsx ${STAGEDIR}${PREFIX}/bin + ${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 + ${INSTALL_DATA} ${WRKSRC}/fMSX/ROMs/*.FNT ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/*.ROM ${STAGEDIR}${DATADIR} .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/fMSX/*.html ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/fMSX/*.html ${STAGEDIR}${DOCSDIR} .endif .include <bsd.port.post.mk> Modified: head/emulators/fmsx/distinfo ============================================================================== --- head/emulators/fmsx/distinfo Fri Jan 31 15:25:03 2014 (r342007) +++ head/emulators/fmsx/distinfo Fri Jan 31 15:36:17 2014 (r342008) @@ -1,22 +1,22 @@ -SHA256 (fmsx351/fMSX351.zip) = e7eb643c88693fed1315f640ec7aea14f0ea6f1fec560fc85bccdc412afddc60 -SIZE (fmsx351/fMSX351.zip) = 515112 -SHA256 (fmsx351/MSX.ROM) = 999564a371dd2fdf7fbe8d853e82a68d557c27b7d87417639b2fa17704b83f78 -SIZE (fmsx351/MSX.ROM) = 32768 -SHA256 (fmsx351/MSX2.ROM) = 4bc4ae85ca5f28246cd3e7b7e017d298ddd375603657f84ef2c7954bc2d9b919 -SIZE (fmsx351/MSX2.ROM) = 32768 -SHA256 (fmsx351/MSX2EXT.ROM) = 6c6f421a10c428d960b7ecc990f99af1c638147f747bddca7b0bf0e2ab738300 -SIZE (fmsx351/MSX2EXT.ROM) = 16384 -SHA256 (fmsx351/MSX2P.ROM) = 9501a609be7d92e53fbd75fa65c8317563035d617744664892863ed54463db51 -SIZE (fmsx351/MSX2P.ROM) = 32768 -SHA256 (fmsx351/MSX2PEXT.ROM) = 36000685128f95ff515a128973f8d439116c1a1a8e38c1777293a428894434a2 -SIZE (fmsx351/MSX2PEXT.ROM) = 16384 -SHA256 (fmsx351/FMPAC.ROM) = 3cfe44646b69a622656b96305f1b975f48ca018839f7946895f7a1352d9720aa -SIZE (fmsx351/FMPAC.ROM) = 65536 -SHA256 (fmsx351/DISK.ROM) = 31740a761447d7590c304338d389b0ae114546a8b9f79c9ffd5e374f80b7d354 -SIZE (fmsx351/DISK.ROM) = 16384 -SHA256 (fmsx351/MSXDOS2.ROM) = 08d582fda65f22e4397353855e828539a64df08a540e5d64706b3362ea09be17 -SIZE (fmsx351/MSXDOS2.ROM) = 65536 -SHA256 (fmsx351/PAINTER.ROM) = 62e646cc9f0d50422016f12a77995be5547649b5961b58c883ff4d48baac280f -SIZE (fmsx351/PAINTER.ROM) = 65536 -SHA256 (fmsx351/KANJI.ROM) = 56785703b14f252ce77be586716dbf5d94125e93b9e6069ff26f7686566cd91a -SIZE (fmsx351/KANJI.ROM) = 131072 +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 Modified: head/emulators/fmsx/files/patch-EMULib_NetUnix.c ============================================================================== --- head/emulators/fmsx/files/patch-EMULib_NetUnix.c Fri Jan 31 15:25:03 2014 (r342007) +++ head/emulators/fmsx/files/patch-EMULib_NetUnix.c Fri Jan 31 15:36:17 2014 (r342008) @@ -1,6 +1,6 @@ ---- EMULib/NetUnix.c.orig 2008-05-26 05:26:55.000000000 +0000 -+++ EMULib/NetUnix.c 2008-05-26 05:28:16.000000000 +0000 -@@ -17,6 +17,8 @@ +--- 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> @@ -8,4 +8,15 @@ +#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; Modified: head/emulators/fmsx/files/patch-EMULib_Rules.Unix ============================================================================== --- head/emulators/fmsx/files/patch-EMULib_Rules.Unix Fri Jan 31 15:25:03 2014 (r342007) +++ head/emulators/fmsx/files/patch-EMULib_Rules.Unix Fri Jan 31 15:36:17 2014 (r342008) @@ -1,9 +1,12 @@ ---- EMULib/Rules.Unix.orig 2008-05-30 01:51:56.000000000 +0000 -+++ EMULib/Rules.Unix 2008-05-30 01:52:07.000000000 +0000 -@@ -1,5 +1,5 @@ +--- EMULib/Rules.Unix.orig 2014-01-30 23:32:06.000000000 +0700 ++++ EMULib/Rules.Unix 2014-01-30 23:30:52.000000000 +0700 +@@ -6,7 +6,7 @@ + include ../../EMULib/Rules.gcc --CFLAGS += -I/usr/X11R6/include -+CFLAGS += -I%%LOCALBASE%%/include - DEFINES+= -DUNIX -DMITSHM - LIBS += -lX11 -lXext +-CFLAGS += -I$(EMULIB)/Unix -I/usr/X11R6/include ++CFLAGS += -I$(EMULIB)/Unix -I%%LOCALBASE%%/include $(DEBUG_FLAGS) + DEFINES+= -DUNIX -DMITSHM -DBPS16 +-LIBS += -lX11 -lXext ++LIBS += -L%%LOCALBASE%%/lib -lX11 -lXext + OBJECTS+= $(EMUUNIX) Modified: head/emulators/fmsx/files/patch-EMULib_Rules.gcc ============================================================================== --- head/emulators/fmsx/files/patch-EMULib_Rules.gcc Fri Jan 31 15:25:03 2014 (r342007) +++ head/emulators/fmsx/files/patch-EMULib_Rules.gcc Fri Jan 31 15:36:17 2014 (r342008) @@ -1,11 +1,19 @@ ---- EMULib/Rules.gcc.orig 2013-12-20 20:52:16.000000000 +0100 -+++ EMULib/Rules.gcc 2013-12-20 20:52:22.000000000 +0100 -@@ -6,7 +6,7 @@ +--- EMULib/Rules.gcc.orig 2014-01-31 00:39:34.000000000 +0700 ++++ EMULib/Rules.gcc 2014-01-31 00:40:38.000000000 +0700 +@@ -6,12 +6,12 @@ LIBGBZ = $(BASEDIR)/GBZ80 PRIVATE = $(BASEDIR)/Private +-CXX = g++ -CC = gcc +-CPP = cpp ++CXX ?= g++ +CC ?= gcc - CPP = cpp - CFLAGS = -O3 -pthread -I.. -I$(EMULIB) ++CPP ?= cpp + MOC = moc + SDT2GAS = perl $(EMULIB)/Tools/sdt2gas.pl +-CFLAGS = -O2 -pthread -I. -I.. -I$(EMULIB) ++CFLAGS += -O2 -pthread -I. -I.. -I$(EMULIB) DEFINES = -DZLIB + LIBS = -lz -lpthread + Modified: head/emulators/fmsx/pkg-plist ============================================================================== --- head/emulators/fmsx/pkg-plist Fri Jan 31 15:25:03 2014 (r342007) +++ head/emulators/fmsx/pkg-plist Fri Jan 31 15:36:17 2014 (r342008) @@ -1,17 +1,17 @@ bin/fmsx bin/fmsx.bin %%DATADIR%%/CYRILLIC.FNT +%%DATADIR%%/DISK.ROM +%%DATADIR%%/FMPAC.ROM %%DATADIR%%/ITALIC.FNT +%%DATADIR%%/KANJI.ROM %%DATADIR%%/MSX.ROM %%DATADIR%%/MSX2.ROM %%DATADIR%%/MSX2EXT.ROM %%DATADIR%%/MSX2P.ROM %%DATADIR%%/MSX2PEXT.ROM -%%DATADIR%%/FMPAC.ROM -%%DATADIR%%/DISK.ROM %%DATADIR%%/MSXDOS2.ROM %%DATADIR%%/PAINTER.ROM -%%DATADIR%%/KANJI.ROM @dirrm %%DATADIR%% %%PORTDOCS%%%%DOCSDIR%%/fMSX.html %%PORTDOCS%%@dirrm %%DOCSDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401311536.s0VFaHcW070534>