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 | 719deba48cfc18e145103906be3ddf513bc8cc0a (patch) | |
| tree | f971b7ad14f75e51ae11cef7d015b4fad9b1af4f | |
| parent | Respect CC in 11.25 too. Fix inherit for tc-export. (diff) | |
| download | historical-719deba48cfc18e145103906be3ddf513bc8cc0a.tar.gz historical-719deba48cfc18e145103906be3ddf513bc8cc0a.tar.bz2 historical-719deba48cfc18e145103906be3ddf513bc8cc0a.zip | |
Apply Debian patches. Declare _GNU_SOURCE.
Package-Manager: portage-2.2_rc62/cvs/Linux i686
| -rw-r--r-- | mail-client/nail/ChangeLog | 6 | ||||
| -rw-r--r-- | mail-client/nail/Manifest | 5 | ||||
| -rw-r--r-- | mail-client/nail/files/nail-12.4-debian.patch | 56 | ||||
| -rw-r--r-- | mail-client/nail/nail-12.4.ebuild | 4 |
4 files changed, 67 insertions, 4 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/Manifest b/mail-client/nail/Manifest index f25ac458d718..1e82ebb21241 100644 --- a/mail-client/nail/Manifest +++ b/mail-client/nail/Manifest @@ -1,7 +1,8 @@ +AUX nail-12.4-debian.patch 1060 RMD160 0df7a5654c0cc8b38570cc73fb5e8efcceaab26e SHA1 59066d0220e6ca4d86fc24c87d5f74900e149645 SHA256 57d6259bb0de14e8583fc77dbff4329ac6a9ebcd002fcc38d435d7d94db4efb8 AUX nail-nosocket.patch 473 RMD160 1598331c9a0ea4fcaa6682bae9e04cb5d7bb3117 SHA1 600c8bb47a17008c992297e28e29c73fb44108ef SHA256 840a0f3f592de84d03c225ccdc6c363b4d372eb605750a0ee7e1b02320547dc9 DIST mailx-12.4.tar.bz2 271482 RMD160 8244d04d0a0058fdbe9867ca503c7cda8d580154 SHA1 b1e105adf9d36269daf317dedf68b6e4cca404a7 SHA256 92201e769fe346bc0364c87437a330ef3c97ab3e9d7b2235b93f509e85e5716a DIST nail-11.25.tar.bz2 267959 RMD160 d72a5a4760cc43bcc2e9223e2eca4f0a8de7605f SHA1 dd15a5bdedb74175763ababa8be70989334963e4 SHA256 ae831aa7ebee1a348d84cb37228fe784b32c6ccf2d06edfba141de8f165515c5 EBUILD nail-11.25-r3.ebuild 1985 RMD160 3f41c625e9647158370245bcee5616befea1fe55 SHA1 251a6b438ba909e733886680ebdb5ed4e1d588a0 SHA256 3b119bc9ac33b7e67017a740f86ea245037349ad1d9351ebeb014039be51a6c2 -EBUILD nail-12.4.ebuild 2097 RMD160 dc524b41c0dac0c58ae5bd3fba4976fa69c24b77 SHA1 18d16835739b2b2965f8286e739404e59015f221 SHA256 a5423f86205d97c00f36f56bc890e3aac059f4d24cde7f0ffd5f80d90bcaf2bc -MISC ChangeLog 7826 RMD160 0246b19a9bb7e34e412ebd28f8daeaa2ec5a3ac8 SHA1 ff72fc7f17d9dc555213065b26103ad731211c5e SHA256 357ce75313aa78d981f941b62565f527faa3d51e6463a2a7a9da61e1c9a6453c +EBUILD nail-12.4.ebuild 2176 RMD160 19b0bcbcfb5b14d1c0594c6574407194ea3c6157 SHA1 a45306268762befefca0140dc98b211deba65c3a SHA256 de61eab06046573296b73adfefb29fb85786d2431cc5f2b3dd3b336dcb98f9ed +MISC ChangeLog 7970 RMD160 648ef80468455face80f580a2e93c05bae9f499d SHA1 d5bbe2a947603af473f8959b497a5a417f72d659 SHA256 b1e879654e042ee5a46c6ec16a85f34b149160f0b3a0850cc9d292c5c9f9e41e MISC metadata.xml 259 RMD160 7bd304e664ab666fab49794d575652f4a5e1587c SHA1 1f0507ccb185c8f48f26b7ad1cfe4df64ce01ad1 SHA256 2b207df02a39323049a95d476319fcaafda0b918c0c4e1feaab97b61ca1a93c6 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" |