- updated for 1.6.

Changed files:
    wget-DESTDIR.patch -> 1.3

diff --git a/wget-DESTDIR.patch b/wget-DESTDIR.patch
index bd3dd362cc8aa61b203379f2a77fda0dd8031bd5..51e44577767ce557a996d033aaed6f6671e84ede 100644 (file)
--- a/wget-DESTDIR.patch
+++ b/wget-DESTDIR.patch
@@ -1,15 +1,15 @@
-diff -ur wget-1.5.3.old/doc/Makefile.in wget-1.5.3/doc/Makefile.in
---- wget-1.5.3.old/doc/Makefile.in     Wed Jun 23 15:09:55 1999
-+++ wget-1.5.3/doc/Makefile.in Wed Jun 23 17:14:23 1999
-@@ -87,39 +87,39 @@
+diff -Nru wget-1.6/doc/Makefile.in wget-1.6.new/doc/Makefile.in
+--- wget-1.6/doc/Makefile.in   Tue Jan  2 02:20:58 2001
++++ wget-1.6.new/doc/Makefile.in       Tue Jan  2 02:22:39 2001
+@@ -90,45 +90,28 @@
  
  # install info pages, creating install directory if necessary
  install.info: wget.info
 -      $(top_srcdir)/mkinstalldirs $(infodir)
 +      $(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir)
-       -for file in $(srcdir)/wget.info $(srcdir)/wget.info-*[0-9]; do \
--         test -f "$$file" && $(INSTALL_DATA) $$file $(infodir) ; \
-+         test -f "$$file" && $(INSTALL_DATA) $$file $(DESTDIR)$(infodir) ; \
+       -for file in wget.info wget.info-*[0-9]; do \
+-         test -f $$file && $(INSTALL_DATA) $$file $(infodir)/$$file ; \
++         test -f $$file && $(INSTALL_DATA) $$file $(DESTDIR)$(infodir)/$$file ; \
        done
  
  # install man page, creating install directory if necessary
@@ -24,25 +24,24 @@ diff -ur wget-1.5.3.old/doc/Makefile.in wget-1.5.3/doc/Makefile.in
 -      $(top_srcdir)/mkinstalldirs $(sysconfdir)
 -      @if test -f $(WGETRC); then \
 -        if cmp -s $(srcdir)/sample.wgetrc $(WGETRC); then echo ""; \
-+      $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
-+      @if test -f $(DESTDIR)$(WGETRC); then \
-+        if cmp -s $(srcdir)/sample.wgetrc $(DESTDIR)$(WGETRC); then echo ""; \
-            else \
+-           else \
 -           echo ' $(INSTALL_DATA) $(srcdir)/sample.wgetrc $(WGETRC).new'; \
 -           $(INSTALL_DATA) $(srcdir)/sample.wgetrc $(WGETRC).new; \
--           echo "WARNING: File \`$(WGETRC)' already exists and is spared."; \
--           echo "         You might want to consider \`$(WGETRC).new',"; \
--           echo "         and merge both into \`$(WGETRC)', for the best."; \
-+           echo ' $(INSTALL_DATA) $(srcdir)/sample.wgetrc $(DESTDIR)$(WGETRC).new'; \
-+           $(INSTALL_DATA) $(srcdir)/sample.wgetrc $(DESTDIR)$(WGETRC).new; \
-+           echo "WARNING: File \`$(DESTDIR)$(WGETRC)' already exists and is spared."; \
-+           echo "         You might want to consider \`$(DESTDIR)$(WGETRC).new',"; \
-+           echo "         and merge both into \`$(DESTDIR)$(WGETRC)', for the best."; \
-         fi; \
-       else \
+-           echo; \
+-           echo "WARNING: Differing \`$(WGETRC)'"; \
+-           echo "         exists and has been spared.  You might want to"; \
+-           echo "         consider merging in the new lines from"; \
+-           echo "         \`$(WGETRC).new'."; \
+-           echo; \
+-           echo "<Hit RETURN to acknowledge>\c"; \
+-           read user_input; \
+-           echo; \
+-        fi; \
+-      else \
 -        $(INSTALL_DATA) $(srcdir)/sample.wgetrc $(WGETRC); \
-+        $(INSTALL_DATA) $(srcdir)/sample.wgetrc $(DESTDIR)$(WGETRC); \
-       fi
+-      fi
++      $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
++      $(INSTALL_DATA) $(srcdir)/sample.wgetrc $(DESTDIR)$(WGETRC)
  
  # uninstall info pages
  uninstall.info:
@@ -56,9 +55,9 @@ diff -ur wget-1.5.3.old/doc/Makefile.in wget-1.5.3/doc/Makefile.in
  
  #
  # Dependencies for cleanup
-diff -ur wget-1.5.3.old/po/Makefile.in.in wget-1.5.3/po/Makefile.in.in
---- wget-1.5.3.old/po/Makefile.in.in   Tue Mar 17 02:54:29 1998
-+++ wget-1.5.3/po/Makefile.in.in       Wed Jun 23 17:17:20 1999
+diff -Nru wget-1.6/po/Makefile.in.in wget-1.6.new/po/Makefile.in.in
+--- wget-1.6/po/Makefile.in.in Tue Jan  2 02:20:58 2001
++++ wget-1.6.new/po/Makefile.in.in     Tue Jan  2 02:20:07 2001
 @@ -92,8 +92,8 @@
        for cat in $$catalogs; do \
          cat=`basename $$cat`; \
@@ -70,10 +69,9 @@ diff -ur wget-1.5.3.old/po/Makefile.in.in wget-1.5.3/po/Makefile.in.in
          esac; \
          lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
          dir=$$destdir/$$lang/LC_MESSAGES; \
-Only in wget-1.5.3/po: Makefile.in.in~
-diff -ur wget-1.5.3.old/src/Makefile.in wget-1.5.3/src/Makefile.in
---- wget-1.5.3.old/src/Makefile.in     Tue Jun 23 23:29:18 1998
-+++ wget-1.5.3/src/Makefile.in Wed Jun 23 15:18:46 1999
+diff -Nru wget-1.6/src/Makefile.in wget-1.6.new/src/Makefile.in
+--- wget-1.6/src/Makefile.in   Tue Jan  2 02:20:58 2001
++++ wget-1.6.new/src/Makefile.in       Tue Jan  2 02:20:07 2001
 @@ -100,11 +100,11 @@
  uninstall: uninstall.bin
  
@@ -89,4 +87,3 @@ diff -ur wget-1.5.3.old/src/Makefile.in wget-1.5.3/src/Makefile.in
  
  #
  # Dependencies for cleanup
-Only in wget-1.5.3/src: Makefile.in~