Thu Feb 17 13:54:13 2011 UTC ()
Update to 20110101.

Changelog is too long to include.
See CHANGES file.


(ryoon)
diff -r1.7 -r1.8 pkgsrc/audio/abcmidi/Makefile
diff -r1.2 -r1.3 pkgsrc/audio/abcmidi/PLIST
diff -r1.2 -r1.3 pkgsrc/audio/abcmidi/distinfo
diff -r1.2 -r1.3 pkgsrc/audio/abcmidi/patches/patch-aa
diff -r1.1 -r1.2 pkgsrc/audio/abcmidi/patches/patch-ab
diff -r1.1 -r1.2 pkgsrc/audio/abcmidi/patches/patch-ac
cvs diff -r1.7 -r1.8 pkgsrc/audio/abcmidi/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/abcmidi/Makefile 2009/10/10 08:33:24 1.7
+++ pkgsrc/audio/abcmidi/Makefile 2011/02/17 13:54:12 1.8
@@ -1,47 +1,36 @@ @@ -1,47 +1,36 @@
1# $NetBSD: Makefile,v 1.7 2009/10/10 08:33:24 wiz Exp $ 1# $NetBSD: Makefile,v 1.8 2011/02/17 13:54:12 ryoon Exp $
2# 2#
3 3
4DISTNAME= abcMIDI-${ABCMIDIVER} 4DISTNAME= abcMIDI-${ABCMIDIVER}
5PKGNAME= abcmidi-${ABCMIDIVER:S/-//g} 5PKGNAME= abcmidi-${ABCMIDIVER:S/-//g}
6CATEGORIES= audio 6CATEGORIES= audio
7MASTER_SITES= http://ifdo.pugmarks.com/~seymour/runabc/ 7MASTER_SITES= http://ifdo.ca/~seymour/runabc/
8EXTRACT_SUFX= .zip 8EXTRACT_SUFX= .zip
9WRKSRC= ${WRKDIR}/abcmidi 
10MAKE_FILE= makefile 
11 9
12MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= http://abc.sourceforge.net/abcMIDI/ 11HOMEPAGE= http://abc.sourceforge.net/abcMIDI/
14COMMENT= Music utilities for abc 12COMMENT= Music utilities for abc
 13LICENSE= gnu-gpl-v2
15 14
16ABCMIDIVER= 2006-04-22 15ABCMIDIVER= 2011-01-01
17 16
18PKG_DESTDIR_SUPPORT= user-destdir 17PKG_DESTDIR_SUPPORT= user-destdir
19 18
20INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 \ 19INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 \
21 share/doc/abcmidi/programming share/examples/abcmidi 20 share/doc/${PKGBASE}/programming \
 21 share/examples/${PKGBASE}
 22
 23WRKSRC= ${WRKDIR}/abcmidi
 24MAKE_FILE= makefile
 25INSTALL_MAKE_FLAGS+= prefix=${PREFIX}
22 26
23do-install: 27post-install:
24 cd ${WRKSRC} && ${INSTALL_PROGRAM} abc2abc abc2midi mftext \ 
25 midi2abc midicopy yaps ${DESTDIR}${PREFIX}/bin 
26 ${INSTALL_DATA} ${WRKSRC}/demo.abc \ 
27 ${DESTDIR}${PREFIX}/share/examples/abcmidi 
28 cd ${WRKSRC}/doc && ${INSTALL_DATA} AUTHORS CHANGES \ 
29 abcguide.txt abcmatch.txt gpl.txt history.txt readme.txt \ 
30 yapshelp.txt ${DESTDIR}${PREFIX}/share/doc/abcmidi 
31 cd ${WRKSRC}/doc/programming && ${INSTALL_DATA} abc2midi.txt \ 28 cd ${WRKSRC}/doc/programming && ${INSTALL_DATA} abc2midi.txt \
32 coding.txt midi2abc.txt split.abc yaps.txt \ 29 coding.txt midi2abc.txt split.abc yaps.txt \
33 ${DESTDIR}${PREFIX}/share/doc/abcmidi/programming 30 ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}/programming
34 ${INSTALL_MAN} ${WRKSRC}/doc/abc2abc.1 \ 31 cd ${WRKSRC}/samples && ${INSTALL_DATA} araber.abc baym_rebin.abc \
35 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 32 boys.abc coleraine.abc daramud.abc demo.abc dergasn.abc \
36 ${INSTALL_MAN} ${WRKSRC}/doc/abc2midi.1 \ 33 drums.abc \
37 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 34 ${DESTDIR}${PREFIX}/share/examples/${PKGBASE}
38 ${INSTALL_MAN} ${WRKSRC}/doc/mftext.1 \ 
39 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 
40 ${INSTALL_MAN} ${WRKSRC}/doc/midi2abc.1 \ 
41 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 
42 ${INSTALL_MAN} ${WRKSRC}/doc/midicopy.1 \ 
43 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 
44 ${INSTALL_MAN} ${WRKSRC}/doc/yaps.1 \ 
45 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 
46 35
47.include "../../mk/bsd.pkg.mk" 36.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/audio/abcmidi/PLIST (expand / switch to unified diff)

--- pkgsrc/audio/abcmidi/PLIST 2009/06/14 17:32:01 1.2
+++ pkgsrc/audio/abcmidi/PLIST 2011/02/17 13:54:12 1.3
@@ -1,27 +1,36 @@ @@ -1,27 +1,36 @@
1@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:32:01 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.3 2011/02/17 13:54:12 ryoon Exp $
2bin/abc2abc 2bin/abc2abc
3bin/abc2midi 3bin/abc2midi
 4bin/abcmatch
4bin/mftext 5bin/mftext
5bin/midi2abc 6bin/midi2abc
6bin/midicopy 7bin/midicopy
7bin/yaps 8bin/yaps
 9man/man1/abc2abc.1
 10man/man1/abc2midi.1
 11man/man1/mftext.1
 12man/man1/midi2abc.1
 13man/man1/midicopy.1
 14man/man1/yaps.1
8share/doc/abcmidi/AUTHORS 15share/doc/abcmidi/AUTHORS
9share/doc/abcmidi/CHANGES 16share/doc/abcmidi/CHANGES
 17share/doc/abcmidi/VERSION
10share/doc/abcmidi/abcguide.txt 18share/doc/abcmidi/abcguide.txt
11share/doc/abcmidi/abcmatch.txt 19share/doc/abcmidi/abcmatch.txt
12share/doc/abcmidi/gpl.txt 20share/doc/abcmidi/gpl.txt
13share/doc/abcmidi/history.txt 21share/doc/abcmidi/history.txt
14share/doc/abcmidi/readme.txt 
15share/doc/abcmidi/yapshelp.txt 
16share/doc/abcmidi/programming/abc2midi.txt 22share/doc/abcmidi/programming/abc2midi.txt
17share/doc/abcmidi/programming/coding.txt 23share/doc/abcmidi/programming/coding.txt
18share/doc/abcmidi/programming/midi2abc.txt 24share/doc/abcmidi/programming/midi2abc.txt
19share/doc/abcmidi/programming/split.abc 25share/doc/abcmidi/programming/split.abc
20share/doc/abcmidi/programming/yaps.txt 26share/doc/abcmidi/programming/yaps.txt
 27share/doc/abcmidi/readme.txt
 28share/doc/abcmidi/yapshelp.txt
 29share/examples/abcmidi/araber.abc
 30share/examples/abcmidi/baym_rebin.abc
 31share/examples/abcmidi/boys.abc
 32share/examples/abcmidi/coleraine.abc
 33share/examples/abcmidi/daramud.abc
21share/examples/abcmidi/demo.abc 34share/examples/abcmidi/demo.abc
22man/man1/abc2abc.1 35share/examples/abcmidi/dergasn.abc
23man/man1/abc2midi.1 36share/examples/abcmidi/drums.abc
24man/man1/mftext.1 
25man/man1/midi2abc.1 
26man/man1/midicopy.1 
27man/man1/yaps.1 
cvs diff -r1.2 -r1.3 pkgsrc/audio/abcmidi/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/abcmidi/distinfo 2006/05/16 13:41:57 1.2
+++ pkgsrc/audio/abcmidi/distinfo 2011/02/17 13:54:12 1.3
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.2 2006/05/16 13:41:57 ben Exp $ 1$NetBSD: distinfo,v 1.3 2011/02/17 13:54:12 ryoon Exp $
2 2
3SHA1 (abcMIDI-2006-04-22.zip) = f7c3000d9a32199ff2d563fe2bafb7d6e2cafc42 3SHA1 (abcMIDI-2011-01-01.zip) = ec24dedb98ba3d2182b56e249513142b02900a6a
4RMD160 (abcMIDI-2006-04-22.zip) = b7c65235a8a0b3b3a480d6b7ffdd9601c3bb4d02 4RMD160 (abcMIDI-2011-01-01.zip) = ef1b710a38be7caaca5949194a7aa9192a5183dc
5Size (abcMIDI-2006-04-22.zip) = 357665 bytes 5Size (abcMIDI-2011-01-01.zip) = 409569 bytes
6SHA1 (patch-aa) = ddbae8f04421ffb927669c702cc8cf380274fff7 6SHA1 (patch-aa) = 3a3a477604d0f1b460a1e534917ea67fceb001f5
7SHA1 (patch-ab) = c65bf9c2565bca5b5d168cc30ec5267153673b99 7SHA1 (patch-ab) = 27df5bb0d637336d7c244c5c9ac9c115bfd9ed24
8SHA1 (patch-ac) = dc8c8814dbb7018250eb511c5ab6e6f6388f9ec9 8SHA1 (patch-ac) = 54e42d69173162ce991564c592e5be1fcc8cc0fa
cvs diff -r1.2 -r1.3 pkgsrc/audio/abcmidi/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/audio/abcmidi/patches/Attic/patch-aa 2006/05/16 13:41:57 1.2
+++ pkgsrc/audio/abcmidi/patches/Attic/patch-aa 2011/02/17 13:54:12 1.3
@@ -1,16 +1,26 @@ @@ -1,16 +1,26 @@
1$NetBSD: patch-aa,v 1.2 2006/05/16 13:41:57 ben Exp $ 1$NetBSD: patch-aa,v 1.3 2011/02/17 13:54:12 ryoon Exp $
2 2
3--- makefile.orig 2006-04-01 11:02:46.000000000 -0800 3--- makefile.orig 2008-06-07 22:04:48.000000000 +0000
4+++ makefile 4+++ makefile
5@@ -31,9 +31,8 @@ 5@@ -31,10 +31,9 @@
6 # cure the problem, change this file from using PC-style end-of-line (carriage  6 # cure the problem, change this file from using PC-style end-of-line (carriage
7 # return and line feed) to unix style end-of-line (line feed). 7 # return and line feed) to unix style end-of-line (line feed).
8  8
9-CC=gcc 9-CC=gcc
10-CFLAGS=-DANSILIBS -O2  10 #CFLAGS=-DANSILIBS -O2
 11-CFLAGS=-DANSILIBS -g
11-LNK=gcc 12-LNK=gcc
12+CFLAGS+=-DANSILIBS 13+CFLAGS=-DANSILIBS
13+LNK=${CC} 14+LNK=${CC}
14 INSTALL=install 15 INSTALL=install
15  16
16 prefix=/usr/local 17 prefix=/usr/local
 18@@ -42,7 +41,7 @@ binaries=abc2midi midi2abc abc2abc mftex
 19
 20 docdir=share/doc/abcmidi
 21 bindir=bin
 22-mandir=share/man/man1
 23+mandir=man/man1
 24
 25 all : abc2midi midi2abc abc2abc mftext yaps midicopy abcmatch
 26
cvs diff -r1.1 -r1.2 pkgsrc/audio/abcmidi/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/audio/abcmidi/patches/Attic/patch-ab 2006/05/16 13:42:29 1.1
+++ pkgsrc/audio/abcmidi/patches/Attic/patch-ab 2011/02/17 13:54:12 1.2
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1$NetBSD: patch-ab,v 1.1 2006/05/16 13:42:29 ben Exp $ 1$NetBSD: patch-ab,v 1.2 2011/02/17 13:54:12 ryoon Exp $
2 2
3--- drawtune.c.orig 2006-01-17 05:07:34.000000000 -0800 3--- drawtune.c.orig 2010-02-08 16:36:39.000000000 +0000
4+++ drawtune.c 4+++ drawtune.c
5@@ -492,7 +492,7 @@ char* s; 5@@ -492,7 +492,7 @@ char* s;
6 double x; 6 double x;
7 char units[40]; 7 char units[40];
8  8
9- count = sscanf(s, "%lf%s", &x, units); 9- count = sscanf(s, "%lf%s", &x, units);
10+ count = sscanf(s, "%lf%39s", &x, units); 10+ count = sscanf(s, "%lf%39s", &x, units);
11 if (count > 0) { 11 if (count > 0) {
12 if ((count >= 2) && (strncmp(units, "cm", 2) == 0)) { 12 if ((count >= 2) && (strncmp(units, "cm", 2) == 0)) {
13 x = x*28.3; 13 x = x*28.3;
14@@ -1950,7 +1950,7 @@ static void define_font(struct font* the 14@@ -1956,7 +1956,7 @@ static void define_font(struct font* the
15 char fontname[80]; 15 char fontname[80];
16 int fontsize, params; 16 int fontsize, params;
17  17
18- params = sscanf(s, "%s %d", fontname, &fontsize); 18- params = sscanf(s, "%s %d", fontname, &fontsize);
19+ params = sscanf(s, "%79s %d", fontname, &fontsize); 19+ params = sscanf(s, "%79s %d", fontname, &fontsize);
20 if (params >= 1) { 20 if (params >= 1) {
21 if (strcmp(fontname, "-") != 0) { 21 if (strcmp(fontname, "-") != 0) {
22 if (thefont->name != NULL) { 22 if (thefont->name != NULL) {
23@@ -1974,7 +1974,7 @@ char *s; 23@@ -1980,7 +1980,7 @@ char *s;
24 int result; 24 int result;
25  25
26 p[0] = '\0'; 26 p[0] = '\0';
27- sscanf(s, " %10s", p); 27- sscanf(s, " %10s", p);
28+ sscanf(s, " %9s", p); 28+ sscanf(s, " %9s", p);
29 result = 1; 29 result = 1;
30 if ((strcmp(p, "0") == 0) || (strcmp(p, "no") == 0) ||  30 if ((strcmp(p, "0") == 0) || (strcmp(p, "no") == 0) ||
31 (strcmp(p, "false") == 0)) { 31 (strcmp(p, "false") == 0)) {
cvs diff -r1.1 -r1.2 pkgsrc/audio/abcmidi/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/audio/abcmidi/patches/Attic/patch-ac 2006/05/16 13:42:29 1.1
+++ pkgsrc/audio/abcmidi/patches/Attic/patch-ac 2011/02/17 13:54:12 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ac,v 1.1 2006/05/16 13:42:29 ben Exp $ 1$NetBSD: patch-ac,v 1.2 2011/02/17 13:54:12 ryoon Exp $
2 2
3--- yapstree.c.orig 2006-04-22 11:05:06.000000000 -0700 3--- yapstree.c.orig 2010-12-12 15:18:56.000000000 +0000
4+++ yapstree.c 4+++ yapstree.c
5@@ -1483,7 +1483,7 @@ char *str; /* string following first wor 5@@ -1485,7 +1485,7 @@ char *str; /* string following first wor
6 }; 6 };
7 }; 7 };
8 if (strcmp(p, "vskip") == 0) { 8 if (strcmp(p, "vskip") == 0) {
9- count = sscanf(s, "%lf%s", &vspace, units); 9- count = sscanf(s, "%lf%s", &vspace, units);
10+ count = sscanf(s, "%lf%79s", &vspace, units); 10+ count = sscanf(s, "%lf%79s", &vspace, units);
11 if (count > 0) { 11 if (count > 0) {
12 if ((count >= 2) && (strncmp(units, "cm", 2) == 0)) { 12 if ((count >= 2) && (strncmp(units, "cm", 2) == 0)) {
13 vspace = vspace*28.3; 13 vspace = vspace*28.3;