Attachment #128831 for bug #172719

View | Details | Raw Unified | Return to bug 172719
Collapse All | Expand All




# Created by: torstenb
# Date created:		17 Oct 1994
# Whom:			torstenb
#
# $FreeBSD: ports/mail/metamail/Makefile,v 1.40 2012/10/09 22:12:13 linimon Exp $
#

PORTNAME=	metamail
PORTVERSION=	2.7

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Implementation of MIME, the Multipurpose Internet Mail Extensions

LICENSE=	MIT

OPTIONS_DEFINE=	X11
OPTIONS_DEFAULT=	X11
X11_DESC=	X11 hebrew font support

USE_GCC=	any

WRKSRC=		${WRKDIR}/${DISTNAME}/src

MAN1=		audiocompose.1 audiosend.1 extcompose.1 \
		getfilename.1 mailto-hebrew.1 mailto.1 metamail.1 \
		metasend.1 mime.1 mimencode.1 mmencode.1 \




--- metamail/uue.c.orig	1993-07-29 03:31:02.000000000 +0900
+++ metamail/uue.c	2012-10-13 08:01:35.000000000 +0900
@@ -72,26 +72,26 @@
     while (1) {
 	if (getline (buf, sizeof buf, infp) < 0) {
 	    fprintf (stderr, "Premature EOF!\n");
-	    return;
+	    return(0);
 	}
 	if (strncmp (buf, "begin", 5) == 0)
 	    break;
 	else if (buf[0] == '-' && buf[1] == '-') {
 	    if (boundaries && PendingBoundary (buf, boundaries, ctptr))
-		return;
+		return(0);
 	}
     }	
     while (1) {
 	if (getline (buf, sizeof buf, infp) < 0) {
 	    fprintf (stderr, "Premature EOF!\n");
-	    return;
+	    return(0);
 	}
 	else if (strncmp (buf, "end", 5) == 0)
 	    break;
 	else if (buf[0] == '-' && buf[1] == '-') {
 	    if (boundaries && PendingBoundary (buf, boundaries, ctptr)) {
 		fprintf (stderr, "premature end of x-uue body part\n");
-		return;
+		return(0);
 	    }
 	    else {
 		fprintf (stderr, "ignoring invalid boundary marker\n");




--- metamail/codes.c.orig	1993-09-20 22:13:22.000000000 +0900
+++ metamail/codes.c	2012-10-13 07:59:21.000000000 +0900
@@ -13,6 +13,7 @@
 WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
 */

 #include <ctype.h>
 #include <config.h>
 
@@ -203,7 +204,7 @@
                  && (Buf[0] == '-')
                  && (Buf[1] == '-')
                  && PendingBoundary(Buf, boundaries, boundaryct)) {
-                return;
+                return(0);
             }
             fprintf(stderr, "Ignoring unrecognized boundary line: %s\n", Buf);
             continue;
@@ -221,7 +222,7 @@
         } while (c4 != EOF && isspace(c4));
         if (c2 == EOF || c3 == EOF || c4 == EOF) {
             fprintf(stderr, "Warning: base64 decoder saw premature EOF!\n");
-            return;
+            return(0);
         }
         if (c1 == '=' || c2 == '=') {
             DataDone=1;
@@ -371,7 +372,7 @@
                  && (Buf[0] == '-')
                  && (Buf[1] == '-')
                  && PendingBoundary(Buf, boundaries, boundaryct)) {
-                return;
+                return(0);
             }
             /* Not a boundary, now we must treat THIS line as q-p, sigh */
             if (neednewline) {

Lines 1-5 Link Here

(-)mail/metamail/files/patch-metamail_mailto.c (-2 / +65 lines)
1	--- metamail/mailto.c.orig Wed Feb 9 21:30:26 1994	1	--- metamail/mailto.c.orig 1994-02-10 05:30:26.000000000 +0900
2	+++ metamail/mailto.c Mon Dec 18 11:46:21 2006	2	+++ metamail/mailto.c 2012-10-13 08:04:36.000000000 +0900
3	@@ -37,6 +37,8 @@	3	@@ -37,6 +37,8 @@
4	*/	4	*/
5		5
Lines 25-30 Link Here
25	&& strncmp(CharacterSet, "iso-8859-", 9)) {	25	&& strncmp(CharacterSet, "iso-8859-", 9)) {
26	fprintf(stderr, "mailto: Unsupported character set: %s\n", CharacterSet);	26	fprintf(stderr, "mailto: Unsupported character set: %s\n", CharacterSet);
27	exit(-1);	27	exit(-1);
		28	@@ -1072,7 +1074,7 @@
		29	#endif
		30	}
		31	fprintf(fp, "Message-ID: %s\n", newid());
		32	- if (!FirstPart) return; /* empty body */
		33	+ if (!FirstPart) return(0); /* empty body */
		34	if (FirstPart->next) {
		35	char boundary[120];
		36	#ifdef AMIGA
28	@@ -1130,6 +1132,7 @@	37	@@ -1130,6 +1132,7 @@
29	if (part->isrich) {	38	if (part->isrich) {
30	if (strcmp(CharacterSet, "us-ascii")	39	if (strcmp(CharacterSet, "us-ascii")
Lines 41-46 Link Here
41	\|\| part->encoding_type_needed != ENC_NONE)) {	50	\|\| part->encoding_type_needed != ENC_NONE)) {
42	fprintf(fp, "; charset=\"%s\"\n", CharacterSet);	51	fprintf(fp, "; charset=\"%s\"\n", CharacterSet);
43	} else fputs("\n", fp);	52	} else fputs("\n", fp);
		53	@@ -1346,7 +1350,7 @@
		54	}
		55	part->isrich = 1;
		56	PartEndsWithNewline=1;
		57	- return;
		58	+ return(0);
		59	}
		60	InNewLineSequence = 0;
		61	if (RightToLeftMode) {
44	@@ -1745,6 +1749,7 @@	62	@@ -1745,6 +1749,7 @@
45	}	63	}
46	printf("\n\nEnter your choice as a number from 0 to %d: ", i);	64	printf("\n\nEnter your choice as a number from 0 to %d: ", i);
Lines 81-86 Link Here
81	while (s && s && isspace((unsigned char) s)) ++s;	99	while (s && s && isspace((unsigned char) s)) ++s;
82	if (s && (s == 'y' \|\| s == 'Y')) break;	100	if (s && (s == 'y' \|\| s == 'Y')) break;
83	continue;	101	continue;
		102	@@ -2109,7 +2118,7 @@
		103	fpout = fopen(FirstPart->filename, "a");
		104	free(CmdBuf);
		105	free(CmdBuf2);
		106	- return;
		107	+ return(0);
		108	}
		109	lastmp = mp = FirstPart;
		110	while (mp) {
84	@@ -2137,6 +2146,7 @@	111	@@ -2137,6 +2146,7 @@
85	printf("2: %s\n", CmdBuf);	112	printf("2: %s\n", CmdBuf);
86	printf("\n\nEnter 1 or 2, or 0 to not edit it: ");	113	printf("\n\nEnter 1 or 2, or 0 to not edit it: ");
Lines 89-91 Link Here
89	fgets(LineBuf, sizeof(LineBuf), stdin);	116	fgets(LineBuf, sizeof(LineBuf), stdin);
90	ans = atoi(LineBuf);	117	ans = atoi(LineBuf);
91	} else ans = 2;	118	} else ans = 2;
		119	@@ -2221,7 +2231,7 @@
		120	int LineAlloced = 0, LineCount = 0;
		121
		122	fp = fopen(fname, "r");
		123	- if (!fp) return;
		124	+ if (!fp) return(0);
		125	do {
		126	LineBuf=NextAliasLine(LineBuf, &LineAlloced, &LineCount, fp, IsAndrew);
		127	if (LineCount == 0) continue;
		128	@@ -2310,7 +2320,7 @@
		129	if (s != s2) printf("mailto: ignoring bad alias line in init file: %s\n", aliasline);
		130	free(s);
		131	free(tmpalias);
		132	- return;
		133	+ return(0);
		134	}
		135	*s2++ = '\0';
		136	tmpalias->shortname = s;
		137	@@ -2364,7 +2374,7 @@
		138	{
		139	char firstnonascii, firstascii;
		140
		141	- if (!s) return;
		142	+ if (!s) return(0);
		143	firstnonascii=firstbad(s);
		144	if (firstnonascii) {
		145	if (!strcmp(CharacterSet, "us-ascii")) {
		146	@@ -2454,7 +2464,7 @@
		147	/* if (!lc2strcmp(name, tmpalias->shortname)) { */
		148	*end = savechar;
		149	EmitAddresses(fp, tmpalias->longname, hdr);
		150	- return;
		151	+ return(0);
		152	}
		153	}
		154	*end = savechar;




--- metamail/metamail.c.orig	1994-02-17 10:57:19.000000000 +0900
+++ metamail/metamail.c	2012-10-16 01:27:14.000000000 +0900
@@ -20,6 +20,8 @@
 
  ******************************************************* */

 	while (s && *s && isspace((unsigned char) *s)) ++s;
 	if (*s == 'y' || *s == 'Y' || !*s || *s == '\n') return(1);
 	if (*s == 'n' || *s == 'N' || *s == 'q' || *s == 'Q') {
@@ -1915,18 +1926,18 @@
             if (!strcmp(KeyHeadList[numkeys], "*")
                  || !lc2strncmp(hdr, KeyHeadList[numkeys], len)) {
 		if (!KeyKeep) phead(hdr);
-		return;
+		return(0);
             }
         }
 	if (KeyKeep) phead(hdr);
-	return;
+	return(0);
     }
     if (!strncmp(hdr, "From ", 5) || !strncmp(hdr, ">From ", 6)) {
 	for (numkeys = 0; KeyHeadList[numkeys]; ++numkeys) {
 	    if (!strcmp(KeyHeadList[numkeys], "*")
 		 || !lc2strncmp(">from", KeyHeadList[numkeys], 5)) {
 		if (!KeyKeep) phead(hdr);
-		return;
+		return(0);
 	    }
 	}
 	if (KeyKeep) phead(hdr);
@@ -2022,7 +2033,8 @@
     if (lc2strcmp(charset, PrevCharset)) {
         char *s2, *charsetinuse;

     }
 #else
     if (HasSavedTtyState) {
@@ -2660,7 +2672,7 @@
     char Buf[100];
 #endif
 
-    if (DefinitelyNotTty || MustNotBeTty) return;	
+    if (DefinitelyNotTty || MustNotBeTty) return(0);	
 #if defined(MSDOS) || defined(AMIGA)
     printf("Press RETURN to go on\n");
     gets(Buf);
@@ -2681,15 +2693,15 @@
 
 StartRawStdin() {

Line 0 Link Here

(-)mail/metamail/files/patch-richmail__iso2022.c (+11 lines)
	1	--- richmail/iso2022.c.orig 1992-12-23 02:50:21.000000000 +0900
	2	+++ richmail/iso2022.c 2012-10-13 08:09:11.000000000 +0900
	3	@@ -84,7 +84,7 @@
	4	OutCharSet = OUT_ASCII;
	5	OutAsciiMode = RICH_ENC_US_ASCII;
	6	if (!name)
	7	- return;
	8	+ return(0);
	9	if (!strncmp (name,"iso-2022-jp",11))
	10	richtextencoding (RICH_ENC_JP_ASCII);
	11	else if (!strncmp (name,"iso-2022-kr",11)) {




--- richmail/richtext.c.orig	1994-02-10 01:31:18.000000000 +0900
+++ richmail/richtext.c	2012-10-13 08:07:01.000000000 +0900
@@ -14,6 +14,8 @@
 */
 

 
 #ifndef	RICHTEXT_LIBRARY
 
@@ -910,7 +922,7 @@
 FILE *fp;
 {
     int inmargin=1;
-    if (!s) return;
+    if (!s) return(0);
     while (s -> ch) {
         if (inmargin && (s -> ch) == ' ') {
             controloutput(MoveRight, 1);
@@ -932,7 +944,7 @@
     *BoldOn, *BoldOff;
 {
     if (OverStrike)
-	return;
+	return(0);
 
     /* We always turn back on the appropriate terminal modes, because
       on some terminals one thing turns off all of them */
@@ -989,16 +1001,6 @@
     while(*s) (*RichtextPutc)((int)(*s++),fp);
 }

Return to bug 172719

Lines 1-9 Link Here

(-)mail/metamail/Makefile (-7 / +4 lines)
1	# New ports collection makefile for: metamail	1	# Created by: torstenb
2	# Date created: 17 Oct 1994
3	# Whom: torstenb
4	#
5	# $FreeBSD: ports/mail/metamail/Makefile,v 1.40 2012/10/09 22:12:13 linimon Exp $	2	# $FreeBSD: ports/mail/metamail/Makefile,v 1.40 2012/10/09 22:12:13 linimon Exp $
6	#
7		3
8	PORTNAME= metamail	4	PORTNAME= metamail
9	PORTVERSION= 2.7	5	PORTVERSION= 2.7
Lines 17-29 Link Here
17	MAINTAINER= ports@FreeBSD.org	13	MAINTAINER= ports@FreeBSD.org
18	COMMENT= Implementation of MIME, the Multipurpose Internet Mail Extensions	14	COMMENT= Implementation of MIME, the Multipurpose Internet Mail Extensions
19		15
		16	LICENSE= MIT
		17
20	OPTIONS_DEFINE= X11	18	OPTIONS_DEFINE= X11
21	OPTIONS_DEFAULT= X11	19	OPTIONS_DEFAULT= X11
22	X11_DESC= X11 hebrew font support	20	X11_DESC= X11 hebrew font support
23		21
24	USE_GCC= any
25
26	WRKSRC= ${WRKDIR}/${DISTNAME}/src	22	WRKSRC= ${WRKDIR}/${DISTNAME}/src
		23
27	MAN1= audiocompose.1 audiosend.1 extcompose.1 \	24	MAN1= audiocompose.1 audiosend.1 extcompose.1 \
28	getfilename.1 mailto-hebrew.1 mailto.1 metamail.1 \	25	getfilename.1 mailto-hebrew.1 mailto.1 metamail.1 \
29	metasend.1 mime.1 mimencode.1 mmencode.1 \	26	metasend.1 mime.1 mimencode.1 mmencode.1 \

Line 0 Link Here

(-)mail/metamail/files/patch-metamail__uue.c (+33 lines)
	1	--- metamail/uue.c.orig 1993-07-29 03:31:02.000000000 +0900
	2	+++ metamail/uue.c 2012-10-13 08:01:35.000000000 +0900
	3	@@ -72,26 +72,26 @@
	4	while (1) {
	5	if (getline (buf, sizeof buf, infp) < 0) {
	6	fprintf (stderr, "Premature EOF!\n");
	7	- return;
	8	+ return(0);
	9	}
	10	if (strncmp (buf, "begin", 5) == 0)
	11	break;
	12	else if (buf[0] == '-' && buf[1] == '-') {
	13	if (boundaries && PendingBoundary (buf, boundaries, ctptr))
	14	- return;
	15	+ return(0);
	16	}
	17	}
	18	while (1) {
	19	if (getline (buf, sizeof buf, infp) < 0) {
	20	fprintf (stderr, "Premature EOF!\n");
	21	- return;
	22	+ return(0);
	23	}
	24	else if (strncmp (buf, "end", 5) == 0)
	25	break;
	26	else if (buf[0] == '-' && buf[1] == '-') {
	27	if (boundaries && PendingBoundary (buf, boundaries, ctptr)) {
	28	fprintf (stderr, "premature end of x-uue body part\n");
	29	- return;
	30	+ return(0);
	31	}
	32	else {
	33	fprintf (stderr, "ignoring invalid boundary marker\n");

Lines 1-5 Link Here

(-)mail/metamail/files/patch-metamail_codes.c (-2 / +29 lines)
1	--- metamail/codes.c.orig Mon Sep 20 15:13:22 1993	1	--- metamail/codes.c.orig 1993-09-20 22:13:22.000000000 +0900
2	+++ metamail/codes.c Mon Dec 18 11:46:21 2006	2	+++ metamail/codes.c 2012-10-13 07:59:21.000000000 +0900
3	@@ -13,6 +13,7 @@	3	@@ -13,6 +13,7 @@
4	WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.	4	WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
5	*/	5	*/
Lines 8-10 Link Here
8	#include <ctype.h>	8	#include <ctype.h>
9	#include <config.h>	9	#include <config.h>
10		10
		11	@@ -203,7 +204,7 @@
		12	&& (Buf[0] == '-')
		13	&& (Buf[1] == '-')
		14	&& PendingBoundary(Buf, boundaries, boundaryct)) {
		15	- return;
		16	+ return(0);
		17	}
		18	fprintf(stderr, "Ignoring unrecognized boundary line: %s\n", Buf);
		19	continue;
		20	@@ -221,7 +222,7 @@
		21	} while (c4 != EOF && isspace(c4));
		22	if (c2 == EOF \|\| c3 == EOF \|\| c4 == EOF) {
		23	fprintf(stderr, "Warning: base64 decoder saw premature EOF!\n");
		24	- return;
		25	+ return(0);
		26	}
		27	if (c1 == '=' \|\| c2 == '=') {
		28	DataDone=1;
		29	@@ -371,7 +372,7 @@
		30	&& (Buf[0] == '-')
		31	&& (Buf[1] == '-')
		32	&& PendingBoundary(Buf, boundaries, boundaryct)) {
		33	- return;
		34	+ return(0);
		35	}
		36	/* Not a boundary, now we must treat THIS line as q-p, sigh */
		37	if (neednewline) {

Lines 1-5 Link Here

(-)mail/metamail/files/patch-metamail_metamail.c (-2 / +33 lines)
1	--- metamail/metamail.c.orig Thu Feb 17 02:57:19 1994	1	--- metamail/metamail.c.orig 1994-02-17 10:57:19.000000000 +0900
2	+++ metamail/metamail.c Mon Dec 18 11:46:22 2006	2	+++ metamail/metamail.c 2012-10-16 01:27:14.000000000 +0900
3	@@ -20,6 +20,8 @@	3	@@ -20,6 +20,8 @@
4		4
5	******************************************************* */	5	******************************************************* */
Lines 108-113 Link Here
108	while (s && s && isspace((unsigned char) s)) ++s;	108	while (s && s && isspace((unsigned char) s)) ++s;
109	if (s == 'y' \|\| s == 'Y' \|\| !s \|\| s == '\n') return(1);	109	if (s == 'y' \|\| s == 'Y' \|\| !s \|\| s == '\n') return(1);
110	if (s == 'n' \|\| s == 'N' \|\| s == 'q' \|\| s == 'Q') {	110	if (s == 'n' \|\| s == 'N' \|\| s == 'q' \|\| s == 'Q') {
		111	@@ -1915,18 +1926,18 @@
		112	if (!strcmp(KeyHeadList[numkeys], "*")
		113	\|\| !lc2strncmp(hdr, KeyHeadList[numkeys], len)) {
		114	if (!KeyKeep) phead(hdr);
		115	- return;
		116	+ return(0);
		117	}
		118	}
		119	if (KeyKeep) phead(hdr);
		120	- return;
		121	+ return(0);
		122	}
		123	if (!strncmp(hdr, "From ", 5) \|\| !strncmp(hdr, ">From ", 6)) {
		124	for (numkeys = 0; KeyHeadList[numkeys]; ++numkeys) {
		125	if (!strcmp(KeyHeadList[numkeys], "*")
		126	\|\| !lc2strncmp(">from", KeyHeadList[numkeys], 5)) {
		127	if (!KeyKeep) phead(hdr);
		128	- return;
		129	+ return(0);
		130	}
		131	}
		132	if (KeyKeep) phead(hdr);
111	@@ -2022,7 +2033,8 @@	133	@@ -2022,7 +2033,8 @@
112	if (lc2strcmp(charset, PrevCharset)) {	134	if (lc2strcmp(charset, PrevCharset)) {
113	char s2, charsetinuse;	135	char s2, charsetinuse;
Lines 165-170 Link Here
165	}	187	}
166	#else	188	#else
167	if (HasSavedTtyState) {	189	if (HasSavedTtyState) {
		190	@@ -2660,7 +2672,7 @@
		191	char Buf[100];
		192	#endif
		193
		194	- if (DefinitelyNotTty \|\| MustNotBeTty) return;
		195	+ if (DefinitelyNotTty \|\| MustNotBeTty) return(0);
		196	#if defined(MSDOS) \|\| defined(AMIGA)
		197	printf("Press RETURN to go on\n");
		198	gets(Buf);
168	@@ -2681,15 +2693,15 @@	199	@@ -2681,15 +2693,15 @@
169		200
170	StartRawStdin() {	201	StartRawStdin() {

Lines 1-5 Link Here

(-)mail/metamail/files/patch-richmail_richtext.c (-2 / +20 lines)
1	--- richmail/richtext.c.orig Wed Feb 9 17:31:18 1994	1	--- richmail/richtext.c.orig 1994-02-10 01:31:18.000000000 +0900
2	+++ richmail/richtext.c Mon Dec 18 11:46:22 2006	2	+++ richmail/richtext.c 2012-10-13 08:07:01.000000000 +0900
3	@@ -14,6 +14,8 @@	3	@@ -14,6 +14,8 @@
4	*/	4	*/
5		5
Lines 26-31 Link Here
26		26
27	#ifndef RICHTEXT_LIBRARY	27	#ifndef RICHTEXT_LIBRARY
28		28
		29	@@ -910,7 +922,7 @@
		30	FILE *fp;
		31	{
		32	int inmargin=1;
		33	- if (!s) return;
		34	+ if (!s) return(0);
		35	while (s -> ch) {
		36	if (inmargin && (s -> ch) == ' ') {
		37	controloutput(MoveRight, 1);
		38	@@ -932,7 +944,7 @@
		39	BoldOn, BoldOff;
		40	{
		41	if (OverStrike)
		42	- return;
		43	+ return(0);
		44
		45	/* We always turn back on the appropriate terminal modes, because
		46	on some terminals one thing turns off all of them */
29	@@ -989,16 +1001,6 @@	47	@@ -989,16 +1001,6 @@
30	while(s) (RichtextPutc)((int)(*s++),fp);	48	while(s) (RichtextPutc)((int)(*s++),fp);
31	}	49	}