diff --git a/x11/gtk+/patches/patch-ac b/x11/gtk+/patches/patch-ac index 29639081e32..12818bbd9db 100644 --- a/x11/gtk+/patches/patch-ac +++ b/x11/gtk+/patches/patch-ac @@ -1,5 +1,5 @@ --- docs/Makefile.in.orig Wed Feb 16 06:30:33 2000 -+++ docs/Makefile.in Thu Mar 9 10:15:58 2000 ++++ docs/Makefile.in Sun Mar 12 08:51:49 2000 @@ -98,7 +98,7 @@ LT_RELEASE = @LT_RELEASE@ LT_REVISION = @LT_REVISION@ @@ -9,3 +9,78 @@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ +@@ -184,46 +184,40 @@ + DVIPS = dvips + + .texi.info: +- @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] +- cd $(srcdir) \ +- && $(MAKEINFO) `echo $< | sed 's,.*/,,'` ++ @rm -f $@ $@-[0-9] $@-[0-9][0-9] ++ $(MAKEINFO) -I $(srcdir) $< + + .texi.dvi: + TEXINPUTS=.:$$TEXINPUTS \ + MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $< + + .texi: +- @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] +- cd $(srcdir) \ +- && $(MAKEINFO) `echo $< | sed 's,.*/,,'` ++ @rm -f $@ $@-[0-9] $@-[0-9][0-9] ++ $(MAKEINFO) -I $(srcdir) $< + + .texinfo.info: +- @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] +- cd $(srcdir) \ +- && $(MAKEINFO) `echo $< | sed 's,.*/,,'` ++ @rm -f $@ $@-[0-9] $@-[0-9][0-9] ++ $(MAKEINFO) -I $(srcdir) $< + + .texinfo: +- @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] +- cd $(srcdir) \ +- && $(MAKEINFO) `echo $< | sed 's,.*/,,'` ++ @rm -f $@ $@-[0-9] $@-[0-9][0-9] ++ $(MAKEINFO) -I $(srcdir) $< + + .texinfo.dvi: + TEXINPUTS=.:$$TEXINPUTS \ + MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $< + + .txi.info: +- @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] +- cd $(srcdir) \ +- && $(MAKEINFO) `echo $< | sed 's,.*/,,'` ++ @rm -f $@ $@-[0-9] $@-[0-9][0-9] ++ $(MAKEINFO) -I $(srcdir) $< + + .txi.dvi: + TEXINPUTS=.:$$TEXINPUTS \ + MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $< + + .txi: +- @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] +- cd $(srcdir) \ +- && $(MAKEINFO) `echo $< | sed 's,.*/,,'` ++ @rm -f $@ $@-[0-9] $@-[0-9][0-9] ++ $(MAKEINFO) -I $(srcdir) $< + .dvi.ps: + $(DVIPS) $< -o $@ + +@@ -232,11 +226,10 @@ + $(mkinstalldirs) $(DESTDIR)$(infodir) + @list='$(INFO_DEPS)'; \ + for file in $$list; do \ +- d=$(srcdir); \ +- for ifile in `cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \ +- if test -f $$d/$$ifile; then \ +- echo " $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile"; \ +- $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile; \ ++ for ifile in `echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \ ++ if test -f $$ifile; then \ ++ echo " $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$ifile"; \ ++ $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$ifile; \ + else : ; fi; \ + done; \ + done diff --git a/x11/gtk+/patches/patch-af b/x11/gtk+/patches/patch-af index 06cddd63dc5..cabc38a1520 100644 --- a/x11/gtk+/patches/patch-af +++ b/x11/gtk+/patches/patch-af @@ -1,5 +1,5 @@ --- po/Makefile.in.in.orig Wed Feb 16 06:27:59 2000 -+++ po/Makefile.in.in Sat Mar 11 20:52:54 2000 ++++ po/Makefile.in.in Sat Mar 11 21:13:37 2000 @@ -19,7 +19,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -9,6 +9,15 @@ gnulocaledir = $(prefix)/share/locale gettextsrcdir = $(prefix)/share/gettext/po subdir = po +@@ -69,7 +69,7 @@ + $(MSGFMT) -o $@ $< + + .po.gmo: +- file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ ++ file=`echo $* | sed 's,.*/,,'`.gmo \ + && rm -f $$file && $(GMSGFMT) -o $$file $< + + .po.cat: @@ -111,9 +111,9 @@ install-data-no: all install-data-yes: all