Attachment #248187 for bug #276780




PORTNAME=	cutmp3
DISTVERSIONPREFIX=	v
DISTVERSION=	3.0.3
CATEGORIES=	audio
MASTER_SITES=	http://www.puchalla-online.de/ \
		http://mirror.mcx2.org/

MAINTAINER=	matthew@matthewphillips.info
COMMENT=	Small and fast command line MP3 editor
WWW=		https://github.com/tarjanm-movidius/cutmp3

LICENSE=	GPLv2+
LICENSE_FILE=	${WRKSRC}/COPYING

USES=		readline
USE_GITHUB=	yes
GH_ACCOUNT=	tarjanm-movidius

PLIST_FILES=	bin/cutmp3 \
		share/man/man1/cutmp3.1.gz

PORTDOCS=	README README.timetable USAGE


Lines 1-2 Link Here

(-)b/audio/cutmp3/distinfo (-2 / +3 lines)
1	SHA256 (cutmp3-3.0.1.tar.bz2) = 7dc97fe8511e099a09e7107e573bd619ed527ada61fb24692c3963499c5b91b5	1	TIMESTAMP = 1706809820
2	SIZE (cutmp3-3.0.1.tar.bz2) = 48167	2	SHA256 (tarjanm-movidius-cutmp3-v3.0.3_GH0.tar.gz) = 7fde60cbf9c57b1697cb86f9f95d073dbabb4281df2a3899861e0bd1531cbd01
		3	SIZE (tarjanm-movidius-cutmp3-v3.0.3_GH0.tar.gz) = 55030




--- Makefile.orig	2024-02-04 14:15:09 UTC
+++ Makefile
@@ -3,37 +3,34 @@ DATADIR=${PREFIX}/share
 PREFIX?=/usr/local
 VERSION=3.0.1
-PREFIX=/usr
+PREFIX?=/usr/local
 BINDIR=${PREFIX}/bin
 DATADIR=${PREFIX}/share
-MANDIR=${PREFIX}/share/man/man1
+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 -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 -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

 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:
@@ -41,4 +38,4 @@ debug:
 	rm -f ${KDEDIR}/share/apps/konqueror/servicemenus/${NAME}.desktop
 
 debug:
-	gcc ${CFLAGS} -DDEBUG -g mpglib.c main.c -o ${NAME} -lm -lreadline
+	${CC} ${CFLAGS} -DDEBUG -g mpglib.c main.c -o ${NAME} -lm -lreadline
-	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
- 

Return to bug 276780

Lines 1-20 Link Here

(-)b/audio/cutmp3/Makefile (-8 / +9 lines)
1	PORTNAME= cutmp3	1	PORTNAME= cutmp3
2	PORTVERSION= 3.0.1	2	DISTVERSIONPREFIX= v
3	PORTREVISION= 2	3	DISTVERSION= 3.0.3
4	CATEGORIES= audio	4	CATEGORIES= audio
5	MASTER_SITES= http://www.puchalla-online.de/ \
6	http://mirror.mcx2.org/
7		5
8	MAINTAINER= ports@FreeBSD.org	6	MAINTAINER= matthew@matthewphillips.info
9	COMMENT= Small and fast command line MP3 editor	7	COMMENT= Small and fast command line MP3 editor
10	WWW= https://www.puchalla-online.de/cutmp3.html	8	WWW= https://github.com/tarjanm-movidius/cutmp3
11		9
12	LICENSE= GPLv2+	10	LICENSE= GPLv2+
13	LICENSE_FILE= ${WRKSRC}/COPYING	11	LICENSE_FILE= ${WRKSRC}/COPYING
14		12
15	USES= tar:bzip2 readline	13	USES= readline
		14	USE_GITHUB= yes
		15	GH_ACCOUNT= tarjanm-movidius
16		16
17	PLIST_FILES= bin/cutmp3 man/man1/cutmp3.1.gz	17	PLIST_FILES= bin/cutmp3 \
		18	share/man/man1/cutmp3.1.gz
18		19
19	PORTDOCS= README README.timetable USAGE	20	PORTDOCS= README README.timetable USAGE
20		21

Lines 1-33 Link Here

(-)b/audio/cutmp3/files/patch-Makefile (-31 / +28 lines)
1	--- Makefile.orig 2015-07-13 10:22:29 UTC	1	--- Makefile.orig 2024-02-04 14:15:09 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -1,42 +1,37 @@	3	@@ -3,37 +3,34 @@ DATADIR=${PREFIX}/share
4	NAME=cutmp3	4	PREFIX?=/usr/local
5	VERSION=3.0.1
6	-PREFIX=/usr
7	+PREFIX?=/usr/local
8	BINDIR=${PREFIX}/bin	5	BINDIR=${PREFIX}/bin
9	DATADIR=${PREFIX}/share	6	DATADIR=${PREFIX}/share
10	-MANDIR=${PREFIX}/share/man/man1	7	-MANDIR=${PREFIX}/share/man/man1
11	-DOCDIR=${DATADIR}/doc/${NAME}-${VERSION}	8	+MANDIR=${DATADIR}/man/man1
12	+MANDIR=${PREFIX}/man/man1	9	DOCDIR=${DATADIR}/doc/${NAME}-${VERSION}
13	+DOCDIR=${DATADIR}/doc/${NAME}	10	-CFLAGS?=-Wall -Wformat-security -Wunused-result
		11	+CFLAGS+=-Wall -Wformat-security -Wunused-result
		12	#CFLAGS+=-DDEBUG
14		13
15	all:	14	all:
16	- @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"	15	@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"
17	- gcc -O ${CFLAGS} -c mpglib.c	16	- gcc -O2 ${CFLAGS} -c mpglib.c
18	- gcc -O ${CFLAGS} -c main.c	17	- gcc -O2 ${CFLAGS} -c main.c
19	- gcc main.o mpglib.o -o ${NAME} -lm -lreadline -lncurses	18	- gcc main.o mpglib.o -o ${NAME} -lm -lreadline
20	+ ${CC} ${CFLAGS} ${CPPFLAGS} -c mpglib.c	19	+ ${CC} -O2 ${CFLAGS} ${CPPFLAGS} -c mpglib.c
21	+ ${CC} ${CFLAGS} ${CPPFLAGS} -c main.c	20	+ ${CC} -O2 ${CFLAGS} ${CPPFLAGS} -c main.c
22	+ ${CC} ${CFLAGS} main.o mpglib.o -o ${NAME} ${LDFLAGS} -lm -lreadline -lncurses	21	+ ${CC} ${CFLAGS} main.o mpglib.o -o ${NAME} ${LDFLAGS} -lm -lreadline
		22	#-lncurses
23		23
24	i386:	24	i386:
25	- gcc -Wall -O -c mpglib.c	25	- gcc -Wall -O2 -c mpglib.c
26	- gcc -Wall -O -c main.c	26	- gcc -Wall -O2 -c main.c
27	- gcc main.o mpglib.o -o ${NAME} -lm -lreadline -lncurses	27	- gcc main.o mpglib.o -o ${NAME} -lm -lreadline
28	+ cc -Wall -O -c mpglib.c	28	+ ${CC} -Wall -O2 ${CFLAGS} -c mpglib.c
29	+ cc -Wall -O -c main.c	29	+ ${CC} -Wall -O2 ${CFLAGS} -c main.c
30	+ cc main.o mpglib.o -o ${NAME} -lm -lreadline -lncurses	30	+ ${CC} main.o mpglib.o -o ${NAME} ${LDFLAGS} -lm -lreadline
31		31
32	clean:	32	clean:
33	rm -f *.o	33	rm -f *.o
Lines 36-60 Link Here
36	install:	36	install:
37	- install -d ${BINDIR}	37	- install -d ${BINDIR}
38	- install ${NAME} ${BINDIR}	38	- install ${NAME} ${BINDIR}
		39	- strip ${BINDIR}/${NAME}
39	+ install -d $(DESTDIR)${BINDIR}	40	+ install -d $(DESTDIR)${BINDIR}
40	+ install ${NAME} $(DESTDIR)${BINDIR}	41	+ install ${NAME} $(DESTDIR)${BINDIR}
		42	+ strip $(DESTDIR)${BINDIR}/${NAME}
41	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	43	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
42	- install -d ${DOCDIR}/${NAME}	44	- install -d ${DOCDIR}/${NAME}
43	- install -m 644 README* USAGE ${DOCDIR}/${NAME}	45	- install -m 644 README* USAGE ${DOCDIR}/${NAME}
44	- install -d ${MANDIR}	46	- install -d ${MANDIR}
45	gzip ${NAME}.1	47	gzip ${NAME}.1
46	- install -m 644 ${NAME}.1.gz ${MANDIR}	48	- install -m 644 ${NAME}.1.gz ${MANDIR}
47	- gunzip ${NAME}.1.gz
48	+ install -m 644 ${NAME}.1.gz $(DESTDIR)${MANDIR}	49	+ install -m 644 ${NAME}.1.gz $(DESTDIR)${MANDIR}
		50	gunzip ${NAME}.1.gz
49		51
50	uninstall:	52	uninstall:
51	rm -f ${BINDIR}/${NAME}	53	@@ -41,4 +38,4 @@ debug:
52	rm -f ${KDEDIR}/share/apps/konqueror/servicemenus/${NAME}.desktop	54	rm -f ${KDEDIR}/share/apps/konqueror/servicemenus/${NAME}.desktop
53		55
54	debug:	56	debug:
55	- gcc -g -Wall -O -c mpglib.c	57	- gcc ${CFLAGS} -DDEBUG -g mpglib.c main.c -o ${NAME} -lm -lreadline
56	- gcc -g -Wall -O -c main.c	58	+ ${CC} ${CFLAGS} -DDEBUG -g mpglib.c main.c -o ${NAME} -lm -lreadline
57	- gcc main.o mpglib.o -o ${NAME} -lm -lreadline -lncurses
58	+ cc -g -Wall -O -c mpglib.c
59	+ cc -g -Wall -O -c main.c
60	+ cc main.o mpglib.o -o ${NAME} -lm -lreadline -lncurses
61	-