Date: Fri, 11 Apr 2014 12:03:52 +0000 (UTC) From: Alex Kozlov <ak@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r350928 - in head/emulators/adamem: . files Message-ID: <201404111203.s3BC3qF2014676@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ak Date: Fri Apr 11 12:03:51 2014 New Revision: 350928 URL: http://svnweb.freebsd.org/changeset/ports/350928 QAT: https://qat.redports.org/buildarchive/r350928/ Log: - Support STAGEDIR - Use standard file's layout - Fix build with clang Added: head/emulators/adamem/files/patch-ADAMEm.c (contents, props changed) head/emulators/adamem/files/patch-Z80IO.h (contents, props changed) Modified: head/emulators/adamem/Makefile head/emulators/adamem/files/patch-Coleco.c head/emulators/adamem/pkg-plist Modified: head/emulators/adamem/Makefile ============================================================================== --- head/emulators/adamem/Makefile Fri Apr 11 11:50:35 2014 (r350927) +++ head/emulators/adamem/Makefile Fri Apr 11 12:03:51 2014 (r350928) @@ -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 ADA 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> Added: head/emulators/adamem/files/patch-ADAMEm.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/adamem/files/patch-ADAMEm.c Fri Apr 11 12:03:51 2014 (r350928) @@ -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)) Modified: head/emulators/adamem/files/patch-Coleco.c ============================================================================== --- head/emulators/adamem/files/patch-Coleco.c Fri Apr 11 11:50:35 2014 (r350927) +++ head/emulators/adamem/files/patch-Coleco.c Fri Apr 11 12:03:51 2014 (r350928) @@ -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 }; Added: head/emulators/adamem/files/patch-Z80IO.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/adamem/files/patch-Z80IO.h Fri Apr 11 12:03:51 2014 (r350928) @@ -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))) Modified: head/emulators/adamem/pkg-plist ============================================================================== --- head/emulators/adamem/pkg-plist Fri Apr 11 11:50:35 2014 (r350927) +++ head/emulators/adamem/pkg-plist Fri Apr 11 12:03:51 2014 (r350928) @@ -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%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404111203.s3BC3qF2014676>