Attachment #106044 for bug #146596

View | Details | Raw Unified | Return to bug 146596
Collapse All | Expand All




#

PORTNAME=	id3v2
PORTVERSION=	0.1.12
CATEGORIES=	audio
MASTER_SITES=	SF

MAINTAINER=	sunpoet@sunpoet.net
COMMENT=	Command line id3v2 tag editor

LIB_DEPENDS=	id3-3.8.3:${PORTSDIR}/audio/id3lib

CPPFLAGS=	-I${LOCALBASE}/include -DHAVE_DECL_GETOPT=1
LDFLAGS=	-L${LOCALBASE}/lib
CFLAGS+=	${CPPFLAGS}
MAKE_ENV=	LDFLAGS="${LDFLAGS}"

MAN1=		id3v2.1
PLIST_FILES=	bin/id3v2

do-install:
		${INSTALL_PROGRAM} ${WRKSRC}/id3v2 ${PREFIX}/bin
		${INSTALL_MAN} ${WRKSRC}/id3v2.1 ${PREFIX}/man/man1

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)/usr/ports/sunpoet/id3v2/distinfo (-3 / +3 lines)
1	MD5 (id3v2-0.1.11.tar.gz) = 68afc3827cf01501dfb22949f901f1d8	1	MD5 (id3v2-0.1.12.tar.gz) = be91b4a41710b3a926e913a24ba0ed3b
2	SHA256 (id3v2-0.1.11.tar.gz) = a459652ba839db12d40ad29e4081aff04b569eb4a84edb845138cffa7d722603	2	SHA256 (id3v2-0.1.12.tar.gz) = 8105fad3189dbb0e4cb381862b4fa18744233c3bbe6def6f81ff64f5101722bf
3	SIZE (id3v2-0.1.11.tar.gz) = 52427	3	SIZE (id3v2-0.1.12.tar.gz) = 121476




--- Makefile.orig	2010-03-27 07:28:34.000000000 +0800
+++ Makefile	2010-05-15 02:52:55.000000000 +0800
@@ -1,20 +1,21 @@
-all: id3v2
+all:	clean id3v2
 
 VERSION=0.1.12
 
-PREFIX=	/opt/local
-CXXFLAGS+=	-Wall -I${PREFIX}/include/ -DVERSION="\"${VERSION}\"" #-DSORT_RUNTIME
-LDFLAGS+=	-L${PREFIX}/lib/ 
+#PREFIX=	/opt/local
+CXXFLAGS+=	-I${LOCALBASE}/include -DVERSION="\"${VERSION}\"" #-DSORT_RUNTIME
+LDFLAGS+=	-L${LOCALBASE}/lib
+MAKEOBJDIR=	${.CURDIR}	# ignore objwarn: in <bsd.obj.mk>
 
 id3v2:	convert.o list.o id3v2.o genre.o
-	${CXX} ${LDFLAGS} -pedantic -Wall -g -o $@ $^ -lz -lid3
-
-create_map: create_map.o
-	c++ -Wall -g -o $@ $^
+	${CXX} ${LDFLAGS} -lz -lid3 -o $@ $>
 
 create_map: create_map.o
 	${CXX} -Wall -g -o $@ $^
 
-install: all
-	install -c -s id3v2 ${PREFIX}/bin/id3v2
-	nroff -man id3v2.1 > ${PREFIX}/share/man/man1/id3v2.1
+install:
+	${BSD_INSTALL_PROGRAM} id3v2 ${PREFIX}/bin
+	${BSD_INSTALL_MAN} id3v2.1 ${PREFIX}/man/man1
 
 clean:
 	rm -f id3v2 create_map core *.o
@@ -25,4 +26,5 @@
 		--exclude=id3v2-${VERSION}/id3v2-${VERSION} \
 	ln -s . id3v2-${VERSION}
 	tar zhcf id3v2-${VERSION}.tar.gz  \
@@ -27,3 +21,4 @@
 		id3v2-${VERSION}
 	rm id3v2-${VERSION}
-	
+
+.include <bsd.prog.mk>

Return to bug 146596

Lines 6-30 Link Here

(-)/usr/ports/sunpoet/id3v2/Makefile (-11 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= id3v2	8	PORTNAME= id3v2
9	PORTVERSION= 0.1.11	9	PORTVERSION= 0.1.12
10	CATEGORIES= audio	10	CATEGORIES= audio
11	MASTER_SITES= SF	11	MASTER_SITES= SF
12		12
13	MAINTAINER= ports@FreeBSD.org	13	MAINTAINER= sunpoet@sunpoet.net
14	COMMENT= Command line id3v2 tag editor	14	COMMENT= Command line id3v2 tag editor
15		15
16	LIB_DEPENDS= id3-3.8.3:${PORTSDIR}/audio/id3lib	16	LIB_DEPENDS= id3-3.8.3:${PORTSDIR}/audio/id3lib
17		17
18	CPPFLAGS= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT=1
19	LDFLAGS= -L${LOCALBASE}/lib
20	CFLAGS+= ${CPPFLAGS}
21	MAKE_ENV= LDFLAGS="${LDFLAGS}"
22
23	MAN1= id3v2.1	18	MAN1= id3v2.1
24	PLIST_FILES= bin/id3v2	19	PLIST_FILES= bin/id3v2
25		20
26	do-install:
27	${INSTALL_PROGRAM} ${WRKSRC}/id3v2 ${PREFIX}/bin
28	${INSTALL_MAN} ${WRKSRC}/id3v2.1 ${PREFIX}/man/man1
29
30	.include <bsd.port.mk>	21	.include <bsd.port.mk>

Lines 1-36 Link Here

(-)/usr/ports/sunpoet/id3v2/files/patch-Makefile (-24 / +27 lines)
1	--- Makefile.orig Tue May 4 11:33:53 2004	1	--- Makefile.orig 2010-03-27 07:28:34.000000000 +0800
2	+++ Makefile Sun Mar 27 16:13:40 2005	2	+++ Makefile 2010-05-15 02:52:55.000000000 +0800
3	@@ -2,23 +2,17 @@	3	@@ -1,20 +1,21 @@
		4	-all: id3v2
		5	+all: clean id3v2
4		6
5	VERSION=0.1.11	7	VERSION=0.1.12
6		8
7	-PREFIX= /usr/local	9	-PREFIX= /opt/local
8	-CXXFLAGS+= -I${PREFIX}/include/ -DVERSION="\"${VERSION}\"" #-DSORT_RUNTIME	10	-CXXFLAGS+= -Wall -I${PREFIX}/include/ -DVERSION="\"${VERSION}\"" #-DSORT_RUNTIME
9	-LDFLAGS+= -L${PREFIX}/lib/	11	-LDFLAGS+= -L${PREFIX}/lib/
10	+PREFIX?= /usr/local	12	+#PREFIX= /opt/local
11	+CXXFLAGS+= -DVERSION="\"${VERSION}\"" #-DSORT_RUNTIME	13	+CXXFLAGS+= -I${LOCALBASE}/include -DVERSION="\"${VERSION}\"" #-DSORT_RUNTIME
12	+#LDFLAGS+= -L${PREFIX}/lib/	14	+LDFLAGS+= -L${LOCALBASE}/lib
		15	+MAKEOBJDIR= ${.CURDIR} # ignore objwarn: in <bsd.obj.mk>
13		16
14	id3v2: convert.o list.o id3v2.o genre.o	17	id3v2: convert.o list.o id3v2.o genre.o
15	- c++ ${LDFLAGS} -pedantic -Wall -lz -lid3 -g -o $@ $^	18	- ${CXX} ${LDFLAGS} -pedantic -Wall -g -o $@ $^ -lz -lid3
16	-
17	-create_map: create_map.o
18	- c++ -Wall -g -o $@ $^
19	+ ${CXX} ${LDFLAGS} -lz -lid3 -o $@ $>	19	+ ${CXX} ${LDFLAGS} -lz -lid3 -o $@ $>
20		20
21	install: all	21	create_map: create_map.o
		22	${CXX} -Wall -g -o $@ $^
		23
		24	-install: all
22	- install -c -s id3v2 ${PREFIX}/bin/id3v2	25	- install -c -s id3v2 ${PREFIX}/bin/id3v2
23	+ ${INSTALL} -c -s id3v2 ${PREFIX}/bin/id3v2	26	- nroff -man id3v2.1 > ${PREFIX}/share/man/man1/id3v2.1
24	nroff -man id3v2.1 > ${PREFIX}/man/man1/id3v2.1	27	+install:
		28	+ ${BSD_INSTALL_PROGRAM} id3v2 ${PREFIX}/bin
		29	+ ${BSD_INSTALL_MAN} id3v2.1 ${PREFIX}/man/man1
25		30
26	-clean:	31	clean:
27	- rm -f id3v2 create_map core *.o	32	rm -f id3v2 create_map core *.o
28	-	33	@@ -25,4 +26,5 @@
29	tarball:	34	--exclude=id3v2-${VERSION}/id3v2-${VERSION} \
30	ln -s . id3v2-${VERSION}
31	tar zhcf id3v2-${VERSION}.tar.gz \
32	@@ -27,3 +21,4 @@
33	id3v2-${VERSION}	35	id3v2-${VERSION}
34	rm id3v2-${VERSION}	36	rm id3v2-${VERSION}
35		37	-
		38	+
36	+.include <bsd.prog.mk>	39	+.include <bsd.prog.mk>