SOURCES: metamail-fixawk.patch, metamail-ncurses.patch - updated f...

[glen]

Author: glen                         Date: Sat Mar 18 14:23:14 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for debian patch

---- Files affected:
SOURCES:
   metamail-fixawk.patch (1.1 -> 1.2) , metamail-ncurses.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/metamail-fixawk.patch
diff -u SOURCES/metamail-fixawk.patch:1.1 SOURCES/metamail-fixawk.patch:1.2
--- SOURCES/metamail-fixawk.patch:1.1	Sat Feb 10 06:06:07 2001
+++ SOURCES/metamail-fixawk.patch	Sat Mar 18 15:23:09 2006
@@ -1,10 +1,10 @@
---- mm2.7/src/bin/sun2mime.fixawk	Thu Feb  1 12:28:33 2001
-+++ mm2.7/src/bin/sun2mime	Thu Feb  1 12:28:55 2001
-@@ -20,7 +20,7 @@
-     rm -rf $TMPFILE
- fi
+--- mm2.7/src/bin/sun2mime~	2006-03-18 00:37:19.000000000 +0200
++++ mm2.7/src/bin/sun2mime	2006-03-18 01:24:50.000000000 +0200
+@@ -8,7 +8,7 @@
+ #
+ TMPFILE=`tempfile -p metamail -m 600`
  
--/bin/nawk '
+-nawk '
 +/bin/awk '
    BEGIN { printf("Content-type: multipart/mixed; boundary=--------\n\n")
            RS=""; FS="\n"; mode="HEADER" }

================================================================
Index: SOURCES/metamail-ncurses.patch
diff -u SOURCES/metamail-ncurses.patch:1.2 SOURCES/metamail-ncurses.patch:1.3
--- SOURCES/metamail-ncurses.patch:1.2	Wed Jun 27 18:50:27 2001
+++ SOURCES/metamail-ncurses.patch	Sat Mar 18 15:23:09 2006
@@ -1,24 +1,39 @@
-diff -Nru mm2.7/src/metamail/Makefile mm2.7.new/src/metamail/Makefile
---- mm2.7/src/metamail/Makefile	Sun Aug  1 23:04:53 1993
-+++ mm2.7.new/src/metamail/Makefile	Sun Oct 18 10:04:42 1998
-@@ -45,7 +45,7 @@
- 
- mailto: mailto.o codes.o shared.o
- 	rm -f mailto
--	$(CC) $(LOCALCFLAGS) -o mailto  mailto.o  codes.o shared.o -ltermcap $(LDLIBS)
-+	$(CC) $(LOCALCFLAGS) -o mailto  mailto.o  codes.o shared.o -ltinfo $(LDLIBS)
- 
- splitmail: splitmail.o shared.o
- 	rm -f splitmail
-diff -Nru mm2.7/src/richmail/Makefile mm2.7.new/src/richmail/Makefile
---- mm2.7/src/richmail/Makefile	Mon Mar 15 20:32:42 1993
-+++ mm2.7.new/src/richmail/Makefile	Sun Oct 18 10:05:08 1998
-@@ -34,7 +34,7 @@
- all:  richtext richtoatk
- 
- richtext: richtext.o $(RICHOBJS)
--	$(CC) ${LOCALCFLAGS} -o richtext richtext.o $(RICHOBJS) -ltermcap $(LDLIBS)
-+	$(CC) ${LOCALCFLAGS} -o richtext richtext.o $(RICHOBJS) -ltinfo $(LDLIBS)
+--- mm2.7/src/src/metamail/Makefile.am	2006-03-18 00:12:41.000000000 +0200
++++ mm2.7.ncurses3/src/src/metamail/Makefile.am	2006-03-18 00:12:20.000000000 +0200
+@@ -1,7 +1,5 @@
+ MAINTAINERCLEANFILES    = Makefile.in
  
- richtoatk: richtoatk.o $(RICHOBJS)
- 	$(CC) ${LOCALCFLAGS} -o richtoatk richtoatk.o $(RICHOBJS) $(LDLIBS)
+-CFLAGS			= -lncurses
+-
+ INCLUDES                = -I$(top_builddir) -I$(top_builddir)/metamail \
+                         -I$(top_srcdir) -I$(top_srcdir)/metamail
+ 
+@@ -15,7 +13,8 @@
+ mimencode_LDADD		= $(top_builddir)/metamail/libmetamail.la
+ 
+ mailto_SOURCES		= mailto.c codes.c shared.c
+-mailto_LDADD		= $(top_builddir)/metamail/libmetamail.la
++mailto_LDADD		= $(top_builddir)/metamail/libmetamail.la -ltinfo
++mailto_CFLAGS		= -I/usr/include/ncurses
+ 
+ splitmail_SOURCES	= splitmail.c shared.c
+ splitmail_LDADD		= $(top_builddir)/metamail/libmetamail.la
+--- mm2.7/src/src/richmail/Makefile.am	2006-03-18 00:12:41.000000000 +0200
++++ mm2.7.ncurses3/src/src/richmail/Makefile.am	2006-03-18 00:12:20.000000000 +0200
+@@ -1,14 +1,13 @@
+ MAINTAINERCLEANFILES    = Makefile.in
+ 
+-CFLAGS			= -lncurses
+-
+ INCLUDES                = -I$(top_builddir) -I$(top_builddir)/metamail \
+                         -I$(top_srcdir) -I$(top_srcdir)/metamail
+ 
+ bin_PROGRAMS            = richtext richtoatk
+ 
+ richtext_SOURCES	= richtext.c richlex.c richset.c usascii.c iso2022.c
+-richtext_LDADD		= $(top_builddir)/metamail/libmetamail.la
++richtext_LDADD		= $(top_builddir)/metamail/libmetamail.la -ltinfo
++richtext_CFLAGS		= -I/usr/include/ncurses
+ 
+ richtoatk_SOURCES	= richtoatk.c richlex.c richset.c usascii.c iso2022.c
+ richtoatk_LDADD		= $(top_builddir)/metamail/libmetamail.la
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/metamail-fixawk.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/metamail-ncurses.patch?r1=1.2&r2=1.3&f=u