Initial work in merging bits of the pkgviews branch into modern pkgsrc.

Currently, the pkgviews/buildlink2 integration is incomplete.  People who
work on this branch should also check out src/usr.sbin/pkg_install from
the pkgviews branch.

11 files changed, 0 insertions, 719 deletions

diff --git a/mail/metamail/DESCR b/mail/metamail/DESCR
deleted file mode 100644
index bd22d85baca..00000000000
--- a/mail/metamail/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Metamail is an implementation of MIME, the Multipurpose Internet
-Mail Extensions, a proposed standard for multimedia mail on the Internet.
-Metamail implements MIME, and also implements extensibility and
-configuration via the "mailcap" mechanism described in an informational
-RFC that is a companion to the MIME document.
diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile
deleted file mode 100644
index ece7379a3ba..00000000000
--- a/mail/metamail/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD: Makefile,v 1.20 2003/06/02 01:18:43 jschauma Exp $
-
-DISTNAME=	mm2.7
-PKGNAME=	metamail-2.7
-PKGREVISION=	1
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
-CATEGORIES=	mail
-MASTER_SITES=	ftp://thumper.bellcore.com/pub/nsb/
-EXTRACT_SUFX=	.tar.Z
-
-MAINTAINER=	tech-pkg@netbsd.org
-COMMENT=	Implementation of MIME, the Multipurpose Internet Mail Extensions
-
-CONFLICTS+=	elm>=2.5.5 mm-2.7
-
-USE_BUILDLINK2=		YES
-USE_PKGINSTALL=		YES
-USE_X11=		YES
-
-CFLAGS+=	-DPKG_SYSCONFDIR='\\\"${PKG_SYSCONFDIR}\\\"'
-MAKE_ENV+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
-
-EGDIR=		${PREFIX}/share/examples/metamail
-CONF_FILES=	${EGDIR}/mailcap ${PKG_SYSCONFDIR}/mailcap
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-CFLAGS=		-DSYSV
-.endif
-
-post-patch:
-	${RM} -f ${WRKDIR}/mm2.7/src/bin/*.orig
-
-pre-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/metamail/PLIST b/mail/metamail/PLIST
deleted file mode 100644
index 42a334e01a7..00000000000
--- a/mail/metamail/PLIST
+++ /dev/null
@@ -1,56 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2003/03/23 13:39:26 jmmv Exp $
-bin/audiocompose
-bin/audiosend
-bin/extcompose
-bin/getfilename
-bin/mailserver
-bin/mailto
-bin/mailto-hebrew
-bin/metamail
-bin/metasend
-bin/mimencode
-bin/mmencode
-bin/patch-metamail
-bin/rcvAppleSingle
-bin/richtext
-bin/richtoatk
-bin/showaudio
-bin/showexternal
-bin/shownonascii
-bin/showpartial
-bin/showpicture
-bin/sndAppleSingle
-bin/splitmail
-bin/sun-audio-file
-bin/sun-message.csh
-bin/sun-to-mime
-bin/sun2mime
-lib/metamail/fonts/heb6x13.pcf
-lib/metamail/fonts/heb8x13.pcf
-lib/metamail/fonts/heb8x13B.pcf
-lib/metamail/fonts/fonts.dir
-lib/metamail/fonts/fonts.alias
-man/man1/audiocompose.1.gz
-man/man1/audiosend.1.gz
-man/man1/extcompose.1.gz
-man/man1/getfilename.1.gz
-man/man1/mailto-hebrew.1.gz
-man/man1/mailto.1.gz
-man/man1/metamail.1.gz
-man/man1/metasend.1.gz
-man/man1/mime.1.gz
-man/man1/mimencode.1.gz
-man/man1/mmencode.1.gz
-man/man1/patch-metamail.1.gz
-man/man1/richtext.1.gz
-man/man1/showaudio.1.gz
-man/man1/showexternal.1.gz
-man/man1/shownonascii.1.gz
-man/man1/showpartial.1.gz
-man/man1/showpicture.1.gz
-man/man1/splitmail.1.gz
-man/man4/mailcap.4.gz
-share/examples/metamail/mailcap
-@dirrm share/examples/metamail
-@dirrm lib/metamail/fonts
-@dirrm lib/metamail
diff --git a/mail/metamail/distinfo b/mail/metamail/distinfo
deleted file mode 100644
index 9306d3db808..00000000000
--- a/mail/metamail/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.3 2003/03/23 13:39:26 jmmv Exp $
-
-SHA1 (mm2.7.tar.Z) = 8f213baec9b17c05bcb066f616977a561757d7a6
-Size (mm2.7.tar.Z) = 262881 bytes
-SHA1 (patch-aa) = a2854927d2bfde0b71fc4de6b19b54819c5bd6b6
-SHA1 (patch-ab) = 7cd0a70de63ba86172b5628bb082fb46100262b9
-SHA1 (patch-ac) = c2e0c044df30c3cc33c7f3ff2c620cd29816e1d6
-SHA1 (patch-ad) = f722790d8e72f58a0b351715aec9407506b0443f
-SHA1 (patch-ae) = 1b8f88c25eb3b8e4a89e0c94b49f35ba0d809aa8
-SHA1 (patch-af) = 2bba73c3a2b11b0234b197e0e2236b17c60d5acb
-SHA1 (patch-ag) = d7dcd95194fad57b2863d165af427dd0d2b49bd5
diff --git a/mail/metamail/patches/patch-aa b/mail/metamail/patches/patch-aa
deleted file mode 100644
index acf5eabc900..00000000000
--- a/mail/metamail/patches/patch-aa
+++ /dev/null
@@ -1,85 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2003/03/23 13:39:26 jmmv Exp $
-
---- Makefile.orig	1994-01-26 18:32:33.000000000 +0100
-+++ Makefile
-@@ -26,7 +26,7 @@ MAKE = make
- CP = cp
- 
- # How to compile C programs
--CC = cc
-+#CC = cc
- 
- # You may also want to change the CFLAGS variable, which will be passed on 
- # to all subdirectories.    If you do that, the changes will only work right if you
-@@ -38,7 +38,7 @@ FOOBAR-sun4=-Bstatic
- 
- STATICFLAG=FOOBAR${HOST_ARCH}
- 
--CFLAGS = -g -I.  ${$(STATICFLAG)} 
-+CFLAGS += -I.  ${$(STATICFLAG)}
- # The following is better if you want to make sure you run with SYSV defined
- # CFLAGS = -g -I.  ${$(STATICFLAG)}  -DSYSV
- # Also, for SGI Irix, compile in K&R mode
-@@ -49,9 +49,12 @@ CFLAGS = -g -I.  ${$(STATICFLAG)} 
- # LDLIBS variable.
- #
- # For Sun and BSD systems, the following should work...
--LDLIBS =
-+# LDLIBS =
- # On BSD 4.4 systems, you will need the following
--# LDLIBS = -lcompat
-+OPSYS!= uname -s
-+.if ${OPSYS} == "NetBSD"
-+LDLIBS = -s -lcompat
-+.endif
- # On SGI machines, we need -lsun for getpw...(), and -lc_s saves some space.
- # LDLIBS = -lsun -lc_s
- # ISC SysVr3.2.2 has a shared C library and requires libinet.a to resolve
-@@ -72,10 +75,10 @@ CONFIGDIR = .
- #	install -s -c $(LOCALBINDIR) $$file
- #
- #INSTALL = cp
--INSTALL = install -c -s
-+INSTALL = install -c
- 
- # Root of installation tree
--INSTROOT = /usr/local
-+INSTROOT = ${PREFIX}
- #
- # This is where binaries should be copied
- LOCALBINDIR = ${INSTROOT}/bin
-@@ -91,14 +94,14 @@ MAN4EXT = 4
- FONTSUFFIX=pcf
- 
- # This is where the mailcap file should be put
--MAILCAPDIR = ${INSTROOT}/etc
-+MAILCAPDIR = ${INSTROOT}/share/examples/metamail
- 
- # This helps with the "for" constructs below on some platforms:
- SHELL=/bin/sh
- 
--install: basics
-+install: install-all
- 
--basics::
-+all basics::
- 	(cd metamail ; $(MAKE)  CONFIGDIR=../${CONFIGDIR}  CFLAGS="${CFLAGS}" CC="${CC}"  LDLIBS="${LDLIBS}")
- 	-${RM} bin/metamail
- 	(cd bin; ${LN} ../metamail/metamail metamail)
-@@ -117,7 +120,7 @@ basics::
- 	(cd bin; ${LN} ../richmail/richtext richtext)
- 	-${RM} bin/richtoatk
- 	(cd bin; ${LN} ../richmail/richtoatk richtoatk)
--	(cd fonts ; $(MAKE)  CONFIGDIR=../${CONFIGDIR}  CFLAGS="${CFLAGS}" CC="${CC}"   LDLIBS="${LDLIBS}" FONTSUFFIX="${FONTSUFFIX}")
-+	(cd fonts ; $(MAKE) PREFIX=${PREFIX} CONFIGDIR=../${CONFIGDIR}  CFLAGS="${CFLAGS}" CC="${CC}"   LDLIBS="${LDLIBS}" FONTSUFFIX="${FONTSUFFIX}")
- 	-${RM} bin/shownonascii
- 	(cd bin; ${LN} ../fonts/shownonascii shownonascii)
- 	-${RM} bin/mailto-hebrew
-@@ -149,6 +152,7 @@ install-all: basics 
- 	-mv $(MAILCAPDIR)/mailcap $(MAILCAPDIR)/mailcap.old
- 	@echo "installing file $(MAILCAPDIR)/mailcap"
- 	${CP} mailcap $(MAILCAPDIR)
-+	(cd fonts ; $(MAKE) PREFIX=${PREFIX} CONFIGDIR=../${CONFIGDIR}  CFLAGS="${CFLAGS}" CC="${CC}"   LDLIBS="${LDLIBS}" FONTSUFFIX="${FONTSUFFIX}" install)
- 
- uninstall-all:
- 	@(cd bin; 				\
diff --git a/mail/metamail/patches/patch-ab b/mail/metamail/patches/patch-ab
deleted file mode 100644
index 9f2aef1fcdc..00000000000
--- a/mail/metamail/patches/patch-ab
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2003/03/23 13:39:26 jmmv Exp $
-
---- config.h.orig	1993-11-24 16:36:07.000000000 +0100
-+++ config.h
-@@ -65,6 +65,12 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIE
- #endif
- #endif
- 
-+/* agc - test for 4.4 BSD-derived systems properly */
-+#include <sys/param.h>
-+#if (defined(BSD) && BSD >= 199306)
-+#define __BSD_4_4__
-+#endif
-+
- /* NOTE:  The RESET_PROGRAM resets the terminal to a "normal" state 
-    If you comment out the definition, all will be well except that metamail's
-    -R switch won't work, and metamail-called programs might be more likely
-@@ -100,7 +106,9 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIE
- #endif
- 
- #ifdef SYSV
-+#if !(defined(__sun__) && defined(__svr4__))
- #define killpg(a, b) kill(-(a), (b))
-+#endif
- #define bcopy(a, b, c) memcpy(b, a, c)
- #define bzero(a, b) memset(a, 0, b)
- #define bcmp memcmp
-@@ -155,9 +163,13 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIE
- #ifdef NeXT
- #define sigtype void
- #else
-+#if defined(__BSD_4_4__)
-+#define sigtype void
-+#else
- #define sigtype int
- #endif
- #endif
-+#endif
- 
- #ifdef MSDOS
- #define PATH_SEPARATOR ';'
-@@ -173,7 +185,7 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIE
- #else
- #define PATH_SEPARATOR ':'
- #ifndef STDPATH
--#define STDPATH "/.mailcap:/usr/local/etc/mailcap:/usr/etc/mailcap:/etc/mailcap:/etc/mail/mailcap:/usr/public/lib/mailcap"
-+#define STDPATH "/.mailcap:" PKG_SYSCONFDIR "/mailcap"
- #endif
- #endif
- #endif
diff --git a/mail/metamail/patches/patch-ac b/mail/metamail/patches/patch-ac
deleted file mode 100644
index 0b0049eb40d..00000000000
--- a/mail/metamail/patches/patch-ac
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ac,v 1.2 1998/08/07 11:09:40 agc Exp $
-
-*** bin/sun2mime.ORIG	Sat Nov 13 15:53:51 1993
---- bin/sun2mime	Mon Dec 12 10:07:44 1994
-***************
-*** 11,17 ****
-  fi
-  TMPFILE=${METAMAIL_TMPDIR}/suntomime.$$
-  
-! /bin/nawk '
-    BEGIN { printf("Content-type: multipart/mixed; boundary=--------\n\n")
-            RS=""; FS="\n"; mode="HEADER" }
-    mode == "HEADER" {
---- 11,17 ----
-  fi
-  TMPFILE=${METAMAIL_TMPDIR}/suntomime.$$
-  
-! /usr/bin/awk '
-    BEGIN { printf("Content-type: multipart/mixed; boundary=--------\n\n")
-            RS=""; FS="\n"; mode="HEADER" }
-    mode == "HEADER" {
diff --git a/mail/metamail/patches/patch-ad b/mail/metamail/patches/patch-ad
deleted file mode 100644
index 21afdd3027e..00000000000
--- a/mail/metamail/patches/patch-ad
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ad,v 1.2 1998/08/07 11:09:40 agc Exp $
-
-*** fonts/Makefile.orig	Mon May 31 22:49:27 1993
---- fonts/Makefile	Thu May 18 21:55:42 1995
-***************
-*** 28,39 ****
-  	-${DIRBUILDER}
-  
-  shownonascii: Xshownonascii
-! 	sed -e s@/u/nsb/lib/fonts@`pwd`@ < Xshownonascii > shownonascii
-  	chmod +x shownonascii
-  
-  mailto-hebrew: Xmailto-hebrew
-! 	sed -e s@/u/nsb/lib/fonts@`pwd`@ < Xmailto-hebrew > mailto-hebrew
-  	chmod +x mailto-hebrew
-  
-  clean:
-  	rm -f heb6x13.${FONTSUFFIX} heb8x13.${FONTSUFFIX} heb8x13B.${FONTSUFFIX}  shownonascii mailto-hebrew fonts.dir
---- 28,45 ----
-  	-${DIRBUILDER}
-  
-  shownonascii: Xshownonascii
-! 	sed -e s@/u/nsb/lib/fonts@${PREFIX}/lib/metamail/fonts@ < Xshownonascii > shownonascii
-  	chmod +x shownonascii
-  
-  mailto-hebrew: Xmailto-hebrew
-! 	sed -e s@/u/nsb/lib/fonts@${PREFIX}/lib/metamail/fonts@ < Xmailto-hebrew > mailto-hebrew
-  	chmod +x mailto-hebrew
-+ 
-+ install:
-+ 	mkdir -p ${PREFIX}/lib/metamail/fonts
-+ 	install -c heb6x13.${FONTSUFFIX} heb8x13.${FONTSUFFIX} \
-+ 		heb8x13B.${FONTSUFFIX} fonts.alias ${PREFIX}/lib/metamail/fonts
-+ 	if [ -d /usr/X11R6 ]; then mkfontdir ${PREFIX}/lib/metamail/fonts ; fi
-  
-  clean:
-  	rm -f heb6x13.${FONTSUFFIX} heb8x13.${FONTSUFFIX} heb8x13B.${FONTSUFFIX}  shownonascii mailto-hebrew fonts.dir
diff --git a/mail/metamail/patches/patch-ae b/mail/metamail/patches/patch-ae
deleted file mode 100644
index 9805716c462..00000000000
--- a/mail/metamail/patches/patch-ae
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ae,v 1.2 1998/08/07 11:09:41 agc Exp $
-
-*** metamail/splitmail.c.orig	Sun Jun 18 13:13:56 1995
---- metamail/splitmail.c	Sun Jun 18 13:14:48 1995
-***************
-*** 41,48 ****
-  #define VERBOSEDELIVERYCMD VerboseDeliveryCmd
-  #else
-  extern char *getenv();
-! #define NORMALDELIVERYCMD "/usr/lib/sendmail -t -oi"
-! #define VERBOSEDELIVERYCMD "/usr/lib/sendmail -t -v -oi"
-  #endif
-  
-  usageexit() {
---- 41,48 ----
-  #define VERBOSEDELIVERYCMD VerboseDeliveryCmd
-  #else
-  extern char *getenv();
-! #define NORMALDELIVERYCMD "/usr/sbin/sendmail -t -oi"
-! #define VERBOSEDELIVERYCMD "/usr/sbin/sendmail -t -v -oi"
-  #endif
-  
-  usageexit() {
diff --git a/mail/metamail/patches/patch-af b/mail/metamail/patches/patch-af
deleted file mode 100644
index e3deae66d00..00000000000
--- a/mail/metamail/patches/patch-af
+++ /dev/null
@@ -1,131 +0,0 @@
-$NetBSD: patch-af,v 1.2 1998/08/07 11:09:41 agc Exp $
-
-*** mailto.c.orig	Wed Feb  9 23:30:26 1994
---- metamail/mailto.c	Mon Nov 20 01:21:37 1995
-***************
-*** 570,575 ****
---- 570,576 ----
-          if (isupper(*sdum)) *sdum = tolower(*sdum);
-      }
-      if (strcmp(CharacterSet, "us-ascii")
-+ 	 && strcmp(CharacterSet, "koi8-r")
-           && strncmp(CharacterSet, "iso-8859-", 9)) {
-          fprintf(stderr, "mailto:  Unsupported character set: %s\n", CharacterSet);
-          exit(-1);
-***************
-*** 1130,1135 ****
---- 1131,1137 ----
-          if (part->isrich) {
-              if (strcmp(CharacterSet, "us-ascii")
-                   && (strncmp(CharacterSet, "iso-8859-", 9) 
-+ 		     && strcmp(CharacterSet, "koi8-r")
-                        || part->encoding_type_needed != ENC_NONE)) {
-                  fprintf(fp, "Content-type: text/richtext; charset=\"%s\"\n", CharacterSet);
-              } else {
-***************
-*** 1140,1145 ****
---- 1142,1148 ----
-              WriteCtypeNicely(fp, part->content_type);
-              if (strcmp(CharacterSet, "us-ascii")
-                   && (strncmp(CharacterSet, "iso-8859-", 9) 
-+ 		     && strcmp(CharacterSet, "koi8-r")
-                        || part->encoding_type_needed != ENC_NONE)) {
-                  fprintf(fp, "; charset=\"%s\"\n", CharacterSet);
-              } else fputs("\n", fp);
-***************
-*** 1745,1750 ****
---- 1748,1754 ----
-      }
-      printf("\n\nEnter your choice as a number from 0 to %d: ", i);
-      fflush(stdout);
-+     *LineBuf = '\0';
-      fgets(LineBuf, sizeof(LineBuf), stdin);
-      ans = atoi(LineBuf);
-      if (ans == 0 || ans == 1) {
-***************
-*** 1791,1797 ****
-                  int ct;
-                  printf("\nEnter the MIME Content-type value for the data from file %s\n    (type '?' for a list of locally-valid content-types): ", sdum);
-                  fflush(stdout);
-!                 gets(LineBuf);
-                  if (index(LineBuf, '/')) {
-                      char lc[100], *s, AnsBuf[100];
-                      strcpy(lc, LineBuf);
---- 1795,1801 ----
-                  int ct;
-                  printf("\nEnter the MIME Content-type value for the data from file %s\n    (type '?' for a list of locally-valid content-types): ", sdum);
-                  fflush(stdout);
-! 		fgets(LineBuf, sizeof(LineBuf), stdin);
-                  if (index(LineBuf, '/')) {
-                      char lc[100], *s, AnsBuf[100];
-                      strcpy(lc, LineBuf);
-***************
-*** 1809,1815 ****
-                      }
-                      if (mc) break;
-                      printf("The MIME content-type '%s' is not listed in your local mailcap files,\nand may not be a valid MIME type.  Do you want to use it anyway [no] ? ", LineBuf);
-!                     s = gets(AnsBuf);
-                      while (s && *s && isspace((unsigned char) *s)) ++s;
-                      if (s && (*s == 'y' || *s == 'Y')) break;
-                      continue;
---- 1813,1819 ----
-                      }
-                      if (mc) break;
-                      printf("The MIME content-type '%s' is not listed in your local mailcap files,\nand may not be a valid MIME type.  Do you want to use it anyway [no] ? ", LineBuf);
-! 		    s = fgets(AnsBuf, sizeof(AnsBuf), stdin);
-                      while (s && *s && isspace((unsigned char) *s)) ++s;
-                      if (s && (*s == 'y' || *s == 'Y')) break;
-                      continue;
-*** metamail.c.bak	Thu Feb 17 04:57:19 1994
---- metamail/metamail.c	Mon Nov 20 01:21:37 1995
-***************
-*** 83,89 ****
-  #define MAX_FILE_NAME_SIZE 256
-  #define WRITE_BINARY	"w"
-  #else /* AMIGA */
-! extern char **environ, *gets();
-  #define CATCOMMAND  "cat"
-  #define CATTEMPLATE "cat %s"
-  #define METAMAIL    "metamail"
---- 83,89 ----
-  #define MAX_FILE_NAME_SIZE 256
-  #define WRITE_BINARY	"w"
-  #else /* AMIGA */
-! extern char **environ;
-  #define CATCOMMAND  "cat"
-  #define CATTEMPLATE "cat %s"
-  #define METAMAIL    "metamail"
-***************
-*** 579,585 ****
-                                  int overwriteans = -1;
-                                  do {
-                                      printf("File %s exists.  Do you want to overwrite it (y/n) ?\n", Fname);
-!                                     s = gets(AnsBuf);
-                                      if (!s) {
-                                          overwriteans = 0;
-                                      } else {
---- 579,585 ----
-                                  int overwriteans = -1;
-                                  do {
-                                      printf("File %s exists.  Do you want to overwrite it (y/n) ?\n", Fname);
-! 				    s = fgets(AnsBuf, sizeof(AnsBuf), stdin);
-                                      if (!s) {
-                                          overwriteans = 0;
-                                      } else {
-***************
-*** 1823,1829 ****
-          } else {
-              printf("This message contains '%s'-format data.\nDo you want to view it using the '%s' command (y/n) [y] ? ", ctype, ShortCommand(progname));
-          }
-!         s = gets(AnsBuf);
-          if (!s) return(0); /* EOF */
-  	while (s && *s && isspace((unsigned char) *s)) ++s;
-  	if (*s == 'y' || *s == 'Y' || !*s || *s == '\n') return(1);
---- 1823,1829 ----
-          } else {
-              printf("This message contains '%s'-format data.\nDo you want to view it using the '%s' command (y/n) [y] ? ", ctype, ShortCommand(progname));
-          }
-! 	s = fgets(AnsBuf, sizeof(AnsBuf), stdin);
-          if (!s) return(0); /* EOF */
-  	while (s && *s && isspace((unsigned char) *s)) ++s;
-  	if (*s == 'y' || *s == 'Y' || !*s || *s == '\n') return(1);
diff --git a/mail/metamail/patches/patch-ag b/mail/metamail/patches/patch-ag
deleted file mode 100644
index f8e8c913455..00000000000
--- a/mail/metamail/patches/patch-ag
+++ /dev/null
@@ -1,262 +0,0 @@
-$NetBSD: patch-ag,v 1.2 1998/08/07 11:09:42 agc Exp $
-
-diff -u -r mm2.7.org/src/bin/showaudio mm2.7/src/bin/showaudio
---- bin/showaudio	Wed Feb  2 16:21:26 1994
-+++ bin/showaudio	Wed May 21 21:34:08 1997
-@@ -15,9 +15,35 @@
- # WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
- #
- 
--
-+# Set a sensible value for the temporary directory, if its not
-+# already set.  If TMPDIR is set previously, then we will
-+# assume it is adequately protected.
- if (! $?METAMAIL_TMPDIR) then
--    set METAMAIL_TMPDIR=/tmp
-+    if ($?TMPDIR) then
-+        set METAMAIL_TMPDIR="$TMPDIR"
-+    else
-+        set METAMAIL_TMPDIR=~/metamail_tmp
-+    endif
-+endif
-+
-+# Set a sensible umask value
-+umask 077
-+
-+# Make sure that the temporary directory is available
-+if (! -d "$METAMAIL_TMPDIR") then
-+
-+    if (! -e "$METAMAIL_TMPDIR") then
-+        mkdir "$METAMAIL_TMPDIR"
-+    else
-+        echo "$METAMAIL_TMPDIR exists, but is not a directory"
-+        exit 2
-+    endif
-+
-+    if ( $status != 0 || ! -d "$METAMAIL_TMPDIR" ) then
-+        echo "Error creating $METAMAIL_TMPDIR"
-+        exit 2
-+    endif
-+
- endif
- 
- # First, figure out which machine to play it on!
-@@ -33,7 +59,7 @@
- set ORG="Bellcore"
- set STDINPUT=0
- if ("$1" == "-p") then
--    set AUDIOPHONE=$2
-+    set AUDIOPHONE="$2"
-     shift
-     shift
- endif
-@@ -173,7 +199,7 @@
- 	    set AUDIOPHONE=$<
- 	endif
- 	if ($thishost == $AUDIOPHONEHOST || $thishost == $AUDIOPHONEHOSTLONG) then
--	    echo Calling Phone number $AUDIOPHONE
-+	    echo Calling Phone number "$AUDIOPHONE"
- 	    echo "You MUST SAY HELLO when you answer the phone, or you will not hear the message."
- 	    mail -s "showaudio: `whoami` called $AUDIOPHONE" $AUDIOLOGMAIL < /dev/null
- 	    if ($STDINPUT) then
-@@ -206,7 +232,7 @@
-     echo -n "File name:"
-     set fname=$<
- endif
--cp $1 $fname
-+cp "$1" $fname
- if ($status == 0) echo Wrote raw audio file: $fname
- exit 0
- 
-Only in mm2.7/src/bin: showaudio~
-diff -u -r mm2.7.org/src/bin/showexternal mm2.7/src/bin/showexternal
---- bin/showexternal	Tue Feb  8 09:39:05 1994
-+++ bin/showexternal	Wed May 21 21:41:39 1997
-@@ -15,9 +15,45 @@
- # WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
- # 
- 
-+# Check argument integrity. Don't trust mail headers
-+switch ("$1$2$3$4$5$6$7")
-+case "*[\t ]*":
-+  echo "Illegal white space in arguments\!"
-+  echo "Command was:"
-+  echo "'$0' '$1' '$2' '$3' '$4' '$5' '$6' '$7'"
-+  exit 2
-+endsw
-+
- onintr cleanup
-+# Set a sensible value for the temporary directory, if its not
-+# already set.  If TMPDIR is set previously, then we will
-+# assume it is adequately protected.
- if (! $?METAMAIL_TMPDIR) then
--    set METAMAIL_TMPDIR=/tmp
-+    if ($?TMPDIR) then
-+        set METAMAIL_TMPDIR="$TMPDIR"
-+    else
-+        set METAMAIL_TMPDIR=~/metamail_tmp
-+    endif
-+endif
-+
-+# Set a sensible umask value
-+umask 077
-+
-+# Make sure that the temporary directory is available
-+if (! -d "$METAMAIL_TMPDIR") then
-+
-+    if (! -e "$METAMAIL_TMPDIR") then
-+        mkdir "$METAMAIL_TMPDIR"
-+    else
-+        echo "$METAMAIL_TMPDIR exists, but is not a directory"
-+        exit 2
-+    endif
-+
-+    if ( $status != 0 || ! -d "$METAMAIL_TMPDIR" ) then
-+        echo "Error creating $METAMAIL_TMPDIR"
-+        exit 2
-+    endif
-+
- endif
- if (! $?FTP) then
-     set FTP=ftp
-Only in mm2.7/src/bin: showexternal~
-diff -u -r mm2.7.org/src/bin/showpartial mm2.7/src/bin/showpartial
---- bin/showpartial	Wed Feb  2 16:21:29 1994
-+++ bin/showpartial	Wed May 21 21:39:49 1997
-@@ -2,8 +2,44 @@
- # (The "-fb" might need to be changed to "-f" on some systems)
- #
- 
-+# Check argument integrity. Don't trust mail headers
-+switch ("$1$2$3$4")
-+case "*[\t ]*":
-+  echo "Illegal white space in arguments\!"
-+  echo "Command was:"
-+  echo "'$0' '$1' '$2' '$3' '$4'"
-+  exit 2
-+endsw
-+
-+# Set a sensible value for the temporary directory, if its not
-+# already set.  If TMPDIR is set previously, then we will
-+# assume it is adequately protected.
- if (! $?METAMAIL_TMPDIR) then
--    set METAMAIL_TMPDIR=/tmp
-+    if ($?TMPDIR) then
-+        set METAMAIL_TMPDIR="$TMPDIR"
-+    else
-+        set METAMAIL_TMPDIR=~/metamail_tmp
-+    endif
-+endif
-+
-+# Set a sensible umask value
-+umask 077
-+
-+# Make sure that the temporary directory is available
-+if (! -d "$METAMAIL_TMPDIR") then
-+
-+    if (! -e "$METAMAIL_TMPDIR") then
-+        mkdir "$METAMAIL_TMPDIR"
-+    else
-+        echo "$METAMAIL_TMPDIR exists, but is not a directory"
-+        exit 2
-+    endif
-+
-+    if ( $status != 0 || ! -d "$METAMAIL_TMPDIR" ) then
-+        echo "Error creating $METAMAIL_TMPDIR"
-+        exit 2
-+    endif
-+
- endif
- 
- set TREEROOT=${METAMAIL_TMPDIR}/m-prts-`whoami`
-@@ -11,14 +47,14 @@
-     echo "Usage:  showpartial file id partnum totalnum"
-     exit -1
- endif
--set file=$1
-+set file="$1"
- # This next line is because message-id can contain weird chars
--set id=`echo $2 | tr -d  \!\$\&\*\(\)\|\'\"\;\/\<\>\\` 
--@ partnum = $3
--if ($#argv == 3 || $4 == "") then
-+set id=`echo "$2" | tr -d  \!\$\&\*\(\)\|\'\"\;\/\<\>\\` 
-+@ partnum = "$3"
-+if ($#argv == 3 || "$4" == "") then
-     set totalnum=-1
- else
--    @ totalnum = $4
-+    @ totalnum = "$4"
- endif
- 
- if (! -d  $TREEROOT)  then
-@@ -35,9 +71,9 @@
-         exit -1
-     endif
- endif
--cp $file ${TREEROOT}/$id/$partnum
-+cp "$file" ${TREEROOT}/$id/$partnum
- if ($status) then 
--    echo cp $file ${TREEROOT}/$id/$partnum failed
-+    echo cp "$file" ${TREEROOT}/$id/$partnum failed
-     exit -1
- endif
- if ($totalnum == -1) then
-Only in mm2.7/src/bin: showpartial~
-diff -u -r mm2.7.org/src/bin/showpicture mm2.7/src/bin/showpicture
---- bin/showpicture	Mon Feb  7 10:59:54 1994
-+++ bin/showpicture	Wed May 21 21:34:59 1997
-@@ -15,15 +15,42 @@
- # WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
- #
- 
-+# Set a sensible value for the temporary directory, if its not
-+# already set.  If TMPDIR is set previously, then we will
-+# assume it is adequately protected.
- if (! $?METAMAIL_TMPDIR) then
--    set METAMAIL_TMPDIR=/tmp
-+    if ($?TMPDIR) then
-+        set METAMAIL_TMPDIR="$TMPDIR"
-+    else
-+        set METAMAIL_TMPDIR=~/metamail_tmp
-+    endif
-+endif
-+
-+# Set a sensible umask value
-+umask 077
-+
-+# Make sure that the temporary directory is available
-+if (! -d "$METAMAIL_TMPDIR") then
-+
-+    if (! -e "$METAMAIL_TMPDIR") then
-+        mkdir "$METAMAIL_TMPDIR"
-+    else
-+        echo "$METAMAIL_TMPDIR exists, but is not a directory"
-+        exit 2
-+    endif
-+
-+    if ( $status != 0 || ! -d "$METAMAIL_TMPDIR" ) then
-+        echo "Error creating $METAMAIL_TMPDIR"
-+        exit 2
-+    endif
-+
- endif
- 
- if (! $?X_VIEWER) then
--set X_VIEWER="xloadimage -view -quiet -geometry +1+1"
-+  set X_VIEWER="xloadimage -view -quiet -geometry +1+1"
- # set X_VIEWER="xv -geometry +1+1"
- endif
--if ($1 == "-viewer" && $#argv > 1) then
-+if ("$1" == "-viewer" && $#argv > 1) then
-     set X_VIEWER = "$2"
-     shift
-     shift
-@@ -57,7 +84,7 @@
-             endif
-         end
-     endif
--    cp $1 $fname
-+    cp "$1" $fname
-     if ($status == 0) echo Wrote file $fname
-     exit 0
- endif