- down to 1.18.1.4

Changed files:
    groff-DESTDIR.patch -> 1.12
    groff-gcc4.patch -> 1.2
    groff-info.patch -> 1.5

diff --git a/groff-DESTDIR.patch b/groff-DESTDIR.patch
index 9177e435b13826f171a2b218737265ea0f0a045b..ce8d1e260a3860c40f07f5e3b24e97468e30c123 100644 (file)
--- a/groff-DESTDIR.patch
+++ b/groff-DESTDIR.patch
@@ -1,6 +1,7 @@
---- groff-1.19.1/Makefile.comm.orig    2004-03-09 07:47:58.000000000 +0100
-+++ groff-1.19.1/Makefile.comm 2004-07-20 08:08:52.291966144 +0200
-@@ -168,29 +168,25 @@
+diff -Nur groff-1.18.orig/Makefile.comm groff-1.18/Makefile.comm
+--- groff-1.18.orig/Makefile.comm      Mon Jun  3 18:01:41 2002
++++ groff-1.18/Makefile.comm   Mon Jul 29 14:46:37 2002
+@@ -163,29 +163,25 @@
  
  .PHONY: install_man
  install_man:
@@ -36,7 +37,7 @@
         echo $(INSTALL_DATA) $$p $$target; \
         $(INSTALL_DATA) $$p $$target; \
        done
-@@ -218,9 +214,8 @@
+@@ -213,9 +209,8 @@
  
  .PHONY: install_prog
  install_prog:
@@ -48,7 +49,7 @@
  
  .PHONY: uninstall_prog
  uninstall_prog:
-@@ -228,31 +223,31 @@
+@@ -223,21 +218,16 @@
  
  .PHONY: install_dev
  install_dev:
@@ -57,75 +58,29 @@
 -      -test -d $(datasubdir) || $(mkinstalldirs) $(datasubdir)
 -      -test -d $(fontdir) || $(mkinstalldirs) $(fontdir)
 -      -test -d $(fontsubdir) || $(mkinstalldirs) $(fontsubdir)
-+      -test -d $(DESTDIR)$(datadir) || $(mkinstalldirs) $(DESTDIR)$(datadir)
-+      -test -d $(DESTDIR)$(dataprogramdir) || $(mkinstalldirs) $(DESTDIR)$(dataprogramdir)
-+      -test -d $(DESTDIR)$(datasubdir) || $(mkinstalldirs) $(DESTDIR)$(datasubdir)
-+      -test -d $(DESTDIR)$(fontdir) || $(mkinstalldirs) $(DESTDIR)$(fontdir)
-+      -test -d $(DESTDIR)$(fontsubdir) || $(mkinstalldirs) $(DESTDIR)$(fontsubdir)
-       -if test -d $(srcdir)/generate; then \
--        test -d $(fontsubdir)/generate \
--          || $(mkinstalldirs) $(fontsubdir)/generate; \
-+        test -d $(DESTDIR)$(fontsubdir)/generate \
-+          || $(mkinstalldirs) $(DESTDIR)$(fontsubdir)/generate; \
-       fi
-       -test -z "$(DEVFILES)" \
-         || for f in ""$(DEVFILES); do \
--             rm -f $(fontsubdir)/$$f; \
-+             rm -f $(DESTDIR)$(fontsubdir)/$$f; \
-              if test -f $$f; then \
--               $(INSTALL_DATA) $$f $(fontsubdir)/$$f; \
-+               $(INSTALL_DATA) $$f $(DESTDIR)$(fontsubdir)/$$f; \
-              else \
--               $(INSTALL_DATA) $(srcdir)/$$f $(fontsubdir)/$$f; \
-+               $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(fontsubdir)/$$f; \
-              fi; \
-            done
-       -test -z "$(DEVSCRIPTS)" \
-         || for f in ""$(DEVSCRIPTS); do \
--             rm -f $(fontsubdir)/$$f; \
-+             rm -f $(DESTDIR)$(fontsubdir)/$$f; \
-              if test -f $$f; then \
--               $(INSTALL_SCRIPT) $$f $(fontsubdir)/$$f; \
-+               $(INSTALL_SCRIPT) $$f $(DESTDIR)$(fontsubdir)/$$f; \
-              else \
--               $(INSTALL_SCRIPT) $(srcdir)/$$f $(fontsubdir)/$$f; \
-+               $(INSTALL_SCRIPT) $(srcdir)/$$f $(DESTDIR)$(fontsubdir)/$$f; \
-              fi; \
-            done
- 
-diff -Nru groff-1.19.orig/contrib/eqn2graph/Makefile.sub groff-1.19/contrib/eqn2graph/Makefile.sub
---- groff-1.19.orig/contrib/eqn2graph/Makefile.sub     2002-07-08 00:14:56.000000000 +0200
-+++ groff-1.19/contrib/eqn2graph/Makefile.sub  2003-04-30 09:40:08.000000000 +0200
-@@ -11,9 +11,8 @@
-       chmod +x $@
- 
- install_data: eqn2graph
--      -test -d $(bindir) || $(mkinstalldirs) $(bindir)
--      -rm -f $(bindir)/eqn2graph
--      $(INSTALL_SCRIPT) eqn2graph $(bindir)/eqn2graph
-+      $(mkinstalldirs) $(DESTDIR)$(bindir)
-+      $(INSTALL_SCRIPT) eqn2graph $(DESTDIR)$(bindir)/eqn2graph
- 
- uninstall_sub:
-       -rm -f $(bindir)/eqn2graph
-diff -Nru groff-1.19.orig/contrib/groffer/Makefile.sub groff-1.19/contrib/groffer/Makefile.sub
---- groff-1.19.orig/contrib/groffer/Makefile.sub       2002-10-21 11:51:55.000000000 +0200
-+++ groff-1.19/contrib/groffer/Makefile.sub    2003-04-30 09:40:08.000000000 +0200
-@@ -39,9 +39,8 @@
-       chmod +x $@
- 
- install_data: groffer
--      -test -d $(bindir) || $(mkinstalldirs) $(bindir)
--      -rm -f $(bindir)/groffer
--      $(INSTALL_SCRIPT) groffer $(bindir)/groffer
-+      $(mkinstalldirs) $(DESTDIR)$(bindir)
-+      $(INSTALL_SCRIPT) groffer $(DESTDIR)$(bindir)/groffer
+-      -if test -d $(srcdir)/generate; then \
+-        test -d $(fontsubdir)/generate || \
+-          $(mkinstalldirs) $(fontsubdir)/generate; \
+-      fi
++      $(mkinstalldirs) $(DESTDIR)$(datadir)
++      $(mkinstalldirs) $(DESTDIR)$(dataprogramdir)
++      $(mkinstalldirs) $(DESTDIR)$(datasubdir)
++      $(mkinstalldirs) $(DESTDIR)$(fontdir)
++      $(mkinstalldirs) $(DESTDIR)$(fontsubdir)/generate
+       -for f in $(DEVFILES); do \
+-        rm -f $(fontsubdir)/$$f; \
+         if test -f $$f; then \
+-          $(INSTALL_DATA) $$f $(fontsubdir)/$$f; \
++          $(INSTALL_DATA) $$f $(DESTDIR)$(fontsubdir)/$$f; \
+         else \
+-          $(INSTALL_DATA) $(srcdir)/$$f $(fontsubdir)/$$f; \
++          $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(fontsubdir)/$$f; \
+         fi; \
+       done
  
- uninstall_sub:
-       -rm -f $(bindir)/groffer
-diff -Nru groff-1.19.orig/contrib/mm/Makefile.sub groff-1.19/contrib/mm/Makefile.sub
---- groff-1.19.orig/contrib/mm/Makefile.sub    2002-05-22 08:26:12.000000000 +0200
-+++ groff-1.19/contrib/mm/Makefile.sub 2003-04-30 09:40:08.000000000 +0200
+diff -Nur groff-1.18.orig/contrib/mm/Makefile.sub groff-1.18/contrib/mm/Makefile.sub
+--- groff-1.18.orig/contrib/mm/Makefile.sub    Wed May 22 08:26:12 2002
++++ groff-1.18/contrib/mm/Makefile.sub Mon Jul 29 14:50:50 2002
 @@ -17,31 +17,27 @@
  install: install_mm
  
@@ -168,143 +123,84 @@ diff -Nru groff-1.19.orig/contrib/mm/Makefile.sub groff-1.19/contrib/mm/Makefile
  
  mmroff: mmroff.pl
        -rm -f $@
-diff -Nru groff-1.19.orig/contrib/mom/Makefile.sub groff-1.19/contrib/mom/Makefile.sub
---- groff-1.19.orig/contrib/mom/Makefile.sub   2003-04-05 00:32:53.000000000 +0200
-+++ groff-1.19/contrib/mom/Makefile.sub        2003-04-30 09:40:08.000000000 +0200
-@@ -95,24 +95,20 @@
- 
- install_data: $(NORMALFILES) $(HTMLDOCFILES) \
-               $(EXAMPLEFILES) $(PROCESSEDEXAMPLEFILES)
--      -test -d $(tmacdir) || $(mkinstalldirs) $(tmacdir)
-+      $(mkinstalldirs) $(DESTDIR)$(tmacdir)
-       for f in $(NORMALFILES); do \
--        rm -f $(tmacdir)/$$f; \
--        $(INSTALL_DATA) $(srcdir)/$$f $(tmacdir)/$$f; \
-+        $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(tmacdir)/$$f; \
-       done
--      -test -d $(htmldocdir)/momdoc || $(mkinstalldirs) $(htmldocdir)/momdoc
-+      $(mkinstalldirs) $(DESTDIR)$(htmldocdir)/momdoc
-       for f in $(HTMLDOCFILES); do \
--        rm -f $(htmldocdir)/$$f; \
--        $(INSTALL_DATA) $(srcdir)/$$f $(htmldocdir)/$$f; \
-+        $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(htmldocdir)/$$f; \
-       done
--      -test -d $(exampledir) || $(mkinstalldirs) $(exampledir)
-+      $(mkinstalldirs) $(DESTDIR)$(exampledir)
-       for f in $(EXAMPLEFILES); do \
--        rm -f $(exampledir)/$$f; \
--        $(INSTALL_DATA) $(srcdir)/$$f $(docdir)/$$f; \
-+        $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(docdir)/$$f; \
-       done
-       for f in $(PROCESSEDEXAMPLEFILES); do \
--        rm -f $(exampledir)/$$f; \
--        $(INSTALL_DATA) $$f $(docdir)/$$f; \
-+        $(INSTALL_DATA) $$f $(DESTDIR)$(docdir)/$$f; \
-       done
- 
- uninstall_sub:
-diff -Nru groff-1.19.orig/contrib/pic2graph/Makefile.sub groff-1.19/contrib/pic2graph/Makefile.sub
---- groff-1.19.orig/contrib/pic2graph/Makefile.sub     2001-08-11 00:16:11.000000000 +0200
-+++ groff-1.19/contrib/pic2graph/Makefile.sub  2003-04-30 09:40:08.000000000 +0200
-@@ -11,9 +11,8 @@
-       chmod +x $@
- 
- install_data: pic2graph
--      -test -d $(bindir) || $(mkinstalldirs) $(bindir)
--      -rm -f $(bindir)/pic2graph
--      $(INSTALL_SCRIPT) pic2graph $(bindir)/pic2graph
-+      $(mkinstalldirs) $(DESTDIR)$(bindir)
-+      $(INSTALL_SCRIPT) pic2graph $(DESTDIR)$(bindir)/pic2graph
- 
- uninstall_sub:
-       -rm -f $(bindir)/pic2graph
---- groff-1.19.1/doc/Makefile.sub.orig 2004-03-05 10:52:57.000000000 +0100
-+++ groff-1.19.1/doc/Makefile.sub      2004-07-20 08:11:31.467767744 +0200
-@@ -150,52 +150,52 @@
+diff -Nur groff-1.18.orig/doc/Makefile.sub groff-1.18/doc/Makefile.sub
+--- groff-1.18.orig/doc/Makefile.sub   Fri Jun 14 17:18:34 2002
++++ groff-1.18/doc/Makefile.sub        Mon Jul 29 14:57:57 2002
+@@ -133,52 +133,42 @@
  
  install_data: groff $(DOCFILES) $(PROCESSEDDOCFILES) $(make_install_html) \
                $(EXAMPLEFILES) $(PROCESSEDEXAMPLEFILES)
 -      -test -d $(infodir) || $(mkinstalldirs) $(infodir)
-+      -test -d $(DESTDIR)$(infodir) || $(mkinstalldirs) $(DESTDIR)$(infodir)
++      $(mkinstalldirs) $(DESTDIR)$(infodir)
  # Prefer info files in builddir over srcdir; we test for
  # the existence of `groff'.
        d=.; \
 -        test -f "groff" || d=$(srcdir); \
--        for f in $$d/groff `ls $$d/groff-*`; do \
+-        for f in $$d/groff $$d/groff-*; do \
 -          rm -f $(infodir)/`basename $$f`; \
 -          $(INSTALL_DATA) $$f $(infodir)/`basename $$f`; \
 +        test -f "groff.info" || d=$(srcdir); \
-+        for f in $$d/groff.info `ls $$d/groff.info-*`; do \
-+          rm -f $(DESTDIR)$(infodir)/`basename $$f`; \
++        for f in $$d/groff.info* ; do \
 +          $(INSTALL_DATA) $$f $(DESTDIR)$(infodir)/`basename $$f`; \
          done
 -      $(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/groff
 -      -test -d $(docdir) || $(mkinstalldirs) $(docdir)
-+      $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/groff.info
-+      -test -d $(DESTDIR)$(docdir) || $(mkinstalldirs) $(DESTDIR)$(docdir)
++      $(mkinstalldirs) $(DESTDIR)$(docdir)
        for f in $(DOCFILES); do \
 -        rm -f $(docdir)/$$f; \
 -        $(INSTALL_DATA) $(srcdir)/$$f $(docdir)/$$f; \
-+        rm -f $(DESTDIR)$(docdir)/$$f; \
 +        $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(docdir)/$$f; \
        done
        for f in $(PROCESSEDDOCFILES); do \
 -        rm -f $(docdir)/$$f; \
 -        $(INSTALL_DATA) $$f $(docdir)/$$f; \
-+        rm -f $(DESTDIR)$(docdir)/$$f; \
 +        $(INSTALL_DATA) $$f $(DESTDIR)$(docdir)/$$f; \
        done
 -      -test -d $(exampledir) || $(mkinstalldirs) $(exampledir)
-+      -test -d $(DESTDIR)$(exampledir) || $(mkinstalldirs) $(DESTDIR)$(exampledir)
++      $(mkinstalldirs) $(DESTDIR)$(exampledir)
        for f in $(EXAMPLEFILES); do \
 -        rm -f $(exampledir)/$$f; \
 -        $(INSTALL_DATA) $(srcdir)/$$f $(exampledir)/$$f; \
-+        rm -f $(DESTDIR)$(exampledir)/$$f; \
 +        $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(exampledir)/$$f; \
        done
        for f in $(PROCESSEDEXAMPLEFILES); do \
 -        rm -f $(exampledir)/$$f; \
 -        $(INSTALL_DATA) $$f $(exampledir)/$$f; \
-+        rm -f $(DESTDIR)$(exampledir)/$$f; \
 +        $(INSTALL_DATA) $$f $(DESTDIR)$(exampledir)/$$f; \
        done
  
  install_html: $(HTMLDOCFILES) $(HTMLEXAMPLEFILES)
 -      -test -d $(htmldocdir) || $(mkinstalldirs) $(htmldocdir)
-+      -test -d $(DESTDIR)$(htmldocdir) || $(mkinstalldirs) $(DESTDIR)$(htmldocdir)
-       for f in `ls $(HTMLDOCFILESALL)`; do \
++      $(mkinstalldirs) $(DESTDIR)$(htmldocdir)
+       for f in $(HTMLDOCFILES); do \
 -        rm -f $(htmldocdir)/$$f; \
 -        $(INSTALL_DATA) $$f $(htmldocdir)/$$f; \
-+        rm -f $(DESTDIR)$(htmldocdir)/$$f; \
 +        $(INSTALL_DATA) $$f $(DESTDIR)$(htmldocdir)/$$f; \
        done
 -      -test -d $(htmldocimagedir) || $(mkinstalldirs) $(htmldocimagedir)
 -      rm -f $(htmldocimagedir)/$(HTMLDOCIMAGEFILES)
 -      $(INSTALL_DATA) $(imagedir)/$(HTMLDOCIMAGEFILES) $(htmldocimagedir)
 -      -test -d $(exampledir) || $(mkinstalldirs) $(exampledir)
-+      -test -d $(DESTDIR)$(htmldocimagedir) || $(mkinstalldirs) $(DESTDIR)$(htmldocimagedir)
-+      rm -f $(DESTDIR)$(htmldocimagedir)/$(HTMLDOCIMAGEFILES)
++      $(mkinstalldirs) $(DESTDIR)$(htmldocimagedir)
 +      $(INSTALL_DATA) $(imagedir)/$(HTMLDOCIMAGEFILES) $(DESTDIR)$(htmldocimagedir)
-+      -test -d $(DESTDIR)$(exampledir) || $(mkinstalldirs) $(DESTDIR)$(exampledir)
++      $(mkinstalldirs) $(DESTDIR)$(exampledir)
        for f in $(HTMLEXAMPLEFILES); do \
 -        rm -f $(exampledir)/$$f; \
 -        $(INSTALL_DATA) $$f $(exampledir)/$$f; \
-+        rm -f $(DESTDIR)$(exampledir)/$$f; \
 +        $(INSTALL_DATA) $$f $(DESTDIR)$(exampledir)/$$f; \
        done
 -      -test -d $(exampleimagedir) || $(mkinstalldirs) $(exampleimagedir)
 -      rm -f $(exampleimagedir)/$(HTMLEXAMPLEIMAGEFILES)
 -      $(INSTALL_DATA) $(imagedir)/$(HTMLEXAMPLEIMAGEFILES) $(exampleimagedir)
-+      -test -d $(DESTDIR)$(exampleimagedir) || $(mkinstalldirs) $(DESTDIR)$(exampleimagedir)
-+      rm -f $(DESTDIR)$(exampleimagedir)/$(HTMLEXAMPLEIMAGEFILES)
++      $(mkinstalldirs) $(DESTDIR)$(exampleimagedir)
 +      $(INSTALL_DATA) $(imagedir)/$(HTMLEXAMPLEIMAGEFILES) $(DESTDIR)$(exampleimagedir)
  
  uninstall_sub:
-       -for f in groff `ls groff-*`; do \
-diff -Nru groff-1.19.orig/src/preproc/eqn/Makefile.sub groff-1.19/src/preproc/eqn/Makefile.sub
---- groff-1.19.orig/src/preproc/eqn/Makefile.sub       2003-04-12 15:52:47.000000000 +0200
-+++ groff-1.19/src/preproc/eqn/Makefile.sub    2003-04-30 09:40:08.000000000 +0200
-@@ -53,8 +53,7 @@
+       -for f in groff groff-*; do \
+diff -Nur groff-1.18.orig/src/preproc/eqn/Makefile.sub groff-1.18/src/preproc/eqn/Makefile.sub
+--- groff-1.18.orig/src/preproc/eqn/Makefile.sub       Sun Jun  2 18:42:56 2002
++++ groff-1.18/src/preproc/eqn/Makefile.sub    Mon Jul 29 14:58:47 2002
+@@ -52,8 +52,7 @@
        chmod +x $@
  
  install_data: neqn
@@ -314,9 +210,9 @@ diff -Nru groff-1.19.orig/src/preproc/eqn/Makefile.sub groff-1.19/src/preproc/eq
  
  uninstall_sub:
        -rm -f $(bindir)/$(NAMEPREFIX)neqn
-diff -Nru groff-1.19.orig/src/roff/grog/Makefile.sub groff-1.19/src/roff/grog/Makefile.sub
---- groff-1.19.orig/src/roff/grog/Makefile.sub 2002-06-14 12:44:00.000000000 +0200
-+++ groff-1.19/src/roff/grog/Makefile.sub      2003-04-30 09:40:08.000000000 +0200
+diff -Nur groff-1.18.orig/src/roff/grog/Makefile.sub groff-1.18/src/roff/grog/Makefile.sub
+--- groff-1.18.orig/src/roff/grog/Makefile.sub Fri Jun 14 12:44:00 2002
++++ groff-1.18/src/roff/grog/Makefile.sub      Mon Jul 29 14:59:05 2002
 @@ -24,9 +24,8 @@
        chmod +x $@
  
@@ -329,10 +225,10 @@ diff -Nru groff-1.19.orig/src/roff/grog/Makefile.sub groff-1.19/src/roff/grog/Ma
  
  uninstall_sub:
        -rm -f $(bindir)/grog
-diff -Nru groff-1.19.orig/src/roff/nroff/Makefile.sub groff-1.19/src/roff/nroff/Makefile.sub
---- groff-1.19.orig/src/roff/nroff/Makefile.sub        2003-01-28 09:40:29.000000000 +0100
-+++ groff-1.19/src/roff/nroff/Makefile.sub     2003-04-30 09:40:08.000000000 +0200
-@@ -13,9 +13,8 @@
+diff -Nur groff-1.18.orig/src/roff/nroff/Makefile.sub groff-1.18/src/roff/nroff/Makefile.sub
+--- groff-1.18.orig/src/roff/nroff/Makefile.sub        Thu Nov 16 22:10:44 2000
++++ groff-1.18/src/roff/nroff/Makefile.sub     Mon Jul 29 14:59:55 2002
+@@ -12,9 +12,8 @@
        chmod +x $@
  
  install_data: nroff
@@ -344,10 +240,10 @@ diff -Nru groff-1.19.orig/src/roff/nroff/Makefile.sub groff-1.19/src/roff/nroff/
  
  uninstall_sub:
        -rm -f $(bindir)/$(NAMEPREFIX)nroff
-diff -Nru groff-1.19.orig/src/utils/afmtodit/Makefile.sub groff-1.19/src/utils/afmtodit/Makefile.sub
---- groff-1.19.orig/src/utils/afmtodit/Makefile.sub    2003-02-25 17:55:24.000000000 +0100
-+++ groff-1.19/src/utils/afmtodit/Makefile.sub 2003-04-30 09:40:08.000000000 +0200
-@@ -17,9 +17,8 @@
+diff -Nur groff-1.18.orig/src/utils/afmtodit/Makefile.sub groff-1.18/src/utils/afmtodit/Makefile.sub
+--- groff-1.18.orig/src/utils/afmtodit/Makefile.sub    Thu Nov 16 22:10:46 2000
++++ groff-1.18/src/utils/afmtodit/Makefile.sub Mon Jul 29 15:00:27 2002
+@@ -15,9 +15,8 @@
        chmod +x afmtodit
  
  install_data: afmtodit
@@ -359,9 +255,9 @@ diff -Nru groff-1.19.orig/src/utils/afmtodit/Makefile.sub groff-1.19/src/utils/a
  
  uninstall_sub:
        -rm -f $(bindir)/afmtodit
-diff -Nru groff-1.19.orig/src/utils/indxbib/Makefile.sub groff-1.19/src/utils/indxbib/Makefile.sub
---- groff-1.19.orig/src/utils/indxbib/Makefile.sub     2003-04-12 15:52:32.000000000 +0200
-+++ groff-1.19/src/utils/indxbib/Makefile.sub  2003-04-30 09:40:08.000000000 +0200
+diff -Nur groff-1.18.orig/src/utils/indxbib/Makefile.sub groff-1.18/src/utils/indxbib/Makefile.sub
+--- groff-1.18.orig/src/utils/indxbib/Makefile.sub     Fri May  3 00:33:22 2002
++++ groff-1.18/src/utils/indxbib/Makefile.sub  Mon Jul 29 15:01:35 2002
 @@ -12,18 +12,10 @@
  NAMEPREFIX=$(g)
  
@@ -385,10 +281,10 @@ diff -Nru groff-1.19.orig/src/utils/indxbib/Makefile.sub groff-1.19/src/utils/in
  
  uninstall_sub:
        -rm -f $(common_words_file)
-diff -Nru groff-1.19.orig/tmac/Makefile.sub groff-1.19/tmac/Makefile.sub
---- groff-1.19.orig/tmac/Makefile.sub  2003-04-08 19:47:27.000000000 +0200
-+++ groff-1.19/tmac/Makefile.sub       2003-04-30 09:44:41.000000000 +0200
-@@ -46,41 +46,31 @@
+diff -Nur groff-1.18.orig/tmac/Makefile.sub groff-1.18/tmac/Makefile.sub
+--- groff-1.18.orig/tmac/Makefile.sub  Sat Jul 13 22:41:16 2002
++++ groff-1.18/tmac/Makefile.sub       Mon Jul 29 15:04:07 2002
+@@ -43,39 +43,30 @@
  
  install_data: $(NORMALFILES) $(SPECIALFILES) man.local \
                stamp-strip stamp-wrap stamp-sed
@@ -417,13 +313,10 @@ diff -Nru groff-1.19.orig/tmac/Makefile.sub groff-1.19/tmac/Makefile.sub
 -      $(INSTALL_DATA) $(srcdir)/an.tmac $(tmacdir)/$(tmac_an_prefix)an.tmac
 -      -rm -f $(tmacdir)/man.tmac
 -      $(INSTALL_DATA) man.tmac-sed $(tmacdir)/man.tmac
--      -rm -f $(tmacdir)/www.tmac
--      $(INSTALL_DATA) www.tmac-sed $(tmacdir)/www.tmac
 +      $(INSTALL_DATA) $(srcdir)/s.tmac $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac
 +      $(INSTALL_DATA) ms.tmac-sed $(DESTDIR)$(tmacdir)/ms.tmac
 +      $(INSTALL_DATA) $(srcdir)/an.tmac $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac
 +      $(INSTALL_DATA) man.tmac-sed $(DESTDIR)$(tmacdir)/man.tmac
-+      $(INSTALL_DATA) www.tmac-sed $(DESTDIR)$(tmacdir)/www.tmac
        for f in $(STRIPFILES); do \
 -        rm -f $(tmacdir)/$$f; \
 -        $(INSTALL_DATA) $$f-s $(tmacdir)/$$f; \
@@ -445,18 +338,65 @@ diff -Nru groff-1.19.orig/tmac/Makefile.sub groff-1.19/tmac/Makefile.sub
  
  stamp-strip: $(STRIPFILES) $(MDOCFILES) mdoc.local
        for f in $(STRIPFILES) $(MDOCFILES) mdoc.local; do \
---- groff-1.19.1/contrib/grap2graph/Makefile.sub.orig  2003-07-02 17:35:01.000000000 +0200
-+++ groff-1.19.1/contrib/grap2graph/Makefile.sub       2004-07-20 22:37:45.706482464 +0200
-@@ -11,9 +11,9 @@
+--- groff-1.18.orig/contrib/eqn2graph/Makefile.sub     Mon Jul  8 00:14:56 2002
++++ groff-1.18/contrib/eqn2graph/Makefile.sub  Mon Jul 29 15:12:05 2002
+@@ -11,9 +11,8 @@
+       chmod +x $@
+ 
+ install_data: eqn2graph
+-      -test -d $(bindir) || $(mkinstalldirs) $(bindir)
+-      -rm -f $(bindir)/eqn2graph
+-      $(INSTALL_SCRIPT) eqn2graph $(bindir)/eqn2graph
++      $(mkinstalldirs) $(DESTDIR)$(bindir)
++      $(INSTALL_SCRIPT) eqn2graph $(DESTDIR)$(bindir)/eqn2graph
+ 
+ uninstall_sub:
+       -rm -f $(bindir)/eqn2graph
+--- groff-1.18.orig/contrib/mom/Makefile.sub   Fri Jun  7 13:56:32 2002
++++ groff-1.18/contrib/mom/Makefile.sub        Mon Jul 29 15:13:36 2002
+@@ -90,24 +90,20 @@
+ 
+ install_data: $(NORMALFILES) $(HTMLDOCFILES) \
+               $(EXAMPLEFILES) $(PROCESSEDEXAMPLEFILES)
+-      -test -d $(tmacdir) || $(mkinstalldirs) $(tmacdir)
++      $(mkinstalldirs) $(DESTDIR)$(tmacdir)
+       for f in $(NORMALFILES); do \
+-        rm -f $(tmacdir)/$$f; \
+-        $(INSTALL_DATA) $(srcdir)/$$f $(tmacdir)/$$f; \
++        $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(tmacdir)/$$f; \
+       done
+-      -test -d $(htmldocdir)/momdoc || $(mkinstalldirs) $(htmldocdir)/momdoc
++      $(mkinstalldirs) $(DESTDIR)$(htmldocdir)/momdoc
+       for f in $(HTMLDOCFILES); do \
+-        rm -f $(htmldocdir)/$$f; \
+-        $(INSTALL_DATA) $(srcdir)/$$f $(htmldocdir)/$$f; \
++        $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(htmldocdir)/$$f; \
+       done
+-      -test -d $(exampledir) || $(mkinstalldirs) $(exampledir)
++      $(mkinstalldirs) $(DESTDIR)$(exampledir)
+       for f in $(EXAMPLEFILES); do \
+-        rm -f $(exampledir)/$$f; \
+-        $(INSTALL_DATA) $(srcdir)/$$f $(docdir)/$$f; \
++        $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(docdir)/$$f; \
+       done
+       for f in $(PROCESSEDEXAMPLEFILES); do \
+-        rm -f $(exampledir)/$$f; \
+-        $(INSTALL_DATA) $$f $(docdir)/$$f; \
++        $(INSTALL_DATA) $$f $(DESTDIR)$(docdir)/$$f; \
+       done
+ 
+ uninstall_sub:
+--- groff-1.18.orig/contrib/pic2graph/Makefile.sub     Sat Aug 11 00:16:11 2001
++++ groff-1.18/contrib/pic2graph/Makefile.sub  Mon Jul 29 15:13:54 2002
+@@ -11,9 +11,8 @@
        chmod +x $@
  
- install_data: grap2graph
+ install_data: pic2graph
 -      -test -d $(bindir) || $(mkinstalldirs) $(bindir)
--      -rm -f $(bindir)/grap2graph
--      $(INSTALL_SCRIPT) grap2graph $(bindir)/grap2graph
-+      -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
-+      -rm -f $(DESTDIR)$(bindir)/grap2graph
-+      $(INSTALL_SCRIPT) grap2graph $(DESTDIR)$(bindir)/grap2graph
+-      -rm -f $(bindir)/pic2graph
+-      $(INSTALL_SCRIPT) pic2graph $(bindir)/pic2graph
++      $(mkinstalldirs) $(DESTDIR)$(bindir)
++      $(INSTALL_SCRIPT) pic2graph $(DESTDIR)$(bindir)/pic2graph
  
  uninstall_sub:
-       -rm -f $(bindir)/grap2graph
+       -rm -f $(bindir)/pic2graph

diff --git a/groff-gcc4.patch b/groff-gcc4.patch
index 59ac70833b123d8b0291eed4fa17996e05b15b8a..41d68cd9588adde879beeec3f2c5c95ed02146e5 100644 (file)
--- a/groff-gcc4.patch
+++ b/groff-gcc4.patch
@@ -1,5 +1,5 @@
---- groff-1.19.1/src/roff/troff/input.cpp.orig 2004-05-05 18:41:58.000000000 +0200
-+++ groff-1.19.1/src/roff/troff/input.cpp      2005-12-11 13:49:32.408111000 +0100
+--- groff-1.19.1/src/roff/troff/input.cc.orig  2004-05-05 18:41:58.000000000 +0200
++++ groff-1.19.1/src/roff/troff/input.cc       2005-12-11 13:49:32.408111000 +0100
 @@ -2355,6 +2355,10 @@
    }
  }
@@ -11,8 +11,8 @@
  void exit_troff()
  {
    exit_started = 1;
---- groff-1.19.1/src/preproc/eqn/eqn.cpp.orig  2004-05-13 15:31:42.000000000 +0200
-+++ groff-1.19.1/src/preproc/eqn/eqn.cpp       2005-12-11 13:59:28.358111000 +0100
+--- groff-1.19.1/src/preproc/eqn/eqn.cc.orig   2004-05-13 15:31:42.000000000 +0200
++++ groff-1.19.1/src/preproc/eqn/eqn.cc        2005-12-11 13:59:28.358111000 +0100
 @@ -667,6 +667,12 @@
  #define YYREJECT goto yyabort
  #define YYACCEPT goto yyaccept

diff --git a/groff-info.patch b/groff-info.patch
index 27be038b0ed9e2e5f8cca7626ac7eb63a7fd625c..2f03663c7c9cfa2a82bc418c827f0254928b292f 100644 (file)
--- a/groff-info.patch
+++ b/groff-info.patch
@@ -1,6 +1,5 @@
-diff -Nru groff-1.19.orig/doc/groff.texinfo groff-1.19/doc/groff.texinfo
---- groff-1.19.orig/doc/groff.texinfo  2003-04-29 09:20:21.000000000 +0200
-+++ groff-1.19/doc/groff.texinfo       2003-04-30 10:01:16.000000000 +0200
+--- groff-1.18/doc/groff.texinfo.orig  Fri Jul  5 17:07:24 2002
++++ groff-1.18/doc/groff.texinfo       Mon Jul 29 15:05:32 2002
 @@ -8,7 +8,7 @@
  @c
  
@@ -10,11 +9,11 @@ diff -Nru groff-1.19.orig/doc/groff.texinfo groff-1.19/doc/groff.texinfo
  @settitle The GNU Troff Manual
  @setchapternewpage odd
  @footnotestyle separate
-@@ -361,9 +361,9 @@
+@@ -371,9 +371,9 @@
  @c Note: We say `Roman numerals' but `roman font'.
  
  
--@dircategory Typesetting
+-@dircategory Miscellaneous
 +@dircategory Text Processing Tools:
  @direntry
 -* Groff: (groff).               The GNU troff document formatting system.