From nobody Sun Feb 11 12:40:18 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TXnHQ5dxQz59f3T; Sun, 11 Feb 2024 12:40:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TXnHQ4m5tz4F8n; Sun, 11 Feb 2024 12:40:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707655218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+pkzzSjEOMDwNSimC8A7VfR14tAAtkieLghmx0BPGEo=; b=khpOIyuNR4XlwUZfFR3Q/DcnCGL5J4BQLSWj2N2DK3xDU71VS3Z6HP8xapcZ5V40Yh0+38 KjFfP/db6fop5r/rAV6q9llqw/AFaKrjDoWNAFNTg8NzezKwofdoyYgjfXBdtxETZFfTDp qQN1V+GzUajwzytxsZtohHoO5M00rfYMB/MHfYbiqyMjwZJcw9ibKVd26iZ5q5i24hxQcC 1k7UnQhxw9cyLs6OdGSZf9oRyyQWkc+rwcpKTUptB0bJ1jnSYO7Xuvi+OnuzQmTgcc5Y6p Fp9Uxy7wYSbVorpDlplvNI77PdDJLWGteTMZIgcXhZXDPhBT10blu0tyvgQZtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707655218; a=rsa-sha256; cv=none; b=qvCG71ntn0hwk94XwDx3vg3QV2VbF2teoeTrINWL8ZpRZvLFXNVk7Ojxued3a+ydm5CBXM AScKJlCQVh8FxOImJTna/pzjFM0x/RvLWHzYvWRacyka2mMO7rDFFFmTS8az8uMrIesb8h zasYv3oYTMUdof49AVKq30Bm13J7iBcXSox2RIm6dbWAaVItlA5VAZZBE0h0jBdfErnytU FMz/OuvuyewQisaVKeaHIBQGaF4dNIAHel1SvDswddh8yBMRzQJ7zBHfKAVyAhkvy8AQD6 U2I2REHe3altt7aJXTLcJbyw/RkaqovVRVkE/OMC3jc7PHg8LQ9xw6/igsxmxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707655218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+pkzzSjEOMDwNSimC8A7VfR14tAAtkieLghmx0BPGEo=; b=Hok21SebZ+PrbQzo5UFrO7zgieBgLYCNsAvhLqPjis4FWfF88/ImogGeTzS4MqRhL950mx Rpt2NvL7/NX2uZpIVSy9NYZcvjM8QunmIUXkItjyCYJWjXsB4DapMj4ZLgi+UFuqHKuQzk XKku72mFbH0uYwD/RuNy/ocd1KsEDgfnpbATQytAUthTz7J0EycrJthDYNPvgdaLe4qPN0 flA/ZpX5g1t4N0A1vWSf9lQTIHdWv9e8KCRAf8trvwH4C4EuEjoGk6vNxf2uaE2eq2GVg4 kUCRj5EWD9JFECf426jE8C2S9xsF+T9WiUpJQMhpOVjC7ZGP9iYWNS67kqHnIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TXnHQ3qJNz105h; Sun, 11 Feb 2024 12:40:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41BCeIn9079708; Sun, 11 Feb 2024 12:40:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41BCeItE079705; Sun, 11 Feb 2024 12:40:18 GMT (envelope-from git) Date: Sun, 11 Feb 2024 12:40:18 GMT Message-Id: <202402111240.41BCeItE079705@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Tijl Coosemans Subject: git: 9eac438c8dd4 - main - multimedia/dvd-slideshow: Update to 0.8.6-1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tijl X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9eac438c8dd4d2b90ac7a8804c2df14ee6395ff6 Auto-Submitted: auto-generated The branch main has been updated by tijl: URL: https://cgit.FreeBSD.org/ports/commit/?id=9eac438c8dd4d2b90ac7a8804c2df14ee6395ff6 commit 9eac438c8dd4d2b90ac7a8804c2df14ee6395ff6 Author: Phil Oleson AuthorDate: 2024-02-11 10:30:10 +0000 Commit: Tijl Coosemans CommitDate: 2024-02-11 12:34:45 +0000 multimedia/dvd-slideshow: Update to 0.8.6-1 Clean up Makefile. PR: 276508 --- multimedia/dvd-slideshow/Makefile | 36 ++++++--------- multimedia/dvd-slideshow/distinfo | 5 +- multimedia/dvd-slideshow/pkg-plist | 94 +++++++++++++++++++------------------- 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 - -.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 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