From: Bjarke Istrup Pedersen Date: Thu, 19 Apr 2007 13:10:16 +0000 (+0000) Subject: Bumping to revision 1.4.4-r1 to fix compiling on Gentoo/FreeBSD X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f18608a9accaae0cab196d84ddb97e7d0bc7b8fb;p=gentoo.git Bumping to revision 1.4.4-r1 to fix compiling on Gentoo/FreeBSD Package-Manager: portage-2.1.2.4 --- diff --git a/net-misc/libupnp/ChangeLog b/net-misc/libupnp/ChangeLog index f1d470f1bafb..070bf4ce0aa1 100644 --- a/net-misc/libupnp/ChangeLog +++ b/net-misc/libupnp/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/libupnp # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/libupnp/ChangeLog,v 1.10 2007/04/17 18:43:03 gurligebis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/libupnp/ChangeLog,v 1.11 2007/04/19 13:10:16 gurligebis Exp $ + + 19 Apr 2007; Bjarke Istrup Pedersen +libupnp-1.4.4-r1.ebuild: + Bumping to revision 1.4.4-r1 to fix compiling on Gentoo/FreeBSD. + +*libupnp-1.4.4-r1 (19 Apr 2007) 17 Apr 2007; Bjarke Istrup Pedersen -libupnp-1.4.2.ebuild: Removing old version, and moving keywords to 1.4.4 diff --git a/net-misc/libupnp/Manifest b/net-misc/libupnp/Manifest index 783cd40d79fa..1b64c38ad274 100644 --- a/net-misc/libupnp/Manifest +++ b/net-misc/libupnp/Manifest @@ -1,12 +1,20 @@ +AUX libupnp-1.4.4-r1-fbsd.patch 1668 RMD160 4eb56fb2ed0edbb619c31549e7397524c929836b SHA1 e3e9d4d42a6fbe220cbe8fb7eb48a124d6f2cbeb SHA256 41a1e27d556efad9e84f1881e62956f42b028ff9f027dd673a8048f1edce601f +MD5 04ebc106918d07b923aa9d05d2b237a2 files/libupnp-1.4.4-r1-fbsd.patch 1668 +RMD160 4eb56fb2ed0edbb619c31549e7397524c929836b files/libupnp-1.4.4-r1-fbsd.patch 1668 +SHA256 41a1e27d556efad9e84f1881e62956f42b028ff9f027dd673a8048f1edce601f files/libupnp-1.4.4-r1-fbsd.patch 1668 DIST libupnp-1.4.4.tar.bz2 1098948 RMD160 3d0edbf93935a5371c8e951b459d3e1d81278f7e SHA1 59c1bb4cb9207ba482076dc8c8271521f27f320f SHA256 72e2069cd2541e7c4b5c8e1f2e9b3d02cbd93e94bfbac23e97d50045a6899001 +EBUILD libupnp-1.4.4-r1.ebuild 1090 RMD160 1be14cb59fb8798d64227120624148ff5cee4cb9 SHA1 0291709f44cad05a390f606c24ae1c91b25008bb SHA256 ee818b0d7924e95f62a065f0c646d1683efb13b5730c8d6c6fe4c8c34ccf9be6 +MD5 d7d775ad7f445a68cc18bc0f4f2a6097 libupnp-1.4.4-r1.ebuild 1090 +RMD160 1be14cb59fb8798d64227120624148ff5cee4cb9 libupnp-1.4.4-r1.ebuild 1090 +SHA256 ee818b0d7924e95f62a065f0c646d1683efb13b5730c8d6c6fe4c8c34ccf9be6 libupnp-1.4.4-r1.ebuild 1090 EBUILD libupnp-1.4.4.ebuild 906 RMD160 db8ea92c969809f87d32af4f4c2348d78f0d8a9e SHA1 781352c2c0bef0c91b7bb95c093035e28578008a SHA256 e7de16f0b1796bbf395d1a82a4d459eb308eef9485abae5080efa49ea0d5e079 MD5 e4a29b06bfbce49873a56291dddf13a2 libupnp-1.4.4.ebuild 906 RMD160 db8ea92c969809f87d32af4f4c2348d78f0d8a9e libupnp-1.4.4.ebuild 906 SHA256 e7de16f0b1796bbf395d1a82a4d459eb308eef9485abae5080efa49ea0d5e079 libupnp-1.4.4.ebuild 906 -MISC ChangeLog 1691 RMD160 6b6b49a698e2fb7911b061c2a10220776816804e SHA1 34d4e52b8a734cb9e8958d3a1314eecb1b2186b6 SHA256 f9ffaeb900b0f0a564312fb0107b3fcd19db487c0028ae8bdcd0069c80f11b21 -MD5 1fb14d1612cfd1221e7da498f6c4de8e ChangeLog 1691 -RMD160 6b6b49a698e2fb7911b061c2a10220776816804e ChangeLog 1691 -SHA256 f9ffaeb900b0f0a564312fb0107b3fcd19db487c0028ae8bdcd0069c80f11b21 ChangeLog 1691 +MISC ChangeLog 1880 RMD160 c58357f2e58fefa94d6915bde73e84106e29e1bc SHA1 ce6d519f930a0667fdd75b5fa62cf021bacff974 SHA256 a60cde701600ab3c2e81cc16bc922484a5a20a4070b4f0ad1a71810a8f8db4b1 +MD5 50713e18a5a70962d4d0bd4d1309e915 ChangeLog 1880 +RMD160 c58357f2e58fefa94d6915bde73e84106e29e1bc ChangeLog 1880 +SHA256 a60cde701600ab3c2e81cc16bc922484a5a20a4070b4f0ad1a71810a8f8db4b1 ChangeLog 1880 MISC metadata.xml 337 RMD160 4b96304608ebda0c9070bc6657fc52694f52e3d9 SHA1 181186b1aed6eacda0ce728048c900f10ae79f6b SHA256 e75f8af04c2deb2fe9616129baf04661e5a00c25d1e353146fe1ca7fd978d228 MD5 3fef076e99b34a5fbf6a38d6b2ed0863 metadata.xml 337 RMD160 4b96304608ebda0c9070bc6657fc52694f52e3d9 metadata.xml 337 @@ -14,3 +22,6 @@ SHA256 e75f8af04c2deb2fe9616129baf04661e5a00c25d1e353146fe1ca7fd978d228 metadata MD5 869cf1804e040b9efd542c3639e4dc80 files/digest-libupnp-1.4.4 247 RMD160 81a0612f35fa6d736e10d151795d642fe03a13bc files/digest-libupnp-1.4.4 247 SHA256 003421ad4c52ff119cd963cd8f6a1084af75f9a2b3729001166b22b138b65f78 files/digest-libupnp-1.4.4 247 +MD5 869cf1804e040b9efd542c3639e4dc80 files/digest-libupnp-1.4.4-r1 247 +RMD160 81a0612f35fa6d736e10d151795d642fe03a13bc files/digest-libupnp-1.4.4-r1 247 +SHA256 003421ad4c52ff119cd963cd8f6a1084af75f9a2b3729001166b22b138b65f78 files/digest-libupnp-1.4.4-r1 247 diff --git a/net-misc/libupnp/files/digest-libupnp-1.4.4-r1 b/net-misc/libupnp/files/digest-libupnp-1.4.4-r1 new file mode 100644 index 000000000000..75614e901e50 --- /dev/null +++ b/net-misc/libupnp/files/digest-libupnp-1.4.4-r1 @@ -0,0 +1,3 @@ +MD5 79d2beeb7d78a5e080a52a7e321b7f22 libupnp-1.4.4.tar.bz2 1098948 +RMD160 3d0edbf93935a5371c8e951b459d3e1d81278f7e libupnp-1.4.4.tar.bz2 1098948 +SHA256 72e2069cd2541e7c4b5c8e1f2e9b3d02cbd93e94bfbac23e97d50045a6899001 libupnp-1.4.4.tar.bz2 1098948 diff --git a/net-misc/libupnp/files/libupnp-1.4.4-r1-fbsd.patch b/net-misc/libupnp/files/libupnp-1.4.4-r1-fbsd.patch new file mode 100644 index 000000000000..6009ddb3f144 --- /dev/null +++ b/net-misc/libupnp/files/libupnp-1.4.4-r1-fbsd.patch @@ -0,0 +1,60 @@ +--- threadutil/inc/ithread.h.orig 2007-03-13 03:19:24 +0000 ++++ threadutil/inc/ithread.h 2007-04-18 19:54:22 +0000 +@@ -47,6 +47,10 @@ + #include + #endif + ++#ifdef __FreeBSD__ ++#define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE ++#endif ++ + #ifdef PTHREAD_MUTEX_RECURSIVE + /* This system has SuS2-compliant mutex attributes. + * E.g. on Cygwin, where we don't have the old nonportable (NP) symbols +--- upnp/src/genlib/net/uri/uri.c.orig 2007-04-18 20:46:43 +0000 ++++ upnp/src/genlib/net/uri/uri.c 2007-04-18 20:49:08 +0000 +@@ -34,8 +34,11 @@ + ************************************************************************/ + + #ifdef __FreeBSD__ ++#include ++#if __FreeBSD_version < 601103 + #include + #endif ++#endif + #include "config.h" + #include "uri.h" + +@@ -620,7 +623,7 @@ + &h, + temp_hostbyname_buff, + BUFFER_SIZE, &errcode ); +-#elif defined(__FreeBSD__) ++#elif defined(__FreeBSD__) && __FreeBSD_version < 601103 + h = lwres_gethostbyname_r( temp_host_name, + &h_buf, + temp_hostbyname_buff, +--- configure.ac (revision 157) ++++ configure.ac (working copy) +@@ -163,13 +163,6 @@ + # + # Default compilation flags + # +-if test x"$enable_debug" = xyes; then +- # AC_PROG_CC already sets CFLAGS to "-g -O2" by default +- : +-else +- # add optimise for size +- AX_CFLAGS_GCC_OPTION([-Os]) +-fi + AX_CFLAGS_WARN_ALL + + # +@@ -203,6 +196,7 @@ + AC_FUNC_VPRINTF + AC_FUNC_FSEEKO + ++AC_CHECK_FUNCS(ftime,, [AC_CHECK_LIB(compat, ftime)]) + + # + # Checks for POSIX Threads diff --git a/net-misc/libupnp/libupnp-1.4.4-r1.ebuild b/net-misc/libupnp/libupnp-1.4.4-r1.ebuild new file mode 100644 index 000000000000..6d5111b6d86f --- /dev/null +++ b/net-misc/libupnp/libupnp-1.4.4-r1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/libupnp/libupnp-1.4.4-r1.ebuild,v 1.1 2007/04/19 13:10:16 gurligebis Exp $ + +WANT_AUTOMAKE=1.9 + +inherit eutils flag-o-matic autotools + +DESCRIPTION="An Portable Open Source UPnP Development Kit" +HOMEPAGE="http://pupnp.sourceforge.net/" +SRC_URI="mirror://sourceforge/pupnp/${P}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="debug" + +RDEPEND="!net-misc/upnp" + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/${PN}-${PVR}-fbsd.patch + + AT_M4DIR="m4" eautoreconf + + # fix tests + chmod +x ixml/test/test_document.sh +} + +src_compile() { + use x86-fbsd && replace-flags -O? -O1 + # w/o docdir to avoid sandbox violations + econf \ + $(use_enable debug) \ + --without-docdir \ + || die "econf failed" + emake || die "emake failed" +} + +src_install () { + emake DESTDIR="${D}" install || die "emake install failed" + dobin upnp/.libs/upnp_tv_{ctrlpt,device} + dodoc NEWS README ChangeLog + dohtml upnp/doc/*.pdf +}