Date: Mon, 28 Jul 2014 15:03:50 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363172 - in head/converters: aish/files btoa/files i18ntools/files iconv/files ish ish/files libutf-8/files mmencode/files trans/files tuc/files uudeview/files uudx/files uulib/files x... Message-ID: <201407281503.s6SF3oaI010715@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Mon Jul 28 15:03:50 2014 New Revision: 363172 URL: http://svnweb.freebsd.org/changeset/ports/363172 QAT: https://qat.redports.org/buildarchive/r363172/ Log: Rename converters/ patch-xy patches to reflect the files they modify. Added: head/converters/aish/files/patch-Makefile - copied unchanged from r363137, head/converters/aish/files/patch-aa head/converters/btoa/files/patch-Makefile.sun - copied unchanged from r363137, head/converters/btoa/files/patch-aa head/converters/btoa/files/patch-btoa.c - copied unchanged from r363137, head/converters/btoa/files/patch-ab head/converters/i18ntools/files/patch-hutrans.c - copied unchanged from r363137, head/converters/i18ntools/files/patch-ac head/converters/i18ntools/files/patch-ptrans.c - copied unchanged from r363137, head/converters/i18ntools/files/patch-ad head/converters/i18ntools/files/patch-uhtrans.c - copied unchanged from r363137, head/converters/i18ntools/files/patch-ab head/converters/i18ntools/files/patch-utrans.c - copied unchanged from r363137, head/converters/i18ntools/files/patch-aa head/converters/iconv/files/patch-iconv_builtin_1 - copied unchanged from r363137, head/converters/iconv/files/patch-ah head/converters/iconv/files/patch-iconv_builtin_2 - copied unchanged from r363137, head/converters/iconv/files/patch-iconv_builtin head/converters/iconv/files/patch-lib_Makefile - copied unchanged from r363137, head/converters/iconv/files/patch-ai head/converters/ish/files/patch-ish.c - copied unchanged from r363137, head/converters/ish/files/patch-ab head/converters/libutf-8/files/patch-Makefile - copied unchanged from r363137, head/converters/libutf-8/files/patch-aa head/converters/mmencode/files/patch-man_mmencode.1 - copied unchanged from r363137, head/converters/mmencode/files/patch-aa head/converters/trans/files/patch-bin_trans.h - copied unchanged from r363137, head/converters/trans/files/patch-ac head/converters/trans/files/patch-src_Makefile - copied unchanged from r363137, head/converters/trans/files/patch-aa head/converters/tuc/files/patch-tuc.1 - copied unchanged from r363137, head/converters/tuc/files/patch-aa head/converters/uudeview/files/patch-Makefile.in - copied unchanged from r363137, head/converters/uudeview/files/patch-aa head/converters/uudeview/files/patch-man_uudeview.1 - copied unchanged from r363137, head/converters/uudeview/files/patch-ac head/converters/uudeview/files/patch-man_uuenview.1 - copied unchanged from r363137, head/converters/uudeview/files/patch-ad head/converters/uudeview/files/patch-unix_Makefile.in - copied unchanged from r363137, head/converters/uudeview/files/patch-ab head/converters/uudx/files/patch-uudx.c - copied unchanged from r363137, head/converters/uudx/files/patch-aa head/converters/uulib/files/patch-Makefile.in - copied unchanged from r363137, head/converters/uulib/files/patch-ab head/converters/uulib/files/patch-uulib_Makefile.in - copied unchanged from r363137, head/converters/uulib/files/patch-aa head/converters/uulib/files/patch-uulib_fptools.c - copied unchanged from r363137, head/converters/uulib/files/patch-ac head/converters/uulib/files/patch-uulib_uunconc.c - copied unchanged from r363137, head/converters/uulib/files/patch-ad head/converters/xdeview/files/patch-configure - copied unchanged from r363137, head/converters/xdeview/files/patch-aa head/converters/xdeview/files/patch-tcl_Makefile.in - copied unchanged from r363137, head/converters/xdeview/files/patch-ab head/converters/xdeview/files/patch-tcl_uutcl.c - copied unchanged from r363137, head/converters/xdeview/files/patch-ad Deleted: head/converters/aish/files/patch-aa head/converters/btoa/files/patch-aa head/converters/btoa/files/patch-ab head/converters/i18ntools/files/patch-aa head/converters/i18ntools/files/patch-ab head/converters/i18ntools/files/patch-ac head/converters/i18ntools/files/patch-ad head/converters/iconv/files/patch-ah head/converters/iconv/files/patch-ai head/converters/iconv/files/patch-iconv_builtin head/converters/ish/files/patch-ab head/converters/libutf-8/files/patch-aa head/converters/mmencode/files/patch-aa head/converters/trans/files/patch-aa head/converters/trans/files/patch-ac head/converters/tuc/files/patch-aa head/converters/uudeview/files/patch-aa head/converters/uudeview/files/patch-ab head/converters/uudeview/files/patch-ac head/converters/uudeview/files/patch-ad head/converters/uudx/files/patch-aa head/converters/uulib/files/patch-aa head/converters/uulib/files/patch-ab head/converters/uulib/files/patch-ac head/converters/uulib/files/patch-ad head/converters/xdeview/files/patch-aa head/converters/xdeview/files/patch-ab head/converters/xdeview/files/patch-ad Modified: head/converters/ish/Makefile Copied: head/converters/aish/files/patch-Makefile (from r363137, head/converters/aish/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/converters/aish/files/patch-Makefile Mon Jul 28 15:03:50 2014 (r363172, copy of r363137, head/converters/aish/files/patch-aa) @@ -0,0 +1,31 @@ +--- Makefile.orig Wed Nov 18 20:13:30 1998 ++++ Makefile Fri Nov 12 02:17:34 1999 +@@ -1,12 +1,12 @@ + # aish/koish 1993,94,95 by H.Ogasawara (COR.) + + # install directory +-DSTDIR = /usr/local/bin ++DSTDIR = ${PREFIX}/bin + + #### *** UNIX +-CC = gcc ++CC ?= gcc + LK = $(CC) +-CFLAGS = -O -DUNIX=1 -DUUENCODE=1 -DMIMEDEC=1 ++CFLAGS += -DUNIX=1 -DUUENCODE=1 -DMIMEDEC=1 + #CFLAGS = -O -DUNIX=1 -DUUENCODE=1 + SYSOBJ = ai_unix.o + SYSCHK = syschk.h +@@ -127,9 +127,9 @@ + clean: + rm -f *.o $(SYSCHK) $(PROG) $(MPROG) core *~ + install: $(PROG) $(MPROG) +- install -c -s $(PROG) $(DSTDIR) +- install -c -s $(MPROG) $(DSTDIR) +- install -c -m 0755 ishcat $(DSTDIR) ++ ${BSD_INSTALL_PROGRAM} $(PROG) $(DSTDIR) ++ ${BSD_INSTALL_PROGRAM} $(MPROG) $(DSTDIR) ++ ${BSD_INSTALL_SCRIPT} ishcat $(DSTDIR) + oldc: + sed '/^##--OLDC-b/,/^##--OLDC-e/s/^#//' Makefile | \ + sed '/^##--NEWC-b/,/^##--NEWC-e/s/.*/#&/' > aisholdc.mk Copied: head/converters/btoa/files/patch-Makefile.sun (from r363137, head/converters/btoa/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/converters/btoa/files/patch-Makefile.sun Mon Jul 28 15:03:50 2014 (r363172, copy of r363137, head/converters/btoa/files/patch-aa) @@ -0,0 +1,39 @@ +--- Makefile.sun.orig Fri Oct 8 05:00:00 1993 ++++ Makefile.sun Sun Oct 19 01:28:03 2003 +@@ -1,13 +1,32 @@ + OBJS = btoa.o atob.o repair.o + ++DESTDIR ?= /usr/local ++ ++CC ?= cc ++CFLAGS ?= -O -pipe ++ ++all: btoa ++ + btoa: $(OBJS) +- cc -O $(OBJS) -o btoa ++ $(CC) $(CFLAGS) $(OBJS) -o btoa + + btoa.o: btoa.c btoa.h chksum.h +- cc -c -O btoa.c ++ $(CC) $(CFLAGS) -c btoa.c + + atob.o: atob.c btoa.h chksum.h +- cc -c -O atob.c ++ $(CC) $(CFLAGS) -c atob.c + + repair.o: repair.c btoa.h +- cc -c -O repair.c ++ $(CC) $(CFLAGS) -c repair.c ++ ++install: btoa btoa.1 ++ -@mkdir -p $(DESTDIR)/bin ++ install -c -s -m 755 btoa $(DESTDIR)/bin/btoa ++ rm -f $(DESTDIR)/bin/atob ++ ln $(DESTDIR)/bin/btoa $(DESTDIR)/bin/atob ++ -@mkdir -p $(DESTDIR)/man/man1 ++ install -c -m 644 btoa.1 $(DESTDIR)/man/man1/btoa.1 ++ strip $(DESTDIR)/bin/btoa ++ ++clean: ++ rm -f btoa $(OBJS) Copied: head/converters/btoa/files/patch-btoa.c (from r363137, head/converters/btoa/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/converters/btoa/files/patch-btoa.c Mon Jul 28 15:03:50 2014 (r363172, copy of r363137, head/converters/btoa/files/patch-ab) @@ -0,0 +1,23 @@ +--- btoa.c.orig Fri Oct 8 13:00:00 1993 ++++ btoa.c Wed May 8 14:54:17 2002 +@@ -20,7 +20,7 @@ + FILE *outfile; + + +-void main(argc, argv) ++int main(argc, argv) + int argc; + BYTE **argv; + { +@@ -39,6 +39,11 @@ + error = openinput = openoutput = a_to_b = diagnosis = repair = FALSE; + new_version = TRUE; + infilename = NULL; ++ ++ /* Assume a_to_b = TRUE if we're called 'atob' */ ++ if (!strncmp(argv[0] + strlen(argv[0]) - 4, "atob", 4)) { ++ a_to_b = TRUE; ++ } + + /* Scan for '-' options. The rest must be file names. */ + while (!error && argc > 1 && *argv[1] == '-') Copied: head/converters/i18ntools/files/patch-hutrans.c (from r363137, head/converters/i18ntools/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/converters/i18ntools/files/patch-hutrans.c Mon Jul 28 15:03:50 2014 (r363172, copy of r363137, head/converters/i18ntools/files/patch-ac) @@ -0,0 +1,23 @@ +--- hutrans.c.orig Sun Oct 20 14:31:49 2002 ++++ hutrans.c Sun Oct 20 14:32:24 2002 +@@ -42,8 +42,8 @@ + + int inbuffer = 0; + int nextchar = 0; +-static FILE *input = stdin; +-static FILE *output = stdout; ++static FILE *input; ++static FILE *output; + static char buffer[BUFFERSIZE]; + + /* +@@ -137,6 +137,9 @@ + unsigned int c; + char *inp = NULL; + char *outp = NULL; ++ ++ input = stdin; ++ output = stdout; + + for (i = 1; i < argc; i++) { + if (argv[i][0] != '-') Copied: head/converters/i18ntools/files/patch-ptrans.c (from r363137, head/converters/i18ntools/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/converters/i18ntools/files/patch-ptrans.c Mon Jul 28 15:03:50 2014 (r363172, copy of r363137, head/converters/i18ntools/files/patch-ad) @@ -0,0 +1,26 @@ +--- ptrans.c.orig Sun Oct 20 14:32:45 2002 ++++ ptrans.c Sun Oct 20 14:33:30 2002 +@@ -45,9 +45,9 @@ + static int eightbit = 1; + static unsigned int line = 1; + static unsigned int character = 0; +-static FILE *input = stdin; +-static FILE *output = stdout; +-static FILE *page = NULL; ++static FILE *input; ++static FILE *output; ++static FILE *page; + static char *charmap = NULL; + static char buffer[9]; + static int uni[256] = { +@@ -748,6 +748,10 @@ + char *outp = NULL; + char *pg = NULL; + char *cp; ++ ++ input = stdin; ++ output = stdout; ++ page = NULL; + + for (i = 1; i < argc; i++) { + if (argv[i][0] != '-') Copied: head/converters/i18ntools/files/patch-uhtrans.c (from r363137, head/converters/i18ntools/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/converters/i18ntools/files/patch-uhtrans.c Mon Jul 28 15:03:50 2014 (r363172, copy of r363137, head/converters/i18ntools/files/patch-ab) @@ -0,0 +1,23 @@ +--- uhtrans.c~ Mon Apr 5 23:00:00 1999 ++++ uhtrans.c Sun Oct 20 14:31:19 2002 +@@ -41,8 +41,8 @@ + + static unsigned int line = 1; + static unsigned int numerrors = 0; +-static FILE *input = stdin; +-static FILE *output = stdout; ++static FILE *input; ++static FILE *output; + + int usage() { + fprintf(stderr, "Usage: uhtrans [ -i inputfile][ -o outputfile]\n"); +@@ -63,6 +63,9 @@ + unsigned int c; + char *inp = NULL; + char *outp = NULL; ++ ++ input = stdin; ++ output = stdout; + + for (i = 1; i < argc; i++) { + if (argv[i][0] != '-') Copied: head/converters/i18ntools/files/patch-utrans.c (from r363137, head/converters/i18ntools/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/converters/i18ntools/files/patch-utrans.c Mon Jul 28 15:03:50 2014 (r363172, copy of r363137, head/converters/i18ntools/files/patch-aa) @@ -0,0 +1,26 @@ +--- utrans.c.orig Sun Oct 20 14:28:59 2002 ++++ utrans.c Sun Oct 20 14:29:45 2002 +@@ -45,9 +45,9 @@ + static int binary = 1; + static unsigned int line = 1; + static unsigned int character = 1; +-static FILE *input = stdin; +-static FILE *output = stdout; +-static FILE *page = NULL; ++static FILE *input; ++static FILE *output; ++static FILE *page; + static char *charmap = NULL; + static char buffer[9]; + +@@ -149,6 +149,10 @@ + char *outp = NULL; + char *pg = NULL; + char *cp; ++ ++ input = stdin; ++ output = stdout; ++ page = NULL; + + for (i = 1; i < argc; i++) { + if (argv[i][0] != '-') Copied: head/converters/iconv/files/patch-iconv_builtin_1 (from r363137, head/converters/iconv/files/patch-ah) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/converters/iconv/files/patch-iconv_builtin_1 Mon Jul 28 15:03:50 2014 (r363172, copy of r363137, head/converters/iconv/files/patch-ah) @@ -0,0 +1,11 @@ +--- iconv_builtin 2000/12/01 10:15:21 1.1 ++++ iconv_builtin 2000/12/01 10:15:46 +@@ -83,7 +83,7 @@ + %builtins = map { $pic = 1 if $_ eq 'PIC'; $_ => $pic } @ARGV; + + while (<STDIN>) { +- unless (/^([^[:space:]#]+)/) { ++ unless (/^([^\s#]+)/) { + # line continuation or comment + print $_ unless $opt_s || !$opt_n || /^#WARNING/; + next; Copied: head/converters/iconv/files/patch-iconv_builtin_2 (from r363137, head/converters/iconv/files/patch-iconv_builtin) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/converters/iconv/files/patch-iconv_builtin_2 Mon Jul 28 15:03:50 2014 (r363172, copy of r363137, head/converters/iconv/files/patch-iconv_builtin) @@ -0,0 +1,34 @@ +--- iconv_builtin.orig 2000-11-20 16:07:41.000000000 -0600 ++++ iconv_builtin 2013-05-24 10:19:34.765696802 -0600 +@@ -31,9 +31,9 @@ + # iconv (Charset Conversion Library) v2.0 + # + +-require 'getopts.pl'; ++use Getopt::Std; + +-&Getopts('mno:s:'); ++getopts('mno:s:'); + + if ($opt_o) { + open(STDOUT, ">$opt_o"); +--- ccs/iconv_mktbl.orig 2000-11-18 15:44:27.000000000 -0600 ++++ ccs/iconv_mktbl 2013-05-24 10:43:06.598689960 -0600 +@@ -31,7 +31,7 @@ + # iconv (Charset Conversion Library) v2.0 + # + +-require 'getopts.pl'; ++use Getopt::Std; + use integer; + + sub pack_hex { +@@ -144,7 +144,7 @@ + $opt_p = '0x'; + $opt_u = 1; + +-&Getopts('aCc:Mm:o:p:u:'); ++getopts('aCc:Mm:o:p:u:'); + # ||| || | | +- u N: field number for Unicode character codes + # ||| || | +--- p str: prefix + # ||| || +----- o file: output file name Copied: head/converters/iconv/files/patch-lib_Makefile (from r363137, head/converters/iconv/files/patch-ai) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/converters/iconv/files/patch-lib_Makefile Mon Jul 28 15:03:50 2014 (r363172, copy of r363137, head/converters/iconv/files/patch-ai) @@ -0,0 +1,63 @@ + +$FreeBSD$ + +--- lib/Makefile.orig Tue Nov 28 01:33:49 2000 ++++ lib/Makefile Mon Jun 3 14:16:50 2002 +@@ -1,27 +1,28 @@ +-LIB = iconv ++LIB = biconv + SHLIB_MAJOR = 2 + SHLIB_MINOR = 0 + + SRCS = aliases.c ccs.c ces.c ces_euc.c ces_iso2022.c ces_table.c \ +- converter.c iconv.c utils.c ++ converter.c iconv.c utils.c biconv.h + + BUILTIN_CCS != cd ${.CURDIR}/../ccs && make lib >/dev/null && ${AR} t libccs.a + BUILTIN_CES != cd ${.CURDIR}/../ces && make lib >/dev/null && ${AR} t libces.a + BUILTIN_CES_STATIC != cd ${.CURDIR}/../ces && make libces_static.a \ + >/dev/null && ${AR} t libces_static.a + +-OBJS = ${BUILTIN_CCS:C|.|../ccs/&|} ${BUILTIN_CES:C|.|../ces/&|} +-STATICOBJS = ${BUILTIN_CES_STATIC:C|.|../ces/&|} ++OBJS = ${BUILTIN_CCS:S|^|../ccs/&|} ${BUILTIN_CES:S|^|../ces/&|} ++STATICOBJS = ${BUILTIN_CES_STATIC:S|^|../ces/&|} + + LIBDIR = ${PREFIX}/lib + +-INCDIR = ${PREFIX}/include +-INCS = iconv.h ++INCSDIR = ${PREFIX}/include ++INCDIR = ${INCSDIR} # for 4.x bsd.lib.mk ++INCS = biconv.h + + CFLAGS += -DICONV_MODULE_PATH=\"${MODULEDIR}\" \ + -DICONV_TABLE_PATH=\"${TABLEDIR}\" + +-MAN3 = iconv.3 iconv_open.3 iconv_close.3 ++MAN3 = biconv.3 biconv_open.3 biconv_close.3 + + ALIASES = ${.CURDIR}/../ccs/charset.aliases \ + ${.CURDIR}/../ces/charset.aliases +@@ -32,13 +33,19 @@ + cat ${.ALLSRC} | ${.CURDIR}/../iconv_builtin ${BUILTIN_CCS} \ + ${BUILTIN_CES} PIC ${BUILTIN_CES_STATIC} > ${.TARGET} + +-iconv.3: iconv.3.in ++biconv.3: iconv.3.in + sed -e "s|@@TABLE_DIR@@|${TABLEDIR}|" \ + -e "s|@@MODULE_DIR@@|${MODULEDIR}|" ${.ALLSRC} > ${.TARGET} + +-iconv_open.3: iconv_open.3.in ++biconv_open.3: iconv_open.3.in + sed -e "s|@@TABLE_DIR@@|${TABLEDIR}|" \ + -e "s|@@MODULE_DIR@@|${MODULEDIR}|" ${.ALLSRC} > ${.TARGET} ++ ++biconv_close.3: iconv_close.3 ++ cp ${.ALLSRC} ${.TARGET} ++ ++biconv.h: iconv.h ++ cp ${.ALLSRC} ${.TARGET} + + CLEANFILES= ${.CURDIR}/../ccs/libccs.a ${.CURDIR}/../ces/libces*.a \ + aliases.h iconv.3 iconv_open.3 Modified: head/converters/ish/Makefile ============================================================================== --- head/converters/ish/Makefile Mon Jul 28 15:02:33 2014 (r363171) +++ head/converters/ish/Makefile Mon Jul 28 15:03:50 2014 (r363172) @@ -18,6 +18,6 @@ ALL_TARGET= ish PLIST_FILES= bin/ish do-install: - (cd ${WRKSRC} && ${INSTALL_PROGRAM} ish ${STAGEDIR}${PREFIX}/bin) + ${INSTALL_PROGRAM} ${WRKSRC}/ish ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> Copied: head/converters/ish/files/patch-ish.c (from r363137, head/converters/ish/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/converters/ish/files/patch-ish.c Mon Jul 28 15:03:50 2014 (r363172, copy of r363137, head/converters/ish/files/patch-ab) @@ -0,0 +1,28 @@ +--- ish.c.orig Sun Aug 5 20:04:08 1990 ++++ ish.c Fri Mar 29 15:18:25 2002 +@@ -48,7 +48,7 @@ + long lsize; + char *filename = "file.ish"; + +-FILE *opath = stdout; ++FILE *opath = NULL; + FILE *ipath; + char name[NAMLEN]; + +@@ -61,7 +61,7 @@ + static int ishargc=0; + static char *ishargv[32]; + +-void main(argc, argv) ++int main(argc, argv) + int argc; + char **argv; + { +@@ -69,6 +69,7 @@ + char *p; + FILE *fopen(); + ++ opath = stdout; + if (argc < 2) + help(); + while(--argc > 0) { Copied: head/converters/libutf-8/files/patch-Makefile (from r363137, head/converters/libutf-8/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/converters/libutf-8/files/patch-Makefile Mon Jul 28 15:03:50 2014 (r363172, copy of r363137, head/converters/libutf-8/files/patch-aa) @@ -0,0 +1,14 @@ +--- Makefile.orig 1999-04-01 09:00:12.000000000 +0200 ++++ Makefile 2009-12-18 20:35:57.000000000 +0100 +@@ -26,8 +26,10 @@ + # Makefile for libutf-8 library + # + ++CFLAGS+= -fPIC ++ + all: libutf-8.so.1 + + libutf-8.so.1: fget.utf-8.o sget.utf-8.o fput.utf-8.o sput.utf-8.o nomacros.o +- ld -o libutf-8.so.1 fget.utf-8.o sget.utf-8.o fput.utf-8.o sput.utf-8.o nomacros.o -shared -soname libutf-8.so ++ ld -o $@ fget.utf-8.o sget.utf-8.o fput.utf-8.o sput.utf-8.o nomacros.o -shared -soname $@ + Copied: head/converters/mmencode/files/patch-man_mmencode.1 (from r363137, head/converters/mmencode/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/converters/mmencode/files/patch-man_mmencode.1 Mon Jul 28 15:03:50 2014 (r363172, copy of r363137, head/converters/mmencode/files/patch-aa) @@ -0,0 +1,60 @@ +--- ../man/mmencode.1.orig Thu Sep 30 10:50:02 1999 ++++ ../man/mmencode.1 Thu Sep 30 10:53:37 1999 +@@ -1,44 +1,42 @@ +-.TH MIMENCODE 1 "Release 1" "Bellcore Prototype" ++.TH MMENCODE 1 "Release 1" "Bellcore Prototype" + .SH NAME +-mimencode - Translate to and from mail-oriented encoding formats ++mmencode - Translate to and from mail-oriented encoding formats + +-(Same program also installed as "mmencode".) ++(Same program also installed as "mimencode".) + .SH SYNOPSIS + .ta 8n +-\fBmimencode\fP [-u] [-b] [-q] [-p] [file name] [-o outputfile] ++\fBmmencode\fP [-u] [-b] [-q] [-p] [file name] [-o outputfile] + .br + .SH DESCRIPTION + The +-.I mimencode +-program simply converts a byte stream into (or out of) one of the standard mail encoding formats defined by MIME, the proposed standard for internet multimedia mail formats. Such an encoding is necessary because binary data cannot be sent through the mail. The encodings understood by mimencode are preferable to the use of the uuencode/uudecode programs, for use in mail, in several respects that were important to the authors of MIME. ++.I mmencode ++program simply converts a byte stream into (or out of) one of the standard mail encoding formats defined by MIME, the proposed standard for internet multimedia mail formats. Such an encoding is necessary because binary data cannot be sent through the mail. The encodings understood by mmencode are preferable to the use of the uuencode/uudecode programs, for use in mail, in several respects that were important to the authors of MIME. + +-By default, mimencode reads standard input, and sends a "base64" encoded version of the input to standard output. ++By default, mmencode reads standard input, and sends a "base64" encoded version of the input to standard output. + +-The (really not necessary) "-b" option tells mimencode to use the "base64" encoding. ++The (really not necessary) "-b" option tells mmencode to use the "base64" encoding. + +-The "-q" option tells mimencode to use the "quoted-printable" encoding instead of base64. ++The "-q" option tells mmencode to use the "quoted-printable" encoding instead of base64. + +-The "-u" option tells mimencode to ++The "-u" option tells mmencode to + .I + decode + the standard input rather than encode it. + +-The "-p" option tells mimencode to translate decoded CRLF sequences into the local newline convention during decoding and to do the reverse during encoding. This option is only meaningful when -b (base64 encoding) is in effect. ++The "-p" option tells mmencode to translate decoded CRLF sequences into the local newline convention during decoding and to do the reverse during encoding. This option is only meaningful when -b (base64 encoding) is in effect. + + If a file name argument is given, input is read from that file rather than from standard input. + + The "-o" option, which must be followed by a file name, sends output to the named file rather than to standard output. + .SH RATIONALE + .I +-Mimencode ++Mmencode + is intended to be a replacement for + .I + uuencode +-for mail and news use. The reason is simple: uuencode doesn't work very well in a number of circumstances and ways. In particular, uuencode uses characters that don't translate well across all mail gateways (particularly ASCII <-> EBCDIC gateways). Also, uuencode is not standard -- there are several variants floating around, encoding and decoding things in different and incompatible ways, with no "standard" on which to base an implementation. Finally, uuencode does not generally work well in a pipe, although some variants have been modified to do so. Mimencode implements the encodings which were defined for MIME as uuencode replacements, and should be considerably more robust for email use. ++for mail and news use. The reason is simple: uuencode doesn't work very well in a number of circumstances and ways. In particular, uuencode uses characters that don't translate well across all mail gateways (particularly ASCII <-> EBCDIC gateways). Also, uuencode is not standard -- there are several variants floating around, encoding and decoding things in different and incompatible ways, with no "standard" on which to base an implementation. Finally, uuencode does not generally work well in a pipe, although some variants have been modified to do so. Mmencode implements the encodings which were defined for MIME as uuencode replacements, and should be considerably more robust for email use. + .SH SEE ALSO + metamail(1), mailto(1) +-.SH BUGS +-This program was originally distributed as "mmencode". That name turns out to conflict with a program of the same name that is part of the Slate software from BBN, but totally changing the name to mimencode would create other problems (notably with portability to systems where the left half of file names is limited to 8 characters). Currently, it is being distributed with links under BOTH names. The programs in the distribution that call the program all call it as "mimencode", so the "mmencode" version may be deleted at sites where it causes a problem. (The source files are still named "mmencode" rather than "mimencode".) + .SH COPYRIGHT + Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore) + Copied: head/converters/trans/files/patch-bin_trans.h (from r363137, head/converters/trans/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/converters/trans/files/patch-bin_trans.h Mon Jul 28 15:03:50 2014 (r363172, copy of r363137, head/converters/trans/files/patch-ac) @@ -0,0 +1,21 @@ +*** bin/trans.h.bak Thu May 1 03:12:00 1997 +--- bin/trans.h Mon May 5 19:35:52 1997 +*************** +*** 81,87 **** + /* + if you want to use non-ANSI utime (), uncomment the following line + */ +! /* #define USE_UTIMBUF */ + + /* + if your compiler doesn't define utimbuf, ... +--- 81,89 ---- + /* + if you want to use non-ANSI utime (), uncomment the following line + */ +! #ifdef __FreeBSD__ +! #define USE_UTIMBUF +! #endif + + /* + if your compiler doesn't define utimbuf, ... Copied: head/converters/trans/files/patch-src_Makefile (from r363137, head/converters/trans/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/converters/trans/files/patch-src_Makefile Mon Jul 28 15:03:50 2014 (r363172, copy of r363137, head/converters/trans/files/patch-aa) @@ -0,0 +1,34 @@ +*** src/Makefile.orig Thu May 1 03:12:00 1997 +--- src/Makefile Mon May 5 20:16:45 1997 +*************** +*** 33,46 **** + # + # CC = bcc + # CC = cl +! CC = gcc + # + # COPTS are the options (if any) for compilation + # + # COPTS = -c -ml + # COPTS = -c -AL + # COPTS = -c -DNO_STRUPR -O2 +! COPTS = -c -ansi -Wall -DNO_STRDUP -DNO_STRUPR -O2 + # + # LOPTS are linker options (if any) + # +--- 33,47 ---- + # + # CC = bcc + # CC = cl +! # CC = gcc + # + # COPTS are the options (if any) for compilation + # + # COPTS = -c -ml + # COPTS = -c -AL + # COPTS = -c -DNO_STRUPR -O2 +! # COPTS = -c -ansi -Wall -DNO_STRDUP -DNO_STRUPR -O2 +! COPTS = ${CFLAGS} -c -Wall -DNO_STRUPR + # + # LOPTS are linker options (if any) + # Copied: head/converters/tuc/files/patch-tuc.1 (from r363137, head/converters/tuc/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/converters/tuc/files/patch-tuc.1 Mon Jul 28 15:03:50 2014 (r363172, copy of r363137, head/converters/tuc/files/patch-aa) @@ -0,0 +1,11 @@ +--- tuc.1.orig Sat Apr 17 09:20:52 1999 ++++ tuc.1 Sat Apr 17 09:21:34 1999 +@@ -84,7 +84,7 @@ + You may also use the + .Fl i + flag to specify +-.Ar outputfile ++.Ar inputfile + explicitly. If you use both + .Fl i + and Copied: head/converters/uudeview/files/patch-Makefile.in (from r363137, head/converters/uudeview/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/converters/uudeview/files/patch-Makefile.in Mon Jul 28 15:03:50 2014 (r363172, copy of r363137, head/converters/uudeview/files/patch-aa) @@ -0,0 +1,12 @@ +diff -rU3 Makefile.in Makefile.in +--- Makefile.in Sat Jun 9 08:47:02 2001 ++++ Makefile.in Sun Sep 1 19:23:05 2002 +@@ -164,7 +164,7 @@ + rm -rf uudeview-$(VERSION).$(PATCH) + chmod 644 uudeview-$(V)-$(VERSION).$(PATCH).diff.gz + +-uudeview: unix/config.h libuu.a ++uudeview: unix/config.h + (cd unix ; $(MAKE)) + + xdeview: tcl/config.h libuu.a Copied: head/converters/uudeview/files/patch-man_uudeview.1 (from r363137, head/converters/uudeview/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/converters/uudeview/files/patch-man_uudeview.1 Mon Jul 28 15:03:50 2014 (r363172, copy of r363137, head/converters/uudeview/files/patch-ac) @@ -0,0 +1,14 @@ +diff -r -u ../../orig/uudeview-0.5.18/man/uudeview.1 ./man/uudeview.1 +--- ../../orig/uudeview-0.5.18/man/uudeview.1 Thu Jun 21 09:54:15 2001 ++++ ./man/uudeview.1 Sun Sep 1 19:27:38 2002 +@@ -375,7 +375,9 @@ + .SH "SEE ALSO" + .BR uuenview (1), + .BR uudecode (1), +-.BR uuencode (1). ++.BR uuencode (1), ++.BR munpack (1), ++.BR metamail (1). + .PD 0 + .PP + The Copied: head/converters/uudeview/files/patch-man_uuenview.1 (from r363137, head/converters/uudeview/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/converters/uudeview/files/patch-man_uuenview.1 Mon Jul 28 15:03:50 2014 (r363172, copy of r363137, head/converters/uudeview/files/patch-ad) @@ -0,0 +1,13 @@ +--- ../../orig/uudeview-0.5.18/man/uuenview.1 Wed Mar 6 08:57:36 2002 ++++ ./man/uuenview.1 Sun Sep 1 19:31:52 2002 +@@ -206,7 +206,9 @@ + .BR uuencode (1), + .BR uudecode (1), + .BR sendmail (8), +-.BR inews (1). ++.BR inews (1), ++.BR mpack (1), ++.BR metamail (1). + .PD 0 + .PP + The Copied: head/converters/uudeview/files/patch-unix_Makefile.in (from r363137, head/converters/uudeview/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/converters/uudeview/files/patch-unix_Makefile.in Mon Jul 28 15:03:50 2014 (r363172, copy of r363137, head/converters/uudeview/files/patch-ab) @@ -0,0 +1,18 @@ +--- unix/Makefile.in.orig Thu Jun 6 12:41:08 1996 ++++ unix/Makefile.in Tue Apr 1 11:05:06 1997 +@@ -115,11 +115,11 @@ + rm -f uudeview uuenview + make all + +-uudeview: $(UUDEVIEW_OBJ) ../uulib/libuu.a +- $(CC) -o $@ $(UUDEVIEW_OBJ) -L../uulib -luu $(LIBS) ++uudeview: $(UUDEVIEW_OBJ) ++ $(CC) -o $@ $(UUDEVIEW_OBJ) -luu $(LIBS) + +-uuenview: $(UUENVIEW_OBJ) ../uulib/libuu.a +- $(CC) -o $@ $(UUENVIEW_OBJ) -L../uulib -luu $(LIBS) ++uuenview: $(UUENVIEW_OBJ) ++ $(CC) -o $@ $(UUENVIEW_OBJ) -luu $(LIBS) + + .c.o: + $(CC) -c $(CFLAGS) -I../uulib $(VDEF) $< Copied: head/converters/uudx/files/patch-uudx.c (from r363137, head/converters/uudx/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/converters/uudx/files/patch-uudx.c Mon Jul 28 15:03:50 2014 (r363172, copy of r363137, head/converters/uudx/files/patch-aa) @@ -0,0 +1,23 @@ +--- uudx.c.orig Sun Jan 29 16:44:42 1995 ++++ uudx.c Sat Feb 12 19:31:31 2000 +@@ -89,7 +89,11 @@ + #else + #define strchr index + extern char *strchr(); ++#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) + extern char *sprintf(); ++#else ++extern int sprintf(); ++#endif + extern char *strcpy(); + #endif /* BSD */ + +@@ -346,7 +350,7 @@ + norm_dir(work_file_name, p); + } + strcat(work_file_name, "udXXXXXX"); +- if (mktemp(work_file_name) == NULL) { ++ if (mkstemp(work_file_name) == NULL) { + cant("make", "work_file_name", 1); + /* NOTREACHED */ + } Copied: head/converters/uulib/files/patch-Makefile.in (from r363137, head/converters/uulib/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/converters/uulib/files/patch-Makefile.in Mon Jul 28 15:03:50 2014 (r363172, copy of r363137, head/converters/uulib/files/patch-ab) @@ -0,0 +1,17 @@ +--- Makefile.in.orig Mon Oct 14 15:19:01 1996 ++++ Makefile.in Fri Sep 25 14:53:03 1998 +@@ -170,6 +170,14 @@ + libuu.a: uulib/config.h + (cd uulib; $(MAKE) CC='$(CC)' CFLAGS='$(CFLAGS)' LIBS='$(LIBS)' ) + ++libuu.so.3.0: uulib/config.h ++ (cd uulib; $(MAKE) CC='$(CC)' CFLAGS='$(CFLAGS)' LIBS='$(LIBS)' \ ++ libuu.so.3.0 ) ++ ++libuu.so.3: uulib/config.h ++ (cd uulib; $(MAKE) CC='$(CC)' CFLAGS='$(CFLAGS)' LIBS='$(LIBS)' \ ++ libuu.so.3 ) ++ + minews: + (cd inews; $(MAKE) CC='$(CC)' CFLAGS='$(CFLAGS)' LIBS='$(LIBS)' ) + Copied: head/converters/uulib/files/patch-uulib_Makefile.in (from r363137, head/converters/uulib/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/converters/uulib/files/patch-uulib_Makefile.in Mon Jul 28 15:03:50 2014 (r363172, copy of r363137, head/converters/uulib/files/patch-aa) @@ -0,0 +1,33 @@ +--- uulib/Makefile.in.orig Mon Oct 14 15:19:18 1996 ++++ uulib/Makefile.in Fri Sep 25 14:49:15 1998 +@@ -50,7 +50,7 @@ + # + + .SUFFIXES: +-.SUFFIXES: .c .o ++.SUFFIXES: .c .o .so + + all: libuu.a + +@@ -73,8 +73,21 @@ + ar r $@ $(UULIB_OBJ) + -$(RANLIB) $@ + ++SOBJS= $(UULIB_OBJ:.o=.so) ++libuu.so.3.0: $(SOBJS) ++ rm -f $(.TARGET) ++ ld -Bshareable -x -o libuu.so.3.0 `lorder $(SOBJS) | tsort -q` ++ ++libuu.so.3: $(SOBJS) ++ rm -f $(.TARGET) ++ $(CC) -shared -Wl,-x,-soname,libuu.so.3 -o libuu.so.3 $(SOBJS) ++ ++.c.so: ++ $(CC) -fpic -DPIC -c -o $(.TARGET) $(CFLAGS) $(VDEF) $(.IMPSRC) ++ + .c.o: + $(CC) -c $(CFLAGS) $(VDEF) $< ++ + + uuencode.o: uuencode.c uudeview.h uuint.h uustring.h fptools.h config.h + uulib.o: uulib.c uudeview.h uuint.h uustring.h fptools.h config.h Copied: head/converters/uulib/files/patch-uulib_fptools.c (from r363137, head/converters/uulib/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/converters/uulib/files/patch-uulib_fptools.c Mon Jul 28 15:03:50 2014 (r363172, copy of r363137, head/converters/uulib/files/patch-ac) @@ -0,0 +1,24 @@ +--- ../../orig/uudeview-0.5.18/uulib/fptools.c Wed Jun 6 14:21:47 2001 ++++ uulib/fptools.c Sun Sep 1 21:57:16 2002 +@@ -507,5 +507,20 @@ + char * TOOLEXPORT + _FP_tempnam (char *dir, char *pfx) + { +- return _FP_strdup (tmpnam (NULL)); ++ /* TODO: should make this patch acceptable for fitting back ++ * into the standard uudeview distribution (rather than the ++ * hack that it is now). */ ++ ++ char *fname; ++ int fd; ++ ++ if ((fname = _FP_strdup ("/tmp/uuXXXXXXX")) != NULL) { ++ if ((fd = mkstemp (fname)) != -1) { ++ close (fd); ++ return fname; ++ } else { ++ _FP_free (fname); ++ } ++ } ++ return NULL; + } Copied: head/converters/uulib/files/patch-uulib_uunconc.c (from r363137, head/converters/uulib/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/converters/uulib/files/patch-uulib_uunconc.c Mon Jul 28 15:03:50 2014 (r363172, copy of r363137, head/converters/uulib/files/patch-ad) @@ -0,0 +1,21 @@ +diff -r -u ../../orig/uudeview-0.5.18/uulib/uunconc.c uulib/uunconc.c +--- ../../orig/uudeview-0.5.18/uulib/uunconc.c Tue Apr 2 05:04:52 2002 ++++ uulib/uunconc.c Sun Sep 1 21:27:01 2002 +@@ -1264,7 +1264,7 @@ + else + mode = "wb"; /* otherwise in binary */ + +- if ((data->binfile = tempnam (NULL, "uu")) == NULL) { ++ if ((data->binfile = _FP_tempnam (NULL, "uu")) == NULL) { + UUMessage (uunconc_id, __LINE__, UUMSG_ERROR, + uustring (S_NO_TEMP_NAME)); + return UURET_NOMEM; +@@ -1426,7 +1426,7 @@ + */ + + if (data->uudet == BH_ENCODED && data->binfile) { +- if ((ntmp = tempnam (NULL, "uu")) == NULL) { ++ if ((ntmp = _FP_tempnam (NULL, "uu")) == NULL) { + UUMessage (uunconc_id, __LINE__, UUMSG_ERROR, + uustring (S_NO_TEMP_NAME)); + progress.action = 0; Copied: head/converters/xdeview/files/patch-configure (from r363137, head/converters/xdeview/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/converters/xdeview/files/patch-configure Mon Jul 28 15:03:50 2014 (r363172, copy of r363137, head/converters/xdeview/files/patch-aa) @@ -0,0 +1,11 @@ +--- configure.orig Thu Jan 9 08:22:00 1997 ++++ configure Thu Nov 4 11:29:23 1999 +@@ -3148,7 +3148,7 @@ + + fi + +-for ac_hdr in fcntl.h unistd.h memory.h malloc.h errno.h direct.h ++for ac_hdr in fcntl.h unistd.h memory.h errno.h direct.h + do + ac_safe=`echo "$ac_hdr" | tr './\055' '___'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 Copied: head/converters/xdeview/files/patch-tcl_Makefile.in (from r363137, head/converters/xdeview/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/converters/xdeview/files/patch-tcl_Makefile.in Mon Jul 28 15:03:50 2014 (r363172, copy of r363137, head/converters/xdeview/files/patch-ab) @@ -0,0 +1,13 @@ +--- tcl/Makefile.in.orig Thu Jun 6 13:09:05 1996 ++++ tcl/Makefile.in Wed Apr 2 00:06:10 1997 +@@ -95,8 +95,8 @@ + rm -f uuwish [Xx]deview gif2gfp + make all + +-uuwish: $(OBJ) ../uulib/libuu.a +- $(CC) -o $@ $(OBJ) -L../uulib -luu $(LIBS) ++uuwish: $(OBJ) ++ $(CC) -o $@ $(OBJ) -luu $(LIBS) + + xdeview: xdeview.head tk_MFSbox.tcl xdeview.tail + rm -f $@ Copied: head/converters/xdeview/files/patch-tcl_uutcl.c (from r363137, head/converters/xdeview/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/converters/xdeview/files/patch-tcl_uutcl.c Mon Jul 28 15:03:50 2014 (r363172, copy of r363137, head/converters/xdeview/files/patch-ad) @@ -0,0 +1,17 @@ +--- tcl/uutcl.c.orig Sat Feb 19 18:56:55 2005 ++++ tcl/uutcl.c Sat Feb 19 18:57:08 2005 +@@ -48,14 +48,6 @@ + #include <tcl.h> + #endif + +-/* +- * The following variable is a special hack that is needed in order for +- * Sun shared libraries to be used for Tcl. +- */ +- +-extern int matherr(); +-int *tclDummyMathPtr = (int *) matherr; +- + #include <uudeview.h> + #include <uuint.h> + #include <fptools.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407281503.s6SF3oaI010715>