diff options
author | Mike Frysinger <vapier@gentoo.org> | 2010-01-17 22:27:29 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2010-01-17 22:27:29 +0000 |
commit | e906ea2ddc7939dfec83727d1f8b50ff3f38ae04 (patch) | |
tree | 0e03e5ce8a7beaf5ccc7e109c01905e1abee6ea7 /net-misc | |
parent | Stable for HPPA (bug #294958). (diff) | |
download | gentoo-2-e906ea2ddc7939dfec83727d1f8b50ff3f38ae04.tar.gz gentoo-2-e906ea2ddc7939dfec83727d1f8b50ff3f38ae04.tar.bz2 gentoo-2-e906ea2ddc7939dfec83727d1f8b50ff3f38ae04.zip |
old
Diffstat (limited to 'net-misc')
-rw-r--r-- | net-misc/wget/files/wget-1.11-linking.patch | 96 | ||||
-rw-r--r-- | net-misc/wget/wget-1.11.4.ebuild | 65 |
2 files changed, 0 insertions, 161 deletions
diff --git a/net-misc/wget/files/wget-1.11-linking.patch b/net-misc/wget/files/wget-1.11-linking.patch deleted file mode 100644 index c1e20ebdca96..000000000000 --- a/net-misc/wget/files/wget-1.11-linking.patch +++ /dev/null @@ -1,96 +0,0 @@ -For static linking, we need 2 things: -1) lib-link.m4 should use -l<libname> and not <full path to lib>, else it tries - to link against the .so -2) lib-link.m4 should add $LIBS after the libs we test for, else newer ld's do - not resolve symbols in static libs properly. - -Martin Schlemmer <azarah@gentoo.org> - ---- configure -+++ configure -@@ -10304,5 +10304,5 @@ - if test "X$found_so" != "X"; then - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then -- LIBGNUTLS="${LIBGNUTLS}${LIBGNUTLS:+ }$found_so" -+ LIBGNUTLS="${LIBGNUTLS}${LIBGNUTLS:+ }-l$name" - else - haveit= -@@ -10317,8 +10317,8 @@ - fi - if test "$hardcode_direct" = yes; then -- LIBGNUTLS="${LIBGNUTLS}${LIBGNUTLS:+ }$found_so" -+ LIBGNUTLS="${LIBGNUTLS}${LIBGNUTLS:+ }-l$name" - else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then -- LIBGNUTLS="${LIBGNUTLS}${LIBGNUTLS:+ }$found_so" -+ LIBGNUTLS="${LIBGNUTLS}${LIBGNUTLS:+ }-l$name" - haveit= - for x in $rpathdirs; do -@@ -10352,5 +10352,5 @@ - fi - if test "$hardcode_minus_L" != no; then -- LIBGNUTLS="${LIBGNUTLS}${LIBGNUTLS:+ }$found_so" -+ LIBGNUTLS="${LIBGNUTLS}${LIBGNUTLS:+ }-l$name" - else - LIBGNUTLS="${LIBGNUTLS}${LIBGNUTLS:+ }-l$name" -@@ -10579,5 +10579,5 @@ - - ac_save_LIBS="$LIBS" -- LIBS="$LIBS $LIBGNUTLS" -+ LIBS="$LIBGNUTLS $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -10957,5 +10957,5 @@ - if test "X$found_so" != "X"; then - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then -- LIBSSL="${LIBSSL}${LIBSSL:+ }$found_so" -+ LIBSSL="${LIBSSL}${LIBSSL:+ }-l$name" - else - haveit= -@@ -10970,8 +10970,8 @@ - fi - if test "$hardcode_direct" = yes; then -- LIBSSL="${LIBSSL}${LIBSSL:+ }$found_so" -+ LIBSSL="${LIBSSL}${LIBSSL:+ }-l$name" - else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then -- LIBSSL="${LIBSSL}${LIBSSL:+ }$found_so" -+ LIBSSL="${LIBSSL}${LIBSSL:+ }-l$name" - haveit= - for x in $rpathdirs; do -@@ -11005,5 +11005,5 @@ - fi - if test "$hardcode_minus_L" != no; then -- LIBSSL="${LIBSSL}${LIBSSL:+ }$found_so" -+ LIBSSL="${LIBSSL}${LIBSSL:+ }-l$name" - else - LIBSSL="${LIBSSL}${LIBSSL:+ }-l$name" -@@ -11232,5 +11232,5 @@ - - ac_save_LIBS="$LIBS" -- LIBS="$LIBS $LIBSSL" -+ LIBS="$LIBSSL $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ ---- src/Makefile.in -+++ src/Makefile.in -@@ -53,7 +53,7 @@ - DEFS = @DEFS@ -DSYSTEM_WGETRC=\"$(sysconfdir)/wgetrc\" -DLOCALEDIR=\"$(localedir)\" - CFLAGS = @CFLAGS@ - LDFLAGS = @LDFLAGS@ --LIBS = @LIBS@ @LIBSSL@ @LIBGNUTLS@ -+LIBS = @LIBSSL@ @LIBGNUTLS@ @LIBS@ - exeext = @EXEEXT@ - - INCLUDES = -I. -I$(srcdir) ---- Makefile.in -+++ Makefile.in -@@ -58,7 +58,7 @@ - CFLAGS = @CFLAGS@ - CPPFLAGS = @CPPFLAGS@ - DEFS = @DEFS@ -DSYSTEM_WGETRC=\"$(sysconfdir)/wgetrc\" -DLOCALEDIR=\"$(localedir)\" --LIBS = @LIBS@ @LIBSSL@ @LIBGNUTLS@ -+LIBS = @LIBSSL@ @LIBGNUTLS@ @LIBS@ - LDFLAGS = @LDFLAGS@ - - # diff --git a/net-misc/wget/wget-1.11.4.ebuild b/net-misc/wget/wget-1.11.4.ebuild deleted file mode 100644 index 85fcf398487b..000000000000 --- a/net-misc/wget/wget-1.11.4.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.11.4.ebuild,v 1.9 2009/09/07 19:52:49 jer Exp $ - -inherit eutils flag-o-matic - -DESCRIPTION="Network utility to retrieve files from the WWW" -HOMEPAGE="http://www.gnu.org/software/wget/" -SRC_URI="mirror://gnu/wget/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" -IUSE="debug ipv6 nls ssl static" - -RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6b )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-1.11-linking.patch -} - -src_compile() { - # openssl-0.9.8 now builds with -pthread on the BSD's - use elibc_FreeBSD && use ssl && append-ldflags -pthread - - use static && append-ldflags -static - econf \ - $(use_with ssl) $(use_enable ssl opie) $(use_enable ssl digest) \ - $(use_enable ipv6) \ - $(use_enable nls) \ - $(use_enable debug) \ - || die - emake || die -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc AUTHORS ChangeLog* MAILING-LIST NEWS README - dodoc doc/sample.wgetrc - - use ipv6 && cat "${FILESDIR}"/wgetrc-ipv6 >> "${D}"/etc/wgetrc - - sed -i \ - -e 's:/usr/local/etc:/etc:g' \ - "${D}"/etc/wgetrc \ - "${D}"/usr/share/man/man1/wget.1 \ - "${D}"/usr/share/info/wget.info -} - -pkg_preinst() { - ewarn "The /etc/wget/wgetrc file has been relocated to /etc/wgetrc" - if [[ -e ${ROOT}/etc/wget/wgetrc ]] ; then - if [[ -e ${ROOT}/etc/wgetrc ]] ; then - ewarn "You have both /etc/wget/wgetrc and /etc/wgetrc ... you should delete the former" - else - einfo "Moving /etc/wget/wgetrc to /etc/wgetrc for you" - mv "${ROOT}"/etc/wget/wgetrc "${ROOT}"/etc/wgetrc - rmdir "${ROOT}"/etc/wget 2>/dev/null - fi - fi -} |