Fix the build on 5.X and -CURRENT.

Reported by:	kris
Approved by:	portmgr (marcus), fjoe (mentor, implicit), maintainer

3 files changed, 90 insertions, 7 deletions

diff --git a/emulators/adamem/Makefile b/emulators/adamem/Makefile
index 53086cac5915..714798c99e60 100644
--- a/emulators/adamem/Makefile
+++ b/emulators/adamem/Makefile
@@ -21,12 +21,6 @@ ALL_TARGET=	x
 
 PROGDIR=	${PREFIX}/${PORTNAME}
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 502126
-BROKEN=		"Does not compile on FreeBSD >= 5.x"
-.endif
-
 do-install:
 	${MKDIR} ${PROGDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/adamem ${PROGDIR}
@@ -40,4 +34,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/adamem.txt ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/emulators/adamem/files/patch-Coleco.c b/emulators/adamem/files/patch-Coleco.c
new file mode 100644
index 000000000000..6236085d68da
--- /dev/null
+++ b/emulators/adamem/files/patch-Coleco.c
@@ -0,0 +1,20 @@
+--- Coleco.c.orig	Wed Sep 22 13:28:07 2004
++++ Coleco.c	Wed Sep 22 13:32:20 2004
+@@ -616,7 +616,7 @@
+  OutE0,OutE0,OutE0,OutE0,OutE0,OutE0,OutE0,OutE0
+ };
+ 
+-void Z80_Out (unsigned Port,byte Val)
++FASTCALL void Z80_Out (unsigned Port,byte Val)
+ {
+  OutPortFn fn;
+  Port&=0xff;
+@@ -763,7 +763,7 @@
+  InpE0,InpE0,InpE2,InpE2,InpE0,InpE0,InpE2,InpE2
+ };
+ 
+-byte Z80_In (unsigned Port)
++FASTCALL byte Z80_In (unsigned Port)
+ {
+  InPortFn fn;
+  Port&=0xff;
diff --git a/emulators/adamem/files/patch-X.c b/emulators/adamem/files/patch-X.c
new file mode 100644
index 000000000000..1446f9de40f5
--- /dev/null
+++ b/emulators/adamem/files/patch-X.c
@@ -0,0 +1,69 @@
+--- X.c.orig	Wed Sep 22 13:33:07 2004
++++ X.c	Wed Sep 22 13:33:49 2004
+@@ -1370,41 +1370,41 @@
+  return 2;
+ }
+ 
+-static void PutPixel32_0 (int offset,int c)
++FASTCALL static void PutPixel32_0 (int offset,int c)
+ {
+  *(unsigned*)(DisplayBuf+offset*4)=c;
+ }
+ 
+-static void PutPixel16_0 (int offset,int c)
++FASTCALL static void PutPixel16_0 (int offset,int c)
+ {
+  *(unsigned short*)(DisplayBuf+offset*2)=c;
+ }
+ 
+-static void PutPixel8_0 (int offset,int c)
++FASTCALL static void PutPixel8_0 (int offset,int c)
+ {
+  DisplayBuf[offset]=c;
+ }
+ 
+-static void PutPixel32_1 (int offset,int c)
++FASTCALL static void PutPixel32_1 (int offset,int c)
+ {
+  *(unsigned*)(DisplayBuf+offset*4*2)=
+  *(unsigned*)(DisplayBuf+offset*4*2+1)=
+  c;
+ }
+ 
+-static void PutPixel16_1 (int offset,int c)
++FASTCALL static void PutPixel16_1 (int offset,int c)
+ {
+  *(unsigned short*)(DisplayBuf+offset*2*2)=
+  *(unsigned short*)(DisplayBuf+offset*2*2+1)=
+  c;
+ }
+ 
+-static void PutPixel8_1 (int offset,int c)
++FASTCALL static void PutPixel8_1 (int offset,int c)
+ {
+  DisplayBuf[offset*2]=DisplayBuf[offset*2+1]=c;
+ }
+ 
+-static void PutPixel32_2 (int offset,int c)
++FASTCALL static void PutPixel32_2 (int offset,int c)
+ {
+  offset=(offset&0x00FF)+((offset&0xFF00)<<1);
+  *(unsigned*)(DisplayBuf+offset*4*2)=
+@@ -1412,7 +1412,7 @@
+  c;
+ }
+ 
+-static void PutPixel16_2 (int offset,int c)
++FASTCALL static void PutPixel16_2 (int offset,int c)
+ {
+  offset=(offset&0x00FF)+((offset&0xFF00)<<1);
+  *(unsigned short*)(DisplayBuf+offset*2*2)=
+@@ -1420,7 +1420,7 @@
+  c;
+ }
+ 
+-static void PutPixel8_2 (int offset,int c)
++FASTCALL static void PutPixel8_2 (int offset,int c)
+ {
+  offset=(offset&0x00FF)+((offset&0xFF00)<<1);
+  DisplayBuf[offset*2]=DisplayBuf[offset*2+1]=c;