svn commit: r337823 - in head/emulators/fmsx: . files

[Rene Ladan]

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 at 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 at 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