Updated id3 to 1.0.0. 1.0.0 ----- - Development taken over by Peter Pentchev. - Import a Debian patch by Stefan Ott <stefan@ott.net> to avoid backquotes in the usage string. - Import a Debian patch by Stefan Ott <stefan@ott.net> and Peter Pentchev to let the compiler and linker flags be overridden. - Let the install program and the strip flag also be overridden. - Check some more functions' return values for errors. - Add some preprocessor and compiler flags to specify certain POSIX and C environment standards. - Reorder the #include statements. - Also include <strings.h> for strncasecmp(). - Mark the list of genres in genre.h as "const char". - Add a lot of GCC-specific compiler warning flags. - Use the err(3) and warn(3) functions, they're portable enough. - Mark several global variables as static. - Break the display of the ID3 tags out into a separate function. - Use "return" from main(), remove unreachable "break" statements. - Avoid possible out-of-bound copying when storing command-line arguments into the new tag structure. - Expect a C99 compiler and reduce the scope of some variables. - Use the C99 "bool" type for, well, boolean flags. - Convert the id3.1 manual page to the mdoc format. - Fix the fields length in the manual page - only the comment is limited to 28 characters, the rest of the text fields are at 30. - Use the more common "file..." instead of "file1 [file2 [file3...]]" - Fill in some commonly-used manual page sections. - Validate number-to-string conversions for the genre and track number. - Fix a signedness error in the track number display.diff -r1.11 -r1.12 pkgsrc/audio/id3/Makefile
(wiz)
@@ -1,15 +1,13 @@ | @@ -1,15 +1,13 @@ | |||
1 | # $NetBSD: Makefile,v 1.11 2016/04/20 12:10:26 nros Exp $ | 1 | # $NetBSD: Makefile,v 1.12 2016/08/24 09:59:31 wiz Exp $ | |
2 | 2 | |||
3 | DISTNAME= id3_0.15.orig | 3 | DISTNAME= id3-1.0.0 | |
4 | PKGNAME= id3-0.15 | |||
5 | CATEGORIES= audio | 4 | CATEGORIES= audio | |
6 | MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/i/id3/} | 5 | MASTER_SITES= https://devel.ringlet.net/files/audio/id3/ | |
6 | EXTRACT_SUFX= .tar.xz | |||
7 | 7 | |||
8 | MAINTAINER= pkgsrc-users@NetBSD.org | 8 | MAINTAINER= pkgsrc-users@NetBSD.org | |
9 | #HOMEPAGE= http://packages.qa.debian.org/i/id3.html | 9 | HOMEPAGE= https://devel.ringlet.net/audio/id3/ | |
10 | COMMENT= ID3 v1.1 tag editor | 10 | COMMENT= ID3 v1.1 tag editor | |
11 | LICENSE= gnu-gpl-v2 | 11 | LICENSE= gnu-gpl-v2 | |
12 | 12 | |||
13 | WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} | |||
14 | ||||
15 | .include "../../mk/bsd.pkg.mk" | 13 | .include "../../mk/bsd.pkg.mk" |
@@ -1,8 +1,8 @@ | @@ -1,8 +1,8 @@ | |||
1 | $NetBSD: distinfo,v 1.5 2015/11/03 01:12:35 agc Exp $ | 1 | $NetBSD: distinfo,v 1.6 2016/08/24 09:59:31 wiz Exp $ | |
2 | 2 | |||
3 | SHA1 (id3_0.15.orig.tar.gz) = 5095c2e8963071776adf10df92d94b3fa8934dd8 | 3 | SHA1 (id3-1.0.0.tar.xz) = 26bf0cd599f4754adb453189598df9ce68cce2ec | |
4 | RMD160 (id3_0.15.orig.tar.gz) = 85a84f94012971bd79828dee179ffe171fe2eb07 | 4 | RMD160 (id3-1.0.0.tar.xz) = 6616235d06c815357369cd339bb2f50579d9776e | |
5 | SHA512 (id3_0.15.orig.tar.gz) = b99f3608fc5494863ddf71b5d15505ea952453777090deb82ea469c1c8ed8cc794907d2fffcd4c5a0aaf6ede260103cd9e720e06244877934b22dfa88e1f2cd0 | 5 | SHA512 (id3-1.0.0.tar.xz) = 94e88c3a47118bdd2778cc64f5ea009d1a3a872431be945f0dab2f5cbd4b5c82dc61d39049ff1f528ab0f013ccd0e938a856d33d1bda5bc96ecfb9c4284a6e55 | |
6 | Size (id3_0.15.orig.tar.gz) = 12871 bytes | 6 | Size (id3-1.0.0.tar.xz) = 13596 bytes | |
7 | SHA1 (patch-aa) = 2c3b4f97300489ba7c2ff3d47cbb6654b00abb70 | 7 | SHA1 (patch-aa) = 48ded9b7447c8d10f56500ef20a52c5a4a587376 | |
8 | SHA1 (patch-ab) = e9343a34088e6ca9bbb0315399e9c8e604546c54 | 8 | SHA1 (patch-ab) = bab24712e77be69ca83dc2b22761a361fab30d60 |
@@ -1,39 +1,28 @@ | @@ -1,39 +1,28 @@ | |||
1 | $NetBSD: patch-aa,v 1.3 2008/11/24 12:04:15 obache Exp $ | 1 | $NetBSD: patch-aa,v 1.4 2016/08/24 09:59:31 wiz Exp $ | |
2 | 2 | |||
3 | --- Makefile.orig 2000-09-23 03:08:39.000000000 +0000 | 3 | --- Makefile.orig 2016-08-13 22:39:26.000000000 +0000 | |
4 | +++ Makefile | 4 | +++ Makefile | |
5 | @@ -3,17 +3,17 @@ VERSION = 0.13 | 5 | @@ -27,9 +27,9 @@ INSTALL ?= /usr/bin/install -c | |
6 | 6 | STRIP ?= -s | ||
7 | SHELL = /bin/sh | |||
8 | ||||
9 | -CC = gcc | |||
10 | -CFLAGS = -g -O2 | |||
11 | -LDFLAGS = | |||
12 | +#CC = gcc | |||
13 | +#CFLAGS = -g -O2 | |||
14 | +#LDFLAGS = | |||
15 | LIBS = | |||
16 | DEFS = | |||
17 | INSTALL = /usr/bin/install -c | |||
18 | 7 | |||
19 | # Installation directories | 8 | # Installation directories | |
20 | -prefix = ${DESTDIR}/usr | 9 | -prefix = ${DESTDIR}/usr | |
21 | +prefix = ${DESTDIR}${PREFIX} | 10 | +prefix = ${DESTDIR}${PREFIX} | |
22 | exec_prefix = ${prefix} | 11 | exec_prefix = ${prefix} | |
23 | -mandir = ${prefix}/share/man/man1 | 12 | -mandir = ${prefix}/share/man/man1 | |
24 | +mandir = ${prefix}/${PKGMANDIR}/man1 | 13 | +mandir = ${prefix}/${PKGMANDIR}/man1 | |
25 | bindir = ${exec_prefix}/bin | 14 | bindir = ${exec_prefix}/bin | |
26 | 15 | |||
27 | INCL = | 16 | INCL = | |
28 | @@ -34,7 +34,7 @@ clean: | 17 | @@ -50,7 +50,7 @@ clean: | |
29 | rm -f *~ *.o core $(PRODUCT) | 18 | rm -f *~ *.o core $(PRODUCT) | |
30 | 19 | |||
31 | install: $(PRODUCT) | 20 | install: $(PRODUCT) | |
32 | - $(INSTALL) -d -m 755 $(bindir) | 21 | - $(INSTALL) -d -m 755 $(bindir) | |
33 | - $(INSTALL) -s -m 755 -o 0 $(PRODUCT) $(bindir) | 22 | - $(INSTALL) $(STRIP) -m 755 -o 0 $(PRODUCT) $(bindir) | |
34 | - $(INSTALL) -d -m 755 $(mandir) | 23 | - $(INSTALL) -d -m 755 $(mandir) | |
35 | - $(INSTALL) -m 644 -o 0 $(PRODUCT).1 $(mandir) | 24 | - $(INSTALL) -m 644 -o 0 $(PRODUCT).1 $(mandir) | |
36 | + $(BSD_INSTALL_PROGRAM_DIR) $(bindir) | 25 | + $(BSD_INSTALL_PROGRAM_DIR) $(bindir) | |
37 | + $(BSD_INSTALL_PROGRAM) $(PRODUCT) $(bindir) | 26 | + $(BSD_INSTALL_PROGRAM) $(PRODUCT) $(bindir) | |
38 | + $(BSD_INSTALL_MAN_DIR) $(mandir) | 27 | + $(BSD_INSTALL_MAN_DIR) $(mandir) | |
39 | + $(BSD_INSTALL_MAN) $(PRODUCT).1 $(mandir) | 28 | + $(BSD_INSTALL_MAN) $(PRODUCT).1 $(mandir) |
@@ -1,12 +1,12 @@ | @@ -1,12 +1,12 @@ | |||
1 | $NetBSD: patch-ab,v 1.1 2003/12/23 18:11:19 sketch Exp $ | 1 | $NetBSD: patch-ab,v 1.2 2016/08/24 09:59:31 wiz Exp $ | |
2 | 2 | |||
3 | --- id3.c.orig 2003-12-23 12:32:28.874414092 +0000 | 3 | --- id3.c.orig 2016-08-13 22:39:26.000000000 +0000 | |
4 | +++ id3.c 2003-12-23 12:32:49.648359969 +0000 | 4 | +++ id3.c | |
5 | @@ -34,7 +34,6 @@ | 5 | @@ -18,7 +18,6 @@ | |
6 | 6 | #include <ctype.h> | ||
7 | #include <stdio.h> | 7 | #include <err.h> | |
8 | #include <stdlib.h> | |||
9 | -#include <getopt.h> | |||
10 | #include <errno.h> | 8 | #include <errno.h> | |
11 | #include <unistd.h> | 9 | -#include <getopt.h> | |
12 | #include <string.h> | 10 | #include <limits.h> | |
11 | #include <stdbool.h> | |||
12 | #include <stdio.h> |