Update to 20111019

Changelog:
* Many bug fix
* use GNU configure

4 files changed, 48 insertions, 37 deletions

diff --git a/audio/abcmidi/Makefile b/audio/abcmidi/Makefile
index 94f55dfd81d..8039c7385ae 100644
--- a/audio/abcmidi/Makefile
+++ b/audio/abcmidi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/02/17 13:54:12 ryoon Exp $
+# $NetBSD: Makefile,v 1.9 2011/10/21 13:31:55 ryoon Exp $
 #
 
 DISTNAME=	abcMIDI-${ABCMIDIVER}
@@ -12,17 +12,15 @@ HOMEPAGE=	http://abc.sourceforge.net/abcMIDI/
 COMMENT=	Music utilities for abc
 LICENSE=	gnu-gpl-v2
 
-ABCMIDIVER=	2011-01-01
+ABCMIDIVER=	2011-10-19
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 \
-			share/doc/${PKGBASE}/programming \
+INSTALLATION_DIRS=	share/doc/${PKGBASE}/programming \
 			share/examples/${PKGBASE}
 
 WRKSRC=		${WRKDIR}/abcmidi
-MAKE_FILE=	makefile
-INSTALL_MAKE_FLAGS+=	prefix=${PREFIX}
+GNU_CONFIGURE=	yes
 
 post-install:
 	cd ${WRKSRC}/doc/programming && ${INSTALL_DATA} abc2midi.txt \
diff --git a/audio/abcmidi/distinfo b/audio/abcmidi/distinfo
index 839af307939..5b08ffdd2ea 100644
--- a/audio/abcmidi/distinfo
+++ b/audio/abcmidi/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2011/02/17 13:54:12 ryoon Exp $
+$NetBSD: distinfo,v 1.4 2011/10/21 13:31:55 ryoon Exp $
 
-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 (abcMIDI-2011-10-19.zip) = 14302681720b78bddc40b73d83012c9a27dba1ba
+RMD160 (abcMIDI-2011-10-19.zip) = daffc7bae1637a0d771858d80f8de7759120ff84
+Size (abcMIDI-2011-10-19.zip) = 470032 bytes
+SHA1 (patch-Makefile.in) = 4e1c08bcbe54e8966e4eabf104cca4f05e7b3f62
 SHA1 (patch-ab) = 27df5bb0d637336d7c244c5c9ac9c115bfd9ed24
 SHA1 (patch-ac) = 54e42d69173162ce991564c592e5be1fcc8cc0fa
diff --git a/audio/abcmidi/patches/patch-Makefile.in b/audio/abcmidi/patches/patch-Makefile.in
new file mode 100644
index 00000000000..5fec84f1bec
--- /dev/null
+++ b/audio/abcmidi/patches/patch-Makefile.in
@@ -0,0 +1,39 @@
+$NetBSD: patch-Makefile.in,v 1.1 2011/10/21 13:31:55 ryoon Exp $
+
+--- /usr/tmp/audio/abcmidi/work/abcmidi/Makefile.in.orig	2011-08-19 16:20:25.000000000 +0000
++++ /usr/tmp/audio/abcmidi/work/abcmidi/Makefile.in
+@@ -50,7 +50,7 @@ VPATH = @srcdir@
+ bindir = @bindir@
+ libdir = @libdir@
+ datadir = @datarootdir@
+-docdir = @prefix@/doc
++docdir = @prefix@/share/doc/abcmidi
+ mandir=@mandir@/man1
+ 
+ binaries=abc2midi midi2abc abc2abc mftext yaps midicopy abcmatch
+@@ -140,17 +140,17 @@ clean :
+ 	rm *.o ${binaries}
+ 
+ install: abc2midi midi2abc abc2abc mftext midicopy yaps abcmatch
+-	test -d $(DESTDIR)${prefix}/${bindir} || mkdir -p $(DESTDIR)${prefix}/${bindir}
+-	$(INSTALL) -m 755 ${binaries} $(DESTDIR)${prefix}/${bindir}
++	test -d $(DESTDIR)/${bindir} || mkdir -p $(DESTDIR)/${bindir}
++	$(INSTALL) -m 755 ${binaries} $(DESTDIR)/${bindir}
+ 
+ 	# install documentation
+ 	test -d $(DESTDIR)${PREFIX}/share/doc/abcmidi || mkdir -p $(DESTDIR)${prefix}/${docdir}
+-	$(INSTALL) -m 644 doc/*.txt $(DESTDIR)${prefix}/${docdir}
+-	$(INSTALL) -m 644 doc/AUTHORS $(DESTDIR)${prefix}/${docdir}
+-	$(INSTALL) -m 644 doc/CHANGES $(DESTDIR)${prefix}/${docdir}
+-	$(INSTALL) -m 644 VERSION $(DESTDIR)${prefix}/${docdir}
++	$(INSTALL) -m 644 doc/*.txt $(DESTDIR)/${docdir}
++	$(INSTALL) -m 644 doc/AUTHORS $(DESTDIR)/${docdir}
++	$(INSTALL) -m 644 doc/CHANGES $(DESTDIR)/${docdir}
++	$(INSTALL) -m 644 VERSION $(DESTDIR)/${docdir}
+ 
+ 	# install manpages
+-	test -d $(DESTDIR)${prefix}/${mandir} || mkdir -p $(DESTDIR)${prefix}/${mandir};
+-	$(INSTALL) -m 644 doc/*.1 $(DESTDIR)${prefix}/${mandir}
++	test -d $(DESTDIR)/${mandir} || mkdir -p $(DESTDIR)/${mandir};
++	$(INSTALL) -m 644 doc/*.1 $(DESTDIR)/${mandir}
+ 
diff --git a/audio/abcmidi/patches/patch-aa b/audio/abcmidi/patches/patch-aa
deleted file mode 100644
index 252f1a6ab6c..00000000000
--- a/audio/abcmidi/patches/patch-aa
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2011/02/17 13:54:12 ryoon Exp $
-
---- makefile.orig	2008-06-07 22:04:48.000000000 +0000
-+++ makefile
-@@ -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 -g 
--LNK=gcc
-+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
-