Update.

diff --git a/ChangeLog b/ChangeLog
index 67efd90d3038c3f7a0e81db7253b03e3d1e4c093..59ba06f1fc29df9339dc32b7609824e4c277b784 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-19  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * cygwin/lilypond.hint: Update.
+
 2004-10-18  Carl Sorensen  <carldsorensen@comcast.net>
 
        * scm/fret-diagrams.scm (fret-diagram-terse): Fix mistake in internal

diff --git a/cygwin/README.in b/cygwin/README.in
index fae792513c9681470a0aca8957cfccc77a66aadf..28dc8e41c21af78809e5fb50f905247d3b0b4994 100644 (file)
--- a/cygwin/README.in
+++ b/cygwin/README.in
@@ -6,19 +6,19 @@ For more information, tutorial, documentation, packaging instructions, visit:
   http://lilypond.org
 
 Runtime requirements:
-  cygwin-1.5.2 or newer
-  libguile12-1.6.4-12 or newer
+  cygwin-1.5.11 or newer
+  libguile12-1.6.5-1 or newer
   bash
   ghostscript
   libiconv2
   libintl2
-  libkpathsea3-2.0.2-12 or newer
+  libkpathsea3-2.0.2-15 or newer
   python
-  tetex-bin-2.0.2-12 or newer
+  tetex-bin-2.0.2-15 or newer
   tetex-tiny or tetex-base
 
 Suggested:
-  XFree86-serv
+  xorg-x11-base
   emacs or vim
   ghostscript-x11
   rxvt
@@ -26,20 +26,20 @@ Suggested:
   gv
 
 Build requirements:
-  cygwin-1.5.2 or newer
-  binutils-20011102 or newer
+  cygwin-1.5.11 or newer
+  binutils-20040725-2 or newer
   gcc-2.95.3-5 or newer
   bison-1.35 or newer
-  guile-devel-1.6.4-11 or newer
+  guile-devel-1.6.5-1 or newer
   fileutils
   flex-2.5.4 or newer
-  libguile12-1.6.4-12 or newer
-  libkpathsea3-2.0.2-12 or newer
-  python-2.2 or newer
-  sed-3.02 or newer
+  libguile12-1.6.5-1 or newer
+  libkpathsea3-2.0.2-15 or newer
+  python
+  sed
   sh-utils
-  tetex-devel-2.0.2-12 or newer
-  texinfo-4.2 or newer
+  tetex-devel-2.0.2-15 or newer
+  texinfo-4.7 or newer
 
 Website/documentation build requirements (lilypond-doc package):
   tetex-bin
@@ -47,18 +47,18 @@ Website/documentation build requirements (lilypond-doc package):
   ghostscript or ghostscript-x11
 
   mftrace, http://www.cs.uu.nl/people/hanwen/mftrace
-  autotrace, http://autotrace.sourceforge.net
+  potrace, http://potrace.sourceforge.net
   netpbm, http://netpbm.sourceforge.net
   t1utils, http://www.lcdf.org/~eddietwo/type/
 
 Recommended website/documentation build requirements:
-  pfaedit 020215 or newer, http://pfaedit.sourceforge.net
+  fontforge, http://fontforge.sourceforge.net
 
 Canonical homepage:
-  http://www.lilypond.org/development
+  http:/lilypond.org
 
 Canonical download:
-  ftp://ftp.lilypond.org/pub/LilyPond
+  http://lilypond.org/download
   
 ------------------------------------
 
@@ -74,7 +74,7 @@ Build instructions:
   # Get mknetrel from:
      cvs -d:pserver:anoncvs@sources.redhat.com:/cvs/cygwin-apps co mknetrel
 
-  # Copy the extra mknetrel script for LilyPond to mknetrel:
+  # Copy the extra mknetrel script to mknetrel/extra:
      cp lilypond-@TOPLEVEL_VERSION@-1/cygwin/mknetrel mknetrel/extra/lilypond
 
   # Build the package:
@@ -90,16 +90,13 @@ This will create:
 
 Port notes:
 
-  These packages were built on GNU/Linux using mknetrel.
-
-  Jan Nieuwenhuizen
-  janneke@gnu.org
+  LilyPond builds ootb with cygwin/mknetrel.
 
-Cygwin port maintained by: Jan Nieuwenhuizen  <janneke@gnu.org> 
+  Cygwin port maintained by: Bertalan Fodor
 
 ------------------
 
-Please send questions or comments on the LilyPond Cygwin package or
+Please send questions or comments on this Cygwin package or
 installation to the Cygwin mailing list at: cygwin@cygwin.com.
 However, if you're having problems related to LilyPond, please write
 to lilypond-user@gnu.org.  Please do not email the authors directly.

diff --git a/cygwin/lilypond.hint b/cygwin/lilypond.hint
index 87aeb14c351ad1a13546e2dcb99a16f8a48d2aeb..cffa42e1814dc97966988af0789b7941431062ed 100644 (file)
--- a/cygwin/lilypond.hint
+++ b/cygwin/lilypond.hint
@@ -1,8 +1,8 @@
 sdesc: "A program for printing sheet music"
 category: Publishing
-requires: bash cygwin fileutils findutils ghostscript libguile12 libiconv2 libintl2 libkpathsea3 python tetex-bin tetex-tiny _update-info-dir
+requires: bash cygwin ec-fonts-mftraced fileutils findutils ghostscript libguile12 libiconv2 libintl2 libkpathsea3 python tetex-bin tetex-tiny _update-info-dir
 #requires: tetex-bin, tetex-tiny | tetex-base
-#suggests: emacs gsview lilypond-doc rxvt tetex-x11 XFree86-serv
+#suggests: emacs gsview lilypond-doc rxvt tetex-x11 xorg-x11-base
 ldesc: "A program for printing sheet music.
 LilyPond prints beautiful sheet music.  It produces music notation
 from a description file. It excels at typesetting classical music, but

diff --git a/cygwin/mknetrel b/cygwin/mknetrel
index 67cda899ddeecc31aef069d4ba7ef399f2a022f5..e8b82531901216fbb4eaaff635e4f0ca474efcb9 100644 (file)
--- a/cygwin/mknetrel
+++ b/cygwin/mknetrel
@@ -89,7 +89,7 @@ preconfig () {
     # for cross-compiling LilyPond, fake a guile-config
     if ! iscygwin; then
        cd $build || exit 1
-       GUILE=1.6.4
+       GUILE=1.6.5
        cat > guile-config <<EOF
 [ "\$1" == "--version" ] && echo "guile-config - Guile version $GUILE"
 [ "\$1" == "compile" ] && echo "-I$cygwin_root/usr/include"

diff --git a/cygwin/mknetrel.doc b/cygwin/mknetrel.doc
index 842f207b2ef0ae56c8aa72f59b5aec4987108c12..75d7ab47172fe712705325147099286a4aaa21be 100644 (file)
--- a/cygwin/mknetrel.doc
+++ b/cygwin/mknetrel.doc
@@ -24,5 +24,9 @@ fixdoc () {
            rm -rf $inst/$prefix/$i
        fi
     done
+    if [-f $inst/$docprefix/$base ]; then
+       mkdir -p $packagedocdir
+       tar -C $inst/$docprefix/$base -cf - . | tar -C $inst/$packagedocdir -xf -
+    fi
     true
 }