patch from splite to make mailx work on ia64

4 files changed, 202 insertions, 6 deletions

diff --git a/net-mail/mailx/ChangeLog b/net-mail/mailx/ChangeLog
index 845a8236a0bd..a391960bf016 100644
--- a/net-mail/mailx/ChangeLog
+++ b/net-mail/mailx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/mailx
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailx/ChangeLog,v 1.13 2003/07/15 09:22:22 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailx/ChangeLog,v 1.14 2003/09/21 18:14:12 avenj Exp $
+
+  21 Sep 2003; Jon Portnoy <avenj@gentoo.org>
+  mailx-8.1.2.20021129-r2.ebuild, files/mailx-64bit.diff :
+  Patch from splite to get mailx to work on IA-64.
 
   15 Jul 2003; Christian Birchinger <joker@gentoo.org>
   mailx-8.1.2.20021129-r2.ebuild:
diff --git a/net-mail/mailx/Manifest b/net-mail/mailx/Manifest
index 44d53d3b61b6..246a1f67b01e 100644
--- a/net-mail/mailx/Manifest
+++ b/net-mail/mailx/Manifest
@@ -1,13 +1,14 @@
-MD5 56b08d9dece23f105d6e28d9df2ac94f ChangeLog 2150
+MD5 d25580f2a46cd4232050343682e3c2f5 ChangeLog 2307
 MD5 b642c14aac9d4c9887ff89c781d46f28 mailx-8.1.1.11.ebuild 1298
 MD5 7d74ca9bdc6d26d25a1f3272a8c38178 mailx-8.1.2.20021129-r1.ebuild 1385
+MD5 3516167dd496ef11fbc008a92512aba3 mailx-8.1.2.20021129-r2.ebuild 1495
 MD5 37a9b6aa1cb31f5840597b768cf8d67e mailx-8.1.2.20021129.ebuild 1202
-MD5 27fb81192404848c9cd91a8c42831f83 mailx-8.1.2.20021129-r2.ebuild 1422
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 43bee2592e0aaf68de420a44df5cf3b6 files/mailx-64bit.diff 4989
 MD5 b55cd4835b1455405746de99343a1829 files/digest-mailx-8.1.1.11 67
 MD5 b55cd4835b1455405746de99343a1829 files/digest-mailx-8.1.2.20021129 67
 MD5 0fabe69aadfc340d678b9d355e0d451e files/digest-mailx-8.1.2.20021129-r1 192
+MD5 0fabe69aadfc340d678b9d355e0d451e files/digest-mailx-8.1.2.20021129-r2 192
 MD5 3aa3c2c06077baa24f3a60f4f07f4e5a files/mailx-8.1.1.11-Makefile.diff 697
 MD5 03da0db1eb8ae098acadd868243269e9 files/mailx-8.1.1.11-version.diff 314
 MD5 e1210a2c73f4c28a1ddfef47de783040 files/mailx-8.1.1.11.diff 59404
-MD5 0fabe69aadfc340d678b9d355e0d451e files/digest-mailx-8.1.2.20021129-r2 192
diff --git a/net-mail/mailx/files/mailx-64bit.diff b/net-mail/mailx/files/mailx-64bit.diff
new file mode 100644
index 000000000000..b50974f0d9c9
--- /dev/null
+++ b/net-mail/mailx/files/mailx-64bit.diff
@@ -0,0 +1,190 @@
+diff -ur mailx-8.1.1.orig.orig/Makefile mailx-8.1.1.orig/Makefile
+--- mailx-8.1.1.orig.orig/Makefile	2003-09-17 17:10:17.000000000 -0500
++++ mailx-8.1.1.orig/Makefile	2003-09-17 17:11:05.000000000 -0500
+@@ -6,7 +6,7 @@
+ 
+ # use second line starting from hamm release
+ #CPPFLAGS=-I/usr/include/bsd -D_BSD_SOURCE -DIOSAFE
+-CPPFLAGS=-D_BSD_SOURCE 
++CPPFLAGS=-D_BSD_SOURCE -D_XOPEN_SOURCE
+ 
+ CFLAGS=-g
+ SRCS=	version.c aux.c cmd1.c cmd2.c cmd3.c cmdtab.c collect.c \
+diff -ur mailx-8.1.1.orig.orig/cmd1.c mailx-8.1.1.orig/cmd1.c
+--- mailx-8.1.1.orig.orig/cmd1.c	2003-09-17 17:10:17.000000000 -0500
++++ mailx-8.1.1.orig/cmd1.c	2003-09-17 17:11:58.000000000 -0500
+@@ -162,7 +162,7 @@
+ 	int *msgvec = v;
+ 	register int *ip;
+ 
+-	for (ip = msgvec; *ip != NULL; ip++)
++	for (ip = msgvec; *ip != 0; ip++)
+ 		printhead(*ip);
+ 	if (--ip >= msgvec)
+ 		dot = &message[*ip - 1];
+diff -ur mailx-8.1.1.orig.orig/cmd2.c mailx-8.1.1.orig/cmd2.c
+--- mailx-8.1.1.orig.orig/cmd2.c	2003-09-17 17:10:17.000000000 -0500
++++ mailx-8.1.1.orig/cmd2.c	2003-09-17 17:12:35.000000000 -0500
+@@ -67,7 +67,7 @@
+ 	register int *ip, *ip2;
+ 	int list[2], mdot;
+ 
+-	if (*msgvec != NULL) {
++	if (*msgvec != 0) {
+ 
+ 		/*
+ 		 * If some messages were supplied, find the 
+@@ -82,10 +82,10 @@
+ 		 * message list which follows dot.
+ 		 */
+ 
+-		for (ip = msgvec; *ip != NULL; ip++)
++		for (ip = msgvec; *ip != 0; ip++)
+ 			if (*ip > mdot)
+ 				break;
+-		if (*ip == NULL)
++		if (*ip == 0)
+ 			ip = msgvec;
+ 		ip2 = ip;
+ 		do {
+@@ -94,9 +94,9 @@
+ 				dot = mp;
+ 				goto hitit;
+ 			}
+-			if (*ip2 != NULL)
++			if (*ip2 != 0)
+ 				ip2++;
+-			if (*ip2 == NULL)
++			if (*ip2 == 0)
+ 				ip2 = msgvec;
+ 		} while (ip2 != ip);
+ 		printf("No messages applicable\n");
+@@ -130,7 +130,7 @@
+ 	 */
+ 
+ 	list[0] = dot - &message[0] + 1;
+-	list[1] = NULL;
++	list[1] = 0;
+ 	return(type(list));
+ }
+ 
+@@ -181,11 +181,11 @@
+ 		return(1);
+ 	if (!f) {
+ 		*msgvec = first(0, MMNORM);
+-		if (*msgvec == NULL) {
++		if (*msgvec == 0) {
+ 			printf("No messages to %s.\n", cmd);
+ 			return(1);
+ 		}
+-		msgvec[1] = NULL;
++		msgvec[1] = 0;
+ 	}
+ 	if (f && getmsglist(str, msgvec, 0) < 0)
+ 		return(1);
+@@ -305,7 +305,7 @@
+ 		list[0] = dot - &message[0] + 1;
+ 		if (list[0] > lastdot) {
+ 			touch(dot);
+-			list[1] = NULL;
++			list[1] = 0;
+ 			return(type(list));
+ 		}
+ 		printf("At EOF\n");
+@@ -327,18 +327,18 @@
+ 	register *ip;
+ 	int last;
+ 
+-	last = NULL;
+-	for (ip = msgvec; *ip != NULL; ip++) {
++	last = 0;
++	for (ip = msgvec; *ip != 0; ip++) {
+ 		mp = &message[*ip - 1];
+ 		touch(mp);
+ 		mp->m_flag |= MDELETED|MTOUCH;
+ 		mp->m_flag &= ~(MPRESERVE|MSAVED|MBOX);
+ 		last = *ip;
+ 	}
+-	if (last != NULL) {
++	if (last != 0) {
+ 		dot = &message[last-1];
+ 		last = first(0, MDELETED);
+-		if (last != NULL) {
++		if (last != 0) {
+ 			dot = &message[last-1];
+ 			return(0);
+ 		}
+diff -ur mailx-8.1.1.orig.orig/cmd3.c mailx-8.1.1.orig/cmd3.c
+--- mailx-8.1.1.orig.orig/cmd3.c	2003-09-17 17:10:17.000000000 -0500
++++ mailx-8.1.1.orig/cmd3.c	2003-09-17 17:12:50.000000000 -0500
+@@ -309,7 +309,7 @@
+ 		printf("Cannot \"preserve\" in edit mode\n");
+ 		return(1);
+ 	}
+-	for (ip = msgvec; *ip != NULL; ip++) {
++	for (ip = msgvec; *ip != 0; ip++) {
+ 		mesg = *ip;
+ 		mp = &message[mesg-1];
+ 		mp->m_flag |= MPRESERVE;
+@@ -329,7 +329,7 @@
+ 	int	*msgvec = v;
+ 	register int *ip;
+ 
+-	for (ip = msgvec; *ip != NULL; ip++) {
++	for (ip = msgvec; *ip != 0; ip++) {
+ 		dot = &message[*ip-1];
+ 		dot->m_flag &= ~(MREAD|MTOUCH);
+ 		dot->m_flag |= MSTATUS;
+@@ -348,7 +348,7 @@
+ 	register struct message *mp;
+ 	register int *ip, mesg;
+ 
+-	for (ip = msgvec; *ip != NULL; ip++) {
++	for (ip = msgvec; *ip != 0; ip++) {
+ 		mesg = *ip;
+ 		mp = &message[mesg-1];
+ 		printf("%d: %d/%ld\n", mesg, mp->m_lines, mp->m_size);
+diff -ur mailx-8.1.1.orig.orig/collect.c mailx-8.1.1.orig/collect.c
+--- mailx-8.1.1.orig.orig/collect.c	2003-09-17 17:10:17.000000000 -0500
++++ mailx-8.1.1.orig/collect.c	2003-09-17 17:12:59.000000000 -0500
+@@ -564,11 +564,11 @@
+ 		return(0);
+ 	if (*msgvec == 0) {
+ 		*msgvec = first(0, MMNORM);
+-		if (*msgvec == NULL) {
++		if (*msgvec == 0) {
+ 			printf("No appropriate messages\n");
+ 			return(0);
+ 		}
+-		msgvec[1] = NULL;
++		msgvec[1] = 0;
+ 	}
+ 	if (f == 'f' || f == 'F')
+ 		tabst = NOSTR;
+diff -ur mailx-8.1.1.orig.orig/def.h mailx-8.1.1.orig/def.h
+--- mailx-8.1.1.orig.orig/def.h	2003-09-17 17:10:17.000000000 -0500
++++ mailx-8.1.1.orig/def.h	2003-09-17 17:13:40.000000000 -0500
+@@ -44,7 +44,7 @@
+ 
+ #include <sys/param.h>
+ #include <sys/stat.h>
+-#include <sys/time.h>
++#include <time.h>
+ 
+ #include <signal.h>
+ #include <termios.h>
+diff -ur mailx-8.1.1.orig.orig/lex.c mailx-8.1.1.orig/lex.c
+--- mailx-8.1.1.orig.orig/lex.c	2003-09-17 17:10:17.000000000 -0500
++++ mailx-8.1.1.orig/lex.c	2003-09-17 17:13:07.000000000 -0500
+@@ -355,9 +355,9 @@
+ 		if (c  == 0) {
+ 			*msgvec = first(com->c_msgflag,
+ 				com->c_msgmask);
+-			msgvec[1] = NULL;
++			msgvec[1] = 0;
+ 		}
+-		if (*msgvec == NULL) {
++		if (*msgvec == 0) {
+ 			printf("No applicable messages\n");
+ 			break;
+ 		}
diff --git a/net-mail/mailx/mailx-8.1.2.20021129-r2.ebuild b/net-mail/mailx/mailx-8.1.2.20021129-r2.ebuild
index 48534ecadd83..6a0ac269bad4 100644
--- a/net-mail/mailx/mailx-8.1.2.20021129-r2.ebuild
+++ b/net-mail/mailx/mailx-8.1.2.20021129-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailx/mailx-8.1.2.20021129-r2.ebuild,v 1.6 2003/09/05 02:52:24 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailx/mailx-8.1.2.20021129-r2.ebuild,v 1.7 2003/09/21 18:14:12 avenj Exp $
 
 inherit ccc
 
@@ -20,7 +20,7 @@ DEPEND=">=net-libs/liblockfile-1.03
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc sparc ~alpha ~mips hppa"
+KEYWORDS="x86 ~ppc sparc ~alpha ~mips hppa ia64"
 
 src_unpack() {
 
@@ -28,6 +28,7 @@ src_unpack() {
 	cd ${S}
 	epatch ${DISTDIR}/20021129-cvs.diff.bz2 || die "patch failed"
 	epatch ${DISTDIR}/multifix.diff.gz || die "patch failed"
+	use ia64 && epatch ${FILESDIR}/mailx-64bit.diff || die "patch failed"
 }
 
 src_compile() {