Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe

1 files changed, 2 insertions, 130 deletions

diff --git a/base/groff/.footprint.x86_64 b/base/groff/.footprint.x86_64
index 982c2c69e..1c440946d 100644
--- a/base/groff/.footprint.x86_64
+++ b/base/groff/.footprint.x86_64
@@ -53,137 +53,8 @@ drwxr-xr-x	root/root	usr/lib/groff/groffer/
 -rw-r--r--	root/root	usr/lib/groff/groffer/version.sh
 drwxr-xr-x	root/root	usr/lib/groff/site-tmac/
 drwxr-xr-x	root/root	usr/share/
-drwxr-xr-x	root/root	usr/share/doc/
-drwxr-xr-x	root/root	usr/share/doc/groff/
-drwxr-xr-x	root/root	usr/share/doc/groff/1.20.1/
-drwxr-xr-x	root/root	usr/share/doc/groff/1.20.1/examples/
-drwxr-xr-x	root/root	usr/share/doc/groff/1.20.1/examples/chem/
-drwxr-xr-x	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/README
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/ch2a_ethyl.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/ch2b_benzene.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/ch2c_benzene_right.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/ch4a_stick.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/ch4b_methyl_acetate.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/ch4c_colon.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/ch4d_HCl.H2O.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/ch4e_CaSO4.2H2O.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/ch4f_C.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/ch4g_BP.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/ch4h_methacrylate.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/ch4i_cyclo.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/ch4j_ring4.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/ch4k_ring3.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/ch4l_vertex.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/ch4m_double.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/ch4n_triple.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/ch4o_aromatic.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/ch4p_cholestanol.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/ch4q_rings.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/ch4r_spiro.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/ch4s_heteroatoms.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/ch4t_polycyclic.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/ch4u_nicotine.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/ch4v_histidine.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/ch4w_lsd.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/ch4x_anisole.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/ch4y_reserpine.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/ch4z1_eqn_glutamic.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/ch4z2_text.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/ch5a_size.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/ch6a_pic.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/ch6b_dna.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/chAa_polymer.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/chAb_vinyl_chloro.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/chAc_morphine.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/chAd_chlorophyll.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/chAe_chair.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/chAf_arrow.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/chAg_circle.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/chAh_brackets.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/chAi_poly_vinyl_chloride.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/chBa_jump.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/chBb_bonds.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/122/chBc_rings.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/README
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/atp.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/cholesterin.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/ethamivan.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/lsd.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/morphine.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/penicillin.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/chem/reserpine.chem
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/gnu.eps
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/grnexmpl.g
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/grnexmpl.me
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/grnexmpl.ps
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/groff.css
-drwxr-xr-x	root/root	usr/share/doc/groff/1.20.1/examples/hdtbl/
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/hdtbl/chess_board.ps
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/hdtbl/chess_board.roff
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/hdtbl/col_rowspan_colors.ps
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/hdtbl/col_rowspan_colors.roff
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/hdtbl/color_boxes.ps
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/hdtbl/color_boxes.roff
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/hdtbl/color_nested_tables.ps
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/hdtbl/color_nested_tables.roff
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/hdtbl/color_table_cells.ps
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/hdtbl/color_table_cells.roff
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/hdtbl/color_transitions.ps
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/hdtbl/color_transitions.roff
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/hdtbl/fonts_n.ps
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/hdtbl/fonts_n.roff
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/hdtbl/fonts_x.ps
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/hdtbl/fonts_x.roff
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/hdtbl/gnu.eps
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/hdtbl/mixed_pickles.ps
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/hdtbl/mixed_pickles.roff
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/hdtbl/rainbow.ps
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/hdtbl/rainbow.roff
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/hdtbl/short_reference.ps
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/hdtbl/short_reference.roff
-drwxr-xr-x	root/root	usr/share/doc/groff/1.20.1/examples/mom/
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/mom/README.txt
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/mom/elvis_syntax
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/mom/elvis_syntax.new
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/mom/letter.mom
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/mom/letter.ps
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/mom/penguin.ps
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/mom/sample_docs.mom
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/mom/sample_docs.ps
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/mom/typesetting.mom
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/mom/typesetting.ps
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/webpage.ms
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/examples/webpage.ps
-drwxr-xr-x	root/root	usr/share/doc/groff/1.20.1/html/
-drwxr-xr-x	root/root	usr/share/doc/groff/1.20.1/html/mom/
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/html/mom/appendices.html
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/html/mom/color.html
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/html/mom/cover.html
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/html/mom/definitions.html
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/html/mom/docelement.html
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/html/mom/docprocessing.html
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/html/mom/goodies.html
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/html/mom/headfootpage.html
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/html/mom/inlines.html
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/html/mom/intro.html
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/html/mom/letters.html
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/html/mom/macrolist.html
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/html/mom/rectoverso.html
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/html/mom/refer.html
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/html/mom/reserved.html
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/html/mom/toc.html
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/html/mom/typemacdoc.html
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/html/mom/typesetting.html
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/html/mom/using.html
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/meintro.me
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/meintro.ps
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/meref.me
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/meref.ps
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/pic.ms
--rw-r--r--	root/root	usr/share/doc/groff/1.20.1/pic.ps
 drwxr-xr-x	root/root	usr/share/groff/
-lrwxrwxrwx	root/root	usr/share/groff/current -> 1.20.1
+lrwxrwxrwx	root/root	usr/share/groff/current -> 1.21
 -rw-r--r--	root/root	usr/share/groff/eign
 drwxr-xr-x	root/root	usr/share/groff/font/
 drwxr-xr-x	root/root	usr/share/groff/font/devascii/
@@ -474,6 +345,7 @@ drwxr-xr-x	root/root	usr/share/groff/tmac/
 -rw-r--r--	root/root	usr/share/groff/tmac/hyphenex.cs
 -rw-r--r--	root/root	usr/share/groff/tmac/hyphenex.det
 -rw-r--r--	root/root	usr/share/groff/tmac/hyphenex.us
+-rw-r--r--	root/root	usr/share/groff/tmac/ja.tmac
 -rw-r--r--	root/root	usr/share/groff/tmac/latin1.tmac
 -rw-r--r--	root/root	usr/share/groff/tmac/latin2.tmac
 -rw-r--r--	root/root	usr/share/groff/tmac/latin5.tmac