From 05186921edba0a5ea4b12ad42c8c5f08423e65ad Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 12 Jan 2007 02:04:47 +0000 Subject: [PATCH] Add support for bzip2 pages to man2html. Package-Manager: portage-2.1.2_rc4-r7 --- sys-apps/man/ChangeLog | 8 +- sys-apps/man/Manifest | 25 +++- sys-apps/man/files/digest-man-1.6e-r2 | 3 + .../man/files/man-1.6e-man2html-bzip2.patch | 51 +++++++ sys-apps/man/man-1.6e-r2.ebuild | 127 ++++++++++++++++++ 5 files changed, 206 insertions(+), 8 deletions(-) create mode 100644 sys-apps/man/files/digest-man-1.6e-r2 create mode 100644 sys-apps/man/files/man-1.6e-man2html-bzip2.patch create mode 100644 sys-apps/man/man-1.6e-r2.ebuild diff --git a/sys-apps/man/ChangeLog b/sys-apps/man/ChangeLog index 925d944c4841..09b7ae97a1fa 100644 --- a/sys-apps/man/ChangeLog +++ b/sys-apps/man/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-apps/man # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.106 2007/01/06 01:34:35 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.107 2007/01/12 02:04:47 vapier Exp $ + +*man-1.6e-r2 (12 Jan 2007) + + 12 Jan 2007; Mike Frysinger + +files/man-1.6e-man2html-bzip2.patch, +man-1.6e-r2.ebuild: + Add support for bzip2 pages to man2html. *man-1.6e-r1 (06 Jan 2007) diff --git a/sys-apps/man/Manifest b/sys-apps/man/Manifest index d8248e7067b7..774925335559 100644 --- a/sys-apps/man/Manifest +++ b/sys-apps/man/Manifest @@ -57,6 +57,10 @@ AUX man-1.6e-headers.patch 241 RMD160 04052f079124c57fcc6b0ebe29a4a62eba39baa4 S MD5 c0bb7479f2ae3701f80daaf4aa64d1fb files/man-1.6e-headers.patch 241 RMD160 04052f079124c57fcc6b0ebe29a4a62eba39baa4 files/man-1.6e-headers.patch 241 SHA256 d62108e3baaec771d99226eff07a6f604a8b9afefd25ec596b9817574a638e20 files/man-1.6e-headers.patch 241 +AUX man-1.6e-man2html-bzip2.patch 1452 RMD160 b9f9d8bbc69e7f222cd366f1474351e138f64a18 SHA1 ae5ca8a77ff691c17885ed254fc823a616786962 SHA256 8733a306b1af24efcc610994c8098dc03a90b2ecaba284762ea5dc04d67afaa0 +MD5 3cd108700679892dc8409d3fbdb2e07d files/man-1.6e-man2html-bzip2.patch 1452 +RMD160 b9f9d8bbc69e7f222cd366f1474351e138f64a18 files/man-1.6e-man2html-bzip2.patch 1452 +SHA256 8733a306b1af24efcc610994c8098dc03a90b2ecaba284762ea5dc04d67afaa0 files/man-1.6e-man2html-bzip2.patch 1452 DIST man-1.6d.tar.gz 270140 RMD160 2c476a735c211acbb478d604b73a1becb54cb87b SHA1 f83aecdcd922f0cf3515665b8e1e0e2514c99286 SHA256 a6d03bdabe16542a5a51471b5d8e7eaa50ad782577c7b31d9c478382097cf4eb DIST man-1.6e.tar.gz 252657 RMD160 486099dc1b34fe86a2c1d19b7c89dc19b9787837 SHA1 7264bda7dd7bf08bdb9dac6ec7734e755ec0a8d1 SHA256 022faf23844eabb3662eabb105836925dd83bedda10271e2450a5bc5b61a5b5f EBUILD man-1.6d.ebuild 3271 RMD160 cb2fa2ab59ed3641ac907f3e72597bdb78d6d176 SHA1 8e522d4667e92ce22c500040f12ae5d872fa836c SHA256 4719ecf55025f396ca02c3fe50beda55447db38bcebdbd4700725f5236fb4381 @@ -67,14 +71,18 @@ EBUILD man-1.6e-r1.ebuild 3420 RMD160 f0568ee3e60529ba7321aff66ab6d1757ca74e78 S MD5 c77e1ca5aff91069776584e4d6a75f3f man-1.6e-r1.ebuild 3420 RMD160 f0568ee3e60529ba7321aff66ab6d1757ca74e78 man-1.6e-r1.ebuild 3420 SHA256 bf28630af6f87ead248e13bbc006b59da474ee4b73a4fc747e87da22b32ce984 man-1.6e-r1.ebuild 3420 +EBUILD man-1.6e-r2.ebuild 3504 RMD160 5c4d68f2863dc84d8b6f52420244167285bb5307 SHA1 c42017f8e257b6206792af70f3587b6acf2afe60 SHA256 e9050e66518e571e82ed84915b152e8592d1dd6d38b815fd335c22b2ed26a7bf +MD5 487ae4a24bcd004654bc0115b37e1e7b man-1.6e-r2.ebuild 3504 +RMD160 5c4d68f2863dc84d8b6f52420244167285bb5307 man-1.6e-r2.ebuild 3504 +SHA256 e9050e66518e571e82ed84915b152e8592d1dd6d38b815fd335c22b2ed26a7bf man-1.6e-r2.ebuild 3504 EBUILD man-1.6e.ebuild 3307 RMD160 b5b9e644e803a87fe26b1c53201b16f9f3edc414 SHA1 67680c0c2f0d1ecac04da84daeb0c850fe4f6931 SHA256 096fcd00f187cb23d96268570c648dcff7a8c09105343a8166f0f2533121c139 MD5 f19ddc44832adc425f5c0b231f0a6d14 man-1.6e.ebuild 3307 RMD160 b5b9e644e803a87fe26b1c53201b16f9f3edc414 man-1.6e.ebuild 3307 SHA256 096fcd00f187cb23d96268570c648dcff7a8c09105343a8166f0f2533121c139 man-1.6e.ebuild 3307 -MISC ChangeLog 15142 RMD160 98d6ef93769278a1473a2813b20573370fb80fd0 SHA1 53e8fa92fc96ed2300d2a31ccc10f921d6d84c1d SHA256 7b5badac07d663531ba42fee62431bf0a19408df108037abb6fcc93b1105f542 -MD5 5c6b2ab7bbb1b22eeecbbb622120f7ab ChangeLog 15142 -RMD160 98d6ef93769278a1473a2813b20573370fb80fd0 ChangeLog 15142 -SHA256 7b5badac07d663531ba42fee62431bf0a19408df108037abb6fcc93b1105f542 ChangeLog 15142 +MISC ChangeLog 15325 RMD160 ed801cb236e58f4780a96e12bd721f2bbf62daa4 SHA1 98657b2f9e942b4786fbcde158d8e738bdcec8a6 SHA256 7ef04b6353634a97d0c06765470148addc250c29a96222c0977876c1753a8429 +MD5 1e40cdb135b22fdb67b5ecc643f28962 ChangeLog 15325 +RMD160 ed801cb236e58f4780a96e12bd721f2bbf62daa4 ChangeLog 15325 +SHA256 7ef04b6353634a97d0c06765470148addc250c29a96222c0977876c1753a8429 ChangeLog 15325 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 @@ -88,10 +96,13 @@ SHA256 450b990513ad7cf341ba6ba412d2ba0d380e11daa1f76fc70290fbbe40b88431 files/di MD5 9260305e16fda8ca7362cceb0cb5ad02 files/digest-man-1.6e-r1 226 RMD160 9d9e3022e704e8ebbee6ab33f2f6b9357ffb0fe6 files/digest-man-1.6e-r1 226 SHA256 450b990513ad7cf341ba6ba412d2ba0d380e11daa1f76fc70290fbbe40b88431 files/digest-man-1.6e-r1 226 +MD5 9260305e16fda8ca7362cceb0cb5ad02 files/digest-man-1.6e-r2 226 +RMD160 9d9e3022e704e8ebbee6ab33f2f6b9357ffb0fe6 files/digest-man-1.6e-r2 226 +SHA256 450b990513ad7cf341ba6ba412d2ba0d380e11daa1f76fc70290fbbe40b88431 files/digest-man-1.6e-r2 226 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFnvy28bi6rjpTunYRAppMAJ46GIUKIvCERpGh+/2knq9W2xVQPwCeJhSm -EYIxyZ8yiJXpkqkgou6SqXQ= -=f3Kt +iD8DBQFFpuzP8bi6rjpTunYRArk6AJ4reoS4sIvnK/mQSSf/7cqqU5FasACg4v0p +DD4MfBgtkDDNGEnMcGwSS3A= +=Zenp -----END PGP SIGNATURE----- diff --git a/sys-apps/man/files/digest-man-1.6e-r2 b/sys-apps/man/files/digest-man-1.6e-r2 new file mode 100644 index 000000000000..69ec127910e1 --- /dev/null +++ b/sys-apps/man/files/digest-man-1.6e-r2 @@ -0,0 +1,3 @@ +MD5 d8187cd756398baefc48ba7d60ff6a8a man-1.6e.tar.gz 252657 +RMD160 486099dc1b34fe86a2c1d19b7c89dc19b9787837 man-1.6e.tar.gz 252657 +SHA256 022faf23844eabb3662eabb105836925dd83bedda10271e2450a5bc5b61a5b5f man-1.6e.tar.gz 252657 diff --git a/sys-apps/man/files/man-1.6e-man2html-bzip2.patch b/sys-apps/man/files/man-1.6e-man2html-bzip2.patch new file mode 100644 index 000000000000..6ca5298c1012 --- /dev/null +++ b/sys-apps/man/files/man-1.6e-man2html-bzip2.patch @@ -0,0 +1,51 @@ +--- man2html/glimpse_filters ++++ man2html/glimpse_filters +@@ -1,3 +1,4 @@ ++*.bz2 bzip2 -d -c + *.gz gzip -d -c + *.Z gzip -d -c + +--- man2html/scripts/cgi-bin/man/man2html ++++ man2html/scripts/cgi-bin/man/man2html +@@ -87,6 +87,9 @@ + if [ -r "$PAGE" ] + then + case "$PAGE" in ++ *.bz2) ++ bzcat "$PAGE" | "$MAN2HTML" "$LL" -D "$PAGE" ++ ;; + *.gz) + zcat "$PAGE" | "$MAN2HTML" "$LL" -D "$PAGE" + ;; +@@ -94,6 +97,9 @@ + "$MAN2HTML" "$LL" "$PAGE" + ;; + esac ++elif [ -r "$PAGE".bz2 ] ++then ++ bzcat "$PAGE".bz2 | "$MAN2HTML" "$LL" -D "$PAGE" + elif [ -r "$PAGE".gz ] + then + zcat "$PAGE".gz | "$MAN2HTML" "$LL" -D "$PAGE" +--- man2html/scripts/cgi-bin/man/mansearch ++++ man2html/scripts/cgi-bin/man/mansearch +@@ -153,7 +153,7 @@ + } + print "
"; + textname = filename; +- sub(/\.(gz)|Z|z$/, "", textname); ++ sub(/\.(gz)|(bz2)|Z|z$/, "", textname); + sub(/\./, "(", textname); + textname = textname ")"; + print textname; +--- man2html/scripts/cgi-bin/man/mansec ++++ man2html/scripts/cgi-bin/man/mansec +@@ -128,7 +128,7 @@ + # Print out alphabetic quick index and other links + } + # Split page.n into "page" and "n" and generate an entry +- sub(/[.]([zZ]|(gz))$/, "", manpage); ++ sub(/[.]([zZ]|(gz)|(bz2))$/, "", manpage); + match(manpage, /[.][^.]+$/); + title = substr(manpage, 1, RSTART - 1); + if (section != "all") { diff --git a/sys-apps/man/man-1.6e-r2.ebuild b/sys-apps/man/man-1.6e-r2.ebuild new file mode 100644 index 000000000000..11f3cece5be1 --- /dev/null +++ b/sys-apps/man/man-1.6e-r2.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.6e-r2.ebuild,v 1.1 2007/01/12 02:04:47 vapier Exp $ + +inherit eutils flag-o-matic toolchain-funcs + +DESCRIPTION="Standard commands to read man pages" +HOMEPAGE="http://primates.ximian.com/~flucifredi/man/" +SRC_URI="http://primates.ximian.com/~flucifredi/man/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="nls" + +DEPEND="nls? ( sys-devel/gettext )" +DEPEND=">=sys-apps/groff-1.18 + !sys-apps/man-db" +PROVIDE="virtual/man" + +pkg_setup() { + enewgroup man 15 + enewuser man 13 -1 /usr/share/man man +} + +src_unpack() { + unpack ${A} + cd "${S}" + + # add support for bzip2 pages + epatch "${FILESDIR}"/man-1.6e-man2html-bzip2.patch + + # We love to cross-compile + epatch "${FILESDIR}"/man-1.6-cross-compile.patch + + # Fix search order in man.conf so that system installed manpages + # will be found first ... + epatch "${FILESDIR}"/man-1.5p-search-order.patch + + # For groff-1.18 or later we need to call nroff with '-c' + epatch "${FILESDIR}"/man-1.5m-groff-1.18.patch + + # makewhatis traverses manpages twice, as default manpath + # contains two directories that are symlinked together + epatch "${FILESDIR}"/man-1.5p-defmanpath-symlinks.patch + + # add more sections to default search path + epatch "${FILESDIR}"/man-1.6b-more-sections.patch + + # cut out symlinked paths #90186 + epatch "${FILESDIR}"/man-1.6c-cut-duplicate-manpaths.patch + + # Fedora patches + epatch "${FILESDIR}"/man-1.5m2-apropos.patch + + # Fixes compilation in FreeBSD wrt #138123 + epatch "${FILESDIR}"/man-1.6d-fbsd.patch + + epatch "${FILESDIR}"/man-1.6e-dont-kill-shebangs.patch #159192 + epatch "${FILESDIR}"/man-1.6e-headers.patch + + strip-linguas $(eval $(grep ^LANGUAGES= configure) ; echo ${LANGUAGES//,/ }) +} + +src_compile() { + tc-export CC BUILD_CC + + local mylang= + if use nls ; then + if [[ -z ${LINGUAS} ]] ; then + mylang="all" + else + mylang="${LINGUAS// /,}" + fi + else + mylang="none" + fi + ./configure \ + -confdir=/etc \ + +sgid +fhs \ + +lang ${mylang} \ + || die "configure failed" + + append-ldflags $(bindnow-flags) + emake || die "emake failed" +} + +src_install() { + emake PREFIX="${D}" install || die "make install failed" + dosym man /usr/bin/manpath + + dodoc LSM README* TODO + + # makewhatis only adds man-pages from the last 24hrs + exeinto /etc/cron.daily + newexe "${FILESDIR}"/makewhatis.cron makewhatis + + keepdir /var/cache/man + diropts -m0775 -g man + local mansects=$(grep ^MANSECT "${D}"/etc/man.conf | cut -f2-) + for x in ${mansects//:/ } ; do + keepdir /var/cache/man/cat${x} + done +} + +pkg_postinst() { + einfo "Forcing sane permissions onto ${ROOT}/var/cache/man (Bug #40322)" + chown -R root:man "${ROOT}"/var/cache/man + chmod -R g+w "${ROOT}"/var/cache/man + [[ -e ${ROOT}/var/cache/man/whatis ]] \ + && chown root:0 "${ROOT}"/var/cache/man/whatis + + echo + + local f files=$(ls "${ROOT}"/etc/cron.{daily,weekly}/makewhatis{,.cron} 2>/dev/null) + for f in ${files} ; do + [[ ${f} == */etc/cron.daily/makewhatis ]] && continue + [[ $(md5sum "${f}") == "8b2016cc778ed4e2570b912c0f420266 "* ]] \ + && rm -f "${f}" + done + files=$(ls "${ROOT}"/etc/cron.{daily,weekly}/makewhatis{,.cron} 2>/dev/null) + if [[ ${files/$'\n'} != ${files} ]] ; then + ewarn "You have multiple makewhatis cron files installed." + ewarn "You might want to delete all but one of these:" + ewarn ${files} + fi +} -- 2.26.2