| 1 |
vapier 11/12/01 02:04:41 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: wget-1.13.4-r1.ebuild |
| 5 |
Log: |
| 6 |
Switch to pkg-config for looking up openssl #246556 by Rick Farina. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha75/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.148 net-misc/wget/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wget/ChangeLog?rev=1.148&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wget/ChangeLog?rev=1.148&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wget/ChangeLog?r1=1.147&r2=1.148 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v |
| 20 |
retrieving revision 1.147 |
| 21 |
retrieving revision 1.148 |
| 22 |
diff -u -r1.147 -r1.148 |
| 23 |
--- ChangeLog 18 Sep 2011 23:08:35 -0000 1.147 |
| 24 |
+++ ChangeLog 1 Dec 2011 02:04:41 -0000 1.148 |
| 25 |
@@ -1,6 +1,12 @@ |
| 26 |
# ChangeLog for net-misc/wget |
| 27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.147 2011/09/18 23:08:35 radhermit Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.148 2011/12/01 02:04:41 vapier Exp $ |
| 30 |
+ |
| 31 |
+*wget-1.13.4-r1 (01 Dec 2011) |
| 32 |
+ |
| 33 |
+ 01 Dec 2011; Mike Frysinger <vapier@g.o> +wget-1.13.4-r1.ebuild, |
| 34 |
+ +files/wget-1.13.4-openssl-pkg-config.patch: |
| 35 |
+ Switch to pkg-config for looking up openssl #246556 by Rick Farina. |
| 36 |
|
| 37 |
*wget-1.13.4 (18 Sep 2011) |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.1 net-misc/wget/wget-1.13.4-r1.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wget/wget-1.13.4-r1.ebuild?rev=1.1&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wget/wget-1.13.4-r1.ebuild?rev=1.1&content-type=text/plain |
| 46 |
|
| 47 |
Index: wget-1.13.4-r1.ebuild |
| 48 |
=================================================================== |
| 49 |
# Copyright 1999-2011 Gentoo Foundation |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.13.4-r1.ebuild,v 1.1 2011/12/01 02:04:41 vapier Exp $ |
| 52 |
|
| 53 |
EAPI="4" |
| 54 |
|
| 55 |
inherit flag-o-matic toolchain-funcs autotools |
| 56 |
|
| 57 |
DESCRIPTION="Network utility to retrieve files from the WWW" |
| 58 |
HOMEPAGE="http://www.gnu.org/software/wget/" |
| 59 |
SRC_URI="mirror://gnu/wget/${P}.tar.xz" |
| 60 |
|
| 61 |
LICENSE="GPL-3" |
| 62 |
SLOT="0" |
| 63 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 64 |
IUSE="debug gnutls idn ipv6 nls ntlm +ssl static" |
| 65 |
|
| 66 |
LIB_DEPEND="idn? ( net-dns/libidn[static-libs] ) |
| 67 |
ssl? ( |
| 68 |
gnutls? ( net-libs/gnutls[static-libs(+)] ) |
| 69 |
!gnutls? ( >=dev-libs/openssl-0.9.6b[static-libs(+)] ) |
| 70 |
)" |
| 71 |
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} )" |
| 72 |
DEPEND="${RDEPEND} |
| 73 |
app-arch/xz-utils |
| 74 |
static? ( ${LIB_DEPEND} ) |
| 75 |
nls? ( sys-devel/gettext )" |
| 76 |
|
| 77 |
REQUIRED_USE="ntlm? ( !gnutls ssl ) gnutls? ( ssl )" |
| 78 |
|
| 79 |
DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc ) |
| 80 |
|
| 81 |
src_prepare() { |
| 82 |
epatch "${FILESDIR}"/${P}-openssl-pkg-config.patch |
| 83 |
eautoreconf |
| 84 |
} |
| 85 |
|
| 86 |
src_configure() { |
| 87 |
# openssl-0.9.8 now builds with -pthread on the BSD's |
| 88 |
use elibc_FreeBSD && use ssl && append-ldflags -pthread |
| 89 |
# fix compilation on Solaris, we need filio.h for FIONBIO as used in |
| 90 |
# the included gnutls -- force ioctl.h to include this header |
| 91 |
[[ ${CHOST} == *-solaris* ]] && append-flags -DBSD_COMP=1 |
| 92 |
|
| 93 |
# the configure script contains a few hacks to workaround openssl |
| 94 |
# build limitations. disable those, and use openssl's pkg-config. |
| 95 |
eval export ac_cv_lib_{z_compress,dl_{dlopen,shl_load}}=no |
| 96 |
|
| 97 |
if use static ; then |
| 98 |
append-ldflags -static |
| 99 |
tc-export PKG_CONFIG |
| 100 |
PKG_CONFIG+=" --static" |
| 101 |
fi |
| 102 |
econf \ |
| 103 |
--disable-rpath \ |
| 104 |
$(use_with ssl ssl $(usex gnutls gnutls openssl)) \ |
| 105 |
$(use_enable ssl opie) \ |
| 106 |
$(use_enable ssl digest) \ |
| 107 |
$(use_enable idn iri) \ |
| 108 |
$(use_enable ipv6) \ |
| 109 |
$(use_enable nls) \ |
| 110 |
$(use_enable ntlm) \ |
| 111 |
$(use_enable debug) |
| 112 |
} |
| 113 |
|
| 114 |
src_install() { |
| 115 |
default |
| 116 |
|
| 117 |
use ipv6 && cat "${FILESDIR}"/wgetrc-ipv6 >> "${ED}"/etc/wgetrc |
| 118 |
|
| 119 |
sed -i \ |
| 120 |
-e "s:/usr/local/etc:${EPREFIX}/etc:g" \ |
| 121 |
"${ED}"/etc/wgetrc \ |
| 122 |
"${ED}"/usr/share/man/man1/wget.1 \ |
| 123 |
"${ED}"/usr/share/info/wget.info |
| 124 |
} |
Archives