 @@ -1,38 +1,40 @@
-# $NetBSD: Makefile,v 1.94 2009/01/12 18:59:24 abs Exp $
+# $NetBSD: Makefile,v 1.95 2009/02/13 15:28:03 abs Exp $
 DISTNAME=	exim-4.69
 PKGREVISION=	4
 CATEGORIES=	mail net
 MASTER_SITES=	ftp://ftp.exim.org/pub/exim/exim4/ \
 		ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
 		ftp://ftp.esat.net/pub/networking/mail/mta/exim/exim4/
 EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	abs@NetBSD.org
 HOMEPAGE=	http://www.exim.org/
 COMMENT=	The Exim mail transfer agent, a replacement for sendmail
 CONFLICTS+=	exim-exiscan-[0-9]*
 USE_TOOLS+=	perl:run
 INSTALLATION_DIRS+=	${PKGMANDIR}/man8
 BUILD_DEFS+=	VARBASE
 MAKE_ENV+=	SSLBASE=${SSLBASE:Q}
 MAKE_ENV+=	INST_CHOWN=${CHOWN:Q}
 MAKE_FLAGS+=	FULLECHO=''
 MAKE_JOBS_SAFE=	no
 PKG_DESTDIR_SUPPORT =	destdir
 .include "../../mk/bsd.prefs.mk"
 BUILD_DEFS+=	EXIM_DB EXIM_MAX_INCLUDE_SIZE
 PKG_GROUPS=	${EXIM_GROUP}
 PKG_USERS=	${EXIM_USER}:${EXIM_GROUP}
 PKG_GROUPS_VARS+=	EXIM_GROUP
 PKG_USERS_VARS+=	EXIM_USER
 PKG_GECOS.${EXIM_USER}=	Exim mail server user
 PKG_HOME.${EXIM_USER}=	${VARBASE}/mail
 PKG_SHELL.${EXIM_USER}=	${NOLOGIN}
 @@ -96,20 +98,21 @@ pre-configure:
 	    < ${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}:' \
 	    ${FILESDIR}/mailer.conf.exim \
 	    > ${WRKDIR}/mailer.conf
 INSTALLATION_DIRS =	${PKGMANDIR}/man8 sbin share/examples/exim
 post-install:
-	${INSTALL_DATA_DIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKDIR}/mailer.conf ${DESTDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKDIR}/mailer.conf ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/exim.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/exim.8
 	${INSTALL_DATA} ${WRKSRC}/doc/exim.8 ${PREFIX}/${PKGMANDIR}/man8/exim.8
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.40 2009/01/12 18:59:24 abs Exp $
+$NetBSD: distinfo,v 1.41 2009/02/13 15:28:03 abs Exp $
 SHA1 (exim-4.69.tar.bz2) = 321e238b6e6b32498110511ce72a911538305a39
 RMD160 (exim-4.69.tar.bz2) = ae97c807c63f858ba4a0ab402677225da9337d05
 Size (exim-4.69.tar.bz2) = 1658939 bytes
 SHA1 (patch-aa) = 93dca43408fb837deb95d2b22502c64559780f7c
 SHA1 (patch-ab) = 1c6e7882346974390c22e7b9e09a76c5ed670d1d
 SHA1 (patch-ac) = de96032a9cf5450101cc73d615d374ddf6817fee
 SHA1 (patch-ad) = 804ab58f454f7e100c117f2cec9cf478375c1752
-SHA1 (patch-ae) = 6cb0f00d159de7c342a55b09fb87ab533c5670bf
+SHA1 (patch-ae) = 33573e3d02edbca0c44ed54d1aadd2db50fa1fe6
 SHA1 (patch-ag) = 8512795060ad913f4699c277867fd24e7a785519

 @@ -1,31 +1,31 @@
-$NetBSD: patch-ae,v 1.9 2006/08/08 15:24:01 abs Exp $
+$NetBSD: patch-ae,v 1.10 2009/02/13 15:28:03 abs Exp $
 --- scripts/exim_install.orig	2006-04-28 11:32:21.000000000 +0100
 +++ scripts/exim_install
 @@ -84,6 +84,8 @@ if [ "${SYSTEM_ALIASES_FILE}" = "" ] ; t
    SYSTEM_ALIASES_FILE=/etc/aliases
  fi
 +INST_CONFIGURE_FILE=${PREFIX}/share/examples/exim/configure
++
  # 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
      echo $com "*** Exim installation ${ver}failed ***"
      exit 1
    fi
 -  if [ ! -f ${SYSTEM_ALIASES_FILE} ]; then
 -    echo $com '****'
 -    echo $com Installing a dummy ${SYSTEM_ALIASES_FILE} file because you do not have
 -    echo $com one, and the default configuration requires it. You should
 -    echo $com edit ${SYSTEM_ALIASES_FILE} and at least create an alias for postmaster.
 -    echo $com '***'
 -    echo ${CP} ../src/aliases.default ${SYSTEM_ALIASES_FILE}
 -    ${real} ${CP} ../src/aliases.default ${SYSTEM_ALIASES_FILE}
 -  fi
-+  echo ${CP} ../src/aliases.default ${PREFIX}/share/examples/exim/aliases
++  echo ${CP} ../src/aliases.default ${DESTDIR}${PREFIX}/share/examples/exim/aliases
-+  ${real} ${CP} ../src/aliases.default ${PREFIX}/share/examples/exim/aliases
++  ${real} ${CP} ../src/aliases.default ${DESTDIR}${PREFIX}/share/examples/exim/aliases
  else
    echo $com Configuration file ${CONFIGURE_FILE} already exists