From f516c288d37e53856bce273af2cdbf24f3f5a6e1 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Fri, 10 Apr 2015 01:31:27 -0700 Subject: groff: 1.22.2 -> 1.22.3 * Updated groff-1.22.2-correct-man.local-install-path.patch * Add perl to RDEPENDS_groff since there are a few perl scripts: groff/usr/bin/roff2pdf:#! /usr/bin/env perl groff/usr/bin/afmtodit:#! /usr/bin/env perl -w groff/usr/bin/roff2dvi:#! /usr/bin/env perl groff/usr/bin/roff2text:#! /usr/bin/env perl groff/usr/bin/glilypond:#! /usr/bin/env perl groff/usr/bin/roff2ps:#! /usr/bin/env perl groff/usr/bin/gperl:#! /usr/bin/env perl groff/usr/bin/mmroff:#! /usr/bin/env perl groff/usr/bin/gpinyin:#! /usr/bin/env perl groff/usr/bin/roff2html:#! /usr/bin/env perl groff/usr/bin/grog:#! /usr/bin/env perl groff/usr/bin/gropdf:#! /usr/bin/env perl -w groff/usr/bin/pdfmom:#! /usr/bin/env perl -w groff/usr/bin/chem:#! /usr/bin/env perl groff/usr/bin/roff2x:#! /usr/bin/env perl groff/usr/bin/groffer:#! /usr/bin/env perl groff/usr/lib64/groff/gpinyin/subs.pl:#! /usr/bin/env perl groff/usr/lib64/groff/grog/subs.pl:#! /usr/bin/env perl groff/usr/lib64/groff/groffer/subs.pl:#! /usr/bin/env perl groff/usr/lib64/groff/groffer/man.pl:#! /usr/bin/env perl groff/usr/lib64/groff/groffer/main_subs.pl:#! /usr/bin/env perl * Fix the dangling /usr/bin/perl or /bin/perl for grog. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- ...off-1.22.2-correct-man.local-install-path.patch | 32 ----------- ...off-1.22.2-correct-man.local-install-path.patch | 34 +++++++++++ meta/recipes-extended/groff/groff_1.22.2.bb | 66 --------------------- meta/recipes-extended/groff/groff_1.22.3.bb | 67 ++++++++++++++++++++++ 4 files changed, 101 insertions(+), 98 deletions(-) delete mode 100644 meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch create mode 100644 meta/recipes-extended/groff/groff-1.22.3/groff-1.22.2-correct-man.local-install-path.patch delete mode 100644 meta/recipes-extended/groff/groff_1.22.2.bb create mode 100644 meta/recipes-extended/groff/groff_1.22.3.bb (limited to 'meta/recipes-extended') diff --git a/meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch b/meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch deleted file mode 100644 index f7e9a742f5..0000000000 --- a/meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch +++ /dev/null @@ -1,32 +0,0 @@ -Correct the install path of man.local to fix following error: - /yocto/build/tmp/sysroots/x86_64-linux/usr/share/groff/1.22.2/tmac/an-old.tmac:690: warning: can't find macro file `man.local' - -Signed-off-by: Zhenhua Luo -Upstream-Status: Pending - ---- groff-1.22.2/tmac/Makefile.sub.orig 2013-02-07 20:06:08.000000000 +0800 -+++ groff-1.22.2/tmac/Makefile.sub 2013-06-26 19:11:23.572259001 +0800 -@@ -114,9 +114,9 @@ - rm -f $(DESTDIR)$(mdocdir)/$$f; \ - $(INSTALL_DATA) $$f-s $(DESTDIR)$(mdocdir)/$$f; \ - done -- -test -f $(DESTDIR)$(localtmacdir)/man.local || \ -+ -test -f $(DESTDIR)$(tmacdir)/man.local || \ - $(INSTALL_DATA) $(srcdir)/man.local \ -- $(DESTDIR)$(localtmacdir)/man.local -+ $(DESTDIR)$(tmacdir)/man.local - -test -f $(DESTDIR)$(localtmacdir)/mdoc.local || \ - $(INSTALL_DATA) mdoc.local-s $(DESTDIR)$(localtmacdir)/mdoc.local - -@@ -158,9 +158,9 @@ - -rm -f $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac - -rm -f $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac - -rm -f $(DESTDIR)$(tmacdir)/www.tmac -- -if cmp -s $(DESTDIR)$(localtmacdir)/man.local \ -+ -if cmp -s $(DESTDIR)$(tmacdir)/man.local \ - $(srcdir)/man.local; then \ -- rm -f $(DESTDIR)$(localtmacdir)/man.local; \ -+ rm -f $(DESTDIR)$(tmacdir)/man.local; \ - fi - -if cmp -s $(DESTDIR)$(localtmacdir)/mdoc.local \ - $(srcdir)/mdoc.local; then \ diff --git a/meta/recipes-extended/groff/groff-1.22.3/groff-1.22.2-correct-man.local-install-path.patch b/meta/recipes-extended/groff/groff-1.22.3/groff-1.22.2-correct-man.local-install-path.patch new file mode 100644 index 0000000000..c73328a186 --- /dev/null +++ b/meta/recipes-extended/groff/groff-1.22.3/groff-1.22.2-correct-man.local-install-path.patch @@ -0,0 +1,34 @@ +Correct the install path of man.local to fix following error: + /yocto/build/tmp/sysroots/x86_64-linux/usr/share/groff/1.22.2/tmac/an-old.tmac:690: warning: can't find macro file `man.local' + +Signed-off-by: Zhenhua Luo +Upstream-Status: Pending + +diff --git a/tmac/Makefile.sub b/tmac/Makefile.sub +index 1506232..f1468c5 100644 +--- a/tmac/Makefile.sub ++++ b/tmac/Makefile.sub +@@ -121,9 +121,9 @@ install_data: $(NORMALFILES) $(SPECIALFILES) man.local \ + $(RM) $(DESTDIR)$(mdocdir)/$$f; \ + $(INSTALL_DATA) $$f-s $(DESTDIR)$(mdocdir)/$$f; \ + done +- -test -f $(DESTDIR)$(localtmacdir)/man.local \ ++ -test -f $(DESTDIR)$(tmacdir)/man.local \ + || $(INSTALL_DATA) $(srcdir)/man.local \ +- $(DESTDIR)$(localtmacdir)/man.local ++ $(DESTDIR)$(tmacdir)/man.local + -test -f $(DESTDIR)$(localtmacdir)/mdoc.local \ + || $(INSTALL_DATA) mdoc.local-s $(DESTDIR)$(localtmacdir)/mdoc.local + +@@ -164,9 +164,9 @@ uninstall_sub: + $(RM) $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac + $(RM) $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac + $(RM) $(DESTDIR)$(tmacdir)/www.tmac +- -if cmp -s $(DESTDIR)$(localtmacdir)/man.local \ ++ -if cmp -s $(DESTDIR)$(tmacdir)/man.local \ + $(srcdir)/man.local; then \ +- $(RM) $(DESTDIR)$(localtmacdir)/man.local; \ ++ $(RM) $(DESTDIR)$(tmacdir)/man.local; \ + fi + -if cmp -s $(DESTDIR)$(localtmacdir)/mdoc.local \ + $(srcdir)/mdoc.local; then \ diff --git a/meta/recipes-extended/groff/groff_1.22.2.bb b/meta/recipes-extended/groff/groff_1.22.2.bb deleted file mode 100644 index 6e845878ac..0000000000 --- a/meta/recipes-extended/groff/groff_1.22.2.bb +++ /dev/null @@ -1,66 +0,0 @@ -SUMMARY = "GNU Troff software" -DESCRIPTION = "The groff (GNU troff) software is a typesetting package which reads plain text mixed with \ -formatting commands and produces formatted output." -SECTION = "base" -HOMEPAGE = "http://www.gnu.org/software/groff/" -LICENSE = "GPLv3" -PR = "r1" - -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \ - file://groff-1.22.2-correct-man.local-install-path.patch \ -" - -SRC_URI[md5sum] = "9f4cd592a5efc7e36481d8d8d8af6d16" -SRC_URI[sha256sum] = "380864dac4772e0c0d7b1282d25d0c5fd7f63baf45c87c4657afed22a13d2076" - -DEPENDS = "groff-native" -DEPENDS_class-native = "" - -inherit autotools texinfo - -EXTRA_OECONF = "--without-x" -PARALLEL_MAKE = "" - -do_configure_prepend() { - if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then - sed -i \ - -e '/^GROFFBIN=/s:=.*:=${STAGING_BINDIR_NATIVE}/groff:' \ - -e '/^TROFFBIN=/s:=.*:=${STAGING_BINDIR_NATIVE}/troff:' \ - -e '/^GROFF_BIN_PATH=/s:=.*:=${STAGING_BINDIR_NATIVE}:' \ - -e '/^GROFF_BIN_DIR=/s:=.*:=${STAGING_BINDIR_NATIVE}:' \ - ${S}/contrib/*/Makefile.sub \ - ${S}/doc/Makefile.in \ - ${S}/doc/Makefile.sub - fi -} - -do_configure_append() { - # generate gnulib configure script - olddir=`pwd` - cd ${S}/src/libs/gnulib/ - ACLOCAL="$ACLOCAL" autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || bbfatal "autoreconf execution failed." - cd ${olddir} -} - -do_install_append() { - # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location - # for target as /usr/bin/perl, so fix it to /usr/bin/perl. - for i in afmtodit mmroff gropdf pdfmom; do - if [ -f ${D}${bindir}/$i ]; then - sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/$i - fi - done -} - -do_install_append_class-native() { - create_cmdline_wrapper ${D}/${bindir}/groff \ - -F${STAGING_DIR_NATIVE}${datadir_native}/groff/${PV}/font \ - -M${STAGING_DIR_NATIVE}${datadir_native}/groff/${PV}/tmac -} - -FILES_${PN} += "${libdir}/${BPN}/site-tmac \ - ${libdir}/${BPN}/groffer/" - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-extended/groff/groff_1.22.3.bb b/meta/recipes-extended/groff/groff_1.22.3.bb new file mode 100644 index 0000000000..36b221aa1f --- /dev/null +++ b/meta/recipes-extended/groff/groff_1.22.3.bb @@ -0,0 +1,67 @@ +SUMMARY = "GNU Troff software" +DESCRIPTION = "The groff (GNU troff) software is a typesetting package which reads plain text mixed with \ +formatting commands and produces formatted output." +SECTION = "base" +HOMEPAGE = "http://www.gnu.org/software/groff/" +LICENSE = "GPLv3" + +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \ + file://groff-1.22.2-correct-man.local-install-path.patch \ +" + +SRC_URI[md5sum] = "cc825fa64bc7306a885f2fb2268d3ec5" +SRC_URI[sha256sum] = "3a48a9d6c97750bfbd535feeb5be0111db6406ddb7bb79fc680809cda6d828a5" + +DEPENDS = "groff-native" +DEPENDS_class-native = "" + +RDEPENDS_${PN} = "perl" + +inherit autotools texinfo + +EXTRA_OECONF = "--without-x" +PARALLEL_MAKE = "" + +do_configure_prepend() { + if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then + sed -i \ + -e '/^GROFFBIN=/s:=.*:=${STAGING_BINDIR_NATIVE}/groff:' \ + -e '/^TROFFBIN=/s:=.*:=${STAGING_BINDIR_NATIVE}/troff:' \ + -e '/^GROFF_BIN_PATH=/s:=.*:=${STAGING_BINDIR_NATIVE}:' \ + -e '/^GROFF_BIN_DIR=/s:=.*:=${STAGING_BINDIR_NATIVE}:' \ + ${S}/contrib/*/Makefile.sub \ + ${S}/doc/Makefile.in \ + ${S}/doc/Makefile.sub + fi +} + +do_configure_append() { + # generate gnulib configure script + olddir=`pwd` + cd ${S}/src/libs/gnulib/ + ACLOCAL="$ACLOCAL" autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || bbfatal "autoreconf execution failed." + cd ${olddir} +} + +do_install_append() { + # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location + # for target as /usr/bin/perl, so fix it to /usr/bin/perl. + for i in afmtodit mmroff gropdf pdfmom grog; do + if [ -f ${D}${bindir}/$i ]; then + sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/$i + fi + done +} + +do_install_append_class-native() { + create_cmdline_wrapper ${D}/${bindir}/groff \ + -F${STAGING_DIR_NATIVE}${datadir_native}/groff/${PV}/font \ + -M${STAGING_DIR_NATIVE}${datadir_native}/groff/${PV}/tmac +} + +FILES_${PN} += "${libdir}/${BPN}/site-tmac \ + ${libdir}/${BPN}/groffer/" + +BBCLASSEXTEND = "native" -- cgit 1.2.3-korg