diff options
author | Kang Kai <kai.kang@windriver.com> | 2011-04-27 15:44:45 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-04 00:54:34 +0100 |
commit | d2c84ea13d1f019f0effe270dab8e2e8ce8a61d6 (patch) | |
tree | b6de7e96dd4cb7639d37eac7df91027097c8ada9 | |
parent | 288638e4f23d90800f95ebaa606aaffca79c3bbc (diff) | |
download | poky-d2c84ea13d1f019f0effe270dab8e2e8ce8a61d6.tar.gz |
groff: update to 1.20.1
Update groff to 1.20.1, add SUMMARY and LICENSE info
From OE 70bf94cd8669f549ca90581e9592d409b6e24e2e
Fixes [Yocto 879]
(From OE-Core rev: 6c5cbb73550639ec71cb9564883253dbe1c09f36)
Signed-off-by: Kang Kai <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
5 files changed, 36 insertions, 144 deletions
diff --git a/meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-remove-mom.patch b/meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-remove-mom.patch deleted file mode 100644 index 90ad8e3423..0000000000 --- a/meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-remove-mom.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | --- | ||
2 | groff-1.18.1.4/Makefile.in | 7 +------ | ||
3 | 1 file changed, 1 insertion(+), 6 deletions(-) | ||
4 | |||
5 | --- a/Makefile.in | ||
6 | +++ b/Makefile.in | ||
7 | @@ -460,27 +460,22 @@ OTHERDIRS=\ | ||
8 | src/roff/grog \ | ||
9 | src/roff/nroff \ | ||
10 | contrib/mm \ | ||
11 | contrib/pic2graph \ | ||
12 | contrib/eqn2graph \ | ||
13 | - contrib/groffer \ | ||
14 | - contrib/mom \ | ||
15 | - doc | ||
16 | + contrib/groffer | ||
17 | ALLDIRS=$(INCDIRS) $(LIBDIRS) $(PROGDIRS) \ | ||
18 | $(DEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS) $(OTHERDIRS) | ||
19 | EXTRADIRS=\ | ||
20 | font/devps/generate \ | ||
21 | font/devdvi/generate \ | ||
22 | font/devlj4/generate \ | ||
23 | - src/xditview \ | ||
24 | doc | ||
25 | NOMAKEDIRS=\ | ||
26 | arch/djgpp \ | ||
27 | contrib/mm/examples \ | ||
28 | contrib/mm/mm \ | ||
29 | - contrib/mom/examples \ | ||
30 | - contrib/mom/momdoc \ | ||
31 | src/libs/snprintf | ||
32 | DISTDIRS=\ | ||
33 | $(INCDIRS) $(LIBDIRS) $(PROGDIRS) $(DEVDIRS) $(OTHERDEVDIRS) \ | ||
34 | $(ALLTTYDEVDIRS) $(OTHERDIRS) $(EXTRADIRS) $(NOMAKEDIRS) | ||
35 | TARGETS=all install install_bin install_data clean distclean mostlyclean \ | ||
diff --git a/meta/recipes-extended/groff/groff-1.18.1.4/man-local.patch b/meta/recipes-extended/groff/groff-1.18.1.4/man-local.patch deleted file mode 100644 index 34b4248da5..0000000000 --- a/meta/recipes-extended/groff/groff-1.18.1.4/man-local.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | Index: groff-1.18.1.4/tmac/man.local | ||
2 | =================================================================== | ||
3 | --- groff-1.18.1.4.orig/tmac/man.local 2000-10-26 22:15:17.000000000 +0800 | ||
4 | +++ groff-1.18.1.4/tmac/man.local 2010-08-24 14:17:52.070006664 +0800 | ||
5 | @@ -1,2 +1,27 @@ | ||
6 | .\" This file is loaded after an-old.tmac. | ||
7 | .\" Put any local modifications to an-old.tmac here. | ||
8 | +. | ||
9 | +.if n \{\ | ||
10 | +. \" Debian: Map \(oq to ' rather than ` in nroff mode for devices other | ||
11 | +. \" than utf8. | ||
12 | +. if !'\*[.T]'utf8' \ | ||
13 | +. tr \[oq]' | ||
14 | +. | ||
15 | +. \" Debian: Disable the use of SGR (ANSI colour) escape sequences by | ||
16 | +. \" grotty. | ||
17 | +. if '\V[GROFF_SGR]'' \ | ||
18 | +. output x X tty: sgr 0 | ||
19 | +. | ||
20 | +. \" Debian: Map \- to the Unicode HYPHEN-MINUS character, to make | ||
21 | +. \" searching in man pages easier. | ||
22 | +. if '\*[.T]'utf8' \ | ||
23 | +. char \- \N'45' | ||
24 | +. | ||
25 | +. \" Debian: Many UTF-8 man pages use "-" instead of "\-" for dashes such | ||
26 | +. \" as those in command-line options. This is a bug in those pages, but | ||
27 | +. \" too many fonts are missing the Unicode HYPHEN character, so we render | ||
28 | +. \" this as the ASCII-compatible HYPHEN-MINUS instead. | ||
29 | +. if '\*[.T]'utf8' \ | ||
30 | +. char - \N'45' | ||
31 | +.\} | ||
32 | + | ||
diff --git a/meta/recipes-extended/groff/groff-1.18.1.4/mdoc-local.patch b/meta/recipes-extended/groff/groff-1.18.1.4/mdoc-local.patch deleted file mode 100644 index 140a544af3..0000000000 --- a/meta/recipes-extended/groff/groff-1.18.1.4/mdoc-local.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | Index: groff-1.18.1.4/tmac/mdoc.local | ||
2 | =================================================================== | ||
3 | --- groff-1.18.1.4.orig/tmac/mdoc.local 2001-03-23 08:17:51.000000000 +0800 | ||
4 | +++ groff-1.18.1.4/tmac/mdoc.local 2010-08-24 14:20:22.014006846 +0800 | ||
5 | @@ -1,2 +1,26 @@ | ||
6 | .\" This file is loaded after doc.tmac. | ||
7 | .\" Put any local modifications to doc.tmac here. | ||
8 | +. | ||
9 | +.if n \{\ | ||
10 | +. \" Debian: Map \(oq to ' rather than ` in nroff mode for devices other | ||
11 | +. \" than utf8. | ||
12 | +. if !'\*[.T]'utf8' \ | ||
13 | +. tr \[oq]' | ||
14 | +. | ||
15 | +. \" Debian: Disable the use of SGR (ANSI colour) escape sequences by | ||
16 | +. \" grotty. | ||
17 | +. if '\V[GROFF_SGR]'' \ | ||
18 | +. output x X tty: sgr 0 | ||
19 | +. | ||
20 | +. \" Debian: Map \- to the Unicode HYPHEN-MINUS character, to make | ||
21 | +. \" searching in man pages easier. | ||
22 | +. if '\*[.T]'utf8' \ | ||
23 | +. char \- \N'45' | ||
24 | +. | ||
25 | +. \" Debian: Many UTF-8 man pages use "-" instead of "\-" for dashes such | ||
26 | +. \" as those in command-line options. This is a bug in those pages, but | ||
27 | +. \" too many fonts are missing the Unicode HYPHEN character, so we render | ||
28 | +. \" this as the ASCII-compatible HYPHEN-MINUS instead. | ||
29 | +. if '\*[.T]'utf8' \ | ||
30 | +. char - \N'45' | ||
31 | +.\} | ||
diff --git a/meta/recipes-extended/groff/groff_1.18.1.4.bb b/meta/recipes-extended/groff/groff_1.18.1.4.bb deleted file mode 100644 index cf3adeac84..0000000000 --- a/meta/recipes-extended/groff/groff_1.18.1.4.bb +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | SUMMARY = "GNU Troff software" | ||
2 | DESCRIPTION = "The groff (GNU troff) software is a typesetting package which reads plain text mixed with \ | ||
3 | formatting commands and produces formatted output." | ||
4 | SECTION = "console/utils" | ||
5 | PRIORITY = "required" | ||
6 | HOMEPAGE = "ftp://ftp.gnu.org/gnu/groff/" | ||
7 | LICENSE = "GPLv2" | ||
8 | PR = "r1" | ||
9 | |||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=e43fc16fccd8519fba405f0a0ff6e8a3" | ||
11 | |||
12 | SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \ | ||
13 | file://groff-1.18.1.4-remove-mom.patch;striplevel=1 \ | ||
14 | file://man-local.patch \ | ||
15 | file://mdoc-local.patch" | ||
16 | |||
17 | inherit autotools | ||
18 | |||
19 | EXTRA_OECONF="--without-x --prefix=${D} --exec-prefix=${D} --bindir=${D}${bindir} --datadir=${D}${datadir} --mandir=${D}${datadir}/man --infodir=${D}${datadir}info --with-appresdir=${D}${datadir}" | ||
20 | |||
21 | SRC_URI[md5sum] = "ceecb81533936d251ed015f40e5f7287" | ||
22 | SRC_URI[sha256sum] = "ff3c7c3b6cae5e8cc5062a144de5eff0022e8e970e1774529cc2d5dde46ce50d" | ||
23 | PARALLEL_MAKE = "" | ||
24 | |||
25 | |||
26 | do_configure (){ | ||
27 | oe_runconf | ||
28 | } | ||
29 | |||
30 | do_install_prepend() { | ||
31 | install -m 0755 -d ${D} | ||
32 | } | ||
33 | |||
34 | |||
35 | do_install_append() { | ||
36 | mkdir -p ${D}${sysconfdir}/groff | ||
37 | cp -rf ${D}${datadir}/groff/site-tmac/* ${D}${sysconfdir}/groff/ | ||
38 | cp -rf ${D}${datadir}/groff/site-tmac/* ${D}${datadir}/groff/${PV}/tmac/ | ||
39 | } | ||
40 | |||
41 | pkg_postinst_${PN}() { | ||
42 | ln -s ${bindir}/tbl ${bindir}/gtbl | ||
43 | echo "export GROFF_FONT_PATH=/usr/share/groff/${PV}/font" >> ${sysconfdir}/profile | ||
44 | echo "export GROFF_TMAC_PATH=/usr/share/groff/${PV}/tmac" >> ${sysconfdir}/profile | ||
45 | } | ||
46 | |||
diff --git a/meta/recipes-extended/groff/groff_1.20.1.bb b/meta/recipes-extended/groff/groff_1.20.1.bb new file mode 100644 index 0000000000..e0e198f576 --- /dev/null +++ b/meta/recipes-extended/groff/groff_1.20.1.bb | |||
@@ -0,0 +1,36 @@ | |||
1 | SUMMARY = "GNU Troff software" | ||
2 | DESCRIPTION = "The groff (GNU troff) software is a typesetting package which reads plain text mixed with \ | ||
3 | formatting commands and produces formatted output." | ||
4 | SECTION = "base" | ||
5 | HOMEPAGE = "ftp://ftp.gnu.org/gnu/groff/" | ||
6 | LICENSE = "GPLv2" | ||
7 | PR = "r0" | ||
8 | |||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | ||
10 | |||
11 | SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz" | ||
12 | |||
13 | SRC_URI[md5sum] = "48fa768dd6fdeb7968041dd5ae8e2b02" | ||
14 | SRC_URI[sha256sum] = "b645878135cb620c6c417c5601bfe96172245af12045540d7344938b4c2cd805" | ||
15 | |||
16 | DEPENDS = "groff-native" | ||
17 | DEPENDS_virtclass-native = "" | ||
18 | |||
19 | inherit autotools | ||
20 | |||
21 | PARALLEL_MAKE = "" | ||
22 | |||
23 | do_configure_prepend() { | ||
24 | if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then | ||
25 | sed -i \ | ||
26 | -e '/^GROFFBIN=/s:=.*:=${STAGING_BINDIR_NATIVE}/groff:' \ | ||
27 | -e '/^TROFFBIN=/s:=.*:=${STAGING_BINDIR_NATIVE}/troff:' \ | ||
28 | -e '/^GROFF_BIN_PATH=/s:=.*:=${STAGING_BINDIR_NATIVE}:' \ | ||
29 | -e '/^GROFF_BIN_DIR=/s:=.*:=${STAGING_BINDIR_NATIVE}:' \ | ||
30 | ${S}/contrib/*/Makefile.sub \ | ||
31 | ${S}/doc/Makefile.in \ | ||
32 | ${S}/doc/Makefile.sub | ||
33 | fi | ||
34 | } | ||
35 | |||
36 | BBCLASSEXTEND = "native" | ||