summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mail/exim/Makefile20
-rw-r--r--mail/exim/distinfo8
-rw-r--r--mail/exim/options.mk4
3 files changed, 15 insertions, 17 deletions
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 1acc766d9c1..5ccd5b2e181 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.101 2010/06/02 13:04:04 adam Exp $
+# $NetBSD: Makefile,v 1.102 2010/06/06 14:15:30 adam Exp $
-DISTNAME= exim-4.71
-PKGREVISION= 2
+DISTNAME= exim-4.72
CATEGORIES= mail net
MASTER_SITES= ftp://ftp.exim.org/pub/exim/exim4/ \
- http://dl.ambiweb.de/mirrors/ftp.exim.org/exim/exim4/
+ http://dl.ambiweb.de/mirrors/ftp.exim.org/exim/exim4/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= abs@NetBSD.org
@@ -38,7 +37,7 @@ PKG_GECOS.${EXIM_USER}= Exim mail server user
PKG_HOME.${EXIM_USER}= ${VARBASE}/mail
PKG_SHELL.${EXIM_USER}= ${NOLOGIN}
-PKG_SYSCONFSUBDIR?= exim
+PKG_SYSCONFSUBDIR= exim
EXAMPLESDIR= ${PREFIX}/share/examples/exim
CONF_FILES= ${EXAMPLESDIR}/aliases ${PKG_SYSCONFDIR}/aliases
CONF_FILES+= ${EXAMPLESDIR}/configure ${PKG_SYSCONFDIR}/configure
@@ -64,6 +63,12 @@ SUBST_MESSAGE.exim= Faking exim version information in exim_install
SUBST_FILES.exim= scripts/exim_install
SUBST_VARS.exim= PKGSRC_EXIM_VERSION
+SUBST_CLASSES+= cflags
+SUBST_STAGE.cflags= post-patch
+SUBST_MESSAGE.cflags= Removing hard-coded CFLAGS
+SUBST_FILES.cflags= OS/Makefile-*
+SUBST_SED.cflags= -e 's,^CFLAGS=.*,,'
+
INSTALL_ARG= INSTALL_ARG=-no_chown
INSTALL_ENV+= ${INSTALL_ARG:Q}
@@ -105,11 +110,6 @@ pre-configure:
-e 's:@PKG_SYSCONFDIR@:${PKG_SYSCONFDIR}:' \
< ${WRKSRC}/Local/eximon.conf.pkgsrc \
> ${WRKSRC}/Local/eximon.conf
-# CFLAGS is already set by pkgsrc
- for f in ${WRKSRC}/OS/Makefile-*; do \
- sed -e 's/^CFLAGS=.*//' $$f > $$f.subst; \
- mv -f $$f.subst $$f; \
- done
post-build:
sed -e 's:@PREFIX@:${PREFIX}:' \
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index 527fce2eb38..83744edb6f6 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.44 2010/01/31 21:06:29 heinz Exp $
+$NetBSD: distinfo,v 1.45 2010/06/06 14:15:30 adam Exp $
-SHA1 (exim-4.71.tar.bz2) = 4b8f853843edcfa4f3bfbb4bef45d8dcff2fc990
-RMD160 (exim-4.71.tar.bz2) = 22e4ad1d43693d61fa1f2f2de40dda647599a087
-Size (exim-4.71.tar.bz2) = 1560170 bytes
+SHA1 (exim-4.72.tar.bz2) = 3aab453faaa076a6b5f02320d7f8ad8aba21b347
+RMD160 (exim-4.72.tar.bz2) = e3ae8dbb056890d49e21e2ba6eaf9cf789ca2c18
+Size (exim-4.72.tar.bz2) = 1559031 bytes
SHA1 (patch-aa) = cf514f31626cde31747342a2d50edd1dbf7f195f
SHA1 (patch-ab) = f5be62c134b1a2d0870a14546ec0bb62090d498a
SHA1 (patch-ae) = 4a9d2fde403cfd6386742b31f062e7801ef081b9
diff --git a/mail/exim/options.mk b/mail/exim/options.mk
index c96eae1df76..8cf25aed617 100644
--- a/mail/exim/options.mk
+++ b/mail/exim/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.16 2010/06/02 13:04:04 adam Exp $
+# $NetBSD: options.mk,v 1.17 2010/06/06 14:15:30 adam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.exim
PKG_SUPPORTED_OPTIONS= exim-appendfile-maildir exim-appendfile-mailstore
@@ -17,8 +17,6 @@ PKG_SUGGESTED_OPTIONS+= exim-tls
.include "../../mk/bsd.options.mk"
-PLIST_SRC=${PKGDIR}/PLIST
-
.if !empty(PKG_OPTIONS:Mexim-appendfile-maildir)
LOCAL_MAKEFILE_OPTIONS+=SUPPORT_MAILDIR=yes
.endif