- Move all "share" files to share/examples/postfix; all of them are used

  as samples, either by the user or by bsd.pkg.install.mk.
- Correctly handle configuration files, that is, avoid touching the conf
  directory directly.
- Use OWN_DIRS to handle the spool directory.
- Run post-install through an INSTALL script.
- Sort PLIST after all these changes.
- Bump PKGREVISION to 1.

2 files changed, 21 insertions, 7 deletions

diff --git a/mail/postfix/patches/patch-aa b/mail/postfix/patches/patch-aa
index 521294995c7..12d3025fdbd 100644
--- a/mail/postfix/patches/patch-aa
+++ b/mail/postfix/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.12 2003/04/17 06:22:18 martti Exp $
+$NetBSD: patch-aa,v 1.13 2003/05/01 14:07:58 jmmv Exp $
 
---- postfix-install.orig	2003-03-21 21:04:53.000000000 +0200
-+++ postfix-install	2003-04-17 08:53:23.000000000 +0300
-@@ -338,33 +338,13 @@
+--- postfix-install.orig	2003-03-21 20:04:53.000000000 +0100
++++ postfix-install
+@@ -338,33 +338,13 @@ README files. Specify \"no\" if you do n
  : ${tempdir=`pwd`}
  : ${config_directory=`bin/postconf -h -d config_directory`}
  
@@ -37,3 +37,17 @@ $NetBSD: patch-aa,v 1.12 2003/04/17 06:22:18 martti Exp $
  
  # If a parameter is not set via the command line or environment,
  # try to use settings from installed configuration files.
+@@ -652,13 +632,3 @@ bin/postconf -c $CONFIG_DIRECTORY -e \
+     "sample_directory = $sample_directory" \
+     "readme_directory = $readme_directory" \
+ || exit 1
+-
+-# If Postfix is being installed locally from source code, do the
+-# post-install processing now.
+-
+-test -n "$install_root" || {
+-    export daemon_directory command_directory queue_directory sendmail_path \
+-	newaliases_path mailq_path mail_owner setgid_group manpage_directory \
+-	sample_directory readme_directory
+-    ${SHELL} conf/post-install $post_install_options || exit 1
+-}
diff --git a/mail/postfix/patches/patch-af b/mail/postfix/patches/patch-af
index 1807d028cf5..56496b57efa 100644
--- a/mail/postfix/patches/patch-af
+++ b/mail/postfix/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.16 2003/02/21 11:49:57 martti Exp $
+$NetBSD: patch-af,v 1.17 2003/05/01 14:07:58 jmmv Exp $
 
 --- conf/main.cf.orig	2003-02-20 16:44:47.000000000 +0200
 +++ conf/main.cf	2003-02-21 13:27:20.000000000 +0200
@@ -18,7 +18,7 @@ $NetBSD: patch-af,v 1.16 2003/02/21 11:49:57 martti Exp $
 +
 +# Shared files and etc directory
 +etc_directory = __PKG_SYSCONFDIR
-+share_directory = __PREFIX/share/postfix
++share_directory = __PREFIX/share/examples/postfix
 +man_directory = __PREFIX/man
  
  # QUEUE AND PROCESS OWNERSHIP
@@ -47,7 +47,7 @@ $NetBSD: patch-af,v 1.16 2003/02/21 11:49:57 martti Exp $
  # sample_directory: The location of the Postfix sample configuration files.
  #
 -sample_directory =
-+sample_directory = __PREFIX/share/postfix
++sample_directory = __PREFIX/share/examples/postfix
  
  # readme_directory: The location of the Postfix README files.
  #