From edwin@mavetju.org  Sun Aug 21 04:02:39 2005
Return-Path: <edwin@mavetju.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 15F8116A42F
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 21 Aug 2005 04:02:39 +0000 (GMT)
	(envelope-from edwin@mavetju.org)
Received: from mail3out.barnet.com.au (mail3out.barnet.com.au [202.83.176.17])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 699B143D48
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 21 Aug 2005 04:02:38 +0000 (GMT)
	(envelope-from edwin@mavetju.org)
Received: by mail3out.barnet.com.au (Postfix, from userid 27)
	id 9576D877C95; Sun, 21 Aug 2005 14:02:37 +1000 (EST)
Received: from mail3-auth.barnet.com.au (mail3.barnet.com.au [202.83.176.16])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(Client CN "*.barnet.com.au", Issuer "BarNet Root Certificate Authority" (verified OK))
	by mail3.barnet.com.au (Postfix) with ESMTP id 57C7E877C92
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 21 Aug 2005 14:02:37 +1000 (EST)
Received: from k7.mavetju (edwin-3.int.barnet.com.au [10.10.12.2])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(Client CN "edwin.adsl.barnet.com.au", Issuer "BarNet Root Certificate Authority" (not verified))
	by mail3-auth.barnet.com.au (Postfix) with ESMTP id 6B9A3877C8F
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 21 Aug 2005 14:02:36 +1000 (EST)
Received: by k7.mavetju (Postfix, from userid 1001)
	id 8F86C6154; Sun, 21 Aug 2005 14:02:35 +1000 (EST)
Message-Id: <20050821040235.8F86C6154@k7.mavetju>
Date: Sun, 21 Aug 2005 14:02:35 +1000 (EST)
From: Edwin Groothuis <edwin@mavetju.org>
Reply-To: Edwin Groothuis <edwin@mavetju.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [maintainer update] emulators/fmsx
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         85172
>Category:       ports
>Synopsis:       [maintainer update] emulators/fmsx
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    edwin
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Aug 21 04:10:14 GMT 2005
>Closed-Date:    Sun Aug 28 10:39:31 GMT 2005
>Last-Modified:  Sun Aug 28 10:39:31 GMT 2005
>Originator:     Edwin Groothuis
>Release:        FreeBSD 5.2.1-RELEASE i386
>Organization:
_
>Environment:
System: FreeBSD k7.mavetju 5.2.1-RELEASE FreeBSD 5.2.1-RELEASE #8: Wed Dec 15 16:58:01 EST 2004 edwin@k7.mavetju:/usr/src-5.2.1/sys/i386/compile/k7 i386

>Description:

Upgrade to version 3.0 for safekeeping until ports freeze is over.

>How-To-Repeat:
>Fix:

? work
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/emulators/fmsx/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- Makefile	9 Aug 2004 15:48:55 -0000	1.18
+++ Makefile	21 Aug 2005 04:00:54 -0000
@@ -6,13 +6,16 @@
 #
 
 PORTNAME=	fmsx
-PORTVERSION=	2.7
+PORTVERSION=	3.0
 CATEGORIES=	emulators
-MASTER_SITES=	http://www.mavetju.org/download/adopted/ \
-		http://fms.komkon.org/fMSX/
-DISTNAME=	fMSX27
-EXTRACT_SUFX=	.tar.Z
-
+MASTER_SITES=	http://www.mavetju.org/download/adopted/:code \
+		http://fms.komkon.org/fMSX/:code \
+		http://fms.komkon.org/fMSX/src/:rom
+DIST_SUBDIR=	fmsx30
+DISTFILES=	fMSX30.tar.Z: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
 MAINTAINER=	dk@farm.org
 COMMENT=	The Portable MSX/MSX2/MSX2+ Emulator
 
@@ -51,7 +54,8 @@
 	${INSTALL_PROGRAM} ${WRKSRC}/rddsk ${PREFIX}/bin/fmsx-rddsk
 	${INSTALL_PROGRAM} ${WRKSRC}/wrdsk ${PREFIX}/bin/fmsx-wrdsk
 	${MKDIR} ${PREFIX}/share/fmsx
-	${INSTALL_DATA} ${WRKSRC}/*.ROM ${WRKSRC}/*.FNT ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/*.FNT ${DATADIR}
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/*.ROM ${DATADIR}
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.html ${DOCSDIR}
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/emulators/fmsx/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo	31 Mar 2004 03:07:41 -0000	1.5
+++ distinfo	21 Aug 2005 04:00:54 -0000
@@ -1,2 +1,22 @@
-MD5 (fMSX27.tar.Z) = 419b3b637067f83465d61b32b0b09ab7
-SIZE (fMSX27.tar.Z) = 516213
+MD5 (fmsx30/fMSX30.tar.Z) = 6a6e7a4966adc3253701896a86adfcde
+SIZE (fmsx30/fMSX30.tar.Z) = 218299
+MD5 (fmsx30/MSX.ROM) = aa95aea2563cd5ec0a0919b44cc17d47
+SIZE (fmsx30/MSX.ROM) = 32768
+MD5 (fmsx30/MSX2.ROM) = ec3a01c91f24fbddcbcab0ad301bc9ef
+SIZE (fmsx30/MSX2.ROM) = 32768
+MD5 (fmsx30/MSX2EXT.ROM) = 2183c2aff17cf4297bdb496de78c2e8a
+SIZE (fmsx30/MSX2EXT.ROM) = 16384
+MD5 (fmsx30/MSX2P.ROM) = 6d8c0ca64e726c82a4b726e9b01cdf1e
+SIZE (fmsx30/MSX2P.ROM) = 32768
+MD5 (fmsx30/MSX2PEXT.ROM) = 7c8243c71d8f143b2531f01afa6a05dc
+SIZE (fmsx30/MSX2PEXT.ROM) = 16384
+MD5 (fmsx30/FMPAC.ROM) = 6f69cc8b5ed761b03afd78000dfb0e19
+SIZE (fmsx30/FMPAC.ROM) = 65536
+MD5 (fmsx30/DISK.ROM) = 80dcd1ad1a4cf65d64b7ba10504e8190
+SIZE (fmsx30/DISK.ROM) = 16384
+MD5 (fmsx30/MSXDOS2.ROM) = 6418d091cd6907bbcf940324339e43bb
+SIZE (fmsx30/MSXDOS2.ROM) = 65536
+MD5 (fmsx30/PAINTER.ROM) = 403cdea1cbd2bb24fae506941f8f655e
+SIZE (fmsx30/PAINTER.ROM) = 65536
+MD5 (fmsx30/KANJI.ROM) = febe8782b466d7c3b16de6d104826b34
+SIZE (fmsx30/KANJI.ROM) = 131072
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/emulators/fmsx/pkg-plist,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist
--- pkg-plist	9 Aug 2004 15:48:55 -0000	1.4
+++ pkg-plist	21 Aug 2005 04:00:54 -0000
@@ -2,18 +2,18 @@
 bin/fmsx.bin
 bin/fmsx-rddsk
 bin/fmsx-wrdsk
-%%DATADIR%%/CMOS.ROM
 %%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
 %%PORTDOCS%%%%DOCSDIR%%/fMSX.html
 %%PORTDOCS%%@dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: files/patch-aa
===================================================================
RCS file: /home/pcvs/ports/emulators/fmsx/files/patch-aa,v
retrieving revision 1.4
diff -u -r1.4 patch-aa
--- files/patch-aa	28 Feb 2004 00:35:26 -0000	1.4
+++ files/patch-aa	21 Aug 2005 04:00:54 -0000
@@ -1,5 +1,5 @@
---- Makefile.orig	Mon Dec 31 20:01:16 2001
-+++ Makefile	Sat Feb 28 11:20:12 2004
+--- Makefile.orig	Sun Aug 21 13:35:41 2005
++++ Makefile	Sun Aug 21 13:36:51 2005
 @@ -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
@@ -12,15 +12,6 @@
 +DEFINES = -DFMSX -DUNIX -DLSB_FIRST -DMITSHM \
 +          -DDISK -DNARROW -DSOUND -D%%BPP%% -DZLIB
 +CFLAGS  = -O3 -Wall -I${X11BASE}/include -L${X11BASE}/lib ${DEFINES}
- OBJECTS = fMSX.o MSX.o Patch.o Debug.o Disk.o Sound.o \
+ OBJECTS = fMSX.o MSX.o Patch.o Debug.o Disk.o Floppy.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 -lz
-+	${CC} ${CFLAGS} -o fmsx ${OBJECTS} -lXext -lX11 -L${X11BASE}/lib -lz
- 
- # Clean up.
- clean:
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->edwin 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Aug 21 04:19:46 GMT 2005 
Responsible-Changed-Why:  
mine 

http://www.freebsd.org/cgi/query-pr.cgi?pr=85172 
State-Changed-From-To: open->closed 
State-Changed-By: edwin 
State-Changed-When: Sun Aug 28 10:39:21 GMT 2005 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=85263 
State-Changed-From-To: open->closed 
State-Changed-By: edwin 
State-Changed-When: Sun Aug 28 10:39:21 GMT 2005 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=85172 
>Unformatted:
