diff options
| -rw-r--r-- | www-client/lynx/ChangeLog | 7 | ||||
| -rw-r--r-- | www-client/lynx/files/digest-lynx-2.8.5-r3 | 6 | ||||
| -rw-r--r-- | www-client/lynx/files/lynx-2.8.5-darwin.patch | 15 | ||||
| -rw-r--r-- | www-client/lynx/files/lynx-2.8.5-embedded-url.patch | 51 | ||||
| -rw-r--r-- | www-client/lynx/files/lynx-2.8.5-tab_to.patch | 13 | ||||
| -rw-r--r-- | www-client/lynx/lynx-2.8.5-r3.ebuild | 76 |
6 files changed, 6 insertions, 162 deletions
diff --git a/www-client/lynx/ChangeLog b/www-client/lynx/ChangeLog index 2f0f9907c55c..5ec127f3a0ad 100644 --- a/www-client/lynx/ChangeLog +++ b/www-client/lynx/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-client/lynx # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/ChangeLog,v 1.64 2007/02/28 00:46:16 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/ChangeLog,v 1.65 2007/02/28 09:13:46 drizzt Exp $ + + 28 Feb 2007; Timothy Redaelli <drizzt@gentoo.org> + -files/lynx-2.8.5-darwin.patch, -files/lynx-2.8.5-embedded-url.patch, + -files/lynx-2.8.5-tab_to.patch, -lynx-2.8.5-r3.ebuild: + Cleaned old version 28 Feb 2007; Jason Wever <weeve@gentoo.org> lynx-2.8.6-r2.ebuild: Stable on SPARC wrt bug #168596. diff --git a/www-client/lynx/files/digest-lynx-2.8.5-r3 b/www-client/lynx/files/digest-lynx-2.8.5-r3 deleted file mode 100644 index f7f732972368..000000000000 --- a/www-client/lynx/files/digest-lynx-2.8.5-r3 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 070b1da6098ca1bb8b084713766dfb3a lynx-2.8.5-rel5.patch.bz2 6907 -RMD160 9e843f4c235c1de17a4ebe62ad1511dd9ed1f620 lynx-2.8.5-rel5.patch.bz2 6907 -SHA256 a6997212e7a36c109f57856d1ce185c074b598f2fb1b1d3d9c57fe38df5d6ccb lynx-2.8.5-rel5.patch.bz2 6907 -MD5 d1e5134e5d175f913c16cb6768bc30eb lynx2.8.5.tar.bz2 2177287 -RMD160 80d20261ac6eaebe1d940fb5de485daaad7bb3b7 lynx2.8.5.tar.bz2 2177287 -SHA256 37607008086933c869be26b4db687f61a768c51ddefa741e77225069b880bc63 lynx2.8.5.tar.bz2 2177287 diff --git a/www-client/lynx/files/lynx-2.8.5-darwin.patch b/www-client/lynx/files/lynx-2.8.5-darwin.patch deleted file mode 100644 index f48d466d679e..000000000000 --- a/www-client/lynx/files/lynx-2.8.5-darwin.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ur lynx2-8-5/WWW/Library/Implementation/HTTCP.c lynx2-8-5-patched/WWW/Library/Implementation/HTTCP.c ---- lynx2-8-5/WWW/Library/Implementation/HTTCP.c 2004-01-25 09:51:04.000000000 +0800 -+++ lynx2-8-5-patched/WWW/Library/Implementation/HTTCP.c 2005-08-12 12:32:50.000000000 +0800 -@@ -1326,7 +1326,11 @@ - if (phost->h_length != sizeof soc_in->sin_addr) { - HTAlwaysAlert(host, gettext("Address length looks invalid")); - } -+#ifndef __APPLE__ - memcpy((void *)&soc_in->sin_addr, phost->h_addr, phost->h_length); -+#else -+ memcpy((void *)&soc_in->sin_addr, phost->h_addr_list[ 0 ], phost->h_length); -+#endif - #endif /* VMS && CMU_TCP */ - } - #endif /* _WINDOWS_NSL */ diff --git a/www-client/lynx/files/lynx-2.8.5-embedded-url.patch b/www-client/lynx/files/lynx-2.8.5-embedded-url.patch deleted file mode 100644 index 8bf23803997b..000000000000 --- a/www-client/lynx/files/lynx-2.8.5-embedded-url.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- WWW/Library/Implementation/HTParse.c.old 2006-08-31 22:55:10.031020854 +0200 -+++ WWW/Library/Implementation/HTParse.c 2006-08-31 22:56:58.964604699 +0200 -@@ -166,6 +166,16 @@ - #define LYalloca_free(x) free(x) - #endif - -+static char *strchr_or_end(char *string, int ch) -+{ -+ char *result = strchr(string, ch); -+ -+ if (result == 0) { -+ result = string + strlen(string); -+ } -+ return result; -+} -+ - /* Parse a Name relative to another name. HTParse() - ** -------------------------------------- - ** -@@ -455,13 +465,24 @@ - *tail++ = '/'; - strcpy(tail, related.absolute); - if (given.relative) { -- p = strchr(tail, '?'); /* Search part? */ -- if (p == NULL) -- p = (tail + strlen(tail) - 1); -- for (; *p != '/'; p--) -- ; /* last / */ -- p[1] = '\0'; /* Remove filename */ -- strcat(p, given.relative); /* Add given one */ -+ /* RFC 1808 part 4 step 5 (if URL path is empty) */ -+ /* a) if given has params, add/replace that */ -+ if (given.relative[0] == ';') { -+ strcpy(strchr_or_end(tail, ';'), given.relative); -+ } -+ /* b) if given has query, add/replace that */ -+ else if (given.relative[0] == '?') { -+ strcpy(strchr_or_end(tail, '?'), given.relative); -+ } -+ /* otherwise fall through to RFC 1808 part 4 step 6 */ -+ else { -+ p = strchr(tail, '?'); /* Search part? */ -+ if (p == NULL) -+ p = (tail + strlen(tail) - 1); -+ for (; *p != '/'; p--) ; /* last / */ -+ p[1] = '\0'; /* Remove filename */ -+ strcat(p, given.relative); /* Add given one */ -+ } - HTSimplify (result); - } - CTRACE((tfp, "HTParse: (Related-ABS)\n")); diff --git a/www-client/lynx/files/lynx-2.8.5-tab_to.patch b/www-client/lynx/files/lynx-2.8.5-tab_to.patch deleted file mode 100644 index bde6dfdaa3aa..000000000000 --- a/www-client/lynx/files/lynx-2.8.5-tab_to.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -u lynx2-8-5/src/HTTP.c lynx2-8-5/src/HTTP.c ---- lynx2-8-5/src/HTML.c 2004/10/21 17:04:47 1.5 -+++ lynx2-8-5/src/HTML.c 2005/11/27 21:45:19 1.6 -@@ -2104,7 +2104,8 @@ - int enval = 2; - - column = HText_getCurrentColumn(me->text); -- if (present[HTML_TAB_TO]) { -+ if (present[HTML_TAB_TO] && -+ value[HTML_TAB_TO] && *value[HTML_TAB_TO]) { - /* - * TO has priority over INDENT if both are present. - FM - */ diff --git a/www-client/lynx/lynx-2.8.5-r3.ebuild b/www-client/lynx/lynx-2.8.5-r3.ebuild deleted file mode 100644 index 47aea779bf8a..000000000000 --- a/www-client/lynx/lynx-2.8.5-r3.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/lynx-2.8.5-r3.ebuild,v 1.18 2007/02/27 16:45:21 grobian Exp $ - -inherit eutils flag-o-matic - -MY_P="${P/-/}" -DESCRIPTION="An excellent console-based web browser with ssl support" -HOMEPAGE="http://lynx.browser.org/" -SRC_URI="ftp://lynx.isc.org/${MY_P}/${MY_P}.tar.bz2 - mirror://gentoo/${P}-rel5.patch.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -IUSE="bzip2 cjk ipv6 nls ssl" - -DEPEND="sys-libs/ncurses - sys-libs/zlib - nls? ( sys-devel/gettext ) - ssl? ( >=dev-libs/openssl-0.9.6 ) - bzip2? ( app-arch/bzip2 )" - -S="${WORKDIR}/${PN}${PV//./-}" - -src_unpack() { - unpack ${A}; cd "${S}" - epatch "${DISTDIR}/${P}"-rel5.patch.bz2 - epatch "${FILESDIR}/${P}"-darwin.patch - epatch "${FILESDIR}/${P}"-tab_to.patch -} - -src_compile() { - local myconf - use ssl && myconf="${myconf} --with-ssl=yes" - use bzip2 && myconf="${myconf} --with-bzlib" - - append-flags -DANSI_VARARGS - - econf \ - --libdir=/etc/lynx \ - --enable-cgi-links \ - --enable-EXP_PERSISTENT_COOKIES \ - --enable-prettysrc \ - --enable-nsl-fork \ - --enable-file-upload \ - --enable-read-eta \ - --enable-libjs \ - --enable-color-style \ - --enable-scrollbar \ - --enable-included-msgs \ - --with-zlib \ - $(use_enable nls) \ - $(use_enable ipv6) \ - $(use_enable cjk) \ - ${myconf} || die - - emake -j1 || die "compile problem" -} - -src_install() { - einstall libdir="${D}"/etc/lynx || die - - dosed "s|^HELPFILE.*$|HELPFILE:file://localhost/usr/share/doc/${PF}/lynx_help/lynx_help/lynx_help_main.html|" \ - /etc/lynx/lynx.cfg - dodoc CHANGES COPYHEADER INSTALLATION PROBLEMS README - docinto docs - dodoc docs/* - docinto lynx_help - dodoc lynx_help/*.txt - dohtml -r lynx_help - - # small little manpage glitch - rm "${D}"/usr/share/man/lynx.1 - newman lynx.man lynx.1 -} |