Convert exim and exim-user to the bsd.pkg.install.mk framework:

- Introduce EXIM_GROUP and EXIM_USER to tune the details of the group and
  user used by the daemon.
- Honour PKG_SYSCONFDIR.
- Install sample files under the examples directory.
- Automatically install example files under sysconfdir using CONF_FILES.
  This simplifies exim's set up from admin's point of view.
- Use RCD_SCRIPTS to handle the startup script.

As a result, bump PKGREVISION of exim and exim-user.

5 files changed, 44 insertions, 25 deletions

diff --git a/mail/exim/patches/patch-aa b/mail/exim/patches/patch-aa
index d57436817ef..89ee5e014fc 100644
--- a/mail/exim/patches/patch-aa
+++ b/mail/exim/patches/patch-aa
@@ -1,13 +1,31 @@
-$NetBSD: patch-aa,v 1.3 2002/06/19 16:02:27 ad Exp $
+$NetBSD: patch-aa,v 1.4 2003/08/02 17:00:10 jmmv Exp $
 
---- scripts/exim_install.orig	Thu Jun 13 12:06:12 2002
-+++ scripts/exim_install	Thu Jun 13 12:07:28 2002
-@@ -42,6 +42,8 @@
+--- scripts/exim_install.orig	2002-07-22 10:59:47.000000000 +0200
++++ scripts/exim_install
+@@ -42,6 +42,8 @@ INFO_DIRECTORY=`sed -n -e '/^ *INFO_DIRE
  NO_SYMLINK=`sed -n         -e '/^ *NO_SYMLINK *=/{s/^[^=]*= *//; s/ \{1,\}#.*//;s/ *$//;h;}' -e '${g;p;}' Makefile`
  EXE=`sed -n                       -e '/^ *EXE *=/{s/^[^=]*= *//; s/ \{1,\}#.*//;s/ *$//;h;}' -e '${g;p;}' Makefile`
  
-+INST_CONFIGURE_FILE=$CONFIGURE_FILE.example
++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
+@@ -278,15 +280,8 @@ if [ ! -f ${CONFIGURE_FILE} ]; then
+     echo $com "*** Exim installation ${ver}failed ***"
+     exit 1
+   fi
+-  if [ ! -f /etc/aliases ]; then
+-    echo $com '****'
+-    echo $com Installing a dummy /etc/aliases file because you do not have
+-    echo $com one, and the default configuration requires it. You should
+-    echo $com edit /etc/aliases and at least create an alias for postmaster.
+-    echo $com '***'
+-    echo ${CP} ../src/aliases.default /etc/aliases
+-    ${real} ${CP} ../src/aliases.default /etc/aliases
+-  fi
++  echo ${CP} ../src/aliases.default ${PREFIX}/share/examples/exim/aliases
++  ${real} ${CP} ../src/aliases.default ${PREFIX}/share/examples/exim/aliases
+ else
+   echo $com Configuration file ${CONFIGURE_FILE} already exists
+ fi
diff --git a/mail/exim/patches/patch-ab b/mail/exim/patches/patch-ab
index 0b40dc6284d..d3c0154979b 100644
--- a/mail/exim/patches/patch-ab
+++ b/mail/exim/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.7 2003/03/22 12:37:25 jmmv Exp $
+$NetBSD: patch-ab,v 1.8 2003/08/02 17:00:10 jmmv Exp $
 
---- Local/Makefile.netbsd.orig	2003-03-22 13:37:47.000000000 +0100
+--- Local/Makefile.netbsd.orig	2003-07-30 20:51:26.000000000 +0200
 +++ Local/Makefile.netbsd
 @@ -98,7 +98,9 @@
  # /usr/local/sbin. The installation script will try to create this directory,
@@ -18,20 +18,21 @@ $NetBSD: patch-ab,v 1.7 2003/03/22 12:37:25 jmmv Exp $
  # configuration if this file does not exist.
  
 -CONFIGURE_FILE=/usr/exim/configure
-+CONFIGURE_FILE=@PREFIX@/etc/exim/configure
++CONFIGURE_FILE=@PKG_SYSCONFDIR@/configure
  
  
  #------------------------------------------------------------------------------
-@@ -126,7 +128,7 @@ CONFIGURE_FILE=/usr/exim/configure
+@@ -126,7 +128,8 @@ CONFIGURE_FILE=/usr/exim/configure
  # owner of a local mailbox.) Specifying these values as root is very strongly
  # discouraged. These values are compiled into the binary.
  
 -EXIM_USER=
-+EXIM_USER=mail
++EXIM_USER=@EXIM_USER@
++EXIM_GROUP=@EXIM_GROUP@
  
  # If the setting of EXIM_USER is numeric (e.g. EXIM_USER=42), there must
  # also be a setting of EXIM_GROUP. If, on the other hand, you use a name
-@@ -207,7 +209,7 @@ TRANSPORT_SMTP=yes
+@@ -207,7 +210,7 @@ TRANSPORT_SMTP=yes
  # This one is special-purpose, and commonly not required, so it is not
  # included by default.
  
@@ -40,7 +41,7 @@ $NetBSD: patch-ab,v 1.7 2003/03/22 12:37:25 jmmv Exp $
  
  
  #------------------------------------------------------------------------------
-@@ -216,9 +218,9 @@ TRANSPORT_SMTP=yes
+@@ -216,9 +219,9 @@ TRANSPORT_SMTP=yes
  # MBX, is included only when requested. If you do not know what this is about,
  # leave these settings commented out.
  
@@ -53,7 +54,7 @@ $NetBSD: patch-ab,v 1.7 2003/03/22 12:37:25 jmmv Exp $
  
  
  #------------------------------------------------------------------------------
-@@ -281,7 +283,7 @@ LOOKUP_LSEARCH=yes
+@@ -281,7 +284,7 @@ LOOKUP_LSEARCH=yes
  # files are defaulted in the OS/Makefile-Default file, but can be overridden in
  # local OS-specific make files.
  
@@ -62,7 +63,7 @@ $NetBSD: patch-ab,v 1.7 2003/03/22 12:37:25 jmmv Exp $
  
  
  
-@@ -302,9 +304,9 @@ EXIM_MONITOR=eximon.bin
+@@ -302,9 +305,9 @@ EXIM_MONITOR=eximon.bin
  # included in the Exim binary. You will then need to set up the run time
  # configuration to make use of the mechanism(s) selected.
  
@@ -75,7 +76,7 @@ $NetBSD: patch-ab,v 1.7 2003/03/22 12:37:25 jmmv Exp $
  
  
  #------------------------------------------------------------------------------
-@@ -315,8 +317,9 @@ EXIM_MONITOR=eximon.bin
+@@ -315,8 +318,9 @@ EXIM_MONITOR=eximon.bin
  # with TLS support. If you don't know what this is all about, leave these
  # settings commented out.
  
@@ -87,7 +88,7 @@ $NetBSD: patch-ab,v 1.7 2003/03/22 12:37:25 jmmv Exp $
  
  # If you are running Exim as a server, note that just building it with TLS
  # support is not all you need to do. You also need to set up a suitable
-@@ -371,7 +374,7 @@ EXIM_MONITOR=eximon.bin
+@@ -371,7 +375,7 @@ EXIM_MONITOR=eximon.bin
  # %s. This will be replaced by one of the strings "main", "panic", or "reject"
  # to form the final file names. Some installations may want something like this:
  
@@ -96,7 +97,7 @@ $NetBSD: patch-ab,v 1.7 2003/03/22 12:37:25 jmmv Exp $
  
  # which results in files with names /var/log/exim_mainlog, etc. The directory
  # in which the log files are placed must exist; Exim does not try to create
-@@ -467,14 +470,14 @@ ZCAT_COMMAND=/usr/bin/zcat
+@@ -467,14 +471,14 @@ ZCAT_COMMAND=/usr/bin/zcat
  # this setting. See the manual section entitled "Use of tcpwrappers" in the
  # chapter on building and installing Exim.
  
@@ -113,7 +114,7 @@ $NetBSD: patch-ab,v 1.7 2003/03/22 12:37:25 jmmv Exp $
  
  # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM
  # as well.
-@@ -511,11 +514,11 @@ ZCAT_COMMAND=/usr/bin/zcat
+@@ -511,11 +515,11 @@ ZCAT_COMMAND=/usr/bin/zcat
  # haven't got Perl, Exim will still build and run; you just won't be able to
  # use those utilities.
  
@@ -130,7 +131,7 @@ $NetBSD: patch-ab,v 1.7 2003/03/22 12:37:25 jmmv Exp $
  
  
  #------------------------------------------------------------------------------
-@@ -695,7 +698,7 @@ ZCAT_COMMAND=/usr/bin/zcat
+@@ -695,7 +699,7 @@ ZCAT_COMMAND=/usr/bin/zcat
  # (process id) to a file so that it can easily be identified. The path of the
  # file can be specified here. Some installations may want something like this:
  
diff --git a/mail/exim/patches/patch-ac b/mail/exim/patches/patch-ac
index 4658df43820..bb710d89f53 100644
--- a/mail/exim/patches/patch-ac
+++ b/mail/exim/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.4 2002/06/19 16:02:27 ad Exp $
+$NetBSD: patch-ac,v 1.5 2003/08/02 17:00:10 jmmv Exp $
 
 --- OS/Makefile-NetBSD-a.out.orig	Thu Apr 18 08:08:28 2002
 +++ OS/Makefile-NetBSD-a.out	Thu Jun 13 12:37:38 2002
@@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.4 2002/06/19 16:02:27 ad Exp $
  
  CHOWN_COMMAND=/usr/sbin/chown
 -CFLAGS=-O
-+CFLAGS=-O2 -pipe
++CFLAGS+=-O2 -pipe
  
  HAVE_SA_LEN=YES
 +HAVE_IPV6=YES
diff --git a/mail/exim/patches/patch-ad b/mail/exim/patches/patch-ad
index 94c9996fcd5..60200fb4fdc 100644
--- a/mail/exim/patches/patch-ad
+++ b/mail/exim/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.3 2002/12/09 11:38:05 ad Exp $
+$NetBSD: patch-ad,v 1.4 2003/08/02 17:00:10 jmmv Exp $
 
 --- OS/Makefile-NetBSD~	Mon Jul 22 09:59:45 2002
 +++ OS/Makefile-NetBSD	Mon Dec  9 11:22:09 2002
@@ -8,7 +8,7 @@ $NetBSD: patch-ad,v 1.3 2002/12/09 11:38:05 ad Exp $
  
 -# Include Makfile.NetBSD-a.out
 +CHOWN_COMMAND=/usr/sbin/chown
-+CFLAGS=-O2 -pipe
++CFLAGS+=-O2 -pipe
  
 -.if exists(OS/Makefile-NetBSD-a.out)
 -.include "OS/Makefile-NetBSD-a.out"
diff --git a/mail/exim/patches/patch-ae b/mail/exim/patches/patch-ae
index 02b67c51ae6..c40e513d54f 100644
--- a/mail/exim/patches/patch-ae
+++ b/mail/exim/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.3 2002/12/09 11:38:06 ad Exp $
+$NetBSD: patch-ae,v 1.4 2003/08/02 17:00:10 jmmv Exp $
 
 --- src/configure.default.orig	Thu Jun 13 11:37:52 2002
 +++ src/configure.default	Thu Jun 13 11:38:06 2002
@@ -7,7 +7,7 @@ $NetBSD: patch-ae,v 1.3 2002/12/09 11:38:06 ad Exp $
    allow_fail
    allow_defer
 -  data = ${lookup{$local_part}lsearch{/etc/aliases}}
-+  data = ${lookup{$local_part}dbm{/etc/mail/aliases.db}}
++  data = ${lookup{$local_part}lsearch{@PKG_SYSCONFDIR@/aliases}}
  # user = exim
    file_transport = address_file
    pipe_transport = address_pipe