summaryrefslogtreecommitdiff
path: root/mail/exim
diff options
context:
space:
mode:
authorheinz <heinz@pkgsrc.org>2010-01-31 21:06:29 +0000
committerheinz <heinz@pkgsrc.org>2010-01-31 21:06:29 +0000
commita7c9355618bf37a9374d2d73ecc3e1bfada899ad (patch)
tree1ca2ea50984389d71cf4f6fcf0f1f228ede78d22 /mail/exim
parentc7f6f789b4275a947b09dbf6934cc06319a0b91d (diff)
downloadpkgsrc-a7c9355618bf37a9374d2d73ecc3e1bfada899ad.tar.gz
Added complete support for installation to DESTDIR. The Exim executable
file cannot run without EXIM_USER being present on the system, so scripts/exim_install was changed to derive the Exim version from the pkgsrc package version (see PKGSRC_EXIM_VERSION in the Makefile and patch-ae). Added LICENSE information. Ok'd by abs@
Diffstat (limited to 'mail/exim')
-rw-r--r--mail/exim/Makefile17
-rw-r--r--mail/exim/distinfo4
-rw-r--r--mail/exim/patches/patch-ae16
3 files changed, 29 insertions, 8 deletions
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index ba999c19f13..09106c572e3 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.99 2010/01/15 20:48:08 zafer Exp $
+# $NetBSD: Makefile,v 1.100 2010/01/31 21:06:29 heinz Exp $
DISTNAME= exim-4.71
PKGREVISION= 1
@@ -10,11 +10,11 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= abs@NetBSD.org
HOMEPAGE= http://www.exim.org/
COMMENT= The Exim mail transfer agent, a replacement for sendmail
+LICENSE= gnu-gpl-v2
CONFLICTS+= exim-exiscan-[0-9]*
USE_TOOLS+= perl:run
-INSTALLATION_DIRS+= ${PKGMANDIR}/man8
BUILD_DEFS+= VARBASE
MAKE_ENV+= SSLBASE=${SSLBASE:Q}
@@ -22,7 +22,7 @@ MAKE_ENV+= INST_CHOWN=${CHOWN:Q}
MAKE_FLAGS+= FULLECHO=''
MAKE_JOBS_SAFE= no
-PKG_DESTDIR_SUPPORT = destdir
+PKG_DESTDIR_SUPPORT = user-destdir
.include "../../mk/bsd.prefs.mk"
@@ -49,6 +49,7 @@ RCD_SCRIPTS= exim
OWN_DIRS_PERMS= ${VARBASE}/log/exim ${EXIM_USER} ${EXIM_GROUP} 0750
OWN_DIRS_PERMS+= ${VARBASE}/spool/exim ${EXIM_USER} ${EXIM_GROUP} 0750
+SPECIAL_PERMS+= sbin/${PKGSRC_EXIM_VERSION} ${SETUID_ROOT_PERMS}
# XXX: The following will be handled by buildlink3 at some point.
CFLAGS+= ${_STRIPFLAG_CC}
@@ -56,6 +57,16 @@ CFLAGS+= ${_STRIPFLAG_CC}
# pay attention to CPPFLAGS as well
CFLAGS+= ${CPPFLAGS}
+PKGSRC_EXIM_VERSION= ${DISTNAME}-1
+SUBST_CLASSES+= exim
+SUBST_STAGE.exim= pre-configure
+SUBST_MESSAGE.exim= Faking exim version information in exim_install
+SUBST_FILES.exim= scripts/exim_install
+SUBST_VARS.exim= PKGSRC_EXIM_VERSION
+
+INSTALL_ARG= INSTALL_ARG=-no_chown
+INSTALL_ENV+= ${INSTALL_ARG:Q}
+
.include "options.mk"
post-extract:
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index 24a9971b7b1..527fce2eb38 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.43 2009/12/07 14:29:09 adam Exp $
+$NetBSD: distinfo,v 1.44 2010/01/31 21:06:29 heinz Exp $
SHA1 (exim-4.71.tar.bz2) = 4b8f853843edcfa4f3bfbb4bef45d8dcff2fc990
RMD160 (exim-4.71.tar.bz2) = 22e4ad1d43693d61fa1f2f2de40dda647599a087
Size (exim-4.71.tar.bz2) = 1560170 bytes
SHA1 (patch-aa) = cf514f31626cde31747342a2d50edd1dbf7f195f
SHA1 (patch-ab) = f5be62c134b1a2d0870a14546ec0bb62090d498a
-SHA1 (patch-ae) = 33573e3d02edbca0c44ed54d1aadd2db50fa1fe6
+SHA1 (patch-ae) = 4a9d2fde403cfd6386742b31f062e7801ef081b9
SHA1 (patch-ag) = 8512795060ad913f4699c277867fd24e7a785519
diff --git a/mail/exim/patches/patch-ae b/mail/exim/patches/patch-ae
index ef485e4618d..8ef6eeb2352 100644
--- a/mail/exim/patches/patch-ae
+++ b/mail/exim/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.10 2009/02/13 15:28:03 abs Exp $
+$NetBSD: patch-ae,v 1.11 2010/01/31 21:06:29 heinz Exp $
---- scripts/exim_install.orig 2006-04-28 11:32:21.000000000 +0100
+--- scripts/exim_install.orig 2009-10-30 16:14:04.000000000 +0100
+++ scripts/exim_install
@@ -84,6 +84,8 @@ if [ "${SYSTEM_ALIASES_FILE}" = "" ] ; t
SYSTEM_ALIASES_FILE=/etc/aliases
@@ -11,7 +11,17 @@ $NetBSD: patch-ae,v 1.10 2009/02/13 15:28:03 abs Exp $
# Allow INST_xx to over-ride xx
case "$INST_BIN_DIRECTORY" in ?*) BIN_DIRECTORY="$INST_BIN_DIRECTORY";; esac
case "$INST_CONFIGURE_FILE" in ?*) CONFIGURE_FILE="$INST_CONFIGURE_FILE";; esac
-@@ -415,15 +417,8 @@ elif [ ! -f ${CONFIGURE_FILE} ]; then
+@@ -220,6 +222,9 @@ while [ $# -gt 0 ]; do
+ if [ $name = exim${EXE} ]; then
+ version=exim-`./exim -bV -C /dev/null | \
+ awk '/Exim version/ { OFS=""; print $3,"-",substr($4,2,length($4)-1) }'`${EXE}
++ # only for pkgsrc: ./exim cannot run during install to DESTDIR because
++ # EXIM_USER may not exist at this time, so we fake the version information
++ version=@PKGSRC_EXIM_VERSION@${EXE}
+
+ if [ "${version}" = "exim-${EXE}" ]; then
+ echo $com ""
+@@ -415,15 +420,8 @@ elif [ ! -f ${CONFIGURE_FILE} ]; then
echo $com "*** Exim installation ${ver}failed ***"
exit 1
fi