diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2010-02-02 18:14:20 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2010-02-02 18:14:20 +0000 |
| commit | 926cfccef7f40ded203795d85f7db169c2103483 (patch) | |
| tree | 6796b2c53cb6cea8335e30c033e18dfa8ac740cd | |
| parent | Respect CC in 11.25 too. Fix inherit for tc-export. (diff) | |
| download | gentoo-2-926cfccef7f40ded203795d85f7db169c2103483.tar.gz gentoo-2-926cfccef7f40ded203795d85f7db169c2103483.tar.bz2 gentoo-2-926cfccef7f40ded203795d85f7db169c2103483.zip | |
Apply Debian patches. Declare _GNU_SOURCE.
(Portage version: 2.2_rc62/cvs/Linux i686)
| -rw-r--r-- | mail-client/nail/ChangeLog | 6 | ||||
| -rw-r--r-- | mail-client/nail/files/nail-12.4-debian.patch | 56 | ||||
| -rw-r--r-- | mail-client/nail/nail-12.4.ebuild | 4 |
3 files changed, 64 insertions, 2 deletions
diff --git a/mail-client/nail/ChangeLog b/mail-client/nail/ChangeLog index 2426113bd113..ec0b809b3217 100644 --- a/mail-client/nail/ChangeLog +++ b/mail-client/nail/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for mail-client/nail # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/nail/ChangeLog,v 1.57 2010/02/02 18:01:54 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/nail/ChangeLog,v 1.58 2010/02/02 18:14:19 jer Exp $ + + 02 Feb 2010; Jeroen Roovers <jer@gentoo.org> nail-12.4.ebuild, + +files/nail-12.4-debian.patch: + Apply Debian patches. Declare _GNU_SOURCE. 02 Feb 2010; Jeroen Roovers <jer@gentoo.org> nail-11.25-r3.ebuild, nail-12.4.ebuild: diff --git a/mail-client/nail/files/nail-12.4-debian.patch b/mail-client/nail/files/nail-12.4-debian.patch new file mode 100644 index 000000000000..2fea0b190d29 --- /dev/null +++ b/mail-client/nail/files/nail-12.4-debian.patch @@ -0,0 +1,56 @@ +--- heirloom-mailx-12.4.orig/getopt.c ++++ heirloom-mailx-12.4/getopt.c +@@ -43,7 +43,7 @@ + char *optarg; + int optind = 1; + int opterr = 1; +-int optopt; ++int optoptc; + + static void + error(const char *s, int c) +@@ -69,7 +69,7 @@ + *bp++ = *s++; + while (*msg) + *bp++ = *msg++; +- *bp++ = optopt; ++ *bp++ = optoptc; + *bp++ = '\n'; + write(2, buf, bp - buf); + ac_free(buf); +@@ -101,13 +101,13 @@ + } + curp = &argv[optind][1]; + } +- optopt = curp[0] & 0377; ++ optoptc = curp[0] & 0377; + while (optstring[0]) { + if (optstring[0] == ':') { + optstring++; + continue; + } +- if ((optstring[0] & 0377) == optopt) { ++ if ((optstring[0] & 0377) == optoptc) { + if (optstring[1] == ':') { + if (curp[1] != '\0') { + optarg = (char *)&curp[1]; +@@ -127,7 +127,7 @@ + optind++; + optarg = 0; + } +- return optopt; ++ return optoptc; + } + optstring++; + } +--- heirloom-mailx-12.4.orig/mailx.1 ++++ heirloom-mailx-12.4/mailx.1 +@@ -3766,7 +3766,7 @@ + .sp + .fi + which might cause +-.N mailx ++.B mailx + to respond with, for example: + .nf + .sp diff --git a/mail-client/nail/nail-12.4.ebuild b/mail-client/nail/nail-12.4.ebuild index 4aaf9e7024b2..6739334ec060 100644 --- a/mail-client/nail/nail-12.4.ebuild +++ b/mail-client/nail/nail-12.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/nail/nail-12.4.ebuild,v 1.2 2010/02/02 18:01:54 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/nail/nail-12.4.ebuild,v 1.3 2010/02/02 18:14:19 jer Exp $ EAPI="2" @@ -39,6 +39,7 @@ remove_sockets() { } src_prepare() { + epatch "${FILESDIR}"/${P}-debian.patch # Do not strip the binary sed -i -e '/STRIP/d' Makefile } @@ -62,6 +63,7 @@ src_compile() { tc-export CC emake \ + CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE" PREFIX=/usr \ MAILSPOOL='/var/spool/mail' \ || die "emake failed" |