ports/60825: [PATCH] ports/emulators/fmsx is outdated, update supplied
Eugene Grosbein
eugen at grosbein.pp.ru
Fri Jan 2 16:40:31 UTC 2004
>Number: 60825
>Category: ports
>Synopsis: [PATCH] ports/emulators/fmsx is outdated, update supplied
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Jan 02 08:40:23 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Eugene Grosbein
>Release: FreeBSD 4.9-STABLE i386
>Organization:
Svyaz Service JSC
>Environment:
System: FreeBSD grosbein.pp.ru 4.9-STABLE FreeBSD 4.9-STABLE #8: Sun Dec 14 20:25:57 KRAT 2003 eu at grosbein.pp.ru:/usr/local/obj/usr/local/src/sys/DADV i386
>Description:
Last update of ports/emulators/fmsx occured more than 3 years ago.
A few version were issued since then, recent is 2.7 that
is significantly improved. Some of port patches are integrated.
>How-To-Repeat:
Take a look at http://fms.komkon.org/fMSX/src/fMSX.html
>Fix:
Apply the following path. It upgrades the port to fMSX 2.7
and fixes a bit the port itself:
- do not hardcode PREFIX in a wrapper
- remove patchfiles for patches that were integrated
- use NOPORTDOCS for pkg-plist
diff -urN /usr/ports/emulators/fmsx/Makefile fmsx/Makefile
--- /usr/ports/emulators/fmsx/Makefile Tue Aug 12 22:36:36 2003
+++ fmsx/Makefile Fri Jan 2 22:55:27 2004
@@ -6,21 +6,25 @@
#
PORTNAME= fmsx
-PORTVERSION= 2.2
+PORTVERSION= 2.7
CATEGORIES= emulators
MASTER_SITES= http://fms.komkon.org/fMSX/
-DISTNAME= fMSX22
+DISTNAME= fMSX27
EXTRACT_SUFX= .tar.Z
MAINTAINER= dk at farm.org
COMMENT= The Portable MSX/MSX2/MSX2+ Emulator
+USE_REINPLACE= yes
+REINPLACE_ARGS= -i ""
+
USE_XLIB= yes
RESTRICTED= Legal status of distributed ROM images unclear
WRKSRC= ${WRKDIR}/MSX
do-install:
${INSTALL_SCRIPT} ${FILESDIR}/fmsx ${PREFIX}/bin
+ ${REINPLACE_CMD} "s,PREFIX,${PREFIX},g" ${PREFIX}/bin/fmsx
${INSTALL_PROGRAM} ${WRKSRC}/fmsx ${PREFIX}/bin/fmsx.bin
${INSTALL_PROGRAM} ${WRKSRC}/rddsk ${PREFIX}/bin/fmsx-rddsk
${INSTALL_PROGRAM} ${WRKSRC}/wrdsk ${PREFIX}/bin/fmsx-wrdsk
diff -urN /usr/ports/emulators/fmsx/distinfo fmsx/distinfo
--- /usr/ports/emulators/fmsx/distinfo Thu Aug 17 00:52:39 2000
+++ fmsx/distinfo Fri Jan 2 18:07:26 2004
@@ -1 +1 @@
-MD5 (fMSX22.tar.Z) = 15f9e0d4cd28f16d9de81f75cfd63ce4
+MD5 (fMSX27.tar.Z) = 419b3b637067f83465d61b32b0b09ab7
diff -urN /usr/ports/emulators/fmsx/files/fmsx fmsx/files/fmsx
--- /usr/ports/emulators/fmsx/files/fmsx Thu Aug 17 00:52:39 2000
+++ fmsx/files/fmsx Fri Jan 2 19:07:13 2004
@@ -1,3 +1,3 @@
#!/bin/sh
-exec /usr/local/bin/fmsx.bin -home /usr/local/share/fmsx "$@"
+exec PREFIX/bin/fmsx.bin -home PREFIX/share/fmsx "$@"
diff -urN /usr/ports/emulators/fmsx/files/patch-aa fmsx/files/patch-aa
--- /usr/ports/emulators/fmsx/files/patch-aa Sun Sep 17 02:10:23 2000
+++ fmsx/files/patch-aa Fri Jan 2 18:21:15 2004
@@ -1,6 +1,6 @@
---- Makefile.orig Fri Aug 4 02:23:33 2000
-+++ Makefile Thu Aug 17 04:50:41 2000
-@@ -43,11 +43,10 @@
+--- Makefile.orig Mon Dec 31 16:01:16 2001
++++ Makefile Fri Jan 2 18:20:54 2004
+@@ -51,10 +51,10 @@
# If you are getting linker errors about not found X11 functions,
# change the -L/usr/X11R6/lib to the directory where X11
# libraries libX11.* and libXext.* are located on your system.
@@ -8,19 +8,18 @@
-DEFINES = -DFMSX -DUNIX -DLSB_FIRST -DDEBUG -DMITSHM \
+CC ?= gcc
+DEFINES = -DFMSX -DUNIX -DLSB_FIRST -DMITSHM \
- -DDISK -DNARROW -DSOUND -DBPP16
--CFLAGS = -O3 -fomit-frame-pointer \
-- -I/usr/X11/include -L/usr/X11/lib ${DEFINES}
-+CFLAGS += -I${X11BASE}/include ${DEFINES}
- OBJECTS = fMSX.o MSX.o Z80.o AY8910.o SCC.o V9938.o Patch.o Debug.o \
- Disk.o Unix.o LibUnix.o SndUnix.o MIDI.o
-
-@@ -63,7 +62,7 @@
+ -DDISK -DNARROW -DSOUND -DBPP16 -DZLIB
+-CFLAGS = -O3 -Wall -I/usr/X11R6/include -L/usr/X11R6/lib ${DEFINES}
++CFLAGS = -O3 -Wall -I${X11BASE}/include -L${X11BASE}/lib ${DEFINES}
+ OBJECTS = fMSX.o MSX.o Patch.o Debug.o Disk.o Sound.o \
+ Z80.o I8255.o AY8910.o YM2413.o SCC.o V9938.o I8251.o \
+ Unix.o LibUnix.o SndUnix.o
+@@ -71,7 +71,7 @@
# fMSX Unix/X requires X11 libraries. See note above if you are
# experiencing any problems.
fmsx: ${OBJECTS}
-- ${CC} ${CFLAGS} -o fmsx ${OBJECTS} -lXext -lX11
-+ ${CC} ${CFLAGS} -o fmsx ${OBJECTS} -lXext -lX11 -L${X11BASE}/lib
+- ${CC} ${CFLAGS} -o fmsx ${OBJECTS} -lXext -lX11 -lz
++ ${CC} ${CFLAGS} -o fmsx ${OBJECTS} -lXext -lX11 -L${X11BASE}/lib -lz
# Clean up.
clean:
diff -urN /usr/ports/emulators/fmsx/files/patch-ab fmsx/files/patch-ab
--- /usr/ports/emulators/fmsx/files/patch-ab Thu Aug 17 00:52:39 2000
+++ fmsx/files/patch-ab Thu Jan 1 07:00:00 1970
@@ -1,21 +0,0 @@
---- Unix.c.orig Thu Aug 3 20:10:32 2000
-+++ Unix.c Wed Aug 16 16:14:50 2000
-@@ -309,12 +309,16 @@
- }
- break;
-
-- case XK_F9:
-+ case XK_F6:
- if(Control) AutoFire=!AutoFire;
- break;
-
-- case XK_F10:
-+ case XK_F9:
- if(Control) UseFont=UseFont? 0:FontBuf? 1:0;
-+ break;
-+
-+ case XK_F10:
-+ if(Control) LogSnd=!LogSnd;
- break;
-
- case XK_F12: ExitNow=1;break;
diff -urN /usr/ports/emulators/fmsx/files/patch-ac fmsx/files/patch-ac
--- /usr/ports/emulators/fmsx/files/patch-ac Mon Oct 13 15:21:27 2003
+++ fmsx/files/patch-ac Thu Jan 1 07:00:00 1970
@@ -1,11 +0,0 @@
---- SndUnix.c.orig Mon Oct 13 00:19:55 2003
-+++ SndUnix.c Mon Oct 13 00:20:18 2003
-@@ -73,7 +73,7 @@
-
- #else /* SUN_AUDIO */
-
--#ifdef LINUX
-+#if defined(LINUX) || defined(__FreeBSD__)
- #include <sys/soundcard.h>
- #else
- #include <machine/soundcard.h>
diff -urN /usr/ports/emulators/fmsx/pkg-descr fmsx/pkg-descr
--- /usr/ports/emulators/fmsx/pkg-descr Thu Dec 12 16:31:05 2002
+++ fmsx/pkg-descr Fri Jan 2 23:30:33 2004
@@ -1,6 +1,6 @@
******* fMSX *******
The Portable MSX/MSX2/MSX2+ Emulator
- version 2.2
+ version 2.7
by Marat Fayzullin <fms at cs.umd.edu>
WWW: http://fms.komkon.org/fMSX/
diff -urN /usr/ports/emulators/fmsx/pkg-plist fmsx/pkg-plist
--- /usr/ports/emulators/fmsx/pkg-plist Thu Aug 17 00:52:39 2000
+++ fmsx/pkg-plist Fri Jan 2 18:33:36 2004
@@ -5,6 +5,7 @@
share/fmsx/CMOS.ROM
share/fmsx/CYRILLIC.FNT
share/fmsx/DISK.ROM
+share/fmsx/FMPAC.ROM
share/fmsx/ITALIC.FNT
share/fmsx/KANJI.ROM
share/fmsx/MSX.ROM
@@ -13,6 +14,6 @@
share/fmsx/MSX2P.ROM
share/fmsx/MSX2PEXT.ROM
share/fmsx/PAINTER.ROM
- at dirrm share/fmsx
-share/doc/fmsx/fMSX.html
- at dirrm share/doc/fmsx
+%%PORTDOCS%%share/doc/fmsx/fMSX.html
+%%PORTDOCS%%@dirrm share/fmsx
+%%PORTDOCS%%@dirrm share/doc/fmsx
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list