Attachment 248187 Details for Bug 276780 – Full patch for 3.0.3 upgrade to cutmp3

[patch] Full patch for 3.0.3 upgrade to cutmp3

0001-Upgrade-cutmp3-to-3.0.3.patch (text/plain), 5.47 KB, created by Matthew Phillips on 2024-02-04 18:48:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Phillips

Created: 2024-02-04 18:48:35 UTC

Size: 5.47 KB

patch

obsolete

>From 361d7122483a8726abcd0fc20056017faa2baffa Mon Sep 17 00:00:00 2001
>From: Matthew Phillips <matthew@matthewphillips.info>
>Date: Sun, 4 Feb 2024 18:45:44 +0000
>Subject: [PATCH] Upgrade cutmp3 to 3.0.3
>
>---
> audio/cutmp3/Makefile             | 17 ++++-----
> audio/cutmp3/distinfo             |  5 +--
> audio/cutmp3/files/patch-Makefile | 58 +++++++++++++++----------------
> 3 files changed, 40 insertions(+), 40 deletions(-)
>
>diff --git a/audio/cutmp3/Makefile b/audio/cutmp3/Makefile
>index 4e29ccddc..414f057d5 100644
>--- a/audio/cutmp3/Makefile
>+++ b/audio/cutmp3/Makefile
>@@ -1,20 +1,21 @@
> PORTNAME=	cutmp3
>-PORTVERSION=	3.0.1
>-PORTREVISION=	2
>+DISTVERSIONPREFIX=	v
>+DISTVERSION=	3.0.3
> CATEGORIES=	audio
>-MASTER_SITES=	http://www.puchalla-online.de/ \
>-		http://mirror.mcx2.org/
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	matthew@matthewphillips.info
> COMMENT=	Small and fast command line MP3 editor
>-WWW=		https://www.puchalla-online.de/cutmp3.html
>+WWW=		https://github.com/tarjanm-movidius/cutmp3
> 
> LICENSE=	GPLv2+
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USES=		tar:bzip2 readline
>+USES=		readline
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	tarjanm-movidius
> 
>-PLIST_FILES=	bin/cutmp3 man/man1/cutmp3.1.gz
>+PLIST_FILES=	bin/cutmp3 \
>+		share/man/man1/cutmp3.1.gz
> 
> PORTDOCS=	README README.timetable USAGE
> 
>diff --git a/audio/cutmp3/distinfo b/audio/cutmp3/distinfo
>index a7a814fec..6dc6f952d 100644
>--- a/audio/cutmp3/distinfo
>+++ b/audio/cutmp3/distinfo
>@@ -1,2 +1,3 @@
>-SHA256 (cutmp3-3.0.1.tar.bz2) = 7dc97fe8511e099a09e7107e573bd619ed527ada61fb24692c3963499c5b91b5
>-SIZE (cutmp3-3.0.1.tar.bz2) = 48167
>+TIMESTAMP = 1706809820
>+SHA256 (tarjanm-movidius-cutmp3-v3.0.3_GH0.tar.gz) = 7fde60cbf9c57b1697cb86f9f95d073dbabb4281df2a3899861e0bd1531cbd01
>+SIZE (tarjanm-movidius-cutmp3-v3.0.3_GH0.tar.gz) = 55030
>diff --git a/audio/cutmp3/files/patch-Makefile b/audio/cutmp3/files/patch-Makefile
>index 01b95c0bd..9f6585ca2 100644
>--- a/audio/cutmp3/files/patch-Makefile
>+++ b/audio/cutmp3/files/patch-Makefile
>@@ -1,33 +1,33 @@
>---- Makefile.orig	2015-07-13 10:22:29 UTC
>+--- Makefile.orig	2024-02-04 14:15:09 UTC
> +++ Makefile
>-@@ -1,42 +1,37 @@
>- NAME=cutmp3
>- VERSION=3.0.1
>--PREFIX=/usr
>-+PREFIX?=/usr/local
>+@@ -3,37 +3,34 @@ DATADIR=${PREFIX}/share
>+ PREFIX?=/usr/local
>  BINDIR=${PREFIX}/bin
>  DATADIR=${PREFIX}/share
> -MANDIR=${PREFIX}/share/man/man1
>--DOCDIR=${DATADIR}/doc/${NAME}-${VERSION}
>-+MANDIR=${PREFIX}/man/man1
>-+DOCDIR=${DATADIR}/doc/${NAME}
>++MANDIR=${DATADIR}/man/man1
>+ DOCDIR=${DATADIR}/doc/${NAME}-${VERSION}
>+-CFLAGS?=-Wall -Wformat-security -Wunused-result
>++CFLAGS+=-Wall -Wformat-security -Wunused-result
>+ #CFLAGS+=-DDEBUG
>  
>  all:
>--	@echo -e "\n\n*** You need readline-devel, ncurses-devel or similar to compile ${NAME} ***\n*** Maybe you want to try the binary on compile failures? ***\n\n"
>--	gcc -O ${CFLAGS} -c mpglib.c
>--	gcc -O ${CFLAGS} -c main.c
>--	gcc main.o mpglib.o -o ${NAME} -lm -lreadline -lncurses
>-+	${CC} ${CFLAGS} ${CPPFLAGS} -c mpglib.c
>-+	${CC} ${CFLAGS} ${CPPFLAGS} -c main.c
>-+	${CC} ${CFLAGS} main.o mpglib.o -o ${NAME} ${LDFLAGS} -lm -lreadline -lncurses
>+ 	@echo -e "\n\n*** You need readline-devel, ncurses-devel or similar to compile ${NAME} ***\n*** Maybe you want to try the binary on compile failures? ***\n\n"
>+-	gcc -O2 ${CFLAGS} -c mpglib.c
>+-	gcc -O2 ${CFLAGS} -c main.c
>+-	gcc main.o mpglib.o -o ${NAME} -lm -lreadline
>++	${CC} -O2 ${CFLAGS} ${CPPFLAGS} -c mpglib.c
>++	${CC} -O2 ${CFLAGS} ${CPPFLAGS} -c main.c
>++	${CC} ${CFLAGS} main.o mpglib.o -o ${NAME} ${LDFLAGS} -lm -lreadline
>+ #-lncurses
>  
>  i386:
>--	gcc -Wall -O -c mpglib.c
>--	gcc -Wall -O -c main.c
>--	gcc main.o mpglib.o -o ${NAME} -lm -lreadline -lncurses
>-+	cc -Wall -O -c mpglib.c
>-+	cc -Wall -O -c main.c
>-+	cc main.o mpglib.o -o ${NAME} -lm -lreadline -lncurses
>+-	gcc -Wall -O2 -c mpglib.c
>+-	gcc -Wall -O2 -c main.c
>+-	gcc main.o mpglib.o -o ${NAME} -lm -lreadline
>++	${CC} -Wall -O2 ${CFLAGS} -c mpglib.c
>++	${CC} -Wall -O2 ${CFLAGS} -c main.c
>++	${CC} main.o mpglib.o -o ${NAME} ${LDFLAGS} -lm -lreadline
>  
>  clean:
>  	rm -f *.o
>@@ -36,25 +36,23 @@
>  install:
> -	install -d ${BINDIR}
> -	install ${NAME} ${BINDIR}
>+-	strip ${BINDIR}/${NAME}
> +	install -d $(DESTDIR)${BINDIR}
> +	install ${NAME} $(DESTDIR)${BINDIR}
>++	strip $(DESTDIR)${BINDIR}/${NAME}
>  	if [ ! -z "${KDEDIR}" ]; then install -m 644 ${NAME}.desktop ${KDEDIR}/share/apps/konqueror/servicemenus; elif [ -d /usr/share/apps/konqueror/servicemenus ]; then install -m 644 ${NAME}.desktop /usr/share/apps/konqueror/servicemenus; elif [ -d /opt/kde/share/apps/konqueror/servicemenus ]; then install -m 644 ${NAME}.desktop /opt/kde/share/apps/konqueror/servicemenus; elif [ -d /opt/kde3/share/apps/konqueror/servicemenus ]; then install -m 644 ${NAME}.desktop /opt/kde3/share/apps/konqueror/servicemenus; fi
> -	install -d ${DOCDIR}/${NAME}
> -	install -m 644 README* USAGE ${DOCDIR}/${NAME}
> -	install -d ${MANDIR}
>  	gzip ${NAME}.1
> -	install -m 644 ${NAME}.1.gz ${MANDIR}
>--	gunzip ${NAME}.1.gz
> +	install -m 644 ${NAME}.1.gz $(DESTDIR)${MANDIR}
>+ 	gunzip ${NAME}.1.gz
>  
>  uninstall:
>- 	rm -f ${BINDIR}/${NAME}
>+@@ -41,4 +38,4 @@ debug:
>  	rm -f ${KDEDIR}/share/apps/konqueror/servicemenus/${NAME}.desktop
>  
>  debug:
>--	gcc -g -Wall -O -c mpglib.c
>--	gcc -g -Wall -O -c main.c
>--	gcc main.o mpglib.o -o ${NAME} -lm -lreadline -lncurses
>-+	cc -g -Wall -O -c mpglib.c
>-+	cc -g -Wall -O -c main.c
>-+	cc main.o mpglib.o -o ${NAME} -lm -lreadline -lncurses
>+-	gcc ${CFLAGS} -DDEBUG -g mpglib.c main.c -o ${NAME} -lm -lreadline
>++	${CC} ${CFLAGS} -DDEBUG -g mpglib.c main.c -o ${NAME} -lm -lreadline
>-- 
>2.43.0
>

Actions: View | Diff

Attachments on bug 276780: 248137 | 248185 | 248187 | 248188