Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/base In directory sc8-pr-cvs17:/tmp/cvs-serv8627
Modified Files: Tag: pangocairo-branch expat.info expat.patch expat1.info Added Files: Tag: pangocairo-branch expat1.patch Log Message: thanks, Dan ! Index: expat.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/base/expat.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 --- expat.info 16 Jan 2007 16:02:08 -0000 1.2.2.1 +++ expat.info 6 Nov 2007 14:53:28 -0000 1.2.2.2 @@ -1,15 +1,22 @@ Package: expat Version: 1.95.8 -Revision: 2 +Revision: 3 Conflicts: expat1 Replaces: expat1 -Patch: %n.patch +PatchFile: %n.patch +PatchFile-MD5: 67d62ceffb3da82f707961c106dca50c +BuildDepends: fink (>= 0.24.12-1) Depends: %N-shlibs (= %v-%r) BuildDependsOnly: true Source: mirror:sourceforge:expat/%n-%v.tar.gz Source-MD5: aff487543845a82fe262e6e2922b4c8e -NoSetLDFLAGS: false +PatchScript: << + patch -p1 < %{PatchFile} + perl -pi -e 's/hardcode_direct=yes/hardcode_direct=no/g' configure + perl -pi -e 's/^LTFLAGS/#LTFLAGS/' Makefile.in +<< ConfigureParams: --mandir=%p/share/man +InfoTest: TestScript: make check || exit 2 InstallScript: make install DESTDIR=%d DocFiles: << COPYING MANIFEST README doc/reference.html doc/style.css @@ -33,6 +40,8 @@ << DescPort: << placed hooks in Makefile for --mandir, and $DESTDIR + + make sure build-directory contents are used before global things << License: BSD Homepage: http://expat.sourceforge.net Index: expat1.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/base/expat1.info,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- expat1.info 16 Jan 2007 16:02:08 -0000 1.1.2.1 +++ expat1.info 6 Nov 2007 14:53:29 -0000 1.1.2.2 @@ -1,24 +1,27 @@ Package: expat1 Version: 2.0.0 Revision: 1 +BuildDepends: fink (>= 0.24.12-1) Depends: %N-shlibs (= %v-%r) Replaces: expat Conflicts: expat BuildDependsOnly: true Source: mirror:sourceforge:expat/expat-%v.tar.gz Source-MD5: d945df7f1c0868c5c73cf66ba9596f3f -SetCXXFlags: -I./lib -I. -NoSetLDFLAGS: false +PatchFile: %n.patch +PatchFile-MD5: 9e0265cd90c5670669d775dbd58b67e6 +PatchScript: << + patch -p1 < %{PatchFile} + perl -pi -e 's/^LTFLAGS/#LTFLAGS/' Makefile.in +<< SetCFLAGS: -g -O2 -fshort-wchar ConfigureParams: --mandir=%p/share/man CompileScript:<< ./configure %c make all << -InstallScript:<< - make install DESTDIR=%d - make check -<< +InfoTest: TestScript: make check || exit 2 +InstallScript: make install DESTDIR=%d DocFiles: << COPYING MANIFEST README doc/reference.html doc/style.css examples/elements.c examples/outline.c @@ -42,7 +45,7 @@ structures for which you may register handlers. << DescPort: << - The SetCXX field is needed in order to run 'make check' -- see + We have C++ sources, need to forge the automake rules for them, cf. http://sourceforge.net/tracker/index.php?func=detail&aid=1498374&group_id=10127&atid=110127 << License: BSD Index: expat.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/base/expat.patch,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -d -r1.1 -r1.1.2.1 --- expat.patch 22 Jun 2006 16:29:40 -0000 1.1 +++ expat.patch 6 Nov 2007 14:53:28 -0000 1.1.2.1 @@ -1,6 +1,6 @@ -diff -urN expat-1.95.8/Makefile.in expat-new/Makefile.in ---- expat-1.95.8/Makefile.in Fri May 7 16:00:48 2004 -+++ expat-new/Makefile.in Sat Sep 18 17:42:43 2004 +diff -Nurd -x'*~' expat-1.95.8.orig/Makefile.in expat-1.95.8/Makefile.in +--- expat-1.95.8.orig/Makefile.in 2004-05-07 16:00:48.000000000 -0400 ++++ expat-1.95.8/Makefile.in 2007-11-06 00:34:51.000000000 -0500 @@ -73,22 +73,22 @@ tests/runtests @@ -34,12 +34,12 @@ # for VPATH builds (invoked by configure) mkdir-init: -@@ -108,7 +108,7 @@ +@@ -106,7 +106,7 @@ ### autoconf this? LTFLAGS = --silent -COMPILE = $(CC) $(CFLAGS) $(DEFS) $(CPPFLAGS) $(INCLUDES) -+COMPILE = $(CC) $(DEFS) $(CPPFLAGS) $(INCLUDES) $(CFLAGS) ++COMPILE = $(CC) $(CFLAGS) $(DEFS) $(INCLUDES) $(CPPFLAGS) LTCOMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) LINK_LIB = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -no-undefined $(VSNFLAG) -rpath $(libdir) $(LDFLAGS) -o $@ LINK_EXE = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LDFLAGS) -o $@ --- NEW FILE: expat1.patch --- diff -Nurd -x'*~' expat-2.0.0.orig/Makefile.in expat-2.0.0/Makefile.in --- expat-2.0.0.orig/Makefile.in 2005-02-10 10:52:02.000000000 -0500 +++ expat-2.0.0/Makefile.in 2007-11-06 01:19:13.000000000 -0500 @@ -112,7 +112,7 @@ VSNFLAG = -version-info @LIBCURRENT@:@LIBREVISION@:@LIBAGE@ ### autoconf this? -LTFLAGS = --silent +#LTFLAGS = --silent COMPILE = $(CC) $(INCLUDES) $(CFLAGS) $(DEFS) $(CPPFLAGS) CXXCOMPILE = $(CXX) $(INCLUDES) $(CFLAGS) $(DEFS) $(CPPFLAGS) @@ -172,13 +172,18 @@ run-xmltest: xmlwf/xmlwf tests/XML-Test-Suite tests/xmltest.sh -.SUFFIXES: .c .lo .o +.SUFFIXES: .c .lo .o .cpp .c.o: $(COMPILE) -o $@ -c $< .c.lo: $(LTCOMPILE) -o $@ -c $< +.cpp.o: + $(CXXCOMPILE) -o $@ -c $< +.cpp.lo: + $(LTCXXCOMPILE) -o $@ -c $< + .PHONY: buildlib all \ clean distclean extraclean maintainer-clean \ dist distdir \ ------------------------------------------------------------------------- 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 Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs