diff options
Diffstat (limited to 'mail/metamail')
| -rw-r--r-- | mail/metamail/Makefile | 9 | ||||
| -rw-r--r-- | mail/metamail/files/patch-sum | 6 | ||||
| -rw-r--r-- | mail/metamail/patches/patch-aa | 190 | ||||
| -rw-r--r-- | mail/metamail/patches/patch-ab | 16 |
4 files changed, 102 insertions, 119 deletions
diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile index 2b95a0c7ad9..78ce2fbab2d 100644 --- a/mail/metamail/Makefile +++ b/mail/metamail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 1999/02/04 18:58:22 agc Exp $ +# $NetBSD: Makefile,v 1.9 1999/09/03 08:19:11 agc Exp $ # FreeBSD Id: Makefile,v 1.8 1996/11/21 11:27:26 asami Exp # @@ -14,6 +14,13 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src USE_X11= yes +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "SunOS" +CFLAGS= -DSYSV +MAKE_ENV+= CFLAGS="${CFLAGS}" CC="${CC}" +.endif + post-patch: ${RM} -f ${WRKDIR}/mm2.7/src/bin/*.orig diff --git a/mail/metamail/files/patch-sum b/mail/metamail/files/patch-sum index 7212356d5bd..d56ba279485 100644 --- a/mail/metamail/files/patch-sum +++ b/mail/metamail/files/patch-sum @@ -1,7 +1,7 @@ -$NetBSD: patch-sum,v 1.1 1999/07/09 14:09:05 agc Exp $ +$NetBSD: patch-sum,v 1.2 1999/09/03 08:19:13 agc Exp $ -MD5 (patch-aa) = 1919219add3cc22f8b25405a0dd50847 -MD5 (patch-ab) = 2b60a60d223af1fe40e3c5e4d1b685d4 +MD5 (patch-aa) = 58de8e5e65b08ca0555c7e377cf0ec27 +MD5 (patch-ab) = 2aa2ebc44d688973895aecb5f286c46c MD5 (patch-ac) = 1235c5d8675e93eeea9ed14d1a6c0104 MD5 (patch-ad) = ea1e72eced720ad02a62f78b12b12e9e MD5 (patch-ae) = 20948e6f8e135957b1bd920e1d7c0230 diff --git a/mail/metamail/patches/patch-aa b/mail/metamail/patches/patch-aa index 312c3cc59c7..0606c7d7b92 100644 --- a/mail/metamail/patches/patch-aa +++ b/mail/metamail/patches/patch-aa @@ -1,113 +1,79 @@ -$NetBSD: patch-aa,v 1.2 1998/08/07 11:09:39 agc Exp $ +$NetBSD: patch-aa,v 1.3 1999/09/03 08:19:14 agc Exp $ -*** Makefile.orig Wed Jan 26 20:32:33 1994 ---- Makefile Mon Nov 20 01:31:41 1995 -*************** -*** 38,44 **** - - STATICFLAG=FOOBAR${HOST_ARCH} - -! CFLAGS = -g -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 ---- 38,44 ---- - - STATICFLAG=FOOBAR${HOST_ARCH} - -! 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,57 **** - # LDLIBS variable. - # - # For Sun and BSD systems, the following should work... -! LDLIBS = - # On BSD 4.4 systems, you will need the following -! # LDLIBS = -lcompat - # 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 ---- 49,57 ---- - # LDLIBS variable. - # - # For Sun and BSD systems, the following should work... -! # LDLIBS = - # On BSD 4.4 systems, you will need the following -! LDLIBS = -s -lcompat - # 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,81 **** - # install -s -c $(LOCALBINDIR) $$file - # - #INSTALL = cp -! INSTALL = install -c -s - - # Root of installation tree -! INSTROOT = /usr/local - # - # This is where binaries should be copied - LOCALBINDIR = ${INSTROOT}/bin ---- 72,81 ---- - # install -s -c $(LOCALBINDIR) $$file - # - #INSTALL = cp -! INSTALL = install -c - - # Root of installation tree -! INSTROOT = ${PREFIX} - # - # This is where binaries should be copied - LOCALBINDIR = ${INSTROOT}/bin -*************** -*** 96,104 **** - # This helps with the "for" constructs below on some platforms: - SHELL=/bin/sh - -! install: basics - -! basics:: - (cd metamail ; $(MAKE) CONFIGDIR=../${CONFIGDIR} CFLAGS="${CFLAGS}" CC="${CC}" LDLIBS="${LDLIBS}") - -${RM} bin/metamail - (cd bin; ${LN} ../metamail/metamail metamail) ---- 96,104 ---- - # This helps with the "for" constructs below on some platforms: - SHELL=/bin/sh - -! install: install-all - -! all basics:: - (cd metamail ; $(MAKE) CONFIGDIR=../${CONFIGDIR} CFLAGS="${CFLAGS}" CC="${CC}" LDLIBS="${LDLIBS}") - -${RM} bin/metamail - (cd bin; ${LN} ../metamail/metamail metamail) -*************** -*** 117,123 **** - (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}") - -${RM} bin/shownonascii - (cd bin; ${LN} ../fonts/shownonascii shownonascii) - -${RM} bin/mailto-hebrew ---- 117,123 ---- - (cd bin; ${LN} ../richmail/richtext richtext) - -${RM} bin/richtoatk - (cd bin; ${LN} ../richmail/richtoatk richtoatk) -! (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,154 **** ---- 149,155 ---- - -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; \ +--- Makefile.orig Wed Jan 26 17:32:33 1994 ++++ Makefile Fri Sep 3 09:14:34 1999 +@@ -26,7 +26,7 @@ + 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 @@ + + 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 @@ + # 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 @@ + # 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 +@@ -96,9 +99,9 @@ + # 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 @@ + (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 @@ + -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 index 2802bc89a37..f5e63200eb1 100644 --- a/mail/metamail/patches/patch-ab +++ b/mail/metamail/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.3 1998/08/07 11:09:39 agc Exp $ +$NetBSD: patch-ab,v 1.4 1999/09/03 08:19:15 agc Exp $ --- config.h.orig Wed Nov 24 15:36:07 1993 -+++ config.h Wed Nov 19 12:58:17 1997 ++++ config.h Fri Sep 3 09:07:12 1999 @@ -65,6 +65,12 @@ #endif #endif @@ -15,7 +15,17 @@ $NetBSD: patch-ab,v 1.3 1998/08/07 11:09:39 agc Exp $ /* 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 -@@ -155,7 +161,11 @@ +@@ -100,7 +106,9 @@ + #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,7 +163,11 @@ #ifdef NeXT #define sigtype void #else |