forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
www-misc/htdig: add patch for musl. EAPI 6 bump.
Gentoo-Bug: https://bugs.gentoo.org/529384 Package-Manager: Portage-2.3.5, Repoman-2.3.1
- Loading branch information
1 parent
bfa301a
commit e4cd88b
Showing
4 changed files
with
100 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| --- a/configure.in | ||
| +++ b/configure.in | ||
| @@ -176,7 +176,7 @@ | ||
| AC_FUNC_STRFTIME | ||
| AC_FUNC_STRPTIME | ||
| AC_FUNC_VPRINTF | ||
| -AC_CHECK_FUNCS([alarm btowc bzero ftime getcwd gettimeofday localtime_r memcmp memcpy memmove memset mkstemp munmap pstat_getdynamic raise re_comp regcomp select setlocale strchr strcspn strdup strerror strrchr strstr strtol strtoul timegm]) | ||
| +AC_CHECK_FUNCS([alarm btowc bzero ftime getcwd gettimeofday localtime_r memcmp memcpy memmove memset mkstemp munmap pstat_getdynamic raise re_comp regcomp rresvport select setlocale strchr strcspn strdup strerror strrchr strstr strtol strtoul timegm]) | ||
| AC_REPLACE_FUNCS(snprintf vsnprintf) | ||
|
|
||
| # More header checks--here use C++ | ||
| diff -ur a/htdig-3.2.0b6/htnet/Connection.cc b/htdig-3.2.0b6/htnet/Connection.cc | ||
| --- a/htnet/Connection.cc | ||
| +++ b/htnet/Connection.cc | ||
| @@ -64,7 +64,7 @@ | ||
|
|
||
| typedef void (*SIGNAL_HANDLER) (...); | ||
|
|
||
| -#ifndef _MSC_VER /* _WIN32 */ | ||
| +#ifdef HAVE_RRESVPORT | ||
| extern "C" { | ||
| int rresvport(int *); | ||
| } | ||
| @@ -161,8 +161,7 @@ | ||
| { | ||
| int aport = IPPORT_RESERVED - 1; | ||
|
|
||
| -// Native Windows (MSVC) has no rresvport | ||
| -#ifndef _MSC_VER /* _WIN32 */ | ||
| +#ifdef HAVE_RRESVPORT | ||
| sock = rresvport(&aport); | ||
| #else | ||
| return NOTOK; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| # Copyright 1999-2017 Gentoo Foundation | ||
| # Distributed under the terms of the GNU General Public License v2 | ||
|
|
||
| EAPI=6 | ||
|
|
||
| inherit autotools | ||
|
|
||
| MY_PV=${PV/_beta/b} | ||
| S=${WORKDIR}/${PN}-${MY_PV} | ||
|
|
||
| DESCRIPTION="HTTP/HTML indexing and searching system" | ||
| HOMEPAGE="http://www.htdig.org" | ||
| SRC_URI="http://www.htdig.org/files/${PN}-${MY_PV}.tar.gz" | ||
|
|
||
| LICENSE="GPL-2" | ||
| SLOT="0" | ||
| KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" | ||
| IUSE="libressl ssl" | ||
|
|
||
| DEPEND=" | ||
| >=sys-libs/zlib-1.1.3 | ||
| app-arch/unzip | ||
| ssl? ( | ||
| !libressl? ( dev-libs/openssl:0 ) | ||
| libressl? ( dev-libs/libressl ) | ||
| )" | ||
|
|
||
| PATCHES=( | ||
| "${FILESDIR}"/${P}-gcc4.patch | ||
| "${FILESDIR}"/${P}-as-needed.patch | ||
| "${FILESDIR}"/${P}-quoting.patch | ||
| "${FILESDIR}"/${P}-gcc6.patch | ||
| "${FILESDIR}"/${P}-musl.patch | ||
| ) | ||
|
|
||
| HTML_DOCS=( htdoc ) | ||
|
|
||
| src_prepare() { | ||
| default | ||
| sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in db/configure.in || die | ||
| eautoreconf | ||
| } | ||
|
|
||
| src_configure() { | ||
| econf \ | ||
| --with-config-dir="${EPREFIX}"/etc/${PN} \ | ||
| --with-default-config-file="${EPREFIX}"/etc/${PN}/${PN}.conf \ | ||
| --with-database-dir="${EPREFIX}"/var/lib/${PN}/db \ | ||
| --with-cgi-bin-dir="${EPREFIX}"/var/www/localhost/cgi-bin \ | ||
| --with-search-dir="${EPREFIX}"/var/www/localhost/htdocs/${PN} \ | ||
| --with-image-dir="${EPREFIX}"/var/www/localhost/htdocs/${PN} \ | ||
| $(use_with ssl) | ||
| } | ||
|
|
||
| src_install () { | ||
| default | ||
| sed -i "s:${D}::g" \ | ||
| "${ED}"/etc/${PN}/${PN}.conf \ | ||
| "${ED}"/usr/bin/rundig \ | ||
| || die "sed failed (removing \${D} from installed files)" | ||
| # symlink htsearch so it can be easily found. see bug #62087 | ||
| dosym ../../var/www/localhost/cgi-bin/htsearch /usr/bin/htsearch | ||
| } |