[pkgsrc/trunk]: pkgsrc/print/lilypond Fix a few problems:

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2829a11f8637
branches:  trunk
changeset: 543446:2829a11f8637
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Jun 18 20:29:32 2008 +0000

description:
Fix a few problems:
. Fontforge version comparison in configure script is broken, because
  the numbers get too big for test(1). Comment it out, we know the
  pkgsrc version is new enough.
. Do not install any emacs lisp files. Should be a separate package.
. Give path to Century New Schoolbook L fonts to configure script directly.
  There seems to be some problem with fc-match in a sandbox (to be
  investigated).

Bump PKGREVISION for PLIST change.

Changes created in cooperation with dillo@ and schmonz@ at pkgsrcCon 2008.

diffstat:

 print/lilypond/Makefile         |   4 +++-
 print/lilypond/PLIST            |   3 +--
 print/lilypond/distinfo         |   4 +++-
 print/lilypond/patches/patch-aa |  14 ++++++++++++++
 print/lilypond/patches/patch-ab |  13 +++++++++++++
 5 files changed, 34 insertions(+), 4 deletions(-)

diffs (86 lines):

diff -r d78d53425eff -r 2829a11f8637 print/lilypond/Makefile
--- a/print/lilypond/Makefile   Wed Jun 18 20:25:42 2008 +0000
+++ b/print/lilypond/Makefile   Wed Jun 18 20:29:32 2008 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.53 2008/06/10 08:05:21 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2008/06/18 20:29:32 wiz Exp $
 #
 
 DISTNAME=      lilypond-2.10.33
+PKGREVISION=   1
 CATEGORIES=    print
 MASTER_SITES=  http://lilypond.org/download/sources/v2.10/
 
@@ -28,6 +29,7 @@
 INFO_DIR=              ${GNU_CONFIGURE_INFODIR}
 INFO_FILES=            YES
 
+CONFIGURE_ARGS+=       --with-ncsb-dir=${LOCALBASE}/share/ghostscript/fonts
 CONFIGURE_ARGS+=       --disable-optimising
 CONFIGURE_ENV+=                PYTHON=${PYTHONBIN:Q}
 PYTHON_VERSIONS_ACCEPTED= 25 24
diff -r d78d53425eff -r 2829a11f8637 print/lilypond/PLIST
--- a/print/lilypond/PLIST      Wed Jun 18 20:25:42 2008 +0000
+++ b/print/lilypond/PLIST      Wed Jun 18 20:29:32 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2008/05/14 20:25:16 sborrill Exp $
+@comment $NetBSD: PLIST,v 1.13 2008/06/18 20:29:32 wiz Exp $
 bin/abc2ly
 bin/convert-ly
 bin/etf2ly
@@ -19,7 +19,6 @@
 man/man1/lilypond.1
 man/man1/midi2ly.1
 man/man1/musicxml2ly.1
-share/emacs/site-lisp/lilypond-words.el
 share/lilypond/${PKGVERSION}/dvips/ps
 share/lilypond/${PKGVERSION}/fonts/otf/CenturySchL-Bold.otf
 share/lilypond/${PKGVERSION}/fonts/otf/CenturySchL-BoldItal.otf
diff -r d78d53425eff -r 2829a11f8637 print/lilypond/distinfo
--- a/print/lilypond/distinfo   Wed Jun 18 20:25:42 2008 +0000
+++ b/print/lilypond/distinfo   Wed Jun 18 20:29:32 2008 +0000
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.9 2008/05/14 20:25:16 sborrill Exp $
+$NetBSD: distinfo,v 1.10 2008/06/18 20:29:32 wiz Exp $
 
 SHA1 (lilypond-2.10.33.tar.gz) = 22717aa67723067f43208e7e771d6909f8db045f
 RMD160 (lilypond-2.10.33.tar.gz) = 589f9ab572b0a628141681424edebb1608528b86
 Size (lilypond-2.10.33.tar.gz) = 2660315 bytes
+SHA1 (patch-aa) = 6c212779b4b5b2e02280a58b5aed2e10b09f1150
+SHA1 (patch-ab) = 5f210ada53a5062da1173c257095ebddf407d67d
 SHA1 (patch-ae) = 7c39ff5b810d09f673e1156afd92da53cfb709f0
diff -r d78d53425eff -r 2829a11f8637 print/lilypond/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/print/lilypond/patches/patch-aa   Wed Jun 18 20:29:32 2008 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-aa,v 1.7 2008/06/18 20:29:32 wiz Exp $
+
+--- configure.orig     2007-09-19 16:21:59.000000000 +0200
++++ configure
+@@ -9213,7 +9213,8 @@ echo $ECHO_N "checking $r version... $EC
+ echo "${ECHO_T}$ver" >&6; }
+     if test "$num" -lt "$req"; then
+ 
+-    eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 20050624 (installed: $ver)"\"`\"
++    :
++    #eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 20050624 (installed: $ver)"\"`\"
+ 
+     fi
+     vervar="`echo FONTFORGE | tr 'a-z' 'A-Z'`_VERSION"
diff -r d78d53425eff -r 2829a11f8637 print/lilypond/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/print/lilypond/patches/patch-ab   Wed Jun 18 20:29:32 2008 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.3 2008/06/18 20:29:32 wiz Exp $
+
+--- GNUmakefile.in.orig        2007-09-19 16:21:55.000000000 +0200
++++ GNUmakefile.in
+@@ -7,7 +7,7 @@ SUBDIRS = buildscripts python scripts \
+       mf ly \
+       tex ps scm \
+       po make \
+-      elisp vim \
++      vim \
+       input \
+       stepmake $(documentation-dir)
+