Attachment 143223 Details for Bug 190392 – 20140529-atari800.diff

[patch] 20140529-atari800.diff

20140529-atari800.diff (text/plain), 5.57 KB, created by Daniel Austin on 2014-05-29 23:20:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Austin

Created: 2014-05-29 23:20:00 UTC

Size: 5.57 KB

patch

obsolete

>diff -ruN atari800.orig/Makefile atari800/Makefile
>--- atari800.orig/Makefile	2014-05-26 14:13:46.000000000 +0100
>+++ atari800/Makefile	2014-05-29 22:39:24.953411269 +0100
>@@ -2,19 +2,20 @@
> # $FreeBSD: head/emulators/atari800/Makefile 355332 2014-05-26 13:13:46Z miwi $
> 
> 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 @@
> 
> 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,45 @@
> ATARI_XF=	ataribas.rom atariosb.rom atarixl.rom demos1.xfd \
> 		demos2.xfd dos25.xfd mydos45d.atr
> 
>-.if defined(WITH_SDL)
>+.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)
>+.if ${PORT_OPTIONS:MSERIOSOUND}
> CONFIGURE_ARGS+=	--enable-seriosound
> .endif
> 
>-.if defined(WITH_CLIPSOUND)
>+.if ${PORT_OPTIONS:MCLIPSOUND}
> CONFIGURE_ARGS+=	--enable-cripsound
> .endif
> 
>-.if defined(WITH_PAGEDATTRIB)
>+.if ${PORT_OPTIONS:MPAGEDATTRIB}
> CONFIGURE_ARGS+=	--enable-pagedattrib
> .endif
> 
>-.if defined(WITH_BUFFEREDLOG)
>+.if ${PORT_OPTIONS:MBUFFEREDLOG}
> CONFIGURE_ARGS+=	--enable-bufferedlog
> .endif
> 
>-.if defined(WITH_VERYSLOW)
>+.if ${PORT_OPTIONS:MVERYSLOW}
> 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,17 +89,17 @@
> 	@${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}
>+.if ${PORT_OPTIONS:MDOCS}
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>+.for docfile in BUGS CHANGES.OLD CREDITS ChangeLog FAQ INSTALL README TODO USAGE
>+	${INSTALL_DATA} ${WRKSRC}/../DOC/${docfile} ${STAGEDIR}${DOCSDIR}
> .endfor
> .endif
> 
>diff -ruN atari800.orig/distinfo atari800/distinfo
>--- atari800.orig/distinfo	2014-01-22 15:30:13.000000000 +0000
>+++ atari800/distinfo	2014-05-29 22:13:38.065536643 +0100
>@@ -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
>diff -ruN atari800.orig/pkg-plist atari800/pkg-plist
>--- atari800.orig/pkg-plist	2014-01-22 15:16:56.000000000 +0000
>+++ atari800/pkg-plist	2014-05-29 21:12:53.649772481 +0100
>@@ -1,4 +1,5 @@
> bin/atari800
>+man/man1/atari800.1.gz
> %%DATADIR%%/atari800.cfg
> %%DATADIR%%/ataribas.rom
> %%DATADIR%%/atariosb.rom

Actions: View | Diff

Attachments on bug 190392: 143223