- Support STAGEDIR

- Use standard file's layout
- Fix build with clang

5 files changed, 59 insertions, 25 deletions

diff --git a/emulators/adamem/Makefile b/emulators/adamem/Makefile
index 94be5be3f4cd..3c1195c1c347 100644
--- a/emulators/adamem/Makefile
+++ b/emulators/adamem/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	adamem
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.komkon.org/~dekogel/files/coleco/
 DISTNAME=	${PORTNAME}
@@ -13,22 +13,24 @@ COMMENT=	ADAMEm is a portable Coleco ADAM and ColecoVision emulator
 
 NO_WRKSUBDIR=	yes
 USE_XORG=	sm x11 xau xext xfixes xi xrandr
+
+MAKE_ARGS=	CC=${CC} LD=${CC}
 ALL_TARGET=	x
 
-PROGDIR=	${PREFIX}/${PORTNAME}
+OPTIONS_DEFINE=	DOCS
+
+post-patch:
+	@${REINPLACE_CMD} -e "s,%%DATADIR%%,${DATADIR}," ${WRKSRC}/ADAMEm.c \
+		${WRKSRC}/Coleco.c
 
-NO_STAGE=	yes
 do-install:
-	${MKDIR} ${PROGDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/adamem ${PROGDIR}
-	${LN} -s adamem ${PROGDIR}/cvem
-	${INSTALL_DATA} ${WRKSRC}/adamem.snd ${PROGDIR}
-	${INSTALL_DATA} ${WRKSRC}/OS7.rom ${PROGDIR}
-	${INSTALL_DATA} ${WRKSRC}/WP.rom ${PROGDIR}
-	${INSTALL_DATA} ${WRKSRC}/EOS.rom ${PROGDIR}
-.ifndef(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/adamem.txt ${DOCSDIR}
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/adamem ${STAGEDIR}${PREFIX}/bin
+	${LN} -s adamem ${STAGEDIR}${PREFIX}/bin/cvem
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+.for f in adamem.snd OS7.rom WP.rom EOS.rom
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DATADIR}
+.endfor
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/adamem.txt ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/emulators/adamem/files/patch-ADAMEm.c b/emulators/adamem/files/patch-ADAMEm.c
new file mode 100644
index 000000000000..fddf36fdbccf
--- /dev/null
+++ b/emulators/adamem/files/patch-ADAMEm.c
@@ -0,0 +1,10 @@
+Index: ADAMEm.c
+@@ -737,7 +737,7 @@
+  strcat (szJoystickFileName,"adamem.joy");
+ #ifdef SOUND
+  strcpy (szSoundFileName,ProgramPath);
+- strcat (szSoundFileName,"adamem.snd");
++ strcat (szSoundFileName,"%%DATADIR%%/adamem.snd");
+ #endif
+  LoadConfigFile (szTempFileName,MainConfigFile);
+  if (!ParseOptions(_argc,_argv))
diff --git a/emulators/adamem/files/patch-Coleco.c b/emulators/adamem/files/patch-Coleco.c
index 6236085d68da..3a42e136f080 100644
--- a/emulators/adamem/files/patch-Coleco.c
+++ b/emulators/adamem/files/patch-Coleco.c
@@ -1,5 +1,19 @@
---- Coleco.c.orig	Wed Sep 22 13:28:07 2004
-+++ Coleco.c	Wed Sep 22 13:32:20 2004
+Index: Coleco.c
+@@ -40,10 +40,10 @@
+ int  CheatCount;                  /* Number of cheats                       */
+ int  DiskSpeed=100;               /* Time in ms it takes to read one...     */
+ int  TapeSpeed=100;               /* ... block                              */
+-char *CartName   = "CART.rom";    /* Cartridge ROM file                     */
+-char *OS7File    = "OS7.rom";     /* ColecoVision ROM file                  */
+-char *EOSFile    = "EOS.rom";     /* EOS ROM file                           */
+-char *WPFile     = "WP.rom";      /* SmartWriter ROM file                   */
++char *CartName   = "%%DATADIR%%/CART.rom";    /* Cartridge ROM file                     */
++char *OS7File    = "%%DATADIR%%/OS7.rom";     /* ColecoVision ROM file                  */
++char *EOSFile    = "%%DATADIR%%/EOS.rom";     /* EOS ROM file                           */
++char *WPFile     = "%%DATADIR%%/WP.rom";      /* SmartWriter ROM file                   */
+ char *SoundName;                  /* Sound log file                         */
+ char *DiskName[4];                /* Disk images                            */
+ char *TapeName[4];                /* Tape images                            */
 @@ -616,7 +616,7 @@
   OutE0,OutE0,OutE0,OutE0,OutE0,OutE0,OutE0,OutE0
  };
diff --git a/emulators/adamem/files/patch-Z80IO.h b/emulators/adamem/files/patch-Z80IO.h
new file mode 100644
index 000000000000..789d76abf0e1
--- /dev/null
+++ b/emulators/adamem/files/patch-Z80IO.h
@@ -0,0 +1,9 @@
+Index: Z80IO.h
+@@ -11,7 +11,6 @@
+ /****************************************************************************/
+ 
+ #define INLINE_OP                     /* Inline Z80_RDOP()                  */
+-#define INLINE_MEM                    /* Inline Z80_RDMEM() and Z80_WRMEM() */
+ 
+ #ifdef __GNUC__
+ #define FASTCALL        __attribute__ ((regparm(3)))
diff --git a/emulators/adamem/pkg-plist b/emulators/adamem/pkg-plist
index 911400e019fd..6e1372153c5e 100644
--- a/emulators/adamem/pkg-plist
+++ b/emulators/adamem/pkg-plist
@@ -1,9 +1,8 @@
-adamem/adamem
-adamem/cvem
-adamem/adamem.snd
-adamem/OS7.rom
-adamem/WP.rom
-adamem/EOS.rom
-@dirrm adamem
-%%PORTDOCS%%share/doc/adamem/adamem.txt
-%%PORTDOCS%%@dirrm share/doc/adamem
+bin/adamem
+bin/cvem
+%%DATADIR%%/adamem.snd
+%%DATADIR%%/OS7.rom
+%%DATADIR%%/WP.rom
+%%DATADIR%%/EOS.rom
+%%PORTDOCS%%%%DOCSDIR%%/adamem.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%