Update of /cvsroot/fink/experimental/thesin/finkinfo/test
In directory usw-pr-cvs1:/tmp/cvs-serv3275

Modified Files:
        pingus-0.5.0pre3-1.info 
Added Files:
        libxml2-2.4.25-3.info libxml2-2.4.25-3.patch 
Log Message:
fixed libxml2 to use the new -isystem and LIBRARY_PATH and just a little pingus update 
as I start to try that one again

--- NEW FILE: libxml2-2.4.25-3.info ---
Package: libxml2
Version: 2.4.25
Revision: 3
Maintainer: Max Horn <[EMAIL PROTECTED]>
Depends: %N-shlibs (= %v-%r), %N-bin
BuildDepends: readline (>= 4.3-5)
Source: mirror:gnome:sources/%n/2.4/%n-%v.tar.bz2
Source-MD5: 1783360685323bd2a7d185a456c605bd
PatchScript: sed 's|@PREFIX@|%p|g' <%a/%f.patch | patch -p1
ConfigureParams: --mandir='${prefix}/share/man'
InstallScript: <<
 make install prefix=%i
 mkdir -p %i/share/doc %i/etc/xml
 mv %i/doc/%n-%v %i/share/doc/%n
 rm -rf %i/doc
<<
DocFiles: AUTHORS Copyright NEWS README TODO
BuildDependsOnly: True
SplitOff: <<
  Package: %N-shlibs
  Replaces: libxml2 (<< 2.4.18-2)
  Suggests: %N-bin
  Files: lib/libxml2.%v.dylib lib/libxml2.2.dylib
  Shlibs: %p/lib/libxml2.2.dylib %n (>= %v-%r)
  DocFiles: Copyright README
<<
SplitOff2: <<
  Package: %N-bin
  Depends: %N-shlibs (= %v-%r), readline-shlibs (>= 4.3-5)
  Replaces: libxml2 (<< 2.4.18-2)
  Files: bin/xmlcatalog bin/xmllint share/man/man1/xmlcatalog.1 
share/man/man1/xmllint.1 etc/xml
  DocFiles: Copyright README
  PostInstScript: <<
    if [ ! -f %p/etc/xmlcatalog ]; then
      xmlcatalog --noout --create %p/etc/xml/catalog
    fi
  <<
  PostRmScript: <<
    if [ purge = "$1" ]; then
      rm -f %p/etc/xml/catalog
    fi
  <<
<<
Description: XML parsing library, version 2
DescPort: <<
The Makefile is too stupid to link the executables against the right
copy of the library, so we help by setting LDFLAGS.
<<
DescPackaging: <<
Previous versions by Christoph Pfisterer <[EMAIL PROTECTED]>
<<
License: LGPL
Homepage: http://www.xmlsoft.org/

--- NEW FILE: libxml2-2.4.25-3.patch ---
diff -ru libxml2-2.4.25/catalog.c libxml2-2.4.25-patched/catalog.c
--- libxml2-2.4.25/catalog.c    2002-03-18 20:37:54.000000000 +0100
+++ libxml2-2.4.25-patched/catalog.c    2002-10-07 16:59:46.000000000 +0200
@@ -56,10 +56,10 @@
 #define XML_URN_PUBID "urn:publicid:";
 #define XML_CATAL_BREAK ((xmlChar *) -1)
 #ifndef XML_XML_DEFAULT_CATALOG
-#define XML_XML_DEFAULT_CATALOG "file:///etc/xml/catalog"
+#define XML_XML_DEFAULT_CATALOG "file://@PREFIX@/etc/xml/catalog"
 #endif
 #ifndef XML_SGML_DEFAULT_CATALOG
-#define XML_SGML_DEFAULT_CATALOG "file:///etc/sgml/catalog"
+#define XML_SGML_DEFAULT_CATALOG "file://@PREFIX@/etc/sgml/catalog"
 #endif
 
 static int xmlExpandCatalog(xmlCatalogPtr catal, const char *filename);
diff -ru libxml2-2.4.25/configure libxml2-2.4.25-patched/configure
--- libxml2-2.4.25/configure    2002-09-26 20:17:42.000000000 +0200
+++ libxml2-2.4.25-patched/configure    2002-10-07 16:59:46.000000000 +0200
@@ -3782,11 +3782,11 @@
     ;;
 
   darwin* | rhapsody*)
-    allow_undefined_flag='-undefined suppress'
+    allow_undefined_flag='-flat_namespace -undefined suppress'
     # FIXME: Relying on posixy $() will cause problems for
     #        cross-compilation, but unfortunately the echo tests do not
     #        yet detect zsh echo's removal of \ escapes.
-    archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) 
$allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname 
$(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)'
+    archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) 
+$allow_undefined_flag -o $lib $libobjs $deplibs$linkopts $(test .$module != .yes && 
+echo -install_name $rpath/$soname $tmp_verstring)'
     # We need to add '_' to the symbols in $export_symbols first
     #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
     hardcode_direct=yes
diff -ru libxml2-2.4.25/ltmain.sh libxml2-2.4.25-patched/ltmain.sh
--- libxml2-2.4.25/ltmain.sh    2002-09-26 20:17:38.000000000 +0200
+++ libxml2-2.4.25-patched/ltmain.sh    2002-10-07 16:59:47.000000000 +0200
@@ -2858,6 +2858,11 @@
        if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
          eval cmds=\"$archive_expsym_cmds\"
        else
+          if test "x$verstring" = "x0.0"; then
+            tmp_verstring=
+          else
+            tmp_verstring="$verstring"
+          fi
          eval cmds=\"$archive_cmds\"
        fi
        IFS="${IFS=     }"; save_ifs="$IFS"; IFS='~'
diff -ru libxml2-2.4.25/xmlcatalog.c libxml2-2.4.25-patched/xmlcatalog.c
--- libxml2-2.4.25/xmlcatalog.c 2002-03-22 04:35:22.000000000 +0100
+++ libxml2-2.4.25-patched/xmlcatalog.c 2002-10-07 16:59:47.000000000 +0200
@@ -41,7 +41,7 @@
 
 #ifdef LIBXML_CATALOG_ENABLED
 
-#define XML_SGML_DEFAULT_CATALOG "/etc/sgml/catalog"
+#define XML_SGML_DEFAULT_CATALOG "@PREFIX@/etc/sgml/catalog"
 
 /************************************************************************
  *                                                                     *
diff -ru libxml2-2.4.25/xmllint.c libxml2-2.4.25-patched/xmllint.c
--- libxml2-2.4.25/xmllint.c    2002-09-25 04:35:22.000000000 +0200
+++ libxml2-2.4.25-patched/xmllint.c    2002-10-07 16:59:47.000000000 +0200
@@ -1075,7 +1075,7 @@
 #ifdef LIBXML_CATALOG_ENABLED
     printf("\t--catalogs : use SGML catalogs from $SGML_CATALOG_FILES\n");
     printf("\t             otherwise XML Catalogs starting from \n");
-    printf("\t         file:///etc/xml/catalog are activated by default\n");
+    printf("\t         file://@PREFIX@/etc/xml/catalog are activated by default\n");
     printf("\t--nocatalogs: deactivate all catalogs\n");
 #endif
     printf("\t--auto : generate a small doc on the fly\n");

Index: pingus-0.5.0pre3-1.info
===================================================================
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/test/pingus-0.5.0pre3-1.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pingus-0.5.0pre3-1.info     10 Oct 2002 18:44:21 -0000      1.1
+++ pingus-0.5.0pre3-1.info     4 Nov 2002 19:33:13 -0000       1.2
@@ -1,18 +1,25 @@
 Package: pingus
 Version: 0.5.0pre3
 Revision: 1
+###
 Depends: imagemagick, libxml2-shlibs, hermes-shlibs, clanlib-shlibs, pth
 BuildDepends: libxml2, hermes, clanlib, automake
-Source: http://pingus.seul.org/%n-%v.tar.bz2
+###
+Source: ftp://%n.seul.org/pub/%n/%n-%v.tar.bz2
+Source-MD5: 737ab23ffd9407d13ec15a57a3150066
+###
 Patch: %f.patch
-ConfigureParams: --without-clanGL --mandir=%p/share/man --infodir=%p/share/info 
--libexecdir=%p/lib
-SetCXXFLAGS: -g -fno-common -D__DARWIN__ -D__unix__
+###
+ConfigureParams: --without-clanGL --mandir=%i/share/man --infodir=%p/share/info 
+--libexecdir=%p/lib
+###
 DocFiles: ABOUT-NLS AUTHORS BUGS COPYING CREDITS ChangeLog FAQ INSTALL NEWS README 
THANKS TODO
+###
 Description: Lemmings clone with penguins
 DescDetail: <<
 Pingus is a free Lemmings clone for any platform supported by ClanLib
 (including X11, GGI, and Win32).
 <<
+###
 License: GPL
 Maintainer: Justin F. Hallett <[EMAIL PROTECTED]>
 Homepage: http://pingus.seul.org/



-------------------------------------------------------
This SF.net email is sponsored by: ApacheCon, November 18-21 in
Las Vegas (supported by COMDEX), the only Apache event to be
fully supported by the ASF. http://www.apachecon.com
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to