Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text
In directory sc8-pr-cvs17:/tmp/cvs-serv10415/main/finkinfo/text
Modified Files:
Tag: pangocairo-branch
detex.info detex.patch ghostscript.info idnits.info
lilypond-devel.info lilypond.info lilypond.patch rfcdiff.info
xpdf.info xpdf.patch
Log Message:
merge from HEAD
Index: rfcdiff.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/rfcdiff.info,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- rfcdiff.info 11 Oct 2006 19:30:32 -0000 1.5
+++ rfcdiff.info 24 Jul 2007 17:36:46 -0000 1.5.2.1
@@ -1,6 +1,6 @@
Package: rfcdiff
Version: 1.33
-Revision: 1
+Revision: 2
Source: http://tools.ietf.org/tools/%n/%n-v%v
Source-MD5: bee50ff43087a48c2c3658f0380c1421
@@ -10,7 +10,7 @@
Description: Compare two versions of an Internet Draft
NoSourceDirectory: 1
-Depends: wdiff
+Depends: wdiff, gawk
PatchScript: <<
head -n 71 %n-v%v | tail -n 19 > LICENSE
Index: lilypond-devel.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/lilypond-devel.info,v
retrieving revision 1.14.2.13
retrieving revision 1.14.2.14
diff -u -d -r1.14.2.13 -r1.14.2.14
--- lilypond-devel.info 24 Jul 2007 16:54:10 -0000 1.14.2.13
+++ lilypond-devel.info 24 Jul 2007 17:36:46 -0000 1.14.2.14
@@ -1,12 +1,12 @@
Package: lilypond-devel
-Version: 2.11.21
+Version: 2.11.26
Revision: 1002
Maintainer: Matthias Neeracher <[EMAIL PROTECTED]>
GCC: 4.0
BuildDepends: <<
guile18, guile18-dev, libkpathsea4 | system-tetex,
libgettext3-dev, gettext-bin, gettext-tools, texinfo (>= 4.8-2),
-mftrace (>= 1.2.4-1001), freetype219 (>= 2.3.1-1),
+mftrace (>= 1.2.14-1001), freetype219 (>= 2.3.1-1),
pango1-xft2-ft219-dev (>= 1.16.0-1), glib2-dev, bison (>= 2.0-1),
fontconfig2-dev (>= 2.2.3-10), expat, pkgconfig (>= 0.21-1), gmp
<<
@@ -20,7 +20,7 @@
Conflicts: lilypond, lilypond-unstable, lilypond-devel, lilypond-devel-tex
Replaces: lilypond, lilypond-unstable
Source:
http://download.linuxaudio.org/lilypond/sources/v2.11/lilypond-%v.tar.gz
-Source-MD5: 1942e6baa459ff57e23fa6832bde4cd7
+Source-MD5: cbd677508a95b7d434f07bad4cefa50e
Patch: %n.patch
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
Index: detex.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/detex.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- detex.patch 26 Jan 2006 03:37:15 -0000 1.1
+++ detex.patch 24 Jul 2007 17:36:46 -0000 1.1.2.1
@@ -40,3 +40,15 @@
clean:
-rm -f a.out core *.s *.o ERRS errs .,* .emacs_[0-9]*
Common subdirectories: detex-2.7/os2 and detex-2.7.patched/os2
+diff -ruN detex-2.7/Makefile detex-2.7-patched/Makefile
+--- detex-2.7/Makefile 1999-05-12 10:45:55.000000000 -0700
++++ detex-2.7-patched/Makefile 2007-07-18 13:22:26.000000000 -0700
+@@ -41,7 +41,7 @@
+
+ # Use your favorite lexical scanner
+ #
+-LEX = lex
++LEX = flex
+ #LEX = flex
+
+ #LFLAGS = -8 -C
Index: lilypond.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/lilypond.info,v
retrieving revision 1.7.2.13
retrieving revision 1.7.2.14
diff -u -d -r1.7.2.13 -r1.7.2.14
--- lilypond.info 19 Jul 2007 22:23:34 -0000 1.7.2.13
+++ lilypond.info 24 Jul 2007 17:36:46 -0000 1.7.2.14
@@ -1,6 +1,6 @@
Package: lilypond
-Version: 2.10.20
-Revision: 1003
+Version: 2.10.25
+Revision: 1002
Maintainer: Matthias Neeracher <[EMAIL PROTECTED]>
GCC: 4.0
BuildDepends: <<
@@ -20,7 +20,7 @@
Conflicts: lilypond, lilypond-unstable, lilypond-devel, lilypond-devel-tex
Replaces: lilypond-devel, lilypond-unstable
Source:
http://download.linuxaudio.org/lilypond/sources/v2.10/lilypond-%v.tar.gz
-Source-MD5: 7d6b8476d0d23b97945c579402794c20
+Source-MD5: 3b269dd092db621b1c25fb390b4347f3
Patch: %n.patch
SetLDFLAGS: -lexpat -L%p/lib/pango-ft219/lib
ConfigureParams: --disable-dependency-tracking
--infodir='$(prefix)/share/info' --mandir='$(prefix)/share/man'
--with-ncsb-dir='%p/share/ghostscript/fonts' --disable-gui
Index: lilypond.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/lilypond.patch,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -u -d -r1.5.2.3 -r1.5.2.4
--- lilypond.patch 2 Mar 2007 15:31:18 -0000 1.5.2.3
+++ lilypond.patch 24 Jul 2007 17:36:46 -0000 1.5.2.4
@@ -1,6 +1,6 @@
-diff -ruN lilypond-2.10.12-orig/Documentation/user/lilypond.tely
lilypond-2.10.12/Documentation/user/lilypond.tely
---- lilypond-2.10.12-orig/Documentation/user/lilypond.tely 2007-01-18
23:33:14.000000000 -0800
-+++ lilypond-2.10.12/Documentation/user/lilypond.tely 2007-01-18
23:45:27.000000000 -0800
+diff -ruN lilypond-2.10.25-orig/Documentation/user/lilypond.tely
lilypond-2.10.25/Documentation/user/lilypond.tely
+--- lilypond-2.10.25-orig/Documentation/user/lilypond.tely 2007-07-19
23:01:23.000000000 +0200
++++ lilypond-2.10.25/Documentation/user/lilypond.tely 2007-07-19
23:01:47.000000000 +0200
@@ -34,13 +34,13 @@
@c
@dircategory LilyPond
@@ -22,9 +22,9 @@
@end direntry
@c don't remove this comment.
-diff -ruN lilypond-2.10.12-orig/Documentation/user/music-glossary.tely
lilypond-2.10.12/Documentation/user/music-glossary.tely
---- lilypond-2.10.12-orig/Documentation/user/music-glossary.tely
2007-01-18 23:33:14.000000000 -0800
-+++ lilypond-2.10.12/Documentation/user/music-glossary.tely 2007-01-18
23:45:27.000000000 -0800
+diff -ruN lilypond-2.10.25-orig/Documentation/user/music-glossary.tely
lilypond-2.10.25/Documentation/user/music-glossary.tely
+--- lilypond-2.10.25-orig/Documentation/user/music-glossary.tely
2007-07-19 23:01:23.000000000 +0200
++++ lilypond-2.10.25/Documentation/user/music-glossary.tely 2007-07-19
23:01:47.000000000 +0200
@@ -17,6 +17,11 @@
and as @uref{source/Documentation/user/music-glossary.html,one big page}.
@end ifhtml
@@ -37,9 +37,25 @@
@titlepage
@title Music Glossary
@author Christian Mondrup @c Original author of LilyPond glossary
-diff -ruN lilypond-2.10.12-orig/config.make.in lilypond-2.10.12/config.make.in
---- lilypond-2.10.12-orig/config.make.in 2007-01-18 23:33:14.000000000
-0800
-+++ lilypond-2.10.12/config.make.in 2007-01-18 23:45:27.000000000 -0800
+diff -ruN lilypond-2.10.25-orig/buildscripts/pfx2ttf.fontforge
lilypond-2.10.25/buildscripts/pfx2ttf.fontforge
+--- lilypond-2.10.25-orig/buildscripts/pfx2ttf.fontforge 2007-07-19
23:01:23.000000000 +0200
++++ lilypond-2.10.25/buildscripts/pfx2ttf.fontforge 2007-07-19
23:04:01.000000000 +0200
+@@ -21,7 +21,11 @@
+ "afii61352", "afii61352", \
+ "ij", "ij", \
+ "IJ", "IJ");
+-RemoveATT("Ligature", "*", "*");
++if (Strtol($version) < 20070501)
++ RemoveATT("Ligature", "*", "*");
++else
++ RemovePosSub("*");
++endif
+
+ Generate($3 + $fontname + ".otf");
+
+diff -ruN lilypond-2.10.25-orig/config.make.in lilypond-2.10.25/config.make.in
+--- lilypond-2.10.25-orig/config.make.in 2007-07-19 23:01:23.000000000
+0200
++++ lilypond-2.10.25/config.make.in 2007-07-19 23:01:47.000000000 +0200
@@ -28,7 +28,7 @@
FREETYPE2_LIBS = @FREETYPE2_LIBS@
PANGO_FT2_LIBS = @PANGO_FT2_LIBS@
Index: xpdf.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/xpdf.info,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- xpdf.info 22 Feb 2007 13:09:28 -0000 1.2.2.1
+++ xpdf.info 24 Jul 2007 17:36:46 -0000 1.2.2.2
@@ -1,31 +1,44 @@
Package: xpdf
-Version: 3.01
-Revision: 1003
+Version: 3.02
+Revision: 1002
GCC: 4.0
Source: ftp://www.foolabs.com/pub/%n/%n-%v.tar.gz
-Source-MD5: e004c69c7dddef165d768b1362b44268
-Source2: ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.01pl2.patch
-Source2-MD5: 8f1f5d37153c7e98f794f18d0b80fc25
-Depends: x11, ghostscript-fonts, t1lib5-shlibs, openmotif3-shlibs,
libpaper1-shlibs
-BuildDepends: t1lib5, openmotif3, x11-dev, libpaper1-dev
+Source-MD5: 599dc4cc65a07ee868cf92a667a913d2
+Depends: x11, ghostscript-fonts, t1lib5-shlibs, openmotif3-shlibs,
libpaper1-shlibs, freetype219-shlibs
+BuildDepends: t1lib5, openmotif3, x11-dev, libpaper1-dev, freetype219
Conflicts: poppler-bin
Replaces: poppler-bin
PatchScript: <<
- patch -p1 < ../xpdf-3.01pl2.patch
- sed 's|@PREFIX@|%p|g' < %a/%n.patch | patch -p1
+ sed 's|@PREFIX@|%p|g' < %a/%n.patch | patch -p1
+
+ perl -pi -e 's/(CXXFLAGS =)( [EMAIL PROTECTED]@)(.*)/\1\3\2/'
*/Makefile.in
+
+ perl -pi -e 's/-L(\$\(GOOLIBDIR\)) -l(Goo)/\1\/lib\2.a/' */Makefile.in
+ perl -pi -e 's/-L(\$\(FOFILIBDIR\)) -l(fofi)/\1\/lib\2.a/' */Makefile.in
+ perl -pi -e 's/-L(\$\(SPLASHLIBDIR\)) -l(splash)/\1\/lib\2.a/'
*/Makefile.in
+
+ perl -pi -e 's/\$\(CXXFLAGS\)// if /LDFLAGS/' xpdf/Makefile.in
<<
-SetCXXFLAGS: -I/usr/X11R6/include -I/usr/X11R6/include/freetype2
-SetCFLAGS: -I/usr/X11R6/include
-SetCPPFLAGS: -I/usr/X11R6/include
-NoSetLDFLAGS: true
-SetLDFLAGS: -L/usr/X11R6/lib
-ConfigureParams: --mandir='${prefix}/share/man'
--infodir='${prefix}/share/info'
--with-freetype2-includes=/usr/X11R6/include/freetype2
--with-freetype2-library=/usr/X11R6/lib --with-t1-includes=%p/include
--with-t1-library=%p/lib --with-Xm-library=%p/lib --with-Xm-includes=%p/include
--enable-a4-paper --with-libpaper-library=%p/lib
--with-libpaper-includes=%p/include
-DescPackaging: <<
- Revision 3/1003 adds security patch bringing package
- to upstream Version 3.01pl2
+SetCXXFLAGS: -I%p/include
+ConfigureParams: <<
+ --mandir=%p/share/man \
+ --with-freetype2-includes="`%p/lib/freetype219/bin/freetype-config
--cflags`" \
+ --with-freetype2-library="`%p/lib/freetype219/bin/freetype-config
--libs`" \
+ --enable-a4-paper
+<<
+InstallScript: make install DESTDIR=%d
+DescPort: <<
+ Put global -I after local ones.
+
+ Use paths to convenience libs instead of using -L and -l to
+ search for them.
+
+ Don't bother passing compiler flags to the linker.
+
+ Patch to allow the multiple freetype flags to be passed (thanks
Martin!).
<<
Description: Portable Document Format (PDF) file viewer
License: GPL
-DocFiles: README INSTALL CHANGES COPYING
+DocFiles: README ANNOUNCE CHANGES COPYING
Maintainer: None <[EMAIL PROTECTED]>
Homepage: http://www.foolabs.com/xpdf
Index: xpdf.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/xpdf.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- xpdf.patch 20 Jan 2006 20:32:32 -0000 1.1
+++ xpdf.patch 24 Jul 2007 17:36:46 -0000 1.1.2.1
@@ -1,3 +1,30 @@
+diff -Nurd -x'*`' xpdf-3.02.orig/configure xpdf-3.02/configure
+--- xpdf-3.02.orig/configure 2007-02-27 17:05:51.000000000 -0500
++++ xpdf-3.02/configure 2007-07-22 20:57:43.000000000 -0400
+@@ -9902,9 +9902,8 @@
+ elif test -d "$smr_cv_with_freetype2_library"; then
+ freetype2_LIBS="-L$smr_cv_with_freetype2_library -lfreetype"
+ else
+- { { echo "$as_me:$LINENO: error: argument must be boolean, file,
or directory" >&5
+-echo "$as_me: error: argument must be boolean, file, or directory" >&2;}
+- { (exit 1); exit 1; }; }
++ # blindly assume user knows what he's doing...
++ freetype2_LIBS="$smr_cv_with_freetype2_library"
+ fi
+ with_freetype2=yes
+ ;;
+@@ -9948,9 +9947,8 @@
+ if test -d "$smr_cv_with_freetype2_includes"; then
+ freetype2_CFLAGS="-I$smr_cv_with_freetype2_includes"
+ else
+- { { echo "$as_me:$LINENO: error: argument must be a directory" >&5
+-echo "$as_me: error: argument must be a directory" >&2;}
+- { (exit 1); exit 1; }; }
++ # blindly assume user knows what he's doing...
++ freetype2_CFLAGS="$smr_cv_with_freetype2_includes"
+ fi
+ else
+ freetype2_CFLAGS=
--- xpdf/doc/sample-xpdfrc.orig Wed Sep 7 11:31:56 2005
+++ xpdf/doc/sample-xpdfrc Wed Sep 7 11:35:05 2005
@@ -29,20 +29,20 @@
Index: idnits.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/idnits.info,v
retrieving revision 1.8.2.4
retrieving revision 1.8.2.5
diff -u -d -r1.8.2.4 -r1.8.2.5
--- idnits.info 19 Jun 2007 21:18:11 -0000 1.8.2.4
+++ idnits.info 24 Jul 2007 17:36:46 -0000 1.8.2.5
@@ -1,8 +1,8 @@
Package: idnits
-Version: 2.04.07
+Version: 2.04.12
Revision: 1
Source: http://tools.ietf.org/tools/%n/%n-%v.tgz
-Source-MD5: 85129c09f1324d2464904c24c3f51786
+Source-MD5: 874b6b41f2f0253d02c14f48ccb2ad84
Maintainer: Lars Eggert <[EMAIL PROTECTED]>
HomePage: http://tools.ietf.org/tools/idnits/
Index: detex.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/detex.info,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- detex.info 5 Sep 2006 04:42:20 -0000 1.2
+++ detex.info 24 Jul 2007 17:36:46 -0000 1.2.2.1
@@ -1,11 +1,12 @@
Package: detex
Version: 2.7
-Revision: 2
+Revision: 3
Source: ftp://ftp.cs.purdue.edu/pub/trinkle/%n-%v.tar.orig
SourceRename: %n-%v.tar
Source-MD5: df837b1adb40503f40b94b8169f0e154
NoSourceDirectory: True
PatchScript: patch <%a/%n.patch
+BuildDepends: flex
CompileScript: make DESTDIR=%p/bin
InstallScript: <<
mkdir -p %i/bin
Index: ghostscript.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/ghostscript.info,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -d -r1.7.2.1 -r1.7.2.2
--- ghostscript.info 30 Apr 2007 02:48:29 -0000 1.7.2.1
+++ ghostscript.info 24 Jul 2007 17:36:46 -0000 1.7.2.2
@@ -1,15 +1,15 @@
Package: ghostscript
-Version: 8.56
+Version: 8.57
Revision: 1
Description: Interpreter for PostScript and PDF
Source: mirror:sourceforge:%n/%n-%v.tar.gz
-Source-MD5: dcf20574f85b3c302e8982dcf427eb7c
+Source-MD5: 7187a46641984d854d7b3ca8c84425df
Depends: x11, x11-shlibs, ghostscript-fonts
BuildDepends: x11-dev
Conflicts: ghostscript-nox, ghostscript6, ghostscript6-nox, system-ghostscript8
Replaces: ghostscript-nox, ghostscript6, ghostscript6-nox, system-ghostscript8
-License: Restrictive/Distributable
+License: GPL
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
SetLIBRARY_PATH: %p/lib
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
