git: 08ba640e253a - main - multimedia/dvbcut: fix Makefile style and remove redundant files

From: Stefan Eßer <se_at_FreeBSD.org>
Date: Sun, 05 Oct 2025 20:34:03 UTC
The branch main has been updated by se:

URL: https://cgit.FreeBSD.org/ports/commit/?id=08ba640e253a5503d3a31bb81dcf1515490679a1

commit 08ba640e253a5503d3a31bb81dcf1515490679a1
Author:     Stefan Eßer <se@FreeBSD.org>
AuthorDate: 2025-10-05 15:25:31 +0000
Commit:     Stefan Eßer <se@FreeBSD.org>
CommitDate: 2025-10-05 20:33:10 +0000

    multimedia/dvbcut: fix Makefile style and remove redundant files
    
    Fix style issues in the Makefile and do not install redundant icon
    files.
---
 multimedia/dvbcut/Makefile  | 33 ++++++++++++++++-----------------
 multimedia/dvbcut/pkg-plist | 20 +++++++++-----------
 2 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/multimedia/dvbcut/Makefile b/multimedia/dvbcut/Makefile
index 4a6b1def9874..afcecb344d35 100644
--- a/multimedia/dvbcut/Makefile
+++ b/multimedia/dvbcut/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	dvbcut
 PORTVERSION=	0.7.4
 DISTVERSIONPREFIX=	v
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	multimedia
 
 MAINTAINER=	se@FreeBSD.org
@@ -10,23 +10,24 @@ WWW=		https://github.com/bernhardu/dvbcut-deb/
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	mplayer:multimedia/mplayer \
-		ffmpeg:multimedia/ffmpeg
-LIB_DEPENDS=	liba52.so:audio/liba52 \
-		libao.so:audio/libao \
-		libmad.so:audio/libmad \
-		libavutil.so:multimedia/ffmpeg
+BUILD_DEPENDS=	ffmpeg:multimedia/ffmpeg \
+		mplayer:multimedia/mplayer
+LIB_DEPENDS=	libao.so:audio/libao \
+		libavutil.so:multimedia/ffmpeg \
+		libmad.so:audio/libmad
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		compiler:c++11-lang desktop-file-utils gl pkgconfig \
 		qmake:outsource qt:5 shared-mime-info
-
-USE_QT=		core gui widgets xml buildtools:build linguisttools:build
-USE_GL=		gl
 USE_GITHUB=	yes
 GH_ACCOUNT=	bernhardu
 GH_PROJECT=	dvbcut-deb
 GH_TAGNAME=	d7c8fad
+USE_GL=		gl
+USE_QT=		core gui widgets xml buildtools:build linguisttools:build
+
+QMAKE_ARGS=		LRELEASE="${LRELEASE}"
+QMAKE_SOURCE_PATH=	${WRKSRC}/src
 
 CXXFLAGS+=	-I${LOCALBASE}/include \
 		-I${LOCALBASE}/include/libavcodec \
@@ -34,9 +35,6 @@ CXXFLAGS+=	-I${LOCALBASE}/include \
 		-I${LOCALBASE}/include/libswscale \
 		-D DVBCUT_VERSION=${PORTVERSION}
 
-QMAKE_SOURCE_PATH=${WRKSRC}/src
-QMAKE_ARGS=	LRELEASE="${LRELEASE}"
-
 PORTSCOUT=	limit:^[^-]*$$
 
 post-build:
@@ -45,14 +43,15 @@ post-build:
 			> ${WRKSRC}/dvbcut.desktop
 
 do-install:
+		${MKDIR} ${STAGEDIR}${PREFIX}/share/dvbcut/applications/
+		${MKDIR} ${STAGEDIR}${PREFIX}/share/dvbcut/icons/
+		${MKDIR} ${STAGEDIR}${PREFIX}/share/mime/packages
 		${INSTALL_PROGRAM} ${WRKDIR}/.build/dvbcut ${STAGEDIR}${PREFIX}/bin/
 		${INSTALL_MAN} ${WRKSRC}/dvbcut.1 ${STAGEDIR}${PREFIX}/share/man/man1/
-		${MKDIR} ${STAGEDIR}${PREFIX}/share/applications
+		${INSTALL_DATA} ${WRKDIR}/.build/dvbcut*.qm ${STAGEDIR}${PREFIX}/share/dvbcut/
+		${INSTALL_DATA} ${WRKSRC}/src/dvbcut*.html ${STAGEDIR}${PREFIX}/share/dvbcut/
 		${INSTALL_DATA} ${WRKSRC}/dvbcut.desktop ${STAGEDIR}${PREFIX}/share/applications/
-		${MKDIR} ${STAGEDIR}${PREFIX}/share/dvbcut/icons/
 		${INSTALL_DATA} ${WRKSRC}/dvbcut.svg ${STAGEDIR}${PREFIX}/share/dvbcut/icons/
-		${INSTALL_DATA} ${WRKSRC}/icons/* ${STAGEDIR}${PREFIX}/share/dvbcut/icons/
-		${MKDIR} ${STAGEDIR}${PREFIX}/share/mime/packages
 		${INSTALL_DATA} ${WRKSRC}/dvbcut.xml ${STAGEDIR}${PREFIX}/share/mime/packages/
 
 .include <bsd.port.mk>
diff --git a/multimedia/dvbcut/pkg-plist b/multimedia/dvbcut/pkg-plist
index a60243d83580..5f6d74d1a757 100644
--- a/multimedia/dvbcut/pkg-plist
+++ b/multimedia/dvbcut/pkg-plist
@@ -1,14 +1,12 @@
 bin/dvbcut
 share/applications/dvbcut.desktop
-share/mime/packages/dvbcut.xml
-share/dvbcut/icons/icons.qrc
-share/dvbcut/icons/bookmark.png
-share/dvbcut/icons/chapter.svgz
-share/dvbcut/icons/dvbcut.svg
-share/dvbcut/icons/play.svgz
-share/dvbcut/icons/stop.png
-share/dvbcut/icons/play.png
-share/dvbcut/icons/bookmark.svgz
-share/dvbcut/icons/chapter.png
-share/dvbcut/icons/stop.svgz
+%%DATADIR%%/dvbcut.qm
+%%DATADIR%%/dvbcut_cs.html
+%%DATADIR%%/dvbcut_cs.qm
+%%DATADIR%%/dvbcut_de.html
+%%DATADIR%%/dvbcut_de.qm
+%%DATADIR%%/dvbcut_en.html
+%%DATADIR%%/icons/dvbcut.svg
 share/man/man1/dvbcut.1.gz
+share/mime/packages/dvbcut.xml
+@dir %%DATADIR%%/applications