multimedia/dvd-slideshow: Update to 0.8.6-1

Clean up Makefile.

PR:		276508

3 files changed, 65 insertions, 70 deletions

diff --git a/multimedia/dvd-slideshow/Makefile b/multimedia/dvd-slideshow/Makefile
index 4da35b96347c..748f10520749 100644
--- a/multimedia/dvd-slideshow/Makefile
+++ b/multimedia/dvd-slideshow/Makefile
@@ -1,16 +1,17 @@
 PORTNAME=	dvd-slideshow
-PORTVERSION=	0.8.4
-DISTVERSIONSUFFIX=	-1
-PORTREVISION=	12
+DISTVERSION=	0.8.6-1
 CATEGORIES=	multimedia
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}${DISTVERSIONSUFFIX} \
-		SF/${PORTNAME}/${PORTNAME}-themes/${THEMEVERSION}-1:themes
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTVERSION} \
+		SF/${PORTNAME}/${PORTNAME}-themes/${THEMEVERSION}:themes
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
-THEMEVERSION=	0.8.4
+THEMEVERSION=	0.8.4-1
 
 MAINTAINER=	oz@nixil.net
 COMMENT=	Script to create slideshow-style DVD with some simple menus
-WWW=		http://dvd-slideshow.sourceforge.net/
+WWW=		https://dvd-slideshow.sourceforge.net/
+
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 RUN_DEPENDS=	bash:shells/bash \
 		mpeg2enc:multimedia/mjpegtools \
@@ -28,31 +29,24 @@ NO_BUILD=	yes
 DATADIR=	${PREFIX}/share/apps/${PORTNAME}
 
 OPTIONS_DEFINE=	DOCS LAME THEMES TOOLAME VORBIS
+OPTIONS_SUB=	yes
+
 THEMES_DESC=	Install optional themes
 
 LAME_RUN_DEPENDS=	lame:audio/lame
-VORBIS_RUN_DEPENDS=	oggdec:audio/vorbis-tools
+THEMES_DISTFILES=	${PORTNAME}-themes-${THEMEVERSION}${EXTRACT_SUFX}:themes
 TOOLAME_RUN_DEPENDS=	toolame:audio/toolame
+VORBIS_RUN_DEPENDS=	oggdec:audio/vorbis-tools
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MTHEMES}
-DISTFILES+=	${PORTNAME}-themes-${THEMEVERSION}-1${EXTRACT_SUFX}:themes
-WRKSRC2=	${WRKDIR}/${PORTNAME}-themes-${THEMEVERSION}-1
-PLIST_SUB+=	NOTHEMES=""
-.else
-PLIST_SUB+=	NOTHEMES="@comment "
-.endif
+WRKSRC2=	${WRKDIR}/${PORTNAME}-themes-${THEMEVERSION}
 
 post-patch:
 .for f in dvd-slideshow dvd-menu dir2slideshow gallery1-to-slideshow jigl2slideshow
 	@${REINPLACE_CMD} -e 's|!/bin/bash|!${PREFIX}/bin/bash|g ; \
 		s|/usr/share/fonts/|${LOCALBASE}/share/fonts/|g ; \
 		s|seq |seq2 |g' ${WRKSRC}/${f}
-.  if ${PORT_OPTIONS:MTHEMES}
 	@${REINPLACE_CMD} -e 's|/opt/dvd-slideshow/themes|${DATADIR}/themes|g' \
 		${WRKSRC}/${f}
-.  endif
 .endfor
 
 do-install:
@@ -67,10 +61,10 @@ do-install:
 .for d in changelog gallery1-to-slideshow dir2slideshow jigl2slideshow dvd-menu dvd-slideshow
 	${INSTALL_DATA} ${WRKSRC}/doc/${d}.html ${STAGEDIR}${DOCSDIR}
 .endfor
-.if ${PORT_OPTIONS:MTHEMES}
+
+do-install-THEMES-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/themes
 	cd ${WRKSRC2} && ${FIND} . | ${CPIO} -dpmu -R ${BINOWN}:${BINGRP} \
 		--quiet ${STAGEDIR}${DATADIR}/themes
-.endif
 
 .include <bsd.port.mk>
diff --git a/multimedia/dvd-slideshow/distinfo b/multimedia/dvd-slideshow/distinfo
index 9ae838cdf7a8..7563e65af572 100644
--- a/multimedia/dvd-slideshow/distinfo
+++ b/multimedia/dvd-slideshow/distinfo
@@ -1,4 +1,5 @@
-SHA256 (dvd-slideshow-0.8.4-2.tar.gz) = 0587cbe4b39b415aec232ada3213b4352c3b9eecec82a64594f1deb8b14a809d
-SIZE (dvd-slideshow-0.8.4-2.tar.gz) = 162905
+TIMESTAMP = 1705047640
+SHA256 (dvd-slideshow-0.8.6-1.tar.gz) = 3424f53ac76a6bc2209f58d8f6995af589a804be9585ac4cde66592c7124acfc
+SIZE (dvd-slideshow-0.8.6-1.tar.gz) = 166490
 SHA256 (dvd-slideshow-themes-0.8.4-1.tar.gz) = 3a929836c9a4afbb3b134718ea548d0f562f48c52d0026ff7bc1b99bebc4d5a1
 SIZE (dvd-slideshow-themes-0.8.4-1.tar.gz) = 1225865
diff --git a/multimedia/dvd-slideshow/pkg-plist b/multimedia/dvd-slideshow/pkg-plist
index 89a5a70be435..e309086a6d7b 100644
--- a/multimedia/dvd-slideshow/pkg-plist
+++ b/multimedia/dvd-slideshow/pkg-plist
@@ -15,50 +15,50 @@ share/man/man1/jigl2slideshow.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/dvd-menu.html
 %%PORTDOCS%%%%DOCSDIR%%/dvd-slideshow.html
 %%PORTDOCS%%%%DOCSDIR%%/dvd-slideshowrc
-%%NOTHEMES%%%%DATADIR%%/themes/themes.readme.txt
-%%NOTHEMES%%%%DATADIR%%/themes/babyblue/thumbnail.jpg
-%%NOTHEMES%%%%DATADIR%%/themes/babyblue/bip.ttf
-%%NOTHEMES%%%%DATADIR%%/themes/babyblue/slide_thumbnail.jpg
-%%NOTHEMES%%%%DATADIR%%/themes/babyblue/bip.license.txt
-%%NOTHEMES%%%%DATADIR%%/themes/babyblue/babyblue.dvd-slideshow.theme
-%%NOTHEMES%%%%DATADIR%%/themes/babyblue/title_thumbnail.jpg
-%%NOTHEMES%%%%DATADIR%%/themes/babypink/thumbnail.jpg
-%%NOTHEMES%%%%DATADIR%%/themes/babypink/bip.ttf
-%%NOTHEMES%%%%DATADIR%%/themes/babypink/slide_thumbnail.jpg
-%%NOTHEMES%%%%DATADIR%%/themes/babypink/bip.license.txt
-%%NOTHEMES%%%%DATADIR%%/themes/babypink/title_thumbnail.jpg
-%%NOTHEMES%%%%DATADIR%%/themes/babypink/babypink.dvd-slideshow.theme
-%%NOTHEMES%%%%DATADIR%%/themes/default/thumbnail.jpg
-%%NOTHEMES%%%%DATADIR%%/themes/default/slide_thumbnail.jpg
-%%NOTHEMES%%%%DATADIR%%/themes/default/title_thumbnail.jpg
-%%NOTHEMES%%%%DATADIR%%/themes/default/default.dvd-slideshow.theme
-%%NOTHEMES%%%%DATADIR%%/themes/dinner/thumbnail.jpg
-%%NOTHEMES%%%%DATADIR%%/themes/dinner/journal.ttf
-%%NOTHEMES%%%%DATADIR%%/themes/dinner/slide_thumbnail.jpg
-%%NOTHEMES%%%%DATADIR%%/themes/dinner/journal.ttf.license.txt
-%%NOTHEMES%%%%DATADIR%%/themes/dinner/title_thumbnail.jpg
-%%NOTHEMES%%%%DATADIR%%/themes/dinner/dinner.readme.txt
-%%NOTHEMES%%%%DATADIR%%/themes/dinner/dinner_plate_menu.jpg
-%%NOTHEMES%%%%DATADIR%%/themes/dinner/dinner_plate_menu.jpg.license.txt
-%%NOTHEMES%%%%DATADIR%%/themes/dinner/tablecloth.jpg.license.txt
-%%NOTHEMES%%%%DATADIR%%/themes/dinner/dinner.dvd-slideshow.theme
-%%NOTHEMES%%%%DATADIR%%/themes/dinner/tablecloth.jpg
-%%NOTHEMES%%%%DATADIR%%/themes/travel/thumbnail.jpg
-%%NOTHEMES%%%%DATADIR%%/themes/travel/journal.ttf
-%%NOTHEMES%%%%DATADIR%%/themes/travel/america_map.jpg.license.txt
-%%NOTHEMES%%%%DATADIR%%/themes/travel/travel.readme.txt
-%%NOTHEMES%%%%DATADIR%%/themes/travel/parchment.jpg.license.txt
-%%NOTHEMES%%%%DATADIR%%/themes/travel/america_map.jpg
-%%NOTHEMES%%%%DATADIR%%/themes/travel/slide_thumbnail.jpg
-%%NOTHEMES%%%%DATADIR%%/themes/travel/journal.ttf.license.txt
-%%NOTHEMES%%%%DATADIR%%/themes/travel/title_thumbnail.jpg
-%%NOTHEMES%%%%DATADIR%%/themes/travel/travel.dvd-slideshow.theme
-%%NOTHEMES%%%%DATADIR%%/themes/travel/parchment.jpg
-%%NOTHEMES%%%%DATADIR%%/themes/wedding/thumbnail.jpg
-%%NOTHEMES%%%%DATADIR%%/themes/wedding/journal.ttf
-%%NOTHEMES%%%%DATADIR%%/themes/wedding/wedding_table_sepia.jpg.license.txt
-%%NOTHEMES%%%%DATADIR%%/themes/wedding/wedding_table_sepia.jpg
-%%NOTHEMES%%%%DATADIR%%/themes/wedding/wedding.dvd-slideshow.theme
-%%NOTHEMES%%%%DATADIR%%/themes/wedding/slide_thumbnail.jpg
-%%NOTHEMES%%%%DATADIR%%/themes/wedding/journal.ttf.license.txt
-%%NOTHEMES%%%%DATADIR%%/themes/wedding/title_thumbnail.jpg
+%%THEMES%%%%DATADIR%%/themes/themes.readme.txt
+%%THEMES%%%%DATADIR%%/themes/babyblue/thumbnail.jpg
+%%THEMES%%%%DATADIR%%/themes/babyblue/bip.ttf
+%%THEMES%%%%DATADIR%%/themes/babyblue/slide_thumbnail.jpg
+%%THEMES%%%%DATADIR%%/themes/babyblue/bip.license.txt
+%%THEMES%%%%DATADIR%%/themes/babyblue/babyblue.dvd-slideshow.theme
+%%THEMES%%%%DATADIR%%/themes/babyblue/title_thumbnail.jpg
+%%THEMES%%%%DATADIR%%/themes/babypink/thumbnail.jpg
+%%THEMES%%%%DATADIR%%/themes/babypink/bip.ttf
+%%THEMES%%%%DATADIR%%/themes/babypink/slide_thumbnail.jpg
+%%THEMES%%%%DATADIR%%/themes/babypink/bip.license.txt
+%%THEMES%%%%DATADIR%%/themes/babypink/title_thumbnail.jpg
+%%THEMES%%%%DATADIR%%/themes/babypink/babypink.dvd-slideshow.theme
+%%THEMES%%%%DATADIR%%/themes/default/thumbnail.jpg
+%%THEMES%%%%DATADIR%%/themes/default/slide_thumbnail.jpg
+%%THEMES%%%%DATADIR%%/themes/default/title_thumbnail.jpg
+%%THEMES%%%%DATADIR%%/themes/default/default.dvd-slideshow.theme
+%%THEMES%%%%DATADIR%%/themes/dinner/thumbnail.jpg
+%%THEMES%%%%DATADIR%%/themes/dinner/journal.ttf
+%%THEMES%%%%DATADIR%%/themes/dinner/slide_thumbnail.jpg
+%%THEMES%%%%DATADIR%%/themes/dinner/journal.ttf.license.txt
+%%THEMES%%%%DATADIR%%/themes/dinner/title_thumbnail.jpg
+%%THEMES%%%%DATADIR%%/themes/dinner/dinner.readme.txt
+%%THEMES%%%%DATADIR%%/themes/dinner/dinner_plate_menu.jpg
+%%THEMES%%%%DATADIR%%/themes/dinner/dinner_plate_menu.jpg.license.txt
+%%THEMES%%%%DATADIR%%/themes/dinner/tablecloth.jpg.license.txt
+%%THEMES%%%%DATADIR%%/themes/dinner/dinner.dvd-slideshow.theme
+%%THEMES%%%%DATADIR%%/themes/dinner/tablecloth.jpg
+%%THEMES%%%%DATADIR%%/themes/travel/thumbnail.jpg
+%%THEMES%%%%DATADIR%%/themes/travel/journal.ttf
+%%THEMES%%%%DATADIR%%/themes/travel/america_map.jpg.license.txt
+%%THEMES%%%%DATADIR%%/themes/travel/travel.readme.txt
+%%THEMES%%%%DATADIR%%/themes/travel/parchment.jpg.license.txt
+%%THEMES%%%%DATADIR%%/themes/travel/america_map.jpg
+%%THEMES%%%%DATADIR%%/themes/travel/slide_thumbnail.jpg
+%%THEMES%%%%DATADIR%%/themes/travel/journal.ttf.license.txt
+%%THEMES%%%%DATADIR%%/themes/travel/title_thumbnail.jpg
+%%THEMES%%%%DATADIR%%/themes/travel/travel.dvd-slideshow.theme
+%%THEMES%%%%DATADIR%%/themes/travel/parchment.jpg
+%%THEMES%%%%DATADIR%%/themes/wedding/thumbnail.jpg
+%%THEMES%%%%DATADIR%%/themes/wedding/journal.ttf
+%%THEMES%%%%DATADIR%%/themes/wedding/wedding_table_sepia.jpg.license.txt
+%%THEMES%%%%DATADIR%%/themes/wedding/wedding_table_sepia.jpg
+%%THEMES%%%%DATADIR%%/themes/wedding/wedding.dvd-slideshow.theme
+%%THEMES%%%%DATADIR%%/themes/wedding/slide_thumbnail.jpg
+%%THEMES%%%%DATADIR%%/themes/wedding/journal.ttf.license.txt
+%%THEMES%%%%DATADIR%%/themes/wedding/title_thumbnail.jpg