Update to 20110101.

Changelog is too long to include.
See CHANGES file.

6 files changed, 64 insertions, 56 deletions

diff --git a/audio/abcmidi/Makefile b/audio/abcmidi/Makefile
index bfe079c12da..94f55dfd81d 100644
--- a/audio/abcmidi/Makefile
+++ b/audio/abcmidi/Makefile
@@ -1,47 +1,36 @@
-# $NetBSD: Makefile,v 1.7 2009/10/10 08:33:24 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2011/02/17 13:54:12 ryoon Exp $
 #
 
 DISTNAME=	abcMIDI-${ABCMIDIVER}
 PKGNAME=	abcmidi-${ABCMIDIVER:S/-//g}
 CATEGORIES=	audio
-MASTER_SITES=	http://ifdo.pugmarks.com/~seymour/runabc/
+MASTER_SITES=	http://ifdo.ca/~seymour/runabc/
 EXTRACT_SUFX=	.zip
-WRKSRC=		${WRKDIR}/abcmidi
-MAKE_FILE=	makefile
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://abc.sourceforge.net/abcMIDI/
 COMMENT=	Music utilities for abc
+LICENSE=	gnu-gpl-v2
 
-ABCMIDIVER=	2006-04-22
+ABCMIDIVER=	2011-01-01
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 \
-			share/doc/abcmidi/programming share/examples/abcmidi
-
-do-install:
-	cd ${WRKSRC} && ${INSTALL_PROGRAM} abc2abc abc2midi mftext \
-		midi2abc midicopy yaps ${DESTDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/demo.abc \
-		${DESTDIR}${PREFIX}/share/examples/abcmidi
-	cd ${WRKSRC}/doc && ${INSTALL_DATA} AUTHORS CHANGES \
-		abcguide.txt abcmatch.txt gpl.txt history.txt readme.txt \
-		yapshelp.txt ${DESTDIR}${PREFIX}/share/doc/abcmidi
+			share/doc/${PKGBASE}/programming \
+			share/examples/${PKGBASE}
+
+WRKSRC=		${WRKDIR}/abcmidi
+MAKE_FILE=	makefile
+INSTALL_MAKE_FLAGS+=	prefix=${PREFIX}
+
+post-install:
 	cd ${WRKSRC}/doc/programming && ${INSTALL_DATA} abc2midi.txt \
 		coding.txt midi2abc.txt split.abc yaps.txt \
-		${DESTDIR}${PREFIX}/share/doc/abcmidi/programming
-	${INSTALL_MAN} ${WRKSRC}/doc/abc2abc.1 \
-		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/abc2midi.1 \
-		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/mftext.1 \
-		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/midi2abc.1 \
-		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/midicopy.1 \
-		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/yaps.1 \
-		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+		${DESTDIR}${PREFIX}/share/doc/${PKGBASE}/programming
+	cd ${WRKSRC}/samples && ${INSTALL_DATA} araber.abc baym_rebin.abc \
+		boys.abc coleraine.abc daramud.abc demo.abc dergasn.abc \
+		drums.abc \
+		${DESTDIR}${PREFIX}/share/examples/${PKGBASE}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/abcmidi/PLIST b/audio/abcmidi/PLIST
index 2c9d16e8d46..5f3cdecd997 100644
--- a/audio/abcmidi/PLIST
+++ b/audio/abcmidi/PLIST
@@ -1,27 +1,36 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:32:01 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2011/02/17 13:54:12 ryoon Exp $
 bin/abc2abc
 bin/abc2midi
+bin/abcmatch
 bin/mftext
 bin/midi2abc
 bin/midicopy
 bin/yaps
+man/man1/abc2abc.1
+man/man1/abc2midi.1
+man/man1/mftext.1
+man/man1/midi2abc.1
+man/man1/midicopy.1
+man/man1/yaps.1
 share/doc/abcmidi/AUTHORS
 share/doc/abcmidi/CHANGES
+share/doc/abcmidi/VERSION
 share/doc/abcmidi/abcguide.txt
 share/doc/abcmidi/abcmatch.txt
 share/doc/abcmidi/gpl.txt
 share/doc/abcmidi/history.txt
-share/doc/abcmidi/readme.txt
-share/doc/abcmidi/yapshelp.txt
 share/doc/abcmidi/programming/abc2midi.txt
 share/doc/abcmidi/programming/coding.txt
 share/doc/abcmidi/programming/midi2abc.txt
 share/doc/abcmidi/programming/split.abc
 share/doc/abcmidi/programming/yaps.txt
+share/doc/abcmidi/readme.txt
+share/doc/abcmidi/yapshelp.txt
+share/examples/abcmidi/araber.abc
+share/examples/abcmidi/baym_rebin.abc
+share/examples/abcmidi/boys.abc
+share/examples/abcmidi/coleraine.abc
+share/examples/abcmidi/daramud.abc
 share/examples/abcmidi/demo.abc
-man/man1/abc2abc.1
-man/man1/abc2midi.1
-man/man1/mftext.1
-man/man1/midi2abc.1
-man/man1/midicopy.1
-man/man1/yaps.1
+share/examples/abcmidi/dergasn.abc
+share/examples/abcmidi/drums.abc
diff --git a/audio/abcmidi/distinfo b/audio/abcmidi/distinfo
index abf3a034677..839af307939 100644
--- a/audio/abcmidi/distinfo
+++ b/audio/abcmidi/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2006/05/16 13:41:57 ben Exp $
+$NetBSD: distinfo,v 1.3 2011/02/17 13:54:12 ryoon Exp $
 
-SHA1 (abcMIDI-2006-04-22.zip) = f7c3000d9a32199ff2d563fe2bafb7d6e2cafc42
-RMD160 (abcMIDI-2006-04-22.zip) = b7c65235a8a0b3b3a480d6b7ffdd9601c3bb4d02
-Size (abcMIDI-2006-04-22.zip) = 357665 bytes
-SHA1 (patch-aa) = ddbae8f04421ffb927669c702cc8cf380274fff7
-SHA1 (patch-ab) = c65bf9c2565bca5b5d168cc30ec5267153673b99
-SHA1 (patch-ac) = dc8c8814dbb7018250eb511c5ab6e6f6388f9ec9
+SHA1 (abcMIDI-2011-01-01.zip) = ec24dedb98ba3d2182b56e249513142b02900a6a
+RMD160 (abcMIDI-2011-01-01.zip) = ef1b710a38be7caaca5949194a7aa9192a5183dc
+Size (abcMIDI-2011-01-01.zip) = 409569 bytes
+SHA1 (patch-aa) = 3a3a477604d0f1b460a1e534917ea67fceb001f5
+SHA1 (patch-ab) = 27df5bb0d637336d7c244c5c9ac9c115bfd9ed24
+SHA1 (patch-ac) = 54e42d69173162ce991564c592e5be1fcc8cc0fa
diff --git a/audio/abcmidi/patches/patch-aa b/audio/abcmidi/patches/patch-aa
index 738dddc4c06..252f1a6ab6c 100644
--- a/audio/abcmidi/patches/patch-aa
+++ b/audio/abcmidi/patches/patch-aa
@@ -1,16 +1,26 @@
-$NetBSD: patch-aa,v 1.2 2006/05/16 13:41:57 ben Exp $
+$NetBSD: patch-aa,v 1.3 2011/02/17 13:54:12 ryoon Exp $
 
---- makefile.orig	2006-04-01 11:02:46.000000000 -0800
+--- makefile.orig	2008-06-07 22:04:48.000000000 +0000
 +++ makefile
-@@ -31,9 +31,8 @@
+@@ -31,10 +31,9 @@
  # cure the problem, change this file from using PC-style end-of-line (carriage 
  # return and line feed) to unix style end-of-line (line feed).
  
 -CC=gcc
--CFLAGS=-DANSILIBS -O2 
+ #CFLAGS=-DANSILIBS -O2 
+-CFLAGS=-DANSILIBS -g 
 -LNK=gcc
-+CFLAGS+=-DANSILIBS
++CFLAGS=-DANSILIBS
 +LNK=${CC}
  INSTALL=install
  
  prefix=/usr/local
+@@ -42,7 +41,7 @@ binaries=abc2midi midi2abc abc2abc mftex
+ 
+ docdir=share/doc/abcmidi
+ bindir=bin
+-mandir=share/man/man1
++mandir=man/man1
+ 
+ all : abc2midi midi2abc abc2abc mftext yaps midicopy abcmatch
+ 
diff --git a/audio/abcmidi/patches/patch-ab b/audio/abcmidi/patches/patch-ab
index 02e7442b1e1..8367bed6720 100644
--- a/audio/abcmidi/patches/patch-ab
+++ b/audio/abcmidi/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1 2006/05/16 13:42:29 ben Exp $
+$NetBSD: patch-ab,v 1.2 2011/02/17 13:54:12 ryoon Exp $
 
---- drawtune.c.orig	2006-01-17 05:07:34.000000000 -0800
+--- drawtune.c.orig	2010-02-08 16:36:39.000000000 +0000
 +++ drawtune.c
 @@ -492,7 +492,7 @@ char* s;
    double x;
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.1 2006/05/16 13:42:29 ben Exp $
    if (count > 0) {
      if ((count >= 2) && (strncmp(units, "cm", 2) == 0)) {
        x = x*28.3;
-@@ -1950,7 +1950,7 @@ static void define_font(struct font* the
+@@ -1956,7 +1956,7 @@ static void define_font(struct font* the
    char fontname[80];
    int fontsize, params;
     
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.1 2006/05/16 13:42:29 ben Exp $
    if (params >= 1) {
      if (strcmp(fontname, "-") != 0) {
        if (thefont->name != NULL) {
-@@ -1974,7 +1974,7 @@ char *s;
+@@ -1980,7 +1980,7 @@ char *s;
    int result;
  
    p[0] = '\0';
diff --git a/audio/abcmidi/patches/patch-ac b/audio/abcmidi/patches/patch-ac
index 31545a370b4..4530bc02c4e 100644
--- a/audio/abcmidi/patches/patch-ac
+++ b/audio/abcmidi/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2006/05/16 13:42:29 ben Exp $
+$NetBSD: patch-ac,v 1.2 2011/02/17 13:54:12 ryoon Exp $
 
---- yapstree.c.orig	2006-04-22 11:05:06.000000000 -0700
+--- yapstree.c.orig	2010-12-12 15:18:56.000000000 +0000
 +++ yapstree.c
-@@ -1483,7 +1483,7 @@ char *str; /* string following first wor
+@@ -1485,7 +1485,7 @@ char *str; /* string following first wor
      };
    };
    if (strcmp(p, "vskip") == 0) {