- Update to 4.6.1

- While here, add LICENSE and switch to options helpers

PR:		202500
Submitted by:	maxclsb@gmail.com
Approved by:	maintainer timeout (acm, 7 months)

3 files changed, 64 insertions, 63 deletions

diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile
index ea024a706be4..883281e7f350 100644
--- a/emulators/stella/Makefile
+++ b/emulators/stella/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	stella
-PORTVERSION=	3.9.3
-PORTREVISION=	3
+PORTVERSION=	4.6.1
 CATEGORIES=	emulators
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -11,12 +10,15 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Multi-platform Atari 2600 VCS emulator
 
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/License.txt
+
 LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USE_SDL=	sdl
-USES=		gmake
+USE_SDL=	sdl2
+USES=		compiler:c++11-lib gmake
 HAS_CONFIGURE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -24,16 +26,13 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	DOCS
 
-post-patch:
-	@${REINPLACE_CMD} -e \
-		's|=sdl-config|="$$SDL_CONFIG"|g' ${WRKSRC}/configure
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/stella ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/src/emucore/stella.pro ${STAGEDIR}${DATADIR}
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC}/docs && ${FIND} . | \
-		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR}
+	@cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/emulators/stella/distinfo b/emulators/stella/distinfo
index 5aeb6d042337..537425cc44a3 100644
--- a/emulators/stella/distinfo
+++ b/emulators/stella/distinfo
@@ -1,2 +1,2 @@
-SHA256 (stella-3.9.3-src.tar.gz) = 8b343084c7aadb41e5aeada996c1c979c6e42d99aa10131e7870308e509362eb
-SIZE (stella-3.9.3-src.tar.gz) = 2291912
+SHA256 (stella-4.6.1-src.tar.gz) = c1921671dbc08422ae8a7a4102c6a2a34433f04594d67f55a7129c1504bcd288
+SIZE (stella-4.6.1-src.tar.gz) = 2285249
diff --git a/emulators/stella/pkg-plist b/emulators/stella/pkg-plist
index ee3dfed0898c..3fbdc918af70 100644
--- a/emulators/stella/pkg-plist
+++ b/emulators/stella/pkg-plist
@@ -1,55 +1,57 @@
 bin/stella
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/graphics/space_invaders.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/select_romdir.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/secret_quest.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/rominfo_2x_small.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/rominfo_1x_small.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/rominfo_1x_large.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/romaudit.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/rom_browser.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/pacman.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/options_video_tv.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/options_video.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/options_ui.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/options_misc.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/options_input.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/options_gameinfo.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/options_debugger.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/options_audio.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/options.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/logs.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/launcher_override.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/launcher_options_snapshots.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/launcher_options_files.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/launcher_filter.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/launcher.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/jr_pacman.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/eventmapping_remap.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/eventmapping_devsports.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/eventmapping_combo.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/eventmapping.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/developer_stats.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/debugger_tiazoomcmenu.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/debugger_tiatab.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/debugger_tiaoutcmenu.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/debugger_tiainfo.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/debugger_romcmenu.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/debugger_rom.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/debugger_ramsearch.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/debugger_ram.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/debugger_main.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/debugger_iotab.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/debugger_globalbuttons.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/debugger_dataops.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/debugger_cpuregs.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/debugger_bpstatus.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/debugger_banksimple.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/debugger_bankcomplex.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/chucky_cheese.png
+%%PORTDOCS%%%%DOCSDIR%%/debugger.html
 %%PORTDOCS%%%%DOCSDIR%%/graphics/cheat.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/console.png
-%%PORTDOCS%%%%DOCSDIR%%/graphics/commandmenu.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/chucky_cheese.png
 %%PORTDOCS%%%%DOCSDIR%%/graphics/circuit.png
-%%PORTDOCS%%%%DOCSDIR%%/debugger.html
+%%PORTDOCS%%%%DOCSDIR%%/graphics/commandmenu.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/console.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/debugger_bankcomplex.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/debugger_banksimple.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/debugger_bpstatus.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/debugger_cpuregs.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/debugger_dataops.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/debugger_globalbuttons.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/debugger_iotab.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/debugger_main.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/debugger_ram-dpc.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/debugger_ram-f8sc.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/debugger_ram.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/debugger_ramsearch.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/debugger_rom.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/debugger_romcmenu.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/debugger_tiainfo.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/debugger_tiaoutcmenu.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/debugger_tiatab.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/debugger_tiazoomcmenu.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/developer_stats.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/eventmapping.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/eventmapping_combo.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/eventmapping_devsports.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/eventmapping_remap.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/jr_pacman.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/launcher.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/launcher_filter.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/launcher_options_files.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/launcher_options_snapshots.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/launcher_override.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/logs.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/options.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/options_audio.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/options_debugger.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/options_gameinfo.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/options_input.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/options_misc.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/options_ui.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/options_video.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/options_video_tv.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/pacman.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/rom_browser.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/romaudit.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/rominfo_1x_large.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/rominfo_1x_small.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/rominfo_2x_small.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/secret_quest.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/select_romdir.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/space_invaders.png
+%%PORTDOCS%%%%DOCSDIR%%/index.html
 %%DATADIR%%/stella.pro