diff options
| author |   Alin Năstac <mrness@gentoo.org> | 2008-10-12 17:27:20 +0000 |
|---|---|---|
| committer | Alin Năstac <mrness@gentoo.org> | 2008-10-12 17:27:20 +0000 |
| commit | daeef4252b63c32e2730f75958d7137c87376809 (patch) | |
| tree | 3437e4bf833ab9143eb1c8d2d87a9cf6e6af84f4 /net-proxy | |
| parent | minor dep fixes (diff) | |
| download | gentoo-2-daeef4252b63c32e2730f75958d7137c87376809.tar.gz gentoo-2-daeef4252b63c32e2730f75958d7137c87376809.tar.bz2 gentoo-2-daeef4252b63c32e2730f75958d7137c87376809.zip | |
Pass user CFLAGS/LDFLAGS through environment instead of setting in stone (#241094).
(Portage version: 2.1.4.4)
Diffstat (limited to 'net-proxy')
| -rw-r--r-- | net-proxy/3proxy/3proxy-0.5.3k.ebuild | 11 | ||||
| -rw-r--r-- | net-proxy/3proxy/ChangeLog | 7 | ||||
| -rw-r--r-- | net-proxy/3proxy/files/3proxy-0.5.3k-gentoo.patch | 26 |
3 files changed, 36 insertions, 8 deletions
diff --git a/net-proxy/3proxy/3proxy-0.5.3k.ebuild b/net-proxy/3proxy/3proxy-0.5.3k.ebuild index 4598cae92502..fe9babff8cb5 100644 --- a/net-proxy/3proxy/3proxy-0.5.3k.ebuild +++ b/net-proxy/3proxy/3proxy-0.5.3k.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/3proxy/3proxy-0.5.3k.ebuild,v 1.1 2008/07/12 22:59:02 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/3proxy/3proxy-0.5.3k.ebuild,v 1.2 2008/10/12 17:27:12 mrness Exp $ -inherit toolchain-funcs +inherit toolchain-funcs eutils DESCRIPTION="really tiny cross-platform proxy servers set" HOMEPAGE="http://www.security.nnov.ru/soft/3proxy/" @@ -19,12 +19,9 @@ S="${WORKDIR}" src_unpack() { unpack ${A} + cd "${S}" - sed -i \ - -e "/^CFLAGS/s:-g -O2:${CFLAGS}:" \ - -e "/^LDFLAGS/s:-O2:${LDFLAGS}:" \ - Makefile.unix || die "sed Makefile" - sed -i 's:/usr/local::' src/stringtable.c || die "sed stringtable" + epatch "${FILESDIR}"/${P}-gentoo.patch } src_compile() { diff --git a/net-proxy/3proxy/ChangeLog b/net-proxy/3proxy/ChangeLog index 66f90c3deac0..aaceb5be6b4c 100644 --- a/net-proxy/3proxy/ChangeLog +++ b/net-proxy/3proxy/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-proxy/3proxy # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/3proxy/ChangeLog,v 1.25 2008/07/12 22:59:02 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/3proxy/ChangeLog,v 1.26 2008/10/12 17:27:12 mrness Exp $ + + 12 Oct 2008; Alin Năstac <mrness@gentoo.org> + +files/3proxy-0.5.3k-gentoo.patch, 3proxy-0.5.3k.ebuild: + Pass user CFLAGS/LDFLAGS through environment instead of setting in stone + (#241094). *3proxy-0.5.3k (12 Jul 2008) diff --git a/net-proxy/3proxy/files/3proxy-0.5.3k-gentoo.patch b/net-proxy/3proxy/files/3proxy-0.5.3k-gentoo.patch new file mode 100644 index 000000000000..a88a28780432 --- /dev/null +++ b/net-proxy/3proxy/files/3proxy-0.5.3k-gentoo.patch @@ -0,0 +1,26 @@ +--- Makefile.unix.orig 2005-04-30 18:29:00.000000000 +0000 ++++ Makefile.unix 2008-10-12 17:18:21.000000000 +0000 +@@ -9,10 +9,10 @@ + CC = gcc + + # you may need -L/usr/pkg/lib for older NetBSD versions +-CFLAGS = -Wall -g -O2 -c -pthread -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL ++CFLAGS += -Wall -g -c -pthread -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL + COUT = -o + LN = gcc +-LDFLAGS = -Wall -O2 -pthread ++LDFLAGS += -Wall -pthread + # -lpthreads may be reuqired on some platforms instead of -pthreads + LIBS = + LNOUT = -o +--- src/stringtable.c.orig 2008-01-09 21:14:46.000000000 +0000 ++++ src/stringtable.c 2008-10-12 17:19:19.000000000 +0000 +@@ -23,7 +23,7 @@ + /* 19 */ NULL, + #ifndef TPROXY_CONF + #ifndef _WIN32 +-/* 20 */ (unsigned char *)"/usr/local/etc/3proxy.cfg", ++/* 20 */ (unsigned char *)"/etc/3proxy.cfg", + #else + /* 20 */ (unsigned char *)"3proxy.cfg", + #endif |