Upgrade to 3.5.2, because old distribution no longer exists.

8 files changed, 32 insertions, 213 deletions

diff --git a/print/mp/Makefile b/print/mp/Makefile
index b8aea4b9c9e..54411921f1d 100644
--- a/print/mp/Makefile
+++ b/print/mp/Makefile
@@ -1,35 +1,30 @@
-# $NetBSD: Makefile,v 1.2 2000/01/10 00:57:17 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2000/09/04 15:46:31 kim Exp $
 #
 
-DISTNAME=	mp
-PKGNAME=	mp-3.4.0
+DISTNAME=	mpdist-3.5.2
+PKGNAME=	mp-3.5.2
 CATEGORIES=	print
 MASTER_SITES=	http://java.sun.com/people/richb/RichApps/mp/
-EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=     kim@tac.nyc.ny.us
 HOMEPAGE=	http://java.sun.com/people/richb/
 
-WRKSRC=		${WRKDIR}/mpdist
-
-NO_CONFIGURE=	yes
+GNU_CONFIGURE=	yes
 
 USE_X11=	yes
 
 .include "../../mk/bsd.prefs.mk"
 
+CONFIGURE_ARGS+=--disable-mptool
+CONFIGURE_ARGS+=--with-prologue=${PREFIX}/share/mp
+
 .if ${OPSYS} == "SunOS"
-EXTRALIBS=	-lsocket -lnsl -lgen
 .else
-BSD_PRINT=	-DBSD_PRINT
+CONFIGURE_ARGS+=--enable-bsd-print
 .endif
 
-ALL_TARGET=	mp PREFIX=${PREFIX} X11BASE=${X11BASE} CC='${CC}' \
-		BSD_PRINT=${BSD_PRINT} EXTRALIBS='${EXTRALIBS}'
-
-INSTALL_TARGET=	install-mp PREFIX=${PREFIX}
-
-pre-patch:
-	${CP} ${WRKSRC}/Makefile.dist ${WRKSRC}/Makefile
+post-install:
+	${MV} ${PREFIX}/share/mpdist ${PREFIX}/share/mp
+	${RM} -f ${PREFIX}/man/man1/mptool.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/mp/files/md5 b/print/mp/files/md5
index b6a827d03b9..a06205b2acb 100644
--- a/print/mp/files/md5
+++ b/print/mp/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/10/28 19:52:26 kim Exp $
+$NetBSD: md5,v 1.2 2000/09/04 15:46:31 kim Exp $
 
-MD5 (mp.tar.Z) = bcd335104c32cad0fa523a554f785cd0
+MD5 (mpdist-3.5.2.tar.gz) = c91356c6b519cab5c5396a5d066ef7c4
diff --git a/print/mp/files/patch-sum b/print/mp/files/patch-sum
index 7470c4bd9c6..350ee6465e2 100644
--- a/print/mp/files/patch-sum
+++ b/print/mp/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.1.1.1 1999/10/28 19:52:26 kim Exp $
+$NetBSD: patch-sum,v 1.2 2000/09/04 15:46:31 kim Exp $
 
-MD5 (patch-aa) = 84eb1e8f8d665ce40bb3cef18b666f7b
-MD5 (patch-ab) = 11633e585459edf05f7d02a871fde753
-MD5 (patch-ac) = ead15e732c6d379652b67e57d1f1be16
-MD5 (patch-ad) = 53e073c4d746568d74587861c96f641a
+This placeholder file is generated by the ``makepatchsum'' target
+whenever the patches directory is empty or missing. Its purpose
+is to ensure that the presence of any obsolete patches will cause
+the proper error to be emitted at build time.
diff --git a/print/mp/patches/patch-aa b/print/mp/patches/patch-aa
deleted file mode 100644
index dba867bc079..00000000000
--- a/print/mp/patches/patch-aa
+++ /dev/null
@@ -1,113 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/10/28 19:52:27 kim Exp $
-
---- Makefile.orig	Thu Oct 21 18:06:01 1999
-+++ Makefile	Thu Oct 21 18:07:08 1999
-@@ -65,14 +65,14 @@
- #  set:
- #          MAILPNAMES      =
- #
--MAILPNAMES = mailp newsp digestp filep filofaxp fileofaxpp franklinp \
-+MAILPNAMES = mailp newsp digestp filep filofaxp filofaxpp franklinp \
- 	     proplanp timemanp timesysip timesyspp
- #---------------------------------------------------------------------
- #  Mimep is capable of MIME support (by using LaTeX and metamail). It uses
- #  some functions from the mp distrubution. To enable these functions then
- #  uncomment the following definition.
- #
--#MIME_SUPPORT    = -DMIME_SUPPORT
-+MIME_SUPPORT    = -DMIME_SUPPORT
- #---------------------------------------------------------------------
- #  Mptool uses Motif. If you are compiling mptool you will need to
- #  uncomment the following two lines and set appropriately.
-@@ -121,28 +121,29 @@
- #  appropriately. If it's not present, then a sensible default value
- #  is used.
- #
--#PROLOGUE = -DPROLOGUE=\"$(MPLIBDIR)\"
-+PROLOGUE = -DPROLOGUE=\"$(MPLIBDIR)\"
- #---------------------------------------------------------------------
- #  Mp and Mptool need X11 to compile and link properly. You will need to
- #  set the following two lines appropriately.
- #
-+OPENWINHOME	= ${X11BASE}
- X11INCDIR       = -I$(OPENWINHOME)/include
--X11LIBDIR       = -L$(OPENWINHOME)/lib
-+X11LIBDIR       = -L$(OPENWINHOME)/lib -R$(OPENWINHOME)/lib
- #=====================================================================
- #
- #  Default locations where mp files will be installed.
- #  You might wish to alter these values.
- #
--MPPATH      = /usr/local
-+MPPATH      = ${PREFIX}
- MPBINDIR    = $(MPPATH)/bin
--MPLIBDIR    = $(MPPATH)/lib/mp
-+MPLIBDIR    = $(MPPATH)/share/mp
- MPMANDIR    = $(MPPATH)/man/man$(MPMANSECT)
--MPMANSECT   = l
-+MPMANSECT   = 1
- #---------------------------------------------------------------------
- #  Compilation flags and standard macro definitions.
- #
--CCOMP	 = -O
--CC       = gcc
-+CCOMP	 = ${CFLAGS}
-+#CC       = gcc
- #---------------------------------------------------------------------
- #  Compilation flags used by all MP programs.
- #
-@@ -155,11 +156,11 @@
- MPCDEFS   = $(GENCDEFS) -I../common
- MPCFLAGS  = $(CCOMP) $(MPCDEFS)
- MPLDFLAGS = $(X11LIBDIR)
--MPLIBS    = -lX11
-+MPLIBS    = -lX11 $(EXTRALIBS)
- #
- #  Options for mp submake.
- #
--MPMAKEOPTS = $(MFLAGS) CC=$(CC) CFLAGS='$(MPCFLAGS)' \
-+MPMAKEOPTS = $(MFLAGS) CC='$(CC)' CFLAGS='$(MPCFLAGS)' \
- 		LDFLAGS='$(MPLDFLAGS)' LIBS='$(MPLIBS)' \
- 		MPBINDIR='$(MPBINDIR)' MPLIBDIR='$(MPLIBDIR)' \
- 		MPMANDIR='$(MPMANDIR)' MPMANSECT='$(MPMANSECT)' \
-@@ -174,7 +175,7 @@
- #
- #  Options for mptool submake.
- #
--MPTOOLMAKEOPTS = $(MFLAGS) CC=$(CC) CFLAGS='$(MPTOOLCFLAGS)' \
-+MPTOOLMAKEOPTS = $(MFLAGS) CC='$(CC)' CFLAGS='$(MPTOOLCFLAGS)' \
- 		LDFLAGS='$(MPTOOLLDFLAGS)' LIBS='$(MPTOOLLIBS)' \
- 		MPBINDIR='$(MPBINDIR)' MPLIBDIR='$(MPLIBDIR)' \
- 		MPMANDIR='$(MPMANDIR)' MPMANSECT='$(MPMANSECT)'
-@@ -189,13 +190,11 @@
- #
- #  Options for mimep submake.
- #
--MIMEPMAKEOPTS = $(MFLAGS) CC=$(CC) CFLAGS='$(MIMEPCFLAGS)' \
-+MIMEPMAKEOPTS = $(MFLAGS) CC='$(CC)' CFLAGS='$(MIMEPCFLAGS)' \
- 		LIBS='$(MIMEPLIBS)' MIMEPBINDIR='$(MPBINDIR)' \
- 		MIMEPMANDIR='$(MPMANDIR)' MIMEPMANSECT='$(MPMANSECT)'
- #=================================================================
- 
--.KEEP_STATE:
--
- BINARIES  = mp mptool mimep
- MPDIR     = mp
- MPTOOLDIR = mptool
-@@ -236,9 +235,15 @@
- 
- SHELL = /bin/sh
- 
--install:
-+install: install-mptool install-mp install-mimep
-+
-+install-mptool:
- 	(cd $(MPTOOLDIR); $(MAKE) $(MPTOOLMAKEOPTS) install)
-+
-+install-mp:
- 	(cd $(MPDIR);     $(MAKE) $(MPMAKEOPTS)     install)
-+
-+install-mimep:
- 	(cd $(MIMEPDIR);  $(MAKE) $(MIMEPMAKEOPTS)  install)
- 
- lint:
diff --git a/print/mp/patches/patch-ab b/print/mp/patches/patch-ab
deleted file mode 100644
index ef40af4885c..00000000000
--- a/print/mp/patches/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/10/28 19:52:27 kim Exp $
-
---- mp/Makefile.orig	Mon Mar 31 15:59:14 1997
-+++ mp/Makefile	Thu Oct 21 13:50:56 1999
-@@ -78,8 +78,6 @@
- 
- #=================================================================
- 
--.KEEP_STATE:
--
- SRCS     = header.c input.c main.c ../common/option.c print.c
- OBJS     = header.o input.o main.o option.o print.o
- HDRS     = header.h input.h print.h
-@@ -99,7 +97,7 @@
- #                                                         mp
- 	   -if [ -f mp ]; then \
- 		cp mp $(MPBINDIR); \
--		chmod 751 $(MPBINDIR)/mp; \
-+		chmod 755 $(MPBINDIR)/mp; \
- 		strip $(MPBINDIR)/mp; \
- 	   fi
- #                                                         mp.1
-@@ -159,7 +157,7 @@
- 	   -for name in $(MAILPNAMES); do \
- 		echo -n $$name " "; \
- 		rm -f $(MPBINDIR)/$$name; \
--		ln -s $(MPBINDIR)/mp $(MPBINDIR)/$$name; \
-+		ln -s mp $(MPBINDIR)/$$name; \
- 	   done
- 	   @echo
- 
diff --git a/print/mp/patches/patch-ac b/print/mp/patches/patch-ac
deleted file mode 100644
index ae4d71feb94..00000000000
--- a/print/mp/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 1999/10/28 19:52:27 kim Exp $
-
---- common/option.h.orig	Fri Sep  3 16:47:22 1999
-+++ common/option.h	Thu Oct 21 17:10:44 1999
-@@ -39,7 +39,7 @@
- #define  MAXLINE       256  /* Maximum string length. */
- #define  MAXMARGIN     500  /* Maximum margin size (in points). */
- #define  MAXNAMES      512  /* Maximum number of files from command line. */
--#define  MAXRESOURCES  40   /* Maximum number of mp X resources. */
-+#define  MAXRESOURCES  42   /* Maximum number of mp X resources. */
- #define  NAMEFIELDS    3    /* Default no. of "words" from passwd gecos. */
- #define  NAMELENGTH    40   /* Maximum allowable real user name. */
- #define  PAGELENGTH    72   /* Number of lines per page. */
diff --git a/print/mp/patches/patch-ad b/print/mp/patches/patch-ad
deleted file mode 100644
index 302612e165c..00000000000
--- a/print/mp/patches/patch-ad
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 1999/10/28 19:52:27 kim Exp $
-
---- common/option.c.orig	Fri Sep  3 16:47:22 1999
-+++ common/option.c	Thu Oct 21 17:59:08 1999
-@@ -826,8 +826,8 @@
-   read_str(&mpres[(int) R_DSIDED],    "doubleSided") ;
-   read_str(&mpres[(int) R_ADDHDRS],   "addHeaders") ;
-   read_str(&mpres[(int) R_REMHDRS],   "removeHeaders") ;
--  read_str(&mpres[(int) R_ALIAS],     "aliasName") ;
-   read_str(&mpres[(int) R_PROLOG],    "prologueName") ;
-+  read_str(&mpres[(int) R_ALIAS],     "aliasName") ;
-   read_str(&mpres[(int) R_NCOLUMNS],  "numberColumns") ;
-   read_str(&mpres[(int) R_TABSIZE],   "tabSize") ;
-   read_str(&mpres[(int) R_NAMEC],     "nameChars") ;
-@@ -847,13 +847,15 @@
-   read_str(&mpres[(int) R_LMARGIN],   "leftMargin") ;
-   read_str(&mpres[(int) R_RMARGIN],   "rightMargin") ;
-   read_str(&mpres[(int) R_TMARGIN],   "topMargin") ;
--  read_str(&mpres[(int) R_BANNERS],   "banners") ;
- 
- #ifdef MIME_SUPPORT
-   read_str(&mpres[(int) R_BOUNDARY],  "boundary") ;
-   read_str(&mpres[(int) R_TYPESIZE],  "typeSize") ;
-   read_str(&mpres[(int) R_PAGINATE],  "paginate") ;
- #endif /*MIME_SUPPORT*/
-+
-+  read_str(&mpres[(int) R_BANNERS],   "banners") ;
-+  read_str(&mpres[(int) R_NEWPAGE],   "newPage") ;
-  
-   rDB = NULL ;                   /* X Resource database. */
- }
diff --git a/print/mp/pkg/PLIST b/print/mp/pkg/PLIST
index 759fd3a704b..68243dfd2c2 100644
--- a/print/mp/pkg/PLIST
+++ b/print/mp/pkg/PLIST
@@ -1,16 +1,26 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/10/28 19:52:27 kim Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/09/04 15:46:32 kim Exp $
+bin/cutlines
 bin/digestp
+bin/ertf2latex
+bin/fileofaxpp
 bin/filep
 bin/filofaxp
-bin/filofaxpp
 bin/franklinp
+bin/iseps
 bin/mailp
+bin/mimep
+bin/mimepps
+bin/mimepurl
 bin/mp
 bin/newsp
 bin/proplanp
+bin/text2latex
 bin/timemanp
 bin/timesysip
 bin/timesyspp
+man/man1/mimep.1
+man/man1/mimep_fr.1
+man/man1/mimep_fr3.1
 man/man1/mp.1
 share/mp/mp.common.ps
 share/mp/mp.pro.alt.ps
@@ -19,7 +29,9 @@ share/mp/mp.pro.ff.ps
 share/mp/mp.pro.ffp.ps
 share/mp/mp.pro.fp.ps
 share/mp/mp.pro.l.c1.ps
+share/mp/mp.pro.l.old
 share/mp/mp.pro.l.ps
+share/mp/mp.pro.old
 share/mp/mp.pro.pp.ps
 share/mp/mp.pro.ps
 share/mp/mp.pro.tm.ps