From eugen@eg.sd.rdtc.ru  Sat Sep 14 18:30:52 2013
Return-Path: <eugen@eg.sd.rdtc.ru>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id CECDB85A
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 14 Sep 2013 18:30:52 +0000 (UTC)
	(envelope-from eugen@eg.sd.rdtc.ru)
Received: from eg.sd.rdtc.ru (eg.sd.rdtc.ru [IPv6:2a03:3100:c:13::5])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 25586237E
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 14 Sep 2013 18:30:51 +0000 (UTC)
Received: from eg.sd.rdtc.ru (localhost [127.0.0.1])
	by eg.sd.rdtc.ru (8.14.7/8.14.7) with ESMTP id r8EIUYPR014671;
	Sun, 15 Sep 2013 01:30:34 +0700 (NOVT)
	(envelope-from eugen@eg.sd.rdtc.ru)
Received: (from eugen@localhost)
	by eg.sd.rdtc.ru (8.14.7/8.14.7/Submit) id r8EIUSVj014670;
	Sun, 15 Sep 2013 01:30:28 +0700 (NOVT)
	(envelope-from eugen)
Message-Id: <201309141830.r8EIUSVj014670@eg.sd.rdtc.ru>
Date: Sun, 15 Sep 2013 01:30:28 +0700 (NOVT)
From: Eugene Grosbein <egrosbein@rdtc.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc: dk@farm.org, marat@komkon.org
Subject: [patch] unbreak ports/emulators/fmsx
X-Send-Pr-Version: 3.114
X-GNATS-Notify: dk@farm.org

>Number:         182097
>Category:       ports
>Synopsis:       [patch] unbreak ports/emulators/fmsx
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    rene
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Sep 14 18:40:00 UTC 2013
>Closed-Date:    Fri Jan 31 15:36:54 UTC 2014
>Last-Modified:  Fri Feb 14 11:50:00 UTC 2014
>Originator:     Eugene Grosbein
>Release:        FreeBSD 8.4-STABLE amd64
>Organization:
RDTC JSC
>Environment:
System: FreeBSD eg.sd.rdtc.ru 8.4-STABLE FreeBSD 8.4-STABLE #2 r251830M: Mon Jun 17 18:05:24 NOVT 2013 root@eg.sd.rdtc.ru:/usr/local/obj/usr/local/src/sys/EG amd64

>Description:
	The port emulators/fmsx was marked as BROKEN (does not build) via
	http://svnweb.freebsd.org/ports?view=revision&revision=312817

	In fact, the code does not have any compilation errors, only warnings.
	Real fix for these warnings would require significant redesign
	of some parts of code as original author uses same function
	to return integers sometimes and sometimes in returns pointers to char.
	The code uses casts from pointers to integers and vice versa heavily.
	This is intential.

	Let's suppress these warnings for this legacy code using
	CFLAGS+=-Wno-pointer-to-int-cast -Wno-int-to-pointer-cast
	as it bulds and runs flawlessly then.

	The author of the code is Cc'ed.

>How-To-Repeat:
	See http://svnweb.freebsd.org/ports?view=revision&revision=312817

>Fix:

diff -urN fmsx.orig/Makefile fmsx/Makefile
--- fmsx.orig/Makefile	2013-09-15 01:20:57.000000000 +0700
+++ fmsx/Makefile	2013-09-15 01:20:49.000000000 +0700
@@ -3,7 +3,7 @@
 
 PORTNAME=	fmsx
 PORTVERSION=	3.5.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.mavetju.org/download/adopted/:code \
 		http://fms.komkon.org/fMSX/:code \
@@ -25,8 +25,6 @@
 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
diff -urN fmsx.orig/files/patch-fMSX_Unix_Makefile fmsx/files/patch-fMSX_Unix_Makefile
--- fmsx.orig/files/patch-fMSX_Unix_Makefile	2013-04-06 12:00:33.000000000 +0700
+++ fmsx/files/patch-fMSX_Unix_Makefile	2013-09-15 01:15:28.000000000 +0700
@@ -1,5 +1,14 @@
---- fMSX/Unix/Makefile.orig	2008-01-28 19:29:59.000000000 +0000
-+++ fMSX/Unix/Makefile	2008-05-26 05:52:08.000000000 +0000
+--- fMSX/Unix/Makefile.orig	2008-01-29 02:29:59.000000000 +0700
++++ fMSX/Unix/Makefile	2013-09-15 01:14:44.000000000 +0700
+@@ -1,7 +1,7 @@
+ include ../../EMULib/Rules.Unix
+ 
+ DEFINES+= -DFMSX -DLSB_FIRST -DBPP16 -DCONDEBUG -DDEBUG
+-CFLAGS += -I$(LIBZ80)
++CFLAGS += -I$(LIBZ80) -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast
+ OBJECTS+= $(EMUUNIX) $(FLOPPY) $(FDIDISK) \
+ 	  $(Z80) $(I8255) $(YM2413) $(AY8910) $(SCC) $(WD1793) \
+ 	  ../fMSX.o ../MSX.o ../V9938.o ../I8251.o ../Patch.o \
 @@ -10,7 +10,7 @@
  all:    fmsx
  
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sat Sep 14 18:40:10 UTC 2013 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=182097 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: dk@farm.org
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/182097: [patch] unbreak ports/emulators/fmsx
Date: Sat, 14 Sep 2013 18:40:09 UT

 Maintainer of emulators/fmsx,
 
 Please note that PR ports/182097 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/182097
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

Date: Sat, 14 Sep 2013 22:15:08 -0400 (EDT)
From: Marat Fayzullin <marat@komkon.org>
To: Eugene Grosbein <egrosbein@rdtc.ru>
Cc: FreeBSD-gnats-submit@freebsd.org, dk@farm.org
In-Reply-To: <201309141830.r8EIUSVj014670@eg.sd.rdtc.ru>
Subject: Re: [patch] unbreak ports/emulators/fmsx
References: <201309141830.r8EIUSVj014670@eg.sd.rdtc.ru>

 Hi, Eugene!
 
 Could you please quote to me the exact lines of Console.c causing 
 problems? I am afraid my version of Console.c is too far ahead of
 the one in FreeBSD Ports, so lines no longer match, at all.
 
 Marat

Date: Sun, 15 Sep 2013 23:03:46 +0700
From: Eugene Grosbein <egrosbein@rdtc.ru>
To: Marat Fayzullin <marat@komkon.org>
Subject: Re: [patch] unbreak ports/emulators/fmsx

 On 15.09.2013 09:15, Marat Fayzullin wrote:
 > 
 > Hi, Eugene!
 > 
 > Could you please quote to me the exact lines of Console.c causing 
 > problems? I am afraid my version of Console.c is too far ahead of
 > the one in FreeBSD Ports, so lines no longer match, at all.
 
 The function int CONMenu() in the EMULib/Console.c (fMSX version 3.5)
 sometimes returns integer and sometimes it does return((int)Result)
 where Result is an array of chars. Calling code casts the result
 back to char* in the latter case. These casts issue warnings for
 amd64 platform where integer and pointer have different storage sizes.
 
 Eugene Grosbein

Date: Mon, 16 Sep 2013 09:04:13 -0400 (EDT)
From: Marat Fayzullin <marat@komkon.org>
To: Eugene Grosbein <egrosbein@rdtc.ru>
Subject: Re: [patch] unbreak ports/emulators/fmsx

 On Sun, 15 Sep 2013, Eugene Grosbein wrote:
 > The function int CONMenu() in the EMULib/Console.c (fMSX version 3.5)
 > sometimes returns integer and sometimes it does return((int)Result)
 > where Result is an array of chars. Calling code casts the result
 > back to char* in the latter case. These casts issue warnings for
 > amd64 platform where integer and pointer have different storage sizes.
 >
 
 Oh, I know this spot: it lets CONMenu() act both as a general options
 menu and as a file selector (in which case, the file name is being
 returned). Have not found any nice way to fix this, without duplicating
 a lot of code, but will look further.
 
 Marat
Responsible-Changed-From-To: freebsd-ports-bugs->rene 
Responsible-Changed-By: rene 
Responsible-Changed-When: Fri Dec 20 19:04:56 UTC 2013 
Responsible-Changed-Why:  
Take 

http://www.freebsd.org/cgi/query-pr.cgi?pr=182097 

From: =?ISO-8859-1?Q?Ren=E9_Ladan?= <rene@freebsd.org>
To: bug-followup@FreeBSD.org, egrosbein@rdtc.ru
Cc: dk@farm.org, marat@komkon.org
Subject: Re: ports/182097: [patch] unbreak ports/emulators/fmsx
Date: Fri, 20 Dec 2013 22:34:20 +0100

 This is a multi-part message in MIME format.
 --------------040008050407090000050700
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 8bit
 
 On FreeBSD 10.0 (amd64), which uses clang as CC (so I had to un-hardcode
 CC in EMULib/Rules.gcc), the port is still broken.  I fixed one error
 but now it chokes on using gzgetc(), see [1]
 
 I also propose to modernize the port a bit (see attached diff):
 - Remove leading 'The' from COMMENT
 - Infrastructure updates
   * replace USE_GMAKE=yes by USES=gmake
   * replace USE_DOS2UNIX=<files> by USES=dos2unix , DOS2UNIX_FILES=<files>
 - Staging (not done yet)
 
 There is no need to bump PORTREVISION since the port was already marked
 broken so no packages are being built currently.
 
 [1] http://people.freebsd.org/~rene/fmsx-3.5.1_2.log
 
 Ren
 
 --------------040008050407090000050700
 Content-Type: text/x-patch;
  name="fmsx.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="fmsx.diff"
 
 Index: Makefile
 ===================================================================
 --- Makefile	(revision 337064)
 +++ Makefile	(working copy)
 @@ -16,20 +16,16 @@
  EXTRACT_ONLY=	fMSX351.zip
  
  MAINTAINER=	dk@farm.org
 -COMMENT=	The Portable MSX/MSX2/MSX2+ Emulator
 +COMMENT=	Portable MSX/MSX2/MSX2+ Emulator
  
 -DEPRECATED=	Broken for more than 6 month
 -EXPIRATION_DATE=	2013-12-18
 -
  USE_XORG=	xi x11
  USE_ZIP=	yes
 -USE_GMAKE=	yes
 -USE_DOS2UNIX=	EMULib/NetUnix.c EMULib/Rules.Unix
 +USES=		gmake dos2unix
 +DOS2UNIX_FILES= EMULib/LibUnix.c EMULib/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
 Index: files/patch-EMULib_LibUnix.c
 ===================================================================
 --- files/patch-EMULib_LibUnix.c	(revision 0)
 +++ files/patch-EMULib_LibUnix.c	(working copy)
 @@ -0,0 +1,19 @@
 +--- EMULib/LibUnix.c.orig	2013-12-20 21:09:39.000000000 +0100
 ++++ EMULib/LibUnix.c	2013-12-20 21:56:52.000000000 +0100
 +@@ -142,7 +142,7 @@
 +     else
 + #endif
 +       XPutImage(Dsp,Wnd,DefaultGCOfScreen(Scr),VideoImg->XImg,VideoX,VideoY,(XSize-VideoW)>>1,(YSize-VideoH)>>1,VideoW,VideoH);
 +-    return;
 ++    return(1);
 +   }
 + 
 +   /* Scale video buffer into OutImg */
 +@@ -159,6 +159,7 @@
 +   else
 + #endif
 +     XPutImage(Dsp,Wnd,DefaultGCOfScreen(Scr),OutImg.XImg,0,0,0,0,XSize,YSize);
 ++    return(1);
 + }
 + 
 + /** GetJoystick() ********************************************/
 
 Property changes on: files/patch-EMULib_LibUnix.c
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: files/patch-EMULib_Rules.gcc
 ===================================================================
 --- files/patch-EMULib_Rules.gcc	(revision 0)
 +++ files/patch-EMULib_Rules.gcc	(working copy)
 @@ -0,0 +1,11 @@
 +--- 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 @@
 + LIBGBZ	= $(BASEDIR)/GBZ80
 + PRIVATE	= $(BASEDIR)/Private
 + 
 +-CC	= gcc
 ++CC	?= gcc
 + CPP	= cpp
 + CFLAGS	= -O3 -pthread -I.. -I$(EMULIB)
 + DEFINES = -DZLIB
 
 Property changes on: files/patch-EMULib_Rules.gcc
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: files/patch-fMSX_Unix_Makefile
 ===================================================================
 --- files/patch-fMSX_Unix_Makefile	(revision 337064)
 +++ files/patch-fMSX_Unix_Makefile	(working copy)
 @@ -1,5 +1,14 @@
 ---- fMSX/Unix/Makefile.orig	2008-01-28 19:29:59.000000000 +0000
 -+++ fMSX/Unix/Makefile	2008-05-26 05:52:08.000000000 +0000
 +--- fMSX/Unix/Makefile.orig	2008-01-28 20:29:59.000000000 +0100
 ++++ fMSX/Unix/Makefile	2013-12-20 20:16:13.000000000 +0100
 +@@ -1,7 +1,7 @@
 + include ../../EMULib/Rules.Unix
 + 
 + DEFINES+= -DFMSX -DLSB_FIRST -DBPP16 -DCONDEBUG -DDEBUG
 +-CFLAGS += -I$(LIBZ80)
 ++CFLAGS += -I$(LIBZ80) -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast
 + OBJECTS+= $(EMUUNIX) $(FLOPPY) $(FDIDISK) \
 + 	  $(Z80) $(I8255) $(YM2413) $(AY8910) $(SCC) $(WD1793) \
 + 	  ../fMSX.o ../MSX.o ../V9938.o ../I8251.o ../Patch.o \
  @@ -10,7 +10,7 @@
   all:    fmsx
   
 
 --------------040008050407090000050700--

From: Marat Fayzullin <marat@komkon.org>
To: =?ISO-8859-1?Q?Ren=E9_Ladan?= <rene@freebsd.org>, bug-followup@freebsd.org,
        egrosbein@rdtc.ru
Cc: dk@farm.org
Subject: Re: ports/182097: [patch] unbreak ports/emulators/fmsx
Date: Sun, 22 Dec 2013 17:48:50 +0400

 ----_com.android.email_30522736208900
 Content-Type: text/plain; charset=utf-8
 Content-Transfer-Encoding: base64
 
 SSB3aWxsIGxvb2sgYXQgaXQgYW5kIHJlcG9ydCBiYWNrLgoKTWFyYXQKCi0tLS0tLS0tIE9yaWdp
 bmFsIG1lc3NhZ2UgLS0tLS0tLS0KRnJvbTogUmVuw6kgTGFkYW4gPHJlbmVAZnJlZWJzZC5vcmc+
 IApEYXRlOiAxMi8yMS8yMDEzICAwMTozNCAgKEdNVCswNDowMCkgClRvOiBidWctZm9sbG93dXBA
 ZnJlZWJzZC5vcmcsZWdyb3NiZWluQHJkdGMucnUgCkNjOiBka0BmYXJtLm9yZyxtYXJhdEBrb21r
 b24ub3JnIApTdWJqZWN0OiBSZTogcG9ydHMvMTgyMDk3OiBbcGF0Y2hdIHVuYnJlYWsgcG9ydHMv
 ZW11bGF0b3JzL2Ztc3ggCiAKT24gRnJlZUJTRCAxMC4wIChhbWQ2NCksIHdoaWNoIHVzZXMgY2xh
 bmcgYXMgQ0MgKHNvIEkgaGFkIHRvIHVuLWhhcmRjb2RlCkNDIGluIEVNVUxpYi9SdWxlcy5nY2Mp
 LCB0aGUgcG9ydCBpcyBzdGlsbCBicm9rZW4uwqAgSSBmaXhlZCBvbmUgZXJyb3IKYnV0IG5vdyBp
 dCBjaG9rZXMgb24gdXNpbmcgZ3pnZXRjKCksIHNlZSBbMV0KCkkgYWxzbyBwcm9wb3NlIHRvIG1v
 ZGVybml6ZSB0aGUgcG9ydCBhIGJpdCAoc2VlIGF0dGFjaGVkIGRpZmYpOgotIFJlbW92ZSBsZWFk
 aW5nICdUaGUnIGZyb20gQ09NTUVOVAotIEluZnJhc3RydWN0dXJlIHVwZGF0ZXMKwqAgKiByZXBs
 YWNlIFVTRV9HTUFLRT15ZXMgYnkgVVNFUz1nbWFrZQrCoCAqIHJlcGxhY2UgVVNFX0RPUzJVTklY
 PTxmaWxlcz4gYnkgVVNFUz1kb3MydW5peCAsIERPUzJVTklYX0ZJTEVTPTxmaWxlcz4KLSBTdGFn
 aW5nIChub3QgZG9uZSB5ZXQpCgpUaGVyZSBpcyBubyBuZWVkIHRvIGJ1bXAgUE9SVFJFVklTSU9O
 IHNpbmNlIHRoZSBwb3J0IHdhcyBhbHJlYWR5IG1hcmtlZApicm9rZW4gc28gbm8gcGFja2FnZXMg
 YXJlIGJlaW5nIGJ1aWx0IGN1cnJlbnRseS4KClsxXSBodHRwOi8vcGVvcGxlLmZyZWVic2Qub3Jn
 L35yZW5lL2Ztc3gtMy41LjFfMi5sb2cKClJlbsOpCg==
 
 ----_com.android.email_30522736208900
 Content-Type: text/html; charset=utf-8
 Content-Transfer-Encoding: base64
 
 PGh0bWw+PGhlYWQ+PG1ldGEgaHR0cC1lcXVpdj0iQ29udGVudC1UeXBlIiBjb250ZW50PSJ0ZXh0
 L2h0bWw7IGNoYXJzZXQ9VVRGLTgiPjwvaGVhZD48Ym9keSA+SSB3aWxsIGxvb2sgYXQgaXQgYW5k
 IHJlcG9ydCBiYWNrLjxkaXY+PGJyPjwvZGl2PjxkaXY+TWFyYXQ8L2Rpdj48YnI+PGJyPjxicj4t
 LS0tLS0tLSBPcmlnaW5hbCBtZXNzYWdlIC0tLS0tLS0tPGJyPkZyb206IFJlbsOpIExhZGFuICZs
 dDtyZW5lQGZyZWVic2Qub3JnJmd0OyA8YnI+RGF0ZTogMTIvMjEvMjAxMyAgMDE6MzQgIChHTVQr
 MDQ6MDApIDxicj5UbzogYnVnLWZvbGxvd3VwQGZyZWVic2Qub3JnLGVncm9zYmVpbkByZHRjLnJ1
 IDxicj5DYzogZGtAZmFybS5vcmcsbWFyYXRAa29ta29uLm9yZyA8YnI+U3ViamVjdDogUmU6IHBv
 cnRzLzE4MjA5NzogW3BhdGNoXSB1bmJyZWFrIHBvcnRzL2VtdWxhdG9ycy9mbXN4IDxicj4gPGJy
 Pjxicj5PbiBGcmVlQlNEIDEwLjAgKGFtZDY0KSwgd2hpY2ggdXNlcyBjbGFuZyBhcyBDQyAoc28g
 SSBoYWQgdG8gdW4taGFyZGNvZGU8YnI+Q0MgaW4gRU1VTGliL1J1bGVzLmdjYyksIHRoZSBwb3J0
 IGlzIHN0aWxsIGJyb2tlbi4mbmJzcDsgSSBmaXhlZCBvbmUgZXJyb3I8YnI+YnV0IG5vdyBpdCBj
 aG9rZXMgb24gdXNpbmcgZ3pnZXRjKCksIHNlZSBbMV08YnI+PGJyPkkgYWxzbyBwcm9wb3NlIHRv
 IG1vZGVybml6ZSB0aGUgcG9ydCBhIGJpdCAoc2VlIGF0dGFjaGVkIGRpZmYpOjxicj4tIFJlbW92
 ZSBsZWFkaW5nICdUaGUnIGZyb20gQ09NTUVOVDxicj4tIEluZnJhc3RydWN0dXJlIHVwZGF0ZXM8
 YnI+Jm5ic3A7ICogcmVwbGFjZSBVU0VfR01BS0U9eWVzIGJ5IFVTRVM9Z21ha2U8YnI+Jm5ic3A7
 ICogcmVwbGFjZSBVU0VfRE9TMlVOSVg9Jmx0O2ZpbGVzJmd0OyBieSBVU0VTPWRvczJ1bml4ICwg
 RE9TMlVOSVhfRklMRVM9Jmx0O2ZpbGVzJmd0Ozxicj4tIFN0YWdpbmcgKG5vdCBkb25lIHlldCk8
 YnI+PGJyPlRoZXJlIGlzIG5vIG5lZWQgdG8gYnVtcCBQT1JUUkVWSVNJT04gc2luY2UgdGhlIHBv
 cnQgd2FzIGFscmVhZHkgbWFya2VkPGJyPmJyb2tlbiBzbyBubyBwYWNrYWdlcyBhcmUgYmVpbmcg
 YnVpbHQgY3VycmVudGx5Ljxicj48YnI+WzFdIGh0dHA6Ly9wZW9wbGUuZnJlZWJzZC5vcmcvfnJl
 bmUvZm1zeC0zLjUuMV8yLmxvZzxicj48YnI+UmVuw6k8YnI+PC9ib2R5Pg==
 
 ----_com.android.email_30522736208900--
 
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/182097: commit references a PR
Date: Fri, 27 Dec 2013 23:08:10 +0000 (UTC)

 Author: rene
 Date: Fri Dec 27 23:08:02 2013
 New Revision: 337823
 URL: http://svnweb.freebsd.org/changeset/ports/337823
 
 Log:
   - Modernize dos2unix and gmake
   - Undeprecate, futher fixes are in progress
   - Remove leading definite article from comment
   
   PR:		ports/182097
   Submitted by:	Eugene Grosbein <egrosbein@rdtc.ru>
   Approved by:	portmgr (blanket infrastructure)
 
 Added:
   head/emulators/fmsx/files/patch-EMULib_LibUnix.c   (contents, props changed)
   head/emulators/fmsx/files/patch-EMULib_Rules.gcc   (contents, props changed)
 Modified:
   head/emulators/fmsx/Makefile
   head/emulators/fmsx/files/patch-fMSX_Unix_Makefile
 
 Modified: head/emulators/fmsx/Makefile
 ==============================================================================
 --- head/emulators/fmsx/Makefile	Fri Dec 27 22:56:50 2013	(r337822)
 +++ head/emulators/fmsx/Makefile	Fri Dec 27 23:08:02 2013	(r337823)
 @@ -16,15 +16,13 @@ DIST_SUBDIR=	fmsx351
  EXTRACT_ONLY=	fMSX351.zip
  
  MAINTAINER=	dk@farm.org
 -COMMENT=	The Portable MSX/MSX2/MSX2+ Emulator
 -
 -DEPRECATED=	Broken for more than 6 month
 -EXPIRATION_DATE=	2013-12-18
 +COMMENT=	Portable MSX/MSX2/MSX2+ Emulator
  
  USE_XORG=	xi x11
  USE_ZIP=	yes
 -USE_GMAKE=	yes
 -USE_DOS2UNIX=	EMULib/NetUnix.c EMULib/Rules.Unix
 +USES=		gmake dos2unix
 +DOS2UNIX_FILES= EMULib/LibUnix.c EMULib/NetUnix.c EMULib/Rules.gcc \
 +		EMULib/Rules.Unix
  RESTRICTED=	Legal status of distributed ROM images unclear
  WRKSRC=		${WRKDIR}
  
 
 Added: head/emulators/fmsx/files/patch-EMULib_LibUnix.c
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/emulators/fmsx/files/patch-EMULib_LibUnix.c	Fri Dec 27 23:08:02 2013	(r337823)
 @@ -0,0 +1,19 @@
 +--- EMULib/LibUnix.c.orig	2013-12-20 21:09:39.000000000 +0100
 ++++ EMULib/LibUnix.c	2013-12-20 21:56:52.000000000 +0100
 +@@ -142,7 +142,7 @@
 +     else
 + #endif
 +       XPutImage(Dsp,Wnd,DefaultGCOfScreen(Scr),VideoImg->XImg,VideoX,VideoY,(XSize-VideoW)>>1,(YSize-VideoH)>>1,VideoW,VideoH);
 +-    return;
 ++    return(1);
 +   }
 + 
 +   /* Scale video buffer into OutImg */
 +@@ -159,6 +159,7 @@
 +   else
 + #endif
 +     XPutImage(Dsp,Wnd,DefaultGCOfScreen(Scr),OutImg.XImg,0,0,0,0,XSize,YSize);
 ++    return(1);
 + }
 + 
 + /** GetJoystick() ********************************************/
 
 Added: head/emulators/fmsx/files/patch-EMULib_Rules.gcc
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/emulators/fmsx/files/patch-EMULib_Rules.gcc	Fri Dec 27 23:08:02 2013	(r337823)
 @@ -0,0 +1,11 @@
 +--- 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 @@
 + LIBGBZ	= $(BASEDIR)/GBZ80
 + PRIVATE	= $(BASEDIR)/Private
 + 
 +-CC	= gcc
 ++CC	?= gcc
 + CPP	= cpp
 + CFLAGS	= -O3 -pthread -I.. -I$(EMULIB)
 + DEFINES = -DZLIB
 
 Modified: head/emulators/fmsx/files/patch-fMSX_Unix_Makefile
 ==============================================================================
 --- head/emulators/fmsx/files/patch-fMSX_Unix_Makefile	Fri Dec 27 22:56:50 2013	(r337822)
 +++ head/emulators/fmsx/files/patch-fMSX_Unix_Makefile	Fri Dec 27 23:08:02 2013	(r337823)
 @@ -1,5 +1,14 @@
 ---- fMSX/Unix/Makefile.orig	2008-01-28 19:29:59.000000000 +0000
 -+++ fMSX/Unix/Makefile	2008-05-26 05:52:08.000000000 +0000
 +--- fMSX/Unix/Makefile.orig	2008-01-28 20:29:59.000000000 +0100
 ++++ fMSX/Unix/Makefile	2013-12-20 20:16:13.000000000 +0100
 +@@ -1,7 +1,7 @@
 + include ../../EMULib/Rules.Unix
 + 
 + DEFINES+= -DFMSX -DLSB_FIRST -DBPP16 -DCONDEBUG -DDEBUG
 +-CFLAGS += -I$(LIBZ80)
 ++CFLAGS += -I$(LIBZ80) -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast
 + OBJECTS+= $(EMUUNIX) $(FLOPPY) $(FDIDISK) \
 + 	  $(Z80) $(I8255) $(YM2413) $(AY8910) $(SCC) $(WD1793) \
 + 	  ../fMSX.o ../MSX.o ../V9938.o ../I8251.o ../Patch.o \
  @@ -10,7 +10,7 @@
   all:    fmsx
   
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 

From: =?ISO-8859-1?Q?Ren=E9_Ladan?= <rene@freebsd.org>
To: bug-followup@FreeBSD.org, egrosbein@rdtc.ru, marat@komkon.org
Cc:  
Subject: Re: ports/182097: [patch] unbreak ports/emulators/fmsx
Date: Mon, 27 Jan 2014 12:26:21 +0100

 Any news on solving this problem?
 
 Ren

From: Eugene Grosbein <eugen@grosbein.net>
To: =?UTF-8?B?UmVuw6kgTGFkYW4=?= <rene@freebsd.org>
Cc: bug-followup@FreeBSD.org, marat@komkon.org
Subject: Re: ports/182097: [patch] unbreak ports/emulators/fmsx
Date: Mon, 27 Jan 2014 21:06:29 +0700

 On 27.01.2014 18:26, René Ladan wrote:
 > Any news on solving this problem?
 
 None from me and still waiting from Marat, author of the software.
 
 

From: Marat Fayzullin <marat@komkon.org>
To: =?ISO-8859-1?Q?Ren=E9_Ladan?= <rene@freebsd.org>
Cc: bug-followup@freebsd.org, egrosbein@rdtc.ru
Subject: Re: ports/182097: [patch] unbreak ports/emulators/fmsx
Date: Mon, 27 Jan 2014 10:43:54 -0500 (EST)

   This message is in MIME format.  The first part should be readable text,
   while the remaining parts are likely unreadable without MIME-aware tools.
 
 --0-1274193093-1390837434=:70507
 Content-Type: TEXT/PLAIN; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 8BIT
 
 
 
 On Mon, 27 Jan 2014, Ren Ladan wrote:
 
 > Any news on solving this problem?
 >
 > Ren
 >
 I have fixed it in the source code but have not yet released the source 
 code.
 --0-1274193093-1390837434=:70507--

From: Marat Fayzullin <marat@komkon.org>
To: Eugene Grosbein <eugen@grosbein.net>
Cc: =?UTF-8?B?UmVuw6kgTGFkYW4=?= <rene@freebsd.org>, bug-followup@freebsd.org
Subject: Re: ports/182097: [patch] unbreak ports/emulators/fmsx
Date: Mon, 27 Jan 2014 11:19:44 -0500 (EST)

   This message is in MIME format.  The first part should be readable text,
   while the remaining parts are likely unreadable without MIME-aware tools.
 
 --0-1817017284-1390839584=:71003
 Content-Type: TEXT/PLAIN; charset=UTF-8; format=flowed
 Content-Transfer-Encoding: 8BIT
 
 
 
 On Mon, 27 Jan 2014, Eugene Grosbein wrote:
 
 > On 27.01.2014 18:26, René Ladan wrote:
 >> Any news on solving this problem?
 >
 > None from me and still waiting from Marat, author of the software.
 >
 >
 I am preparing the next fMSX-Unix release where these issues will be 
 (hopefully) fixed.
 --0-1817017284-1390839584=:71003--

From: Marat Fayzullin <marat@komkon.org>
To: Eugene Grosbein <eugen@grosbein.net>
Cc: =?UTF-8?B?UmVuw6kgTGFkYW4=?= <rene@freebsd.org>, bug-followup@freebsd.org
Subject: Re: ports/182097: [patch] unbreak ports/emulators/fmsx
Date: Wed, 29 Jan 2014 13:04:40 -0500 (EST)

   This message is in MIME format.  The first part should be readable text,
   while the remaining parts are likely unreadable without MIME-aware tools.
 
 --0-1532301641-1391018680=:26032
 Content-Type: TEXT/PLAIN; charset=X-UNKNOWN; format=flowed
 Content-Transfer-Encoding: 8BIT
 
 
 Hello, Eugene, All!
 
 fMSX 3.7 source code is now online:
 
 http://fms.komkon.org/fMSX/fMSX37.zip
 
 I have taken effort to fix all the issues you have reported, and then 
 some. If there are any left, let me know right away.
 
 Best regards,
    Marat Fayzullin
 
 On Mon, 27 Jan 2014, Marat Fayzullin wrote:
 
 >
 >
 > On Mon, 27 Jan 2014, Eugene Grosbein wrote:
 >
 >> On 27.01.2014 18:26, René Ladan wrote:
 >>> Any news on solving this problem?
 >> 
 >> None from me and still waiting from Marat, author of the software.
 >> 
 >> 
 > I am preparing the next fMSX-Unix release where these issues will be 
 > (hopefully) fixed.
 --0-1532301641-1391018680=:26032--

From: Eugene Grosbein <eugen@grosbein.net>
To: Marat Fayzullin <marat@komkon.org>
Cc: =?UTF-8?B?UmVuw6kgTGFkYW4=?= <rene@freebsd.org>, bug-followup@freebsd.org
Subject: Re: ports/182097: [patch] unbreak ports/emulators/fmsx
Date: Thu, 30 Jan 2014 13:28:14 +0700

 On 30.01.2014 01:04, Marat Fayzullin wrote:
 > 
 > Hello, Eugene, All!
 > 
 > fMSX 3.7 source code is now online:
 > 
 > http://fms.komkon.org/fMSX/fMSX37.zip
 > 
 > I have taken effort to fix all the issues you have reported, and then 
 > some. If there are any left, let me know right away.
 
 I'm going to update FreeBSD port for 3.7.
 Do you expect this version will be hosted at http://www.mavetju.org/download/adopted/
 just like 3.5.1?
 

From: =?ISO-8859-1?Q?Ren=E9_Ladan?= <rene@freebsd.org>
To: Eugene Grosbein <eugen@grosbein.net>
Cc: Marat Fayzullin <marat@komkon.org>, 
	"mailto:bug-followup@FreeBSD.org," <bug-followup@freebsd.org>
Subject: Re: ports/182097: [patch] unbreak ports/emulators/fmsx
Date: Thu, 30 Jan 2014 10:15:41 +0100

 2014-01-30 Eugene Grosbein <eugen@grosbein.net>:
 > On 30.01.2014 01:04, Marat Fayzullin wrote:
 >>
 >> Hello, Eugene, All!
 >>
 >> fMSX 3.7 source code is now online:
 >>
 >> http://fms.komkon.org/fMSX/fMSX37.zip
 >>
 >> I have taken effort to fix all the issues you have reported, and then
 >> some. If there are any left, let me know right away.
 >
 Thanks, I'll have a look when I'm back from the office.
 
 > I'm going to update FreeBSD port for 3.7.
 > Do you expect this version will be hosted at http://www.mavetju.org/downl=
 oad/adopted/
 > just like 3.5.1?
 >
 You should ask edwin@mavetju.org
 
 Ren=E9

From: Marat Fayzullin <marat@komkon.org>
To: Eugene Grosbein <eugen@grosbein.net>
Cc: =?UTF-8?B?UmVuw6kgTGFkYW4=?= <rene@freebsd.org>, bug-followup@freebsd.org
Subject: Re: ports/182097: [patch] unbreak ports/emulators/fmsx
Date: Thu, 30 Jan 2014 08:35:18 -0500 (EST)

 On Thu, 30 Jan 2014, Eugene Grosbein wrote:
 > I'm going to update FreeBSD port for 3.7.
 > Do you expect this version will be hosted at http://www.mavetju.org/download/adopted/
 > just like 3.5.1?
 >
 I have no idea what www.mavetju.org is. I suggest you use the original
 URL (http://fms.komkon.org/fMSX/fMSX37.zip) instead.

From: Eugene Grosbein <eugen@grosbein.net>
To: =?UTF-8?B?UmVuw6kgTGFkYW4=?= <rene@freebsd.org>
Cc: bug-followup@FreeBSD.org, edwin@mavetju.org
Subject: Re: ports/182097: [patch] unbreak ports/emulators/fmsx
Date: Fri, 31 Jan 2014 01:12:23 +0700

 On 27.01.2014 18:26, René Ladan wrote:
 > Any news on solving this problem?
 
 Here comes patch for emulatiors/fmsx port.
 I ask edwin@mavetju.org to consider adopting fMSX-3.7 distfile
 from http://fms.komkon.org/fMSX/
 
 List of changes:
 
 - update version up to fMSX-3.7 and unbreak it;
 - for now, delete http://www.mavetju.org/download/adopted/ mirror (temporary, I hope);
 - STAGEify port;
 - remove patch-EMULib_LibUnix.c and patch-fMSX_Unix_Makefile (fixes integrated upstream);
 - add support for building port WITH_DEBUG=yes (pass DEBUG_FLAGS to gmake)
 - sort pkg-plist.
 
 Compile and run-tested with 8.4-STABLE and 9.2-STABLE (stock gcc)
 and 11.0-CURRENT (stock clang).
 
 diff -urN /usr/ports/emulators/fmsx/Makefile fmsx/Makefile
 --- /usr/ports/emulators/fmsx/Makefile	2014-01-31 00:39:13.000000000 +0700
 +++ fmsx/Makefile	2014-01-31 00:53:40.000000000 +0700
 @@ -2,18 +2,16 @@
  # $FreeBSD: head/emulators/fmsx/Makefile 337823 2013-12-27 23:08:02Z rene $
  
  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 @@
  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 @@
  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 @@
  .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>
 diff -urN /usr/ports/emulators/fmsx/distinfo fmsx/distinfo
 --- /usr/ports/emulators/fmsx/distinfo	2014-01-23 12:13:35.000000000 +0700
 +++ fmsx/distinfo	2014-01-30 23:50:20.000000000 +0700
 @@ -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
 diff -urN /usr/ports/emulators/fmsx/files/patch-EMULib_LibUnix.c fmsx/files/patch-EMULib_LibUnix.c
 --- /usr/ports/emulators/fmsx/files/patch-EMULib_LibUnix.c	2013-12-30 21:59:42.000000000 +0700
 +++ fmsx/files/patch-EMULib_LibUnix.c	1970-01-01 07:00:00.000000000 +0700
 @@ -1,19 +0,0 @@
 ---- EMULib/LibUnix.c.orig	2013-12-20 21:09:39.000000000 +0100
 -+++ EMULib/LibUnix.c	2013-12-20 21:56:52.000000000 +0100
 -@@ -142,7 +142,7 @@
 -     else
 - #endif
 -       XPutImage(Dsp,Wnd,DefaultGCOfScreen(Scr),VideoImg->XImg,VideoX,VideoY,(XSize-VideoW)>>1,(YSize-VideoH)>>1,VideoW,VideoH);
 --    return;
 -+    return(1);
 -   }
 - 
 -   /* Scale video buffer into OutImg */
 -@@ -159,6 +159,7 @@
 -   else
 - #endif
 -     XPutImage(Dsp,Wnd,DefaultGCOfScreen(Scr),OutImg.XImg,0,0,0,0,XSize,YSize);
 -+    return(1);
 - }
 - 
 - /** GetJoystick() ********************************************/
 diff -urN /usr/ports/emulators/fmsx/files/patch-EMULib_NetUnix.c fmsx/files/patch-EMULib_NetUnix.c
 --- /usr/ports/emulators/fmsx/files/patch-EMULib_NetUnix.c	2014-01-23 12:13:35.000000000 +0700
 +++ fmsx/files/patch-EMULib_NetUnix.c	2014-01-30 23:50:19.000000000 +0700
 @@ -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;
 diff -urN /usr/ports/emulators/fmsx/files/patch-EMULib_Rules.Unix fmsx/files/patch-EMULib_Rules.Unix
 --- /usr/ports/emulators/fmsx/files/patch-EMULib_Rules.Unix	2014-01-23 12:13:35.000000000 +0700
 +++ fmsx/files/patch-EMULib_Rules.Unix	2014-01-31 00:49:05.000000000 +0700
 @@ -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)
 diff -urN /usr/ports/emulators/fmsx/files/patch-EMULib_Rules.gcc fmsx/files/patch-EMULib_Rules.gcc
 --- /usr/ports/emulators/fmsx/files/patch-EMULib_Rules.gcc	2013-12-30 21:59:42.000000000 +0700
 +++ fmsx/files/patch-EMULib_Rules.gcc	2014-01-31 00:41:19.000000000 +0700
 @@ -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
 + 
 diff -urN /usr/ports/emulators/fmsx/files/patch-fMSX_Unix_Makefile fmsx/files/patch-fMSX_Unix_Makefile
 --- /usr/ports/emulators/fmsx/files/patch-fMSX_Unix_Makefile	2014-01-23 12:13:35.000000000 +0700
 +++ fmsx/files/patch-fMSX_Unix_Makefile	1970-01-01 07:00:00.000000000 +0700
 @@ -1,20 +0,0 @@
 ---- fMSX/Unix/Makefile.orig	2008-01-28 20:29:59.000000000 +0100
 -+++ fMSX/Unix/Makefile	2013-12-20 20:16:13.000000000 +0100
 -@@ -1,7 +1,7 @@
 - include ../../EMULib/Rules.Unix
 - 
 - DEFINES+= -DFMSX -DLSB_FIRST -DBPP16 -DCONDEBUG -DDEBUG
 --CFLAGS += -I$(LIBZ80)
 -+CFLAGS += -I$(LIBZ80) -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast
 - OBJECTS+= $(EMUUNIX) $(FLOPPY) $(FDIDISK) \
 - 	  $(Z80) $(I8255) $(YM2413) $(AY8910) $(SCC) $(WD1793) \
 - 	  ../fMSX.o ../MSX.o ../V9938.o ../I8251.o ../Patch.o \
 -@@ -10,7 +10,7 @@
 - all:    fmsx
 - 
 - fmsx:	Makefile $(OBJECTS)
 --	$(CC) -o $@ $(CFLAGS) $(OBJECTS) $(LIBS)
 -+	$(CC) -L%%LOCALBASE%%/lib -o $@ $(CFLAGS) $(OBJECTS) $(LIBS)
 - 
 - clean:
 - 	rm -f $(OBJECTS)
 diff -urN /usr/ports/emulators/fmsx/pkg-plist fmsx/pkg-plist
 --- /usr/ports/emulators/fmsx/pkg-plist	2014-01-23 12:13:35.000000000 +0700
 +++ fmsx/pkg-plist	2014-01-30 23:50:20.000000000 +0700
 @@ -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%%
 
 
State-Changed-From-To: feedback->closed 
State-Changed-By: rene 
State-Changed-When: Fri Jan 31 15:36:42 UTC 2014 
State-Changed-Why:  
Committed, thanks 

http://www.freebsd.org/cgi/query-pr.cgi?pr=182097 

From: Edwin Groothuis <edwin@mavetju.org>
To: Eugene Grosbein <eugen@grosbein.net>, =?UTF-8?B?UmVuw6kgTGFkYW4=?=
 <rene@freebsd.org>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/182097: [patch] unbreak ports/emulators/fmsx
Date: Fri, 14 Feb 2014 22:40:42 +1100

 On 31/01/14 05:12 , Eugene Grosbein wrote:
 > On 27.01.2014 18:26, René Ladan wrote:
 >> Any news on solving this problem?
 > 
 > Here comes patch for emulatiors/fmsx port.
 > I ask edwin@mavetju.org to consider adopting fMSX-3.7 distfile
 
 Done.
 
 Edwin
 
>Unformatted:
