summaryrefslogtreecommitdiff
path: root/print/mp/patches
diff options
context:
space:
mode:
Diffstat (limited to 'print/mp/patches')
-rw-r--r--print/mp/patches/patch-aa113
-rw-r--r--print/mp/patches/patch-ab31
-rw-r--r--print/mp/patches/patch-ac13
-rw-r--r--print/mp/patches/patch-ad31
4 files changed, 188 insertions, 0 deletions
diff --git a/print/mp/patches/patch-aa b/print/mp/patches/patch-aa
new file mode 100644
index 00000000000..dba867bc079
--- /dev/null
+++ b/print/mp/patches/patch-aa
@@ -0,0 +1,113 @@
+$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
new file mode 100644
index 00000000000..ef40af4885c
--- /dev/null
+++ b/print/mp/patches/patch-ab
@@ -0,0 +1,31 @@
+$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
new file mode 100644
index 00000000000..ae4d71feb94
--- /dev/null
+++ b/print/mp/patches/patch-ac
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..302612e165c
--- /dev/null
+++ b/print/mp/patches/patch-ad
@@ -0,0 +1,31 @@
+$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. */
+ }