diff options
| author | heinz <heinz@pkgsrc.org> | 2010-01-31 21:06:29 +0000 |
|---|---|---|
| committer | heinz <heinz@pkgsrc.org> | 2010-01-31 21:06:29 +0000 |
| commit | 1419c39a25fefb7460930b542215fd18267aa1b0 (patch) | |
| tree | 1ca2ea50984389d71cf4f6fcf0f1f228ede78d22 /mail/exim/patches | |
| parent | 7730759e7edf8adcab18f37dc659199a34be62dc (diff) | |
| download | pkgsrc-1419c39a25fefb7460930b542215fd18267aa1b0.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/patches')
| -rw-r--r-- | mail/exim/patches/patch-ae | 16 |
1 files changed, 13 insertions, 3 deletions
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 |