forgot to remove unused patch

(Portage version: 2.0.51.19)

2 files changed, 5 insertions, 191 deletions

diff --git a/mail-client/mailx/ChangeLog b/mail-client/mailx/ChangeLog
index b52c6dabec2e..7736371e4979 100644
--- a/mail-client/mailx/ChangeLog
+++ b/mail-client/mailx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/mailx
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mailx/ChangeLog,v 1.37 2005/05/18 11:30:41 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mailx/ChangeLog,v 1.38 2005/05/18 11:33:22 ferdy Exp $
+
+  18 May 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  -files/mailx-64bit.diff:
+  forgot to remove unused patch
 
   18 May 2005; Fernando J. Pereda <ferdy@gentoo.org>
   -mailx-8.1.2.20021129-r2.ebuild, -mailx-8.1.2.20021129-r3.ebuild,
diff --git a/mail-client/mailx/files/mailx-64bit.diff b/mail-client/mailx/files/mailx-64bit.diff
deleted file mode 100644
index b50974f0d9c9..000000000000
--- a/mail-client/mailx/files/mailx-64bit.diff
+++ /dev/null
@@ -1,190 +0,0 @@
-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;
- 		}