mail-client/mailx: Apply patch to fix compile error (bug #310493)

Package-Manager: portage-2.2_rc67_p185/cvs/Linux i686

diff --git a/mail-client/mailx/ChangeLog b/mail-client/mailx/ChangeLog
index dfe156f264cb22df416517c9c8ca89095ba64a31..55da082d7ecbac1ba4d075a6e1a3e1fb9e0b83c8 100644 (file)
--- a/mail-client/mailx/ChangeLog
+++ b/mail-client/mailx/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-client/mailx
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mailx/ChangeLog,v 1.54 2010/01/11 17:57:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mailx/ChangeLog,v 1.55 2010/07/11 23:12:53 sping Exp $
+
+*mailx-8.1.2.20050715-r2 (11 Jul 2010)
+
+  11 Jul 2010; Sebastian Pipping <sping@gentoo.org>
+  +mailx-8.1.2.20050715-r2.ebuild,
+  +files/mailx-8.1.2.20050715-offsetof.patch:
+  Apply patch 225901 by Vasiliy A. Balkanov renaming internal macro
+  offsetof() to offsetofmailx() to fix a compile error (bug #310493)
 
   11 Jan 2010; Raúl Porcel <armin76@gentoo.org>
   mailx-8.1.2.20040524-r1.ebuild, mailx-8.1.2.20050715.ebuild,

diff --git a/mail-client/mailx/Manifest b/mail-client/mailx/Manifest
index 1d04f6ef7a7ce1a4ebdd6f9efeef739f076645b0..0409b9fb4ebbbf5711dd85a946696ab03b0a8732 100644 (file)
--- a/mail-client/mailx/Manifest
+++ b/mail-client/mailx/Manifest
@@ -1,10 +1,12 @@
 AUX mailx-8.1.2.20050715-nostrip.patch 668 RMD160 86080719a66d0889f6fa6458ab65e72b670b3ce8 SHA1 0c04fadebc81b1ced09256421d9cc8a5b1b31cd3 SHA256 0636586473c198918e8db1d1ebfc006d3312935959532f8c2742b882da5e391e
+AUX mailx-8.1.2.20050715-offsetof.patch 1566 RMD160 1c6e36cd7607550ef7616d17a4ca2a1223f7a85b SHA1 640f93913ea9d517d9ae6233450c069cdb970eee SHA256 be6bf29554e6f695492e2c9dd3a8e6d6e19a4e375982c7478941c61f992dfe4b
 DIST mailx-20040524-cvs.diff.bz2 34358 RMD160 308e9204b2e3a9b0b93d9ff43f92b3658369857a SHA1 b81f24c166991d4aaf2d2a34151c748f97ede962 SHA256 e53949664f44f0ac785078887f7c5220f5b1b4d9628073ad786916d5e6808c30
 DIST mailx_8.1.2-0.20050715cvs-1.diff.gz 36758 RMD160 bf116b8e7d1207b37d0f9451771f0f318880aff2 SHA1 f8b54d1c6fff315444f5342481fad9d5cf9b52c0 SHA256 2fb891f912624766d0bef765d69cec75ad3334dda1aa58659f3c3c1d0579c2c3
 DIST mailx_8.1.2-0.20050715cvs.orig.tar.gz 94664 RMD160 9fdf63d616f2240141bf06dc1fbf6457ddd5fc1c SHA1 23e2ddef1bbd0df85d7ecbecc5fd62f90eb9a4a4 SHA256 5c578a8c573b4430358d4f6523f8acd8b2c5039579d907c88ec09dab13b226d3
 DIST mailx_8.1.2.orig.tar.gz 94950 RMD160 9737e0b6bfed110699e2d9702f5e69e4b06942a1 SHA1 001199530e044bd94a7b4dc6637d7311c143f48b SHA256 f31a1479635b2f3e8bfe2d08e406fe50cc721d4b82c5d25779426ecc41cbdce9
 EBUILD mailx-8.1.2.20040524-r1.ebuild 1324 RMD160 93f10d00f8da685114ae9e813c946edc3e1b8900 SHA1 6eedf7160441c19345db7576260387c45f67f796 SHA256 41e13de0afcec0b64c4d77a59b1a8c438ac75e7a6d878e58cf8361f49065010d
 EBUILD mailx-8.1.2.20050715-r1.ebuild 1484 RMD160 4de8cbe97c334499edf1661a6f73432732c06e8e SHA1 f665c401d5da3c72fbc9bd8ad20cbfba0c4763cf SHA256 b4ea9f6b7149ff6f9fdcc04817e7646ec701ad50658cb555d11aa96d49184f99
+EBUILD mailx-8.1.2.20050715-r2.ebuild 1537 RMD160 a46cbd5effd331ec5d3c0a4adc326f404f56d612 SHA1 3a5305d2d060c6ad2dacd051741ad49d8dc08402 SHA256 a9e6b196a2614ea923cd815220709452f3a59e4aa589152720be53b0bcc639b6
 EBUILD mailx-8.1.2.20050715.ebuild 1399 RMD160 c43ca175c82338f92c7a0b554a5b4c63645fc0cf SHA1 d338dbd261f008fa6f58a1421cc7af29b94c2889 SHA256 525541179536a015df17e719d30a92b84ac7e947d65a3761725830c58a8ad638
-MISC ChangeLog 9739 RMD160 ea34c4b936ee41493fc26258770b1e0a906cec03 SHA1 655683a4c250e8f8e79794b113d28adc653e01ea SHA256 febb531be5588dbd1f8c1d1d624e470dace138615544c98009b5a13f086f69ad
+MISC ChangeLog 10048 RMD160 5253b12f95029c03283708232743b1f063943ece SHA1 b00de08854874dabd3a74f9e652b60aa9badb956 SHA256 46ab00b973747daee672f89b13a6184de1aeb081f63a08f3c14c75b9413ee6d1
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32

diff --git a/mail-client/mailx/files/mailx-8.1.2.20050715-offsetof.patch b/mail-client/mailx/files/mailx-8.1.2.20050715-offsetof.patch
new file mode 100644 (file)
index 0000000..7af8128
--- /dev/null
+++ b/mail-client/mailx/files/mailx-8.1.2.20050715-offsetof.patch
@@ -0,0 +1,36 @@
+diff -r -u mailx-8.1.2-0.20050715cvs.orig.orig/def.h mailx-8.1.2-0.20050715cvs.orig/def.h
+--- mailx-8.1.2-0.20050715cvs.orig.orig/def.h  2003-10-14 21:50:20.000000000 +0900
++++ mailx-8.1.2-0.20050715cvs.orig/def.h       2010-03-31 10:29:37.000000000 +0900
+@@ -97,7 +97,7 @@
+  * Given a file address, determine the block number it represents.
+  */
+ #define blockof(off)                  ((int) ((off) / 4096))
+-#define offsetof(off)                 ((int) ((off) % 4096))
++#define offsetofmailx(off)                    ((int) ((off) % 4096))
+ #define positionof(block, offset)     ((off_t)(block) * 4096 + (offset))
+ 
+ /*
+diff -r -u mailx-8.1.2-0.20050715cvs.orig.orig/edit.c mailx-8.1.2-0.20050715cvs.orig/edit.c
+--- mailx-8.1.2-0.20050715cvs.orig.orig/edit.c 2004-05-25 01:34:32.000000000 +0900
++++ mailx-8.1.2-0.20050715cvs.orig/edit.c      2010-03-31 10:41:28.000000000 +0900
+@@ -111,7 +111,7 @@
+                       (void)fseek(otf, 0L, 2);
+                       size = ftell(otf);
+                       mp->m_block = blockof(size);
+-                      mp->m_offset = offsetof(size);
++                      mp->m_offset = offsetofmailx(size);
+                       mp->m_size = fsize(fp);
+                       mp->m_lines = 0;
+                       mp->m_flag |= MODIFY;
+diff -r -u mailx-8.1.2-0.20050715cvs.orig.orig/fio.c mailx-8.1.2-0.20050715cvs.orig/fio.c
+--- mailx-8.1.2-0.20050715cvs.orig.orig/fio.c  2004-05-25 01:34:32.000000000 +0900
++++ mailx-8.1.2-0.20050715cvs.orig/fio.c       2010-03-31 10:29:28.000000000 +0900
+@@ -139,7 +139,7 @@
+                       this.m_size = 0;
+                       this.m_lines = 0;
+                       this.m_block = blockof(offset);
+-                      this.m_offset = offsetof(offset);
++                      this.m_offset = offsetofmailx(offset);
+                       inhead = 1;
+               } else if (linebuf[0] == 0) {
+                       inhead = 0;

diff --git a/mail-client/mailx/mailx-8.1.2.20050715-r2.ebuild b/mail-client/mailx/mailx-8.1.2.20050715-r2.ebuild
new file mode 100644 (file)
index 0000000..b0a59c5
--- /dev/null
+++ b/mail-client/mailx/mailx-8.1.2.20050715-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mailx/mailx-8.1.2.20050715-r2.ebuild,v 1.1 2010/07/11 23:12:53 sping Exp $
+
+inherit eutils flag-o-matic
+
+MX_MAJ_VER=${PV%.*}
+MX_MIN_VER=${PV##*.}
+MY_PV=${MX_MAJ_VER}-0.${MX_MIN_VER}cvs
+S=${WORKDIR}/${PN}-${MY_PV}.orig/
+debian_patch=${PN}_${MY_PV}-1.diff.gz
+
+DESCRIPTION="The /bin/mail program, which is used to send mail via shell scripts"
+HOMEPAGE="http://www.debian.org/"
+SRC_URI="mirror://gentoo/mailx_${MY_PV}.orig.tar.gz
+       mirror://gentoo/${debian_patch}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND=">=net-libs/liblockfile-1.03
+       virtual/mta
+       !mail-client/mailutils
+       mail-client/mailx-support
+       !virtual/mailx"
+PROVIDE="virtual/mailx"
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       epatch "${DISTDIR}/${debian_patch}"
+       epatch "${FILESDIR}/${P}-nostrip.patch"
+       sed -i -e "s: -O2: \$(EXTRAFLAGS):g" Makefile
+       epatch "${FILESDIR}/${P}-offsetof.patch"
+}
+
+src_compile() {
+       make EXTRAFLAGS="${CFLAGS}" || die
+}
+
+src_install() {
+       dodir /bin /usr/share/man/man1 /etc /usr/lib
+
+       insinto /bin
+       insopts -m 755
+       doins mail || die
+
+       doman mail.1
+
+       dosym mail /bin/Mail
+       dosym mail /bin/mailx
+       dosym mail.1 /usr/share/man/man1/Mail.1
+
+       cd "${S}"/misc
+       insinto /usr/share/${PN}/
+       insopts -m 644
+       doins mail.help mail.tildehelp || die
+       insinto /etc
+       insopts -m 644
+       doins mail.rc || die
+}