From: Jan Lentfer Date: Tue, 26 Jan 2010 09:08:46 +0000 (+0100) Subject: groff: Update master to work with v1.20.1 X-Git-Tag: v2.7.1~229^2~50 X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/4a1b183bd52b80fea269b0bd4a5fe059b7d171ce groff: Update master to work with v1.20.1 * updated patches to apply cleanly * removed one obsolete patch --- diff --git a/gnu/usr.bin/groff/src/libs/libgroff/patches/cmap.cpp.patch b/gnu/usr.bin/groff/src/libs/libgroff/patches/cmap.cpp.patch index 686e829e95..945808f520 100644 --- a/gnu/usr.bin/groff/src/libs/libgroff/patches/cmap.cpp.patch +++ b/gnu/usr.bin/groff/src/libs/libgroff/patches/cmap.cpp.patch @@ -3,7 +3,7 @@ $DragonFly: src/gnu/usr.bin/groff/src/libs/libgroff/patches/cmap.cpp.patch,v 1.1 --- cmap.cpp 2005-08-31 14:28:07.000000000 +0200 +++ cmap.cpp 2005-08-31 15:15:08.000000000 +0200 @@ -19,12 +19,15 @@ - Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + along with this program. If not, see . */ #include +#if defined(__DragonFly__) || defined(__FreeBSD__) diff --git a/gnu/usr.bin/groff/src/libs/libgroff/patches/invalid.cpp.patch b/gnu/usr.bin/groff/src/libs/libgroff/patches/invalid.cpp.patch index 1b255e92de..87da603447 100644 --- a/gnu/usr.bin/groff/src/libs/libgroff/patches/invalid.cpp.patch +++ b/gnu/usr.bin/groff/src/libs/libgroff/patches/invalid.cpp.patch @@ -2,7 +2,7 @@ $DragonFly: src/gnu/usr.bin/groff/src/libs/libgroff/patches/invalid.cpp.patch,v --- invalid.cpp 2005-08-31 14:28:07.000000000 +0200 +++ invalid.cpp 2005-08-31 15:28:51.000000000 +0200 -@@ -31,8 +31,8 @@ +@@ -30,8 +31,8 @@ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, diff --git a/gnu/usr.bin/groff/src/roff/nroff/patches/nroff.sh.no_obj.patch b/gnu/usr.bin/groff/src/roff/nroff/patches/nroff.sh.no_obj.patch index 844793fa1c..a56dee75b5 100644 --- a/gnu/usr.bin/groff/src/roff/nroff/patches/nroff.sh.no_obj.patch +++ b/gnu/usr.bin/groff/src/roff/nroff/patches/nroff.sh.no_obj.patch @@ -1,49 +1,47 @@ -$DragonFly: src/gnu/usr.bin/groff/src/roff/nroff/patches/nroff.sh.no_obj.patch,v 1.2 2005/09/09 14:11:04 asmodai Exp $ - ---- nroff.sh.orig 2005-09-09 15:01:13.000000000 +0200 -+++ nroff.sh 2005-09-09 15:04:33.000000000 +0200 -@@ -8,19 +8,23 @@ +--- nroff.sh.orig 2010-01-26 08:02:39 +0100 ++++ nroff.sh 2010-01-26 08:07:29 +0100 +@@ -34,19 +34,23 @@ case "`exec 2>/dev/null ; locale charmap`" in UTF-8) - T=-Tutf8 ;; + Tloc=utf8 ;; - ISO-8859-1 | ISO-8859-15) + ISO*8859-1 | ISO*8859-15) - T=-Tlatin1 ;; + Tloc=latin1 ;; IBM-1047) - T=-Tcp1047 ;; + Tloc=cp1047 ;; + KOI8-R) + T=-Tkoi8-r ;; *) case "${LC_ALL-${LC_CTYPE-${LANG}}}" in *.UTF-8) - T=-Tutf8 ;; + Tloc=utf8 ;; - iso_8859_1 | *.ISO-8859-1 | *.ISO8859-1 | \ - iso_8859_15 | *.ISO-8859-15 | *.ISO8859-15) + iso_8859_1 | *.ISO*8859-1 | *.ISO8859-1 | \ + iso_8859_15 | *.ISO*8859-15 | *.ISO8859-15) - T=-Tlatin1 ;; + Tloc=latin1 ;; *.IBM-1047) - T=-Tcp1047 ;; + Tloc=cp1047 ;; + *.KOI8-R) + T=-Tkoi8-r ;; *) case "$LESSCHARSET" in utf-8) -@@ -29,6 +33,8 @@ - T=-Tlatin1 ;; +@@ -55,6 +59,8 @@ + Tloc=latin1 ;; cp1047) - T=-Tcp1047 ;; + Tloc=cp1047 ;; + koi8-r) + T=-Tkoi8-r ;; *) - T=-Tascii ;; - esac ;; -@@ -53,7 +59,7 @@ - exit 1 ;; - -[iptSUC] | -[dMmrno]*) - opts="$opts $1" ;; -- -Tascii | -Tlatin1 | -Tutf8 | -Tcp1047) -+ -Tascii | -Tlatin1 | -Tutf8 | -Tcp1047 | -Tkoi8-r) - T=$1 ;; - -T*) - # ignore other devices + Tloc=ascii ;; + esac ;; +@@ -118,7 +124,7 @@ + fi + + case $T in +- -Tascii | -Tlatin1 | -Tutf8 | -Tcp1047) ++ -Tascii | -Tlatin1 | -Tutf8 | -Tcp1047 | -Tkoi8-r) + ;; + *) + # ignore other devices and use locale fallback diff --git a/gnu/usr.bin/groff/tmac/patches/doc-syms.no_obj.patch b/gnu/usr.bin/groff/tmac/patches/doc-syms.no_obj.patch index ded897dae2..564373c068 100644 --- a/gnu/usr.bin/groff/tmac/patches/doc-syms.no_obj.patch +++ b/gnu/usr.bin/groff/tmac/patches/doc-syms.no_obj.patch @@ -2,7 +2,7 @@ $DragonFly: src/gnu/usr.bin/groff/tmac/patches/doc-syms.no_obj.patch,v 1.1 2005/ --- doc-syms 2005-09-08 12:50:26.000000000 +0200 +++ doc-syms 2005-09-08 12:52:04.000000000 +0200 -@@ -262,6 +262,70 @@ +@@ -324,6 +262,70 @@ .. . . diff --git a/gnu/usr.bin/groff/tmac/patches/eqnrc.no_obj.patch b/gnu/usr.bin/groff/tmac/patches/eqnrc.no_obj.patch index cfd714c9e4..f284124722 100644 --- a/gnu/usr.bin/groff/tmac/patches/eqnrc.no_obj.patch +++ b/gnu/usr.bin/groff/tmac/patches/eqnrc.no_obj.patch @@ -2,7 +2,7 @@ $DragonFly: src/gnu/usr.bin/groff/tmac/patches/eqnrc.no_obj.patch,v 1.1 2005/09/ --- eqnrc 2005-08-31 14:28:07.000000000 +0200 +++ eqnrc 2005-08-31 15:42:52.000000000 +0200 -@@ -53,6 +53,7 @@ +@@ -55,6 +53,7 @@ ifdef latin1 ! define n %1% ! ifdef utf8 ! define n %1% ! ifdef cp1047 ! define n %1% ! diff --git a/gnu/usr.bin/groff/tmac/patches/groff_mdoc.man.patch b/gnu/usr.bin/groff/tmac/patches/groff_mdoc.man.patch deleted file mode 100644 index 775402cdfd..0000000000 --- a/gnu/usr.bin/groff/tmac/patches/groff_mdoc.man.patch +++ /dev/null @@ -1,47 +0,0 @@ -$DragonFly: src/gnu/usr.bin/groff/tmac/patches/groff_mdoc.man.patch,v 1.1 2006/03/08 23:09:30 swildner Exp $ - ---- ../../../../../contrib/groff-1.19/tmac/groff_mdoc.man 2005-09-09 16:10:41.000000000 +0200 -+++ groff_mdoc.man 2006-03-08 23:57:58.000000000 +0100 -@@ -183,6 +183,7 @@ - . It "BSD Macro" - . It "NetBSD Macro" - . It "FreeBSD Macro" -+. It "DragonFly Macro" - . It "OpenBSD Macro" - . It "BSD/OS Macro" - . It "UNIX Macro" -@@ -869,6 +870,8 @@ - 2.2.2, 2.2.5, 2.2.6, 2.2.7, 2.2.8, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 4.0, 4.1, - 4.1.1, 4.2, 4.3, 4.4, 4.5, 4.6, 4.6.2, 4.7, 4.8, 4.9, 4.10, 5.0, 5.1, 5.2, - 5.2.1, 5.3 -+.It DragonFly -+1.0, 1.1, 1.2, 1.3, 1.4, 1.5 - .El - .Ed - .Pp -@@ -2167,6 +2170,25 @@ - command above in section - .Sx "TITLE MACROS" . - . -+.Ss "DragonFly Macro" -+. -+.Pp -+.Dl Usage: .Dx Oo Ao version Ac Oc ... -+.Pp -+.Bl -tag -width ".Li .Dx\ 1.4\ ." -compact -offset 15n -+.It Li .Dx -+.Dx -+.It Li ".Dx 1.4 ." -+.Dx 1.4 . -+.El -+.Pp -+For possible values of -+.Ao version Ac -+see the description of the -+.Ql .Os -+command above in section -+.Sx "TITLE MACROS" . -+. - .Ss "OpenBSD Macro" - . - .Pp diff --git a/gnu/usr.bin/groff/tmac/patches/troffrc.no_obj.patch b/gnu/usr.bin/groff/tmac/patches/troffrc.no_obj.patch index a5940cbf96..7f52234e49 100644 --- a/gnu/usr.bin/groff/tmac/patches/troffrc.no_obj.patch +++ b/gnu/usr.bin/groff/tmac/patches/troffrc.no_obj.patch @@ -10,9 +10,9 @@ $DragonFly: src/gnu/usr.bin/groff/tmac/patches/troffrc.no_obj.patch,v 1.1 2005/0 .do ds troffrc!lj4 lj4.tmac .do ds troffrc!lbp lbp.tmac .do ds troffrc!html html.tmac -@@ -29,7 +30,10 @@ - . - .\" test whether we work under EBCDIC +@@ -30,7 +30,10 @@ + .\" Test whether we work under EBCDIC and map the no-breakable space + .\" character accordingly. .do ie '\[char97]'a' \ -. do tr \[char160]\~ +. ie '\*[.T]'koi8-r' \ @@ -22,15 +22,18 @@ $DragonFly: src/gnu/usr.bin/groff/tmac/patches/troffrc.no_obj.patch,v 1.1 2005/0 .el \ . do tr \[char65]\~ . -@@ -39,8 +43,18 @@ +@@ -40,6 +40,8 @@ .\" Load hyphenation patterns and exceptions. .do hpf hyphen.us .do hpfa hyphenex.us +.if '\*[.T]'koi8-r' \ +. do hpfa hyphen.ru . - .\" Handle paper formats + .\" Handle paper formats. .do mso papersize.tmac +@@ -47,4 +49,12 @@ + .\" Handle PS images. + .do mso pspic.tmac . +.\" Disable SGR support in grotty(1). +.if n \{\ diff --git a/gnu/usr.bin/groff/tmac/patches/tty.tmac.no_obj.patch b/gnu/usr.bin/groff/tmac/patches/tty.tmac.no_obj.patch index 78abda576e..63c30be986 100644 --- a/gnu/usr.bin/groff/tmac/patches/tty.tmac.no_obj.patch +++ b/gnu/usr.bin/groff/tmac/patches/tty.tmac.no_obj.patch @@ -2,7 +2,7 @@ $DragonFly: src/gnu/usr.bin/groff/tmac/patches/tty.tmac.no_obj.patch,v 1.1 2005/ --- tty.tmac 2005-08-31 14:28:07.000000000 +0200 +++ tty.tmac 2005-08-31 15:51:25.000000000 +0200 -@@ -80,6 +80,9 @@ +@@ -83,6 +80,9 @@ .ie '\*(.T'cp1047' \ . do mso cp1047.tmac .el \