From 6f94cf27a3936fe20f8574919478d3021bdc1ea9 Mon Sep 17 00:00:00 2001 From: brad Date: Mon, 10 May 2004 08:42:42 +0000 Subject: [PATCH] simplify, use MAKE_FLAGS --- mail/exim/Makefile | 4 ++-- mail/exim/patches/patch-OS_Makefile-Default | 12 ------------ mail/exim/patches/patch-OS_Makefile-OpenBSD | 11 ----------- 3 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 mail/exim/patches/patch-OS_Makefile-Default delete mode 100644 mail/exim/patches/patch-OS_Makefile-OpenBSD diff --git a/mail/exim/Makefile b/mail/exim/Makefile index 1720eeae130..2c63ff67757 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.38 2004/05/10 07:42:32 brad Exp $ +# $OpenBSD: Makefile,v 1.39 2004/05/10 08:42:42 brad Exp $ COMMENT= "flexible mail transfer agent" @@ -27,7 +27,7 @@ FLAVORS= no_x11 no_perl mysql postgresql ldap no_ssl FLAVOR?= MAKE_ENV= FLAVOR="${FLAVOR}" -MAKE_FLAGS= CC="${CC}" +MAKE_FLAGS= CC="${CC}" CFLAGS="${CFLAGS}" EXIM_MAKECAT= EXIM_LOOKUP_INCLUDE= diff --git a/mail/exim/patches/patch-OS_Makefile-Default b/mail/exim/patches/patch-OS_Makefile-Default deleted file mode 100644 index 3912a1e274c..00000000000 --- a/mail/exim/patches/patch-OS_Makefile-Default +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-OS_Makefile-Default,v 1.2 2000/08/12 23:57:45 naddy Exp $ ---- OS/Makefile-Default.orig Wed Apr 12 11:44:50 2000 -+++ OS/Makefile-Default Tue Aug 8 17:48:01 2000 -@@ -53,7 +53,7 @@ PERL_COMMAND=/usr/bin/perl - - # CC contains the name of the C compiler to be used. - --CC=gcc -+# CC=gcc - - - # CFLAGS contains flags to be passed to the compiler. Nothing is defaulted diff --git a/mail/exim/patches/patch-OS_Makefile-OpenBSD b/mail/exim/patches/patch-OS_Makefile-OpenBSD deleted file mode 100644 index 8afa3daef88..00000000000 --- a/mail/exim/patches/patch-OS_Makefile-OpenBSD +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-OS_Makefile-OpenBSD,v 1.2 2000/08/12 23:57:45 naddy Exp $ ---- OS/Makefile-OpenBSD.orig Thu Jul 20 13:08:45 2000 -+++ OS/Makefile-OpenBSD Wed Aug 9 02:11:09 2000 -@@ -2,7 +2,6 @@ - - CHOWN_COMMAND=/usr/sbin/chown - CHGRP_COMMAND=/usr/sbin/chgrp --CFLAGS=-O - - HAVE_SA_LEN=YES -