[Darwinfiles-cvs] packagetree/dev-libs/expat/files expat-1.95.3.patch,NONE,1.1

[<ji...@us...>]

Update of /cvsroot/darwinfiles/packagetree/dev-libs/expat/files
In directory usw-pr-cvs1:/tmp/cvs-serv10949

Added Files:
	expat-1.95.3.patch 
Log Message:
Updated for darwin

--- NEW FILE: expat-1.95.3.patch ---
diff -ru expat-1.95.3/Makefile.in expat-new/Makefile.in
--- expat-1.95.3/Makefile.in	Mon Jun  3 14:16:07 2002
+++ expat-new/Makefile.in	Mon Jun 17 17:36:19 2002
@@ -30,7 +30,7 @@
 bindir = @bindir@
 libdir = @libdir@
 includedir = @includedir@
-mandir = ${prefix}/man/man1
+mandir = @mandir@
 
 top_builddir = .
 
@@ -68,22 +68,22 @@
 	tests/runtests
 
 install: xmlwf/xmlwf installlib
-	$(mkinstalldirs) $(bindir) $(mandir)
-	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf $(bindir)/xmlwf
-	$(INSTALL_DATA) doc/xmlwf.1 $(mandir)
+	$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
+	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf $(DESTDIR)$(bindir)/xmlwf
+	$(INSTALL_DATA) doc/xmlwf.1 $(DESTDIR)$(mandir)/man1
 
 installlib: lib/$(LIBRARY) lib/$(APIHEADER)
-	$(mkinstalldirs) $(libdir) $(includedir)
-	$(LIBTOOL) --mode=install $(INSTALL) lib/$(LIBRARY) $(libdir)/$(LIBRARY)
-	$(INSTALL_DATA) lib/$(APIHEADER) $(includedir)
+	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
+	$(LIBTOOL) --mode=install $(INSTALL) lib/$(LIBRARY) $(DESTDIR)$(libdir)/$(LIBRARY)
+	$(INSTALL_DATA) lib/$(APIHEADER) $(DESTDIR)$(includedir)
 
 uninstall: uninstalllib
-	$(LIBTOOL) --mode=uninstall rm -f $(bindir)/xmlwf
-	rm -f $(mandir)/xmlwf.1
+	$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(bindir)/xmlwf
+	rm -f $(DESTDIR)$(mandir)/man1/xmlwf.1
 
 uninstalllib:
-	$(LIBTOOL) --mode=uninstall rm -f $(libdir)/$(LIBRARY)
-	rm -f $(includedir)/$(APIHEADER)
+	$(LIBTOOL) --mode=uninstall rm -f $(DESDIR)$(libdir)/$(LIBRARY)
+	rm -f $(DESTDIR)$(includedir)/$(APIHEADER)
 
 # for VPATH builds (invoked by configure)
 mkdir-init:
diff -ru expat-1.95.3/configure expat-1.95.3-patched/configure
--- expat-1.95.3/configure	Mon Jun  3 15:12:02 2002
+++ expat-1.95.3-patched/configure	Sat Jun 29 18:10:57 2002
@@ -4917,7 +4917,7 @@
     # 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 -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 expat-1.95.3/conftools/ltmain.sh expat-1.95.3-patched/conftools/ltmain.sh
--- expat-1.95.3/conftools/ltmain.sh	Mon Jun  3 15:11:58 2002
+++ expat-1.95.3-patched/conftools/ltmain.sh	Sat Jun 29 18:08:51 2002
@@ -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='~'