Updated to 6.2.9.

pkgsrc changes:
* Set LICENSE.
* Use gmake.
* Include cairo bl3.mk.

upstream changes:
---- Version 6.2.9 - 11/02/08 ----

Don't display negative bar numbers
	(reported by Janus Meuris).
Fix bad clef change again with K: or V: when stafflines or staffscale present.
Fix voice clashes raised by previous version.
Don't count the upbeat measure when %%measurenb
	(reported by Hudson Flávio Meneses Lacerda).
Less note shift when voices inverted in a staff.
Add the width scale factor in %%font.

---- Version 6.2.8 - 11/01/31 ----

Bad tempo note duration of Q:Cxx or Q:Lxx
	(reported by Paul Rosen).
Crash when note length divisor = 0.
Fix bad PostScript when %%font defined (and used) in the middle of a tune.
Bad horizontal offset of notes when music line too much shrunk
	(reported by Paul Rosen).
Handle "+++" as a valid decoration
	(reported by Guido Gonzato).
Bad measure bars when "|" in %%score and many voices per staff
	(reported by Marc Sabatella).
Set the rests of multi-voices staves closer to the middle of the staff
	(reported by Marc Sabatella).
Fix the loss of gchord/annot when defined in a lower voice and
	%%combinevoices (reported by Atte André Jensen).
Don't display the second slash of "\\" with pango
	(reported by Hudson Flávio Meneses Lacerda).
Add "\Uxxxxxxxx" for unicode 32 bits characters.
Limit the number of hexadecimal characters to 4 for unicode
	16 bits characters "\uxxxx".
Build and install abcm2ps from outside the source tree
	(fixed by Matthias Rustler).

---- Version 6.2.7 - 10/12/26 ----

Bad clef when voice going to a different staff after %%score.
Bad generation after %%score when the previous %%score did not contain
	the first declared voice (reported by Marc Sabatella).
Output the lyrics (W:) in the last page when %%newpage's in the tune.
Bad scale when %%newpage in tune (reported by Paul Rosen).
Avoid bad PostScript when "$n" used before definition of %%setfont-n
	(reported by Paul Rosen).
Treat "\uxxxx" in text as a hexadecimal Unicode character.
Bad font when texts with both standard fonts and pango
	(reported by Hudson Flávio Meneses Lacerda).
Fix some warnings.
Crash when a nested slur started on a grace note
	(reported by Paul Rosen).

---- Version 6.2.6 - 10/11/30 ----

Part display missing when P: defined before a clef change at start of line
	(reported by Paul Rosen).
Bad horizontal offset of text between %%begintext and %%endtext when
	empty line and new PostScript page.
Lack of %%postscript output when defined just after K:.
Bad clef change with K: or V: when stafflines or staffscale present
	(reported by Paul Rosen).
Adjust the K: / V: 'middle=' value when the defined clef is not on a line.
Handle "middle=" without 'clef=' in K: or V:.

---- Version 6.2.5 - 10/11/26 ----

Bad clef changes when many voices per staff.
Bad key signatures on all staff systems but the first one when clef
	different from treble.
Bad measure numbers after measure repeat (Zn) and many voices.

---- Version 6.2.4 - 10/11/20 ----

Bad memory allocation mechanism making random crashes.
Bad staff scale when change inside a tune.
Bad staff clef when the music line starts with a clef change.
Don't cut beamed notes when %%continueall.
Bad horizontal offset of notes far outside the staff after a clef or
	a key or time signature.
Bad horizontal offset of long decorations when many at the same time.
Use pango in header/footer as required.
PostScript error when parenthesis alone in a header/footer.

---- Version 6.2.3 - 10/11/01 ----

Move the accidentals to a separate font.
Use standard rendering when '%%pangoembedded 0'.
'%%pangoembedded' added.
Change pango output mechanism.

---- Version 6.2.2 - 10/10/29 ----

Better text center and right align with pango.
Do pango generation when character >= c6xx.
May force pango with '%%pango 2'.
Define the character '...' (ellipsis) in sample.abc for show without pango.
Define UTF-8 characters e008080..e2cfdf stubs for show without pango.
Add characters 'ldot' to 'longs' (UTF-8 c580..c5bf) for show without pango.
Better rendering with pango (scale changes).
Do pango work when not in a graphic context (use cairo instead of gdk).
Remove a useless malloc().

---- Version 6.2.1 - 10/10/16 ----

Bad vertical offset of key signature when clef change.
Bad horizontal offset of lyrics starting with parenthesis.
Change some PS definitions (treble and bass clefs, full head).
Use encoded number strings in user paths.
Convert some standard drawing to user paths.
Bad box around guitar chord when not all ASCII characters.

---- Version 6.2.0 - 10/10/06 ----

Fix combination of rests (when %%combinevoices).
May combine 3 or 4 voices (when %%combinevoices).
Add quiet mode (-q in command line).
Extend the U: syntax (see features.txt).

---- Version 6.1.1 - 10/09/17 ----

Bad scale when a voice moves to a staff with an other scale.
Loop when '%%staves' inside the tune with a cloned voice.
Loop when '%%staves' without any parameter (reported by Reinier Maliepaard).
Expand the special characters of %%infoname texts.
Use standard values for exit codes and max length of file names.
The '*' (star) is no more allowed (it was ignored as the '`' - back quote).
Check the character in U: definition.

---- Version 6.1.0 - 10/08/02 ----

Don't forget the %%infoname at start of file.
Crash on '%%infoname R' (reported by Chuck Boody).
Crash when clef in V: and no note in the tune (reported by Reinier Maliepaard).

---- Version 6.0.11 - 10/07/20 ----

Clash of rest under beam when multi-voices.
Clash of notes/clefs/grace notes/dots when multi-voices and strunk lines.
Don't display dots on the last square note of the tune.
Bad stem direction of grace notes in secundary voices.
Reduce the natural spacing when only long notes in a tune.
Define the user decorations when needed.
Erroneous bar error and bad placement when grace note before measure
	bar and multi-voices.
Bad tie direction when dotted (reported by Hudson Lacerda).
Bad PS output when parenthesis in P: (reported by Hudson Lacerda).

---- Version 6.0.10 - 10/06/22 ----

Bad tune selection when <last_index> absent in "-e".
Bad title when title trim.
More horizontal space for flat accidental in texts.
Change the directory separator for MAC systems.
Fix a crash when unknown glyph with pango.
Fix lyrics error in chinese.abc.

---- Version 6.0.9 - 10/04/11 ----

Fix more security vulnerabilities (thanks to Tim Starling).

---- Version 6.0.8 - 10/04/05 ----

Change the utf-8 font mechanism from CMAP to composite font (FontType 0).
Fix some security vulnerabilities (thanks to Tim Starling).
Add %%Begin/EndDocument when inserting a EPS file (thanks to Reinier Maliepaard).
Fix bad guitar chord / annotation offset when non latin characters and pango.
Have flats a bit higher in texts.
Have more space between accidentals in key signatures.

---- Version 6.0.7 - 10/02/24 ----

Fix measure bar numbering when %%setbarnb and many voices.
Fix measure bar numbering when M:none.
Fix the EPS output when use of pango.
Fix a crash when '-E' at start of command line and use of pango.
Fix the EPS output when accidentals.
Fix the output of user postscript sequences when many output files.
Fix a crash when slur ending on a grace note at end of a secundary voice.
Include back chinese.abc in the tarball.

---- Version 6.0.6 - 10/02/19 ----

Handle font changes inside lyric words.
More flute tablatures from Michel Bellon.
Add information about pango in the INSTALL file.
Force recompilation after configure.
Change the glyphs of accidentals.
Speed up the PS rendering of pango text.
Do the TAB in guitar chords work again.
Fix the parenthesis problem with pango.
Adjust some compose characters sequences.
Move the setcachedevice from the Extra font to the extra-draw dict.
	This permits to add characters from various sizes.
Fix a crash when a tune ends with T:.

---- Version 6.0.5 - 10/02/12 ----

Add the 'pango' parameter.
Add an arabic title in chinese.abc.
Fix a crash when non ascii characters in tunes, outside of text strings.
Print some texts with the pango/freetype libraries.

---- Version 6.0.4 - 10/02/09 ----

Do the hyphen work again in lyrics.
Prepare the 'pango' job.
Fix bad horizontal spacing of accidentals.
Add O/obreve.
Add some compose characters from the ABC standard version 2.

---- Version 6.0.3 - 10/01/31 ----

Change the character values for accidentals to correct utf-8 sequences.
Fix bar numbering when incomplete measure at start of tune.
Fix bar numbering when incomplete measure at end of previous line.

---- Version 6.0.2 - 10/01/28 ----

Change the utf-8 mechanism for extra characters.
Fix lyrics display when not enough or too many lyrics in a music line.

---- Version 6.0.1 - 10/01/20 ----

Remove the latin parameters.
Do the accidentals in string ('\201'.. and '#'.. in guitar chords)
	work again.
Accept ABC files coded in latin1.

---- Version 6.0.0 - 10/01/19 ----

Remove multilang.abc.
Add chinese.abc.
Generate PostScript level 3 only.
Add UTF-8 support.
	!! COMPATIBILITY !!
	The other encodings (latin-x) are no more supported.
Add all whistle types in flute.fmt (thanks to Guido Gonzato).

Creation from abcm2ps version 5.9.7.

4 files changed, 24 insertions, 14 deletions

diff --git a/print/abcm2ps/Makefile b/print/abcm2ps/Makefile
index 934b035783c..ec7ebfa363e 100644
--- a/print/abcm2ps/Makefile
+++ b/print/abcm2ps/Makefile
@@ -1,16 +1,23 @@
-# $NetBSD: Makefile,v 1.6 2010/04/20 17:40:47 minskim Exp $
+# $NetBSD: Makefile,v 1.7 2011/02/16 20:46:55 ryoon Exp $
 
-DISTNAME=	abcm2ps-5.9.13
+DISTNAME=	abcm2ps-6.2.9
 CATEGORIES=	print
 MASTER_SITES=	http://moinejf.free.fr/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://moinejf.free.fr/
 COMMENT=	Converts ABC to music sheet in PostScript format
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	yes
 BUILD_TARGET=	${PKGBASE}
 
+USE_TOOLS+=	gmake
+
+CONFIGURE_ARGS+=	--prefix=${DESTDIR}${PREFIX} \
+			--docdir=${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+
+.include "../../devel/pango/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/abcm2ps/PLIST b/print/abcm2ps/PLIST
index c1112d9909d..81dd34a36a0 100644
--- a/print/abcm2ps/PLIST
+++ b/print/abcm2ps/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2010/04/20 17:40:47 minskim Exp $
+@comment $NetBSD: PLIST,v 1.6 2011/02/16 20:46:55 ryoon Exp $
 bin/abcm2ps
 share/abcm2ps/fbook.fmt
 share/abcm2ps/flute.fmt
@@ -9,13 +9,13 @@ share/doc/abcm2ps/Changes
 share/doc/abcm2ps/License
 share/doc/abcm2ps/README
 share/doc/abcm2ps/accordion.abc
+share/doc/abcm2ps/chinese.abc
 share/doc/abcm2ps/deco.abc
 share/doc/abcm2ps/features.txt
 share/doc/abcm2ps/format.txt
 share/doc/abcm2ps/journey.abc
 share/doc/abcm2ps/mtunes1.abc
 share/doc/abcm2ps/mtunes2.abc
-share/doc/abcm2ps/multilang.abc
 share/doc/abcm2ps/newfeatures.abc
 share/doc/abcm2ps/options.txt
 share/doc/abcm2ps/sample.abc
diff --git a/print/abcm2ps/distinfo b/print/abcm2ps/distinfo
index 88b99dd11c1..0b870158fb9 100644
--- a/print/abcm2ps/distinfo
+++ b/print/abcm2ps/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2010/04/20 17:40:47 minskim Exp $
+$NetBSD: distinfo,v 1.7 2011/02/16 20:46:55 ryoon Exp $
 
-SHA1 (abcm2ps-5.9.13.tar.gz) = 55f2d36358cae94619bc647c52cf685184013e8c
-RMD160 (abcm2ps-5.9.13.tar.gz) = 788a089b79fd39ab374036b8558fab25e415caf2
-Size (abcm2ps-5.9.13.tar.gz) = 252876 bytes
-SHA1 (patch-aa) = 5ffcbbe9d1dfe48ead377d5d25d27dad53d40f48
+SHA1 (abcm2ps-6.2.9.tar.gz) = c1669b5cf007ef49be61c92764179247369dac6e
+RMD160 (abcm2ps-6.2.9.tar.gz) = 92b2d53b5b701faafc2e602f8a87138ef62a3fde
+Size (abcm2ps-6.2.9.tar.gz) = 265578 bytes
+SHA1 (patch-aa) = 707ece683628fe24245840d9c019f83779dc3699
diff --git a/print/abcm2ps/patches/patch-aa b/print/abcm2ps/patches/patch-aa
index 728ab80c134..f8e3d16952e 100644
--- a/print/abcm2ps/patches/patch-aa
+++ b/print/abcm2ps/patches/patch-aa
@@ -1,18 +1,21 @@
-$NetBSD: patch-aa,v 1.2 2008/06/12 02:14:43 joerg Exp $
+$NetBSD: patch-aa,v 1.3 2011/02/16 20:46:56 ryoon Exp $
 
---- Makefile.in.orig	2005-06-25 10:15:28.000000000 +0000
+* fix documentation path.
+* support user-destdir.
+
+--- Makefile.in.orig	2011-01-27 10:03:53.000000000 +0000
 +++ Makefile.in
 @@ -19,7 +19,7 @@ VPATH = @srcdir@
  bindir = @bindir@
  libdir = @libdir@
- datadir = @datadir@
+ datadir = @datarootdir@
 -docdir = @prefix@/doc
 +docdir = @prefix@/share/doc
  
  # unix
  OBJECTS=abc2ps.o \
 @@ -32,15 +32,15 @@ $(OBJECTS): abcparse.h abc2ps.h config.h
- DOCFILES=Changes License README *.abc *.eps *.txt
+ DOCFILES=$(addprefix $(srcdir)/,Changes License README *.abc *.eps *.txt)
  
  install: abcm2ps
 -	mkdir -p $(bindir); \
@@ -23,7 +26,7 @@ $NetBSD: patch-aa,v 1.2 2008/06/12 02:14:43 joerg Exp $
 +	mkdir -p $(DESTDIR)$(datadir)/abcm2ps; \
 +	mkdir -p $(DESTDIR)$(docdir)/abcm2ps; \
 +	$(INSTALL_PROGRAM) abcm2ps $(DESTDIR)$(bindir)
- 	for f in *.fmt; do \
+ 	for f in $(srcdir)/*.fmt; do \
 -		$(INSTALL_DATA) $$f $(datadir)/abcm2ps; \
 +		$(INSTALL_DATA) $$f $(DESTDIR)$(datadir)/abcm2ps; \
  	done