I'm happy to take over maintainer for this port. Convert port to staged, also convert to new ports options Update to latest version of software from last month Fix: Patch supplied below. No new files. NOTE: this is still a restricted port as the ROM files are not redistributable. Tested with portlint and poudriere
Responsible Changed From-To: freebsd-ports-bugs->ak I'll take it.
State Changed From-To: open->closed Committed. Thanks!
Author: ak Date: Fri May 30 19:37:57 2014 New Revision: 355903 URL: http://svnweb.freebsd.org/changeset/ports/355903 QAT: https://qat.redports.org/buildarchive/r355903/ Log: - Update to 3.1.0 - Support STAGEDIR - Convert to OptionsNG - Convert to new LIB_DEPENDS syntax - Add license - Pass maintainership to submitter PR: ports/190392 Submitted by: Daniel Austin <freebsd-ports@dan.me.uk> (new maintainer) Modified: head/emulators/atari800/Makefile head/emulators/atari800/distinfo head/emulators/atari800/pkg-plist Modified: head/emulators/atari800/Makefile ============================================================================== --- head/emulators/atari800/Makefile Fri May 30 19:36:44 2014 (r355902) +++ head/emulators/atari800/Makefile Fri May 30 19:37:57 2014 (r355903) @@ -2,19 +2,20 @@ # $FreeBSD$ PORTNAME= atari800 -PORTVERSION= 2.0.3 -PORTREVISION= 5 +PORTVERSION= 3.1.0 CATEGORIES= emulators MASTER_SITES= SF SF/${PORTNAME}/ROM/Original%20XL%20ROM:x DISTFILES= ${DISTNAME}${EXTRACT_SUFX} xf25.zip:x DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= freebsd-ports@dan.me.uk COMMENT= Atari 8-bit computer emulator +LICENSE= GPLv2 + BUILD_DEPENDS= ${UNZIP_CMD}:${PORTSDIR}/archivers/unzip -LIB_DEPENDS= png15:${PORTSDIR}/graphics/png +LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png RESTRICTED= xf25 contains copyright ROMs and cannot be distributed. @@ -22,8 +23,18 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src USES= gmake GNU_CONFIGURE= yes +NO_OPTIONS_SORT=yes + +OPTIONS_DEFINE= DOCS SHM SDL SERIOSOUND CLIPSOUND PAGEDATTRIB BUFFEREDLOG VERYSLOW +OPTIONS_DEFAULT= SHM -MAN1= atari800.1 +SHM_DESC= X11 frontend with shared memory extensions +SDL_DESC= SDL frontend +SERIOSOUND_DESC=Serial in/out sound +CLIPSOUND_DESC= Sound clipping +PAGEDATTRIB_DESC=Page-based attribute array +BUFFEREDLOG_DESC=Buffered debug output (until graphics mode switches back to text mode) +VERYSLOW_DESC= Very slow computer support CFLAGS+= -I${LOCALBASE}/include/libpng LDFLAGS+= -L${LOCALBASE}/lib @@ -31,57 +42,31 @@ LDFLAGS+= -L${LOCALBASE}/lib ATARI_XF= ataribas.rom atariosb.rom atarixl.rom demos1.xfd \ demos2.xfd dos25.xfd mydos45d.atr -.if defined(WITH_SDL) +SERIOSOUND_CONFIGURE_ON= --enable-seriosound +CLIPSOUND_CONFIGURE_ON= --enable-cripsound +PAGEDATTRIB_CONFIGURE_ON= --enable-pagedattrib +BUFFEREDLOG_CONFIGURE_ON= --enable-bufferedlog +VERYSLOW_CONFIGURE_ON= --enable-veryslow + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MSDL} PKGNAMESUFFIX= -sdl USE_SDL= sdl CONFIGURE_ARGS+= --target=sdl .else USE_XORG= x11 xext -.if defined(WITHOUT_SHM) -CONFIGURE_ARGS+= --target=x11 -.else +.if ${PORT_OPTIONS:MSHM} CONFIGURE_ARGS+= --target=x11-shm +.else +CONFIGURE_ARGS+= --target=x11 .endif .endif -.if defined(WITH_SERIOSOUND) -CONFIGURE_ARGS+= --enable-seriosound -.endif - -.if defined(WITH_CLIPSOUND) -CONFIGURE_ARGS+= --enable-cripsound -.endif - -.if defined(WITH_PAGEDATTRIB) -CONFIGURE_ARGS+= --enable-pagedattrib -.endif - -.if defined(WITH_BUFFEREDLOG) -CONFIGURE_ARGS+= --enable-bufferedlog -.endif - -.if defined(WITH_VERYSLOW) -CONFIGURE_ARGS+= --enable-veryslow -.endif - -NO_STAGE= yes -pre-everything:: - @${ECHO_MSG} "" - @${ECHO_MSG} "Atari800 has the following tunable option(s):" - @${ECHO_MSG} " WITHOUT_SHM=yes Use X11 frontend without shared memory extensions" - @${ECHO_MSG} " WITH_SDL=yes Use SDL frontend" - @${ECHO_MSG} " WITH_SERIOSOUND=yes Use serial in/out sound" - @${ECHO_MSG} " WITH_CLIPSOUND=yes Use sound clipping" - @${ECHO_MSG} " WITH_PAGEDATTRIB=yes Use page-based attribute array" - @${ECHO_MSG} " WITH_BUFFEREDLOG=yes Use buffered debug output" - @${ECHO_MSG} " (until the graphics mode switches back to text mode)" - @${ECHO_MSG} " WITH_VERYSLOW=yes Use very slow computer support" - @${ECHO_MSG} " (use with the -refresh option)" - @${ECHO_MSG} "" - post-patch: @${CP} ${FILESDIR}/atari800.cfg ${WRKSRC} @${REINPLACE_CMD} -e 's|GUMBY|${DATADIR}|g' ${WRKSRC}/atari800.cfg + @${REINPLACE_CMD} -e 's|/etc|${DATADIR}|g' ${WRKSRC}/cfg.c @${REINPLACE_CMD} -e 's|/etc|${DATADIR}|g' ${WRKSRC}/atari.c @${REINPLACE_CMD} -e 's|sdl-config|$$SDL_CONFIG|g' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @@ -90,18 +75,16 @@ pre-configure: @${UNZIP_CMD} -q -L -o ${DISTDIR}/${DIST_SUBDIR}/xf25.zip ${ATARI_XF} -d ${WRKSRC} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/atari800 ${PREFIX}/bin/atari800 - ${INSTALL_MAN} ${WRKSRC}/atari800.man ${MANPREFIX}/man/man1/atari800.1 - @${MKDIR} ${DATADIR} - ${INSTALL_DATA} -m 644 ${WRKSRC}/atari800.cfg ${DATADIR} -.for file in ${ATARI_XF} - ${INSTALL_DATA} ${WRKSRC}/${file} ${DATADIR} + ${INSTALL_PROGRAM} ${WRKSRC}/atari800 ${STAGEDIR}${PREFIX}/bin/atari800 + ${INSTALL_MAN} ${WRKSRC}/atari800.man ${STAGEDIR}${MANPREFIX}/man/man1/atari800.1 + @${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/atari800.cfg ${STAGEDIR}${DATADIR} +.for rom in ${ATARI_XF} + ${INSTALL_DATA} ${WRKSRC}/${rom} ${STAGEDIR}${DATADIR} .endfor -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for file in BUGS CHANGES.OLD CREDITS ChangeLog FAQ INSTALL README TODO USAGE - ${INSTALL_DATA} ${WRKSRC}/../DOC/${file} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} +.for docfile in BUGS CHANGES.OLD CREDITS ChangeLog FAQ README TODO USAGE + ${INSTALL_DATA} ${WRKSRC}/../DOC/${docfile} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include <bsd.port.mk> Modified: head/emulators/atari800/distinfo ============================================================================== --- head/emulators/atari800/distinfo Fri May 30 19:36:44 2014 (r355902) +++ head/emulators/atari800/distinfo Fri May 30 19:37:57 2014 (r355903) @@ -1,4 +1,4 @@ -SHA256 (atari800/atari800-2.0.3.tar.gz) = 987a19c9a4ff483f9a84e165d24a881413adf5391d41ac9852cbb50a30d17966 -SIZE (atari800/atari800-2.0.3.tar.gz) = 998685 +SHA256 (atari800/atari800-3.1.0.tar.gz) = 901b02cce92ddb0b614f8034e6211f24cbfc2f8fb1c6581ba0097b1e68f91e0c +SIZE (atari800/atari800-3.1.0.tar.gz) = 1492289 SHA256 (atari800/xf25.zip) = 98ae0ad10413dd6f35ed80f5662dba6d790def70c7829046e52012a03b574b8a SIZE (atari800/xf25.zip) = 188942 Modified: head/emulators/atari800/pkg-plist ============================================================================== --- head/emulators/atari800/pkg-plist Fri May 30 19:36:44 2014 (r355902) +++ head/emulators/atari800/pkg-plist Fri May 30 19:37:57 2014 (r355903) @@ -1,4 +1,5 @@ bin/atari800 +man/man1/atari800.1.gz %%DATADIR%%/atari800.cfg %%DATADIR%%/ataribas.rom %%DATADIR%%/atariosb.rom @@ -12,7 +13,6 @@ bin/atari800 %%PORTDOCS%%%%DOCSDIR%%/CREDITS %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/FAQ -%%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TODO %%PORTDOCS%%%%DOCSDIR%%/USAGE _______________________________________________ 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"