diff options
| author | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2003-01-02 15:50:43 +0000 |
|---|---|---|
| committer | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2003-01-02 15:50:43 +0000 |
| commit | d9c1c83acd648cf463ac06318fcfb6a208f74347 (patch) | |
| tree | 60b6d1879dc35ba3148bba10aa9179e924a34cba | |
| parent | Update to 1.0.b2.1 (diff) | |
upgrade to 1.1.12
PR: 45802
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=72216
638 files changed, 462 insertions, 11814 deletions
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index 6b47f15e39d2..6adf63b1ee81 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -12,7 +12,7 @@ # the options are the same names as in the scripts/configure.postfix file PORTNAME= postfix -PORTVERSION= 1.1.11 +PORTVERSION= 1.1.12 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -28,6 +28,7 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= khera@kciLink.com USE_SUBMAKE= yes +USE_REINPLACE= yes MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \ postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \ @@ -40,6 +41,10 @@ MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \ master.8 nqmgr.8 pickup.8 pipe.8 qmgr.8 qmqpd.8 showq.8 smtp.8 \ smtpd.8 spawn.8 trivial-rewrite.8 virtual.8 +# TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to +# patch it. +MAN8base=$(MAN8:S/tlsmgr.8//) + CONF1= main.cf master.cf access aliases canonical pcre_table regexp_table \ relocated transport virtual @@ -66,6 +71,27 @@ post-patch: CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ ${ECHO} "all: default" >> Makefile) +pre-patch: +.for file in ${MAN1} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/man/man1/${file} ${WRKSRC}/html/${file}.html +.endfor +.for file in ${MAN5} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/man/man5/${file} ${WRKSRC}/html/${file}.html +.endfor +.for file in ${MAN8base} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/man/man8/${file} ${WRKSRC}/html/${file}.html +.endfor +.for file in faq rate rewrite uce + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/html/${file}.html +.endfor +.for file in ${CONF1} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" ${WRKSRC}/conf/${file} +.endfor + pre-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo index 379358ed4749..832388cccb96 100644 --- a/mail/postfix/distinfo +++ b/mail/postfix/distinfo @@ -1,4 +1,4 @@ -MD5 (postfix/postfix-1.1.11.tar.gz) = b34bb2b5018327c19456a77814141208 +MD5 (postfix/postfix-1.1.12.tar.gz) = d1d0f9792ec6ea063ccca59184e54212 MD5 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz) = 11d82e9a3482f64af9d228f7a4319566 -MD5 (postfix/postfix-1.1.11+ipv6.patch.gz) = dc2a6362518025583a17305607eb8f0e +MD5 (postfix/postfix-1.1.12+ipv6.patch.gz) = add4396ce50ca61b5d9b67454fb51258 MD5 (postfix/postfix-pg.postfix-1.1.8.patch) = e0f4d910a6d6648d9b48e2244f2764ba diff --git a/mail/postfix/files/patch-aa b/mail/postfix/files/patch-aa deleted file mode 100644 index 51b40396bd5e..000000000000 --- a/mail/postfix/files/patch-aa +++ /dev/null @@ -1,86 +0,0 @@ -*** ./conf/main.cf.orig Fri Jan 4 13:09:04 2002 ---- ./conf/main.cf Tue Jan 8 22:41:50 2002 -*************** -*** 31,44 **** - # The command_directory parameter specifies the location of all - # postXXX commands. The default value is $program_directory. - # -! command_directory = /usr/sbin - - # The daemon_directory parameter specifies the location of all Postfix - # daemon programs (i.e. programs listed in the master.cf file). The - # default value is $program_directory. This directory must be owned - # by root. - # -! daemon_directory = /usr/libexec/postfix - - # QUEUE AND PROCESS OWNERSHIP - # ---- 31,44 ---- - # The command_directory parameter specifies the location of all - # postXXX commands. The default value is $program_directory. - # -! command_directory = !!PREFIX!!/sbin - - # The daemon_directory parameter specifies the location of all Postfix - # daemon programs (i.e. programs listed in the master.cf file). The - # default value is $program_directory. This directory must be owned - # by root. - # -! daemon_directory = !!PREFIX!!/libexec/postfix - - # QUEUE AND PROCESS OWNERSHIP - # -*************** -*** 325,332 **** - # - # The home_mailbox parameter specifies the optional pathname of a - # mailbox file relative to a user's home directory. The default -! # mailbox file is /var/spool/mail/user or /var/mail/user. Specify -! # "Maildir/" for qmail-style delivery (the / is required). - # - #home_mailbox = Mailbox - #home_mailbox = Maildir/ ---- 325,332 ---- - # - # The home_mailbox parameter specifies the optional pathname of a - # mailbox file relative to a user's home directory. The default -! # mailbox file is /var/mail/user. Specify "Maildir/" for -! # qmail-style delivery (the / is required). - # - #home_mailbox = Mailbox - #home_mailbox = Maildir/ -*************** -*** 424,430 **** - # - # See also the body_checks example in the sample-filter.cf file. - # -! #header_checks = regexp:/etc/postfix/header_checks - - # FAST ETRN SERVICE - # ---- 424,430 ---- - # - # See also the body_checks example in the sample-filter.cf file. - # -! #header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks - - # FAST ETRN SERVICE - # -*************** -*** 525,531 **** - # commands. This must be a group name with a numerical group ID that - # is not shared with other accounts, not even with the Postfix account. - # -! setgid_group = - - # manpage_path: The location of the Postfix on-line manual pages. - # ---- 525,531 ---- - # commands. This must be a group name with a numerical group ID that - # is not shared with other accounts, not even with the Postfix account. - # -! setgid_group = maildrop - - # manpage_path: The location of the Postfix on-line manual pages. - # diff --git a/mail/postfix/files/patch-ab b/mail/postfix/files/patch-ab deleted file mode 100644 index 7c81d3dc12c9..000000000000 --- a/mail/postfix/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/canonical.orig Tue Mar 7 10:42:58 2000 ---- ./conf/canonical Thu Jun 1 21:53:23 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/canonical - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/canonical - # diff --git a/mail/postfix/files/patch-ac b/mail/postfix/files/patch-ac deleted file mode 100644 index 0fb2192cdd84..000000000000 --- a/mail/postfix/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/access.orig Tue Mar 7 10:42:58 2000 ---- ./conf/access Thu Jun 1 21:53:36 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/access - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/access - # diff --git a/mail/postfix/files/patch-ad b/mail/postfix/files/patch-ad deleted file mode 100644 index c1b102574165..000000000000 --- a/mail/postfix/files/patch-ad +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/pcre_table.orig Thu Mar 9 20:36:19 2000 ---- ./conf/pcre_table Thu Jun 1 22:02:08 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # pcre:/etc/postfix/filename - # ---- 7,9 ---- - # SYNOPSIS -! # pcre:!!PREFIX!!/etc/postfix/filename - # diff --git a/mail/postfix/files/patch-ae b/mail/postfix/files/patch-ae deleted file mode 100644 index e396dd8626db..000000000000 --- a/mail/postfix/files/patch-ae +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/regexp_table.orig Thu Mar 9 20:36:19 2000 ---- ./conf/regexp_table Thu Jun 1 22:03:27 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # regexp:/etc/postfix/filename - # ---- 7,9 ---- - # SYNOPSIS -! # regexp:!!PREFIX!!/etc/postfix/filename - # diff --git a/mail/postfix/files/patch-af b/mail/postfix/files/patch-af deleted file mode 100644 index 8fca6b208941..000000000000 --- a/mail/postfix/files/patch-af +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/relocated.orig Tue Mar 7 10:42:58 2000 ---- ./conf/relocated Thu Jun 1 22:03:59 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/relocated - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/relocated - # diff --git a/mail/postfix/files/patch-ag b/mail/postfix/files/patch-ag deleted file mode 100644 index 54c0fa918d3b..000000000000 --- a/mail/postfix/files/patch-ag +++ /dev/null @@ -1,15 +0,0 @@ -*** ./conf/sample-auth.cf.orig Sun May 28 17:55:19 2000 ---- ./conf/sample-auth.cf Thu Jun 1 22:05:32 2000 -*************** -*** 91,95 **** - # The Postfix SMTP client opens the lookup table before going to -! # chroot jail, so you can leave the password file in /etc/postfix. - # -! smtp_sasl_password_maps = hash:/etc/postfix/saslpass - ---- 91,95 ---- - # The Postfix SMTP client opens the lookup table before going to -! # chroot jail, so you can leave the password file in !!PREFIX!!/etc/postfix. - # -! smtp_sasl_password_maps = hash:!!PREFIX!!/etc/postfix/saslpass - diff --git a/mail/postfix/files/patch-ah b/mail/postfix/files/patch-ah deleted file mode 100644 index a8c70a15a78d..000000000000 --- a/mail/postfix/files/patch-ah +++ /dev/null @@ -1,44 +0,0 @@ -*** ./conf/sample-canonical.cf.orig Thu Sep 23 14:10:38 1999 ---- ./conf/sample-canonical.cf Thu Jun 1 22:07:23 2000 -*************** -*** 14,16 **** - # -! # If you use this feature, run "postmap /etc/postfix/canonical" to - # build the necessary DBM or DB file after every change. The changes ---- 14,16 ---- - # -! # If you use this feature, run "postmap !!PREFIX!!/etc/postfix/canonical" to - # build the necessary DBM or DB file after every change. The changes -*************** -*** 19,24 **** - # -! #canonical_maps = dbm:/etc/postfix/canonical -! #canonical_maps = hash:/etc/postfix/canonical -! #canonical_maps = hash:/etc/postfix/canonical, nis:canonical -! #canonical_maps = hash:/etc/postfix/canonical, netinfo:/canonical - canonical_maps = ---- 19,24 ---- - # -! #canonical_maps = dbm:!!PREFIX!!/etc/postfix/canonical -! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical -! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical, nis:canonical -! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical, netinfo:/canonical - canonical_maps = -*************** -*** 32,34 **** - # -! #recipient_canonical_maps = hash:/etc/postfix/recipient_canonical - recipient_canonical_maps = ---- 32,34 ---- - # -! #recipient_canonical_maps = hash:!!PREFIX!!/etc/postfix/recipient_canonical - recipient_canonical_maps = -*************** -*** 46,48 **** - # -! #sender_canonical_maps = hash:/etc/postfix/sender_canonical - sender_canonical_maps = ---- 46,48 ---- - # -! #sender_canonical_maps = hash:!!PREFIX!!/etc/postfix/sender_canonical - sender_canonical_maps = diff --git a/mail/postfix/files/patch-ai b/mail/postfix/files/patch-ai deleted file mode 100644 index f7aa2fd5f4c6..000000000000 --- a/mail/postfix/files/patch-ai +++ /dev/null @@ -1,18 +0,0 @@ -*** ./conf/sample-filter.cf.orig Mon May 29 11:30:44 2000 ---- ./conf/sample-filter.cf Thu Jun 1 22:07:58 2000 -*************** -*** 15,17 **** - # -! header_checks = regexp:/etc/postfix/header_checks - ---- 15,17 ---- - # -! header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks - -*************** -*** 26,27 **** - # -! body_checks = regexp:/etc/postfix/body_checks ---- 26,27 ---- - # -! body_checks = regexp:!!PREFIX!!/etc/postfix/body_checks diff --git a/mail/postfix/files/patch-aj b/mail/postfix/files/patch-aj deleted file mode 100644 index 241d48132551..000000000000 --- a/mail/postfix/files/patch-aj +++ /dev/null @@ -1,24 +0,0 @@ -*** ./conf/sample-misc.cf.orig Thu Sep 23 14:10:52 1999 ---- ./conf/sample-misc.cf Thu Jun 1 22:09:39 2000 -*************** -*** 220,222 **** - # -! program_directory = /usr/libexec/postfix - ---- 220,222 ---- - # -! program_directory = !!PREFIX!!/libexec/postfix - -*************** -*** 263,267 **** - # Specify the types and names of databases to use. After change, -! # run "postmap /etc/postfix/relocated", then "postfix reload". - # -! #relocated_maps = hash:/etc/postfix/relocated - relocated_maps = ---- 263,267 ---- - # Specify the types and names of databases to use. After change, -! # run "postmap !!PREFIX!!/etc/postfix/relocated", then "postfix reload". - # -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated - relocated_maps = diff --git a/mail/postfix/files/patch-ak b/mail/postfix/files/patch-ak deleted file mode 100644 index 250dd411a4bd..000000000000 --- a/mail/postfix/files/patch-ak +++ /dev/null @@ -1,26 +0,0 @@ -*** ./conf/sample-relocated.cf.orig Thu Sep 23 14:11:17 1999 ---- ./conf/sample-relocated.cf Thu Jun 1 22:10:43 2000 -*************** -*** 12,14 **** - # -! # If you use this feature, run "postmap /etc/postfix/relocated" to - # build the necessary DBM or DB file after change, then "postfix ---- 12,14 ---- - # -! # If you use this feature, run "postmap !!PREFIX!!/etc/postfix/relocated" to - # build the necessary DBM or DB file after change, then "postfix -*************** -*** 16,21 **** - # -! #relocated_maps = dbm:/etc/postfix/relocated -! #relocated_maps = hash:/etc/postfix/relocated -! #relocated_maps = hash:/etc/postfix/relocated, nis:virtual -! #relocated_maps = hash:/etc/postfix/relocated, netinfo:/relocated - relocated_maps = ---- 16,21 ---- - # -! #relocated_maps = dbm:!!PREFIX!!/etc/postfix/relocated -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated, nis:virtual -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated, netinfo:/relocated - relocated_maps = diff --git a/mail/postfix/files/patch-al b/mail/postfix/files/patch-al deleted file mode 100644 index 799206da0c96..000000000000 --- a/mail/postfix/files/patch-al +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/sample-smtpd.cf.orig Mon Dec 27 19:41:37 1999 ---- ./conf/sample-smtpd.cf Thu Jun 1 22:11:22 2000 -*************** -*** 183,185 **** - #smtpd_sender_restrictions = reject_unknown_sender_domain -! #smtpd_sender_restrictions = reject_unknown_sender_domain, hash:/etc/postfix/access - smtpd_sender_restrictions = ---- 183,185 ---- - #smtpd_sender_restrictions = reject_unknown_sender_domain -! #smtpd_sender_restrictions = reject_unknown_sender_domain, hash:!!PREFIX!!/etc/postfix/access - smtpd_sender_restrictions = diff --git a/mail/postfix/files/patch-am b/mail/postfix/files/patch-am deleted file mode 100644 index 2d395fa9ca03..000000000000 --- a/mail/postfix/files/patch-am +++ /dev/null @@ -1,23 +0,0 @@ -*** ./conf/sample-transport.cf.orig Thu Dec 23 10:50:00 1999 ---- ./conf/sample-transport.cf Thu Jun 1 22:13:09 2000 -*************** -*** 10,18 **** - # By default, this feature is disabled. Specify the types of databases -! # to use. If you use this feature, run "postmap /etc/postfix/transport" - # after change, then "postfix reload". - # -! #transport_maps = dbm:/etc/postfix/transport -! #transport_maps = hash:/etc/postfix/transport -! #transport_maps = hash:/etc/postfix/transport, nis:transport -! #transport_maps = hash:/etc/postfix/transport, netinfo:/transport - transport_maps = ---- 10,18 ---- - # By default, this feature is disabled. Specify the types of databases -! # to use. If you use this feature, run "postmap !!PREFIX!!/etc/postfix/transport" - # after change, then "postfix reload". - # -! #transport_maps = dbm:!!PREFIX!!/etc/postfix/transport -! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport -! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport, nis:transport -! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport, netinfo:/transport - transport_maps = diff --git a/mail/postfix/files/patch-an b/mail/postfix/files/patch-an deleted file mode 100644 index af5ac7cc031b..000000000000 --- a/mail/postfix/files/patch-an +++ /dev/null @@ -1,26 +0,0 @@ -*** ./conf/sample-virtual.cf.orig Mon Dec 20 21:00:42 1999 ---- ./conf/sample-virtual.cf Thu Jun 1 22:13:32 2000 -*************** -*** 12,14 **** - # -! # If you use this feature, run "postmap /etc/postfix/virtual" to - # build the necessary DBM or DB file after change. ---- 12,14 ---- - # -! # If you use this feature, run "postmap !!PREFIX!!/etc/postfix/virtual" to - # build the necessary DBM or DB file after change. -*************** -*** 18,23 **** - # -! #virtual_maps = dbm:/etc/postfix/virtual -! #virtual_maps = hash:/etc/postfix/virtual -! #virtual_maps = hash:/etc/postfix/virtual, nis:virtual -! #virtual_maps = hash:/etc/postfix/virtual, netinfo:/virtual - virtual_maps = ---- 18,23 ---- - # -! #virtual_maps = dbm:!!PREFIX!!/etc/postfix/virtual -! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual -! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual, nis:virtual -! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual, netinfo:/virtual - virtual_maps = diff --git a/mail/postfix/files/patch-ao b/mail/postfix/files/patch-ao deleted file mode 100644 index fd854e181601..000000000000 --- a/mail/postfix/files/patch-ao +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/transport.orig Tue Mar 7 10:42:58 2000 ---- ./conf/transport Thu Jun 1 22:13:41 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/transport - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/transport - # diff --git a/mail/postfix/files/patch-ap b/mail/postfix/files/patch-ap deleted file mode 100644 index 4598192cd5c1..000000000000 --- a/mail/postfix/files/patch-ap +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/virtual.orig Tue Mar 7 10:42:59 2000 ---- ./conf/virtual Thu Jun 1 22:13:54 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/virtual - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/virtual - # diff --git a/mail/postfix/files/patch-ba b/mail/postfix/files/patch-ba deleted file mode 100644 index ccb54ec60a7a..000000000000 --- a/mail/postfix/files/patch-ba +++ /dev/null @@ -1,20 +0,0 @@ -*** ./html/mailq.1.html.orig Sat Apr 22 20:28:36 2000 ---- ./html/mailq.1.html Thu Jun 1 22:19:24 2000 -*************** -*** 83,85 **** - The path name of the <b>sendmail.cf</b> file. Postfix con- -! figuration files are kept in <b>/etc/postfix</b>. - ---- 83,85 ---- - The path name of the <b>sendmail.cf</b> file. Postfix con- -! figuration files are kept in <b>!!PREFIX!!/etc/postfix</b>. - -*************** -*** 231,233 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - ---- 231,233 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - diff --git a/mail/postfix/files/patch-bb b/mail/postfix/files/patch-bb deleted file mode 100644 index ea744664dfa7..000000000000 --- a/mail/postfix/files/patch-bb +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/access.5.html.orig Tue Nov 21 21:24:13 2000 -+++ ./html/access.5.html Tue Nov 21 21:24:34 2000 -@@ -9,7 +9,7 @@ - access - format of Postfix access table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/access</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b> - - <b>DESCRIPTION</b> - The optional <b>access</b> table directs the Postfix SMTP server -@@ -21,7 +21,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/access</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b> in order to rebuild the - indexed file after changing the access table. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix/files/patch-bc b/mail/postfix/files/patch-bc deleted file mode 100644 index e407a9650585..000000000000 --- a/mail/postfix/files/patch-bc +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/canonical.5.html.orig Tue Nov 21 21:32:38 2000 -+++ ./html/canonical.5.html Tue Nov 21 21:33:21 2000 -@@ -9,7 +9,7 @@ - canonical - format of Postfix canonical table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/canonical</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b> - - <b>DESCRIPTION</b> - The optional <b>canonical</b> table specifies an address mapping -@@ -20,7 +20,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/canonical</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b> in order to rebuild the - indexed file after changing the text file. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix/files/patch-be b/mail/postfix/files/patch-be deleted file mode 100644 index bef6a3bfaf73..000000000000 --- a/mail/postfix/files/patch-be +++ /dev/null @@ -1,10 +0,0 @@ ---- ./html/faq.html.orig Sat Oct 28 23:34:51 2000 -+++ ./html/faq.html Sat Oct 28 23:36:04 2000 -@@ -2572,7 +2572,7 @@ - - Answer: instead of using <b>/usr/include/ndbm.h</b>, you're building - Postfix with some incompatible third-party file, typically --<b>/usr/local/include/ndbm.h</b>. -+<b>!!PREFIX!!/include/ndbm.h</b>. - - <p> diff --git a/mail/postfix/files/patch-bf b/mail/postfix/files/patch-bf deleted file mode 100644 index d652e1e567b3..000000000000 --- a/mail/postfix/files/patch-bf +++ /dev/null @@ -1,13 +0,0 @@ -*** ./html/cleanup.8.html.orig Sun May 28 21:58:41 2000 ---- ./html/cleanup.8.html Thu Jun 1 22:29:04 2000 -*************** -*** 174,177 **** - <b>FILES</b> -! /etc/postfix/canonical*, canonical mapping table -! /etc/postfix/virtual*, virtual mapping table - ---- 174,177 ---- - <b>FILES</b> -! !!PREFIX!!/etc/postfix/canonical*, canonical mapping table -! !!PREFIX!!/etc/postfix/virtual*, virtual mapping table - diff --git a/mail/postfix/files/patch-bg b/mail/postfix/files/patch-bg deleted file mode 100644 index ce2454eaef01..000000000000 --- a/mail/postfix/files/patch-bg +++ /dev/null @@ -1,13 +0,0 @@ -*** ./html/master.8.html.orig Tue Mar 7 10:48:56 2000 ---- ./html/master.8.html Thu Jun 1 22:29:24 2000 -*************** -*** 148,151 **** - <b>FILES</b> -! /etc/postfix/main.cf: global configuration file. -! /etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. ---- 148,151 ---- - <b>FILES</b> -! !!PREFIX!!/etc/postfix/main.cf: global configuration file. -! !!PREFIX!!/etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. diff --git a/mail/postfix/files/patch-bh b/mail/postfix/files/patch-bh deleted file mode 100644 index a20232e6796a..000000000000 --- a/mail/postfix/files/patch-bh +++ /dev/null @@ -1,11 +0,0 @@ -*** ./html/goals.html.orig Sun May 9 15:44:18 1999 ---- ./html/goals.html Thu Jun 1 22:30:14 2000 -*************** -*** 45,47 **** - <li>Compatibility. Postfix is designed to be sendmail-compatible -! to make migration easy. Postfix supports <b>/var[/spool]/mail</b>, - <b>/etc/aliases</b>, <b>NIS</b>, and <b>~/.forward</b> files. ---- 45,47 ---- - <li>Compatibility. Postfix is designed to be sendmail-compatible -! to make migration easy. Postfix supports <b>/var/mail</b>, - <b>/etc/aliases</b>, <b>NIS</b>, and <b>~/.forward</b> files. diff --git a/mail/postfix/files/patch-bi b/mail/postfix/files/patch-bi deleted file mode 100644 index 7e4acdb0c126..000000000000 --- a/mail/postfix/files/patch-bi +++ /dev/null @@ -1,11 +0,0 @@ -*** ./html/postdrop.1.html.orig Mon May 3 15:05:12 1999 ---- ./html/postdrop.1.html Thu Jun 1 22:30:47 2000 -*************** -*** 48,50 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - ---- 48,50 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - diff --git a/mail/postfix/files/patch-bj b/mail/postfix/files/patch-bj deleted file mode 100644 index 00e78d01ba5a..000000000000 --- a/mail/postfix/files/patch-bj +++ /dev/null @@ -1,42 +0,0 @@ -*** ./html/uce.html.orig Fri Dec 31 15:06:07 1999 ---- ./html/uce.html Thu Jun 1 22:31:37 2000 -*************** -*** 126,130 **** - -! <dd> <b>header_checks = regexp:/etc/postfix/header_checks</b> - -! <dd> <b>header_checks = pcre:/etc/postfix/header_checks</b> - ---- 126,130 ---- - -! <dd> <b>header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks</b> - -! <dd> <b>header_checks = pcre:!!PREFIX!!/etc/postfix/header_checks</b> - -*************** -*** 169,171 **** - -! <dd> <b>smtpd_client_restrictions = hash:/etc/postfix/access, - reject_maps_rbl</b> ---- 169,171 ---- - -! <dd> <b>smtpd_client_restrictions = hash:!!PREFIX!!/etc/postfix/access, - reject_maps_rbl</b> -*************** -*** 474,476 **** - -! <dd> <b>smtpd_sender_restrictions = hash:/etc/postfix/access, - reject_unknown_sender_domain</b> ---- 474,476 ---- - -! <dd> <b>smtpd_sender_restrictions = hash:!!PREFIX!!/etc/postfix/access, - reject_unknown_sender_domain</b> -*************** -*** 856,858 **** - <dd> <b>smtpd_etrn_restrictions = permit_mynetworks, -! hash:/etc/postfix/etrn_access, reject</b> - ---- 856,858 ---- - <dd> <b>smtpd_etrn_restrictions = permit_mynetworks, -! hash:!!PREFIX!!/etc/postfix/etrn_access, reject</b> - diff --git a/mail/postfix/files/patch-bk b/mail/postfix/files/patch-bk deleted file mode 100644 index 62a0573559ae..000000000000 --- a/mail/postfix/files/patch-bk +++ /dev/null @@ -1,29 +0,0 @@ -*** ./html/rate.html.orig Wed Mar 17 17:55:22 1999 ---- ./html/rate.html Thu Jun 1 22:32:19 2000 -*************** -*** 224,226 **** - -! <dt>/etc/postfix/main.cf: - ---- 224,226 ---- - -! <dt>!!PREFIX!!/etc/postfix/main.cf: - -*************** -*** 237,239 **** - -! <dt>/etc/postfix/<a href="transport.5.html">transport</a>: - ---- 237,239 ---- - -! <dt>!!PREFIX!!/etc/postfix/<a href="transport.5.html">transport</a>: - -*************** -*** 253,255 **** - -! <dt>/etc/postfix/master.cf: - ---- 253,255 ---- - -! <dt>!!PREFIX!!/etc/postfix/master.cf: - diff --git a/mail/postfix/files/patch-bl b/mail/postfix/files/patch-bl deleted file mode 100644 index 176c7d1b64de..000000000000 --- a/mail/postfix/files/patch-bl +++ /dev/null @@ -1,11 +0,0 @@ -*** ./html/regexp_table.5.html.orig Sat Apr 22 20:28:38 2000 ---- ./html/regexp_table.5.html Thu Jun 1 22:32:44 2000 -*************** -*** 11,13 **** - <b>SYNOPSIS</b> -! regexp:/etc/postfix/filename - ---- 11,13 ---- - <b>SYNOPSIS</b> -! regexp:!!PREFIX!!/etc/postfix/filename - diff --git a/mail/postfix/files/patch-bm b/mail/postfix/files/patch-bm deleted file mode 100644 index e5ccc2c50b94..000000000000 --- a/mail/postfix/files/patch-bm +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/relocated.5.html.orig Tue Nov 21 21:37:54 2000 -+++ ./html/relocated.5.html Tue Nov 21 21:38:08 2000 -@@ -9,7 +9,7 @@ - relocated - format of Postfix relocated table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/relocated</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b> - - <b>DESCRIPTION</b> - The optional <b>relocated</b> table provides the information that -@@ -20,7 +20,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/relocated</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b> in order to rebuild the - indexed file after changing the relocated table. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix/files/patch-bn b/mail/postfix/files/patch-bn deleted file mode 100644 index 21e69dcaa40c..000000000000 --- a/mail/postfix/files/patch-bn +++ /dev/null @@ -1,56 +0,0 @@ -*** ./html/rewrite.html.orig Sat May 8 17:51:41 1999 ---- ./html/rewrite.html Thu Jun 1 22:34:21 2000 -*************** -*** 194,196 **** - -! <dd><b>canonical_maps = hash:/etc/postfix/canonical</b> - ---- 194,196 ---- - -! <dd><b>canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical</b> - -*************** -*** 207,209 **** - -! <dd><b>sender_canonical_maps = hash:/etc/postfix/sender_canonical</b> - ---- 207,209 ---- - -! <dd><b>sender_canonical_maps = hash:!!PREFIX!!/etc/postfix/sender_canonical</b> - -*************** -*** 211,213 **** - -! <dd><b>recipient_canonical_maps = hash:/etc/postfix/recipient_canonical</b> - ---- 211,213 ---- - -! <dd><b>recipient_canonical_maps = hash:!!PREFIX!!/etc/postfix/recipient_canonical</b> - -*************** -*** 295,297 **** - -! <dd><b>virtual_maps = hash:/etc/postfix/virtual</b> - ---- 295,297 ---- - -! <dd><b>virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual</b> - -*************** -*** 323,325 **** - -! <dd><b>relocated_maps = hash:/etc/postfix/relocated</b> - ---- 323,325 ---- - -! <dd><b>relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated</b> - -*************** -*** 348,350 **** - -! <dd><b>transport_maps = hash:/etc/postfix/transport</b> - ---- 348,350 ---- - -! <dd><b>transport_maps = hash:!!PREFIX!!/etc/postfix/transport</b> - diff --git a/mail/postfix/files/patch-bo b/mail/postfix/files/patch-bo deleted file mode 100644 index b45270be8151..000000000000 --- a/mail/postfix/files/patch-bo +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/transport.5.html.orig Tue Nov 21 21:43:00 2000 -+++ ./html/transport.5.html Tue Nov 21 21:43:20 2000 -@@ -9,7 +9,7 @@ - transport - format of Postfix transport table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/transport</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b> - - <b>DESCRIPTION</b> - The optional <b>transport</b> table specifies a mapping from -@@ -21,7 +21,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/transport</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b> in order to rebuild the - indexed file after changing the transport table. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix/files/patch-bp b/mail/postfix/files/patch-bp deleted file mode 100644 index 5206bfd4bfd0..000000000000 --- a/mail/postfix/files/patch-bp +++ /dev/null @@ -1,43 +0,0 @@ ---- ./html/virtual.5.html.orig Tue Nov 21 21:46:50 2000 -+++ ./html/virtual.5.html Tue Nov 21 21:47:17 2000 -@@ -9,7 +9,7 @@ - virtual - format of Postfix virtual table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/virtual</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b> - - <b>DESCRIPTION</b> - The optional <b>virtual</b> table specifies address redirections -@@ -27,7 +27,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/virtual</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b> in order to rebuild the - indexed file after changing the text file. - - When the table is provided via other means such as NIS, -@@ -52,7 +52,7 @@ - - Support for a Postfix-style virtual domain looks like: - -- /etc/postfix/virtual: -+ !!PREFIX!!/etc/postfix/virtual: - <i>virtual.domain</i> <i>anything</i> (right-hand content does not matter) - <i>postmaster@virtual.domain</i> <i>postmaster</i> - <i>user1@virtual.domain</i> <i>address1</i> -@@ -94,11 +94,11 @@ - - Support for a Sendmail-style virtual domain looks like: - -- /etc/postfix/main.cf: -+ !!PREFIX!!/etc/postfix/main.cf: - mydestination = $myhostname localhost.$mydomain $mydomain - <i>virtual.domain</i> - -- /etc/postfix/virtual: -+ !!PREFIX!!/etc/postfix/virtual: - <i>user1@virtual.domain</i> <i>address1</i> - <i>user2@virtual.domain</i> <i>address2,</i> <i>address3</i> - diff --git a/mail/postfix/files/patch-ca b/mail/postfix/files/patch-ca deleted file mode 100644 index 86d56f80be30..000000000000 --- a/mail/postfix/files/patch-ca +++ /dev/null @@ -1,11 +0,0 @@ -*** ./man/man1/postdrop.1.orig Mon May 3 15:03:29 1999 ---- ./man/man1/postdrop.1 Thu Jun 1 22:38:54 2000 -*************** -*** 53,55 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS ---- 53,55 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS diff --git a/mail/postfix/files/patch-cb b/mail/postfix/files/patch-cb deleted file mode 100644 index 58559c7273d1..000000000000 --- a/mail/postfix/files/patch-cb +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man1/sendmail.1.orig Thu Mar 30 14:05:28 2000 ---- ./man/man1/sendmail.1 Thu Jun 1 22:39:16 2000 -*************** -*** 63,65 **** - The path name of the \fBsendmail.cf\fR file. Postfix configuration -! files are kept in \fB/etc/postfix\fR. - .IP "\fB-F \fIfull_name\fR ---- 63,65 ---- - The path name of the \fBsendmail.cf\fR file. Postfix configuration -! files are kept in \fB!!PREFIX!!/etc/postfix\fR. - .IP "\fB-F \fIfull_name\fR -*************** -*** 173,175 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS ---- 173,175 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS diff --git a/mail/postfix/files/patch-cc b/mail/postfix/files/patch-cc deleted file mode 100644 index cd6946003217..000000000000 --- a/mail/postfix/files/patch-cc +++ /dev/null @@ -1,11 +0,0 @@ -*** ./man/man5/pcre_table.5.orig Thu Mar 30 14:05:28 2000 ---- ./man/man5/pcre_table.5 Thu Jun 1 22:39:34 2000 -*************** -*** 10,12 **** - .nf -! pcre:/etc/postfix/filename - .SH DESCRIPTION ---- 10,12 ---- - .nf -! pcre:!!PREFIX!!/etc/postfix/filename - .SH DESCRIPTION diff --git a/mail/postfix/files/patch-cd b/mail/postfix/files/patch-cd deleted file mode 100644 index b51de44d0bee..000000000000 --- a/mail/postfix/files/patch-cd +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/access.5.orig Sat Apr 22 20:28:30 2000 ---- ./man/man5/access.5 Thu Jun 1 22:39:55 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/access\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/access\fR - .SH DESCRIPTION -*************** -*** 21,23 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed - file after changing the access table. ---- 21,23 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed - file after changing the access table. diff --git a/mail/postfix/files/patch-ce b/mail/postfix/files/patch-ce deleted file mode 100644 index f77053f8b3aa..000000000000 --- a/mail/postfix/files/patch-ce +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/canonical.5.orig Sat Apr 22 20:28:30 2000 ---- ./man/man5/canonical.5 Thu Jun 1 22:40:18 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/canonical\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR - .SH DESCRIPTION -*************** -*** 21,23 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed - file after changing the canonical table. ---- 21,23 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed - file after changing the canonical table. diff --git a/mail/postfix/files/patch-cf b/mail/postfix/files/patch-cf deleted file mode 100644 index 28fb053b94a7..000000000000 --- a/mail/postfix/files/patch-cf +++ /dev/null @@ -1,11 +0,0 @@ -*** ./man/man5/regexp_table.5.orig Thu Mar 30 14:05:28 2000 ---- ./man/man5/regexp_table.5 Thu Jun 1 22:40:43 2000 -*************** -*** 10,12 **** - .nf -! regexp:/etc/postfix/filename - .SH DESCRIPTION ---- 10,12 ---- - .nf -! regexp:!!PREFIX!!/etc/postfix/filename - .SH DESCRIPTION diff --git a/mail/postfix/files/patch-cg b/mail/postfix/files/patch-cg deleted file mode 100644 index 0ae82cc57669..000000000000 --- a/mail/postfix/files/patch-cg +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/relocated.5.orig Sat Apr 22 20:28:31 2000 ---- ./man/man5/relocated.5 Thu Jun 1 22:41:05 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/relocated\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR - .SH DESCRIPTION -*************** -*** 20,22 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed - file after changing the relocated table. ---- 20,22 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed - file after changing the relocated table. diff --git a/mail/postfix/files/patch-ch b/mail/postfix/files/patch-ch deleted file mode 100644 index 3ed047ea474c..000000000000 --- a/mail/postfix/files/patch-ch +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/transport.5.orig Sat Apr 22 20:28:31 2000 ---- ./man/man5/transport.5 Thu Jun 1 22:41:26 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/transport\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR - .SH DESCRIPTION -*************** -*** 21,23 **** - for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed - file after changing the transport table. ---- 21,23 ---- - for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed - file after changing the transport table. diff --git a/mail/postfix/files/patch-ci b/mail/postfix/files/patch-ci deleted file mode 100644 index 1a7cf4abbac7..000000000000 --- a/mail/postfix/files/patch-ci +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/virtual.5.orig Sat Apr 22 20:28:31 2000 ---- ./man/man5/virtual.5 Thu Jun 1 22:41:51 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/virtual\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR - .SH DESCRIPTION -*************** -*** 26,28 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed - file after changing the virtual table. ---- 26,28 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed - file after changing the virtual table. diff --git a/mail/postfix/files/patch-cj b/mail/postfix/files/patch-cj deleted file mode 100644 index 50448f2ec26d..000000000000 --- a/mail/postfix/files/patch-cj +++ /dev/null @@ -1,13 +0,0 @@ -*** ./man/man8/cleanup.8.orig Sun May 28 21:58:32 2000 ---- ./man/man8/cleanup.8 Thu Jun 1 22:42:21 2000 -*************** -*** 136,139 **** - .nf -! /etc/postfix/canonical*, canonical mapping table -! /etc/postfix/virtual*, virtual mapping table - .SH LICENSE ---- 136,139 ---- - .nf -! !!PREFIX!!/etc/postfix/canonical*, canonical mapping table -! !!PREFIX!!/etc/postfix/virtual*, virtual mapping table - .SH LICENSE diff --git a/mail/postfix/files/patch-cl b/mail/postfix/files/patch-cl deleted file mode 100644 index 44c8a3a7aae0..000000000000 --- a/mail/postfix/files/patch-cl +++ /dev/null @@ -1,13 +0,0 @@ -*** ./man/man8/master.8.orig Tue Mar 7 10:48:19 2000 ---- ./man/man8/master.8 Thu Jun 1 22:43:02 2000 -*************** -*** 120,123 **** - .nf -! /etc/postfix/main.cf: global configuration file. -! /etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. ---- 120,123 ---- - .nf -! !!PREFIX!!/etc/postfix/main.cf: global configuration file. -! !!PREFIX!!/etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. diff --git a/mail/postfix/files/patch-da b/mail/postfix/files/patch-da deleted file mode 100644 index e57e31750d18..000000000000 --- a/mail/postfix/files/patch-da +++ /dev/null @@ -1,11 +0,0 @@ -*** ./proto/regexp_table.orig Wed Mar 8 19:18:20 2000 ---- ./proto/regexp_table Thu Jun 1 22:44:43 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # regexp:/etc/postfix/filename - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # regexp:!!PREFIX!!/etc/postfix/filename - # DESCRIPTION diff --git a/mail/postfix/files/patch-db b/mail/postfix/files/patch-db deleted file mode 100644 index 7f89fb770783..000000000000 --- a/mail/postfix/files/patch-db +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/access.orig Sun Apr 9 16:44:45 2000 ---- ./proto/access Thu Jun 1 22:45:05 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/access\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR - # DESCRIPTION -*************** -*** 15,17 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed - # file after changing the access table. ---- 15,17 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed - # file after changing the access table. diff --git a/mail/postfix/files/patch-dc b/mail/postfix/files/patch-dc deleted file mode 100644 index 786f2da45c32..000000000000 --- a/mail/postfix/files/patch-dc +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/canonical.orig Sun Apr 9 16:43:37 2000 ---- ./proto/canonical Thu Jun 1 22:45:28 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/canonical\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR - # DESCRIPTION -*************** -*** 15,17 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed - # file after changing the canonical table. ---- 15,17 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed - # file after changing the canonical table. diff --git a/mail/postfix/files/patch-dd b/mail/postfix/files/patch-dd deleted file mode 100644 index b65a57ff7d57..000000000000 --- a/mail/postfix/files/patch-dd +++ /dev/null @@ -1,11 +0,0 @@ -*** ./proto/pcre_table.orig Wed Mar 8 19:18:11 2000 ---- ./proto/pcre_table Thu Jun 1 22:45:41 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # pcre:/etc/postfix/filename - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # pcre:!!PREFIX!!/etc/postfix/filename - # DESCRIPTION diff --git a/mail/postfix/files/patch-de b/mail/postfix/files/patch-de deleted file mode 100644 index 73bb2af2261d..000000000000 --- a/mail/postfix/files/patch-de +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/relocated.orig Sun Apr 9 16:47:31 2000 ---- ./proto/relocated Thu Jun 1 22:46:02 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/relocated\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR - # DESCRIPTION -*************** -*** 14,16 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed - # file after changing the relocated table. ---- 14,16 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed - # file after changing the relocated table. diff --git a/mail/postfix/files/patch-df b/mail/postfix/files/patch-df deleted file mode 100644 index 8d3fba96a224..000000000000 --- a/mail/postfix/files/patch-df +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/transport.orig Sun Apr 9 17:05:45 2000 ---- ./proto/transport Thu Jun 1 22:46:23 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/transport\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR - # DESCRIPTION -*************** -*** 15,17 **** - # for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed - # file after changing the transport table. ---- 15,17 ---- - # for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed - # file after changing the transport table. diff --git a/mail/postfix/files/patch-dg b/mail/postfix/files/patch-dg deleted file mode 100644 index bff20a2cff3e..000000000000 --- a/mail/postfix/files/patch-dg +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/virtual.orig Sun Apr 9 17:14:14 2000 ---- ./proto/virtual Thu Jun 1 22:46:40 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/virtual\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR - # DESCRIPTION -*************** -*** 20,22 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed - # file after changing the virtual table. ---- 20,22 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed - # file after changing the virtual table. diff --git a/mail/postfix/files/patch-ea b/mail/postfix/files/patch-ea deleted file mode 100644 index 6c3f98d2af4f..000000000000 --- a/mail/postfix/files/patch-ea +++ /dev/null @@ -1,13 +0,0 @@ -*** ./src/cleanup/cleanup.c.orig Sun May 28 18:33:41 2000 ---- ./src/cleanup/cleanup.c Thu Jun 1 21:52:22 2000 -*************** -*** 118,121 **** - /* FILES -! /* /etc/postfix/canonical*, canonical mapping table -! /* /etc/postfix/virtual*, virtual mapping table - /* LICENSE ---- 118,121 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix/canonical*, canonical mapping table -! /* !!PREFIX!!/etc/postfix/virtual*, virtual mapping table - /* LICENSE diff --git a/mail/postfix/files/patch-eb b/mail/postfix/files/patch-eb deleted file mode 100644 index e67680963d2d..000000000000 --- a/mail/postfix/files/patch-eb +++ /dev/null @@ -1,11 +0,0 @@ -*** ./src/global/mail_conf.c.orig Sun May 7 18:51:16 2000 ---- ./src/global/mail_conf.c Thu Jun 1 22:16:29 2000 -*************** -*** 53,55 **** - /* FILES -! /* /etc/postfix: default Postfix configuration directory. - /* ENVIRONMENT ---- 53,55 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix: default Postfix configuration directory. - /* ENVIRONMENT diff --git a/mail/postfix/files/patch-ee b/mail/postfix/files/patch-ee deleted file mode 100644 index ef44eac24b73..000000000000 --- a/mail/postfix/files/patch-ee +++ /dev/null @@ -1,13 +0,0 @@ -*** ./src/master/master.c.orig Tue Mar 7 10:25:07 2000 ---- ./src/master/master.c Thu Jun 1 22:43:50 2000 -*************** -*** 104,107 **** - /* FILES -! /* /etc/postfix/main.cf: global configuration file. -! /* /etc/postfix/master.cf: master process configuration file. - /* /var/spool/postfix/pid/master.pid: master lock file. ---- 104,107 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix/main.cf: global configuration file. -! /* !!PREFIX!!/etc/postfix/master.cf: master process configuration file. - /* /var/spool/postfix/pid/master.pid: master lock file. diff --git a/mail/postfix/files/patch-ef b/mail/postfix/files/patch-ef deleted file mode 100644 index 586b304a103d..000000000000 --- a/mail/postfix/files/patch-ef +++ /dev/null @@ -1,11 +0,0 @@ -*** ./src/postdrop/postdrop.c.orig Sun Apr 25 18:05:43 1999 ---- ./src/postdrop/postdrop.c Thu Jun 1 22:44:22 2000 -*************** -*** 39,41 **** - /* /var/spool/postfix, mail queue -! /* /etc/postfix, configuration files - /* CONFIGURATION PARAMETERS ---- 39,41 ---- - /* /var/spool/postfix, mail queue -! /* !!PREFIX!!/etc/postfix, configuration files - /* CONFIGURATION PARAMETERS diff --git a/mail/postfix/files/patch-eg b/mail/postfix/files/patch-eg deleted file mode 100644 index 2983bbfd86ea..000000000000 --- a/mail/postfix/files/patch-eg +++ /dev/null @@ -1,20 +0,0 @@ -*** ./src/sendmail/sendmail.c.orig Tue Mar 14 10:42:06 2000 ---- ./src/sendmail/sendmail.c Thu Jun 1 22:47:24 2000 -*************** -*** 57,59 **** - /* The path name of the \fBsendmail.cf\fR file. Postfix configuration -! /* files are kept in \fB/etc/postfix\fR. - /* .IP "\fB-F \fIfull_name\fR ---- 57,59 ---- - /* The path name of the \fBsendmail.cf\fR file. Postfix configuration -! /* files are kept in \fB!!PREFIX!!/etc/postfix\fR. - /* .IP "\fB-F \fIfull_name\fR -*************** -*** 159,161 **** - /* /var/spool/postfix, mail queue -! /* /etc/postfix, configuration files - /* CONFIGURATION PARAMETERS ---- 159,161 ---- - /* /var/spool/postfix, mail queue -! /* !!PREFIX!!/etc/postfix, configuration files - /* CONFIGURATION PARAMETERS diff --git a/mail/postfix/files/patch-eh b/mail/postfix/files/patch-eh deleted file mode 100644 index c104c3680d21..000000000000 --- a/mail/postfix/files/patch-eh +++ /dev/null @@ -1,11 +0,0 @@ -*** ./src/trivial-rewrite/transport.c.orig Tue Nov 16 19:15:41 1999 ---- ./src/trivial-rewrite/transport.c Thu Jun 1 22:47:49 2000 -*************** -*** 32,34 **** - /* FILES -! /* /etc/postfix/transport* - /* CONFIGURATION PARAMETERS ---- 32,34 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix/transport* - /* CONFIGURATION PARAMETERS diff --git a/mail/postfix/pkg-message b/mail/postfix/pkg-message index a7ae2b17e2a6..7fb3a804599c 100644 --- a/mail/postfix/pkg-message +++ b/mail/postfix/pkg-message @@ -8,10 +8,21 @@ sendmail_outbound_enable="NO" sendmail_submit_enable="NO" sendmail_msp_queue_enable="NO" -This will disable Sendmail completely. + **OR** +sendmail_enable="NONE" -Also, you may wish to disable some Sendmail-specific daily maintenance +then type this command as root: + +ln -s /usr/local/sbin/postfix /usr/local/etc/rc.d/postfix.sh + +Either of these will disable Sendmail completely. The latter form is useful +if you need to wait until other local package initialization (such as ldconfig +for Postgres or MySQL) is done. The former method will start postfix very +early on in the boot process. + + +Also, you will want to disable some Sendmail-specific daily maintenance routines in your /etc/periodic.conf file: daily_status_mail_rejects_enable="NO" diff --git a/mail/postfix1/Makefile b/mail/postfix1/Makefile index 6b47f15e39d2..6adf63b1ee81 100644 --- a/mail/postfix1/Makefile +++ b/mail/postfix1/Makefile @@ -12,7 +12,7 @@ # the options are the same names as in the scripts/configure.postfix file PORTNAME= postfix -PORTVERSION= 1.1.11 +PORTVERSION= 1.1.12 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -28,6 +28,7 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= khera@kciLink.com USE_SUBMAKE= yes +USE_REINPLACE= yes MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \ postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \ @@ -40,6 +41,10 @@ MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \ master.8 nqmgr.8 pickup.8 pipe.8 qmgr.8 qmqpd.8 showq.8 smtp.8 \ smtpd.8 spawn.8 trivial-rewrite.8 virtual.8 +# TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to +# patch it. +MAN8base=$(MAN8:S/tlsmgr.8//) + CONF1= main.cf master.cf access aliases canonical pcre_table regexp_table \ relocated transport virtual @@ -66,6 +71,27 @@ post-patch: CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ ${ECHO} "all: default" >> Makefile) +pre-patch: +.for file in ${MAN1} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/man/man1/${file} ${WRKSRC}/html/${file}.html +.endfor +.for file in ${MAN5} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/man/man5/${file} ${WRKSRC}/html/${file}.html +.endfor +.for file in ${MAN8base} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/man/man8/${file} ${WRKSRC}/html/${file}.html +.endfor +.for file in faq rate rewrite uce + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/html/${file}.html +.endfor +.for file in ${CONF1} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" ${WRKSRC}/conf/${file} +.endfor + pre-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL diff --git a/mail/postfix1/distinfo b/mail/postfix1/distinfo index 379358ed4749..832388cccb96 100644 --- a/mail/postfix1/distinfo +++ b/mail/postfix1/distinfo @@ -1,4 +1,4 @@ -MD5 (postfix/postfix-1.1.11.tar.gz) = b34bb2b5018327c19456a77814141208 +MD5 (postfix/postfix-1.1.12.tar.gz) = d1d0f9792ec6ea063ccca59184e54212 MD5 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz) = 11d82e9a3482f64af9d228f7a4319566 -MD5 (postfix/postfix-1.1.11+ipv6.patch.gz) = dc2a6362518025583a17305607eb8f0e +MD5 (postfix/postfix-1.1.12+ipv6.patch.gz) = add4396ce50ca61b5d9b67454fb51258 MD5 (postfix/postfix-pg.postfix-1.1.8.patch) = e0f4d910a6d6648d9b48e2244f2764ba diff --git a/mail/postfix1/files/patch-aa b/mail/postfix1/files/patch-aa deleted file mode 100644 index 51b40396bd5e..000000000000 --- a/mail/postfix1/files/patch-aa +++ /dev/null @@ -1,86 +0,0 @@ -*** ./conf/main.cf.orig Fri Jan 4 13:09:04 2002 ---- ./conf/main.cf Tue Jan 8 22:41:50 2002 -*************** -*** 31,44 **** - # The command_directory parameter specifies the location of all - # postXXX commands. The default value is $program_directory. - # -! command_directory = /usr/sbin - - # The daemon_directory parameter specifies the location of all Postfix - # daemon programs (i.e. programs listed in the master.cf file). The - # default value is $program_directory. This directory must be owned - # by root. - # -! daemon_directory = /usr/libexec/postfix - - # QUEUE AND PROCESS OWNERSHIP - # ---- 31,44 ---- - # The command_directory parameter specifies the location of all - # postXXX commands. The default value is $program_directory. - # -! command_directory = !!PREFIX!!/sbin - - # The daemon_directory parameter specifies the location of all Postfix - # daemon programs (i.e. programs listed in the master.cf file). The - # default value is $program_directory. This directory must be owned - # by root. - # -! daemon_directory = !!PREFIX!!/libexec/postfix - - # QUEUE AND PROCESS OWNERSHIP - # -*************** -*** 325,332 **** - # - # The home_mailbox parameter specifies the optional pathname of a - # mailbox file relative to a user's home directory. The default -! # mailbox file is /var/spool/mail/user or /var/mail/user. Specify -! # "Maildir/" for qmail-style delivery (the / is required). - # - #home_mailbox = Mailbox - #home_mailbox = Maildir/ ---- 325,332 ---- - # - # The home_mailbox parameter specifies the optional pathname of a - # mailbox file relative to a user's home directory. The default -! # mailbox file is /var/mail/user. Specify "Maildir/" for -! # qmail-style delivery (the / is required). - # - #home_mailbox = Mailbox - #home_mailbox = Maildir/ -*************** -*** 424,430 **** - # - # See also the body_checks example in the sample-filter.cf file. - # -! #header_checks = regexp:/etc/postfix/header_checks - - # FAST ETRN SERVICE - # ---- 424,430 ---- - # - # See also the body_checks example in the sample-filter.cf file. - # -! #header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks - - # FAST ETRN SERVICE - # -*************** -*** 525,531 **** - # commands. This must be a group name with a numerical group ID that - # is not shared with other accounts, not even with the Postfix account. - # -! setgid_group = - - # manpage_path: The location of the Postfix on-line manual pages. - # ---- 525,531 ---- - # commands. This must be a group name with a numerical group ID that - # is not shared with other accounts, not even with the Postfix account. - # -! setgid_group = maildrop - - # manpage_path: The location of the Postfix on-line manual pages. - # diff --git a/mail/postfix1/files/patch-ab b/mail/postfix1/files/patch-ab deleted file mode 100644 index 7c81d3dc12c9..000000000000 --- a/mail/postfix1/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/canonical.orig Tue Mar 7 10:42:58 2000 ---- ./conf/canonical Thu Jun 1 21:53:23 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/canonical - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/canonical - # diff --git a/mail/postfix1/files/patch-ac b/mail/postfix1/files/patch-ac deleted file mode 100644 index 0fb2192cdd84..000000000000 --- a/mail/postfix1/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/access.orig Tue Mar 7 10:42:58 2000 ---- ./conf/access Thu Jun 1 21:53:36 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/access - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/access - # diff --git a/mail/postfix1/files/patch-ad b/mail/postfix1/files/patch-ad deleted file mode 100644 index c1b102574165..000000000000 --- a/mail/postfix1/files/patch-ad +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/pcre_table.orig Thu Mar 9 20:36:19 2000 ---- ./conf/pcre_table Thu Jun 1 22:02:08 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # pcre:/etc/postfix/filename - # ---- 7,9 ---- - # SYNOPSIS -! # pcre:!!PREFIX!!/etc/postfix/filename - # diff --git a/mail/postfix1/files/patch-ae b/mail/postfix1/files/patch-ae deleted file mode 100644 index e396dd8626db..000000000000 --- a/mail/postfix1/files/patch-ae +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/regexp_table.orig Thu Mar 9 20:36:19 2000 ---- ./conf/regexp_table Thu Jun 1 22:03:27 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # regexp:/etc/postfix/filename - # ---- 7,9 ---- - # SYNOPSIS -! # regexp:!!PREFIX!!/etc/postfix/filename - # diff --git a/mail/postfix1/files/patch-af b/mail/postfix1/files/patch-af deleted file mode 100644 index 8fca6b208941..000000000000 --- a/mail/postfix1/files/patch-af +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/relocated.orig Tue Mar 7 10:42:58 2000 ---- ./conf/relocated Thu Jun 1 22:03:59 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/relocated - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/relocated - # diff --git a/mail/postfix1/files/patch-ag b/mail/postfix1/files/patch-ag deleted file mode 100644 index 54c0fa918d3b..000000000000 --- a/mail/postfix1/files/patch-ag +++ /dev/null @@ -1,15 +0,0 @@ -*** ./conf/sample-auth.cf.orig Sun May 28 17:55:19 2000 ---- ./conf/sample-auth.cf Thu Jun 1 22:05:32 2000 -*************** -*** 91,95 **** - # The Postfix SMTP client opens the lookup table before going to -! # chroot jail, so you can leave the password file in /etc/postfix. - # -! smtp_sasl_password_maps = hash:/etc/postfix/saslpass - ---- 91,95 ---- - # The Postfix SMTP client opens the lookup table before going to -! # chroot jail, so you can leave the password file in !!PREFIX!!/etc/postfix. - # -! smtp_sasl_password_maps = hash:!!PREFIX!!/etc/postfix/saslpass - diff --git a/mail/postfix1/files/patch-ah b/mail/postfix1/files/patch-ah deleted file mode 100644 index a8c70a15a78d..000000000000 --- a/mail/postfix1/files/patch-ah +++ /dev/null @@ -1,44 +0,0 @@ -*** ./conf/sample-canonical.cf.orig Thu Sep 23 14:10:38 1999 ---- ./conf/sample-canonical.cf Thu Jun 1 22:07:23 2000 -*************** -*** 14,16 **** - # -! # If you use this feature, run "postmap /etc/postfix/canonical" to - # build the necessary DBM or DB file after every change. The changes ---- 14,16 ---- - # -! # If you use this feature, run "postmap !!PREFIX!!/etc/postfix/canonical" to - # build the necessary DBM or DB file after every change. The changes -*************** -*** 19,24 **** - # -! #canonical_maps = dbm:/etc/postfix/canonical -! #canonical_maps = hash:/etc/postfix/canonical -! #canonical_maps = hash:/etc/postfix/canonical, nis:canonical -! #canonical_maps = hash:/etc/postfix/canonical, netinfo:/canonical - canonical_maps = ---- 19,24 ---- - # -! #canonical_maps = dbm:!!PREFIX!!/etc/postfix/canonical -! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical -! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical, nis:canonical -! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical, netinfo:/canonical - canonical_maps = -*************** -*** 32,34 **** - # -! #recipient_canonical_maps = hash:/etc/postfix/recipient_canonical - recipient_canonical_maps = ---- 32,34 ---- - # -! #recipient_canonical_maps = hash:!!PREFIX!!/etc/postfix/recipient_canonical - recipient_canonical_maps = -*************** -*** 46,48 **** - # -! #sender_canonical_maps = hash:/etc/postfix/sender_canonical - sender_canonical_maps = ---- 46,48 ---- - # -! #sender_canonical_maps = hash:!!PREFIX!!/etc/postfix/sender_canonical - sender_canonical_maps = diff --git a/mail/postfix1/files/patch-ai b/mail/postfix1/files/patch-ai deleted file mode 100644 index f7aa2fd5f4c6..000000000000 --- a/mail/postfix1/files/patch-ai +++ /dev/null @@ -1,18 +0,0 @@ -*** ./conf/sample-filter.cf.orig Mon May 29 11:30:44 2000 ---- ./conf/sample-filter.cf Thu Jun 1 22:07:58 2000 -*************** -*** 15,17 **** - # -! header_checks = regexp:/etc/postfix/header_checks - ---- 15,17 ---- - # -! header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks - -*************** -*** 26,27 **** - # -! body_checks = regexp:/etc/postfix/body_checks ---- 26,27 ---- - # -! body_checks = regexp:!!PREFIX!!/etc/postfix/body_checks diff --git a/mail/postfix1/files/patch-aj b/mail/postfix1/files/patch-aj deleted file mode 100644 index 241d48132551..000000000000 --- a/mail/postfix1/files/patch-aj +++ /dev/null @@ -1,24 +0,0 @@ -*** ./conf/sample-misc.cf.orig Thu Sep 23 14:10:52 1999 ---- ./conf/sample-misc.cf Thu Jun 1 22:09:39 2000 -*************** -*** 220,222 **** - # -! program_directory = /usr/libexec/postfix - ---- 220,222 ---- - # -! program_directory = !!PREFIX!!/libexec/postfix - -*************** -*** 263,267 **** - # Specify the types and names of databases to use. After change, -! # run "postmap /etc/postfix/relocated", then "postfix reload". - # -! #relocated_maps = hash:/etc/postfix/relocated - relocated_maps = ---- 263,267 ---- - # Specify the types and names of databases to use. After change, -! # run "postmap !!PREFIX!!/etc/postfix/relocated", then "postfix reload". - # -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated - relocated_maps = diff --git a/mail/postfix1/files/patch-ak b/mail/postfix1/files/patch-ak deleted file mode 100644 index 250dd411a4bd..000000000000 --- a/mail/postfix1/files/patch-ak +++ /dev/null @@ -1,26 +0,0 @@ -*** ./conf/sample-relocated.cf.orig Thu Sep 23 14:11:17 1999 ---- ./conf/sample-relocated.cf Thu Jun 1 22:10:43 2000 -*************** -*** 12,14 **** - # -! # If you use this feature, run "postmap /etc/postfix/relocated" to - # build the necessary DBM or DB file after change, then "postfix ---- 12,14 ---- - # -! # If you use this feature, run "postmap !!PREFIX!!/etc/postfix/relocated" to - # build the necessary DBM or DB file after change, then "postfix -*************** -*** 16,21 **** - # -! #relocated_maps = dbm:/etc/postfix/relocated -! #relocated_maps = hash:/etc/postfix/relocated -! #relocated_maps = hash:/etc/postfix/relocated, nis:virtual -! #relocated_maps = hash:/etc/postfix/relocated, netinfo:/relocated - relocated_maps = ---- 16,21 ---- - # -! #relocated_maps = dbm:!!PREFIX!!/etc/postfix/relocated -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated, nis:virtual -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated, netinfo:/relocated - relocated_maps = diff --git a/mail/postfix1/files/patch-al b/mail/postfix1/files/patch-al deleted file mode 100644 index 799206da0c96..000000000000 --- a/mail/postfix1/files/patch-al +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/sample-smtpd.cf.orig Mon Dec 27 19:41:37 1999 ---- ./conf/sample-smtpd.cf Thu Jun 1 22:11:22 2000 -*************** -*** 183,185 **** - #smtpd_sender_restrictions = reject_unknown_sender_domain -! #smtpd_sender_restrictions = reject_unknown_sender_domain, hash:/etc/postfix/access - smtpd_sender_restrictions = ---- 183,185 ---- - #smtpd_sender_restrictions = reject_unknown_sender_domain -! #smtpd_sender_restrictions = reject_unknown_sender_domain, hash:!!PREFIX!!/etc/postfix/access - smtpd_sender_restrictions = diff --git a/mail/postfix1/files/patch-am b/mail/postfix1/files/patch-am deleted file mode 100644 index 2d395fa9ca03..000000000000 --- a/mail/postfix1/files/patch-am +++ /dev/null @@ -1,23 +0,0 @@ -*** ./conf/sample-transport.cf.orig Thu Dec 23 10:50:00 1999 ---- ./conf/sample-transport.cf Thu Jun 1 22:13:09 2000 -*************** -*** 10,18 **** - # By default, this feature is disabled. Specify the types of databases -! # to use. If you use this feature, run "postmap /etc/postfix/transport" - # after change, then "postfix reload". - # -! #transport_maps = dbm:/etc/postfix/transport -! #transport_maps = hash:/etc/postfix/transport -! #transport_maps = hash:/etc/postfix/transport, nis:transport -! #transport_maps = hash:/etc/postfix/transport, netinfo:/transport - transport_maps = ---- 10,18 ---- - # By default, this feature is disabled. Specify the types of databases -! # to use. If you use this feature, run "postmap !!PREFIX!!/etc/postfix/transport" - # after change, then "postfix reload". - # -! #transport_maps = dbm:!!PREFIX!!/etc/postfix/transport -! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport -! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport, nis:transport -! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport, netinfo:/transport - transport_maps = diff --git a/mail/postfix1/files/patch-an b/mail/postfix1/files/patch-an deleted file mode 100644 index af5ac7cc031b..000000000000 --- a/mail/postfix1/files/patch-an +++ /dev/null @@ -1,26 +0,0 @@ -*** ./conf/sample-virtual.cf.orig Mon Dec 20 21:00:42 1999 ---- ./conf/sample-virtual.cf Thu Jun 1 22:13:32 2000 -*************** -*** 12,14 **** - # -! # If you use this feature, run "postmap /etc/postfix/virtual" to - # build the necessary DBM or DB file after change. ---- 12,14 ---- - # -! # If you use this feature, run "postmap !!PREFIX!!/etc/postfix/virtual" to - # build the necessary DBM or DB file after change. -*************** -*** 18,23 **** - # -! #virtual_maps = dbm:/etc/postfix/virtual -! #virtual_maps = hash:/etc/postfix/virtual -! #virtual_maps = hash:/etc/postfix/virtual, nis:virtual -! #virtual_maps = hash:/etc/postfix/virtual, netinfo:/virtual - virtual_maps = ---- 18,23 ---- - # -! #virtual_maps = dbm:!!PREFIX!!/etc/postfix/virtual -! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual -! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual, nis:virtual -! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual, netinfo:/virtual - virtual_maps = diff --git a/mail/postfix1/files/patch-ao b/mail/postfix1/files/patch-ao deleted file mode 100644 index fd854e181601..000000000000 --- a/mail/postfix1/files/patch-ao +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/transport.orig Tue Mar 7 10:42:58 2000 ---- ./conf/transport Thu Jun 1 22:13:41 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/transport - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/transport - # diff --git a/mail/postfix1/files/patch-ap b/mail/postfix1/files/patch-ap deleted file mode 100644 index 4598192cd5c1..000000000000 --- a/mail/postfix1/files/patch-ap +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/virtual.orig Tue Mar 7 10:42:59 2000 ---- ./conf/virtual Thu Jun 1 22:13:54 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/virtual - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/virtual - # diff --git a/mail/postfix1/files/patch-ba b/mail/postfix1/files/patch-ba deleted file mode 100644 index ccb54ec60a7a..000000000000 --- a/mail/postfix1/files/patch-ba +++ /dev/null @@ -1,20 +0,0 @@ -*** ./html/mailq.1.html.orig Sat Apr 22 20:28:36 2000 ---- ./html/mailq.1.html Thu Jun 1 22:19:24 2000 -*************** -*** 83,85 **** - The path name of the <b>sendmail.cf</b> file. Postfix con- -! figuration files are kept in <b>/etc/postfix</b>. - ---- 83,85 ---- - The path name of the <b>sendmail.cf</b> file. Postfix con- -! figuration files are kept in <b>!!PREFIX!!/etc/postfix</b>. - -*************** -*** 231,233 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - ---- 231,233 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - diff --git a/mail/postfix1/files/patch-bb b/mail/postfix1/files/patch-bb deleted file mode 100644 index ea744664dfa7..000000000000 --- a/mail/postfix1/files/patch-bb +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/access.5.html.orig Tue Nov 21 21:24:13 2000 -+++ ./html/access.5.html Tue Nov 21 21:24:34 2000 -@@ -9,7 +9,7 @@ - access - format of Postfix access table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/access</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b> - - <b>DESCRIPTION</b> - The optional <b>access</b> table directs the Postfix SMTP server -@@ -21,7 +21,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/access</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b> in order to rebuild the - indexed file after changing the access table. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix1/files/patch-bc b/mail/postfix1/files/patch-bc deleted file mode 100644 index e407a9650585..000000000000 --- a/mail/postfix1/files/patch-bc +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/canonical.5.html.orig Tue Nov 21 21:32:38 2000 -+++ ./html/canonical.5.html Tue Nov 21 21:33:21 2000 -@@ -9,7 +9,7 @@ - canonical - format of Postfix canonical table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/canonical</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b> - - <b>DESCRIPTION</b> - The optional <b>canonical</b> table specifies an address mapping -@@ -20,7 +20,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/canonical</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b> in order to rebuild the - indexed file after changing the text file. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix1/files/patch-be b/mail/postfix1/files/patch-be deleted file mode 100644 index bef6a3bfaf73..000000000000 --- a/mail/postfix1/files/patch-be +++ /dev/null @@ -1,10 +0,0 @@ ---- ./html/faq.html.orig Sat Oct 28 23:34:51 2000 -+++ ./html/faq.html Sat Oct 28 23:36:04 2000 -@@ -2572,7 +2572,7 @@ - - Answer: instead of using <b>/usr/include/ndbm.h</b>, you're building - Postfix with some incompatible third-party file, typically --<b>/usr/local/include/ndbm.h</b>. -+<b>!!PREFIX!!/include/ndbm.h</b>. - - <p> diff --git a/mail/postfix1/files/patch-bf b/mail/postfix1/files/patch-bf deleted file mode 100644 index d652e1e567b3..000000000000 --- a/mail/postfix1/files/patch-bf +++ /dev/null @@ -1,13 +0,0 @@ -*** ./html/cleanup.8.html.orig Sun May 28 21:58:41 2000 ---- ./html/cleanup.8.html Thu Jun 1 22:29:04 2000 -*************** -*** 174,177 **** - <b>FILES</b> -! /etc/postfix/canonical*, canonical mapping table -! /etc/postfix/virtual*, virtual mapping table - ---- 174,177 ---- - <b>FILES</b> -! !!PREFIX!!/etc/postfix/canonical*, canonical mapping table -! !!PREFIX!!/etc/postfix/virtual*, virtual mapping table - diff --git a/mail/postfix1/files/patch-bg b/mail/postfix1/files/patch-bg deleted file mode 100644 index ce2454eaef01..000000000000 --- a/mail/postfix1/files/patch-bg +++ /dev/null @@ -1,13 +0,0 @@ -*** ./html/master.8.html.orig Tue Mar 7 10:48:56 2000 ---- ./html/master.8.html Thu Jun 1 22:29:24 2000 -*************** -*** 148,151 **** - <b>FILES</b> -! /etc/postfix/main.cf: global configuration file. -! /etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. ---- 148,151 ---- - <b>FILES</b> -! !!PREFIX!!/etc/postfix/main.cf: global configuration file. -! !!PREFIX!!/etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. diff --git a/mail/postfix1/files/patch-bh b/mail/postfix1/files/patch-bh deleted file mode 100644 index a20232e6796a..000000000000 --- a/mail/postfix1/files/patch-bh +++ /dev/null @@ -1,11 +0,0 @@ -*** ./html/goals.html.orig Sun May 9 15:44:18 1999 ---- ./html/goals.html Thu Jun 1 22:30:14 2000 -*************** -*** 45,47 **** - <li>Compatibility. Postfix is designed to be sendmail-compatible -! to make migration easy. Postfix supports <b>/var[/spool]/mail</b>, - <b>/etc/aliases</b>, <b>NIS</b>, and <b>~/.forward</b> files. ---- 45,47 ---- - <li>Compatibility. Postfix is designed to be sendmail-compatible -! to make migration easy. Postfix supports <b>/var/mail</b>, - <b>/etc/aliases</b>, <b>NIS</b>, and <b>~/.forward</b> files. diff --git a/mail/postfix1/files/patch-bi b/mail/postfix1/files/patch-bi deleted file mode 100644 index 7e4acdb0c126..000000000000 --- a/mail/postfix1/files/patch-bi +++ /dev/null @@ -1,11 +0,0 @@ -*** ./html/postdrop.1.html.orig Mon May 3 15:05:12 1999 ---- ./html/postdrop.1.html Thu Jun 1 22:30:47 2000 -*************** -*** 48,50 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - ---- 48,50 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - diff --git a/mail/postfix1/files/patch-bj b/mail/postfix1/files/patch-bj deleted file mode 100644 index 00e78d01ba5a..000000000000 --- a/mail/postfix1/files/patch-bj +++ /dev/null @@ -1,42 +0,0 @@ -*** ./html/uce.html.orig Fri Dec 31 15:06:07 1999 ---- ./html/uce.html Thu Jun 1 22:31:37 2000 -*************** -*** 126,130 **** - -! <dd> <b>header_checks = regexp:/etc/postfix/header_checks</b> - -! <dd> <b>header_checks = pcre:/etc/postfix/header_checks</b> - ---- 126,130 ---- - -! <dd> <b>header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks</b> - -! <dd> <b>header_checks = pcre:!!PREFIX!!/etc/postfix/header_checks</b> - -*************** -*** 169,171 **** - -! <dd> <b>smtpd_client_restrictions = hash:/etc/postfix/access, - reject_maps_rbl</b> ---- 169,171 ---- - -! <dd> <b>smtpd_client_restrictions = hash:!!PREFIX!!/etc/postfix/access, - reject_maps_rbl</b> -*************** -*** 474,476 **** - -! <dd> <b>smtpd_sender_restrictions = hash:/etc/postfix/access, - reject_unknown_sender_domain</b> ---- 474,476 ---- - -! <dd> <b>smtpd_sender_restrictions = hash:!!PREFIX!!/etc/postfix/access, - reject_unknown_sender_domain</b> -*************** -*** 856,858 **** - <dd> <b>smtpd_etrn_restrictions = permit_mynetworks, -! hash:/etc/postfix/etrn_access, reject</b> - ---- 856,858 ---- - <dd> <b>smtpd_etrn_restrictions = permit_mynetworks, -! hash:!!PREFIX!!/etc/postfix/etrn_access, reject</b> - diff --git a/mail/postfix1/files/patch-bk b/mail/postfix1/files/patch-bk deleted file mode 100644 index 62a0573559ae..000000000000 --- a/mail/postfix1/files/patch-bk +++ /dev/null @@ -1,29 +0,0 @@ -*** ./html/rate.html.orig Wed Mar 17 17:55:22 1999 ---- ./html/rate.html Thu Jun 1 22:32:19 2000 -*************** -*** 224,226 **** - -! <dt>/etc/postfix/main.cf: - ---- 224,226 ---- - -! <dt>!!PREFIX!!/etc/postfix/main.cf: - -*************** -*** 237,239 **** - -! <dt>/etc/postfix/<a href="transport.5.html">transport</a>: - ---- 237,239 ---- - -! <dt>!!PREFIX!!/etc/postfix/<a href="transport.5.html">transport</a>: - -*************** -*** 253,255 **** - -! <dt>/etc/postfix/master.cf: - ---- 253,255 ---- - -! <dt>!!PREFIX!!/etc/postfix/master.cf: - diff --git a/mail/postfix1/files/patch-bl b/mail/postfix1/files/patch-bl deleted file mode 100644 index 176c7d1b64de..000000000000 --- a/mail/postfix1/files/patch-bl +++ /dev/null @@ -1,11 +0,0 @@ -*** ./html/regexp_table.5.html.orig Sat Apr 22 20:28:38 2000 ---- ./html/regexp_table.5.html Thu Jun 1 22:32:44 2000 -*************** -*** 11,13 **** - <b>SYNOPSIS</b> -! regexp:/etc/postfix/filename - ---- 11,13 ---- - <b>SYNOPSIS</b> -! regexp:!!PREFIX!!/etc/postfix/filename - diff --git a/mail/postfix1/files/patch-bm b/mail/postfix1/files/patch-bm deleted file mode 100644 index e5ccc2c50b94..000000000000 --- a/mail/postfix1/files/patch-bm +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/relocated.5.html.orig Tue Nov 21 21:37:54 2000 -+++ ./html/relocated.5.html Tue Nov 21 21:38:08 2000 -@@ -9,7 +9,7 @@ - relocated - format of Postfix relocated table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/relocated</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b> - - <b>DESCRIPTION</b> - The optional <b>relocated</b> table provides the information that -@@ -20,7 +20,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/relocated</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b> in order to rebuild the - indexed file after changing the relocated table. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix1/files/patch-bn b/mail/postfix1/files/patch-bn deleted file mode 100644 index 21e69dcaa40c..000000000000 --- a/mail/postfix1/files/patch-bn +++ /dev/null @@ -1,56 +0,0 @@ -*** ./html/rewrite.html.orig Sat May 8 17:51:41 1999 ---- ./html/rewrite.html Thu Jun 1 22:34:21 2000 -*************** -*** 194,196 **** - -! <dd><b>canonical_maps = hash:/etc/postfix/canonical</b> - ---- 194,196 ---- - -! <dd><b>canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical</b> - -*************** -*** 207,209 **** - -! <dd><b>sender_canonical_maps = hash:/etc/postfix/sender_canonical</b> - ---- 207,209 ---- - -! <dd><b>sender_canonical_maps = hash:!!PREFIX!!/etc/postfix/sender_canonical</b> - -*************** -*** 211,213 **** - -! <dd><b>recipient_canonical_maps = hash:/etc/postfix/recipient_canonical</b> - ---- 211,213 ---- - -! <dd><b>recipient_canonical_maps = hash:!!PREFIX!!/etc/postfix/recipient_canonical</b> - -*************** -*** 295,297 **** - -! <dd><b>virtual_maps = hash:/etc/postfix/virtual</b> - ---- 295,297 ---- - -! <dd><b>virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual</b> - -*************** -*** 323,325 **** - -! <dd><b>relocated_maps = hash:/etc/postfix/relocated</b> - ---- 323,325 ---- - -! <dd><b>relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated</b> - -*************** -*** 348,350 **** - -! <dd><b>transport_maps = hash:/etc/postfix/transport</b> - ---- 348,350 ---- - -! <dd><b>transport_maps = hash:!!PREFIX!!/etc/postfix/transport</b> - diff --git a/mail/postfix1/files/patch-bo b/mail/postfix1/files/patch-bo deleted file mode 100644 index b45270be8151..000000000000 --- a/mail/postfix1/files/patch-bo +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/transport.5.html.orig Tue Nov 21 21:43:00 2000 -+++ ./html/transport.5.html Tue Nov 21 21:43:20 2000 -@@ -9,7 +9,7 @@ - transport - format of Postfix transport table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/transport</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b> - - <b>DESCRIPTION</b> - The optional <b>transport</b> table specifies a mapping from -@@ -21,7 +21,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/transport</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b> in order to rebuild the - indexed file after changing the transport table. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix1/files/patch-bp b/mail/postfix1/files/patch-bp deleted file mode 100644 index 5206bfd4bfd0..000000000000 --- a/mail/postfix1/files/patch-bp +++ /dev/null @@ -1,43 +0,0 @@ ---- ./html/virtual.5.html.orig Tue Nov 21 21:46:50 2000 -+++ ./html/virtual.5.html Tue Nov 21 21:47:17 2000 -@@ -9,7 +9,7 @@ - virtual - format of Postfix virtual table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/virtual</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b> - - <b>DESCRIPTION</b> - The optional <b>virtual</b> table specifies address redirections -@@ -27,7 +27,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/virtual</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b> in order to rebuild the - indexed file after changing the text file. - - When the table is provided via other means such as NIS, -@@ -52,7 +52,7 @@ - - Support for a Postfix-style virtual domain looks like: - -- /etc/postfix/virtual: -+ !!PREFIX!!/etc/postfix/virtual: - <i>virtual.domain</i> <i>anything</i> (right-hand content does not matter) - <i>postmaster@virtual.domain</i> <i>postmaster</i> - <i>user1@virtual.domain</i> <i>address1</i> -@@ -94,11 +94,11 @@ - - Support for a Sendmail-style virtual domain looks like: - -- /etc/postfix/main.cf: -+ !!PREFIX!!/etc/postfix/main.cf: - mydestination = $myhostname localhost.$mydomain $mydomain - <i>virtual.domain</i> - -- /etc/postfix/virtual: -+ !!PREFIX!!/etc/postfix/virtual: - <i>user1@virtual.domain</i> <i>address1</i> - <i>user2@virtual.domain</i> <i>address2,</i> <i>address3</i> - diff --git a/mail/postfix1/files/patch-ca b/mail/postfix1/files/patch-ca deleted file mode 100644 index 86d56f80be30..000000000000 --- a/mail/postfix1/files/patch-ca +++ /dev/null @@ -1,11 +0,0 @@ -*** ./man/man1/postdrop.1.orig Mon May 3 15:03:29 1999 ---- ./man/man1/postdrop.1 Thu Jun 1 22:38:54 2000 -*************** -*** 53,55 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS ---- 53,55 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS diff --git a/mail/postfix1/files/patch-cb b/mail/postfix1/files/patch-cb deleted file mode 100644 index 58559c7273d1..000000000000 --- a/mail/postfix1/files/patch-cb +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man1/sendmail.1.orig Thu Mar 30 14:05:28 2000 ---- ./man/man1/sendmail.1 Thu Jun 1 22:39:16 2000 -*************** -*** 63,65 **** - The path name of the \fBsendmail.cf\fR file. Postfix configuration -! files are kept in \fB/etc/postfix\fR. - .IP "\fB-F \fIfull_name\fR ---- 63,65 ---- - The path name of the \fBsendmail.cf\fR file. Postfix configuration -! files are kept in \fB!!PREFIX!!/etc/postfix\fR. - .IP "\fB-F \fIfull_name\fR -*************** -*** 173,175 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS ---- 173,175 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS diff --git a/mail/postfix1/files/patch-cc b/mail/postfix1/files/patch-cc deleted file mode 100644 index cd6946003217..000000000000 --- a/mail/postfix1/files/patch-cc +++ /dev/null @@ -1,11 +0,0 @@ -*** ./man/man5/pcre_table.5.orig Thu Mar 30 14:05:28 2000 ---- ./man/man5/pcre_table.5 Thu Jun 1 22:39:34 2000 -*************** -*** 10,12 **** - .nf -! pcre:/etc/postfix/filename - .SH DESCRIPTION ---- 10,12 ---- - .nf -! pcre:!!PREFIX!!/etc/postfix/filename - .SH DESCRIPTION diff --git a/mail/postfix1/files/patch-cd b/mail/postfix1/files/patch-cd deleted file mode 100644 index b51de44d0bee..000000000000 --- a/mail/postfix1/files/patch-cd +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/access.5.orig Sat Apr 22 20:28:30 2000 ---- ./man/man5/access.5 Thu Jun 1 22:39:55 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/access\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/access\fR - .SH DESCRIPTION -*************** -*** 21,23 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed - file after changing the access table. ---- 21,23 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed - file after changing the access table. diff --git a/mail/postfix1/files/patch-ce b/mail/postfix1/files/patch-ce deleted file mode 100644 index f77053f8b3aa..000000000000 --- a/mail/postfix1/files/patch-ce +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/canonical.5.orig Sat Apr 22 20:28:30 2000 ---- ./man/man5/canonical.5 Thu Jun 1 22:40:18 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/canonical\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR - .SH DESCRIPTION -*************** -*** 21,23 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed - file after changing the canonical table. ---- 21,23 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed - file after changing the canonical table. diff --git a/mail/postfix1/files/patch-cf b/mail/postfix1/files/patch-cf deleted file mode 100644 index 28fb053b94a7..000000000000 --- a/mail/postfix1/files/patch-cf +++ /dev/null @@ -1,11 +0,0 @@ -*** ./man/man5/regexp_table.5.orig Thu Mar 30 14:05:28 2000 ---- ./man/man5/regexp_table.5 Thu Jun 1 22:40:43 2000 -*************** -*** 10,12 **** - .nf -! regexp:/etc/postfix/filename - .SH DESCRIPTION ---- 10,12 ---- - .nf -! regexp:!!PREFIX!!/etc/postfix/filename - .SH DESCRIPTION diff --git a/mail/postfix1/files/patch-cg b/mail/postfix1/files/patch-cg deleted file mode 100644 index 0ae82cc57669..000000000000 --- a/mail/postfix1/files/patch-cg +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/relocated.5.orig Sat Apr 22 20:28:31 2000 ---- ./man/man5/relocated.5 Thu Jun 1 22:41:05 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/relocated\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR - .SH DESCRIPTION -*************** -*** 20,22 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed - file after changing the relocated table. ---- 20,22 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed - file after changing the relocated table. diff --git a/mail/postfix1/files/patch-ch b/mail/postfix1/files/patch-ch deleted file mode 100644 index 3ed047ea474c..000000000000 --- a/mail/postfix1/files/patch-ch +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/transport.5.orig Sat Apr 22 20:28:31 2000 ---- ./man/man5/transport.5 Thu Jun 1 22:41:26 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/transport\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR - .SH DESCRIPTION -*************** -*** 21,23 **** - for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed - file after changing the transport table. ---- 21,23 ---- - for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed - file after changing the transport table. diff --git a/mail/postfix1/files/patch-ci b/mail/postfix1/files/patch-ci deleted file mode 100644 index 1a7cf4abbac7..000000000000 --- a/mail/postfix1/files/patch-ci +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/virtual.5.orig Sat Apr 22 20:28:31 2000 ---- ./man/man5/virtual.5 Thu Jun 1 22:41:51 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/virtual\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR - .SH DESCRIPTION -*************** -*** 26,28 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed - file after changing the virtual table. ---- 26,28 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed - file after changing the virtual table. diff --git a/mail/postfix1/files/patch-cj b/mail/postfix1/files/patch-cj deleted file mode 100644 index 50448f2ec26d..000000000000 --- a/mail/postfix1/files/patch-cj +++ /dev/null @@ -1,13 +0,0 @@ -*** ./man/man8/cleanup.8.orig Sun May 28 21:58:32 2000 ---- ./man/man8/cleanup.8 Thu Jun 1 22:42:21 2000 -*************** -*** 136,139 **** - .nf -! /etc/postfix/canonical*, canonical mapping table -! /etc/postfix/virtual*, virtual mapping table - .SH LICENSE ---- 136,139 ---- - .nf -! !!PREFIX!!/etc/postfix/canonical*, canonical mapping table -! !!PREFIX!!/etc/postfix/virtual*, virtual mapping table - .SH LICENSE diff --git a/mail/postfix1/files/patch-cl b/mail/postfix1/files/patch-cl deleted file mode 100644 index 44c8a3a7aae0..000000000000 --- a/mail/postfix1/files/patch-cl +++ /dev/null @@ -1,13 +0,0 @@ -*** ./man/man8/master.8.orig Tue Mar 7 10:48:19 2000 ---- ./man/man8/master.8 Thu Jun 1 22:43:02 2000 -*************** -*** 120,123 **** - .nf -! /etc/postfix/main.cf: global configuration file. -! /etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. ---- 120,123 ---- - .nf -! !!PREFIX!!/etc/postfix/main.cf: global configuration file. -! !!PREFIX!!/etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. diff --git a/mail/postfix1/files/patch-da b/mail/postfix1/files/patch-da deleted file mode 100644 index e57e31750d18..000000000000 --- a/mail/postfix1/files/patch-da +++ /dev/null @@ -1,11 +0,0 @@ -*** ./proto/regexp_table.orig Wed Mar 8 19:18:20 2000 ---- ./proto/regexp_table Thu Jun 1 22:44:43 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # regexp:/etc/postfix/filename - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # regexp:!!PREFIX!!/etc/postfix/filename - # DESCRIPTION diff --git a/mail/postfix1/files/patch-db b/mail/postfix1/files/patch-db deleted file mode 100644 index 7f89fb770783..000000000000 --- a/mail/postfix1/files/patch-db +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/access.orig Sun Apr 9 16:44:45 2000 ---- ./proto/access Thu Jun 1 22:45:05 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/access\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR - # DESCRIPTION -*************** -*** 15,17 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed - # file after changing the access table. ---- 15,17 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed - # file after changing the access table. diff --git a/mail/postfix1/files/patch-dc b/mail/postfix1/files/patch-dc deleted file mode 100644 index 786f2da45c32..000000000000 --- a/mail/postfix1/files/patch-dc +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/canonical.orig Sun Apr 9 16:43:37 2000 ---- ./proto/canonical Thu Jun 1 22:45:28 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/canonical\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR - # DESCRIPTION -*************** -*** 15,17 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed - # file after changing the canonical table. ---- 15,17 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed - # file after changing the canonical table. diff --git a/mail/postfix1/files/patch-dd b/mail/postfix1/files/patch-dd deleted file mode 100644 index b65a57ff7d57..000000000000 --- a/mail/postfix1/files/patch-dd +++ /dev/null @@ -1,11 +0,0 @@ -*** ./proto/pcre_table.orig Wed Mar 8 19:18:11 2000 ---- ./proto/pcre_table Thu Jun 1 22:45:41 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # pcre:/etc/postfix/filename - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # pcre:!!PREFIX!!/etc/postfix/filename - # DESCRIPTION diff --git a/mail/postfix1/files/patch-de b/mail/postfix1/files/patch-de deleted file mode 100644 index 73bb2af2261d..000000000000 --- a/mail/postfix1/files/patch-de +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/relocated.orig Sun Apr 9 16:47:31 2000 ---- ./proto/relocated Thu Jun 1 22:46:02 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/relocated\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR - # DESCRIPTION -*************** -*** 14,16 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed - # file after changing the relocated table. ---- 14,16 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed - # file after changing the relocated table. diff --git a/mail/postfix1/files/patch-df b/mail/postfix1/files/patch-df deleted file mode 100644 index 8d3fba96a224..000000000000 --- a/mail/postfix1/files/patch-df +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/transport.orig Sun Apr 9 17:05:45 2000 ---- ./proto/transport Thu Jun 1 22:46:23 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/transport\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR - # DESCRIPTION -*************** -*** 15,17 **** - # for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed - # file after changing the transport table. ---- 15,17 ---- - # for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed - # file after changing the transport table. diff --git a/mail/postfix1/files/patch-dg b/mail/postfix1/files/patch-dg deleted file mode 100644 index bff20a2cff3e..000000000000 --- a/mail/postfix1/files/patch-dg +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/virtual.orig Sun Apr 9 17:14:14 2000 ---- ./proto/virtual Thu Jun 1 22:46:40 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/virtual\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR - # DESCRIPTION -*************** -*** 20,22 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed - # file after changing the virtual table. ---- 20,22 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed - # file after changing the virtual table. diff --git a/mail/postfix1/files/patch-ea b/mail/postfix1/files/patch-ea deleted file mode 100644 index 6c3f98d2af4f..000000000000 --- a/mail/postfix1/files/patch-ea +++ /dev/null @@ -1,13 +0,0 @@ -*** ./src/cleanup/cleanup.c.orig Sun May 28 18:33:41 2000 ---- ./src/cleanup/cleanup.c Thu Jun 1 21:52:22 2000 -*************** -*** 118,121 **** - /* FILES -! /* /etc/postfix/canonical*, canonical mapping table -! /* /etc/postfix/virtual*, virtual mapping table - /* LICENSE ---- 118,121 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix/canonical*, canonical mapping table -! /* !!PREFIX!!/etc/postfix/virtual*, virtual mapping table - /* LICENSE diff --git a/mail/postfix1/files/patch-eb b/mail/postfix1/files/patch-eb deleted file mode 100644 index e67680963d2d..000000000000 --- a/mail/postfix1/files/patch-eb +++ /dev/null @@ -1,11 +0,0 @@ -*** ./src/global/mail_conf.c.orig Sun May 7 18:51:16 2000 ---- ./src/global/mail_conf.c Thu Jun 1 22:16:29 2000 -*************** -*** 53,55 **** - /* FILES -! /* /etc/postfix: default Postfix configuration directory. - /* ENVIRONMENT ---- 53,55 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix: default Postfix configuration directory. - /* ENVIRONMENT diff --git a/mail/postfix1/files/patch-ee b/mail/postfix1/files/patch-ee deleted file mode 100644 index ef44eac24b73..000000000000 --- a/mail/postfix1/files/patch-ee +++ /dev/null @@ -1,13 +0,0 @@ -*** ./src/master/master.c.orig Tue Mar 7 10:25:07 2000 ---- ./src/master/master.c Thu Jun 1 22:43:50 2000 -*************** -*** 104,107 **** - /* FILES -! /* /etc/postfix/main.cf: global configuration file. -! /* /etc/postfix/master.cf: master process configuration file. - /* /var/spool/postfix/pid/master.pid: master lock file. ---- 104,107 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix/main.cf: global configuration file. -! /* !!PREFIX!!/etc/postfix/master.cf: master process configuration file. - /* /var/spool/postfix/pid/master.pid: master lock file. diff --git a/mail/postfix1/files/patch-ef b/mail/postfix1/files/patch-ef deleted file mode 100644 index 586b304a103d..000000000000 --- a/mail/postfix1/files/patch-ef +++ /dev/null @@ -1,11 +0,0 @@ -*** ./src/postdrop/postdrop.c.orig Sun Apr 25 18:05:43 1999 ---- ./src/postdrop/postdrop.c Thu Jun 1 22:44:22 2000 -*************** -*** 39,41 **** - /* /var/spool/postfix, mail queue -! /* /etc/postfix, configuration files - /* CONFIGURATION PARAMETERS ---- 39,41 ---- - /* /var/spool/postfix, mail queue -! /* !!PREFIX!!/etc/postfix, configuration files - /* CONFIGURATION PARAMETERS diff --git a/mail/postfix1/files/patch-eg b/mail/postfix1/files/patch-eg deleted file mode 100644 index 2983bbfd86ea..000000000000 --- a/mail/postfix1/files/patch-eg +++ /dev/null @@ -1,20 +0,0 @@ -*** ./src/sendmail/sendmail.c.orig Tue Mar 14 10:42:06 2000 ---- ./src/sendmail/sendmail.c Thu Jun 1 22:47:24 2000 -*************** -*** 57,59 **** - /* The path name of the \fBsendmail.cf\fR file. Postfix configuration -! /* files are kept in \fB/etc/postfix\fR. - /* .IP "\fB-F \fIfull_name\fR ---- 57,59 ---- - /* The path name of the \fBsendmail.cf\fR file. Postfix configuration -! /* files are kept in \fB!!PREFIX!!/etc/postfix\fR. - /* .IP "\fB-F \fIfull_name\fR -*************** -*** 159,161 **** - /* /var/spool/postfix, mail queue -! /* /etc/postfix, configuration files - /* CONFIGURATION PARAMETERS ---- 159,161 ---- - /* /var/spool/postfix, mail queue -! /* !!PREFIX!!/etc/postfix, configuration files - /* CONFIGURATION PARAMETERS diff --git a/mail/postfix1/files/patch-eh b/mail/postfix1/files/patch-eh deleted file mode 100644 index c104c3680d21..000000000000 --- a/mail/postfix1/files/patch-eh +++ /dev/null @@ -1,11 +0,0 @@ -*** ./src/trivial-rewrite/transport.c.orig Tue Nov 16 19:15:41 1999 ---- ./src/trivial-rewrite/transport.c Thu Jun 1 22:47:49 2000 -*************** -*** 32,34 **** - /* FILES -! /* /etc/postfix/transport* - /* CONFIGURATION PARAMETERS ---- 32,34 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix/transport* - /* CONFIGURATION PARAMETERS diff --git a/mail/postfix1/pkg-message b/mail/postfix1/pkg-message index a7ae2b17e2a6..7fb3a804599c 100644 --- a/mail/postfix1/pkg-message +++ b/mail/postfix1/pkg-message @@ -8,10 +8,21 @@ sendmail_outbound_enable="NO" sendmail_submit_enable="NO" sendmail_msp_queue_enable="NO" -This will disable Sendmail completely. + **OR** +sendmail_enable="NONE" -Also, you may wish to disable some Sendmail-specific daily maintenance +then type this command as root: + +ln -s /usr/local/sbin/postfix /usr/local/etc/rc.d/postfix.sh + +Either of these will disable Sendmail completely. The latter form is useful +if you need to wait until other local package initialization (such as ldconfig +for Postgres or MySQL) is done. The former method will start postfix very +early on in the boot process. + + +Also, you will want to disable some Sendmail-specific daily maintenance routines in your /etc/periodic.conf file: daily_status_mail_rejects_enable="NO" diff --git a/mail/postfix20/Makefile b/mail/postfix20/Makefile index 6b47f15e39d2..6adf63b1ee81 100644 --- a/mail/postfix20/Makefile +++ b/mail/postfix20/Makefile @@ -12,7 +12,7 @@ # the options are the same names as in the scripts/configure.postfix file PORTNAME= postfix -PORTVERSION= 1.1.11 +PORTVERSION= 1.1.12 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -28,6 +28,7 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= khera@kciLink.com USE_SUBMAKE= yes +USE_REINPLACE= yes MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \ postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \ @@ -40,6 +41,10 @@ MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \ master.8 nqmgr.8 pickup.8 pipe.8 qmgr.8 qmqpd.8 showq.8 smtp.8 \ smtpd.8 spawn.8 trivial-rewrite.8 virtual.8 +# TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to +# patch it. +MAN8base=$(MAN8:S/tlsmgr.8//) + CONF1= main.cf master.cf access aliases canonical pcre_table regexp_table \ relocated transport virtual @@ -66,6 +71,27 @@ post-patch: CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ ${ECHO} "all: default" >> Makefile) +pre-patch: +.for file in ${MAN1} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/man/man1/${file} ${WRKSRC}/html/${file}.html +.endfor +.for file in ${MAN5} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/man/man5/${file} ${WRKSRC}/html/${file}.html +.endfor +.for file in ${MAN8base} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/man/man8/${file} ${WRKSRC}/html/${file}.html +.endfor +.for file in faq rate rewrite uce + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/html/${file}.html +.endfor +.for file in ${CONF1} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" ${WRKSRC}/conf/${file} +.endfor + pre-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL diff --git a/mail/postfix20/distinfo b/mail/postfix20/distinfo index 379358ed4749..832388cccb96 100644 --- a/mail/postfix20/distinfo +++ b/mail/postfix20/distinfo @@ -1,4 +1,4 @@ -MD5 (postfix/postfix-1.1.11.tar.gz) = b34bb2b5018327c19456a77814141208 +MD5 (postfix/postfix-1.1.12.tar.gz) = d1d0f9792ec6ea063ccca59184e54212 MD5 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz) = 11d82e9a3482f64af9d228f7a4319566 -MD5 (postfix/postfix-1.1.11+ipv6.patch.gz) = dc2a6362518025583a17305607eb8f0e +MD5 (postfix/postfix-1.1.12+ipv6.patch.gz) = add4396ce50ca61b5d9b67454fb51258 MD5 (postfix/postfix-pg.postfix-1.1.8.patch) = e0f4d910a6d6648d9b48e2244f2764ba diff --git a/mail/postfix20/files/patch-aa b/mail/postfix20/files/patch-aa deleted file mode 100644 index 51b40396bd5e..000000000000 --- a/mail/postfix20/files/patch-aa +++ /dev/null @@ -1,86 +0,0 @@ -*** ./conf/main.cf.orig Fri Jan 4 13:09:04 2002 ---- ./conf/main.cf Tue Jan 8 22:41:50 2002 -*************** -*** 31,44 **** - # The command_directory parameter specifies the location of all - # postXXX commands. The default value is $program_directory. - # -! command_directory = /usr/sbin - - # The daemon_directory parameter specifies the location of all Postfix - # daemon programs (i.e. programs listed in the master.cf file). The - # default value is $program_directory. This directory must be owned - # by root. - # -! daemon_directory = /usr/libexec/postfix - - # QUEUE AND PROCESS OWNERSHIP - # ---- 31,44 ---- - # The command_directory parameter specifies the location of all - # postXXX commands. The default value is $program_directory. - # -! command_directory = !!PREFIX!!/sbin - - # The daemon_directory parameter specifies the location of all Postfix - # daemon programs (i.e. programs listed in the master.cf file). The - # default value is $program_directory. This directory must be owned - # by root. - # -! daemon_directory = !!PREFIX!!/libexec/postfix - - # QUEUE AND PROCESS OWNERSHIP - # -*************** -*** 325,332 **** - # - # The home_mailbox parameter specifies the optional pathname of a - # mailbox file relative to a user's home directory. The default -! # mailbox file is /var/spool/mail/user or /var/mail/user. Specify -! # "Maildir/" for qmail-style delivery (the / is required). - # - #home_mailbox = Mailbox - #home_mailbox = Maildir/ ---- 325,332 ---- - # - # The home_mailbox parameter specifies the optional pathname of a - # mailbox file relative to a user's home directory. The default -! # mailbox file is /var/mail/user. Specify "Maildir/" for -! # qmail-style delivery (the / is required). - # - #home_mailbox = Mailbox - #home_mailbox = Maildir/ -*************** -*** 424,430 **** - # - # See also the body_checks example in the sample-filter.cf file. - # -! #header_checks = regexp:/etc/postfix/header_checks - - # FAST ETRN SERVICE - # ---- 424,430 ---- - # - # See also the body_checks example in the sample-filter.cf file. - # -! #header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks - - # FAST ETRN SERVICE - # -*************** -*** 525,531 **** - # commands. This must be a group name with a numerical group ID that - # is not shared with other accounts, not even with the Postfix account. - # -! setgid_group = - - # manpage_path: The location of the Postfix on-line manual pages. - # ---- 525,531 ---- - # commands. This must be a group name with a numerical group ID that - # is not shared with other accounts, not even with the Postfix account. - # -! setgid_group = maildrop - - # manpage_path: The location of the Postfix on-line manual pages. - # diff --git a/mail/postfix20/files/patch-ab b/mail/postfix20/files/patch-ab deleted file mode 100644 index 7c81d3dc12c9..000000000000 --- a/mail/postfix20/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/canonical.orig Tue Mar 7 10:42:58 2000 ---- ./conf/canonical Thu Jun 1 21:53:23 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/canonical - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/canonical - # diff --git a/mail/postfix20/files/patch-ac b/mail/postfix20/files/patch-ac deleted file mode 100644 index 0fb2192cdd84..000000000000 --- a/mail/postfix20/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/access.orig Tue Mar 7 10:42:58 2000 ---- ./conf/access Thu Jun 1 21:53:36 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/access - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/access - # diff --git a/mail/postfix20/files/patch-ad b/mail/postfix20/files/patch-ad deleted file mode 100644 index c1b102574165..000000000000 --- a/mail/postfix20/files/patch-ad +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/pcre_table.orig Thu Mar 9 20:36:19 2000 ---- ./conf/pcre_table Thu Jun 1 22:02:08 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # pcre:/etc/postfix/filename - # ---- 7,9 ---- - # SYNOPSIS -! # pcre:!!PREFIX!!/etc/postfix/filename - # diff --git a/mail/postfix20/files/patch-ae b/mail/postfix20/files/patch-ae deleted file mode 100644 index e396dd8626db..000000000000 --- a/mail/postfix20/files/patch-ae +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/regexp_table.orig Thu Mar 9 20:36:19 2000 ---- ./conf/regexp_table Thu Jun 1 22:03:27 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # regexp:/etc/postfix/filename - # ---- 7,9 ---- - # SYNOPSIS -! # regexp:!!PREFIX!!/etc/postfix/filename - # diff --git a/mail/postfix20/files/patch-af b/mail/postfix20/files/patch-af deleted file mode 100644 index 8fca6b208941..000000000000 --- a/mail/postfix20/files/patch-af +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/relocated.orig Tue Mar 7 10:42:58 2000 ---- ./conf/relocated Thu Jun 1 22:03:59 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/relocated - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/relocated - # diff --git a/mail/postfix20/files/patch-ag b/mail/postfix20/files/patch-ag deleted file mode 100644 index 54c0fa918d3b..000000000000 --- a/mail/postfix20/files/patch-ag +++ /dev/null @@ -1,15 +0,0 @@ -*** ./conf/sample-auth.cf.orig Sun May 28 17:55:19 2000 ---- ./conf/sample-auth.cf Thu Jun 1 22:05:32 2000 -*************** -*** 91,95 **** - # The Postfix SMTP client opens the lookup table before going to -! # chroot jail, so you can leave the password file in /etc/postfix. - # -! smtp_sasl_password_maps = hash:/etc/postfix/saslpass - ---- 91,95 ---- - # The Postfix SMTP client opens the lookup table before going to -! # chroot jail, so you can leave the password file in !!PREFIX!!/etc/postfix. - # -! smtp_sasl_password_maps = hash:!!PREFIX!!/etc/postfix/saslpass - diff --git a/mail/postfix20/files/patch-ah b/mail/postfix20/files/patch-ah deleted file mode 100644 index a8c70a15a78d..000000000000 --- a/mail/postfix20/files/patch-ah +++ /dev/null @@ -1,44 +0,0 @@ -*** ./conf/sample-canonical.cf.orig Thu Sep 23 14:10:38 1999 ---- ./conf/sample-canonical.cf Thu Jun 1 22:07:23 2000 -*************** -*** 14,16 **** - # -! # If you use this feature, run "postmap /etc/postfix/canonical" to - # build the necessary DBM or DB file after every change. The changes ---- 14,16 ---- - # -! # If you use this feature, run "postmap !!PREFIX!!/etc/postfix/canonical" to - # build the necessary DBM or DB file after every change. The changes -*************** -*** 19,24 **** - # -! #canonical_maps = dbm:/etc/postfix/canonical -! #canonical_maps = hash:/etc/postfix/canonical -! #canonical_maps = hash:/etc/postfix/canonical, nis:canonical -! #canonical_maps = hash:/etc/postfix/canonical, netinfo:/canonical - canonical_maps = ---- 19,24 ---- - # -! #canonical_maps = dbm:!!PREFIX!!/etc/postfix/canonical -! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical -! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical, nis:canonical -! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical, netinfo:/canonical - canonical_maps = -*************** -*** 32,34 **** - # -! #recipient_canonical_maps = hash:/etc/postfix/recipient_canonical - recipient_canonical_maps = ---- 32,34 ---- - # -! #recipient_canonical_maps = hash:!!PREFIX!!/etc/postfix/recipient_canonical - recipient_canonical_maps = -*************** -*** 46,48 **** - # -! #sender_canonical_maps = hash:/etc/postfix/sender_canonical - sender_canonical_maps = ---- 46,48 ---- - # -! #sender_canonical_maps = hash:!!PREFIX!!/etc/postfix/sender_canonical - sender_canonical_maps = diff --git a/mail/postfix20/files/patch-ai b/mail/postfix20/files/patch-ai deleted file mode 100644 index f7aa2fd5f4c6..000000000000 --- a/mail/postfix20/files/patch-ai +++ /dev/null @@ -1,18 +0,0 @@ -*** ./conf/sample-filter.cf.orig Mon May 29 11:30:44 2000 ---- ./conf/sample-filter.cf Thu Jun 1 22:07:58 2000 -*************** -*** 15,17 **** - # -! header_checks = regexp:/etc/postfix/header_checks - ---- 15,17 ---- - # -! header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks - -*************** -*** 26,27 **** - # -! body_checks = regexp:/etc/postfix/body_checks ---- 26,27 ---- - # -! body_checks = regexp:!!PREFIX!!/etc/postfix/body_checks diff --git a/mail/postfix20/files/patch-aj b/mail/postfix20/files/patch-aj deleted file mode 100644 index 241d48132551..000000000000 --- a/mail/postfix20/files/patch-aj +++ /dev/null @@ -1,24 +0,0 @@ -*** ./conf/sample-misc.cf.orig Thu Sep 23 14:10:52 1999 ---- ./conf/sample-misc.cf Thu Jun 1 22:09:39 2000 -*************** -*** 220,222 **** - # -! program_directory = /usr/libexec/postfix - ---- 220,222 ---- - # -! program_directory = !!PREFIX!!/libexec/postfix - -*************** -*** 263,267 **** - # Specify the types and names of databases to use. After change, -! # run "postmap /etc/postfix/relocated", then "postfix reload". - # -! #relocated_maps = hash:/etc/postfix/relocated - relocated_maps = ---- 263,267 ---- - # Specify the types and names of databases to use. After change, -! # run "postmap !!PREFIX!!/etc/postfix/relocated", then "postfix reload". - # -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated - relocated_maps = diff --git a/mail/postfix20/files/patch-ak b/mail/postfix20/files/patch-ak deleted file mode 100644 index 250dd411a4bd..000000000000 --- a/mail/postfix20/files/patch-ak +++ /dev/null @@ -1,26 +0,0 @@ -*** ./conf/sample-relocated.cf.orig Thu Sep 23 14:11:17 1999 ---- ./conf/sample-relocated.cf Thu Jun 1 22:10:43 2000 -*************** -*** 12,14 **** - # -! # If you use this feature, run "postmap /etc/postfix/relocated" to - # build the necessary DBM or DB file after change, then "postfix ---- 12,14 ---- - # -! # If you use this feature, run "postmap !!PREFIX!!/etc/postfix/relocated" to - # build the necessary DBM or DB file after change, then "postfix -*************** -*** 16,21 **** - # -! #relocated_maps = dbm:/etc/postfix/relocated -! #relocated_maps = hash:/etc/postfix/relocated -! #relocated_maps = hash:/etc/postfix/relocated, nis:virtual -! #relocated_maps = hash:/etc/postfix/relocated, netinfo:/relocated - relocated_maps = ---- 16,21 ---- - # -! #relocated_maps = dbm:!!PREFIX!!/etc/postfix/relocated -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated, nis:virtual -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated, netinfo:/relocated - relocated_maps = diff --git a/mail/postfix20/files/patch-al b/mail/postfix20/files/patch-al deleted file mode 100644 index 799206da0c96..000000000000 --- a/mail/postfix20/files/patch-al +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/sample-smtpd.cf.orig Mon Dec 27 19:41:37 1999 ---- ./conf/sample-smtpd.cf Thu Jun 1 22:11:22 2000 -*************** -*** 183,185 **** - #smtpd_sender_restrictions = reject_unknown_sender_domain -! #smtpd_sender_restrictions = reject_unknown_sender_domain, hash:/etc/postfix/access - smtpd_sender_restrictions = ---- 183,185 ---- - #smtpd_sender_restrictions = reject_unknown_sender_domain -! #smtpd_sender_restrictions = reject_unknown_sender_domain, hash:!!PREFIX!!/etc/postfix/access - smtpd_sender_restrictions = diff --git a/mail/postfix20/files/patch-am b/mail/postfix20/files/patch-am deleted file mode 100644 index 2d395fa9ca03..000000000000 --- a/mail/postfix20/files/patch-am +++ /dev/null @@ -1,23 +0,0 @@ -*** ./conf/sample-transport.cf.orig Thu Dec 23 10:50:00 1999 ---- ./conf/sample-transport.cf Thu Jun 1 22:13:09 2000 -*************** -*** 10,18 **** - # By default, this feature is disabled. Specify the types of databases -! # to use. If you use this feature, run "postmap /etc/postfix/transport" - # after change, then "postfix reload". - # -! #transport_maps = dbm:/etc/postfix/transport -! #transport_maps = hash:/etc/postfix/transport -! #transport_maps = hash:/etc/postfix/transport, nis:transport -! #transport_maps = hash:/etc/postfix/transport, netinfo:/transport - transport_maps = ---- 10,18 ---- - # By default, this feature is disabled. Specify the types of databases -! # to use. If you use this feature, run "postmap !!PREFIX!!/etc/postfix/transport" - # after change, then "postfix reload". - # -! #transport_maps = dbm:!!PREFIX!!/etc/postfix/transport -! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport -! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport, nis:transport -! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport, netinfo:/transport - transport_maps = diff --git a/mail/postfix20/files/patch-an b/mail/postfix20/files/patch-an deleted file mode 100644 index af5ac7cc031b..000000000000 --- a/mail/postfix20/files/patch-an +++ /dev/null @@ -1,26 +0,0 @@ -*** ./conf/sample-virtual.cf.orig Mon Dec 20 21:00:42 1999 ---- ./conf/sample-virtual.cf Thu Jun 1 22:13:32 2000 -*************** -*** 12,14 **** - # -! # If you use this feature, run "postmap /etc/postfix/virtual" to - # build the necessary DBM or DB file after change. ---- 12,14 ---- - # -! # If you use this feature, run "postmap !!PREFIX!!/etc/postfix/virtual" to - # build the necessary DBM or DB file after change. -*************** -*** 18,23 **** - # -! #virtual_maps = dbm:/etc/postfix/virtual -! #virtual_maps = hash:/etc/postfix/virtual -! #virtual_maps = hash:/etc/postfix/virtual, nis:virtual -! #virtual_maps = hash:/etc/postfix/virtual, netinfo:/virtual - virtual_maps = ---- 18,23 ---- - # -! #virtual_maps = dbm:!!PREFIX!!/etc/postfix/virtual -! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual -! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual, nis:virtual -! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual, netinfo:/virtual - virtual_maps = diff --git a/mail/postfix20/files/patch-ao b/mail/postfix20/files/patch-ao deleted file mode 100644 index fd854e181601..000000000000 --- a/mail/postfix20/files/patch-ao +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/transport.orig Tue Mar 7 10:42:58 2000 ---- ./conf/transport Thu Jun 1 22:13:41 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/transport - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/transport - # diff --git a/mail/postfix20/files/patch-ap b/mail/postfix20/files/patch-ap deleted file mode 100644 index 4598192cd5c1..000000000000 --- a/mail/postfix20/files/patch-ap +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/virtual.orig Tue Mar 7 10:42:59 2000 ---- ./conf/virtual Thu Jun 1 22:13:54 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/virtual - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/virtual - # diff --git a/mail/postfix20/files/patch-ba b/mail/postfix20/files/patch-ba deleted file mode 100644 index ccb54ec60a7a..000000000000 --- a/mail/postfix20/files/patch-ba +++ /dev/null @@ -1,20 +0,0 @@ -*** ./html/mailq.1.html.orig Sat Apr 22 20:28:36 2000 ---- ./html/mailq.1.html Thu Jun 1 22:19:24 2000 -*************** -*** 83,85 **** - The path name of the <b>sendmail.cf</b> file. Postfix con- -! figuration files are kept in <b>/etc/postfix</b>. - ---- 83,85 ---- - The path name of the <b>sendmail.cf</b> file. Postfix con- -! figuration files are kept in <b>!!PREFIX!!/etc/postfix</b>. - -*************** -*** 231,233 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - ---- 231,233 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - diff --git a/mail/postfix20/files/patch-bb b/mail/postfix20/files/patch-bb deleted file mode 100644 index ea744664dfa7..000000000000 --- a/mail/postfix20/files/patch-bb +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/access.5.html.orig Tue Nov 21 21:24:13 2000 -+++ ./html/access.5.html Tue Nov 21 21:24:34 2000 -@@ -9,7 +9,7 @@ - access - format of Postfix access table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/access</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b> - - <b>DESCRIPTION</b> - The optional <b>access</b> table directs the Postfix SMTP server -@@ -21,7 +21,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/access</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b> in order to rebuild the - indexed file after changing the access table. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix20/files/patch-bc b/mail/postfix20/files/patch-bc deleted file mode 100644 index e407a9650585..000000000000 --- a/mail/postfix20/files/patch-bc +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/canonical.5.html.orig Tue Nov 21 21:32:38 2000 -+++ ./html/canonical.5.html Tue Nov 21 21:33:21 2000 -@@ -9,7 +9,7 @@ - canonical - format of Postfix canonical table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/canonical</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b> - - <b>DESCRIPTION</b> - The optional <b>canonical</b> table specifies an address mapping -@@ -20,7 +20,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/canonical</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b> in order to rebuild the - indexed file after changing the text file. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix20/files/patch-be b/mail/postfix20/files/patch-be deleted file mode 100644 index bef6a3bfaf73..000000000000 --- a/mail/postfix20/files/patch-be +++ /dev/null @@ -1,10 +0,0 @@ ---- ./html/faq.html.orig Sat Oct 28 23:34:51 2000 -+++ ./html/faq.html Sat Oct 28 23:36:04 2000 -@@ -2572,7 +2572,7 @@ - - Answer: instead of using <b>/usr/include/ndbm.h</b>, you're building - Postfix with some incompatible third-party file, typically --<b>/usr/local/include/ndbm.h</b>. -+<b>!!PREFIX!!/include/ndbm.h</b>. - - <p> diff --git a/mail/postfix20/files/patch-bf b/mail/postfix20/files/patch-bf deleted file mode 100644 index d652e1e567b3..000000000000 --- a/mail/postfix20/files/patch-bf +++ /dev/null @@ -1,13 +0,0 @@ -*** ./html/cleanup.8.html.orig Sun May 28 21:58:41 2000 ---- ./html/cleanup.8.html Thu Jun 1 22:29:04 2000 -*************** -*** 174,177 **** - <b>FILES</b> -! /etc/postfix/canonical*, canonical mapping table -! /etc/postfix/virtual*, virtual mapping table - ---- 174,177 ---- - <b>FILES</b> -! !!PREFIX!!/etc/postfix/canonical*, canonical mapping table -! !!PREFIX!!/etc/postfix/virtual*, virtual mapping table - diff --git a/mail/postfix20/files/patch-bg b/mail/postfix20/files/patch-bg deleted file mode 100644 index ce2454eaef01..000000000000 --- a/mail/postfix20/files/patch-bg +++ /dev/null @@ -1,13 +0,0 @@ -*** ./html/master.8.html.orig Tue Mar 7 10:48:56 2000 ---- ./html/master.8.html Thu Jun 1 22:29:24 2000 -*************** -*** 148,151 **** - <b>FILES</b> -! /etc/postfix/main.cf: global configuration file. -! /etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. ---- 148,151 ---- - <b>FILES</b> -! !!PREFIX!!/etc/postfix/main.cf: global configuration file. -! !!PREFIX!!/etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. diff --git a/mail/postfix20/files/patch-bh b/mail/postfix20/files/patch-bh deleted file mode 100644 index a20232e6796a..000000000000 --- a/mail/postfix20/files/patch-bh +++ /dev/null @@ -1,11 +0,0 @@ -*** ./html/goals.html.orig Sun May 9 15:44:18 1999 ---- ./html/goals.html Thu Jun 1 22:30:14 2000 -*************** -*** 45,47 **** - <li>Compatibility. Postfix is designed to be sendmail-compatible -! to make migration easy. Postfix supports <b>/var[/spool]/mail</b>, - <b>/etc/aliases</b>, <b>NIS</b>, and <b>~/.forward</b> files. ---- 45,47 ---- - <li>Compatibility. Postfix is designed to be sendmail-compatible -! to make migration easy. Postfix supports <b>/var/mail</b>, - <b>/etc/aliases</b>, <b>NIS</b>, and <b>~/.forward</b> files. diff --git a/mail/postfix20/files/patch-bi b/mail/postfix20/files/patch-bi deleted file mode 100644 index 7e4acdb0c126..000000000000 --- a/mail/postfix20/files/patch-bi +++ /dev/null @@ -1,11 +0,0 @@ -*** ./html/postdrop.1.html.orig Mon May 3 15:05:12 1999 ---- ./html/postdrop.1.html Thu Jun 1 22:30:47 2000 -*************** -*** 48,50 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - ---- 48,50 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - diff --git a/mail/postfix20/files/patch-bj b/mail/postfix20/files/patch-bj deleted file mode 100644 index 00e78d01ba5a..000000000000 --- a/mail/postfix20/files/patch-bj +++ /dev/null @@ -1,42 +0,0 @@ -*** ./html/uce.html.orig Fri Dec 31 15:06:07 1999 ---- ./html/uce.html Thu Jun 1 22:31:37 2000 -*************** -*** 126,130 **** - -! <dd> <b>header_checks = regexp:/etc/postfix/header_checks</b> - -! <dd> <b>header_checks = pcre:/etc/postfix/header_checks</b> - ---- 126,130 ---- - -! <dd> <b>header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks</b> - -! <dd> <b>header_checks = pcre:!!PREFIX!!/etc/postfix/header_checks</b> - -*************** -*** 169,171 **** - -! <dd> <b>smtpd_client_restrictions = hash:/etc/postfix/access, - reject_maps_rbl</b> ---- 169,171 ---- - -! <dd> <b>smtpd_client_restrictions = hash:!!PREFIX!!/etc/postfix/access, - reject_maps_rbl</b> -*************** -*** 474,476 **** - -! <dd> <b>smtpd_sender_restrictions = hash:/etc/postfix/access, - reject_unknown_sender_domain</b> ---- 474,476 ---- - -! <dd> <b>smtpd_sender_restrictions = hash:!!PREFIX!!/etc/postfix/access, - reject_unknown_sender_domain</b> -*************** -*** 856,858 **** - <dd> <b>smtpd_etrn_restrictions = permit_mynetworks, -! hash:/etc/postfix/etrn_access, reject</b> - ---- 856,858 ---- - <dd> <b>smtpd_etrn_restrictions = permit_mynetworks, -! hash:!!PREFIX!!/etc/postfix/etrn_access, reject</b> - diff --git a/mail/postfix20/files/patch-bk b/mail/postfix20/files/patch-bk deleted file mode 100644 index 62a0573559ae..000000000000 --- a/mail/postfix20/files/patch-bk +++ /dev/null @@ -1,29 +0,0 @@ -*** ./html/rate.html.orig Wed Mar 17 17:55:22 1999 ---- ./html/rate.html Thu Jun 1 22:32:19 2000 -*************** -*** 224,226 **** - -! <dt>/etc/postfix/main.cf: - ---- 224,226 ---- - -! <dt>!!PREFIX!!/etc/postfix/main.cf: - -*************** -*** 237,239 **** - -! <dt>/etc/postfix/<a href="transport.5.html">transport</a>: - ---- 237,239 ---- - -! <dt>!!PREFIX!!/etc/postfix/<a href="transport.5.html">transport</a>: - -*************** -*** 253,255 **** - -! <dt>/etc/postfix/master.cf: - ---- 253,255 ---- - -! <dt>!!PREFIX!!/etc/postfix/master.cf: - diff --git a/mail/postfix20/files/patch-bl b/mail/postfix20/files/patch-bl deleted file mode 100644 index 176c7d1b64de..000000000000 --- a/mail/postfix20/files/patch-bl +++ /dev/null @@ -1,11 +0,0 @@ -*** ./html/regexp_table.5.html.orig Sat Apr 22 20:28:38 2000 ---- ./html/regexp_table.5.html Thu Jun 1 22:32:44 2000 -*************** -*** 11,13 **** - <b>SYNOPSIS</b> -! regexp:/etc/postfix/filename - ---- 11,13 ---- - <b>SYNOPSIS</b> -! regexp:!!PREFIX!!/etc/postfix/filename - diff --git a/mail/postfix20/files/patch-bm b/mail/postfix20/files/patch-bm deleted file mode 100644 index e5ccc2c50b94..000000000000 --- a/mail/postfix20/files/patch-bm +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/relocated.5.html.orig Tue Nov 21 21:37:54 2000 -+++ ./html/relocated.5.html Tue Nov 21 21:38:08 2000 -@@ -9,7 +9,7 @@ - relocated - format of Postfix relocated table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/relocated</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b> - - <b>DESCRIPTION</b> - The optional <b>relocated</b> table provides the information that -@@ -20,7 +20,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/relocated</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b> in order to rebuild the - indexed file after changing the relocated table. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix20/files/patch-bn b/mail/postfix20/files/patch-bn deleted file mode 100644 index 21e69dcaa40c..000000000000 --- a/mail/postfix20/files/patch-bn +++ /dev/null @@ -1,56 +0,0 @@ -*** ./html/rewrite.html.orig Sat May 8 17:51:41 1999 ---- ./html/rewrite.html Thu Jun 1 22:34:21 2000 -*************** -*** 194,196 **** - -! <dd><b>canonical_maps = hash:/etc/postfix/canonical</b> - ---- 194,196 ---- - -! <dd><b>canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical</b> - -*************** -*** 207,209 **** - -! <dd><b>sender_canonical_maps = hash:/etc/postfix/sender_canonical</b> - ---- 207,209 ---- - -! <dd><b>sender_canonical_maps = hash:!!PREFIX!!/etc/postfix/sender_canonical</b> - -*************** -*** 211,213 **** - -! <dd><b>recipient_canonical_maps = hash:/etc/postfix/recipient_canonical</b> - ---- 211,213 ---- - -! <dd><b>recipient_canonical_maps = hash:!!PREFIX!!/etc/postfix/recipient_canonical</b> - -*************** -*** 295,297 **** - -! <dd><b>virtual_maps = hash:/etc/postfix/virtual</b> - ---- 295,297 ---- - -! <dd><b>virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual</b> - -*************** -*** 323,325 **** - -! <dd><b>relocated_maps = hash:/etc/postfix/relocated</b> - ---- 323,325 ---- - -! <dd><b>relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated</b> - -*************** -*** 348,350 **** - -! <dd><b>transport_maps = hash:/etc/postfix/transport</b> - ---- 348,350 ---- - -! <dd><b>transport_maps = hash:!!PREFIX!!/etc/postfix/transport</b> - diff --git a/mail/postfix20/files/patch-bo b/mail/postfix20/files/patch-bo deleted file mode 100644 index b45270be8151..000000000000 --- a/mail/postfix20/files/patch-bo +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/transport.5.html.orig Tue Nov 21 21:43:00 2000 -+++ ./html/transport.5.html Tue Nov 21 21:43:20 2000 -@@ -9,7 +9,7 @@ - transport - format of Postfix transport table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/transport</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b> - - <b>DESCRIPTION</b> - The optional <b>transport</b> table specifies a mapping from -@@ -21,7 +21,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/transport</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b> in order to rebuild the - indexed file after changing the transport table. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix20/files/patch-bp b/mail/postfix20/files/patch-bp deleted file mode 100644 index 5206bfd4bfd0..000000000000 --- a/mail/postfix20/files/patch-bp +++ /dev/null @@ -1,43 +0,0 @@ ---- ./html/virtual.5.html.orig Tue Nov 21 21:46:50 2000 -+++ ./html/virtual.5.html Tue Nov 21 21:47:17 2000 -@@ -9,7 +9,7 @@ - virtual - format of Postfix virtual table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/virtual</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b> - - <b>DESCRIPTION</b> - The optional <b>virtual</b> table specifies address redirections -@@ -27,7 +27,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/virtual</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b> in order to rebuild the - indexed file after changing the text file. - - When the table is provided via other means such as NIS, -@@ -52,7 +52,7 @@ - - Support for a Postfix-style virtual domain looks like: - -- /etc/postfix/virtual: -+ !!PREFIX!!/etc/postfix/virtual: - <i>virtual.domain</i> <i>anything</i> (right-hand content does not matter) - <i>postmaster@virtual.domain</i> <i>postmaster</i> - <i>user1@virtual.domain</i> <i>address1</i> -@@ -94,11 +94,11 @@ - - Support for a Sendmail-style virtual domain looks like: - -- /etc/postfix/main.cf: -+ !!PREFIX!!/etc/postfix/main.cf: - mydestination = $myhostname localhost.$mydomain $mydomain - <i>virtual.domain</i> - -- /etc/postfix/virtual: -+ !!PREFIX!!/etc/postfix/virtual: - <i>user1@virtual.domain</i> <i>address1</i> - <i>user2@virtual.domain</i> <i>address2,</i> <i>address3</i> - diff --git a/mail/postfix20/files/patch-ca b/mail/postfix20/files/patch-ca deleted file mode 100644 index 86d56f80be30..000000000000 --- a/mail/postfix20/files/patch-ca +++ /dev/null @@ -1,11 +0,0 @@ -*** ./man/man1/postdrop.1.orig Mon May 3 15:03:29 1999 ---- ./man/man1/postdrop.1 Thu Jun 1 22:38:54 2000 -*************** -*** 53,55 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS ---- 53,55 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS diff --git a/mail/postfix20/files/patch-cb b/mail/postfix20/files/patch-cb deleted file mode 100644 index 58559c7273d1..000000000000 --- a/mail/postfix20/files/patch-cb +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man1/sendmail.1.orig Thu Mar 30 14:05:28 2000 ---- ./man/man1/sendmail.1 Thu Jun 1 22:39:16 2000 -*************** -*** 63,65 **** - The path name of the \fBsendmail.cf\fR file. Postfix configuration -! files are kept in \fB/etc/postfix\fR. - .IP "\fB-F \fIfull_name\fR ---- 63,65 ---- - The path name of the \fBsendmail.cf\fR file. Postfix configuration -! files are kept in \fB!!PREFIX!!/etc/postfix\fR. - .IP "\fB-F \fIfull_name\fR -*************** -*** 173,175 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS ---- 173,175 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS diff --git a/mail/postfix20/files/patch-cc b/mail/postfix20/files/patch-cc deleted file mode 100644 index cd6946003217..000000000000 --- a/mail/postfix20/files/patch-cc +++ /dev/null @@ -1,11 +0,0 @@ -*** ./man/man5/pcre_table.5.orig Thu Mar 30 14:05:28 2000 ---- ./man/man5/pcre_table.5 Thu Jun 1 22:39:34 2000 -*************** -*** 10,12 **** - .nf -! pcre:/etc/postfix/filename - .SH DESCRIPTION ---- 10,12 ---- - .nf -! pcre:!!PREFIX!!/etc/postfix/filename - .SH DESCRIPTION diff --git a/mail/postfix20/files/patch-cd b/mail/postfix20/files/patch-cd deleted file mode 100644 index b51de44d0bee..000000000000 --- a/mail/postfix20/files/patch-cd +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/access.5.orig Sat Apr 22 20:28:30 2000 ---- ./man/man5/access.5 Thu Jun 1 22:39:55 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/access\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/access\fR - .SH DESCRIPTION -*************** -*** 21,23 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed - file after changing the access table. ---- 21,23 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed - file after changing the access table. diff --git a/mail/postfix20/files/patch-ce b/mail/postfix20/files/patch-ce deleted file mode 100644 index f77053f8b3aa..000000000000 --- a/mail/postfix20/files/patch-ce +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/canonical.5.orig Sat Apr 22 20:28:30 2000 ---- ./man/man5/canonical.5 Thu Jun 1 22:40:18 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/canonical\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR - .SH DESCRIPTION -*************** -*** 21,23 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed - file after changing the canonical table. ---- 21,23 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed - file after changing the canonical table. diff --git a/mail/postfix20/files/patch-cf b/mail/postfix20/files/patch-cf deleted file mode 100644 index 28fb053b94a7..000000000000 --- a/mail/postfix20/files/patch-cf +++ /dev/null @@ -1,11 +0,0 @@ -*** ./man/man5/regexp_table.5.orig Thu Mar 30 14:05:28 2000 ---- ./man/man5/regexp_table.5 Thu Jun 1 22:40:43 2000 -*************** -*** 10,12 **** - .nf -! regexp:/etc/postfix/filename - .SH DESCRIPTION ---- 10,12 ---- - .nf -! regexp:!!PREFIX!!/etc/postfix/filename - .SH DESCRIPTION diff --git a/mail/postfix20/files/patch-cg b/mail/postfix20/files/patch-cg deleted file mode 100644 index 0ae82cc57669..000000000000 --- a/mail/postfix20/files/patch-cg +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/relocated.5.orig Sat Apr 22 20:28:31 2000 ---- ./man/man5/relocated.5 Thu Jun 1 22:41:05 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/relocated\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR - .SH DESCRIPTION -*************** -*** 20,22 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed - file after changing the relocated table. ---- 20,22 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed - file after changing the relocated table. diff --git a/mail/postfix20/files/patch-ch b/mail/postfix20/files/patch-ch deleted file mode 100644 index 3ed047ea474c..000000000000 --- a/mail/postfix20/files/patch-ch +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/transport.5.orig Sat Apr 22 20:28:31 2000 ---- ./man/man5/transport.5 Thu Jun 1 22:41:26 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/transport\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR - .SH DESCRIPTION -*************** -*** 21,23 **** - for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed - file after changing the transport table. ---- 21,23 ---- - for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed - file after changing the transport table. diff --git a/mail/postfix20/files/patch-ci b/mail/postfix20/files/patch-ci deleted file mode 100644 index 1a7cf4abbac7..000000000000 --- a/mail/postfix20/files/patch-ci +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/virtual.5.orig Sat Apr 22 20:28:31 2000 ---- ./man/man5/virtual.5 Thu Jun 1 22:41:51 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/virtual\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR - .SH DESCRIPTION -*************** -*** 26,28 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed - file after changing the virtual table. ---- 26,28 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed - file after changing the virtual table. diff --git a/mail/postfix20/files/patch-cj b/mail/postfix20/files/patch-cj deleted file mode 100644 index 50448f2ec26d..000000000000 --- a/mail/postfix20/files/patch-cj +++ /dev/null @@ -1,13 +0,0 @@ -*** ./man/man8/cleanup.8.orig Sun May 28 21:58:32 2000 ---- ./man/man8/cleanup.8 Thu Jun 1 22:42:21 2000 -*************** -*** 136,139 **** - .nf -! /etc/postfix/canonical*, canonical mapping table -! /etc/postfix/virtual*, virtual mapping table - .SH LICENSE ---- 136,139 ---- - .nf -! !!PREFIX!!/etc/postfix/canonical*, canonical mapping table -! !!PREFIX!!/etc/postfix/virtual*, virtual mapping table - .SH LICENSE diff --git a/mail/postfix20/files/patch-cl b/mail/postfix20/files/patch-cl deleted file mode 100644 index 44c8a3a7aae0..000000000000 --- a/mail/postfix20/files/patch-cl +++ /dev/null @@ -1,13 +0,0 @@ -*** ./man/man8/master.8.orig Tue Mar 7 10:48:19 2000 ---- ./man/man8/master.8 Thu Jun 1 22:43:02 2000 -*************** -*** 120,123 **** - .nf -! /etc/postfix/main.cf: global configuration file. -! /etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. ---- 120,123 ---- - .nf -! !!PREFIX!!/etc/postfix/main.cf: global configuration file. -! !!PREFIX!!/etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. diff --git a/mail/postfix20/files/patch-da b/mail/postfix20/files/patch-da deleted file mode 100644 index e57e31750d18..000000000000 --- a/mail/postfix20/files/patch-da +++ /dev/null @@ -1,11 +0,0 @@ -*** ./proto/regexp_table.orig Wed Mar 8 19:18:20 2000 ---- ./proto/regexp_table Thu Jun 1 22:44:43 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # regexp:/etc/postfix/filename - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # regexp:!!PREFIX!!/etc/postfix/filename - # DESCRIPTION diff --git a/mail/postfix20/files/patch-db b/mail/postfix20/files/patch-db deleted file mode 100644 index 7f89fb770783..000000000000 --- a/mail/postfix20/files/patch-db +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/access.orig Sun Apr 9 16:44:45 2000 ---- ./proto/access Thu Jun 1 22:45:05 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/access\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR - # DESCRIPTION -*************** -*** 15,17 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed - # file after changing the access table. ---- 15,17 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed - # file after changing the access table. diff --git a/mail/postfix20/files/patch-dc b/mail/postfix20/files/patch-dc deleted file mode 100644 index 786f2da45c32..000000000000 --- a/mail/postfix20/files/patch-dc +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/canonical.orig Sun Apr 9 16:43:37 2000 ---- ./proto/canonical Thu Jun 1 22:45:28 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/canonical\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR - # DESCRIPTION -*************** -*** 15,17 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed - # file after changing the canonical table. ---- 15,17 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed - # file after changing the canonical table. diff --git a/mail/postfix20/files/patch-dd b/mail/postfix20/files/patch-dd deleted file mode 100644 index b65a57ff7d57..000000000000 --- a/mail/postfix20/files/patch-dd +++ /dev/null @@ -1,11 +0,0 @@ -*** ./proto/pcre_table.orig Wed Mar 8 19:18:11 2000 ---- ./proto/pcre_table Thu Jun 1 22:45:41 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # pcre:/etc/postfix/filename - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # pcre:!!PREFIX!!/etc/postfix/filename - # DESCRIPTION diff --git a/mail/postfix20/files/patch-de b/mail/postfix20/files/patch-de deleted file mode 100644 index 73bb2af2261d..000000000000 --- a/mail/postfix20/files/patch-de +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/relocated.orig Sun Apr 9 16:47:31 2000 ---- ./proto/relocated Thu Jun 1 22:46:02 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/relocated\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR - # DESCRIPTION -*************** -*** 14,16 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed - # file after changing the relocated table. ---- 14,16 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed - # file after changing the relocated table. diff --git a/mail/postfix20/files/patch-df b/mail/postfix20/files/patch-df deleted file mode 100644 index 8d3fba96a224..000000000000 --- a/mail/postfix20/files/patch-df +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/transport.orig Sun Apr 9 17:05:45 2000 ---- ./proto/transport Thu Jun 1 22:46:23 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/transport\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR - # DESCRIPTION -*************** -*** 15,17 **** - # for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed - # file after changing the transport table. ---- 15,17 ---- - # for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed - # file after changing the transport table. diff --git a/mail/postfix20/files/patch-dg b/mail/postfix20/files/patch-dg deleted file mode 100644 index bff20a2cff3e..000000000000 --- a/mail/postfix20/files/patch-dg +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/virtual.orig Sun Apr 9 17:14:14 2000 ---- ./proto/virtual Thu Jun 1 22:46:40 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/virtual\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR - # DESCRIPTION -*************** -*** 20,22 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed - # file after changing the virtual table. ---- 20,22 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed - # file after changing the virtual table. diff --git a/mail/postfix20/files/patch-ea b/mail/postfix20/files/patch-ea deleted file mode 100644 index 6c3f98d2af4f..000000000000 --- a/mail/postfix20/files/patch-ea +++ /dev/null @@ -1,13 +0,0 @@ -*** ./src/cleanup/cleanup.c.orig Sun May 28 18:33:41 2000 ---- ./src/cleanup/cleanup.c Thu Jun 1 21:52:22 2000 -*************** -*** 118,121 **** - /* FILES -! /* /etc/postfix/canonical*, canonical mapping table -! /* /etc/postfix/virtual*, virtual mapping table - /* LICENSE ---- 118,121 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix/canonical*, canonical mapping table -! /* !!PREFIX!!/etc/postfix/virtual*, virtual mapping table - /* LICENSE diff --git a/mail/postfix20/files/patch-eb b/mail/postfix20/files/patch-eb deleted file mode 100644 index e67680963d2d..000000000000 --- a/mail/postfix20/files/patch-eb +++ /dev/null @@ -1,11 +0,0 @@ -*** ./src/global/mail_conf.c.orig Sun May 7 18:51:16 2000 ---- ./src/global/mail_conf.c Thu Jun 1 22:16:29 2000 -*************** -*** 53,55 **** - /* FILES -! /* /etc/postfix: default Postfix configuration directory. - /* ENVIRONMENT ---- 53,55 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix: default Postfix configuration directory. - /* ENVIRONMENT diff --git a/mail/postfix20/files/patch-ee b/mail/postfix20/files/patch-ee deleted file mode 100644 index ef44eac24b73..000000000000 --- a/mail/postfix20/files/patch-ee +++ /dev/null @@ -1,13 +0,0 @@ -*** ./src/master/master.c.orig Tue Mar 7 10:25:07 2000 ---- ./src/master/master.c Thu Jun 1 22:43:50 2000 -*************** -*** 104,107 **** - /* FILES -! /* /etc/postfix/main.cf: global configuration file. -! /* /etc/postfix/master.cf: master process configuration file. - /* /var/spool/postfix/pid/master.pid: master lock file. ---- 104,107 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix/main.cf: global configuration file. -! /* !!PREFIX!!/etc/postfix/master.cf: master process configuration file. - /* /var/spool/postfix/pid/master.pid: master lock file. diff --git a/mail/postfix20/files/patch-ef b/mail/postfix20/files/patch-ef deleted file mode 100644 index 586b304a103d..000000000000 --- a/mail/postfix20/files/patch-ef +++ /dev/null @@ -1,11 +0,0 @@ -*** ./src/postdrop/postdrop.c.orig Sun Apr 25 18:05:43 1999 ---- ./src/postdrop/postdrop.c Thu Jun 1 22:44:22 2000 -*************** -*** 39,41 **** - /* /var/spool/postfix, mail queue -! /* /etc/postfix, configuration files - /* CONFIGURATION PARAMETERS ---- 39,41 ---- - /* /var/spool/postfix, mail queue -! /* !!PREFIX!!/etc/postfix, configuration files - /* CONFIGURATION PARAMETERS diff --git a/mail/postfix20/files/patch-eg b/mail/postfix20/files/patch-eg deleted file mode 100644 index 2983bbfd86ea..000000000000 --- a/mail/postfix20/files/patch-eg +++ /dev/null @@ -1,20 +0,0 @@ -*** ./src/sendmail/sendmail.c.orig Tue Mar 14 10:42:06 2000 ---- ./src/sendmail/sendmail.c Thu Jun 1 22:47:24 2000 -*************** -*** 57,59 **** - /* The path name of the \fBsendmail.cf\fR file. Postfix configuration -! /* files are kept in \fB/etc/postfix\fR. - /* .IP "\fB-F \fIfull_name\fR ---- 57,59 ---- - /* The path name of the \fBsendmail.cf\fR file. Postfix configuration -! /* files are kept in \fB!!PREFIX!!/etc/postfix\fR. - /* .IP "\fB-F \fIfull_name\fR -*************** -*** 159,161 **** - /* /var/spool/postfix, mail queue -! /* /etc/postfix, configuration files - /* CONFIGURATION PARAMETERS ---- 159,161 ---- - /* /var/spool/postfix, mail queue -! /* !!PREFIX!!/etc/postfix, configuration files - /* CONFIGURATION PARAMETERS diff --git a/mail/postfix20/files/patch-eh b/mail/postfix20/files/patch-eh deleted file mode 100644 index c104c3680d21..000000000000 --- a/mail/postfix20/files/patch-eh +++ /dev/null @@ -1,11 +0,0 @@ -*** ./src/trivial-rewrite/transport.c.orig Tue Nov 16 19:15:41 1999 ---- ./src/trivial-rewrite/transport.c Thu Jun 1 22:47:49 2000 -*************** -*** 32,34 **** - /* FILES -! /* /etc/postfix/transport* - /* CONFIGURATION PARAMETERS ---- 32,34 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix/transport* - /* CONFIGURATION PARAMETERS diff --git a/mail/postfix20/pkg-message b/mail/postfix20/pkg-message index a7ae2b17e2a6..7fb3a804599c 100644 --- a/mail/postfix20/pkg-message +++ b/mail/postfix20/pkg-message @@ -8,10 +8,21 @@ sendmail_outbound_enable="NO" sendmail_submit_enable="NO" sendmail_msp_queue_enable="NO" -This will disable Sendmail completely. + **OR** +sendmail_enable="NONE" -Also, you may wish to disable some Sendmail-specific daily maintenance +then type this command as root: + +ln -s /usr/local/sbin/postfix /usr/local/etc/rc.d/postfix.sh + +Either of these will disable Sendmail completely. The latter form is useful +if you need to wait until other local package initialization (such as ldconfig +for Postgres or MySQL) is done. The former method will start postfix very +early on in the boot process. + + +Also, you will want to disable some Sendmail-specific daily maintenance routines in your /etc/periodic.conf file: daily_status_mail_rejects_enable="NO" diff --git a/mail/postfix21/Makefile b/mail/postfix21/Makefile index 6b47f15e39d2..6adf63b1ee81 100644 --- a/mail/postfix21/Makefile +++ b/mail/postfix21/Makefile @@ -12,7 +12,7 @@ # the options are the same names as in the scripts/configure.postfix file PORTNAME= postfix -PORTVERSION= 1.1.11 +PORTVERSION= 1.1.12 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -28,6 +28,7 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= khera@kciLink.com USE_SUBMAKE= yes +USE_REINPLACE= yes MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \ postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \ @@ -40,6 +41,10 @@ MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \ master.8 nqmgr.8 pickup.8 pipe.8 qmgr.8 qmqpd.8 showq.8 smtp.8 \ smtpd.8 spawn.8 trivial-rewrite.8 virtual.8 +# TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to +# patch it. +MAN8base=$(MAN8:S/tlsmgr.8//) + CONF1= main.cf master.cf access aliases canonical pcre_table regexp_table \ relocated transport virtual @@ -66,6 +71,27 @@ post-patch: CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ ${ECHO} "all: default" >> Makefile) +pre-patch: +.for file in ${MAN1} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/man/man1/${file} ${WRKSRC}/html/${file}.html +.endfor +.for file in ${MAN5} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/man/man5/${file} ${WRKSRC}/html/${file}.html +.endfor +.for file in ${MAN8base} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/man/man8/${file} ${WRKSRC}/html/${file}.html +.endfor +.for file in faq rate rewrite uce + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/html/${file}.html +.endfor +.for file in ${CONF1} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" ${WRKSRC}/conf/${file} +.endfor + pre-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL diff --git a/mail/postfix21/distinfo b/mail/postfix21/distinfo index 379358ed4749..832388cccb96 100644 --- a/mail/postfix21/distinfo +++ b/mail/postfix21/distinfo @@ -1,4 +1,4 @@ -MD5 (postfix/postfix-1.1.11.tar.gz) = b34bb2b5018327c19456a77814141208 +MD5 (postfix/postfix-1.1.12.tar.gz) = d1d0f9792ec6ea063ccca59184e54212 MD5 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz) = 11d82e9a3482f64af9d228f7a4319566 -MD5 (postfix/postfix-1.1.11+ipv6.patch.gz) = dc2a6362518025583a17305607eb8f0e +MD5 (postfix/postfix-1.1.12+ipv6.patch.gz) = add4396ce50ca61b5d9b67454fb51258 MD5 (postfix/postfix-pg.postfix-1.1.8.patch) = e0f4d910a6d6648d9b48e2244f2764ba diff --git a/mail/postfix21/files/patch-aa b/mail/postfix21/files/patch-aa deleted file mode 100644 index 51b40396bd5e..000000000000 --- a/mail/postfix21/files/patch-aa +++ /dev/null @@ -1,86 +0,0 @@ -*** ./conf/main.cf.orig Fri Jan 4 13:09:04 2002 ---- ./conf/main.cf Tue Jan 8 22:41:50 2002 -*************** -*** 31,44 **** - # The command_directory parameter specifies the location of all - # postXXX commands. The default value is $program_directory. - # -! command_directory = /usr/sbin - - # The daemon_directory parameter specifies the location of all Postfix - # daemon programs (i.e. programs listed in the master.cf file). The - # default value is $program_directory. This directory must be owned - # by root. - # -! daemon_directory = /usr/libexec/postfix - - # QUEUE AND PROCESS OWNERSHIP - # ---- 31,44 ---- - # The command_directory parameter specifies the location of all - # postXXX commands. The default value is $program_directory. - # -! command_directory = !!PREFIX!!/sbin - - # The daemon_directory parameter specifies the location of all Postfix - # daemon programs (i.e. programs listed in the master.cf file). The - # default value is $program_directory. This directory must be owned - # by root. - # -! daemon_directory = !!PREFIX!!/libexec/postfix - - # QUEUE AND PROCESS OWNERSHIP - # -*************** -*** 325,332 **** - # - # The home_mailbox parameter specifies the optional pathname of a - # mailbox file relative to a user's home directory. The default -! # mailbox file is /var/spool/mail/user or /var/mail/user. Specify -! # "Maildir/" for qmail-style delivery (the / is required). - # - #home_mailbox = Mailbox - #home_mailbox = Maildir/ ---- 325,332 ---- - # - # The home_mailbox parameter specifies the optional pathname of a - # mailbox file relative to a user's home directory. The default -! # mailbox file is /var/mail/user. Specify "Maildir/" for -! # qmail-style delivery (the / is required). - # - #home_mailbox = Mailbox - #home_mailbox = Maildir/ -*************** -*** 424,430 **** - # - # See also the body_checks example in the sample-filter.cf file. - # -! #header_checks = regexp:/etc/postfix/header_checks - - # FAST ETRN SERVICE - # ---- 424,430 ---- - # - # See also the body_checks example in the sample-filter.cf file. - # -! #header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks - - # FAST ETRN SERVICE - # -*************** -*** 525,531 **** - # commands. This must be a group name with a numerical group ID that - # is not shared with other accounts, not even with the Postfix account. - # -! setgid_group = - - # manpage_path: The location of the Postfix on-line manual pages. - # ---- 525,531 ---- - # commands. This must be a group name with a numerical group ID that - # is not shared with other accounts, not even with the Postfix account. - # -! setgid_group = maildrop - - # manpage_path: The location of the Postfix on-line manual pages. - # diff --git a/mail/postfix21/files/patch-ab b/mail/postfix21/files/patch-ab deleted file mode 100644 index 7c81d3dc12c9..000000000000 --- a/mail/postfix21/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/canonical.orig Tue Mar 7 10:42:58 2000 ---- ./conf/canonical Thu Jun 1 21:53:23 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/canonical - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/canonical - # diff --git a/mail/postfix21/files/patch-ac b/mail/postfix21/files/patch-ac deleted file mode 100644 index 0fb2192cdd84..000000000000 --- a/mail/postfix21/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/access.orig Tue Mar 7 10:42:58 2000 ---- ./conf/access Thu Jun 1 21:53:36 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/access - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/access - # diff --git a/mail/postfix21/files/patch-ad b/mail/postfix21/files/patch-ad deleted file mode 100644 index c1b102574165..000000000000 --- a/mail/postfix21/files/patch-ad +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/pcre_table.orig Thu Mar 9 20:36:19 2000 ---- ./conf/pcre_table Thu Jun 1 22:02:08 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # pcre:/etc/postfix/filename - # ---- 7,9 ---- - # SYNOPSIS -! # pcre:!!PREFIX!!/etc/postfix/filename - # diff --git a/mail/postfix21/files/patch-ae b/mail/postfix21/files/patch-ae deleted file mode 100644 index e396dd8626db..000000000000 --- a/mail/postfix21/files/patch-ae +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/regexp_table.orig Thu Mar 9 20:36:19 2000 ---- ./conf/regexp_table Thu Jun 1 22:03:27 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # regexp:/etc/postfix/filename - # ---- 7,9 ---- - # SYNOPSIS -! # regexp:!!PREFIX!!/etc/postfix/filename - # diff --git a/mail/postfix21/files/patch-af b/mail/postfix21/files/patch-af deleted file mode 100644 index 8fca6b208941..000000000000 --- a/mail/postfix21/files/patch-af +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/relocated.orig Tue Mar 7 10:42:58 2000 ---- ./conf/relocated Thu Jun 1 22:03:59 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/relocated - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/relocated - # diff --git a/mail/postfix21/files/patch-ag b/mail/postfix21/files/patch-ag deleted file mode 100644 index 54c0fa918d3b..000000000000 --- a/mail/postfix21/files/patch-ag +++ /dev/null @@ -1,15 +0,0 @@ -*** ./conf/sample-auth.cf.orig Sun May 28 17:55:19 2000 ---- ./conf/sample-auth.cf Thu Jun 1 22:05:32 2000 -*************** -*** 91,95 **** - # The Postfix SMTP client opens the lookup table before going to -! # chroot jail, so you can leave the password file in /etc/postfix. - # -! smtp_sasl_password_maps = hash:/etc/postfix/saslpass - ---- 91,95 ---- - # The Postfix SMTP client opens the lookup table before going to -! # chroot jail, so you can leave the password file in !!PREFIX!!/etc/postfix. - # -! smtp_sasl_password_maps = hash:!!PREFIX!!/etc/postfix/saslpass - diff --git a/mail/postfix21/files/patch-ah b/mail/postfix21/files/patch-ah deleted file mode 100644 index a8c70a15a78d..000000000000 --- a/mail/postfix21/files/patch-ah +++ /dev/null @@ -1,44 +0,0 @@ -*** ./conf/sample-canonical.cf.orig Thu Sep 23 14:10:38 1999 ---- ./conf/sample-canonical.cf Thu Jun 1 22:07:23 2000 -*************** -*** 14,16 **** - # -! # If you use this feature, run "postmap /etc/postfix/canonical" to - # build the necessary DBM or DB file after every change. The changes ---- 14,16 ---- - # -! # If you use this feature, run "postmap !!PREFIX!!/etc/postfix/canonical" to - # build the necessary DBM or DB file after every change. The changes -*************** -*** 19,24 **** - # -! #canonical_maps = dbm:/etc/postfix/canonical -! #canonical_maps = hash:/etc/postfix/canonical -! #canonical_maps = hash:/etc/postfix/canonical, nis:canonical -! #canonical_maps = hash:/etc/postfix/canonical, netinfo:/canonical - canonical_maps = ---- 19,24 ---- - # -! #canonical_maps = dbm:!!PREFIX!!/etc/postfix/canonical -! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical -! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical, nis:canonical -! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical, netinfo:/canonical - canonical_maps = -*************** -*** 32,34 **** - # -! #recipient_canonical_maps = hash:/etc/postfix/recipient_canonical - recipient_canonical_maps = ---- 32,34 ---- - # -! #recipient_canonical_maps = hash:!!PREFIX!!/etc/postfix/recipient_canonical - recipient_canonical_maps = -*************** -*** 46,48 **** - # -! #sender_canonical_maps = hash:/etc/postfix/sender_canonical - sender_canonical_maps = ---- 46,48 ---- - # -! #sender_canonical_maps = hash:!!PREFIX!!/etc/postfix/sender_canonical - sender_canonical_maps = diff --git a/mail/postfix21/files/patch-ai b/mail/postfix21/files/patch-ai deleted file mode 100644 index f7aa2fd5f4c6..000000000000 --- a/mail/postfix21/files/patch-ai +++ /dev/null @@ -1,18 +0,0 @@ -*** ./conf/sample-filter.cf.orig Mon May 29 11:30:44 2000 ---- ./conf/sample-filter.cf Thu Jun 1 22:07:58 2000 -*************** -*** 15,17 **** - # -! header_checks = regexp:/etc/postfix/header_checks - ---- 15,17 ---- - # -! header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks - -*************** -*** 26,27 **** - # -! body_checks = regexp:/etc/postfix/body_checks ---- 26,27 ---- - # -! body_checks = regexp:!!PREFIX!!/etc/postfix/body_checks diff --git a/mail/postfix21/files/patch-aj b/mail/postfix21/files/patch-aj deleted file mode 100644 index 241d48132551..000000000000 --- a/mail/postfix21/files/patch-aj +++ /dev/null @@ -1,24 +0,0 @@ -*** ./conf/sample-misc.cf.orig Thu Sep 23 14:10:52 1999 ---- ./conf/sample-misc.cf Thu Jun 1 22:09:39 2000 -*************** -*** 220,222 **** - # -! program_directory = /usr/libexec/postfix - ---- 220,222 ---- - # -! program_directory = !!PREFIX!!/libexec/postfix - -*************** -*** 263,267 **** - # Specify the types and names of databases to use. After change, -! # run "postmap /etc/postfix/relocated", then "postfix reload". - # -! #relocated_maps = hash:/etc/postfix/relocated - relocated_maps = ---- 263,267 ---- - # Specify the types and names of databases to use. After change, -! # run "postmap !!PREFIX!!/etc/postfix/relocated", then "postfix reload". - # -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated - relocated_maps = diff --git a/mail/postfix21/files/patch-ak b/mail/postfix21/files/patch-ak deleted file mode 100644 index 250dd411a4bd..000000000000 --- a/mail/postfix21/files/patch-ak +++ /dev/null @@ -1,26 +0,0 @@ -*** ./conf/sample-relocated.cf.orig Thu Sep 23 14:11:17 1999 ---- ./conf/sample-relocated.cf Thu Jun 1 22:10:43 2000 -*************** -*** 12,14 **** - # -! # If you use this feature, run "postmap /etc/postfix/relocated" to - # build the necessary DBM or DB file after change, then "postfix ---- 12,14 ---- - # -! # If you use this feature, run "postmap !!PREFIX!!/etc/postfix/relocated" to - # build the necessary DBM or DB file after change, then "postfix -*************** -*** 16,21 **** - # -! #relocated_maps = dbm:/etc/postfix/relocated -! #relocated_maps = hash:/etc/postfix/relocated -! #relocated_maps = hash:/etc/postfix/relocated, nis:virtual -! #relocated_maps = hash:/etc/postfix/relocated, netinfo:/relocated - relocated_maps = ---- 16,21 ---- - # -! #relocated_maps = dbm:!!PREFIX!!/etc/postfix/relocated -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated, nis:virtual -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated, netinfo:/relocated - relocated_maps = diff --git a/mail/postfix21/files/patch-al b/mail/postfix21/files/patch-al deleted file mode 100644 index 799206da0c96..000000000000 --- a/mail/postfix21/files/patch-al +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/sample-smtpd.cf.orig Mon Dec 27 19:41:37 1999 ---- ./conf/sample-smtpd.cf Thu Jun 1 22:11:22 2000 -*************** -*** 183,185 **** - #smtpd_sender_restrictions = reject_unknown_sender_domain -! #smtpd_sender_restrictions = reject_unknown_sender_domain, hash:/etc/postfix/access - smtpd_sender_restrictions = ---- 183,185 ---- - #smtpd_sender_restrictions = reject_unknown_sender_domain -! #smtpd_sender_restrictions = reject_unknown_sender_domain, hash:!!PREFIX!!/etc/postfix/access - smtpd_sender_restrictions = diff --git a/mail/postfix21/files/patch-am b/mail/postfix21/files/patch-am deleted file mode 100644 index 2d395fa9ca03..000000000000 --- a/mail/postfix21/files/patch-am +++ /dev/null @@ -1,23 +0,0 @@ -*** ./conf/sample-transport.cf.orig Thu Dec 23 10:50:00 1999 ---- ./conf/sample-transport.cf Thu Jun 1 22:13:09 2000 -*************** -*** 10,18 **** - # By default, this feature is disabled. Specify the types of databases -! # to use. If you use this feature, run "postmap /etc/postfix/transport" - # after change, then "postfix reload". - # -! #transport_maps = dbm:/etc/postfix/transport -! #transport_maps = hash:/etc/postfix/transport -! #transport_maps = hash:/etc/postfix/transport, nis:transport -! #transport_maps = hash:/etc/postfix/transport, netinfo:/transport - transport_maps = ---- 10,18 ---- - # By default, this feature is disabled. Specify the types of databases -! # to use. If you use this feature, run "postmap !!PREFIX!!/etc/postfix/transport" - # after change, then "postfix reload". - # -! #transport_maps = dbm:!!PREFIX!!/etc/postfix/transport -! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport -! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport, nis:transport -! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport, netinfo:/transport - transport_maps = diff --git a/mail/postfix21/files/patch-an b/mail/postfix21/files/patch-an deleted file mode 100644 index af5ac7cc031b..000000000000 --- a/mail/postfix21/files/patch-an +++ /dev/null @@ -1,26 +0,0 @@ -*** ./conf/sample-virtual.cf.orig Mon Dec 20 21:00:42 1999 ---- ./conf/sample-virtual.cf Thu Jun 1 22:13:32 2000 -*************** -*** 12,14 **** - # -! # If you use this feature, run "postmap /etc/postfix/virtual" to - # build the necessary DBM or DB file after change. ---- 12,14 ---- - # -! # If you use this feature, run "postmap !!PREFIX!!/etc/postfix/virtual" to - # build the necessary DBM or DB file after change. -*************** -*** 18,23 **** - # -! #virtual_maps = dbm:/etc/postfix/virtual -! #virtual_maps = hash:/etc/postfix/virtual -! #virtual_maps = hash:/etc/postfix/virtual, nis:virtual -! #virtual_maps = hash:/etc/postfix/virtual, netinfo:/virtual - virtual_maps = ---- 18,23 ---- - # -! #virtual_maps = dbm:!!PREFIX!!/etc/postfix/virtual -! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual -! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual, nis:virtual -! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual, netinfo:/virtual - virtual_maps = diff --git a/mail/postfix21/files/patch-ao b/mail/postfix21/files/patch-ao deleted file mode 100644 index fd854e181601..000000000000 --- a/mail/postfix21/files/patch-ao +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/transport.orig Tue Mar 7 10:42:58 2000 ---- ./conf/transport Thu Jun 1 22:13:41 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/transport - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/transport - # diff --git a/mail/postfix21/files/patch-ap b/mail/postfix21/files/patch-ap deleted file mode 100644 index 4598192cd5c1..000000000000 --- a/mail/postfix21/files/patch-ap +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/virtual.orig Tue Mar 7 10:42:59 2000 ---- ./conf/virtual Thu Jun 1 22:13:54 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/virtual - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/virtual - # diff --git a/mail/postfix21/files/patch-ba b/mail/postfix21/files/patch-ba deleted file mode 100644 index ccb54ec60a7a..000000000000 --- a/mail/postfix21/files/patch-ba +++ /dev/null @@ -1,20 +0,0 @@ -*** ./html/mailq.1.html.orig Sat Apr 22 20:28:36 2000 ---- ./html/mailq.1.html Thu Jun 1 22:19:24 2000 -*************** -*** 83,85 **** - The path name of the <b>sendmail.cf</b> file. Postfix con- -! figuration files are kept in <b>/etc/postfix</b>. - ---- 83,85 ---- - The path name of the <b>sendmail.cf</b> file. Postfix con- -! figuration files are kept in <b>!!PREFIX!!/etc/postfix</b>. - -*************** -*** 231,233 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - ---- 231,233 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - diff --git a/mail/postfix21/files/patch-bb b/mail/postfix21/files/patch-bb deleted file mode 100644 index ea744664dfa7..000000000000 --- a/mail/postfix21/files/patch-bb +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/access.5.html.orig Tue Nov 21 21:24:13 2000 -+++ ./html/access.5.html Tue Nov 21 21:24:34 2000 -@@ -9,7 +9,7 @@ - access - format of Postfix access table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/access</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b> - - <b>DESCRIPTION</b> - The optional <b>access</b> table directs the Postfix SMTP server -@@ -21,7 +21,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/access</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b> in order to rebuild the - indexed file after changing the access table. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix21/files/patch-bc b/mail/postfix21/files/patch-bc deleted file mode 100644 index e407a9650585..000000000000 --- a/mail/postfix21/files/patch-bc +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/canonical.5.html.orig Tue Nov 21 21:32:38 2000 -+++ ./html/canonical.5.html Tue Nov 21 21:33:21 2000 -@@ -9,7 +9,7 @@ - canonical - format of Postfix canonical table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/canonical</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b> - - <b>DESCRIPTION</b> - The optional <b>canonical</b> table specifies an address mapping -@@ -20,7 +20,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/canonical</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b> in order to rebuild the - indexed file after changing the text file. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix21/files/patch-be b/mail/postfix21/files/patch-be deleted file mode 100644 index bef6a3bfaf73..000000000000 --- a/mail/postfix21/files/patch-be +++ /dev/null @@ -1,10 +0,0 @@ ---- ./html/faq.html.orig Sat Oct 28 23:34:51 2000 -+++ ./html/faq.html Sat Oct 28 23:36:04 2000 -@@ -2572,7 +2572,7 @@ - - Answer: instead of using <b>/usr/include/ndbm.h</b>, you're building - Postfix with some incompatible third-party file, typically --<b>/usr/local/include/ndbm.h</b>. -+<b>!!PREFIX!!/include/ndbm.h</b>. - - <p> diff --git a/mail/postfix21/files/patch-bf b/mail/postfix21/files/patch-bf deleted file mode 100644 index d652e1e567b3..000000000000 --- a/mail/postfix21/files/patch-bf +++ /dev/null @@ -1,13 +0,0 @@ -*** ./html/cleanup.8.html.orig Sun May 28 21:58:41 2000 ---- ./html/cleanup.8.html Thu Jun 1 22:29:04 2000 -*************** -*** 174,177 **** - <b>FILES</b> -! /etc/postfix/canonical*, canonical mapping table -! /etc/postfix/virtual*, virtual mapping table - ---- 174,177 ---- - <b>FILES</b> -! !!PREFIX!!/etc/postfix/canonical*, canonical mapping table -! !!PREFIX!!/etc/postfix/virtual*, virtual mapping table - diff --git a/mail/postfix21/files/patch-bg b/mail/postfix21/files/patch-bg deleted file mode 100644 index ce2454eaef01..000000000000 --- a/mail/postfix21/files/patch-bg +++ /dev/null @@ -1,13 +0,0 @@ -*** ./html/master.8.html.orig Tue Mar 7 10:48:56 2000 ---- ./html/master.8.html Thu Jun 1 22:29:24 2000 -*************** -*** 148,151 **** - <b>FILES</b> -! /etc/postfix/main.cf: global configuration file. -! /etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. ---- 148,151 ---- - <b>FILES</b> -! !!PREFIX!!/etc/postfix/main.cf: global configuration file. -! !!PREFIX!!/etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. diff --git a/mail/postfix21/files/patch-bh b/mail/postfix21/files/patch-bh deleted file mode 100644 index a20232e6796a..000000000000 --- a/mail/postfix21/files/patch-bh +++ /dev/null @@ -1,11 +0,0 @@ -*** ./html/goals.html.orig Sun May 9 15:44:18 1999 ---- ./html/goals.html Thu Jun 1 22:30:14 2000 -*************** -*** 45,47 **** - <li>Compatibility. Postfix is designed to be sendmail-compatible -! to make migration easy. Postfix supports <b>/var[/spool]/mail</b>, - <b>/etc/aliases</b>, <b>NIS</b>, and <b>~/.forward</b> files. ---- 45,47 ---- - <li>Compatibility. Postfix is designed to be sendmail-compatible -! to make migration easy. Postfix supports <b>/var/mail</b>, - <b>/etc/aliases</b>, <b>NIS</b>, and <b>~/.forward</b> files. diff --git a/mail/postfix21/files/patch-bi b/mail/postfix21/files/patch-bi deleted file mode 100644 index 7e4acdb0c126..000000000000 --- a/mail/postfix21/files/patch-bi +++ /dev/null @@ -1,11 +0,0 @@ -*** ./html/postdrop.1.html.orig Mon May 3 15:05:12 1999 ---- ./html/postdrop.1.html Thu Jun 1 22:30:47 2000 -*************** -*** 48,50 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - ---- 48,50 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - diff --git a/mail/postfix21/files/patch-bj b/mail/postfix21/files/patch-bj deleted file mode 100644 index 00e78d01ba5a..000000000000 --- a/mail/postfix21/files/patch-bj +++ /dev/null @@ -1,42 +0,0 @@ -*** ./html/uce.html.orig Fri Dec 31 15:06:07 1999 ---- ./html/uce.html Thu Jun 1 22:31:37 2000 -*************** -*** 126,130 **** - -! <dd> <b>header_checks = regexp:/etc/postfix/header_checks</b> - -! <dd> <b>header_checks = pcre:/etc/postfix/header_checks</b> - ---- 126,130 ---- - -! <dd> <b>header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks</b> - -! <dd> <b>header_checks = pcre:!!PREFIX!!/etc/postfix/header_checks</b> - -*************** -*** 169,171 **** - -! <dd> <b>smtpd_client_restrictions = hash:/etc/postfix/access, - reject_maps_rbl</b> ---- 169,171 ---- - -! <dd> <b>smtpd_client_restrictions = hash:!!PREFIX!!/etc/postfix/access, - reject_maps_rbl</b> -*************** -*** 474,476 **** - -! <dd> <b>smtpd_sender_restrictions = hash:/etc/postfix/access, - reject_unknown_sender_domain</b> ---- 474,476 ---- - -! <dd> <b>smtpd_sender_restrictions = hash:!!PREFIX!!/etc/postfix/access, - reject_unknown_sender_domain</b> -*************** -*** 856,858 **** - <dd> <b>smtpd_etrn_restrictions = permit_mynetworks, -! hash:/etc/postfix/etrn_access, reject</b> - ---- 856,858 ---- - <dd> <b>smtpd_etrn_restrictions = permit_mynetworks, -! hash:!!PREFIX!!/etc/postfix/etrn_access, reject</b> - diff --git a/mail/postfix21/files/patch-bk b/mail/postfix21/files/patch-bk deleted file mode 100644 index 62a0573559ae..000000000000 --- a/mail/postfix21/files/patch-bk +++ /dev/null @@ -1,29 +0,0 @@ -*** ./html/rate.html.orig Wed Mar 17 17:55:22 1999 ---- ./html/rate.html Thu Jun 1 22:32:19 2000 -*************** -*** 224,226 **** - -! <dt>/etc/postfix/main.cf: - ---- 224,226 ---- - -! <dt>!!PREFIX!!/etc/postfix/main.cf: - -*************** -*** 237,239 **** - -! <dt>/etc/postfix/<a href="transport.5.html">transport</a>: - ---- 237,239 ---- - -! <dt>!!PREFIX!!/etc/postfix/<a href="transport.5.html">transport</a>: - -*************** -*** 253,255 **** - -! <dt>/etc/postfix/master.cf: - ---- 253,255 ---- - -! <dt>!!PREFIX!!/etc/postfix/master.cf: - diff --git a/mail/postfix21/files/patch-bl b/mail/postfix21/files/patch-bl deleted file mode 100644 index 176c7d1b64de..000000000000 --- a/mail/postfix21/files/patch-bl +++ /dev/null @@ -1,11 +0,0 @@ -*** ./html/regexp_table.5.html.orig Sat Apr 22 20:28:38 2000 ---- ./html/regexp_table.5.html Thu Jun 1 22:32:44 2000 -*************** -*** 11,13 **** - <b>SYNOPSIS</b> -! regexp:/etc/postfix/filename - ---- 11,13 ---- - <b>SYNOPSIS</b> -! regexp:!!PREFIX!!/etc/postfix/filename - diff --git a/mail/postfix21/files/patch-bm b/mail/postfix21/files/patch-bm deleted file mode 100644 index e5ccc2c50b94..000000000000 --- a/mail/postfix21/files/patch-bm +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/relocated.5.html.orig Tue Nov 21 21:37:54 2000 -+++ ./html/relocated.5.html Tue Nov 21 21:38:08 2000 -@@ -9,7 +9,7 @@ - relocated - format of Postfix relocated table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/relocated</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b> - - <b>DESCRIPTION</b> - The optional <b>relocated</b> table provides the information that -@@ -20,7 +20,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/relocated</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b> in order to rebuild the - indexed file after changing the relocated table. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix21/files/patch-bn b/mail/postfix21/files/patch-bn deleted file mode 100644 index 21e69dcaa40c..000000000000 --- a/mail/postfix21/files/patch-bn +++ /dev/null @@ -1,56 +0,0 @@ -*** ./html/rewrite.html.orig Sat May 8 17:51:41 1999 ---- ./html/rewrite.html Thu Jun 1 22:34:21 2000 -*************** -*** 194,196 **** - -! <dd><b>canonical_maps = hash:/etc/postfix/canonical</b> - ---- 194,196 ---- - -! <dd><b>canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical</b> - -*************** -*** 207,209 **** - -! <dd><b>sender_canonical_maps = hash:/etc/postfix/sender_canonical</b> - ---- 207,209 ---- - -! <dd><b>sender_canonical_maps = hash:!!PREFIX!!/etc/postfix/sender_canonical</b> - -*************** -*** 211,213 **** - -! <dd><b>recipient_canonical_maps = hash:/etc/postfix/recipient_canonical</b> - ---- 211,213 ---- - -! <dd><b>recipient_canonical_maps = hash:!!PREFIX!!/etc/postfix/recipient_canonical</b> - -*************** -*** 295,297 **** - -! <dd><b>virtual_maps = hash:/etc/postfix/virtual</b> - ---- 295,297 ---- - -! <dd><b>virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual</b> - -*************** -*** 323,325 **** - -! <dd><b>relocated_maps = hash:/etc/postfix/relocated</b> - ---- 323,325 ---- - -! <dd><b>relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated</b> - -*************** -*** 348,350 **** - -! <dd><b>transport_maps = hash:/etc/postfix/transport</b> - ---- 348,350 ---- - -! <dd><b>transport_maps = hash:!!PREFIX!!/etc/postfix/transport</b> - diff --git a/mail/postfix21/files/patch-bo b/mail/postfix21/files/patch-bo deleted file mode 100644 index b45270be8151..000000000000 --- a/mail/postfix21/files/patch-bo +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/transport.5.html.orig Tue Nov 21 21:43:00 2000 -+++ ./html/transport.5.html Tue Nov 21 21:43:20 2000 -@@ -9,7 +9,7 @@ - transport - format of Postfix transport table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/transport</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b> - - <b>DESCRIPTION</b> - The optional <b>transport</b> table specifies a mapping from -@@ -21,7 +21,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/transport</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b> in order to rebuild the - indexed file after changing the transport table. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix21/files/patch-bp b/mail/postfix21/files/patch-bp deleted file mode 100644 index 5206bfd4bfd0..000000000000 --- a/mail/postfix21/files/patch-bp +++ /dev/null @@ -1,43 +0,0 @@ ---- ./html/virtual.5.html.orig Tue Nov 21 21:46:50 2000 -+++ ./html/virtual.5.html Tue Nov 21 21:47:17 2000 -@@ -9,7 +9,7 @@ - virtual - format of Postfix virtual table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/virtual</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b> - - <b>DESCRIPTION</b> - The optional <b>virtual</b> table specifies address redirections -@@ -27,7 +27,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/virtual</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b> in order to rebuild the - indexed file after changing the text file. - - When the table is provided via other means such as NIS, -@@ -52,7 +52,7 @@ - - Support for a Postfix-style virtual domain looks like: - -- /etc/postfix/virtual: -+ !!PREFIX!!/etc/postfix/virtual: - <i>virtual.domain</i> <i>anything</i> (right-hand content does not matter) - <i>postmaster@virtual.domain</i> <i>postmaster</i> - <i>user1@virtual.domain</i> <i>address1</i> -@@ -94,11 +94,11 @@ - - Support for a Sendmail-style virtual domain looks like: - -- /etc/postfix/main.cf: -+ !!PREFIX!!/etc/postfix/main.cf: - mydestination = $myhostname localhost.$mydomain $mydomain - <i>virtual.domain</i> - -- /etc/postfix/virtual: -+ !!PREFIX!!/etc/postfix/virtual: - <i>user1@virtual.domain</i> <i>address1</i> - <i>user2@virtual.domain</i> <i>address2,</i> <i>address3</i> - diff --git a/mail/postfix21/files/patch-ca b/mail/postfix21/files/patch-ca deleted file mode 100644 index 86d56f80be30..000000000000 --- a/mail/postfix21/files/patch-ca +++ /dev/null @@ -1,11 +0,0 @@ -*** ./man/man1/postdrop.1.orig Mon May 3 15:03:29 1999 ---- ./man/man1/postdrop.1 Thu Jun 1 22:38:54 2000 -*************** -*** 53,55 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS ---- 53,55 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS diff --git a/mail/postfix21/files/patch-cb b/mail/postfix21/files/patch-cb deleted file mode 100644 index 58559c7273d1..000000000000 --- a/mail/postfix21/files/patch-cb +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man1/sendmail.1.orig Thu Mar 30 14:05:28 2000 ---- ./man/man1/sendmail.1 Thu Jun 1 22:39:16 2000 -*************** -*** 63,65 **** - The path name of the \fBsendmail.cf\fR file. Postfix configuration -! files are kept in \fB/etc/postfix\fR. - .IP "\fB-F \fIfull_name\fR ---- 63,65 ---- - The path name of the \fBsendmail.cf\fR file. Postfix configuration -! files are kept in \fB!!PREFIX!!/etc/postfix\fR. - .IP "\fB-F \fIfull_name\fR -*************** -*** 173,175 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS ---- 173,175 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS diff --git a/mail/postfix21/files/patch-cc b/mail/postfix21/files/patch-cc deleted file mode 100644 index cd6946003217..000000000000 --- a/mail/postfix21/files/patch-cc +++ /dev/null @@ -1,11 +0,0 @@ -*** ./man/man5/pcre_table.5.orig Thu Mar 30 14:05:28 2000 ---- ./man/man5/pcre_table.5 Thu Jun 1 22:39:34 2000 -*************** -*** 10,12 **** - .nf -! pcre:/etc/postfix/filename - .SH DESCRIPTION ---- 10,12 ---- - .nf -! pcre:!!PREFIX!!/etc/postfix/filename - .SH DESCRIPTION diff --git a/mail/postfix21/files/patch-cd b/mail/postfix21/files/patch-cd deleted file mode 100644 index b51de44d0bee..000000000000 --- a/mail/postfix21/files/patch-cd +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/access.5.orig Sat Apr 22 20:28:30 2000 ---- ./man/man5/access.5 Thu Jun 1 22:39:55 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/access\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/access\fR - .SH DESCRIPTION -*************** -*** 21,23 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed - file after changing the access table. ---- 21,23 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed - file after changing the access table. diff --git a/mail/postfix21/files/patch-ce b/mail/postfix21/files/patch-ce deleted file mode 100644 index f77053f8b3aa..000000000000 --- a/mail/postfix21/files/patch-ce +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/canonical.5.orig Sat Apr 22 20:28:30 2000 ---- ./man/man5/canonical.5 Thu Jun 1 22:40:18 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/canonical\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR - .SH DESCRIPTION -*************** -*** 21,23 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed - file after changing the canonical table. ---- 21,23 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed - file after changing the canonical table. diff --git a/mail/postfix21/files/patch-cf b/mail/postfix21/files/patch-cf deleted file mode 100644 index 28fb053b94a7..000000000000 --- a/mail/postfix21/files/patch-cf +++ /dev/null @@ -1,11 +0,0 @@ -*** ./man/man5/regexp_table.5.orig Thu Mar 30 14:05:28 2000 ---- ./man/man5/regexp_table.5 Thu Jun 1 22:40:43 2000 -*************** -*** 10,12 **** - .nf -! regexp:/etc/postfix/filename - .SH DESCRIPTION ---- 10,12 ---- - .nf -! regexp:!!PREFIX!!/etc/postfix/filename - .SH DESCRIPTION diff --git a/mail/postfix21/files/patch-cg b/mail/postfix21/files/patch-cg deleted file mode 100644 index 0ae82cc57669..000000000000 --- a/mail/postfix21/files/patch-cg +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/relocated.5.orig Sat Apr 22 20:28:31 2000 ---- ./man/man5/relocated.5 Thu Jun 1 22:41:05 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/relocated\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR - .SH DESCRIPTION -*************** -*** 20,22 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed - file after changing the relocated table. ---- 20,22 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed - file after changing the relocated table. diff --git a/mail/postfix21/files/patch-ch b/mail/postfix21/files/patch-ch deleted file mode 100644 index 3ed047ea474c..000000000000 --- a/mail/postfix21/files/patch-ch +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/transport.5.orig Sat Apr 22 20:28:31 2000 ---- ./man/man5/transport.5 Thu Jun 1 22:41:26 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/transport\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR - .SH DESCRIPTION -*************** -*** 21,23 **** - for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed - file after changing the transport table. ---- 21,23 ---- - for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed - file after changing the transport table. diff --git a/mail/postfix21/files/patch-ci b/mail/postfix21/files/patch-ci deleted file mode 100644 index 1a7cf4abbac7..000000000000 --- a/mail/postfix21/files/patch-ci +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/virtual.5.orig Sat Apr 22 20:28:31 2000 ---- ./man/man5/virtual.5 Thu Jun 1 22:41:51 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/virtual\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR - .SH DESCRIPTION -*************** -*** 26,28 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed - file after changing the virtual table. ---- 26,28 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed - file after changing the virtual table. diff --git a/mail/postfix21/files/patch-cj b/mail/postfix21/files/patch-cj deleted file mode 100644 index 50448f2ec26d..000000000000 --- a/mail/postfix21/files/patch-cj +++ /dev/null @@ -1,13 +0,0 @@ -*** ./man/man8/cleanup.8.orig Sun May 28 21:58:32 2000 ---- ./man/man8/cleanup.8 Thu Jun 1 22:42:21 2000 -*************** -*** 136,139 **** - .nf -! /etc/postfix/canonical*, canonical mapping table -! /etc/postfix/virtual*, virtual mapping table - .SH LICENSE ---- 136,139 ---- - .nf -! !!PREFIX!!/etc/postfix/canonical*, canonical mapping table -! !!PREFIX!!/etc/postfix/virtual*, virtual mapping table - .SH LICENSE diff --git a/mail/postfix21/files/patch-cl b/mail/postfix21/files/patch-cl deleted file mode 100644 index 44c8a3a7aae0..000000000000 --- a/mail/postfix21/files/patch-cl +++ /dev/null @@ -1,13 +0,0 @@ -*** ./man/man8/master.8.orig Tue Mar 7 10:48:19 2000 ---- ./man/man8/master.8 Thu Jun 1 22:43:02 2000 -*************** -*** 120,123 **** - .nf -! /etc/postfix/main.cf: global configuration file. -! /etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. ---- 120,123 ---- - .nf -! !!PREFIX!!/etc/postfix/main.cf: global configuration file. -! !!PREFIX!!/etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. diff --git a/mail/postfix21/files/patch-da b/mail/postfix21/files/patch-da deleted file mode 100644 index e57e31750d18..000000000000 --- a/mail/postfix21/files/patch-da +++ /dev/null @@ -1,11 +0,0 @@ -*** ./proto/regexp_table.orig Wed Mar 8 19:18:20 2000 ---- ./proto/regexp_table Thu Jun 1 22:44:43 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # regexp:/etc/postfix/filename - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # regexp:!!PREFIX!!/etc/postfix/filename - # DESCRIPTION diff --git a/mail/postfix21/files/patch-db b/mail/postfix21/files/patch-db deleted file mode 100644 index 7f89fb770783..000000000000 --- a/mail/postfix21/files/patch-db +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/access.orig Sun Apr 9 16:44:45 2000 ---- ./proto/access Thu Jun 1 22:45:05 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/access\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR - # DESCRIPTION -*************** -*** 15,17 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed - # file after changing the access table. ---- 15,17 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed - # file after changing the access table. diff --git a/mail/postfix21/files/patch-dc b/mail/postfix21/files/patch-dc deleted file mode 100644 index 786f2da45c32..000000000000 --- a/mail/postfix21/files/patch-dc +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/canonical.orig Sun Apr 9 16:43:37 2000 ---- ./proto/canonical Thu Jun 1 22:45:28 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/canonical\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR - # DESCRIPTION -*************** -*** 15,17 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed - # file after changing the canonical table. ---- 15,17 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed - # file after changing the canonical table. diff --git a/mail/postfix21/files/patch-dd b/mail/postfix21/files/patch-dd deleted file mode 100644 index b65a57ff7d57..000000000000 --- a/mail/postfix21/files/patch-dd +++ /dev/null @@ -1,11 +0,0 @@ -*** ./proto/pcre_table.orig Wed Mar 8 19:18:11 2000 ---- ./proto/pcre_table Thu Jun 1 22:45:41 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # pcre:/etc/postfix/filename - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # pcre:!!PREFIX!!/etc/postfix/filename - # DESCRIPTION diff --git a/mail/postfix21/files/patch-de b/mail/postfix21/files/patch-de deleted file mode 100644 index 73bb2af2261d..000000000000 --- a/mail/postfix21/files/patch-de +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/relocated.orig Sun Apr 9 16:47:31 2000 ---- ./proto/relocated Thu Jun 1 22:46:02 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/relocated\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR - # DESCRIPTION -*************** -*** 14,16 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed - # file after changing the relocated table. ---- 14,16 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed - # file after changing the relocated table. diff --git a/mail/postfix21/files/patch-df b/mail/postfix21/files/patch-df deleted file mode 100644 index 8d3fba96a224..000000000000 --- a/mail/postfix21/files/patch-df +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/transport.orig Sun Apr 9 17:05:45 2000 ---- ./proto/transport Thu Jun 1 22:46:23 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/transport\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR - # DESCRIPTION -*************** -*** 15,17 **** - # for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed - # file after changing the transport table. ---- 15,17 ---- - # for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed - # file after changing the transport table. diff --git a/mail/postfix21/files/patch-dg b/mail/postfix21/files/patch-dg deleted file mode 100644 index bff20a2cff3e..000000000000 --- a/mail/postfix21/files/patch-dg +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/virtual.orig Sun Apr 9 17:14:14 2000 ---- ./proto/virtual Thu Jun 1 22:46:40 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/virtual\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR - # DESCRIPTION -*************** -*** 20,22 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed - # file after changing the virtual table. ---- 20,22 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed - # file after changing the virtual table. diff --git a/mail/postfix21/files/patch-ea b/mail/postfix21/files/patch-ea deleted file mode 100644 index 6c3f98d2af4f..000000000000 --- a/mail/postfix21/files/patch-ea +++ /dev/null @@ -1,13 +0,0 @@ -*** ./src/cleanup/cleanup.c.orig Sun May 28 18:33:41 2000 ---- ./src/cleanup/cleanup.c Thu Jun 1 21:52:22 2000 -*************** -*** 118,121 **** - /* FILES -! /* /etc/postfix/canonical*, canonical mapping table -! /* /etc/postfix/virtual*, virtual mapping table - /* LICENSE ---- 118,121 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix/canonical*, canonical mapping table -! /* !!PREFIX!!/etc/postfix/virtual*, virtual mapping table - /* LICENSE diff --git a/mail/postfix21/files/patch-eb b/mail/postfix21/files/patch-eb deleted file mode 100644 index e67680963d2d..000000000000 --- a/mail/postfix21/files/patch-eb +++ /dev/null @@ -1,11 +0,0 @@ -*** ./src/global/mail_conf.c.orig Sun May 7 18:51:16 2000 ---- ./src/global/mail_conf.c Thu Jun 1 22:16:29 2000 -*************** -*** 53,55 **** - /* FILES -! /* /etc/postfix: default Postfix configuration directory. - /* ENVIRONMENT ---- 53,55 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix: default Postfix configuration directory. - /* ENVIRONMENT diff --git a/mail/postfix21/files/patch-ee b/mail/postfix21/files/patch-ee deleted file mode 100644 index ef44eac24b73..000000000000 --- a/mail/postfix21/files/patch-ee +++ /dev/null @@ -1,13 +0,0 @@ -*** ./src/master/master.c.orig Tue Mar 7 10:25:07 2000 ---- ./src/master/master.c Thu Jun 1 22:43:50 2000 -*************** -*** 104,107 **** - /* FILES -! /* /etc/postfix/main.cf: global configuration file. -! /* /etc/postfix/master.cf: master process configuration file. - /* /var/spool/postfix/pid/master.pid: master lock file. ---- 104,107 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix/main.cf: global configuration file. -! /* !!PREFIX!!/etc/postfix/master.cf: master process configuration file. - /* /var/spool/postfix/pid/master.pid: master lock file. diff --git a/mail/postfix21/files/patch-ef b/mail/postfix21/files/patch-ef deleted file mode 100644 index 586b304a103d..000000000000 --- a/mail/postfix21/files/patch-ef +++ /dev/null @@ -1,11 +0,0 @@ -*** ./src/postdrop/postdrop.c.orig Sun Apr 25 18:05:43 1999 ---- ./src/postdrop/postdrop.c Thu Jun 1 22:44:22 2000 -*************** -*** 39,41 **** - /* /var/spool/postfix, mail queue -! /* /etc/postfix, configuration files - /* CONFIGURATION PARAMETERS ---- 39,41 ---- - /* /var/spool/postfix, mail queue -! /* !!PREFIX!!/etc/postfix, configuration files - /* CONFIGURATION PARAMETERS diff --git a/mail/postfix21/files/patch-eg b/mail/postfix21/files/patch-eg deleted file mode 100644 index 2983bbfd86ea..000000000000 --- a/mail/postfix21/files/patch-eg +++ /dev/null @@ -1,20 +0,0 @@ -*** ./src/sendmail/sendmail.c.orig Tue Mar 14 10:42:06 2000 ---- ./src/sendmail/sendmail.c Thu Jun 1 22:47:24 2000 -*************** -*** 57,59 **** - /* The path name of the \fBsendmail.cf\fR file. Postfix configuration -! /* files are kept in \fB/etc/postfix\fR. - /* .IP "\fB-F \fIfull_name\fR ---- 57,59 ---- - /* The path name of the \fBsendmail.cf\fR file. Postfix configuration -! /* files are kept in \fB!!PREFIX!!/etc/postfix\fR. - /* .IP "\fB-F \fIfull_name\fR -*************** -*** 159,161 **** - /* /var/spool/postfix, mail queue -! /* /etc/postfix, configuration files - /* CONFIGURATION PARAMETERS ---- 159,161 ---- - /* /var/spool/postfix, mail queue -! /* !!PREFIX!!/etc/postfix, configuration files - /* CONFIGURATION PARAMETERS diff --git a/mail/postfix21/files/patch-eh b/mail/postfix21/files/patch-eh deleted file mode 100644 index c104c3680d21..000000000000 --- a/mail/postfix21/files/patch-eh +++ /dev/null @@ -1,11 +0,0 @@ -*** ./src/trivial-rewrite/transport.c.orig Tue Nov 16 19:15:41 1999 ---- ./src/trivial-rewrite/transport.c Thu Jun 1 22:47:49 2000 -*************** -*** 32,34 **** - /* FILES -! /* /etc/postfix/transport* - /* CONFIGURATION PARAMETERS ---- 32,34 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix/transport* - /* CONFIGURATION PARAMETERS diff --git a/mail/postfix21/pkg-message b/mail/postfix21/pkg-message index a7ae2b17e2a6..7fb3a804599c 100644 --- a/mail/postfix21/pkg-message +++ b/mail/postfix21/pkg-message @@ -8,10 +8,21 @@ sendmail_outbound_enable="NO" sendmail_submit_enable="NO" sendmail_msp_queue_enable="NO" -This will disable Sendmail completely. + **OR** +sendmail_enable="NONE" -Also, you may wish to disable some Sendmail-specific daily maintenance +then type this command as root: + +ln -s /usr/local/sbin/postfix /usr/local/etc/rc.d/postfix.sh + +Either of these will disable Sendmail completely. The latter form is useful +if you need to wait until other local package initialization (such as ldconfig +for Postgres or MySQL) is done. The former method will start postfix very +early on in the boot process. + + +Also, you will want to disable some Sendmail-specific daily maintenance routines in your /etc/periodic.conf file: daily_status_mail_rejects_enable="NO" diff --git a/mail/postfix22/Makefile b/mail/postfix22/Makefile index 6b47f15e39d2..6adf63b1ee81 100644 --- a/mail/postfix22/Makefile +++ b/mail/postfix22/Makefile @@ -12,7 +12,7 @@ # the options are the same names as in the scripts/configure.postfix file PORTNAME= postfix -PORTVERSION= 1.1.11 +PORTVERSION= 1.1.12 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -28,6 +28,7 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= khera@kciLink.com USE_SUBMAKE= yes +USE_REINPLACE= yes MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \ postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \ @@ -40,6 +41,10 @@ MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \ master.8 nqmgr.8 pickup.8 pipe.8 qmgr.8 qmqpd.8 showq.8 smtp.8 \ smtpd.8 spawn.8 trivial-rewrite.8 virtual.8 +# TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to +# patch it. +MAN8base=$(MAN8:S/tlsmgr.8//) + CONF1= main.cf master.cf access aliases canonical pcre_table regexp_table \ relocated transport virtual @@ -66,6 +71,27 @@ post-patch: CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ ${ECHO} "all: default" >> Makefile) +pre-patch: +.for file in ${MAN1} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/man/man1/${file} ${WRKSRC}/html/${file}.html +.endfor +.for file in ${MAN5} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/man/man5/${file} ${WRKSRC}/html/${file}.html +.endfor +.for file in ${MAN8base} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/man/man8/${file} ${WRKSRC}/html/${file}.html +.endfor +.for file in faq rate rewrite uce + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/html/${file}.html +.endfor +.for file in ${CONF1} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" ${WRKSRC}/conf/${file} +.endfor + pre-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL diff --git a/mail/postfix22/distinfo b/mail/postfix22/distinfo index 379358ed4749..832388cccb96 100644 --- a/mail/postfix22/distinfo +++ b/mail/postfix22/distinfo @@ -1,4 +1,4 @@ -MD5 (postfix/postfix-1.1.11.tar.gz) = b34bb2b5018327c19456a77814141208 +MD5 (postfix/postfix-1.1.12.tar.gz) = d1d0f9792ec6ea063ccca59184e54212 MD5 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz) = 11d82e9a3482f64af9d228f7a4319566 -MD5 (postfix/postfix-1.1.11+ipv6.patch.gz) = dc2a6362518025583a17305607eb8f0e +MD5 (postfix/postfix-1.1.12+ipv6.patch.gz) = add4396ce50ca61b5d9b67454fb51258 MD5 (postfix/postfix-pg.postfix-1.1.8.patch) = e0f4d910a6d6648d9b48e2244f2764ba diff --git a/mail/postfix22/files/patch-aa b/mail/postfix22/files/patch-aa deleted file mode 100644 index 51b40396bd5e..000000000000 --- a/mail/postfix22/files/patch-aa +++ /dev/null @@ -1,86 +0,0 @@ -*** ./conf/main.cf.orig Fri Jan 4 13:09:04 2002 ---- ./conf/main.cf Tue Jan 8 22:41:50 2002 -*************** -*** 31,44 **** - # The command_directory parameter specifies the location of all - # postXXX commands. The default value is $program_directory. - # -! command_directory = /usr/sbin - - # The daemon_directory parameter specifies the location of all Postfix - # daemon programs (i.e. programs listed in the master.cf file). The - # default value is $program_directory. This directory must be owned - # by root. - # -! daemon_directory = /usr/libexec/postfix - - # QUEUE AND PROCESS OWNERSHIP - # ---- 31,44 ---- - # The command_directory parameter specifies the location of all - # postXXX commands. The default value is $program_directory. - # -! command_directory = !!PREFIX!!/sbin - - # The daemon_directory parameter specifies the location of all Postfix - # daemon programs (i.e. programs listed in the master.cf file). The - # default value is $program_directory. This directory must be owned - # by root. - # -! daemon_directory = !!PREFIX!!/libexec/postfix - - # QUEUE AND PROCESS OWNERSHIP - # -*************** -*** 325,332 **** - # - # The home_mailbox parameter specifies the optional pathname of a - # mailbox file relative to a user's home directory. The default -! # mailbox file is /var/spool/mail/user or /var/mail/user. Specify -! # "Maildir/" for qmail-style delivery (the / is required). - # - #home_mailbox = Mailbox - #home_mailbox = Maildir/ ---- 325,332 ---- - # - # The home_mailbox parameter specifies the optional pathname of a - # mailbox file relative to a user's home directory. The default -! # mailbox file is /var/mail/user. Specify "Maildir/" for -! # qmail-style delivery (the / is required). - # - #home_mailbox = Mailbox - #home_mailbox = Maildir/ -*************** -*** 424,430 **** - # - # See also the body_checks example in the sample-filter.cf file. - # -! #header_checks = regexp:/etc/postfix/header_checks - - # FAST ETRN SERVICE - # ---- 424,430 ---- - # - # See also the body_checks example in the sample-filter.cf file. - # -! #header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks - - # FAST ETRN SERVICE - # -*************** -*** 525,531 **** - # commands. This must be a group name with a numerical group ID that - # is not shared with other accounts, not even with the Postfix account. - # -! setgid_group = - - # manpage_path: The location of the Postfix on-line manual pages. - # ---- 525,531 ---- - # commands. This must be a group name with a numerical group ID that - # is not shared with other accounts, not even with the Postfix account. - # -! setgid_group = maildrop - - # manpage_path: The location of the Postfix on-line manual pages. - # diff --git a/mail/postfix22/files/patch-ab b/mail/postfix22/files/patch-ab deleted file mode 100644 index 7c81d3dc12c9..000000000000 --- a/mail/postfix22/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/canonical.orig Tue Mar 7 10:42:58 2000 ---- ./conf/canonical Thu Jun 1 21:53:23 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/canonical - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/canonical - # diff --git a/mail/postfix22/files/patch-ac b/mail/postfix22/files/patch-ac deleted file mode 100644 index 0fb2192cdd84..000000000000 --- a/mail/postfix22/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/access.orig Tue Mar 7 10:42:58 2000 ---- ./conf/access Thu Jun 1 21:53:36 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/access - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/access - # diff --git a/mail/postfix22/files/patch-ad b/mail/postfix22/files/patch-ad deleted file mode 100644 index c1b102574165..000000000000 --- a/mail/postfix22/files/patch-ad +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/pcre_table.orig Thu Mar 9 20:36:19 2000 ---- ./conf/pcre_table Thu Jun 1 22:02:08 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # pcre:/etc/postfix/filename - # ---- 7,9 ---- - # SYNOPSIS -! # pcre:!!PREFIX!!/etc/postfix/filename - # diff --git a/mail/postfix22/files/patch-ae b/mail/postfix22/files/patch-ae deleted file mode 100644 index e396dd8626db..000000000000 --- a/mail/postfix22/files/patch-ae +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/regexp_table.orig Thu Mar 9 20:36:19 2000 ---- ./conf/regexp_table Thu Jun 1 22:03:27 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # regexp:/etc/postfix/filename - # ---- 7,9 ---- - # SYNOPSIS -! # regexp:!!PREFIX!!/etc/postfix/filename - # diff --git a/mail/postfix22/files/patch-af b/mail/postfix22/files/patch-af deleted file mode 100644 index 8fca6b208941..000000000000 --- a/mail/postfix22/files/patch-af +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/relocated.orig Tue Mar 7 10:42:58 2000 ---- ./conf/relocated Thu Jun 1 22:03:59 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/relocated - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/relocated - # diff --git a/mail/postfix22/files/patch-ag b/mail/postfix22/files/patch-ag deleted file mode 100644 index 54c0fa918d3b..000000000000 --- a/mail/postfix22/files/patch-ag +++ /dev/null @@ -1,15 +0,0 @@ -*** ./conf/sample-auth.cf.orig Sun May 28 17:55:19 2000 ---- ./conf/sample-auth.cf Thu Jun 1 22:05:32 2000 -*************** -*** 91,95 **** - # The Postfix SMTP client opens the lookup table before going to -! # chroot jail, so you can leave the password file in /etc/postfix. - # -! smtp_sasl_password_maps = hash:/etc/postfix/saslpass - ---- 91,95 ---- - # The Postfix SMTP client opens the lookup table before going to -! # chroot jail, so you can leave the password file in !!PREFIX!!/etc/postfix. - # -! smtp_sasl_password_maps = hash:!!PREFIX!!/etc/postfix/saslpass - diff --git a/mail/postfix22/files/patch-ah b/mail/postfix22/files/patch-ah deleted file mode 100644 index a8c70a15a78d..000000000000 --- a/mail/postfix22/files/patch-ah +++ /dev/null @@ -1,44 +0,0 @@ -*** ./conf/sample-canonical.cf.orig Thu Sep 23 14:10:38 1999 ---- ./conf/sample-canonical.cf Thu Jun 1 22:07:23 2000 -*************** -*** 14,16 **** - # -! # If you use this feature, run "postmap /etc/postfix/canonical" to - # build the necessary DBM or DB file after every change. The changes ---- 14,16 ---- - # -! # If you use this feature, run "postmap !!PREFIX!!/etc/postfix/canonical" to - # build the necessary DBM or DB file after every change. The changes -*************** -*** 19,24 **** - # -! #canonical_maps = dbm:/etc/postfix/canonical -! #canonical_maps = hash:/etc/postfix/canonical -! #canonical_maps = hash:/etc/postfix/canonical, nis:canonical -! #canonical_maps = hash:/etc/postfix/canonical, netinfo:/canonical - canonical_maps = ---- 19,24 ---- - # -! #canonical_maps = dbm:!!PREFIX!!/etc/postfix/canonical -! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical -! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical, nis:canonical -! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical, netinfo:/canonical - canonical_maps = -*************** -*** 32,34 **** - # -! #recipient_canonical_maps = hash:/etc/postfix/recipient_canonical - recipient_canonical_maps = ---- 32,34 ---- - # -! #recipient_canonical_maps = hash:!!PREFIX!!/etc/postfix/recipient_canonical - recipient_canonical_maps = -*************** -*** 46,48 **** - # -! #sender_canonical_maps = hash:/etc/postfix/sender_canonical - sender_canonical_maps = ---- 46,48 ---- - # -! #sender_canonical_maps = hash:!!PREFIX!!/etc/postfix/sender_canonical - sender_canonical_maps = diff --git a/mail/postfix22/files/patch-ai b/mail/postfix22/files/patch-ai deleted file mode 100644 index f7aa2fd5f4c6..000000000000 --- a/mail/postfix22/files/patch-ai +++ /dev/null @@ -1,18 +0,0 @@ -*** ./conf/sample-filter.cf.orig Mon May 29 11:30:44 2000 ---- ./conf/sample-filter.cf Thu Jun 1 22:07:58 2000 -*************** -*** 15,17 **** - # -! header_checks = regexp:/etc/postfix/header_checks - ---- 15,17 ---- - # -! header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks - -*************** -*** 26,27 **** - # -! body_checks = regexp:/etc/postfix/body_checks ---- 26,27 ---- - # -! body_checks = regexp:!!PREFIX!!/etc/postfix/body_checks diff --git a/mail/postfix22/files/patch-aj b/mail/postfix22/files/patch-aj deleted file mode 100644 index 241d48132551..000000000000 --- a/mail/postfix22/files/patch-aj +++ /dev/null @@ -1,24 +0,0 @@ -*** ./conf/sample-misc.cf.orig Thu Sep 23 14:10:52 1999 ---- ./conf/sample-misc.cf Thu Jun 1 22:09:39 2000 -*************** -*** 220,222 **** - # -! program_directory = /usr/libexec/postfix - ---- 220,222 ---- - # -! program_directory = !!PREFIX!!/libexec/postfix - -*************** -*** 263,267 **** - # Specify the types and names of databases to use. After change, -! # run "postmap /etc/postfix/relocated", then "postfix reload". - # -! #relocated_maps = hash:/etc/postfix/relocated - relocated_maps = ---- 263,267 ---- - # Specify the types and names of databases to use. After change, -! # run "postmap !!PREFIX!!/etc/postfix/relocated", then "postfix reload". - # -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated - relocated_maps = diff --git a/mail/postfix22/files/patch-ak b/mail/postfix22/files/patch-ak deleted file mode 100644 index 250dd411a4bd..000000000000 --- a/mail/postfix22/files/patch-ak +++ /dev/null @@ -1,26 +0,0 @@ -*** ./conf/sample-relocated.cf.orig Thu Sep 23 14:11:17 1999 ---- ./conf/sample-relocated.cf Thu Jun 1 22:10:43 2000 -*************** -*** 12,14 **** - # -! # If you use this feature, run "postmap /etc/postfix/relocated" to - # build the necessary DBM or DB file after change, then "postfix ---- 12,14 ---- - # -! # If you use this feature, run "postmap !!PREFIX!!/etc/postfix/relocated" to - # build the necessary DBM or DB file after change, then "postfix -*************** -*** 16,21 **** - # -! #relocated_maps = dbm:/etc/postfix/relocated -! #relocated_maps = hash:/etc/postfix/relocated -! #relocated_maps = hash:/etc/postfix/relocated, nis:virtual -! #relocated_maps = hash:/etc/postfix/relocated, netinfo:/relocated - relocated_maps = ---- 16,21 ---- - # -! #relocated_maps = dbm:!!PREFIX!!/etc/postfix/relocated -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated, nis:virtual -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated, netinfo:/relocated - relocated_maps = diff --git a/mail/postfix22/files/patch-al b/mail/postfix22/files/patch-al deleted file mode 100644 index 799206da0c96..000000000000 --- a/mail/postfix22/files/patch-al +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/sample-smtpd.cf.orig Mon Dec 27 19:41:37 1999 ---- ./conf/sample-smtpd.cf Thu Jun 1 22:11:22 2000 -*************** -*** 183,185 **** - #smtpd_sender_restrictions = reject_unknown_sender_domain -! #smtpd_sender_restrictions = reject_unknown_sender_domain, hash:/etc/postfix/access - smtpd_sender_restrictions = ---- 183,185 ---- - #smtpd_sender_restrictions = reject_unknown_sender_domain -! #smtpd_sender_restrictions = reject_unknown_sender_domain, hash:!!PREFIX!!/etc/postfix/access - smtpd_sender_restrictions = diff --git a/mail/postfix22/files/patch-am b/mail/postfix22/files/patch-am deleted file mode 100644 index 2d395fa9ca03..000000000000 --- a/mail/postfix22/files/patch-am +++ /dev/null @@ -1,23 +0,0 @@ -*** ./conf/sample-transport.cf.orig Thu Dec 23 10:50:00 1999 ---- ./conf/sample-transport.cf Thu Jun 1 22:13:09 2000 -*************** -*** 10,18 **** - # By default, this feature is disabled. Specify the types of databases -! # to use. If you use this feature, run "postmap /etc/postfix/transport" - # after change, then "postfix reload". - # -! #transport_maps = dbm:/etc/postfix/transport -! #transport_maps = hash:/etc/postfix/transport -! #transport_maps = hash:/etc/postfix/transport, nis:transport -! #transport_maps = hash:/etc/postfix/transport, netinfo:/transport - transport_maps = ---- 10,18 ---- - # By default, this feature is disabled. Specify the types of databases -! # to use. If you use this feature, run "postmap !!PREFIX!!/etc/postfix/transport" - # after change, then "postfix reload". - # -! #transport_maps = dbm:!!PREFIX!!/etc/postfix/transport -! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport -! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport, nis:transport -! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport, netinfo:/transport - transport_maps = diff --git a/mail/postfix22/files/patch-an b/mail/postfix22/files/patch-an deleted file mode 100644 index af5ac7cc031b..000000000000 --- a/mail/postfix22/files/patch-an +++ /dev/null @@ -1,26 +0,0 @@ -*** ./conf/sample-virtual.cf.orig Mon Dec 20 21:00:42 1999 ---- ./conf/sample-virtual.cf Thu Jun 1 22:13:32 2000 -*************** -*** 12,14 **** - # -! # If you use this feature, run "postmap /etc/postfix/virtual" to - # build the necessary DBM or DB file after change. ---- 12,14 ---- - # -! # If you use this feature, run "postmap !!PREFIX!!/etc/postfix/virtual" to - # build the necessary DBM or DB file after change. -*************** -*** 18,23 **** - # -! #virtual_maps = dbm:/etc/postfix/virtual -! #virtual_maps = hash:/etc/postfix/virtual -! #virtual_maps = hash:/etc/postfix/virtual, nis:virtual -! #virtual_maps = hash:/etc/postfix/virtual, netinfo:/virtual - virtual_maps = ---- 18,23 ---- - # -! #virtual_maps = dbm:!!PREFIX!!/etc/postfix/virtual -! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual -! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual, nis:virtual -! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual, netinfo:/virtual - virtual_maps = diff --git a/mail/postfix22/files/patch-ao b/mail/postfix22/files/patch-ao deleted file mode 100644 index fd854e181601..000000000000 --- a/mail/postfix22/files/patch-ao +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/transport.orig Tue Mar 7 10:42:58 2000 ---- ./conf/transport Thu Jun 1 22:13:41 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/transport - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/transport - # diff --git a/mail/postfix22/files/patch-ap b/mail/postfix22/files/patch-ap deleted file mode 100644 index 4598192cd5c1..000000000000 --- a/mail/postfix22/files/patch-ap +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/virtual.orig Tue Mar 7 10:42:59 2000 ---- ./conf/virtual Thu Jun 1 22:13:54 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/virtual - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/virtual - # diff --git a/mail/postfix22/files/patch-ba b/mail/postfix22/files/patch-ba deleted file mode 100644 index ccb54ec60a7a..000000000000 --- a/mail/postfix22/files/patch-ba +++ /dev/null @@ -1,20 +0,0 @@ -*** ./html/mailq.1.html.orig Sat Apr 22 20:28:36 2000 ---- ./html/mailq.1.html Thu Jun 1 22:19:24 2000 -*************** -*** 83,85 **** - The path name of the <b>sendmail.cf</b> file. Postfix con- -! figuration files are kept in <b>/etc/postfix</b>. - ---- 83,85 ---- - The path name of the <b>sendmail.cf</b> file. Postfix con- -! figuration files are kept in <b>!!PREFIX!!/etc/postfix</b>. - -*************** -*** 231,233 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - ---- 231,233 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - diff --git a/mail/postfix22/files/patch-bb b/mail/postfix22/files/patch-bb deleted file mode 100644 index ea744664dfa7..000000000000 --- a/mail/postfix22/files/patch-bb +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/access.5.html.orig Tue Nov 21 21:24:13 2000 -+++ ./html/access.5.html Tue Nov 21 21:24:34 2000 -@@ -9,7 +9,7 @@ - access - format of Postfix access table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/access</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b> - - <b>DESCRIPTION</b> - The optional <b>access</b> table directs the Postfix SMTP server -@@ -21,7 +21,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/access</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b> in order to rebuild the - indexed file after changing the access table. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix22/files/patch-bc b/mail/postfix22/files/patch-bc deleted file mode 100644 index e407a9650585..000000000000 --- a/mail/postfix22/files/patch-bc +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/canonical.5.html.orig Tue Nov 21 21:32:38 2000 -+++ ./html/canonical.5.html Tue Nov 21 21:33:21 2000 -@@ -9,7 +9,7 @@ - canonical - format of Postfix canonical table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/canonical</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b> - - <b>DESCRIPTION</b> - The optional <b>canonical</b> table specifies an address mapping -@@ -20,7 +20,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/canonical</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b> in order to rebuild the - indexed file after changing the text file. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix22/files/patch-be b/mail/postfix22/files/patch-be deleted file mode 100644 index bef6a3bfaf73..000000000000 --- a/mail/postfix22/files/patch-be +++ /dev/null @@ -1,10 +0,0 @@ ---- ./html/faq.html.orig Sat Oct 28 23:34:51 2000 -+++ ./html/faq.html Sat Oct 28 23:36:04 2000 -@@ -2572,7 +2572,7 @@ - - Answer: instead of using <b>/usr/include/ndbm.h</b>, you're building - Postfix with some incompatible third-party file, typically --<b>/usr/local/include/ndbm.h</b>. -+<b>!!PREFIX!!/include/ndbm.h</b>. - - <p> diff --git a/mail/postfix22/files/patch-bf b/mail/postfix22/files/patch-bf deleted file mode 100644 index d652e1e567b3..000000000000 --- a/mail/postfix22/files/patch-bf +++ /dev/null @@ -1,13 +0,0 @@ -*** ./html/cleanup.8.html.orig Sun May 28 21:58:41 2000 ---- ./html/cleanup.8.html Thu Jun 1 22:29:04 2000 -*************** -*** 174,177 **** - <b>FILES</b> -! /etc/postfix/canonical*, canonical mapping table -! /etc/postfix/virtual*, virtual mapping table - ---- 174,177 ---- - <b>FILES</b> -! !!PREFIX!!/etc/postfix/canonical*, canonical mapping table -! !!PREFIX!!/etc/postfix/virtual*, virtual mapping table - diff --git a/mail/postfix22/files/patch-bg b/mail/postfix22/files/patch-bg deleted file mode 100644 index ce2454eaef01..000000000000 --- a/mail/postfix22/files/patch-bg +++ /dev/null @@ -1,13 +0,0 @@ -*** ./html/master.8.html.orig Tue Mar 7 10:48:56 2000 ---- ./html/master.8.html Thu Jun 1 22:29:24 2000 -*************** -*** 148,151 **** - <b>FILES</b> -! /etc/postfix/main.cf: global configuration file. -! /etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. ---- 148,151 ---- - <b>FILES</b> -! !!PREFIX!!/etc/postfix/main.cf: global configuration file. -! !!PREFIX!!/etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. diff --git a/mail/postfix22/files/patch-bh b/mail/postfix22/files/patch-bh deleted file mode 100644 index a20232e6796a..000000000000 --- a/mail/postfix22/files/patch-bh +++ /dev/null @@ -1,11 +0,0 @@ -*** ./html/goals.html.orig Sun May 9 15:44:18 1999 ---- ./html/goals.html Thu Jun 1 22:30:14 2000 -*************** -*** 45,47 **** - <li>Compatibility. Postfix is designed to be sendmail-compatible -! to make migration easy. Postfix supports <b>/var[/spool]/mail</b>, - <b>/etc/aliases</b>, <b>NIS</b>, and <b>~/.forward</b> files. ---- 45,47 ---- - <li>Compatibility. Postfix is designed to be sendmail-compatible -! to make migration easy. Postfix supports <b>/var/mail</b>, - <b>/etc/aliases</b>, <b>NIS</b>, and <b>~/.forward</b> files. diff --git a/mail/postfix22/files/patch-bi b/mail/postfix22/files/patch-bi deleted file mode 100644 index 7e4acdb0c126..000000000000 --- a/mail/postfix22/files/patch-bi +++ /dev/null @@ -1,11 +0,0 @@ -*** ./html/postdrop.1.html.orig Mon May 3 15:05:12 1999 ---- ./html/postdrop.1.html Thu Jun 1 22:30:47 2000 -*************** -*** 48,50 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - ---- 48,50 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - diff --git a/mail/postfix22/files/patch-bj b/mail/postfix22/files/patch-bj deleted file mode 100644 index 00e78d01ba5a..000000000000 --- a/mail/postfix22/files/patch-bj +++ /dev/null @@ -1,42 +0,0 @@ -*** ./html/uce.html.orig Fri Dec 31 15:06:07 1999 ---- ./html/uce.html Thu Jun 1 22:31:37 2000 -*************** -*** 126,130 **** - -! <dd> <b>header_checks = regexp:/etc/postfix/header_checks</b> - -! <dd> <b>header_checks = pcre:/etc/postfix/header_checks</b> - ---- 126,130 ---- - -! <dd> <b>header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks</b> - -! <dd> <b>header_checks = pcre:!!PREFIX!!/etc/postfix/header_checks</b> - -*************** -*** 169,171 **** - -! <dd> <b>smtpd_client_restrictions = hash:/etc/postfix/access, - reject_maps_rbl</b> ---- 169,171 ---- - -! <dd> <b>smtpd_client_restrictions = hash:!!PREFIX!!/etc/postfix/access, - reject_maps_rbl</b> -*************** -*** 474,476 **** - -! <dd> <b>smtpd_sender_restrictions = hash:/etc/postfix/access, - reject_unknown_sender_domain</b> ---- 474,476 ---- - -! <dd> <b>smtpd_sender_restrictions = hash:!!PREFIX!!/etc/postfix/access, - reject_unknown_sender_domain</b> -*************** -*** 856,858 **** - <dd> <b>smtpd_etrn_restrictions = permit_mynetworks, -! hash:/etc/postfix/etrn_access, reject</b> - ---- 856,858 ---- - <dd> <b>smtpd_etrn_restrictions = permit_mynetworks, -! hash:!!PREFIX!!/etc/postfix/etrn_access, reject</b> - diff --git a/mail/postfix22/files/patch-bk b/mail/postfix22/files/patch-bk deleted file mode 100644 index 62a0573559ae..000000000000 --- a/mail/postfix22/files/patch-bk +++ /dev/null @@ -1,29 +0,0 @@ -*** ./html/rate.html.orig Wed Mar 17 17:55:22 1999 ---- ./html/rate.html Thu Jun 1 22:32:19 2000 -*************** -*** 224,226 **** - -! <dt>/etc/postfix/main.cf: - ---- 224,226 ---- - -! <dt>!!PREFIX!!/etc/postfix/main.cf: - -*************** -*** 237,239 **** - -! <dt>/etc/postfix/<a href="transport.5.html">transport</a>: - ---- 237,239 ---- - -! <dt>!!PREFIX!!/etc/postfix/<a href="transport.5.html">transport</a>: - -*************** -*** 253,255 **** - -! <dt>/etc/postfix/master.cf: - ---- 253,255 ---- - -! <dt>!!PREFIX!!/etc/postfix/master.cf: - diff --git a/mail/postfix22/files/patch-bl b/mail/postfix22/files/patch-bl deleted file mode 100644 index 176c7d1b64de..000000000000 --- a/mail/postfix22/files/patch-bl +++ /dev/null @@ -1,11 +0,0 @@ -*** ./html/regexp_table.5.html.orig Sat Apr 22 20:28:38 2000 ---- ./html/regexp_table.5.html Thu Jun 1 22:32:44 2000 -*************** -*** 11,13 **** - <b>SYNOPSIS</b> -! regexp:/etc/postfix/filename - ---- 11,13 ---- - <b>SYNOPSIS</b> -! regexp:!!PREFIX!!/etc/postfix/filename - diff --git a/mail/postfix22/files/patch-bm b/mail/postfix22/files/patch-bm deleted file mode 100644 index e5ccc2c50b94..000000000000 --- a/mail/postfix22/files/patch-bm +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/relocated.5.html.orig Tue Nov 21 21:37:54 2000 -+++ ./html/relocated.5.html Tue Nov 21 21:38:08 2000 -@@ -9,7 +9,7 @@ - relocated - format of Postfix relocated table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/relocated</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b> - - <b>DESCRIPTION</b> - The optional <b>relocated</b> table provides the information that -@@ -20,7 +20,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/relocated</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b> in order to rebuild the - indexed file after changing the relocated table. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix22/files/patch-bn b/mail/postfix22/files/patch-bn deleted file mode 100644 index 21e69dcaa40c..000000000000 --- a/mail/postfix22/files/patch-bn +++ /dev/null @@ -1,56 +0,0 @@ -*** ./html/rewrite.html.orig Sat May 8 17:51:41 1999 ---- ./html/rewrite.html Thu Jun 1 22:34:21 2000 -*************** -*** 194,196 **** - -! <dd><b>canonical_maps = hash:/etc/postfix/canonical</b> - ---- 194,196 ---- - -! <dd><b>canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical</b> - -*************** -*** 207,209 **** - -! <dd><b>sender_canonical_maps = hash:/etc/postfix/sender_canonical</b> - ---- 207,209 ---- - -! <dd><b>sender_canonical_maps = hash:!!PREFIX!!/etc/postfix/sender_canonical</b> - -*************** -*** 211,213 **** - -! <dd><b>recipient_canonical_maps = hash:/etc/postfix/recipient_canonical</b> - ---- 211,213 ---- - -! <dd><b>recipient_canonical_maps = hash:!!PREFIX!!/etc/postfix/recipient_canonical</b> - -*************** -*** 295,297 **** - -! <dd><b>virtual_maps = hash:/etc/postfix/virtual</b> - ---- 295,297 ---- - -! <dd><b>virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual</b> - -*************** -*** 323,325 **** - -! <dd><b>relocated_maps = hash:/etc/postfix/relocated</b> - ---- 323,325 ---- - -! <dd><b>relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated</b> - -*************** -*** 348,350 **** - -! <dd><b>transport_maps = hash:/etc/postfix/transport</b> - ---- 348,350 ---- - -! <dd><b>transport_maps = hash:!!PREFIX!!/etc/postfix/transport</b> - diff --git a/mail/postfix22/files/patch-bo b/mail/postfix22/files/patch-bo deleted file mode 100644 index b45270be8151..000000000000 --- a/mail/postfix22/files/patch-bo +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/transport.5.html.orig Tue Nov 21 21:43:00 2000 -+++ ./html/transport.5.html Tue Nov 21 21:43:20 2000 -@@ -9,7 +9,7 @@ - transport - format of Postfix transport table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/transport</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b> - - <b>DESCRIPTION</b> - The optional <b>transport</b> table specifies a mapping from -@@ -21,7 +21,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/transport</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b> in order to rebuild the - indexed file after changing the transport table. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix22/files/patch-bp b/mail/postfix22/files/patch-bp deleted file mode 100644 index 5206bfd4bfd0..000000000000 --- a/mail/postfix22/files/patch-bp +++ /dev/null @@ -1,43 +0,0 @@ ---- ./html/virtual.5.html.orig Tue Nov 21 21:46:50 2000 -+++ ./html/virtual.5.html Tue Nov 21 21:47:17 2000 -@@ -9,7 +9,7 @@ - virtual - format of Postfix virtual table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/virtual</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b> - - <b>DESCRIPTION</b> - The optional <b>virtual</b> table specifies address redirections -@@ -27,7 +27,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/virtual</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b> in order to rebuild the - indexed file after changing the text file. - - When the table is provided via other means such as NIS, -@@ -52,7 +52,7 @@ - - Support for a Postfix-style virtual domain looks like: - -- /etc/postfix/virtual: -+ !!PREFIX!!/etc/postfix/virtual: - <i>virtual.domain</i> <i>anything</i> (right-hand content does not matter) - <i>postmaster@virtual.domain</i> <i>postmaster</i> - <i>user1@virtual.domain</i> <i>address1</i> -@@ -94,11 +94,11 @@ - - Support for a Sendmail-style virtual domain looks like: - -- /etc/postfix/main.cf: -+ !!PREFIX!!/etc/postfix/main.cf: - mydestination = $myhostname localhost.$mydomain $mydomain - <i>virtual.domain</i> - -- /etc/postfix/virtual: -+ !!PREFIX!!/etc/postfix/virtual: - <i>user1@virtual.domain</i> <i>address1</i> - <i>user2@virtual.domain</i> <i>address2,</i> <i>address3</i> - diff --git a/mail/postfix22/files/patch-ca b/mail/postfix22/files/patch-ca deleted file mode 100644 index 86d56f80be30..000000000000 --- a/mail/postfix22/files/patch-ca +++ /dev/null @@ -1,11 +0,0 @@ -*** ./man/man1/postdrop.1.orig Mon May 3 15:03:29 1999 ---- ./man/man1/postdrop.1 Thu Jun 1 22:38:54 2000 -*************** -*** 53,55 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS ---- 53,55 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS diff --git a/mail/postfix22/files/patch-cb b/mail/postfix22/files/patch-cb deleted file mode 100644 index 58559c7273d1..000000000000 --- a/mail/postfix22/files/patch-cb +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man1/sendmail.1.orig Thu Mar 30 14:05:28 2000 ---- ./man/man1/sendmail.1 Thu Jun 1 22:39:16 2000 -*************** -*** 63,65 **** - The path name of the \fBsendmail.cf\fR file. Postfix configuration -! files are kept in \fB/etc/postfix\fR. - .IP "\fB-F \fIfull_name\fR ---- 63,65 ---- - The path name of the \fBsendmail.cf\fR file. Postfix configuration -! files are kept in \fB!!PREFIX!!/etc/postfix\fR. - .IP "\fB-F \fIfull_name\fR -*************** -*** 173,175 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS ---- 173,175 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS diff --git a/mail/postfix22/files/patch-cc b/mail/postfix22/files/patch-cc deleted file mode 100644 index cd6946003217..000000000000 --- a/mail/postfix22/files/patch-cc +++ /dev/null @@ -1,11 +0,0 @@ -*** ./man/man5/pcre_table.5.orig Thu Mar 30 14:05:28 2000 ---- ./man/man5/pcre_table.5 Thu Jun 1 22:39:34 2000 -*************** -*** 10,12 **** - .nf -! pcre:/etc/postfix/filename - .SH DESCRIPTION ---- 10,12 ---- - .nf -! pcre:!!PREFIX!!/etc/postfix/filename - .SH DESCRIPTION diff --git a/mail/postfix22/files/patch-cd b/mail/postfix22/files/patch-cd deleted file mode 100644 index b51de44d0bee..000000000000 --- a/mail/postfix22/files/patch-cd +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/access.5.orig Sat Apr 22 20:28:30 2000 ---- ./man/man5/access.5 Thu Jun 1 22:39:55 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/access\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/access\fR - .SH DESCRIPTION -*************** -*** 21,23 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed - file after changing the access table. ---- 21,23 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed - file after changing the access table. diff --git a/mail/postfix22/files/patch-ce b/mail/postfix22/files/patch-ce deleted file mode 100644 index f77053f8b3aa..000000000000 --- a/mail/postfix22/files/patch-ce +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/canonical.5.orig Sat Apr 22 20:28:30 2000 ---- ./man/man5/canonical.5 Thu Jun 1 22:40:18 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/canonical\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR - .SH DESCRIPTION -*************** -*** 21,23 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed - file after changing the canonical table. ---- 21,23 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed - file after changing the canonical table. diff --git a/mail/postfix22/files/patch-cf b/mail/postfix22/files/patch-cf deleted file mode 100644 index 28fb053b94a7..000000000000 --- a/mail/postfix22/files/patch-cf +++ /dev/null @@ -1,11 +0,0 @@ -*** ./man/man5/regexp_table.5.orig Thu Mar 30 14:05:28 2000 ---- ./man/man5/regexp_table.5 Thu Jun 1 22:40:43 2000 -*************** -*** 10,12 **** - .nf -! regexp:/etc/postfix/filename - .SH DESCRIPTION ---- 10,12 ---- - .nf -! regexp:!!PREFIX!!/etc/postfix/filename - .SH DESCRIPTION diff --git a/mail/postfix22/files/patch-cg b/mail/postfix22/files/patch-cg deleted file mode 100644 index 0ae82cc57669..000000000000 --- a/mail/postfix22/files/patch-cg +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/relocated.5.orig Sat Apr 22 20:28:31 2000 ---- ./man/man5/relocated.5 Thu Jun 1 22:41:05 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/relocated\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR - .SH DESCRIPTION -*************** -*** 20,22 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed - file after changing the relocated table. ---- 20,22 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed - file after changing the relocated table. diff --git a/mail/postfix22/files/patch-ch b/mail/postfix22/files/patch-ch deleted file mode 100644 index 3ed047ea474c..000000000000 --- a/mail/postfix22/files/patch-ch +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/transport.5.orig Sat Apr 22 20:28:31 2000 ---- ./man/man5/transport.5 Thu Jun 1 22:41:26 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/transport\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR - .SH DESCRIPTION -*************** -*** 21,23 **** - for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed - file after changing the transport table. ---- 21,23 ---- - for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed - file after changing the transport table. diff --git a/mail/postfix22/files/patch-ci b/mail/postfix22/files/patch-ci deleted file mode 100644 index 1a7cf4abbac7..000000000000 --- a/mail/postfix22/files/patch-ci +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/virtual.5.orig Sat Apr 22 20:28:31 2000 ---- ./man/man5/virtual.5 Thu Jun 1 22:41:51 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/virtual\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR - .SH DESCRIPTION -*************** -*** 26,28 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed - file after changing the virtual table. ---- 26,28 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed - file after changing the virtual table. diff --git a/mail/postfix22/files/patch-cj b/mail/postfix22/files/patch-cj deleted file mode 100644 index 50448f2ec26d..000000000000 --- a/mail/postfix22/files/patch-cj +++ /dev/null @@ -1,13 +0,0 @@ -*** ./man/man8/cleanup.8.orig Sun May 28 21:58:32 2000 ---- ./man/man8/cleanup.8 Thu Jun 1 22:42:21 2000 -*************** -*** 136,139 **** - .nf -! /etc/postfix/canonical*, canonical mapping table -! /etc/postfix/virtual*, virtual mapping table - .SH LICENSE ---- 136,139 ---- - .nf -! !!PREFIX!!/etc/postfix/canonical*, canonical mapping table -! !!PREFIX!!/etc/postfix/virtual*, virtual mapping table - .SH LICENSE diff --git a/mail/postfix22/files/patch-cl b/mail/postfix22/files/patch-cl deleted file mode 100644 index 44c8a3a7aae0..000000000000 --- a/mail/postfix22/files/patch-cl +++ /dev/null @@ -1,13 +0,0 @@ -*** ./man/man8/master.8.orig Tue Mar 7 10:48:19 2000 ---- ./man/man8/master.8 Thu Jun 1 22:43:02 2000 -*************** -*** 120,123 **** - .nf -! /etc/postfix/main.cf: global configuration file. -! /etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. ---- 120,123 ---- - .nf -! !!PREFIX!!/etc/postfix/main.cf: global configuration file. -! !!PREFIX!!/etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. diff --git a/mail/postfix22/files/patch-da b/mail/postfix22/files/patch-da deleted file mode 100644 index e57e31750d18..000000000000 --- a/mail/postfix22/files/patch-da +++ /dev/null @@ -1,11 +0,0 @@ -*** ./proto/regexp_table.orig Wed Mar 8 19:18:20 2000 ---- ./proto/regexp_table Thu Jun 1 22:44:43 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # regexp:/etc/postfix/filename - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # regexp:!!PREFIX!!/etc/postfix/filename - # DESCRIPTION diff --git a/mail/postfix22/files/patch-db b/mail/postfix22/files/patch-db deleted file mode 100644 index 7f89fb770783..000000000000 --- a/mail/postfix22/files/patch-db +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/access.orig Sun Apr 9 16:44:45 2000 ---- ./proto/access Thu Jun 1 22:45:05 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/access\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR - # DESCRIPTION -*************** -*** 15,17 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed - # file after changing the access table. ---- 15,17 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed - # file after changing the access table. diff --git a/mail/postfix22/files/patch-dc b/mail/postfix22/files/patch-dc deleted file mode 100644 index 786f2da45c32..000000000000 --- a/mail/postfix22/files/patch-dc +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/canonical.orig Sun Apr 9 16:43:37 2000 ---- ./proto/canonical Thu Jun 1 22:45:28 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/canonical\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR - # DESCRIPTION -*************** -*** 15,17 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed - # file after changing the canonical table. ---- 15,17 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed - # file after changing the canonical table. diff --git a/mail/postfix22/files/patch-dd b/mail/postfix22/files/patch-dd deleted file mode 100644 index b65a57ff7d57..000000000000 --- a/mail/postfix22/files/patch-dd +++ /dev/null @@ -1,11 +0,0 @@ -*** ./proto/pcre_table.orig Wed Mar 8 19:18:11 2000 ---- ./proto/pcre_table Thu Jun 1 22:45:41 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # pcre:/etc/postfix/filename - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # pcre:!!PREFIX!!/etc/postfix/filename - # DESCRIPTION diff --git a/mail/postfix22/files/patch-de b/mail/postfix22/files/patch-de deleted file mode 100644 index 73bb2af2261d..000000000000 --- a/mail/postfix22/files/patch-de +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/relocated.orig Sun Apr 9 16:47:31 2000 ---- ./proto/relocated Thu Jun 1 22:46:02 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/relocated\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR - # DESCRIPTION -*************** -*** 14,16 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed - # file after changing the relocated table. ---- 14,16 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed - # file after changing the relocated table. diff --git a/mail/postfix22/files/patch-df b/mail/postfix22/files/patch-df deleted file mode 100644 index 8d3fba96a224..000000000000 --- a/mail/postfix22/files/patch-df +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/transport.orig Sun Apr 9 17:05:45 2000 ---- ./proto/transport Thu Jun 1 22:46:23 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/transport\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR - # DESCRIPTION -*************** -*** 15,17 **** - # for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed - # file after changing the transport table. ---- 15,17 ---- - # for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed - # file after changing the transport table. diff --git a/mail/postfix22/files/patch-dg b/mail/postfix22/files/patch-dg deleted file mode 100644 index bff20a2cff3e..000000000000 --- a/mail/postfix22/files/patch-dg +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/virtual.orig Sun Apr 9 17:14:14 2000 ---- ./proto/virtual Thu Jun 1 22:46:40 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/virtual\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR - # DESCRIPTION -*************** -*** 20,22 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed - # file after changing the virtual table. ---- 20,22 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed - # file after changing the virtual table. diff --git a/mail/postfix22/files/patch-ea b/mail/postfix22/files/patch-ea deleted file mode 100644 index 6c3f98d2af4f..000000000000 --- a/mail/postfix22/files/patch-ea +++ /dev/null @@ -1,13 +0,0 @@ -*** ./src/cleanup/cleanup.c.orig Sun May 28 18:33:41 2000 ---- ./src/cleanup/cleanup.c Thu Jun 1 21:52:22 2000 -*************** -*** 118,121 **** - /* FILES -! /* /etc/postfix/canonical*, canonical mapping table -! /* /etc/postfix/virtual*, virtual mapping table - /* LICENSE ---- 118,121 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix/canonical*, canonical mapping table -! /* !!PREFIX!!/etc/postfix/virtual*, virtual mapping table - /* LICENSE diff --git a/mail/postfix22/files/patch-eb b/mail/postfix22/files/patch-eb deleted file mode 100644 index e67680963d2d..000000000000 --- a/mail/postfix22/files/patch-eb +++ /dev/null @@ -1,11 +0,0 @@ -*** ./src/global/mail_conf.c.orig Sun May 7 18:51:16 2000 ---- ./src/global/mail_conf.c Thu Jun 1 22:16:29 2000 -*************** -*** 53,55 **** - /* FILES -! /* /etc/postfix: default Postfix configuration directory. - /* ENVIRONMENT ---- 53,55 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix: default Postfix configuration directory. - /* ENVIRONMENT diff --git a/mail/postfix22/files/patch-ee b/mail/postfix22/files/patch-ee deleted file mode 100644 index ef44eac24b73..000000000000 --- a/mail/postfix22/files/patch-ee +++ /dev/null @@ -1,13 +0,0 @@ -*** ./src/master/master.c.orig Tue Mar 7 10:25:07 2000 ---- ./src/master/master.c Thu Jun 1 22:43:50 2000 -*************** -*** 104,107 **** - /* FILES -! /* /etc/postfix/main.cf: global configuration file. -! /* /etc/postfix/master.cf: master process configuration file. - /* /var/spool/postfix/pid/master.pid: master lock file. ---- 104,107 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix/main.cf: global configuration file. -! /* !!PREFIX!!/etc/postfix/master.cf: master process configuration file. - /* /var/spool/postfix/pid/master.pid: master lock file. diff --git a/mail/postfix22/files/patch-ef b/mail/postfix22/files/patch-ef deleted file mode 100644 index 586b304a103d..000000000000 --- a/mail/postfix22/files/patch-ef +++ /dev/null @@ -1,11 +0,0 @@ -*** ./src/postdrop/postdrop.c.orig Sun Apr 25 18:05:43 1999 ---- ./src/postdrop/postdrop.c Thu Jun 1 22:44:22 2000 -*************** -*** 39,41 **** - /* /var/spool/postfix, mail queue -! /* /etc/postfix, configuration files - /* CONFIGURATION PARAMETERS ---- 39,41 ---- - /* /var/spool/postfix, mail queue -! /* !!PREFIX!!/etc/postfix, configuration files - /* CONFIGURATION PARAMETERS diff --git a/mail/postfix22/files/patch-eg b/mail/postfix22/files/patch-eg deleted file mode 100644 index 2983bbfd86ea..000000000000 --- a/mail/postfix22/files/patch-eg +++ /dev/null @@ -1,20 +0,0 @@ -*** ./src/sendmail/sendmail.c.orig Tue Mar 14 10:42:06 2000 ---- ./src/sendmail/sendmail.c Thu Jun 1 22:47:24 2000 -*************** -*** 57,59 **** - /* The path name of the \fBsendmail.cf\fR file. Postfix configuration -! /* files are kept in \fB/etc/postfix\fR. - /* .IP "\fB-F \fIfull_name\fR ---- 57,59 ---- - /* The path name of the \fBsendmail.cf\fR file. Postfix configuration -! /* files are kept in \fB!!PREFIX!!/etc/postfix\fR. - /* .IP "\fB-F \fIfull_name\fR -*************** -*** 159,161 **** - /* /var/spool/postfix, mail queue -! /* /etc/postfix, configuration files - /* CONFIGURATION PARAMETERS ---- 159,161 ---- - /* /var/spool/postfix, mail queue -! /* !!PREFIX!!/etc/postfix, configuration files - /* CONFIGURATION PARAMETERS diff --git a/mail/postfix22/files/patch-eh b/mail/postfix22/files/patch-eh deleted file mode 100644 index c104c3680d21..000000000000 --- a/mail/postfix22/files/patch-eh +++ /dev/null @@ -1,11 +0,0 @@ -*** ./src/trivial-rewrite/transport.c.orig Tue Nov 16 19:15:41 1999 ---- ./src/trivial-rewrite/transport.c Thu Jun 1 22:47:49 2000 -*************** -*** 32,34 **** - /* FILES -! /* /etc/postfix/transport* - /* CONFIGURATION PARAMETERS ---- 32,34 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix/transport* - /* CONFIGURATION PARAMETERS diff --git a/mail/postfix22/pkg-message b/mail/postfix22/pkg-message index a7ae2b17e2a6..7fb3a804599c 100644 --- a/mail/postfix22/pkg-message +++ b/mail/postfix22/pkg-message @@ -8,10 +8,21 @@ sendmail_outbound_enable="NO" sendmail_submit_enable="NO" sendmail_msp_queue_enable="NO" -This will disable Sendmail completely. + **OR** +sendmail_enable="NONE" -Also, you may wish to disable some Sendmail-specific daily maintenance +then type this command as root: + +ln -s /usr/local/sbin/postfix /usr/local/etc/rc.d/postfix.sh + +Either of these will disable Sendmail completely. The latter form is useful +if you need to wait until other local package initialization (such as ldconfig +for Postgres or MySQL) is done. The former method will start postfix very +early on in the boot process. + + +Also, you will want to disable some Sendmail-specific daily maintenance routines in your /etc/periodic.conf file: daily_status_mail_rejects_enable="NO" diff --git a/mail/postfix23/Makefile b/mail/postfix23/Makefile index 6b47f15e39d2..6adf63b1ee81 100644 --- a/mail/postfix23/Makefile +++ b/mail/postfix23/Makefile @@ -12,7 +12,7 @@ # the options are the same names as in the scripts/configure.postfix file PORTNAME= postfix -PORTVERSION= 1.1.11 +PORTVERSION= 1.1.12 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -28,6 +28,7 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= khera@kciLink.com USE_SUBMAKE= yes +USE_REINPLACE= yes MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \ postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \ @@ -40,6 +41,10 @@ MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \ master.8 nqmgr.8 pickup.8 pipe.8 qmgr.8 qmqpd.8 showq.8 smtp.8 \ smtpd.8 spawn.8 trivial-rewrite.8 virtual.8 +# TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to +# patch it. +MAN8base=$(MAN8:S/tlsmgr.8//) + CONF1= main.cf master.cf access aliases canonical pcre_table regexp_table \ relocated transport virtual @@ -66,6 +71,27 @@ post-patch: CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ ${ECHO} "all: default" >> Makefile) +pre-patch: +.for file in ${MAN1} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/man/man1/${file} ${WRKSRC}/html/${file}.html +.endfor +.for file in ${MAN5} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/man/man5/${file} ${WRKSRC}/html/${file}.html +.endfor +.for file in ${MAN8base} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/man/man8/${file} ${WRKSRC}/html/${file}.html +.endfor +.for file in faq rate rewrite uce + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/html/${file}.html +.endfor +.for file in ${CONF1} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" ${WRKSRC}/conf/${file} +.endfor + pre-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL diff --git a/mail/postfix23/distinfo b/mail/postfix23/distinfo index 379358ed4749..832388cccb96 100644 --- a/mail/postfix23/distinfo +++ b/mail/postfix23/distinfo @@ -1,4 +1,4 @@ -MD5 (postfix/postfix-1.1.11.tar.gz) = b34bb2b5018327c19456a77814141208 +MD5 (postfix/postfix-1.1.12.tar.gz) = d1d0f9792ec6ea063ccca59184e54212 MD5 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz) = 11d82e9a3482f64af9d228f7a4319566 -MD5 (postfix/postfix-1.1.11+ipv6.patch.gz) = dc2a6362518025583a17305607eb8f0e +MD5 (postfix/postfix-1.1.12+ipv6.patch.gz) = add4396ce50ca61b5d9b67454fb51258 MD5 (postfix/postfix-pg.postfix-1.1.8.patch) = e0f4d910a6d6648d9b48e2244f2764ba diff --git a/mail/postfix23/files/patch-aa b/mail/postfix23/files/patch-aa deleted file mode 100644 index 51b40396bd5e..000000000000 --- a/mail/postfix23/files/patch-aa +++ /dev/null @@ -1,86 +0,0 @@ -*** ./conf/main.cf.orig Fri Jan 4 13:09:04 2002 ---- ./conf/main.cf Tue Jan 8 22:41:50 2002 -*************** -*** 31,44 **** - # The command_directory parameter specifies the location of all - # postXXX commands. The default value is $program_directory. - # -! command_directory = /usr/sbin - - # The daemon_directory parameter specifies the location of all Postfix - # daemon programs (i.e. programs listed in the master.cf file). The - # default value is $program_directory. This directory must be owned - # by root. - # -! daemon_directory = /usr/libexec/postfix - - # QUEUE AND PROCESS OWNERSHIP - # ---- 31,44 ---- - # The command_directory parameter specifies the location of all - # postXXX commands. The default value is $program_directory. - # -! command_directory = !!PREFIX!!/sbin - - # The daemon_directory parameter specifies the location of all Postfix - # daemon programs (i.e. programs listed in the master.cf file). The - # default value is $program_directory. This directory must be owned - # by root. - # -! daemon_directory = !!PREFIX!!/libexec/postfix - - # QUEUE AND PROCESS OWNERSHIP - # -*************** -*** 325,332 **** - # - # The home_mailbox parameter specifies the optional pathname of a - # mailbox file relative to a user's home directory. The default -! # mailbox file is /var/spool/mail/user or /var/mail/user. Specify -! # "Maildir/" for qmail-style delivery (the / is required). - # - #home_mailbox = Mailbox - #home_mailbox = Maildir/ ---- 325,332 ---- - # - # The home_mailbox parameter specifies the optional pathname of a - # mailbox file relative to a user's home directory. The default -! # mailbox file is /var/mail/user. Specify "Maildir/" for -! # qmail-style delivery (the / is required). - # - #home_mailbox = Mailbox - #home_mailbox = Maildir/ -*************** -*** 424,430 **** - # - # See also the body_checks example in the sample-filter.cf file. - # -! #header_checks = regexp:/etc/postfix/header_checks - - # FAST ETRN SERVICE - # ---- 424,430 ---- - # - # See also the body_checks example in the sample-filter.cf file. - # -! #header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks - - # FAST ETRN SERVICE - # -*************** -*** 525,531 **** - # commands. This must be a group name with a numerical group ID that - # is not shared with other accounts, not even with the Postfix account. - # -! setgid_group = - - # manpage_path: The location of the Postfix on-line manual pages. - # ---- 525,531 ---- - # commands. This must be a group name with a numerical group ID that - # is not shared with other accounts, not even with the Postfix account. - # -! setgid_group = maildrop - - # manpage_path: The location of the Postfix on-line manual pages. - # diff --git a/mail/postfix23/files/patch-ab b/mail/postfix23/files/patch-ab deleted file mode 100644 index 7c81d3dc12c9..000000000000 --- a/mail/postfix23/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/canonical.orig Tue Mar 7 10:42:58 2000 ---- ./conf/canonical Thu Jun 1 21:53:23 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/canonical - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/canonical - # diff --git a/mail/postfix23/files/patch-ac b/mail/postfix23/files/patch-ac deleted file mode 100644 index 0fb2192cdd84..000000000000 --- a/mail/postfix23/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/access.orig Tue Mar 7 10:42:58 2000 ---- ./conf/access Thu Jun 1 21:53:36 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/access - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/access - # diff --git a/mail/postfix23/files/patch-ad b/mail/postfix23/files/patch-ad deleted file mode 100644 index c1b102574165..000000000000 --- a/mail/postfix23/files/patch-ad +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/pcre_table.orig Thu Mar 9 20:36:19 2000 ---- ./conf/pcre_table Thu Jun 1 22:02:08 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # pcre:/etc/postfix/filename - # ---- 7,9 ---- - # SYNOPSIS -! # pcre:!!PREFIX!!/etc/postfix/filename - # diff --git a/mail/postfix23/files/patch-ae b/mail/postfix23/files/patch-ae deleted file mode 100644 index e396dd8626db..000000000000 --- a/mail/postfix23/files/patch-ae +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/regexp_table.orig Thu Mar 9 20:36:19 2000 ---- ./conf/regexp_table Thu Jun 1 22:03:27 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # regexp:/etc/postfix/filename - # ---- 7,9 ---- - # SYNOPSIS -! # regexp:!!PREFIX!!/etc/postfix/filename - # diff --git a/mail/postfix23/files/patch-af b/mail/postfix23/files/patch-af deleted file mode 100644 index 8fca6b208941..000000000000 --- a/mail/postfix23/files/patch-af +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/relocated.orig Tue Mar 7 10:42:58 2000 ---- ./conf/relocated Thu Jun 1 22:03:59 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/relocated - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/relocated - # diff --git a/mail/postfix23/files/patch-ag b/mail/postfix23/files/patch-ag deleted file mode 100644 index 54c0fa918d3b..000000000000 --- a/mail/postfix23/files/patch-ag +++ /dev/null @@ -1,15 +0,0 @@ -*** ./conf/sample-auth.cf.orig Sun May 28 17:55:19 2000 ---- ./conf/sample-auth.cf Thu Jun 1 22:05:32 2000 -*************** -*** 91,95 **** - # The Postfix SMTP client opens the lookup table before going to -! # chroot jail, so you can leave the password file in /etc/postfix. - # -! smtp_sasl_password_maps = hash:/etc/postfix/saslpass - ---- 91,95 ---- - # The Postfix SMTP client opens the lookup table before going to -! # chroot jail, so you can leave the password file in !!PREFIX!!/etc/postfix. - # -! smtp_sasl_password_maps = hash:!!PREFIX!!/etc/postfix/saslpass - diff --git a/mail/postfix23/files/patch-ah b/mail/postfix23/files/patch-ah deleted file mode 100644 index a8c70a15a78d..000000000000 --- a/mail/postfix23/files/patch-ah +++ /dev/null @@ -1,44 +0,0 @@ -*** ./conf/sample-canonical.cf.orig Thu Sep 23 14:10:38 1999 ---- ./conf/sample-canonical.cf Thu Jun 1 22:07:23 2000 -*************** -*** 14,16 **** - # -! # If you use this feature, run "postmap /etc/postfix/canonical" to - # build the necessary DBM or DB file after every change. The changes ---- 14,16 ---- - # -! # If you use this feature, run "postmap !!PREFIX!!/etc/postfix/canonical" to - # build the necessary DBM or DB file after every change. The changes -*************** -*** 19,24 **** - # -! #canonical_maps = dbm:/etc/postfix/canonical -! #canonical_maps = hash:/etc/postfix/canonical -! #canonical_maps = hash:/etc/postfix/canonical, nis:canonical -! #canonical_maps = hash:/etc/postfix/canonical, netinfo:/canonical - canonical_maps = ---- 19,24 ---- - # -! #canonical_maps = dbm:!!PREFIX!!/etc/postfix/canonical -! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical -! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical, nis:canonical -! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical, netinfo:/canonical - canonical_maps = -*************** -*** 32,34 **** - # -! #recipient_canonical_maps = hash:/etc/postfix/recipient_canonical - recipient_canonical_maps = ---- 32,34 ---- - # -! #recipient_canonical_maps = hash:!!PREFIX!!/etc/postfix/recipient_canonical - recipient_canonical_maps = -*************** -*** 46,48 **** - # -! #sender_canonical_maps = hash:/etc/postfix/sender_canonical - sender_canonical_maps = ---- 46,48 ---- - # -! #sender_canonical_maps = hash:!!PREFIX!!/etc/postfix/sender_canonical - sender_canonical_maps = diff --git a/mail/postfix23/files/patch-ai b/mail/postfix23/files/patch-ai deleted file mode 100644 index f7aa2fd5f4c6..000000000000 --- a/mail/postfix23/files/patch-ai +++ /dev/null @@ -1,18 +0,0 @@ -*** ./conf/sample-filter.cf.orig Mon May 29 11:30:44 2000 ---- ./conf/sample-filter.cf Thu Jun 1 22:07:58 2000 -*************** -*** 15,17 **** - # -! header_checks = regexp:/etc/postfix/header_checks - ---- 15,17 ---- - # -! header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks - -*************** -*** 26,27 **** - # -! body_checks = regexp:/etc/postfix/body_checks ---- 26,27 ---- - # -! body_checks = regexp:!!PREFIX!!/etc/postfix/body_checks diff --git a/mail/postfix23/files/patch-aj b/mail/postfix23/files/patch-aj deleted file mode 100644 index 241d48132551..000000000000 --- a/mail/postfix23/files/patch-aj +++ /dev/null @@ -1,24 +0,0 @@ -*** ./conf/sample-misc.cf.orig Thu Sep 23 14:10:52 1999 ---- ./conf/sample-misc.cf Thu Jun 1 22:09:39 2000 -*************** -*** 220,222 **** - # -! program_directory = /usr/libexec/postfix - ---- 220,222 ---- - # -! program_directory = !!PREFIX!!/libexec/postfix - -*************** -*** 263,267 **** - # Specify the types and names of databases to use. After change, -! # run "postmap /etc/postfix/relocated", then "postfix reload". - # -! #relocated_maps = hash:/etc/postfix/relocated - relocated_maps = ---- 263,267 ---- - # Specify the types and names of databases to use. After change, -! # run "postmap !!PREFIX!!/etc/postfix/relocated", then "postfix reload". - # -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated - relocated_maps = diff --git a/mail/postfix23/files/patch-ak b/mail/postfix23/files/patch-ak deleted file mode 100644 index 250dd411a4bd..000000000000 --- a/mail/postfix23/files/patch-ak +++ /dev/null @@ -1,26 +0,0 @@ -*** ./conf/sample-relocated.cf.orig Thu Sep 23 14:11:17 1999 ---- ./conf/sample-relocated.cf Thu Jun 1 22:10:43 2000 -*************** -*** 12,14 **** - # -! # If you use this feature, run "postmap /etc/postfix/relocated" to - # build the necessary DBM or DB file after change, then "postfix ---- 12,14 ---- - # -! # If you use this feature, run "postmap !!PREFIX!!/etc/postfix/relocated" to - # build the necessary DBM or DB file after change, then "postfix -*************** -*** 16,21 **** - # -! #relocated_maps = dbm:/etc/postfix/relocated -! #relocated_maps = hash:/etc/postfix/relocated -! #relocated_maps = hash:/etc/postfix/relocated, nis:virtual -! #relocated_maps = hash:/etc/postfix/relocated, netinfo:/relocated - relocated_maps = ---- 16,21 ---- - # -! #relocated_maps = dbm:!!PREFIX!!/etc/postfix/relocated -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated, nis:virtual -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated, netinfo:/relocated - relocated_maps = diff --git a/mail/postfix23/files/patch-al b/mail/postfix23/files/patch-al deleted file mode 100644 index 799206da0c96..000000000000 --- a/mail/postfix23/files/patch-al +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/sample-smtpd.cf.orig Mon Dec 27 19:41:37 1999 ---- ./conf/sample-smtpd.cf Thu Jun 1 22:11:22 2000 -*************** -*** 183,185 **** - #smtpd_sender_restrictions = reject_unknown_sender_domain -! #smtpd_sender_restrictions = reject_unknown_sender_domain, hash:/etc/postfix/access - smtpd_sender_restrictions = ---- 183,185 ---- - #smtpd_sender_restrictions = reject_unknown_sender_domain -! #smtpd_sender_restrictions = reject_unknown_sender_domain, hash:!!PREFIX!!/etc/postfix/access - smtpd_sender_restrictions = diff --git a/mail/postfix23/files/patch-am b/mail/postfix23/files/patch-am deleted file mode 100644 index 2d395fa9ca03..000000000000 --- a/mail/postfix23/files/patch-am +++ /dev/null @@ -1,23 +0,0 @@ -*** ./conf/sample-transport.cf.orig Thu Dec 23 10:50:00 1999 ---- ./conf/sample-transport.cf Thu Jun 1 22:13:09 2000 -*************** -*** 10,18 **** - # By default, this feature is disabled. Specify the types of databases -! # to use. If you use this feature, run "postmap /etc/postfix/transport" - # after change, then "postfix reload". - # -! #transport_maps = dbm:/etc/postfix/transport -! #transport_maps = hash:/etc/postfix/transport -! #transport_maps = hash:/etc/postfix/transport, nis:transport -! #transport_maps = hash:/etc/postfix/transport, netinfo:/transport - transport_maps = ---- 10,18 ---- - # By default, this feature is disabled. Specify the types of databases -! # to use. If you use this feature, run "postmap !!PREFIX!!/etc/postfix/transport" - # after change, then "postfix reload". - # -! #transport_maps = dbm:!!PREFIX!!/etc/postfix/transport -! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport -! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport, nis:transport -! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport, netinfo:/transport - transport_maps = diff --git a/mail/postfix23/files/patch-an b/mail/postfix23/files/patch-an deleted file mode 100644 index af5ac7cc031b..000000000000 --- a/mail/postfix23/files/patch-an +++ /dev/null @@ -1,26 +0,0 @@ -*** ./conf/sample-virtual.cf.orig Mon Dec 20 21:00:42 1999 ---- ./conf/sample-virtual.cf Thu Jun 1 22:13:32 2000 -*************** -*** 12,14 **** - # -! # If you use this feature, run "postmap /etc/postfix/virtual" to - # build the necessary DBM or DB file after change. ---- 12,14 ---- - # -! # If you use this feature, run "postmap !!PREFIX!!/etc/postfix/virtual" to - # build the necessary DBM or DB file after change. -*************** -*** 18,23 **** - # -! #virtual_maps = dbm:/etc/postfix/virtual -! #virtual_maps = hash:/etc/postfix/virtual -! #virtual_maps = hash:/etc/postfix/virtual, nis:virtual -! #virtual_maps = hash:/etc/postfix/virtual, netinfo:/virtual - virtual_maps = ---- 18,23 ---- - # -! #virtual_maps = dbm:!!PREFIX!!/etc/postfix/virtual -! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual -! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual, nis:virtual -! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual, netinfo:/virtual - virtual_maps = diff --git a/mail/postfix23/files/patch-ao b/mail/postfix23/files/patch-ao deleted file mode 100644 index fd854e181601..000000000000 --- a/mail/postfix23/files/patch-ao +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/transport.orig Tue Mar 7 10:42:58 2000 ---- ./conf/transport Thu Jun 1 22:13:41 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/transport - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/transport - # diff --git a/mail/postfix23/files/patch-ap b/mail/postfix23/files/patch-ap deleted file mode 100644 index 4598192cd5c1..000000000000 --- a/mail/postfix23/files/patch-ap +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/virtual.orig Tue Mar 7 10:42:59 2000 ---- ./conf/virtual Thu Jun 1 22:13:54 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/virtual - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/virtual - # diff --git a/mail/postfix23/files/patch-ba b/mail/postfix23/files/patch-ba deleted file mode 100644 index ccb54ec60a7a..000000000000 --- a/mail/postfix23/files/patch-ba +++ /dev/null @@ -1,20 +0,0 @@ -*** ./html/mailq.1.html.orig Sat Apr 22 20:28:36 2000 ---- ./html/mailq.1.html Thu Jun 1 22:19:24 2000 -*************** -*** 83,85 **** - The path name of the <b>sendmail.cf</b> file. Postfix con- -! figuration files are kept in <b>/etc/postfix</b>. - ---- 83,85 ---- - The path name of the <b>sendmail.cf</b> file. Postfix con- -! figuration files are kept in <b>!!PREFIX!!/etc/postfix</b>. - -*************** -*** 231,233 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - ---- 231,233 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - diff --git a/mail/postfix23/files/patch-bb b/mail/postfix23/files/patch-bb deleted file mode 100644 index ea744664dfa7..000000000000 --- a/mail/postfix23/files/patch-bb +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/access.5.html.orig Tue Nov 21 21:24:13 2000 -+++ ./html/access.5.html Tue Nov 21 21:24:34 2000 -@@ -9,7 +9,7 @@ - access - format of Postfix access table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/access</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b> - - <b>DESCRIPTION</b> - The optional <b>access</b> table directs the Postfix SMTP server -@@ -21,7 +21,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/access</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b> in order to rebuild the - indexed file after changing the access table. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix23/files/patch-bc b/mail/postfix23/files/patch-bc deleted file mode 100644 index e407a9650585..000000000000 --- a/mail/postfix23/files/patch-bc +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/canonical.5.html.orig Tue Nov 21 21:32:38 2000 -+++ ./html/canonical.5.html Tue Nov 21 21:33:21 2000 -@@ -9,7 +9,7 @@ - canonical - format of Postfix canonical table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/canonical</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b> - - <b>DESCRIPTION</b> - The optional <b>canonical</b> table specifies an address mapping -@@ -20,7 +20,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/canonical</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b> in order to rebuild the - indexed file after changing the text file. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix23/files/patch-be b/mail/postfix23/files/patch-be deleted file mode 100644 index bef6a3bfaf73..000000000000 --- a/mail/postfix23/files/patch-be +++ /dev/null @@ -1,10 +0,0 @@ ---- ./html/faq.html.orig Sat Oct 28 23:34:51 2000 -+++ ./html/faq.html Sat Oct 28 23:36:04 2000 -@@ -2572,7 +2572,7 @@ - - Answer: instead of using <b>/usr/include/ndbm.h</b>, you're building - Postfix with some incompatible third-party file, typically --<b>/usr/local/include/ndbm.h</b>. -+<b>!!PREFIX!!/include/ndbm.h</b>. - - <p> diff --git a/mail/postfix23/files/patch-bf b/mail/postfix23/files/patch-bf deleted file mode 100644 index d652e1e567b3..000000000000 --- a/mail/postfix23/files/patch-bf +++ /dev/null @@ -1,13 +0,0 @@ -*** ./html/cleanup.8.html.orig Sun May 28 21:58:41 2000 ---- ./html/cleanup.8.html Thu Jun 1 22:29:04 2000 -*************** -*** 174,177 **** - <b>FILES</b> -! /etc/postfix/canonical*, canonical mapping table -! /etc/postfix/virtual*, virtual mapping table - ---- 174,177 ---- - <b>FILES</b> -! !!PREFIX!!/etc/postfix/canonical*, canonical mapping table -! !!PREFIX!!/etc/postfix/virtual*, virtual mapping table - diff --git a/mail/postfix23/files/patch-bg b/mail/postfix23/files/patch-bg deleted file mode 100644 index ce2454eaef01..000000000000 --- a/mail/postfix23/files/patch-bg +++ /dev/null @@ -1,13 +0,0 @@ -*** ./html/master.8.html.orig Tue Mar 7 10:48:56 2000 ---- ./html/master.8.html Thu Jun 1 22:29:24 2000 -*************** -*** 148,151 **** - <b>FILES</b> -! /etc/postfix/main.cf: global configuration file. -! /etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. ---- 148,151 ---- - <b>FILES</b> -! !!PREFIX!!/etc/postfix/main.cf: global configuration file. -! !!PREFIX!!/etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. diff --git a/mail/postfix23/files/patch-bh b/mail/postfix23/files/patch-bh deleted file mode 100644 index a20232e6796a..000000000000 --- a/mail/postfix23/files/patch-bh +++ /dev/null @@ -1,11 +0,0 @@ -*** ./html/goals.html.orig Sun May 9 15:44:18 1999 ---- ./html/goals.html Thu Jun 1 22:30:14 2000 -*************** -*** 45,47 **** - <li>Compatibility. Postfix is designed to be sendmail-compatible -! to make migration easy. Postfix supports <b>/var[/spool]/mail</b>, - <b>/etc/aliases</b>, <b>NIS</b>, and <b>~/.forward</b> files. ---- 45,47 ---- - <li>Compatibility. Postfix is designed to be sendmail-compatible -! to make migration easy. Postfix supports <b>/var/mail</b>, - <b>/etc/aliases</b>, <b>NIS</b>, and <b>~/.forward</b> files. diff --git a/mail/postfix23/files/patch-bi b/mail/postfix23/files/patch-bi deleted file mode 100644 index 7e4acdb0c126..000000000000 --- a/mail/postfix23/files/patch-bi +++ /dev/null @@ -1,11 +0,0 @@ -*** ./html/postdrop.1.html.orig Mon May 3 15:05:12 1999 ---- ./html/postdrop.1.html Thu Jun 1 22:30:47 2000 -*************** -*** 48,50 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - ---- 48,50 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - diff --git a/mail/postfix23/files/patch-bj b/mail/postfix23/files/patch-bj deleted file mode 100644 index 00e78d01ba5a..000000000000 --- a/mail/postfix23/files/patch-bj +++ /dev/null @@ -1,42 +0,0 @@ -*** ./html/uce.html.orig Fri Dec 31 15:06:07 1999 ---- ./html/uce.html Thu Jun 1 22:31:37 2000 -*************** -*** 126,130 **** - -! <dd> <b>header_checks = regexp:/etc/postfix/header_checks</b> - -! <dd> <b>header_checks = pcre:/etc/postfix/header_checks</b> - ---- 126,130 ---- - -! <dd> <b>header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks</b> - -! <dd> <b>header_checks = pcre:!!PREFIX!!/etc/postfix/header_checks</b> - -*************** -*** 169,171 **** - -! <dd> <b>smtpd_client_restrictions = hash:/etc/postfix/access, - reject_maps_rbl</b> ---- 169,171 ---- - -! <dd> <b>smtpd_client_restrictions = hash:!!PREFIX!!/etc/postfix/access, - reject_maps_rbl</b> -*************** -*** 474,476 **** - -! <dd> <b>smtpd_sender_restrictions = hash:/etc/postfix/access, - reject_unknown_sender_domain</b> ---- 474,476 ---- - -! <dd> <b>smtpd_sender_restrictions = hash:!!PREFIX!!/etc/postfix/access, - reject_unknown_sender_domain</b> -*************** -*** 856,858 **** - <dd> <b>smtpd_etrn_restrictions = permit_mynetworks, -! hash:/etc/postfix/etrn_access, reject</b> - ---- 856,858 ---- - <dd> <b>smtpd_etrn_restrictions = permit_mynetworks, -! hash:!!PREFIX!!/etc/postfix/etrn_access, reject</b> - diff --git a/mail/postfix23/files/patch-bk b/mail/postfix23/files/patch-bk deleted file mode 100644 index 62a0573559ae..000000000000 --- a/mail/postfix23/files/patch-bk +++ /dev/null @@ -1,29 +0,0 @@ -*** ./html/rate.html.orig Wed Mar 17 17:55:22 1999 ---- ./html/rate.html Thu Jun 1 22:32:19 2000 -*************** -*** 224,226 **** - -! <dt>/etc/postfix/main.cf: - ---- 224,226 ---- - -! <dt>!!PREFIX!!/etc/postfix/main.cf: - -*************** -*** 237,239 **** - -! <dt>/etc/postfix/<a href="transport.5.html">transport</a>: - ---- 237,239 ---- - -! <dt>!!PREFIX!!/etc/postfix/<a href="transport.5.html">transport</a>: - -*************** -*** 253,255 **** - -! <dt>/etc/postfix/master.cf: - ---- 253,255 ---- - -! <dt>!!PREFIX!!/etc/postfix/master.cf: - diff --git a/mail/postfix23/files/patch-bl b/mail/postfix23/files/patch-bl deleted file mode 100644 index 176c7d1b64de..000000000000 --- a/mail/postfix23/files/patch-bl +++ /dev/null @@ -1,11 +0,0 @@ -*** ./html/regexp_table.5.html.orig Sat Apr 22 20:28:38 2000 ---- ./html/regexp_table.5.html Thu Jun 1 22:32:44 2000 -*************** -*** 11,13 **** - <b>SYNOPSIS</b> -! regexp:/etc/postfix/filename - ---- 11,13 ---- - <b>SYNOPSIS</b> -! regexp:!!PREFIX!!/etc/postfix/filename - diff --git a/mail/postfix23/files/patch-bm b/mail/postfix23/files/patch-bm deleted file mode 100644 index e5ccc2c50b94..000000000000 --- a/mail/postfix23/files/patch-bm +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/relocated.5.html.orig Tue Nov 21 21:37:54 2000 -+++ ./html/relocated.5.html Tue Nov 21 21:38:08 2000 -@@ -9,7 +9,7 @@ - relocated - format of Postfix relocated table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/relocated</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b> - - <b>DESCRIPTION</b> - The optional <b>relocated</b> table provides the information that -@@ -20,7 +20,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/relocated</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b> in order to rebuild the - indexed file after changing the relocated table. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix23/files/patch-bn b/mail/postfix23/files/patch-bn deleted file mode 100644 index 21e69dcaa40c..000000000000 --- a/mail/postfix23/files/patch-bn +++ /dev/null @@ -1,56 +0,0 @@ -*** ./html/rewrite.html.orig Sat May 8 17:51:41 1999 ---- ./html/rewrite.html Thu Jun 1 22:34:21 2000 -*************** -*** 194,196 **** - -! <dd><b>canonical_maps = hash:/etc/postfix/canonical</b> - ---- 194,196 ---- - -! <dd><b>canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical</b> - -*************** -*** 207,209 **** - -! <dd><b>sender_canonical_maps = hash:/etc/postfix/sender_canonical</b> - ---- 207,209 ---- - -! <dd><b>sender_canonical_maps = hash:!!PREFIX!!/etc/postfix/sender_canonical</b> - -*************** -*** 211,213 **** - -! <dd><b>recipient_canonical_maps = hash:/etc/postfix/recipient_canonical</b> - ---- 211,213 ---- - -! <dd><b>recipient_canonical_maps = hash:!!PREFIX!!/etc/postfix/recipient_canonical</b> - -*************** -*** 295,297 **** - -! <dd><b>virtual_maps = hash:/etc/postfix/virtual</b> - ---- 295,297 ---- - -! <dd><b>virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual</b> - -*************** -*** 323,325 **** - -! <dd><b>relocated_maps = hash:/etc/postfix/relocated</b> - ---- 323,325 ---- - -! <dd><b>relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated</b> - -*************** -*** 348,350 **** - -! <dd><b>transport_maps = hash:/etc/postfix/transport</b> - ---- 348,350 ---- - -! <dd><b>transport_maps = hash:!!PREFIX!!/etc/postfix/transport</b> - diff --git a/mail/postfix23/files/patch-bo b/mail/postfix23/files/patch-bo deleted file mode 100644 index b45270be8151..000000000000 --- a/mail/postfix23/files/patch-bo +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/transport.5.html.orig Tue Nov 21 21:43:00 2000 -+++ ./html/transport.5.html Tue Nov 21 21:43:20 2000 -@@ -9,7 +9,7 @@ - transport - format of Postfix transport table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/transport</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b> - - <b>DESCRIPTION</b> - The optional <b>transport</b> table specifies a mapping from -@@ -21,7 +21,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/transport</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b> in order to rebuild the - indexed file after changing the transport table. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix23/files/patch-bp b/mail/postfix23/files/patch-bp deleted file mode 100644 index 5206bfd4bfd0..000000000000 --- a/mail/postfix23/files/patch-bp +++ /dev/null @@ -1,43 +0,0 @@ ---- ./html/virtual.5.html.orig Tue Nov 21 21:46:50 2000 -+++ ./html/virtual.5.html Tue Nov 21 21:47:17 2000 -@@ -9,7 +9,7 @@ - virtual - format of Postfix virtual table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/virtual</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b> - - <b>DESCRIPTION</b> - The optional <b>virtual</b> table specifies address redirections -@@ -27,7 +27,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/virtual</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b> in order to rebuild the - indexed file after changing the text file. - - When the table is provided via other means such as NIS, -@@ -52,7 +52,7 @@ - - Support for a Postfix-style virtual domain looks like: - -- /etc/postfix/virtual: -+ !!PREFIX!!/etc/postfix/virtual: - <i>virtual.domain</i> <i>anything</i> (right-hand content does not matter) - <i>postmaster@virtual.domain</i> <i>postmaster</i> - <i>user1@virtual.domain</i> <i>address1</i> -@@ -94,11 +94,11 @@ - - Support for a Sendmail-style virtual domain looks like: - -- /etc/postfix/main.cf: -+ !!PREFIX!!/etc/postfix/main.cf: - mydestination = $myhostname localhost.$mydomain $mydomain - <i>virtual.domain</i> - -- /etc/postfix/virtual: -+ !!PREFIX!!/etc/postfix/virtual: - <i>user1@virtual.domain</i> <i>address1</i> - <i>user2@virtual.domain</i> <i>address2,</i> <i>address3</i> - diff --git a/mail/postfix23/files/patch-ca b/mail/postfix23/files/patch-ca deleted file mode 100644 index 86d56f80be30..000000000000 --- a/mail/postfix23/files/patch-ca +++ /dev/null @@ -1,11 +0,0 @@ -*** ./man/man1/postdrop.1.orig Mon May 3 15:03:29 1999 ---- ./man/man1/postdrop.1 Thu Jun 1 22:38:54 2000 -*************** -*** 53,55 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS ---- 53,55 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS diff --git a/mail/postfix23/files/patch-cb b/mail/postfix23/files/patch-cb deleted file mode 100644 index 58559c7273d1..000000000000 --- a/mail/postfix23/files/patch-cb +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man1/sendmail.1.orig Thu Mar 30 14:05:28 2000 ---- ./man/man1/sendmail.1 Thu Jun 1 22:39:16 2000 -*************** -*** 63,65 **** - The path name of the \fBsendmail.cf\fR file. Postfix configuration -! files are kept in \fB/etc/postfix\fR. - .IP "\fB-F \fIfull_name\fR ---- 63,65 ---- - The path name of the \fBsendmail.cf\fR file. Postfix configuration -! files are kept in \fB!!PREFIX!!/etc/postfix\fR. - .IP "\fB-F \fIfull_name\fR -*************** -*** 173,175 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS ---- 173,175 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS diff --git a/mail/postfix23/files/patch-cc b/mail/postfix23/files/patch-cc deleted file mode 100644 index cd6946003217..000000000000 --- a/mail/postfix23/files/patch-cc +++ /dev/null @@ -1,11 +0,0 @@ -*** ./man/man5/pcre_table.5.orig Thu Mar 30 14:05:28 2000 ---- ./man/man5/pcre_table.5 Thu Jun 1 22:39:34 2000 -*************** -*** 10,12 **** - .nf -! pcre:/etc/postfix/filename - .SH DESCRIPTION ---- 10,12 ---- - .nf -! pcre:!!PREFIX!!/etc/postfix/filename - .SH DESCRIPTION diff --git a/mail/postfix23/files/patch-cd b/mail/postfix23/files/patch-cd deleted file mode 100644 index b51de44d0bee..000000000000 --- a/mail/postfix23/files/patch-cd +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/access.5.orig Sat Apr 22 20:28:30 2000 ---- ./man/man5/access.5 Thu Jun 1 22:39:55 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/access\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/access\fR - .SH DESCRIPTION -*************** -*** 21,23 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed - file after changing the access table. ---- 21,23 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed - file after changing the access table. diff --git a/mail/postfix23/files/patch-ce b/mail/postfix23/files/patch-ce deleted file mode 100644 index f77053f8b3aa..000000000000 --- a/mail/postfix23/files/patch-ce +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/canonical.5.orig Sat Apr 22 20:28:30 2000 ---- ./man/man5/canonical.5 Thu Jun 1 22:40:18 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/canonical\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR - .SH DESCRIPTION -*************** -*** 21,23 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed - file after changing the canonical table. ---- 21,23 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed - file after changing the canonical table. diff --git a/mail/postfix23/files/patch-cf b/mail/postfix23/files/patch-cf deleted file mode 100644 index 28fb053b94a7..000000000000 --- a/mail/postfix23/files/patch-cf +++ /dev/null @@ -1,11 +0,0 @@ -*** ./man/man5/regexp_table.5.orig Thu Mar 30 14:05:28 2000 ---- ./man/man5/regexp_table.5 Thu Jun 1 22:40:43 2000 -*************** -*** 10,12 **** - .nf -! regexp:/etc/postfix/filename - .SH DESCRIPTION ---- 10,12 ---- - .nf -! regexp:!!PREFIX!!/etc/postfix/filename - .SH DESCRIPTION diff --git a/mail/postfix23/files/patch-cg b/mail/postfix23/files/patch-cg deleted file mode 100644 index 0ae82cc57669..000000000000 --- a/mail/postfix23/files/patch-cg +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/relocated.5.orig Sat Apr 22 20:28:31 2000 ---- ./man/man5/relocated.5 Thu Jun 1 22:41:05 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/relocated\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR - .SH DESCRIPTION -*************** -*** 20,22 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed - file after changing the relocated table. ---- 20,22 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed - file after changing the relocated table. diff --git a/mail/postfix23/files/patch-ch b/mail/postfix23/files/patch-ch deleted file mode 100644 index 3ed047ea474c..000000000000 --- a/mail/postfix23/files/patch-ch +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/transport.5.orig Sat Apr 22 20:28:31 2000 ---- ./man/man5/transport.5 Thu Jun 1 22:41:26 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/transport\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR - .SH DESCRIPTION -*************** -*** 21,23 **** - for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed - file after changing the transport table. ---- 21,23 ---- - for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed - file after changing the transport table. diff --git a/mail/postfix23/files/patch-ci b/mail/postfix23/files/patch-ci deleted file mode 100644 index 1a7cf4abbac7..000000000000 --- a/mail/postfix23/files/patch-ci +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/virtual.5.orig Sat Apr 22 20:28:31 2000 ---- ./man/man5/virtual.5 Thu Jun 1 22:41:51 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/virtual\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR - .SH DESCRIPTION -*************** -*** 26,28 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed - file after changing the virtual table. ---- 26,28 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed - file after changing the virtual table. diff --git a/mail/postfix23/files/patch-cj b/mail/postfix23/files/patch-cj deleted file mode 100644 index 50448f2ec26d..000000000000 --- a/mail/postfix23/files/patch-cj +++ /dev/null @@ -1,13 +0,0 @@ -*** ./man/man8/cleanup.8.orig Sun May 28 21:58:32 2000 ---- ./man/man8/cleanup.8 Thu Jun 1 22:42:21 2000 -*************** -*** 136,139 **** - .nf -! /etc/postfix/canonical*, canonical mapping table -! /etc/postfix/virtual*, virtual mapping table - .SH LICENSE ---- 136,139 ---- - .nf -! !!PREFIX!!/etc/postfix/canonical*, canonical mapping table -! !!PREFIX!!/etc/postfix/virtual*, virtual mapping table - .SH LICENSE diff --git a/mail/postfix23/files/patch-cl b/mail/postfix23/files/patch-cl deleted file mode 100644 index 44c8a3a7aae0..000000000000 --- a/mail/postfix23/files/patch-cl +++ /dev/null @@ -1,13 +0,0 @@ -*** ./man/man8/master.8.orig Tue Mar 7 10:48:19 2000 ---- ./man/man8/master.8 Thu Jun 1 22:43:02 2000 -*************** -*** 120,123 **** - .nf -! /etc/postfix/main.cf: global configuration file. -! /etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. ---- 120,123 ---- - .nf -! !!PREFIX!!/etc/postfix/main.cf: global configuration file. -! !!PREFIX!!/etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. diff --git a/mail/postfix23/files/patch-da b/mail/postfix23/files/patch-da deleted file mode 100644 index e57e31750d18..000000000000 --- a/mail/postfix23/files/patch-da +++ /dev/null @@ -1,11 +0,0 @@ -*** ./proto/regexp_table.orig Wed Mar 8 19:18:20 2000 ---- ./proto/regexp_table Thu Jun 1 22:44:43 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # regexp:/etc/postfix/filename - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # regexp:!!PREFIX!!/etc/postfix/filename - # DESCRIPTION diff --git a/mail/postfix23/files/patch-db b/mail/postfix23/files/patch-db deleted file mode 100644 index 7f89fb770783..000000000000 --- a/mail/postfix23/files/patch-db +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/access.orig Sun Apr 9 16:44:45 2000 ---- ./proto/access Thu Jun 1 22:45:05 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/access\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR - # DESCRIPTION -*************** -*** 15,17 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed - # file after changing the access table. ---- 15,17 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed - # file after changing the access table. diff --git a/mail/postfix23/files/patch-dc b/mail/postfix23/files/patch-dc deleted file mode 100644 index 786f2da45c32..000000000000 --- a/mail/postfix23/files/patch-dc +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/canonical.orig Sun Apr 9 16:43:37 2000 ---- ./proto/canonical Thu Jun 1 22:45:28 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/canonical\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR - # DESCRIPTION -*************** -*** 15,17 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed - # file after changing the canonical table. ---- 15,17 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed - # file after changing the canonical table. diff --git a/mail/postfix23/files/patch-dd b/mail/postfix23/files/patch-dd deleted file mode 100644 index b65a57ff7d57..000000000000 --- a/mail/postfix23/files/patch-dd +++ /dev/null @@ -1,11 +0,0 @@ -*** ./proto/pcre_table.orig Wed Mar 8 19:18:11 2000 ---- ./proto/pcre_table Thu Jun 1 22:45:41 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # pcre:/etc/postfix/filename - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # pcre:!!PREFIX!!/etc/postfix/filename - # DESCRIPTION diff --git a/mail/postfix23/files/patch-de b/mail/postfix23/files/patch-de deleted file mode 100644 index 73bb2af2261d..000000000000 --- a/mail/postfix23/files/patch-de +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/relocated.orig Sun Apr 9 16:47:31 2000 ---- ./proto/relocated Thu Jun 1 22:46:02 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/relocated\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR - # DESCRIPTION -*************** -*** 14,16 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed - # file after changing the relocated table. ---- 14,16 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed - # file after changing the relocated table. diff --git a/mail/postfix23/files/patch-df b/mail/postfix23/files/patch-df deleted file mode 100644 index 8d3fba96a224..000000000000 --- a/mail/postfix23/files/patch-df +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/transport.orig Sun Apr 9 17:05:45 2000 ---- ./proto/transport Thu Jun 1 22:46:23 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/transport\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR - # DESCRIPTION -*************** -*** 15,17 **** - # for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed - # file after changing the transport table. ---- 15,17 ---- - # for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed - # file after changing the transport table. diff --git a/mail/postfix23/files/patch-dg b/mail/postfix23/files/patch-dg deleted file mode 100644 index bff20a2cff3e..000000000000 --- a/mail/postfix23/files/patch-dg +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/virtual.orig Sun Apr 9 17:14:14 2000 ---- ./proto/virtual Thu Jun 1 22:46:40 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/virtual\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR - # DESCRIPTION -*************** -*** 20,22 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed - # file after changing the virtual table. ---- 20,22 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed - # file after changing the virtual table. diff --git a/mail/postfix23/files/patch-ea b/mail/postfix23/files/patch-ea deleted file mode 100644 index 6c3f98d2af4f..000000000000 --- a/mail/postfix23/files/patch-ea +++ /dev/null @@ -1,13 +0,0 @@ -*** ./src/cleanup/cleanup.c.orig Sun May 28 18:33:41 2000 ---- ./src/cleanup/cleanup.c Thu Jun 1 21:52:22 2000 -*************** -*** 118,121 **** - /* FILES -! /* /etc/postfix/canonical*, canonical mapping table -! /* /etc/postfix/virtual*, virtual mapping table - /* LICENSE ---- 118,121 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix/canonical*, canonical mapping table -! /* !!PREFIX!!/etc/postfix/virtual*, virtual mapping table - /* LICENSE diff --git a/mail/postfix23/files/patch-eb b/mail/postfix23/files/patch-eb deleted file mode 100644 index e67680963d2d..000000000000 --- a/mail/postfix23/files/patch-eb +++ /dev/null @@ -1,11 +0,0 @@ -*** ./src/global/mail_conf.c.orig Sun May 7 18:51:16 2000 ---- ./src/global/mail_conf.c Thu Jun 1 22:16:29 2000 -*************** -*** 53,55 **** - /* FILES -! /* /etc/postfix: default Postfix configuration directory. - /* ENVIRONMENT ---- 53,55 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix: default Postfix configuration directory. - /* ENVIRONMENT diff --git a/mail/postfix23/files/patch-ee b/mail/postfix23/files/patch-ee deleted file mode 100644 index ef44eac24b73..000000000000 --- a/mail/postfix23/files/patch-ee +++ /dev/null @@ -1,13 +0,0 @@ -*** ./src/master/master.c.orig Tue Mar 7 10:25:07 2000 ---- ./src/master/master.c Thu Jun 1 22:43:50 2000 -*************** -*** 104,107 **** - /* FILES -! /* /etc/postfix/main.cf: global configuration file. -! /* /etc/postfix/master.cf: master process configuration file. - /* /var/spool/postfix/pid/master.pid: master lock file. ---- 104,107 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix/main.cf: global configuration file. -! /* !!PREFIX!!/etc/postfix/master.cf: master process configuration file. - /* /var/spool/postfix/pid/master.pid: master lock file. diff --git a/mail/postfix23/files/patch-ef b/mail/postfix23/files/patch-ef deleted file mode 100644 index 586b304a103d..000000000000 --- a/mail/postfix23/files/patch-ef +++ /dev/null @@ -1,11 +0,0 @@ -*** ./src/postdrop/postdrop.c.orig Sun Apr 25 18:05:43 1999 ---- ./src/postdrop/postdrop.c Thu Jun 1 22:44:22 2000 -*************** -*** 39,41 **** - /* /var/spool/postfix, mail queue -! /* /etc/postfix, configuration files - /* CONFIGURATION PARAMETERS ---- 39,41 ---- - /* /var/spool/postfix, mail queue -! /* !!PREFIX!!/etc/postfix, configuration files - /* CONFIGURATION PARAMETERS diff --git a/mail/postfix23/files/patch-eg b/mail/postfix23/files/patch-eg deleted file mode 100644 index 2983bbfd86ea..000000000000 --- a/mail/postfix23/files/patch-eg +++ /dev/null @@ -1,20 +0,0 @@ -*** ./src/sendmail/sendmail.c.orig Tue Mar 14 10:42:06 2000 ---- ./src/sendmail/sendmail.c Thu Jun 1 22:47:24 2000 -*************** -*** 57,59 **** - /* The path name of the \fBsendmail.cf\fR file. Postfix configuration -! /* files are kept in \fB/etc/postfix\fR. - /* .IP "\fB-F \fIfull_name\fR ---- 57,59 ---- - /* The path name of the \fBsendmail.cf\fR file. Postfix configuration -! /* files are kept in \fB!!PREFIX!!/etc/postfix\fR. - /* .IP "\fB-F \fIfull_name\fR -*************** -*** 159,161 **** - /* /var/spool/postfix, mail queue -! /* /etc/postfix, configuration files - /* CONFIGURATION PARAMETERS ---- 159,161 ---- - /* /var/spool/postfix, mail queue -! /* !!PREFIX!!/etc/postfix, configuration files - /* CONFIGURATION PARAMETERS diff --git a/mail/postfix23/files/patch-eh b/mail/postfix23/files/patch-eh deleted file mode 100644 index c104c3680d21..000000000000 --- a/mail/postfix23/files/patch-eh +++ /dev/null @@ -1,11 +0,0 @@ -*** ./src/trivial-rewrite/transport.c.orig Tue Nov 16 19:15:41 1999 ---- ./src/trivial-rewrite/transport.c Thu Jun 1 22:47:49 2000 -*************** -*** 32,34 **** - /* FILES -! /* /etc/postfix/transport* - /* CONFIGURATION PARAMETERS ---- 32,34 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix/transport* - /* CONFIGURATION PARAMETERS diff --git a/mail/postfix23/pkg-message b/mail/postfix23/pkg-message index a7ae2b17e2a6..7fb3a804599c 100644 --- a/mail/postfix23/pkg-message +++ b/mail/postfix23/pkg-message @@ -8,10 +8,21 @@ sendmail_outbound_enable="NO" sendmail_submit_enable="NO" sendmail_msp_queue_enable="NO" -This will disable Sendmail completely. + **OR** +sendmail_enable="NONE" -Also, you may wish to disable some Sendmail-specific daily maintenance +then type this command as root: + +ln -s /usr/local/sbin/postfix /usr/local/etc/rc.d/postfix.sh + +Either of these will disable Sendmail completely. The latter form is useful +if you need to wait until other local package initialization (such as ldconfig +for Postgres or MySQL) is done. The former method will start postfix very +early on in the boot process. + + +Also, you will want to disable some Sendmail-specific daily maintenance routines in your /etc/periodic.conf file: daily_status_mail_rejects_enable="NO" diff --git a/mail/postfix24/Makefile b/mail/postfix24/Makefile index 6b47f15e39d2..6adf63b1ee81 100644 --- a/mail/postfix24/Makefile +++ b/mail/postfix24/Makefile @@ -12,7 +12,7 @@ # the options are the same names as in the scripts/configure.postfix file PORTNAME= postfix -PORTVERSION= 1.1.11 +PORTVERSION= 1.1.12 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -28,6 +28,7 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= khera@kciLink.com USE_SUBMAKE= yes +USE_REINPLACE= yes MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \ postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \ @@ -40,6 +41,10 @@ MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \ master.8 nqmgr.8 pickup.8 pipe.8 qmgr.8 qmqpd.8 showq.8 smtp.8 \ smtpd.8 spawn.8 trivial-rewrite.8 virtual.8 +# TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to +# patch it. +MAN8base=$(MAN8:S/tlsmgr.8//) + CONF1= main.cf master.cf access aliases canonical pcre_table regexp_table \ relocated transport virtual @@ -66,6 +71,27 @@ post-patch: CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ ${ECHO} "all: default" >> Makefile) +pre-patch: +.for file in ${MAN1} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/man/man1/${file} ${WRKSRC}/html/${file}.html +.endfor +.for file in ${MAN5} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/man/man5/${file} ${WRKSRC}/html/${file}.html +.endfor +.for file in ${MAN8base} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/man/man8/${file} ${WRKSRC}/html/${file}.html +.endfor +.for file in faq rate rewrite uce + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/html/${file}.html +.endfor +.for file in ${CONF1} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" ${WRKSRC}/conf/${file} +.endfor + pre-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL diff --git a/mail/postfix24/distinfo b/mail/postfix24/distinfo index 379358ed4749..832388cccb96 100644 --- a/mail/postfix24/distinfo +++ b/mail/postfix24/distinfo @@ -1,4 +1,4 @@ -MD5 (postfix/postfix-1.1.11.tar.gz) = b34bb2b5018327c19456a77814141208 +MD5 (postfix/postfix-1.1.12.tar.gz) = d1d0f9792ec6ea063ccca59184e54212 MD5 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz) = 11d82e9a3482f64af9d228f7a4319566 -MD5 (postfix/postfix-1.1.11+ipv6.patch.gz) = dc2a6362518025583a17305607eb8f0e +MD5 (postfix/postfix-1.1.12+ipv6.patch.gz) = add4396ce50ca61b5d9b67454fb51258 MD5 (postfix/postfix-pg.postfix-1.1.8.patch) = e0f4d910a6d6648d9b48e2244f2764ba diff --git a/mail/postfix24/files/patch-aa b/mail/postfix24/files/patch-aa deleted file mode 100644 index 51b40396bd5e..000000000000 --- a/mail/postfix24/files/patch-aa +++ /dev/null @@ -1,86 +0,0 @@ -*** ./conf/main.cf.orig Fri Jan 4 13:09:04 2002 ---- ./conf/main.cf Tue Jan 8 22:41:50 2002 -*************** -*** 31,44 **** - # The command_directory parameter specifies the location of all - # postXXX commands. The default value is $program_directory. - # -! command_directory = /usr/sbin - - # The daemon_directory parameter specifies the location of all Postfix - # daemon programs (i.e. programs listed in the master.cf file). The - # default value is $program_directory. This directory must be owned - # by root. - # -! daemon_directory = /usr/libexec/postfix - - # QUEUE AND PROCESS OWNERSHIP - # ---- 31,44 ---- - # The command_directory parameter specifies the location of all - # postXXX commands. The default value is $program_directory. - # -! command_directory = !!PREFIX!!/sbin - - # The daemon_directory parameter specifies the location of all Postfix - # daemon programs (i.e. programs listed in the master.cf file). The - # default value is $program_directory. This directory must be owned - # by root. - # -! daemon_directory = !!PREFIX!!/libexec/postfix - - # QUEUE AND PROCESS OWNERSHIP - # -*************** -*** 325,332 **** - # - # The home_mailbox parameter specifies the optional pathname of a - # mailbox file relative to a user's home directory. The default -! # mailbox file is /var/spool/mail/user or /var/mail/user. Specify -! # "Maildir/" for qmail-style delivery (the / is required). - # - #home_mailbox = Mailbox - #home_mailbox = Maildir/ ---- 325,332 ---- - # - # The home_mailbox parameter specifies the optional pathname of a - # mailbox file relative to a user's home directory. The default -! # mailbox file is /var/mail/user. Specify "Maildir/" for -! # qmail-style delivery (the / is required). - # - #home_mailbox = Mailbox - #home_mailbox = Maildir/ -*************** -*** 424,430 **** - # - # See also the body_checks example in the sample-filter.cf file. - # -! #header_checks = regexp:/etc/postfix/header_checks - - # FAST ETRN SERVICE - # ---- 424,430 ---- - # - # See also the body_checks example in the sample-filter.cf file. - # -! #header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks - - # FAST ETRN SERVICE - # -*************** -*** 525,531 **** - # commands. This must be a group name with a numerical group ID that - # is not shared with other accounts, not even with the Postfix account. - # -! setgid_group = - - # manpage_path: The location of the Postfix on-line manual pages. - # ---- 525,531 ---- - # commands. This must be a group name with a numerical group ID that - # is not shared with other accounts, not even with the Postfix account. - # -! setgid_group = maildrop - - # manpage_path: The location of the Postfix on-line manual pages. - # diff --git a/mail/postfix24/files/patch-ab b/mail/postfix24/files/patch-ab deleted file mode 100644 index 7c81d3dc12c9..000000000000 --- a/mail/postfix24/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/canonical.orig Tue Mar 7 10:42:58 2000 ---- ./conf/canonical Thu Jun 1 21:53:23 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/canonical - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/canonical - # diff --git a/mail/postfix24/files/patch-ac b/mail/postfix24/files/patch-ac deleted file mode 100644 index 0fb2192cdd84..000000000000 --- a/mail/postfix24/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/access.orig Tue Mar 7 10:42:58 2000 ---- ./conf/access Thu Jun 1 21:53:36 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/access - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/access - # diff --git a/mail/postfix24/files/patch-ad b/mail/postfix24/files/patch-ad deleted file mode 100644 index c1b102574165..000000000000 --- a/mail/postfix24/files/patch-ad +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/pcre_table.orig Thu Mar 9 20:36:19 2000 ---- ./conf/pcre_table Thu Jun 1 22:02:08 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # pcre:/etc/postfix/filename - # ---- 7,9 ---- - # SYNOPSIS -! # pcre:!!PREFIX!!/etc/postfix/filename - # diff --git a/mail/postfix24/files/patch-ae b/mail/postfix24/files/patch-ae deleted file mode 100644 index e396dd8626db..000000000000 --- a/mail/postfix24/files/patch-ae +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/regexp_table.orig Thu Mar 9 20:36:19 2000 ---- ./conf/regexp_table Thu Jun 1 22:03:27 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # regexp:/etc/postfix/filename - # ---- 7,9 ---- - # SYNOPSIS -! # regexp:!!PREFIX!!/etc/postfix/filename - # diff --git a/mail/postfix24/files/patch-af b/mail/postfix24/files/patch-af deleted file mode 100644 index 8fca6b208941..000000000000 --- a/mail/postfix24/files/patch-af +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/relocated.orig Tue Mar 7 10:42:58 2000 ---- ./conf/relocated Thu Jun 1 22:03:59 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/relocated - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/relocated - # diff --git a/mail/postfix24/files/patch-ag b/mail/postfix24/files/patch-ag deleted file mode 100644 index 54c0fa918d3b..000000000000 --- a/mail/postfix24/files/patch-ag +++ /dev/null @@ -1,15 +0,0 @@ -*** ./conf/sample-auth.cf.orig Sun May 28 17:55:19 2000 ---- ./conf/sample-auth.cf Thu Jun 1 22:05:32 2000 -*************** -*** 91,95 **** - # The Postfix SMTP client opens the lookup table before going to -! # chroot jail, so you can leave the password file in /etc/postfix. - # -! smtp_sasl_password_maps = hash:/etc/postfix/saslpass - ---- 91,95 ---- - # The Postfix SMTP client opens the lookup table before going to -! # chroot jail, so you can leave the password file in !!PREFIX!!/etc/postfix. - # -! smtp_sasl_password_maps = hash:!!PREFIX!!/etc/postfix/saslpass - diff --git a/mail/postfix24/files/patch-ah b/mail/postfix24/files/patch-ah deleted file mode 100644 index a8c70a15a78d..000000000000 --- a/mail/postfix24/files/patch-ah +++ /dev/null @@ -1,44 +0,0 @@ -*** ./conf/sample-canonical.cf.orig Thu Sep 23 14:10:38 1999 ---- ./conf/sample-canonical.cf Thu Jun 1 22:07:23 2000 -*************** -*** 14,16 **** - # -! # If you use this feature, run "postmap /etc/postfix/canonical" to - # build the necessary DBM or DB file after every change. The changes ---- 14,16 ---- - # -! # If you use this feature, run "postmap !!PREFIX!!/etc/postfix/canonical" to - # build the necessary DBM or DB file after every change. The changes -*************** -*** 19,24 **** - # -! #canonical_maps = dbm:/etc/postfix/canonical -! #canonical_maps = hash:/etc/postfix/canonical -! #canonical_maps = hash:/etc/postfix/canonical, nis:canonical -! #canonical_maps = hash:/etc/postfix/canonical, netinfo:/canonical - canonical_maps = ---- 19,24 ---- - # -! #canonical_maps = dbm:!!PREFIX!!/etc/postfix/canonical -! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical -! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical, nis:canonical -! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical, netinfo:/canonical - canonical_maps = -*************** -*** 32,34 **** - # -! #recipient_canonical_maps = hash:/etc/postfix/recipient_canonical - recipient_canonical_maps = ---- 32,34 ---- - # -! #recipient_canonical_maps = hash:!!PREFIX!!/etc/postfix/recipient_canonical - recipient_canonical_maps = -*************** -*** 46,48 **** - # -! #sender_canonical_maps = hash:/etc/postfix/sender_canonical - sender_canonical_maps = ---- 46,48 ---- - # -! #sender_canonical_maps = hash:!!PREFIX!!/etc/postfix/sender_canonical - sender_canonical_maps = diff --git a/mail/postfix24/files/patch-ai b/mail/postfix24/files/patch-ai deleted file mode 100644 index f7aa2fd5f4c6..000000000000 --- a/mail/postfix24/files/patch-ai +++ /dev/null @@ -1,18 +0,0 @@ -*** ./conf/sample-filter.cf.orig Mon May 29 11:30:44 2000 ---- ./conf/sample-filter.cf Thu Jun 1 22:07:58 2000 -*************** -*** 15,17 **** - # -! header_checks = regexp:/etc/postfix/header_checks - ---- 15,17 ---- - # -! header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks - -*************** -*** 26,27 **** - # -! body_checks = regexp:/etc/postfix/body_checks ---- 26,27 ---- - # -! body_checks = regexp:!!PREFIX!!/etc/postfix/body_checks diff --git a/mail/postfix24/files/patch-aj b/mail/postfix24/files/patch-aj deleted file mode 100644 index 241d48132551..000000000000 --- a/mail/postfix24/files/patch-aj +++ /dev/null @@ -1,24 +0,0 @@ -*** ./conf/sample-misc.cf.orig Thu Sep 23 14:10:52 1999 ---- ./conf/sample-misc.cf Thu Jun 1 22:09:39 2000 -*************** -*** 220,222 **** - # -! program_directory = /usr/libexec/postfix - ---- 220,222 ---- - # -! program_directory = !!PREFIX!!/libexec/postfix - -*************** -*** 263,267 **** - # Specify the types and names of databases to use. After change, -! # run "postmap /etc/postfix/relocated", then "postfix reload". - # -! #relocated_maps = hash:/etc/postfix/relocated - relocated_maps = ---- 263,267 ---- - # Specify the types and names of databases to use. After change, -! # run "postmap !!PREFIX!!/etc/postfix/relocated", then "postfix reload". - # -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated - relocated_maps = diff --git a/mail/postfix24/files/patch-ak b/mail/postfix24/files/patch-ak deleted file mode 100644 index 250dd411a4bd..000000000000 --- a/mail/postfix24/files/patch-ak +++ /dev/null @@ -1,26 +0,0 @@ -*** ./conf/sample-relocated.cf.orig Thu Sep 23 14:11:17 1999 ---- ./conf/sample-relocated.cf Thu Jun 1 22:10:43 2000 -*************** -*** 12,14 **** - # -! # If you use this feature, run "postmap /etc/postfix/relocated" to - # build the necessary DBM or DB file after change, then "postfix ---- 12,14 ---- - # -! # If you use this feature, run "postmap !!PREFIX!!/etc/postfix/relocated" to - # build the necessary DBM or DB file after change, then "postfix -*************** -*** 16,21 **** - # -! #relocated_maps = dbm:/etc/postfix/relocated -! #relocated_maps = hash:/etc/postfix/relocated -! #relocated_maps = hash:/etc/postfix/relocated, nis:virtual -! #relocated_maps = hash:/etc/postfix/relocated, netinfo:/relocated - relocated_maps = ---- 16,21 ---- - # -! #relocated_maps = dbm:!!PREFIX!!/etc/postfix/relocated -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated, nis:virtual -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated, netinfo:/relocated - relocated_maps = diff --git a/mail/postfix24/files/patch-al b/mail/postfix24/files/patch-al deleted file mode 100644 index 799206da0c96..000000000000 --- a/mail/postfix24/files/patch-al +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/sample-smtpd.cf.orig Mon Dec 27 19:41:37 1999 ---- ./conf/sample-smtpd.cf Thu Jun 1 22:11:22 2000 -*************** -*** 183,185 **** - #smtpd_sender_restrictions = reject_unknown_sender_domain -! #smtpd_sender_restrictions = reject_unknown_sender_domain, hash:/etc/postfix/access - smtpd_sender_restrictions = ---- 183,185 ---- - #smtpd_sender_restrictions = reject_unknown_sender_domain -! #smtpd_sender_restrictions = reject_unknown_sender_domain, hash:!!PREFIX!!/etc/postfix/access - smtpd_sender_restrictions = diff --git a/mail/postfix24/files/patch-am b/mail/postfix24/files/patch-am deleted file mode 100644 index 2d395fa9ca03..000000000000 --- a/mail/postfix24/files/patch-am +++ /dev/null @@ -1,23 +0,0 @@ -*** ./conf/sample-transport.cf.orig Thu Dec 23 10:50:00 1999 ---- ./conf/sample-transport.cf Thu Jun 1 22:13:09 2000 -*************** -*** 10,18 **** - # By default, this feature is disabled. Specify the types of databases -! # to use. If you use this feature, run "postmap /etc/postfix/transport" - # after change, then "postfix reload". - # -! #transport_maps = dbm:/etc/postfix/transport -! #transport_maps = hash:/etc/postfix/transport -! #transport_maps = hash:/etc/postfix/transport, nis:transport -! #transport_maps = hash:/etc/postfix/transport, netinfo:/transport - transport_maps = ---- 10,18 ---- - # By default, this feature is disabled. Specify the types of databases -! # to use. If you use this feature, run "postmap !!PREFIX!!/etc/postfix/transport" - # after change, then "postfix reload". - # -! #transport_maps = dbm:!!PREFIX!!/etc/postfix/transport -! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport -! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport, nis:transport -! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport, netinfo:/transport - transport_maps = diff --git a/mail/postfix24/files/patch-an b/mail/postfix24/files/patch-an deleted file mode 100644 index af5ac7cc031b..000000000000 --- a/mail/postfix24/files/patch-an +++ /dev/null @@ -1,26 +0,0 @@ -*** ./conf/sample-virtual.cf.orig Mon Dec 20 21:00:42 1999 ---- ./conf/sample-virtual.cf Thu Jun 1 22:13:32 2000 -*************** -*** 12,14 **** - # -! # If you use this feature, run "postmap /etc/postfix/virtual" to - # build the necessary DBM or DB file after change. ---- 12,14 ---- - # -! # If you use this feature, run "postmap !!PREFIX!!/etc/postfix/virtual" to - # build the necessary DBM or DB file after change. -*************** -*** 18,23 **** - # -! #virtual_maps = dbm:/etc/postfix/virtual -! #virtual_maps = hash:/etc/postfix/virtual -! #virtual_maps = hash:/etc/postfix/virtual, nis:virtual -! #virtual_maps = hash:/etc/postfix/virtual, netinfo:/virtual - virtual_maps = ---- 18,23 ---- - # -! #virtual_maps = dbm:!!PREFIX!!/etc/postfix/virtual -! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual -! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual, nis:virtual -! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual, netinfo:/virtual - virtual_maps = diff --git a/mail/postfix24/files/patch-ao b/mail/postfix24/files/patch-ao deleted file mode 100644 index fd854e181601..000000000000 --- a/mail/postfix24/files/patch-ao +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/transport.orig Tue Mar 7 10:42:58 2000 ---- ./conf/transport Thu Jun 1 22:13:41 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/transport - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/transport - # diff --git a/mail/postfix24/files/patch-ap b/mail/postfix24/files/patch-ap deleted file mode 100644 index 4598192cd5c1..000000000000 --- a/mail/postfix24/files/patch-ap +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/virtual.orig Tue Mar 7 10:42:59 2000 ---- ./conf/virtual Thu Jun 1 22:13:54 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/virtual - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/virtual - # diff --git a/mail/postfix24/files/patch-ba b/mail/postfix24/files/patch-ba deleted file mode 100644 index ccb54ec60a7a..000000000000 --- a/mail/postfix24/files/patch-ba +++ /dev/null @@ -1,20 +0,0 @@ -*** ./html/mailq.1.html.orig Sat Apr 22 20:28:36 2000 ---- ./html/mailq.1.html Thu Jun 1 22:19:24 2000 -*************** -*** 83,85 **** - The path name of the <b>sendmail.cf</b> file. Postfix con- -! figuration files are kept in <b>/etc/postfix</b>. - ---- 83,85 ---- - The path name of the <b>sendmail.cf</b> file. Postfix con- -! figuration files are kept in <b>!!PREFIX!!/etc/postfix</b>. - -*************** -*** 231,233 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - ---- 231,233 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - diff --git a/mail/postfix24/files/patch-bb b/mail/postfix24/files/patch-bb deleted file mode 100644 index ea744664dfa7..000000000000 --- a/mail/postfix24/files/patch-bb +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/access.5.html.orig Tue Nov 21 21:24:13 2000 -+++ ./html/access.5.html Tue Nov 21 21:24:34 2000 -@@ -9,7 +9,7 @@ - access - format of Postfix access table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/access</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b> - - <b>DESCRIPTION</b> - The optional <b>access</b> table directs the Postfix SMTP server -@@ -21,7 +21,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/access</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b> in order to rebuild the - indexed file after changing the access table. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix24/files/patch-bc b/mail/postfix24/files/patch-bc deleted file mode 100644 index e407a9650585..000000000000 --- a/mail/postfix24/files/patch-bc +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/canonical.5.html.orig Tue Nov 21 21:32:38 2000 -+++ ./html/canonical.5.html Tue Nov 21 21:33:21 2000 -@@ -9,7 +9,7 @@ - canonical - format of Postfix canonical table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/canonical</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b> - - <b>DESCRIPTION</b> - The optional <b>canonical</b> table specifies an address mapping -@@ -20,7 +20,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/canonical</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b> in order to rebuild the - indexed file after changing the text file. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix24/files/patch-be b/mail/postfix24/files/patch-be deleted file mode 100644 index bef6a3bfaf73..000000000000 --- a/mail/postfix24/files/patch-be +++ /dev/null @@ -1,10 +0,0 @@ ---- ./html/faq.html.orig Sat Oct 28 23:34:51 2000 -+++ ./html/faq.html Sat Oct 28 23:36:04 2000 -@@ -2572,7 +2572,7 @@ - - Answer: instead of using <b>/usr/include/ndbm.h</b>, you're building - Postfix with some incompatible third-party file, typically --<b>/usr/local/include/ndbm.h</b>. -+<b>!!PREFIX!!/include/ndbm.h</b>. - - <p> diff --git a/mail/postfix24/files/patch-bf b/mail/postfix24/files/patch-bf deleted file mode 100644 index d652e1e567b3..000000000000 --- a/mail/postfix24/files/patch-bf +++ /dev/null @@ -1,13 +0,0 @@ -*** ./html/cleanup.8.html.orig Sun May 28 21:58:41 2000 ---- ./html/cleanup.8.html Thu Jun 1 22:29:04 2000 -*************** -*** 174,177 **** - <b>FILES</b> -! /etc/postfix/canonical*, canonical mapping table -! /etc/postfix/virtual*, virtual mapping table - ---- 174,177 ---- - <b>FILES</b> -! !!PREFIX!!/etc/postfix/canonical*, canonical mapping table -! !!PREFIX!!/etc/postfix/virtual*, virtual mapping table - diff --git a/mail/postfix24/files/patch-bg b/mail/postfix24/files/patch-bg deleted file mode 100644 index ce2454eaef01..000000000000 --- a/mail/postfix24/files/patch-bg +++ /dev/null @@ -1,13 +0,0 @@ -*** ./html/master.8.html.orig Tue Mar 7 10:48:56 2000 ---- ./html/master.8.html Thu Jun 1 22:29:24 2000 -*************** -*** 148,151 **** - <b>FILES</b> -! /etc/postfix/main.cf: global configuration file. -! /etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. ---- 148,151 ---- - <b>FILES</b> -! !!PREFIX!!/etc/postfix/main.cf: global configuration file. -! !!PREFIX!!/etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. diff --git a/mail/postfix24/files/patch-bh b/mail/postfix24/files/patch-bh deleted file mode 100644 index a20232e6796a..000000000000 --- a/mail/postfix24/files/patch-bh +++ /dev/null @@ -1,11 +0,0 @@ -*** ./html/goals.html.orig Sun May 9 15:44:18 1999 ---- ./html/goals.html Thu Jun 1 22:30:14 2000 -*************** -*** 45,47 **** - <li>Compatibility. Postfix is designed to be sendmail-compatible -! to make migration easy. Postfix supports <b>/var[/spool]/mail</b>, - <b>/etc/aliases</b>, <b>NIS</b>, and <b>~/.forward</b> files. ---- 45,47 ---- - <li>Compatibility. Postfix is designed to be sendmail-compatible -! to make migration easy. Postfix supports <b>/var/mail</b>, - <b>/etc/aliases</b>, <b>NIS</b>, and <b>~/.forward</b> files. diff --git a/mail/postfix24/files/patch-bi b/mail/postfix24/files/patch-bi deleted file mode 100644 index 7e4acdb0c126..000000000000 --- a/mail/postfix24/files/patch-bi +++ /dev/null @@ -1,11 +0,0 @@ -*** ./html/postdrop.1.html.orig Mon May 3 15:05:12 1999 ---- ./html/postdrop.1.html Thu Jun 1 22:30:47 2000 -*************** -*** 48,50 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - ---- 48,50 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - diff --git a/mail/postfix24/files/patch-bj b/mail/postfix24/files/patch-bj deleted file mode 100644 index 00e78d01ba5a..000000000000 --- a/mail/postfix24/files/patch-bj +++ /dev/null @@ -1,42 +0,0 @@ -*** ./html/uce.html.orig Fri Dec 31 15:06:07 1999 ---- ./html/uce.html Thu Jun 1 22:31:37 2000 -*************** -*** 126,130 **** - -! <dd> <b>header_checks = regexp:/etc/postfix/header_checks</b> - -! <dd> <b>header_checks = pcre:/etc/postfix/header_checks</b> - ---- 126,130 ---- - -! <dd> <b>header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks</b> - -! <dd> <b>header_checks = pcre:!!PREFIX!!/etc/postfix/header_checks</b> - -*************** -*** 169,171 **** - -! <dd> <b>smtpd_client_restrictions = hash:/etc/postfix/access, - reject_maps_rbl</b> ---- 169,171 ---- - -! <dd> <b>smtpd_client_restrictions = hash:!!PREFIX!!/etc/postfix/access, - reject_maps_rbl</b> -*************** -*** 474,476 **** - -! <dd> <b>smtpd_sender_restrictions = hash:/etc/postfix/access, - reject_unknown_sender_domain</b> ---- 474,476 ---- - -! <dd> <b>smtpd_sender_restrictions = hash:!!PREFIX!!/etc/postfix/access, - reject_unknown_sender_domain</b> -*************** -*** 856,858 **** - <dd> <b>smtpd_etrn_restrictions = permit_mynetworks, -! hash:/etc/postfix/etrn_access, reject</b> - ---- 856,858 ---- - <dd> <b>smtpd_etrn_restrictions = permit_mynetworks, -! hash:!!PREFIX!!/etc/postfix/etrn_access, reject</b> - diff --git a/mail/postfix24/files/patch-bk b/mail/postfix24/files/patch-bk deleted file mode 100644 index 62a0573559ae..000000000000 --- a/mail/postfix24/files/patch-bk +++ /dev/null @@ -1,29 +0,0 @@ -*** ./html/rate.html.orig Wed Mar 17 17:55:22 1999 ---- ./html/rate.html Thu Jun 1 22:32:19 2000 -*************** -*** 224,226 **** - -! <dt>/etc/postfix/main.cf: - ---- 224,226 ---- - -! <dt>!!PREFIX!!/etc/postfix/main.cf: - -*************** -*** 237,239 **** - -! <dt>/etc/postfix/<a href="transport.5.html">transport</a>: - ---- 237,239 ---- - -! <dt>!!PREFIX!!/etc/postfix/<a href="transport.5.html">transport</a>: - -*************** -*** 253,255 **** - -! <dt>/etc/postfix/master.cf: - ---- 253,255 ---- - -! <dt>!!PREFIX!!/etc/postfix/master.cf: - diff --git a/mail/postfix24/files/patch-bl b/mail/postfix24/files/patch-bl deleted file mode 100644 index 176c7d1b64de..000000000000 --- a/mail/postfix24/files/patch-bl +++ /dev/null @@ -1,11 +0,0 @@ -*** ./html/regexp_table.5.html.orig Sat Apr 22 20:28:38 2000 ---- ./html/regexp_table.5.html Thu Jun 1 22:32:44 2000 -*************** -*** 11,13 **** - <b>SYNOPSIS</b> -! regexp:/etc/postfix/filename - ---- 11,13 ---- - <b>SYNOPSIS</b> -! regexp:!!PREFIX!!/etc/postfix/filename - diff --git a/mail/postfix24/files/patch-bm b/mail/postfix24/files/patch-bm deleted file mode 100644 index e5ccc2c50b94..000000000000 --- a/mail/postfix24/files/patch-bm +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/relocated.5.html.orig Tue Nov 21 21:37:54 2000 -+++ ./html/relocated.5.html Tue Nov 21 21:38:08 2000 -@@ -9,7 +9,7 @@ - relocated - format of Postfix relocated table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/relocated</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b> - - <b>DESCRIPTION</b> - The optional <b>relocated</b> table provides the information that -@@ -20,7 +20,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/relocated</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b> in order to rebuild the - indexed file after changing the relocated table. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix24/files/patch-bn b/mail/postfix24/files/patch-bn deleted file mode 100644 index 21e69dcaa40c..000000000000 --- a/mail/postfix24/files/patch-bn +++ /dev/null @@ -1,56 +0,0 @@ -*** ./html/rewrite.html.orig Sat May 8 17:51:41 1999 ---- ./html/rewrite.html Thu Jun 1 22:34:21 2000 -*************** -*** 194,196 **** - -! <dd><b>canonical_maps = hash:/etc/postfix/canonical</b> - ---- 194,196 ---- - -! <dd><b>canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical</b> - -*************** -*** 207,209 **** - -! <dd><b>sender_canonical_maps = hash:/etc/postfix/sender_canonical</b> - ---- 207,209 ---- - -! <dd><b>sender_canonical_maps = hash:!!PREFIX!!/etc/postfix/sender_canonical</b> - -*************** -*** 211,213 **** - -! <dd><b>recipient_canonical_maps = hash:/etc/postfix/recipient_canonical</b> - ---- 211,213 ---- - -! <dd><b>recipient_canonical_maps = hash:!!PREFIX!!/etc/postfix/recipient_canonical</b> - -*************** -*** 295,297 **** - -! <dd><b>virtual_maps = hash:/etc/postfix/virtual</b> - ---- 295,297 ---- - -! <dd><b>virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual</b> - -*************** -*** 323,325 **** - -! <dd><b>relocated_maps = hash:/etc/postfix/relocated</b> - ---- 323,325 ---- - -! <dd><b>relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated</b> - -*************** -*** 348,350 **** - -! <dd><b>transport_maps = hash:/etc/postfix/transport</b> - ---- 348,350 ---- - -! <dd><b>transport_maps = hash:!!PREFIX!!/etc/postfix/transport</b> - diff --git a/mail/postfix24/files/patch-bo b/mail/postfix24/files/patch-bo deleted file mode 100644 index b45270be8151..000000000000 --- a/mail/postfix24/files/patch-bo +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/transport.5.html.orig Tue Nov 21 21:43:00 2000 -+++ ./html/transport.5.html Tue Nov 21 21:43:20 2000 -@@ -9,7 +9,7 @@ - transport - format of Postfix transport table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/transport</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b> - - <b>DESCRIPTION</b> - The optional <b>transport</b> table specifies a mapping from -@@ -21,7 +21,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/transport</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b> in order to rebuild the - indexed file after changing the transport table. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix24/files/patch-bp b/mail/postfix24/files/patch-bp deleted file mode 100644 index 5206bfd4bfd0..000000000000 --- a/mail/postfix24/files/patch-bp +++ /dev/null @@ -1,43 +0,0 @@ ---- ./html/virtual.5.html.orig Tue Nov 21 21:46:50 2000 -+++ ./html/virtual.5.html Tue Nov 21 21:47:17 2000 -@@ -9,7 +9,7 @@ - virtual - format of Postfix virtual table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/virtual</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b> - - <b>DESCRIPTION</b> - The optional <b>virtual</b> table specifies address redirections -@@ -27,7 +27,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/virtual</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b> in order to rebuild the - indexed file after changing the text file. - - When the table is provided via other means such as NIS, -@@ -52,7 +52,7 @@ - - Support for a Postfix-style virtual domain looks like: - -- /etc/postfix/virtual: -+ !!PREFIX!!/etc/postfix/virtual: - <i>virtual.domain</i> <i>anything</i> (right-hand content does not matter) - <i>postmaster@virtual.domain</i> <i>postmaster</i> - <i>user1@virtual.domain</i> <i>address1</i> -@@ -94,11 +94,11 @@ - - Support for a Sendmail-style virtual domain looks like: - -- /etc/postfix/main.cf: -+ !!PREFIX!!/etc/postfix/main.cf: - mydestination = $myhostname localhost.$mydomain $mydomain - <i>virtual.domain</i> - -- /etc/postfix/virtual: -+ !!PREFIX!!/etc/postfix/virtual: - <i>user1@virtual.domain</i> <i>address1</i> - <i>user2@virtual.domain</i> <i>address2,</i> <i>address3</i> - diff --git a/mail/postfix24/files/patch-ca b/mail/postfix24/files/patch-ca deleted file mode 100644 index 86d56f80be30..000000000000 --- a/mail/postfix24/files/patch-ca +++ /dev/null @@ -1,11 +0,0 @@ -*** ./man/man1/postdrop.1.orig Mon May 3 15:03:29 1999 ---- ./man/man1/postdrop.1 Thu Jun 1 22:38:54 2000 -*************** -*** 53,55 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS ---- 53,55 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS diff --git a/mail/postfix24/files/patch-cb b/mail/postfix24/files/patch-cb deleted file mode 100644 index 58559c7273d1..000000000000 --- a/mail/postfix24/files/patch-cb +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man1/sendmail.1.orig Thu Mar 30 14:05:28 2000 ---- ./man/man1/sendmail.1 Thu Jun 1 22:39:16 2000 -*************** -*** 63,65 **** - The path name of the \fBsendmail.cf\fR file. Postfix configuration -! files are kept in \fB/etc/postfix\fR. - .IP "\fB-F \fIfull_name\fR ---- 63,65 ---- - The path name of the \fBsendmail.cf\fR file. Postfix configuration -! files are kept in \fB!!PREFIX!!/etc/postfix\fR. - .IP "\fB-F \fIfull_name\fR -*************** -*** 173,175 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS ---- 173,175 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS diff --git a/mail/postfix24/files/patch-cc b/mail/postfix24/files/patch-cc deleted file mode 100644 index cd6946003217..000000000000 --- a/mail/postfix24/files/patch-cc +++ /dev/null @@ -1,11 +0,0 @@ -*** ./man/man5/pcre_table.5.orig Thu Mar 30 14:05:28 2000 ---- ./man/man5/pcre_table.5 Thu Jun 1 22:39:34 2000 -*************** -*** 10,12 **** - .nf -! pcre:/etc/postfix/filename - .SH DESCRIPTION ---- 10,12 ---- - .nf -! pcre:!!PREFIX!!/etc/postfix/filename - .SH DESCRIPTION diff --git a/mail/postfix24/files/patch-cd b/mail/postfix24/files/patch-cd deleted file mode 100644 index b51de44d0bee..000000000000 --- a/mail/postfix24/files/patch-cd +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/access.5.orig Sat Apr 22 20:28:30 2000 ---- ./man/man5/access.5 Thu Jun 1 22:39:55 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/access\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/access\fR - .SH DESCRIPTION -*************** -*** 21,23 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed - file after changing the access table. ---- 21,23 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed - file after changing the access table. diff --git a/mail/postfix24/files/patch-ce b/mail/postfix24/files/patch-ce deleted file mode 100644 index f77053f8b3aa..000000000000 --- a/mail/postfix24/files/patch-ce +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/canonical.5.orig Sat Apr 22 20:28:30 2000 ---- ./man/man5/canonical.5 Thu Jun 1 22:40:18 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/canonical\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR - .SH DESCRIPTION -*************** -*** 21,23 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed - file after changing the canonical table. ---- 21,23 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed - file after changing the canonical table. diff --git a/mail/postfix24/files/patch-cf b/mail/postfix24/files/patch-cf deleted file mode 100644 index 28fb053b94a7..000000000000 --- a/mail/postfix24/files/patch-cf +++ /dev/null @@ -1,11 +0,0 @@ -*** ./man/man5/regexp_table.5.orig Thu Mar 30 14:05:28 2000 ---- ./man/man5/regexp_table.5 Thu Jun 1 22:40:43 2000 -*************** -*** 10,12 **** - .nf -! regexp:/etc/postfix/filename - .SH DESCRIPTION ---- 10,12 ---- - .nf -! regexp:!!PREFIX!!/etc/postfix/filename - .SH DESCRIPTION diff --git a/mail/postfix24/files/patch-cg b/mail/postfix24/files/patch-cg deleted file mode 100644 index 0ae82cc57669..000000000000 --- a/mail/postfix24/files/patch-cg +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/relocated.5.orig Sat Apr 22 20:28:31 2000 ---- ./man/man5/relocated.5 Thu Jun 1 22:41:05 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/relocated\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR - .SH DESCRIPTION -*************** -*** 20,22 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed - file after changing the relocated table. ---- 20,22 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed - file after changing the relocated table. diff --git a/mail/postfix24/files/patch-ch b/mail/postfix24/files/patch-ch deleted file mode 100644 index 3ed047ea474c..000000000000 --- a/mail/postfix24/files/patch-ch +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/transport.5.orig Sat Apr 22 20:28:31 2000 ---- ./man/man5/transport.5 Thu Jun 1 22:41:26 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/transport\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR - .SH DESCRIPTION -*************** -*** 21,23 **** - for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed - file after changing the transport table. ---- 21,23 ---- - for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed - file after changing the transport table. diff --git a/mail/postfix24/files/patch-ci b/mail/postfix24/files/patch-ci deleted file mode 100644 index 1a7cf4abbac7..000000000000 --- a/mail/postfix24/files/patch-ci +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/virtual.5.orig Sat Apr 22 20:28:31 2000 ---- ./man/man5/virtual.5 Thu Jun 1 22:41:51 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/virtual\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR - .SH DESCRIPTION -*************** -*** 26,28 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed - file after changing the virtual table. ---- 26,28 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed - file after changing the virtual table. diff --git a/mail/postfix24/files/patch-cj b/mail/postfix24/files/patch-cj deleted file mode 100644 index 50448f2ec26d..000000000000 --- a/mail/postfix24/files/patch-cj +++ /dev/null @@ -1,13 +0,0 @@ -*** ./man/man8/cleanup.8.orig Sun May 28 21:58:32 2000 ---- ./man/man8/cleanup.8 Thu Jun 1 22:42:21 2000 -*************** -*** 136,139 **** - .nf -! /etc/postfix/canonical*, canonical mapping table -! /etc/postfix/virtual*, virtual mapping table - .SH LICENSE ---- 136,139 ---- - .nf -! !!PREFIX!!/etc/postfix/canonical*, canonical mapping table -! !!PREFIX!!/etc/postfix/virtual*, virtual mapping table - .SH LICENSE diff --git a/mail/postfix24/files/patch-cl b/mail/postfix24/files/patch-cl deleted file mode 100644 index 44c8a3a7aae0..000000000000 --- a/mail/postfix24/files/patch-cl +++ /dev/null @@ -1,13 +0,0 @@ -*** ./man/man8/master.8.orig Tue Mar 7 10:48:19 2000 ---- ./man/man8/master.8 Thu Jun 1 22:43:02 2000 -*************** -*** 120,123 **** - .nf -! /etc/postfix/main.cf: global configuration file. -! /etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. ---- 120,123 ---- - .nf -! !!PREFIX!!/etc/postfix/main.cf: global configuration file. -! !!PREFIX!!/etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. diff --git a/mail/postfix24/files/patch-da b/mail/postfix24/files/patch-da deleted file mode 100644 index e57e31750d18..000000000000 --- a/mail/postfix24/files/patch-da +++ /dev/null @@ -1,11 +0,0 @@ -*** ./proto/regexp_table.orig Wed Mar 8 19:18:20 2000 ---- ./proto/regexp_table Thu Jun 1 22:44:43 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # regexp:/etc/postfix/filename - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # regexp:!!PREFIX!!/etc/postfix/filename - # DESCRIPTION diff --git a/mail/postfix24/files/patch-db b/mail/postfix24/files/patch-db deleted file mode 100644 index 7f89fb770783..000000000000 --- a/mail/postfix24/files/patch-db +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/access.orig Sun Apr 9 16:44:45 2000 ---- ./proto/access Thu Jun 1 22:45:05 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/access\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR - # DESCRIPTION -*************** -*** 15,17 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed - # file after changing the access table. ---- 15,17 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed - # file after changing the access table. diff --git a/mail/postfix24/files/patch-dc b/mail/postfix24/files/patch-dc deleted file mode 100644 index 786f2da45c32..000000000000 --- a/mail/postfix24/files/patch-dc +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/canonical.orig Sun Apr 9 16:43:37 2000 ---- ./proto/canonical Thu Jun 1 22:45:28 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/canonical\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR - # DESCRIPTION -*************** -*** 15,17 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed - # file after changing the canonical table. ---- 15,17 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed - # file after changing the canonical table. diff --git a/mail/postfix24/files/patch-dd b/mail/postfix24/files/patch-dd deleted file mode 100644 index b65a57ff7d57..000000000000 --- a/mail/postfix24/files/patch-dd +++ /dev/null @@ -1,11 +0,0 @@ -*** ./proto/pcre_table.orig Wed Mar 8 19:18:11 2000 ---- ./proto/pcre_table Thu Jun 1 22:45:41 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # pcre:/etc/postfix/filename - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # pcre:!!PREFIX!!/etc/postfix/filename - # DESCRIPTION diff --git a/mail/postfix24/files/patch-de b/mail/postfix24/files/patch-de deleted file mode 100644 index 73bb2af2261d..000000000000 --- a/mail/postfix24/files/patch-de +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/relocated.orig Sun Apr 9 16:47:31 2000 ---- ./proto/relocated Thu Jun 1 22:46:02 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/relocated\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR - # DESCRIPTION -*************** -*** 14,16 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed - # file after changing the relocated table. ---- 14,16 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed - # file after changing the relocated table. diff --git a/mail/postfix24/files/patch-df b/mail/postfix24/files/patch-df deleted file mode 100644 index 8d3fba96a224..000000000000 --- a/mail/postfix24/files/patch-df +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/transport.orig Sun Apr 9 17:05:45 2000 ---- ./proto/transport Thu Jun 1 22:46:23 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/transport\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR - # DESCRIPTION -*************** -*** 15,17 **** - # for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed - # file after changing the transport table. ---- 15,17 ---- - # for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed - # file after changing the transport table. diff --git a/mail/postfix24/files/patch-dg b/mail/postfix24/files/patch-dg deleted file mode 100644 index bff20a2cff3e..000000000000 --- a/mail/postfix24/files/patch-dg +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/virtual.orig Sun Apr 9 17:14:14 2000 ---- ./proto/virtual Thu Jun 1 22:46:40 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/virtual\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR - # DESCRIPTION -*************** -*** 20,22 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed - # file after changing the virtual table. ---- 20,22 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed - # file after changing the virtual table. diff --git a/mail/postfix24/files/patch-ea b/mail/postfix24/files/patch-ea deleted file mode 100644 index 6c3f98d2af4f..000000000000 --- a/mail/postfix24/files/patch-ea +++ /dev/null @@ -1,13 +0,0 @@ -*** ./src/cleanup/cleanup.c.orig Sun May 28 18:33:41 2000 ---- ./src/cleanup/cleanup.c Thu Jun 1 21:52:22 2000 -*************** -*** 118,121 **** - /* FILES -! /* /etc/postfix/canonical*, canonical mapping table -! /* /etc/postfix/virtual*, virtual mapping table - /* LICENSE ---- 118,121 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix/canonical*, canonical mapping table -! /* !!PREFIX!!/etc/postfix/virtual*, virtual mapping table - /* LICENSE diff --git a/mail/postfix24/files/patch-eb b/mail/postfix24/files/patch-eb deleted file mode 100644 index e67680963d2d..000000000000 --- a/mail/postfix24/files/patch-eb +++ /dev/null @@ -1,11 +0,0 @@ -*** ./src/global/mail_conf.c.orig Sun May 7 18:51:16 2000 ---- ./src/global/mail_conf.c Thu Jun 1 22:16:29 2000 -*************** -*** 53,55 **** - /* FILES -! /* /etc/postfix: default Postfix configuration directory. - /* ENVIRONMENT ---- 53,55 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix: default Postfix configuration directory. - /* ENVIRONMENT diff --git a/mail/postfix24/files/patch-ee b/mail/postfix24/files/patch-ee deleted file mode 100644 index ef44eac24b73..000000000000 --- a/mail/postfix24/files/patch-ee +++ /dev/null @@ -1,13 +0,0 @@ -*** ./src/master/master.c.orig Tue Mar 7 10:25:07 2000 ---- ./src/master/master.c Thu Jun 1 22:43:50 2000 -*************** -*** 104,107 **** - /* FILES -! /* /etc/postfix/main.cf: global configuration file. -! /* /etc/postfix/master.cf: master process configuration file. - /* /var/spool/postfix/pid/master.pid: master lock file. ---- 104,107 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix/main.cf: global configuration file. -! /* !!PREFIX!!/etc/postfix/master.cf: master process configuration file. - /* /var/spool/postfix/pid/master.pid: master lock file. diff --git a/mail/postfix24/files/patch-ef b/mail/postfix24/files/patch-ef deleted file mode 100644 index 586b304a103d..000000000000 --- a/mail/postfix24/files/patch-ef +++ /dev/null @@ -1,11 +0,0 @@ -*** ./src/postdrop/postdrop.c.orig Sun Apr 25 18:05:43 1999 ---- ./src/postdrop/postdrop.c Thu Jun 1 22:44:22 2000 -*************** -*** 39,41 **** - /* /var/spool/postfix, mail queue -! /* /etc/postfix, configuration files - /* CONFIGURATION PARAMETERS ---- 39,41 ---- - /* /var/spool/postfix, mail queue -! /* !!PREFIX!!/etc/postfix, configuration files - /* CONFIGURATION PARAMETERS diff --git a/mail/postfix24/files/patch-eg b/mail/postfix24/files/patch-eg deleted file mode 100644 index 2983bbfd86ea..000000000000 --- a/mail/postfix24/files/patch-eg +++ /dev/null @@ -1,20 +0,0 @@ -*** ./src/sendmail/sendmail.c.orig Tue Mar 14 10:42:06 2000 ---- ./src/sendmail/sendmail.c Thu Jun 1 22:47:24 2000 -*************** -*** 57,59 **** - /* The path name of the \fBsendmail.cf\fR file. Postfix configuration -! /* files are kept in \fB/etc/postfix\fR. - /* .IP "\fB-F \fIfull_name\fR ---- 57,59 ---- - /* The path name of the \fBsendmail.cf\fR file. Postfix configuration -! /* files are kept in \fB!!PREFIX!!/etc/postfix\fR. - /* .IP "\fB-F \fIfull_name\fR -*************** -*** 159,161 **** - /* /var/spool/postfix, mail queue -! /* /etc/postfix, configuration files - /* CONFIGURATION PARAMETERS ---- 159,161 ---- - /* /var/spool/postfix, mail queue -! /* !!PREFIX!!/etc/postfix, configuration files - /* CONFIGURATION PARAMETERS diff --git a/mail/postfix24/files/patch-eh b/mail/postfix24/files/patch-eh deleted file mode 100644 index c104c3680d21..000000000000 --- a/mail/postfix24/files/patch-eh +++ /dev/null @@ -1,11 +0,0 @@ -*** ./src/trivial-rewrite/transport.c.orig Tue Nov 16 19:15:41 1999 ---- ./src/trivial-rewrite/transport.c Thu Jun 1 22:47:49 2000 -*************** -*** 32,34 **** - /* FILES -! /* /etc/postfix/transport* - /* CONFIGURATION PARAMETERS ---- 32,34 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix/transport* - /* CONFIGURATION PARAMETERS diff --git a/mail/postfix24/pkg-message b/mail/postfix24/pkg-message index a7ae2b17e2a6..7fb3a804599c 100644 --- a/mail/postfix24/pkg-message +++ b/mail/postfix24/pkg-message @@ -8,10 +8,21 @@ sendmail_outbound_enable="NO" sendmail_submit_enable="NO" sendmail_msp_queue_enable="NO" -This will disable Sendmail completely. + **OR** +sendmail_enable="NONE" -Also, you may wish to disable some Sendmail-specific daily maintenance +then type this command as root: + +ln -s /usr/local/sbin/postfix /usr/local/etc/rc.d/postfix.sh + +Either of these will disable Sendmail completely. The latter form is useful +if you need to wait until other local package initialization (such as ldconfig +for Postgres or MySQL) is done. The former method will start postfix very +early on in the boot process. + + +Also, you will want to disable some Sendmail-specific daily maintenance routines in your /etc/periodic.conf file: daily_status_mail_rejects_enable="NO" diff --git a/mail/postfix25/Makefile b/mail/postfix25/Makefile index 6b47f15e39d2..6adf63b1ee81 100644 --- a/mail/postfix25/Makefile +++ b/mail/postfix25/Makefile @@ -12,7 +12,7 @@ # the options are the same names as in the scripts/configure.postfix file PORTNAME= postfix -PORTVERSION= 1.1.11 +PORTVERSION= 1.1.12 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -28,6 +28,7 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= khera@kciLink.com USE_SUBMAKE= yes +USE_REINPLACE= yes MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \ postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \ @@ -40,6 +41,10 @@ MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \ master.8 nqmgr.8 pickup.8 pipe.8 qmgr.8 qmqpd.8 showq.8 smtp.8 \ smtpd.8 spawn.8 trivial-rewrite.8 virtual.8 +# TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to +# patch it. +MAN8base=$(MAN8:S/tlsmgr.8//) + CONF1= main.cf master.cf access aliases canonical pcre_table regexp_table \ relocated transport virtual @@ -66,6 +71,27 @@ post-patch: CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ ${ECHO} "all: default" >> Makefile) +pre-patch: +.for file in ${MAN1} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/man/man1/${file} ${WRKSRC}/html/${file}.html +.endfor +.for file in ${MAN5} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/man/man5/${file} ${WRKSRC}/html/${file}.html +.endfor +.for file in ${MAN8base} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/man/man8/${file} ${WRKSRC}/html/${file}.html +.endfor +.for file in faq rate rewrite uce + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/html/${file}.html +.endfor +.for file in ${CONF1} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" ${WRKSRC}/conf/${file} +.endfor + pre-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL diff --git a/mail/postfix25/distinfo b/mail/postfix25/distinfo index 379358ed4749..832388cccb96 100644 --- a/mail/postfix25/distinfo +++ b/mail/postfix25/distinfo @@ -1,4 +1,4 @@ -MD5 (postfix/postfix-1.1.11.tar.gz) = b34bb2b5018327c19456a77814141208 +MD5 (postfix/postfix-1.1.12.tar.gz) = d1d0f9792ec6ea063ccca59184e54212 MD5 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz) = 11d82e9a3482f64af9d228f7a4319566 -MD5 (postfix/postfix-1.1.11+ipv6.patch.gz) = dc2a6362518025583a17305607eb8f0e +MD5 (postfix/postfix-1.1.12+ipv6.patch.gz) = add4396ce50ca61b5d9b67454fb51258 MD5 (postfix/postfix-pg.postfix-1.1.8.patch) = e0f4d910a6d6648d9b48e2244f2764ba diff --git a/mail/postfix25/files/patch-aa b/mail/postfix25/files/patch-aa deleted file mode 100644 index 51b40396bd5e..000000000000 --- a/mail/postfix25/files/patch-aa +++ /dev/null @@ -1,86 +0,0 @@ -*** ./conf/main.cf.orig Fri Jan 4 13:09:04 2002 ---- ./conf/main.cf Tue Jan 8 22:41:50 2002 -*************** -*** 31,44 **** - # The command_directory parameter specifies the location of all - # postXXX commands. The default value is $program_directory. - # -! command_directory = /usr/sbin - - # The daemon_directory parameter specifies the location of all Postfix - # daemon programs (i.e. programs listed in the master.cf file). The - # default value is $program_directory. This directory must be owned - # by root. - # -! daemon_directory = /usr/libexec/postfix - - # QUEUE AND PROCESS OWNERSHIP - # ---- 31,44 ---- - # The command_directory parameter specifies the location of all - # postXXX commands. The default value is $program_directory. - # -! command_directory = !!PREFIX!!/sbin - - # The daemon_directory parameter specifies the location of all Postfix - # daemon programs (i.e. programs listed in the master.cf file). The - # default value is $program_directory. This directory must be owned - # by root. - # -! daemon_directory = !!PREFIX!!/libexec/postfix - - # QUEUE AND PROCESS OWNERSHIP - # -*************** -*** 325,332 **** - # - # The home_mailbox parameter specifies the optional pathname of a - # mailbox file relative to a user's home directory. The default -! # mailbox file is /var/spool/mail/user or /var/mail/user. Specify -! # "Maildir/" for qmail-style delivery (the / is required). - # - #home_mailbox = Mailbox - #home_mailbox = Maildir/ ---- 325,332 ---- - # - # The home_mailbox parameter specifies the optional pathname of a - # mailbox file relative to a user's home directory. The default -! # mailbox file is /var/mail/user. Specify "Maildir/" for -! # qmail-style delivery (the / is required). - # - #home_mailbox = Mailbox - #home_mailbox = Maildir/ -*************** -*** 424,430 **** - # - # See also the body_checks example in the sample-filter.cf file. - # -! #header_checks = regexp:/etc/postfix/header_checks - - # FAST ETRN SERVICE - # ---- 424,430 ---- - # - # See also the body_checks example in the sample-filter.cf file. - # -! #header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks - - # FAST ETRN SERVICE - # -*************** -*** 525,531 **** - # commands. This must be a group name with a numerical group ID that - # is not shared with other accounts, not even with the Postfix account. - # -! setgid_group = - - # manpage_path: The location of the Postfix on-line manual pages. - # ---- 525,531 ---- - # commands. This must be a group name with a numerical group ID that - # is not shared with other accounts, not even with the Postfix account. - # -! setgid_group = maildrop - - # manpage_path: The location of the Postfix on-line manual pages. - # diff --git a/mail/postfix25/files/patch-ab b/mail/postfix25/files/patch-ab deleted file mode 100644 index 7c81d3dc12c9..000000000000 --- a/mail/postfix25/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/canonical.orig Tue Mar 7 10:42:58 2000 ---- ./conf/canonical Thu Jun 1 21:53:23 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/canonical - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/canonical - # diff --git a/mail/postfix25/files/patch-ac b/mail/postfix25/files/patch-ac deleted file mode 100644 index 0fb2192cdd84..000000000000 --- a/mail/postfix25/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/access.orig Tue Mar 7 10:42:58 2000 ---- ./conf/access Thu Jun 1 21:53:36 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/access - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/access - # diff --git a/mail/postfix25/files/patch-ad b/mail/postfix25/files/patch-ad deleted file mode 100644 index c1b102574165..000000000000 --- a/mail/postfix25/files/patch-ad +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/pcre_table.orig Thu Mar 9 20:36:19 2000 ---- ./conf/pcre_table Thu Jun 1 22:02:08 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # pcre:/etc/postfix/filename - # ---- 7,9 ---- - # SYNOPSIS -! # pcre:!!PREFIX!!/etc/postfix/filename - # diff --git a/mail/postfix25/files/patch-ae b/mail/postfix25/files/patch-ae deleted file mode 100644 index e396dd8626db..000000000000 --- a/mail/postfix25/files/patch-ae +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/regexp_table.orig Thu Mar 9 20:36:19 2000 ---- ./conf/regexp_table Thu Jun 1 22:03:27 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # regexp:/etc/postfix/filename - # ---- 7,9 ---- - # SYNOPSIS -! # regexp:!!PREFIX!!/etc/postfix/filename - # diff --git a/mail/postfix25/files/patch-af b/mail/postfix25/files/patch-af deleted file mode 100644 index 8fca6b208941..000000000000 --- a/mail/postfix25/files/patch-af +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/relocated.orig Tue Mar 7 10:42:58 2000 ---- ./conf/relocated Thu Jun 1 22:03:59 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/relocated - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/relocated - # diff --git a/mail/postfix25/files/patch-ag b/mail/postfix25/files/patch-ag deleted file mode 100644 index 54c0fa918d3b..000000000000 --- a/mail/postfix25/files/patch-ag +++ /dev/null @@ -1,15 +0,0 @@ -*** ./conf/sample-auth.cf.orig Sun May 28 17:55:19 2000 ---- ./conf/sample-auth.cf Thu Jun 1 22:05:32 2000 -*************** -*** 91,95 **** - # The Postfix SMTP client opens the lookup table before going to -! # chroot jail, so you can leave the password file in /etc/postfix. - # -! smtp_sasl_password_maps = hash:/etc/postfix/saslpass - ---- 91,95 ---- - # The Postfix SMTP client opens the lookup table before going to -! # chroot jail, so you can leave the password file in !!PREFIX!!/etc/postfix. - # -! smtp_sasl_password_maps = hash:!!PREFIX!!/etc/postfix/saslpass - diff --git a/mail/postfix25/files/patch-ah b/mail/postfix25/files/patch-ah deleted file mode 100644 index a8c70a15a78d..000000000000 --- a/mail/postfix25/files/patch-ah +++ /dev/null @@ -1,44 +0,0 @@ -*** ./conf/sample-canonical.cf.orig Thu Sep 23 14:10:38 1999 ---- ./conf/sample-canonical.cf Thu Jun 1 22:07:23 2000 -*************** -*** 14,16 **** - # -! # If you use this feature, run "postmap /etc/postfix/canonical" to - # build the necessary DBM or DB file after every change. The changes ---- 14,16 ---- - # -! # If you use this feature, run "postmap !!PREFIX!!/etc/postfix/canonical" to - # build the necessary DBM or DB file after every change. The changes -*************** -*** 19,24 **** - # -! #canonical_maps = dbm:/etc/postfix/canonical -! #canonical_maps = hash:/etc/postfix/canonical -! #canonical_maps = hash:/etc/postfix/canonical, nis:canonical -! #canonical_maps = hash:/etc/postfix/canonical, netinfo:/canonical - canonical_maps = ---- 19,24 ---- - # -! #canonical_maps = dbm:!!PREFIX!!/etc/postfix/canonical -! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical -! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical, nis:canonical -! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical, netinfo:/canonical - canonical_maps = -*************** -*** 32,34 **** - # -! #recipient_canonical_maps = hash:/etc/postfix/recipient_canonical - recipient_canonical_maps = ---- 32,34 ---- - # -! #recipient_canonical_maps = hash:!!PREFIX!!/etc/postfix/recipient_canonical - recipient_canonical_maps = -*************** -*** 46,48 **** - # -! #sender_canonical_maps = hash:/etc/postfix/sender_canonical - sender_canonical_maps = ---- 46,48 ---- - # -! #sender_canonical_maps = hash:!!PREFIX!!/etc/postfix/sender_canonical - sender_canonical_maps = diff --git a/mail/postfix25/files/patch-ai b/mail/postfix25/files/patch-ai deleted file mode 100644 index f7aa2fd5f4c6..000000000000 --- a/mail/postfix25/files/patch-ai +++ /dev/null @@ -1,18 +0,0 @@ -*** ./conf/sample-filter.cf.orig Mon May 29 11:30:44 2000 ---- ./conf/sample-filter.cf Thu Jun 1 22:07:58 2000 -*************** -*** 15,17 **** - # -! header_checks = regexp:/etc/postfix/header_checks - ---- 15,17 ---- - # -! header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks - -*************** -*** 26,27 **** - # -! body_checks = regexp:/etc/postfix/body_checks ---- 26,27 ---- - # -! body_checks = regexp:!!PREFIX!!/etc/postfix/body_checks diff --git a/mail/postfix25/files/patch-aj b/mail/postfix25/files/patch-aj deleted file mode 100644 index 241d48132551..000000000000 --- a/mail/postfix25/files/patch-aj +++ /dev/null @@ -1,24 +0,0 @@ -*** ./conf/sample-misc.cf.orig Thu Sep 23 14:10:52 1999 ---- ./conf/sample-misc.cf Thu Jun 1 22:09:39 2000 -*************** -*** 220,222 **** - # -! program_directory = /usr/libexec/postfix - ---- 220,222 ---- - # -! program_directory = !!PREFIX!!/libexec/postfix - -*************** -*** 263,267 **** - # Specify the types and names of databases to use. After change, -! # run "postmap /etc/postfix/relocated", then "postfix reload". - # -! #relocated_maps = hash:/etc/postfix/relocated - relocated_maps = ---- 263,267 ---- - # Specify the types and names of databases to use. After change, -! # run "postmap !!PREFIX!!/etc/postfix/relocated", then "postfix reload". - # -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated - relocated_maps = diff --git a/mail/postfix25/files/patch-ak b/mail/postfix25/files/patch-ak deleted file mode 100644 index 250dd411a4bd..000000000000 --- a/mail/postfix25/files/patch-ak +++ /dev/null @@ -1,26 +0,0 @@ -*** ./conf/sample-relocated.cf.orig Thu Sep 23 14:11:17 1999 ---- ./conf/sample-relocated.cf Thu Jun 1 22:10:43 2000 -*************** -*** 12,14 **** - # -! # If you use this feature, run "postmap /etc/postfix/relocated" to - # build the necessary DBM or DB file after change, then "postfix ---- 12,14 ---- - # -! # If you use this feature, run "postmap !!PREFIX!!/etc/postfix/relocated" to - # build the necessary DBM or DB file after change, then "postfix -*************** -*** 16,21 **** - # -! #relocated_maps = dbm:/etc/postfix/relocated -! #relocated_maps = hash:/etc/postfix/relocated -! #relocated_maps = hash:/etc/postfix/relocated, nis:virtual -! #relocated_maps = hash:/etc/postfix/relocated, netinfo:/relocated - relocated_maps = ---- 16,21 ---- - # -! #relocated_maps = dbm:!!PREFIX!!/etc/postfix/relocated -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated, nis:virtual -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated, netinfo:/relocated - relocated_maps = diff --git a/mail/postfix25/files/patch-al b/mail/postfix25/files/patch-al deleted file mode 100644 index 799206da0c96..000000000000 --- a/mail/postfix25/files/patch-al +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/sample-smtpd.cf.orig Mon Dec 27 19:41:37 1999 ---- ./conf/sample-smtpd.cf Thu Jun 1 22:11:22 2000 -*************** -*** 183,185 **** - #smtpd_sender_restrictions = reject_unknown_sender_domain -! #smtpd_sender_restrictions = reject_unknown_sender_domain, hash:/etc/postfix/access - smtpd_sender_restrictions = ---- 183,185 ---- - #smtpd_sender_restrictions = reject_unknown_sender_domain -! #smtpd_sender_restrictions = reject_unknown_sender_domain, hash:!!PREFIX!!/etc/postfix/access - smtpd_sender_restrictions = diff --git a/mail/postfix25/files/patch-am b/mail/postfix25/files/patch-am deleted file mode 100644 index 2d395fa9ca03..000000000000 --- a/mail/postfix25/files/patch-am +++ /dev/null @@ -1,23 +0,0 @@ -*** ./conf/sample-transport.cf.orig Thu Dec 23 10:50:00 1999 ---- ./conf/sample-transport.cf Thu Jun 1 22:13:09 2000 -*************** -*** 10,18 **** - # By default, this feature is disabled. Specify the types of databases -! # to use. If you use this feature, run "postmap /etc/postfix/transport" - # after change, then "postfix reload". - # -! #transport_maps = dbm:/etc/postfix/transport -! #transport_maps = hash:/etc/postfix/transport -! #transport_maps = hash:/etc/postfix/transport, nis:transport -! #transport_maps = hash:/etc/postfix/transport, netinfo:/transport - transport_maps = ---- 10,18 ---- - # By default, this feature is disabled. Specify the types of databases -! # to use. If you use this feature, run "postmap !!PREFIX!!/etc/postfix/transport" - # after change, then "postfix reload". - # -! #transport_maps = dbm:!!PREFIX!!/etc/postfix/transport -! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport -! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport, nis:transport -! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport, netinfo:/transport - transport_maps = diff --git a/mail/postfix25/files/patch-an b/mail/postfix25/files/patch-an deleted file mode 100644 index af5ac7cc031b..000000000000 --- a/mail/postfix25/files/patch-an +++ /dev/null @@ -1,26 +0,0 @@ -*** ./conf/sample-virtual.cf.orig Mon Dec 20 21:00:42 1999 ---- ./conf/sample-virtual.cf Thu Jun 1 22:13:32 2000 -*************** -*** 12,14 **** - # -! # If you use this feature, run "postmap /etc/postfix/virtual" to - # build the necessary DBM or DB file after change. ---- 12,14 ---- - # -! # If you use this feature, run "postmap !!PREFIX!!/etc/postfix/virtual" to - # build the necessary DBM or DB file after change. -*************** -*** 18,23 **** - # -! #virtual_maps = dbm:/etc/postfix/virtual -! #virtual_maps = hash:/etc/postfix/virtual -! #virtual_maps = hash:/etc/postfix/virtual, nis:virtual -! #virtual_maps = hash:/etc/postfix/virtual, netinfo:/virtual - virtual_maps = ---- 18,23 ---- - # -! #virtual_maps = dbm:!!PREFIX!!/etc/postfix/virtual -! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual -! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual, nis:virtual -! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual, netinfo:/virtual - virtual_maps = diff --git a/mail/postfix25/files/patch-ao b/mail/postfix25/files/patch-ao deleted file mode 100644 index fd854e181601..000000000000 --- a/mail/postfix25/files/patch-ao +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/transport.orig Tue Mar 7 10:42:58 2000 ---- ./conf/transport Thu Jun 1 22:13:41 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/transport - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/transport - # diff --git a/mail/postfix25/files/patch-ap b/mail/postfix25/files/patch-ap deleted file mode 100644 index 4598192cd5c1..000000000000 --- a/mail/postfix25/files/patch-ap +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/virtual.orig Tue Mar 7 10:42:59 2000 ---- ./conf/virtual Thu Jun 1 22:13:54 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/virtual - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/virtual - # diff --git a/mail/postfix25/files/patch-ba b/mail/postfix25/files/patch-ba deleted file mode 100644 index ccb54ec60a7a..000000000000 --- a/mail/postfix25/files/patch-ba +++ /dev/null @@ -1,20 +0,0 @@ -*** ./html/mailq.1.html.orig Sat Apr 22 20:28:36 2000 ---- ./html/mailq.1.html Thu Jun 1 22:19:24 2000 -*************** -*** 83,85 **** - The path name of the <b>sendmail.cf</b> file. Postfix con- -! figuration files are kept in <b>/etc/postfix</b>. - ---- 83,85 ---- - The path name of the <b>sendmail.cf</b> file. Postfix con- -! figuration files are kept in <b>!!PREFIX!!/etc/postfix</b>. - -*************** -*** 231,233 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - ---- 231,233 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - diff --git a/mail/postfix25/files/patch-bb b/mail/postfix25/files/patch-bb deleted file mode 100644 index ea744664dfa7..000000000000 --- a/mail/postfix25/files/patch-bb +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/access.5.html.orig Tue Nov 21 21:24:13 2000 -+++ ./html/access.5.html Tue Nov 21 21:24:34 2000 -@@ -9,7 +9,7 @@ - access - format of Postfix access table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/access</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b> - - <b>DESCRIPTION</b> - The optional <b>access</b> table directs the Postfix SMTP server -@@ -21,7 +21,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/access</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b> in order to rebuild the - indexed file after changing the access table. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix25/files/patch-bc b/mail/postfix25/files/patch-bc deleted file mode 100644 index e407a9650585..000000000000 --- a/mail/postfix25/files/patch-bc +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/canonical.5.html.orig Tue Nov 21 21:32:38 2000 -+++ ./html/canonical.5.html Tue Nov 21 21:33:21 2000 -@@ -9,7 +9,7 @@ - canonical - format of Postfix canonical table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/canonical</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b> - - <b>DESCRIPTION</b> - The optional <b>canonical</b> table specifies an address mapping -@@ -20,7 +20,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/canonical</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b> in order to rebuild the - indexed file after changing the text file. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix25/files/patch-be b/mail/postfix25/files/patch-be deleted file mode 100644 index bef6a3bfaf73..000000000000 --- a/mail/postfix25/files/patch-be +++ /dev/null @@ -1,10 +0,0 @@ ---- ./html/faq.html.orig Sat Oct 28 23:34:51 2000 -+++ ./html/faq.html Sat Oct 28 23:36:04 2000 -@@ -2572,7 +2572,7 @@ - - Answer: instead of using <b>/usr/include/ndbm.h</b>, you're building - Postfix with some incompatible third-party file, typically --<b>/usr/local/include/ndbm.h</b>. -+<b>!!PREFIX!!/include/ndbm.h</b>. - - <p> diff --git a/mail/postfix25/files/patch-bf b/mail/postfix25/files/patch-bf deleted file mode 100644 index d652e1e567b3..000000000000 --- a/mail/postfix25/files/patch-bf +++ /dev/null @@ -1,13 +0,0 @@ -*** ./html/cleanup.8.html.orig Sun May 28 21:58:41 2000 ---- ./html/cleanup.8.html Thu Jun 1 22:29:04 2000 -*************** -*** 174,177 **** - <b>FILES</b> -! /etc/postfix/canonical*, canonical mapping table -! /etc/postfix/virtual*, virtual mapping table - ---- 174,177 ---- - <b>FILES</b> -! !!PREFIX!!/etc/postfix/canonical*, canonical mapping table -! !!PREFIX!!/etc/postfix/virtual*, virtual mapping table - diff --git a/mail/postfix25/files/patch-bg b/mail/postfix25/files/patch-bg deleted file mode 100644 index ce2454eaef01..000000000000 --- a/mail/postfix25/files/patch-bg +++ /dev/null @@ -1,13 +0,0 @@ -*** ./html/master.8.html.orig Tue Mar 7 10:48:56 2000 ---- ./html/master.8.html Thu Jun 1 22:29:24 2000 -*************** -*** 148,151 **** - <b>FILES</b> -! /etc/postfix/main.cf: global configuration file. -! /etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. ---- 148,151 ---- - <b>FILES</b> -! !!PREFIX!!/etc/postfix/main.cf: global configuration file. -! !!PREFIX!!/etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. diff --git a/mail/postfix25/files/patch-bh b/mail/postfix25/files/patch-bh deleted file mode 100644 index a20232e6796a..000000000000 --- a/mail/postfix25/files/patch-bh +++ /dev/null @@ -1,11 +0,0 @@ -*** ./html/goals.html.orig Sun May 9 15:44:18 1999 ---- ./html/goals.html Thu Jun 1 22:30:14 2000 -*************** -*** 45,47 **** - <li>Compatibility. Postfix is designed to be sendmail-compatible -! to make migration easy. Postfix supports <b>/var[/spool]/mail</b>, - <b>/etc/aliases</b>, <b>NIS</b>, and <b>~/.forward</b> files. ---- 45,47 ---- - <li>Compatibility. Postfix is designed to be sendmail-compatible -! to make migration easy. Postfix supports <b>/var/mail</b>, - <b>/etc/aliases</b>, <b>NIS</b>, and <b>~/.forward</b> files. diff --git a/mail/postfix25/files/patch-bi b/mail/postfix25/files/patch-bi deleted file mode 100644 index 7e4acdb0c126..000000000000 --- a/mail/postfix25/files/patch-bi +++ /dev/null @@ -1,11 +0,0 @@ -*** ./html/postdrop.1.html.orig Mon May 3 15:05:12 1999 ---- ./html/postdrop.1.html Thu Jun 1 22:30:47 2000 -*************** -*** 48,50 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - ---- 48,50 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - diff --git a/mail/postfix25/files/patch-bj b/mail/postfix25/files/patch-bj deleted file mode 100644 index 00e78d01ba5a..000000000000 --- a/mail/postfix25/files/patch-bj +++ /dev/null @@ -1,42 +0,0 @@ -*** ./html/uce.html.orig Fri Dec 31 15:06:07 1999 ---- ./html/uce.html Thu Jun 1 22:31:37 2000 -*************** -*** 126,130 **** - -! <dd> <b>header_checks = regexp:/etc/postfix/header_checks</b> - -! <dd> <b>header_checks = pcre:/etc/postfix/header_checks</b> - ---- 126,130 ---- - -! <dd> <b>header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks</b> - -! <dd> <b>header_checks = pcre:!!PREFIX!!/etc/postfix/header_checks</b> - -*************** -*** 169,171 **** - -! <dd> <b>smtpd_client_restrictions = hash:/etc/postfix/access, - reject_maps_rbl</b> ---- 169,171 ---- - -! <dd> <b>smtpd_client_restrictions = hash:!!PREFIX!!/etc/postfix/access, - reject_maps_rbl</b> -*************** -*** 474,476 **** - -! <dd> <b>smtpd_sender_restrictions = hash:/etc/postfix/access, - reject_unknown_sender_domain</b> ---- 474,476 ---- - -! <dd> <b>smtpd_sender_restrictions = hash:!!PREFIX!!/etc/postfix/access, - reject_unknown_sender_domain</b> -*************** -*** 856,858 **** - <dd> <b>smtpd_etrn_restrictions = permit_mynetworks, -! hash:/etc/postfix/etrn_access, reject</b> - ---- 856,858 ---- - <dd> <b>smtpd_etrn_restrictions = permit_mynetworks, -! hash:!!PREFIX!!/etc/postfix/etrn_access, reject</b> - diff --git a/mail/postfix25/files/patch-bk b/mail/postfix25/files/patch-bk deleted file mode 100644 index 62a0573559ae..000000000000 --- a/mail/postfix25/files/patch-bk +++ /dev/null @@ -1,29 +0,0 @@ -*** ./html/rate.html.orig Wed Mar 17 17:55:22 1999 ---- ./html/rate.html Thu Jun 1 22:32:19 2000 -*************** -*** 224,226 **** - -! <dt>/etc/postfix/main.cf: - ---- 224,226 ---- - -! <dt>!!PREFIX!!/etc/postfix/main.cf: - -*************** -*** 237,239 **** - -! <dt>/etc/postfix/<a href="transport.5.html">transport</a>: - ---- 237,239 ---- - -! <dt>!!PREFIX!!/etc/postfix/<a href="transport.5.html">transport</a>: - -*************** -*** 253,255 **** - -! <dt>/etc/postfix/master.cf: - ---- 253,255 ---- - -! <dt>!!PREFIX!!/etc/postfix/master.cf: - diff --git a/mail/postfix25/files/patch-bl b/mail/postfix25/files/patch-bl deleted file mode 100644 index 176c7d1b64de..000000000000 --- a/mail/postfix25/files/patch-bl +++ /dev/null @@ -1,11 +0,0 @@ -*** ./html/regexp_table.5.html.orig Sat Apr 22 20:28:38 2000 ---- ./html/regexp_table.5.html Thu Jun 1 22:32:44 2000 -*************** -*** 11,13 **** - <b>SYNOPSIS</b> -! regexp:/etc/postfix/filename - ---- 11,13 ---- - <b>SYNOPSIS</b> -! regexp:!!PREFIX!!/etc/postfix/filename - diff --git a/mail/postfix25/files/patch-bm b/mail/postfix25/files/patch-bm deleted file mode 100644 index e5ccc2c50b94..000000000000 --- a/mail/postfix25/files/patch-bm +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/relocated.5.html.orig Tue Nov 21 21:37:54 2000 -+++ ./html/relocated.5.html Tue Nov 21 21:38:08 2000 -@@ -9,7 +9,7 @@ - relocated - format of Postfix relocated table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/relocated</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b> - - <b>DESCRIPTION</b> - The optional <b>relocated</b> table provides the information that -@@ -20,7 +20,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/relocated</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b> in order to rebuild the - indexed file after changing the relocated table. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix25/files/patch-bn b/mail/postfix25/files/patch-bn deleted file mode 100644 index 21e69dcaa40c..000000000000 --- a/mail/postfix25/files/patch-bn +++ /dev/null @@ -1,56 +0,0 @@ -*** ./html/rewrite.html.orig Sat May 8 17:51:41 1999 ---- ./html/rewrite.html Thu Jun 1 22:34:21 2000 -*************** -*** 194,196 **** - -! <dd><b>canonical_maps = hash:/etc/postfix/canonical</b> - ---- 194,196 ---- - -! <dd><b>canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical</b> - -*************** -*** 207,209 **** - -! <dd><b>sender_canonical_maps = hash:/etc/postfix/sender_canonical</b> - ---- 207,209 ---- - -! <dd><b>sender_canonical_maps = hash:!!PREFIX!!/etc/postfix/sender_canonical</b> - -*************** -*** 211,213 **** - -! <dd><b>recipient_canonical_maps = hash:/etc/postfix/recipient_canonical</b> - ---- 211,213 ---- - -! <dd><b>recipient_canonical_maps = hash:!!PREFIX!!/etc/postfix/recipient_canonical</b> - -*************** -*** 295,297 **** - -! <dd><b>virtual_maps = hash:/etc/postfix/virtual</b> - ---- 295,297 ---- - -! <dd><b>virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual</b> - -*************** -*** 323,325 **** - -! <dd><b>relocated_maps = hash:/etc/postfix/relocated</b> - ---- 323,325 ---- - -! <dd><b>relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated</b> - -*************** -*** 348,350 **** - -! <dd><b>transport_maps = hash:/etc/postfix/transport</b> - ---- 348,350 ---- - -! <dd><b>transport_maps = hash:!!PREFIX!!/etc/postfix/transport</b> - diff --git a/mail/postfix25/files/patch-bo b/mail/postfix25/files/patch-bo deleted file mode 100644 index b45270be8151..000000000000 --- a/mail/postfix25/files/patch-bo +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/transport.5.html.orig Tue Nov 21 21:43:00 2000 -+++ ./html/transport.5.html Tue Nov 21 21:43:20 2000 -@@ -9,7 +9,7 @@ - transport - format of Postfix transport table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/transport</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b> - - <b>DESCRIPTION</b> - The optional <b>transport</b> table specifies a mapping from -@@ -21,7 +21,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/transport</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b> in order to rebuild the - indexed file after changing the transport table. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix25/files/patch-bp b/mail/postfix25/files/patch-bp deleted file mode 100644 index 5206bfd4bfd0..000000000000 --- a/mail/postfix25/files/patch-bp +++ /dev/null @@ -1,43 +0,0 @@ ---- ./html/virtual.5.html.orig Tue Nov 21 21:46:50 2000 -+++ ./html/virtual.5.html Tue Nov 21 21:47:17 2000 -@@ -9,7 +9,7 @@ - virtual - format of Postfix virtual table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/virtual</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b> - - <b>DESCRIPTION</b> - The optional <b>virtual</b> table specifies address redirections -@@ -27,7 +27,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/virtual</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b> in order to rebuild the - indexed file after changing the text file. - - When the table is provided via other means such as NIS, -@@ -52,7 +52,7 @@ - - Support for a Postfix-style virtual domain looks like: - -- /etc/postfix/virtual: -+ !!PREFIX!!/etc/postfix/virtual: - <i>virtual.domain</i> <i>anything</i> (right-hand content does not matter) - <i>postmaster@virtual.domain</i> <i>postmaster</i> - <i>user1@virtual.domain</i> <i>address1</i> -@@ -94,11 +94,11 @@ - - Support for a Sendmail-style virtual domain looks like: - -- /etc/postfix/main.cf: -+ !!PREFIX!!/etc/postfix/main.cf: - mydestination = $myhostname localhost.$mydomain $mydomain - <i>virtual.domain</i> - -- /etc/postfix/virtual: -+ !!PREFIX!!/etc/postfix/virtual: - <i>user1@virtual.domain</i> <i>address1</i> - <i>user2@virtual.domain</i> <i>address2,</i> <i>address3</i> - diff --git a/mail/postfix25/files/patch-ca b/mail/postfix25/files/patch-ca deleted file mode 100644 index 86d56f80be30..000000000000 --- a/mail/postfix25/files/patch-ca +++ /dev/null @@ -1,11 +0,0 @@ -*** ./man/man1/postdrop.1.orig Mon May 3 15:03:29 1999 ---- ./man/man1/postdrop.1 Thu Jun 1 22:38:54 2000 -*************** -*** 53,55 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS ---- 53,55 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS diff --git a/mail/postfix25/files/patch-cb b/mail/postfix25/files/patch-cb deleted file mode 100644 index 58559c7273d1..000000000000 --- a/mail/postfix25/files/patch-cb +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man1/sendmail.1.orig Thu Mar 30 14:05:28 2000 ---- ./man/man1/sendmail.1 Thu Jun 1 22:39:16 2000 -*************** -*** 63,65 **** - The path name of the \fBsendmail.cf\fR file. Postfix configuration -! files are kept in \fB/etc/postfix\fR. - .IP "\fB-F \fIfull_name\fR ---- 63,65 ---- - The path name of the \fBsendmail.cf\fR file. Postfix configuration -! files are kept in \fB!!PREFIX!!/etc/postfix\fR. - .IP "\fB-F \fIfull_name\fR -*************** -*** 173,175 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS ---- 173,175 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS diff --git a/mail/postfix25/files/patch-cc b/mail/postfix25/files/patch-cc deleted file mode 100644 index cd6946003217..000000000000 --- a/mail/postfix25/files/patch-cc +++ /dev/null @@ -1,11 +0,0 @@ -*** ./man/man5/pcre_table.5.orig Thu Mar 30 14:05:28 2000 ---- ./man/man5/pcre_table.5 Thu Jun 1 22:39:34 2000 -*************** -*** 10,12 **** - .nf -! pcre:/etc/postfix/filename - .SH DESCRIPTION ---- 10,12 ---- - .nf -! pcre:!!PREFIX!!/etc/postfix/filename - .SH DESCRIPTION diff --git a/mail/postfix25/files/patch-cd b/mail/postfix25/files/patch-cd deleted file mode 100644 index b51de44d0bee..000000000000 --- a/mail/postfix25/files/patch-cd +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/access.5.orig Sat Apr 22 20:28:30 2000 ---- ./man/man5/access.5 Thu Jun 1 22:39:55 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/access\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/access\fR - .SH DESCRIPTION -*************** -*** 21,23 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed - file after changing the access table. ---- 21,23 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed - file after changing the access table. diff --git a/mail/postfix25/files/patch-ce b/mail/postfix25/files/patch-ce deleted file mode 100644 index f77053f8b3aa..000000000000 --- a/mail/postfix25/files/patch-ce +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/canonical.5.orig Sat Apr 22 20:28:30 2000 ---- ./man/man5/canonical.5 Thu Jun 1 22:40:18 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/canonical\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR - .SH DESCRIPTION -*************** -*** 21,23 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed - file after changing the canonical table. ---- 21,23 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed - file after changing the canonical table. diff --git a/mail/postfix25/files/patch-cf b/mail/postfix25/files/patch-cf deleted file mode 100644 index 28fb053b94a7..000000000000 --- a/mail/postfix25/files/patch-cf +++ /dev/null @@ -1,11 +0,0 @@ -*** ./man/man5/regexp_table.5.orig Thu Mar 30 14:05:28 2000 ---- ./man/man5/regexp_table.5 Thu Jun 1 22:40:43 2000 -*************** -*** 10,12 **** - .nf -! regexp:/etc/postfix/filename - .SH DESCRIPTION ---- 10,12 ---- - .nf -! regexp:!!PREFIX!!/etc/postfix/filename - .SH DESCRIPTION diff --git a/mail/postfix25/files/patch-cg b/mail/postfix25/files/patch-cg deleted file mode 100644 index 0ae82cc57669..000000000000 --- a/mail/postfix25/files/patch-cg +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/relocated.5.orig Sat Apr 22 20:28:31 2000 ---- ./man/man5/relocated.5 Thu Jun 1 22:41:05 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/relocated\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR - .SH DESCRIPTION -*************** -*** 20,22 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed - file after changing the relocated table. ---- 20,22 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed - file after changing the relocated table. diff --git a/mail/postfix25/files/patch-ch b/mail/postfix25/files/patch-ch deleted file mode 100644 index 3ed047ea474c..000000000000 --- a/mail/postfix25/files/patch-ch +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/transport.5.orig Sat Apr 22 20:28:31 2000 ---- ./man/man5/transport.5 Thu Jun 1 22:41:26 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/transport\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR - .SH DESCRIPTION -*************** -*** 21,23 **** - for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed - file after changing the transport table. ---- 21,23 ---- - for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed - file after changing the transport table. diff --git a/mail/postfix25/files/patch-ci b/mail/postfix25/files/patch-ci deleted file mode 100644 index 1a7cf4abbac7..000000000000 --- a/mail/postfix25/files/patch-ci +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/virtual.5.orig Sat Apr 22 20:28:31 2000 ---- ./man/man5/virtual.5 Thu Jun 1 22:41:51 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/virtual\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR - .SH DESCRIPTION -*************** -*** 26,28 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed - file after changing the virtual table. ---- 26,28 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed - file after changing the virtual table. diff --git a/mail/postfix25/files/patch-cj b/mail/postfix25/files/patch-cj deleted file mode 100644 index 50448f2ec26d..000000000000 --- a/mail/postfix25/files/patch-cj +++ /dev/null @@ -1,13 +0,0 @@ -*** ./man/man8/cleanup.8.orig Sun May 28 21:58:32 2000 ---- ./man/man8/cleanup.8 Thu Jun 1 22:42:21 2000 -*************** -*** 136,139 **** - .nf -! /etc/postfix/canonical*, canonical mapping table -! /etc/postfix/virtual*, virtual mapping table - .SH LICENSE ---- 136,139 ---- - .nf -! !!PREFIX!!/etc/postfix/canonical*, canonical mapping table -! !!PREFIX!!/etc/postfix/virtual*, virtual mapping table - .SH LICENSE diff --git a/mail/postfix25/files/patch-cl b/mail/postfix25/files/patch-cl deleted file mode 100644 index 44c8a3a7aae0..000000000000 --- a/mail/postfix25/files/patch-cl +++ /dev/null @@ -1,13 +0,0 @@ -*** ./man/man8/master.8.orig Tue Mar 7 10:48:19 2000 ---- ./man/man8/master.8 Thu Jun 1 22:43:02 2000 -*************** -*** 120,123 **** - .nf -! /etc/postfix/main.cf: global configuration file. -! /etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. ---- 120,123 ---- - .nf -! !!PREFIX!!/etc/postfix/main.cf: global configuration file. -! !!PREFIX!!/etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. diff --git a/mail/postfix25/files/patch-da b/mail/postfix25/files/patch-da deleted file mode 100644 index e57e31750d18..000000000000 --- a/mail/postfix25/files/patch-da +++ /dev/null @@ -1,11 +0,0 @@ -*** ./proto/regexp_table.orig Wed Mar 8 19:18:20 2000 ---- ./proto/regexp_table Thu Jun 1 22:44:43 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # regexp:/etc/postfix/filename - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # regexp:!!PREFIX!!/etc/postfix/filename - # DESCRIPTION diff --git a/mail/postfix25/files/patch-db b/mail/postfix25/files/patch-db deleted file mode 100644 index 7f89fb770783..000000000000 --- a/mail/postfix25/files/patch-db +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/access.orig Sun Apr 9 16:44:45 2000 ---- ./proto/access Thu Jun 1 22:45:05 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/access\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR - # DESCRIPTION -*************** -*** 15,17 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed - # file after changing the access table. ---- 15,17 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed - # file after changing the access table. diff --git a/mail/postfix25/files/patch-dc b/mail/postfix25/files/patch-dc deleted file mode 100644 index 786f2da45c32..000000000000 --- a/mail/postfix25/files/patch-dc +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/canonical.orig Sun Apr 9 16:43:37 2000 ---- ./proto/canonical Thu Jun 1 22:45:28 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/canonical\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR - # DESCRIPTION -*************** -*** 15,17 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed - # file after changing the canonical table. ---- 15,17 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed - # file after changing the canonical table. diff --git a/mail/postfix25/files/patch-dd b/mail/postfix25/files/patch-dd deleted file mode 100644 index b65a57ff7d57..000000000000 --- a/mail/postfix25/files/patch-dd +++ /dev/null @@ -1,11 +0,0 @@ -*** ./proto/pcre_table.orig Wed Mar 8 19:18:11 2000 ---- ./proto/pcre_table Thu Jun 1 22:45:41 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # pcre:/etc/postfix/filename - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # pcre:!!PREFIX!!/etc/postfix/filename - # DESCRIPTION diff --git a/mail/postfix25/files/patch-de b/mail/postfix25/files/patch-de deleted file mode 100644 index 73bb2af2261d..000000000000 --- a/mail/postfix25/files/patch-de +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/relocated.orig Sun Apr 9 16:47:31 2000 ---- ./proto/relocated Thu Jun 1 22:46:02 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/relocated\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR - # DESCRIPTION -*************** -*** 14,16 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed - # file after changing the relocated table. ---- 14,16 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed - # file after changing the relocated table. diff --git a/mail/postfix25/files/patch-df b/mail/postfix25/files/patch-df deleted file mode 100644 index 8d3fba96a224..000000000000 --- a/mail/postfix25/files/patch-df +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/transport.orig Sun Apr 9 17:05:45 2000 ---- ./proto/transport Thu Jun 1 22:46:23 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/transport\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR - # DESCRIPTION -*************** -*** 15,17 **** - # for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed - # file after changing the transport table. ---- 15,17 ---- - # for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed - # file after changing the transport table. diff --git a/mail/postfix25/files/patch-dg b/mail/postfix25/files/patch-dg deleted file mode 100644 index bff20a2cff3e..000000000000 --- a/mail/postfix25/files/patch-dg +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/virtual.orig Sun Apr 9 17:14:14 2000 ---- ./proto/virtual Thu Jun 1 22:46:40 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/virtual\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR - # DESCRIPTION -*************** -*** 20,22 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed - # file after changing the virtual table. ---- 20,22 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed - # file after changing the virtual table. diff --git a/mail/postfix25/files/patch-ea b/mail/postfix25/files/patch-ea deleted file mode 100644 index 6c3f98d2af4f..000000000000 --- a/mail/postfix25/files/patch-ea +++ /dev/null @@ -1,13 +0,0 @@ -*** ./src/cleanup/cleanup.c.orig Sun May 28 18:33:41 2000 ---- ./src/cleanup/cleanup.c Thu Jun 1 21:52:22 2000 -*************** -*** 118,121 **** - /* FILES -! /* /etc/postfix/canonical*, canonical mapping table -! /* /etc/postfix/virtual*, virtual mapping table - /* LICENSE ---- 118,121 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix/canonical*, canonical mapping table -! /* !!PREFIX!!/etc/postfix/virtual*, virtual mapping table - /* LICENSE diff --git a/mail/postfix25/files/patch-eb b/mail/postfix25/files/patch-eb deleted file mode 100644 index e67680963d2d..000000000000 --- a/mail/postfix25/files/patch-eb +++ /dev/null @@ -1,11 +0,0 @@ -*** ./src/global/mail_conf.c.orig Sun May 7 18:51:16 2000 ---- ./src/global/mail_conf.c Thu Jun 1 22:16:29 2000 -*************** -*** 53,55 **** - /* FILES -! /* /etc/postfix: default Postfix configuration directory. - /* ENVIRONMENT ---- 53,55 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix: default Postfix configuration directory. - /* ENVIRONMENT diff --git a/mail/postfix25/files/patch-ee b/mail/postfix25/files/patch-ee deleted file mode 100644 index ef44eac24b73..000000000000 --- a/mail/postfix25/files/patch-ee +++ /dev/null @@ -1,13 +0,0 @@ -*** ./src/master/master.c.orig Tue Mar 7 10:25:07 2000 ---- ./src/master/master.c Thu Jun 1 22:43:50 2000 -*************** -*** 104,107 **** - /* FILES -! /* /etc/postfix/main.cf: global configuration file. -! /* /etc/postfix/master.cf: master process configuration file. - /* /var/spool/postfix/pid/master.pid: master lock file. ---- 104,107 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix/main.cf: global configuration file. -! /* !!PREFIX!!/etc/postfix/master.cf: master process configuration file. - /* /var/spool/postfix/pid/master.pid: master lock file. diff --git a/mail/postfix25/files/patch-ef b/mail/postfix25/files/patch-ef deleted file mode 100644 index 586b304a103d..000000000000 --- a/mail/postfix25/files/patch-ef +++ /dev/null @@ -1,11 +0,0 @@ -*** ./src/postdrop/postdrop.c.orig Sun Apr 25 18:05:43 1999 ---- ./src/postdrop/postdrop.c Thu Jun 1 22:44:22 2000 -*************** -*** 39,41 **** - /* /var/spool/postfix, mail queue -! /* /etc/postfix, configuration files - /* CONFIGURATION PARAMETERS ---- 39,41 ---- - /* /var/spool/postfix, mail queue -! /* !!PREFIX!!/etc/postfix, configuration files - /* CONFIGURATION PARAMETERS diff --git a/mail/postfix25/files/patch-eg b/mail/postfix25/files/patch-eg deleted file mode 100644 index 2983bbfd86ea..000000000000 --- a/mail/postfix25/files/patch-eg +++ /dev/null @@ -1,20 +0,0 @@ -*** ./src/sendmail/sendmail.c.orig Tue Mar 14 10:42:06 2000 ---- ./src/sendmail/sendmail.c Thu Jun 1 22:47:24 2000 -*************** -*** 57,59 **** - /* The path name of the \fBsendmail.cf\fR file. Postfix configuration -! /* files are kept in \fB/etc/postfix\fR. - /* .IP "\fB-F \fIfull_name\fR ---- 57,59 ---- - /* The path name of the \fBsendmail.cf\fR file. Postfix configuration -! /* files are kept in \fB!!PREFIX!!/etc/postfix\fR. - /* .IP "\fB-F \fIfull_name\fR -*************** -*** 159,161 **** - /* /var/spool/postfix, mail queue -! /* /etc/postfix, configuration files - /* CONFIGURATION PARAMETERS ---- 159,161 ---- - /* /var/spool/postfix, mail queue -! /* !!PREFIX!!/etc/postfix, configuration files - /* CONFIGURATION PARAMETERS diff --git a/mail/postfix25/files/patch-eh b/mail/postfix25/files/patch-eh deleted file mode 100644 index c104c3680d21..000000000000 --- a/mail/postfix25/files/patch-eh +++ /dev/null @@ -1,11 +0,0 @@ -*** ./src/trivial-rewrite/transport.c.orig Tue Nov 16 19:15:41 1999 ---- ./src/trivial-rewrite/transport.c Thu Jun 1 22:47:49 2000 -*************** -*** 32,34 **** - /* FILES -! /* /etc/postfix/transport* - /* CONFIGURATION PARAMETERS ---- 32,34 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix/transport* - /* CONFIGURATION PARAMETERS diff --git a/mail/postfix25/pkg-message b/mail/postfix25/pkg-message index a7ae2b17e2a6..7fb3a804599c 100644 --- a/mail/postfix25/pkg-message +++ b/mail/postfix25/pkg-message @@ -8,10 +8,21 @@ sendmail_outbound_enable="NO" sendmail_submit_enable="NO" sendmail_msp_queue_enable="NO" -This will disable Sendmail completely. + **OR** +sendmail_enable="NONE" -Also, you may wish to disable some Sendmail-specific daily maintenance +then type this command as root: + +ln -s /usr/local/sbin/postfix /usr/local/etc/rc.d/postfix.sh + +Either of these will disable Sendmail completely. The latter form is useful +if you need to wait until other local package initialization (such as ldconfig +for Postgres or MySQL) is done. The former method will start postfix very +early on in the boot process. + + +Also, you will want to disable some Sendmail-specific daily maintenance routines in your /etc/periodic.conf file: daily_status_mail_rejects_enable="NO" diff --git a/mail/postfix26/Makefile b/mail/postfix26/Makefile index 6b47f15e39d2..6adf63b1ee81 100644 --- a/mail/postfix26/Makefile +++ b/mail/postfix26/Makefile @@ -12,7 +12,7 @@ # the options are the same names as in the scripts/configure.postfix file PORTNAME= postfix -PORTVERSION= 1.1.11 +PORTVERSION= 1.1.12 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -28,6 +28,7 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= khera@kciLink.com USE_SUBMAKE= yes +USE_REINPLACE= yes MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \ postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \ @@ -40,6 +41,10 @@ MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \ master.8 nqmgr.8 pickup.8 pipe.8 qmgr.8 qmqpd.8 showq.8 smtp.8 \ smtpd.8 spawn.8 trivial-rewrite.8 virtual.8 +# TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to +# patch it. +MAN8base=$(MAN8:S/tlsmgr.8//) + CONF1= main.cf master.cf access aliases canonical pcre_table regexp_table \ relocated transport virtual @@ -66,6 +71,27 @@ post-patch: CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ ${ECHO} "all: default" >> Makefile) +pre-patch: +.for file in ${MAN1} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/man/man1/${file} ${WRKSRC}/html/${file}.html +.endfor +.for file in ${MAN5} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/man/man5/${file} ${WRKSRC}/html/${file}.html +.endfor +.for file in ${MAN8base} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/man/man8/${file} ${WRKSRC}/html/${file}.html +.endfor +.for file in faq rate rewrite uce + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/html/${file}.html +.endfor +.for file in ${CONF1} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" ${WRKSRC}/conf/${file} +.endfor + pre-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL diff --git a/mail/postfix26/distinfo b/mail/postfix26/distinfo index 379358ed4749..832388cccb96 100644 --- a/mail/postfix26/distinfo +++ b/mail/postfix26/distinfo @@ -1,4 +1,4 @@ -MD5 (postfix/postfix-1.1.11.tar.gz) = b34bb2b5018327c19456a77814141208 +MD5 (postfix/postfix-1.1.12.tar.gz) = d1d0f9792ec6ea063ccca59184e54212 MD5 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz) = 11d82e9a3482f64af9d228f7a4319566 -MD5 (postfix/postfix-1.1.11+ipv6.patch.gz) = dc2a6362518025583a17305607eb8f0e +MD5 (postfix/postfix-1.1.12+ipv6.patch.gz) = add4396ce50ca61b5d9b67454fb51258 MD5 (postfix/postfix-pg.postfix-1.1.8.patch) = e0f4d910a6d6648d9b48e2244f2764ba diff --git a/mail/postfix26/files/patch-aa b/mail/postfix26/files/patch-aa deleted file mode 100644 index 51b40396bd5e..000000000000 --- a/mail/postfix26/files/patch-aa +++ /dev/null @@ -1,86 +0,0 @@ -*** ./conf/main.cf.orig Fri Jan 4 13:09:04 2002 ---- ./conf/main.cf Tue Jan 8 22:41:50 2002 -*************** -*** 31,44 **** - # The command_directory parameter specifies the location of all - # postXXX commands. The default value is $program_directory. - # -! command_directory = /usr/sbin - - # The daemon_directory parameter specifies the location of all Postfix - # daemon programs (i.e. programs listed in the master.cf file). The - # default value is $program_directory. This directory must be owned - # by root. - # -! daemon_directory = /usr/libexec/postfix - - # QUEUE AND PROCESS OWNERSHIP - # ---- 31,44 ---- - # The command_directory parameter specifies the location of all - # postXXX commands. The default value is $program_directory. - # -! command_directory = !!PREFIX!!/sbin - - # The daemon_directory parameter specifies the location of all Postfix - # daemon programs (i.e. programs listed in the master.cf file). The - # default value is $program_directory. This directory must be owned - # by root. - # -! daemon_directory = !!PREFIX!!/libexec/postfix - - # QUEUE AND PROCESS OWNERSHIP - # -*************** -*** 325,332 **** - # - # The home_mailbox parameter specifies the optional pathname of a - # mailbox file relative to a user's home directory. The default -! # mailbox file is /var/spool/mail/user or /var/mail/user. Specify -! # "Maildir/" for qmail-style delivery (the / is required). - # - #home_mailbox = Mailbox - #home_mailbox = Maildir/ ---- 325,332 ---- - # - # The home_mailbox parameter specifies the optional pathname of a - # mailbox file relative to a user's home directory. The default -! # mailbox file is /var/mail/user. Specify "Maildir/" for -! # qmail-style delivery (the / is required). - # - #home_mailbox = Mailbox - #home_mailbox = Maildir/ -*************** -*** 424,430 **** - # - # See also the body_checks example in the sample-filter.cf file. - # -! #header_checks = regexp:/etc/postfix/header_checks - - # FAST ETRN SERVICE - # ---- 424,430 ---- - # - # See also the body_checks example in the sample-filter.cf file. - # -! #header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks - - # FAST ETRN SERVICE - # -*************** -*** 525,531 **** - # commands. This must be a group name with a numerical group ID that - # is not shared with other accounts, not even with the Postfix account. - # -! setgid_group = - - # manpage_path: The location of the Postfix on-line manual pages. - # ---- 525,531 ---- - # commands. This must be a group name with a numerical group ID that - # is not shared with other accounts, not even with the Postfix account. - # -! setgid_group = maildrop - - # manpage_path: The location of the Postfix on-line manual pages. - # diff --git a/mail/postfix26/files/patch-ab b/mail/postfix26/files/patch-ab deleted file mode 100644 index 7c81d3dc12c9..000000000000 --- a/mail/postfix26/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/canonical.orig Tue Mar 7 10:42:58 2000 ---- ./conf/canonical Thu Jun 1 21:53:23 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/canonical - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/canonical - # diff --git a/mail/postfix26/files/patch-ac b/mail/postfix26/files/patch-ac deleted file mode 100644 index 0fb2192cdd84..000000000000 --- a/mail/postfix26/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/access.orig Tue Mar 7 10:42:58 2000 ---- ./conf/access Thu Jun 1 21:53:36 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/access - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/access - # diff --git a/mail/postfix26/files/patch-ad b/mail/postfix26/files/patch-ad deleted file mode 100644 index c1b102574165..000000000000 --- a/mail/postfix26/files/patch-ad +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/pcre_table.orig Thu Mar 9 20:36:19 2000 ---- ./conf/pcre_table Thu Jun 1 22:02:08 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # pcre:/etc/postfix/filename - # ---- 7,9 ---- - # SYNOPSIS -! # pcre:!!PREFIX!!/etc/postfix/filename - # diff --git a/mail/postfix26/files/patch-ae b/mail/postfix26/files/patch-ae deleted file mode 100644 index e396dd8626db..000000000000 --- a/mail/postfix26/files/patch-ae +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/regexp_table.orig Thu Mar 9 20:36:19 2000 ---- ./conf/regexp_table Thu Jun 1 22:03:27 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # regexp:/etc/postfix/filename - # ---- 7,9 ---- - # SYNOPSIS -! # regexp:!!PREFIX!!/etc/postfix/filename - # diff --git a/mail/postfix26/files/patch-af b/mail/postfix26/files/patch-af deleted file mode 100644 index 8fca6b208941..000000000000 --- a/mail/postfix26/files/patch-af +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/relocated.orig Tue Mar 7 10:42:58 2000 ---- ./conf/relocated Thu Jun 1 22:03:59 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/relocated - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/relocated - # diff --git a/mail/postfix26/files/patch-ag b/mail/postfix26/files/patch-ag deleted file mode 100644 index 54c0fa918d3b..000000000000 --- a/mail/postfix26/files/patch-ag +++ /dev/null @@ -1,15 +0,0 @@ -*** ./conf/sample-auth.cf.orig Sun May 28 17:55:19 2000 ---- ./conf/sample-auth.cf Thu Jun 1 22:05:32 2000 -*************** -*** 91,95 **** - # The Postfix SMTP client opens the lookup table before going to -! # chroot jail, so you can leave the password file in /etc/postfix. - # -! smtp_sasl_password_maps = hash:/etc/postfix/saslpass - ---- 91,95 ---- - # The Postfix SMTP client opens the lookup table before going to -! # chroot jail, so you can leave the password file in !!PREFIX!!/etc/postfix. - # -! smtp_sasl_password_maps = hash:!!PREFIX!!/etc/postfix/saslpass - diff --git a/mail/postfix26/files/patch-ah b/mail/postfix26/files/patch-ah deleted file mode 100644 index a8c70a15a78d..000000000000 --- a/mail/postfix26/files/patch-ah +++ /dev/null @@ -1,44 +0,0 @@ -*** ./conf/sample-canonical.cf.orig Thu Sep 23 14:10:38 1999 ---- ./conf/sample-canonical.cf Thu Jun 1 22:07:23 2000 -*************** -*** 14,16 **** - # -! # If you use this feature, run "postmap /etc/postfix/canonical" to - # build the necessary DBM or DB file after every change. The changes ---- 14,16 ---- - # -! # If you use this feature, run "postmap !!PREFIX!!/etc/postfix/canonical" to - # build the necessary DBM or DB file after every change. The changes -*************** -*** 19,24 **** - # -! #canonical_maps = dbm:/etc/postfix/canonical -! #canonical_maps = hash:/etc/postfix/canonical -! #canonical_maps = hash:/etc/postfix/canonical, nis:canonical -! #canonical_maps = hash:/etc/postfix/canonical, netinfo:/canonical - canonical_maps = ---- 19,24 ---- - # -! #canonical_maps = dbm:!!PREFIX!!/etc/postfix/canonical -! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical -! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical, nis:canonical -! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical, netinfo:/canonical - canonical_maps = -*************** -*** 32,34 **** - # -! #recipient_canonical_maps = hash:/etc/postfix/recipient_canonical - recipient_canonical_maps = ---- 32,34 ---- - # -! #recipient_canonical_maps = hash:!!PREFIX!!/etc/postfix/recipient_canonical - recipient_canonical_maps = -*************** -*** 46,48 **** - # -! #sender_canonical_maps = hash:/etc/postfix/sender_canonical - sender_canonical_maps = ---- 46,48 ---- - # -! #sender_canonical_maps = hash:!!PREFIX!!/etc/postfix/sender_canonical - sender_canonical_maps = diff --git a/mail/postfix26/files/patch-ai b/mail/postfix26/files/patch-ai deleted file mode 100644 index f7aa2fd5f4c6..000000000000 --- a/mail/postfix26/files/patch-ai +++ /dev/null @@ -1,18 +0,0 @@ -*** ./conf/sample-filter.cf.orig Mon May 29 11:30:44 2000 ---- ./conf/sample-filter.cf Thu Jun 1 22:07:58 2000 -*************** -*** 15,17 **** - # -! header_checks = regexp:/etc/postfix/header_checks - ---- 15,17 ---- - # -! header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks - -*************** -*** 26,27 **** - # -! body_checks = regexp:/etc/postfix/body_checks ---- 26,27 ---- - # -! body_checks = regexp:!!PREFIX!!/etc/postfix/body_checks diff --git a/mail/postfix26/files/patch-aj b/mail/postfix26/files/patch-aj deleted file mode 100644 index 241d48132551..000000000000 --- a/mail/postfix26/files/patch-aj +++ /dev/null @@ -1,24 +0,0 @@ -*** ./conf/sample-misc.cf.orig Thu Sep 23 14:10:52 1999 ---- ./conf/sample-misc.cf Thu Jun 1 22:09:39 2000 -*************** -*** 220,222 **** - # -! program_directory = /usr/libexec/postfix - ---- 220,222 ---- - # -! program_directory = !!PREFIX!!/libexec/postfix - -*************** -*** 263,267 **** - # Specify the types and names of databases to use. After change, -! # run "postmap /etc/postfix/relocated", then "postfix reload". - # -! #relocated_maps = hash:/etc/postfix/relocated - relocated_maps = ---- 263,267 ---- - # Specify the types and names of databases to use. After change, -! # run "postmap !!PREFIX!!/etc/postfix/relocated", then "postfix reload". - # -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated - relocated_maps = diff --git a/mail/postfix26/files/patch-ak b/mail/postfix26/files/patch-ak deleted file mode 100644 index 250dd411a4bd..000000000000 --- a/mail/postfix26/files/patch-ak +++ /dev/null @@ -1,26 +0,0 @@ -*** ./conf/sample-relocated.cf.orig Thu Sep 23 14:11:17 1999 ---- ./conf/sample-relocated.cf Thu Jun 1 22:10:43 2000 -*************** -*** 12,14 **** - # -! # If you use this feature, run "postmap /etc/postfix/relocated" to - # build the necessary DBM or DB file after change, then "postfix ---- 12,14 ---- - # -! # If you use this feature, run "postmap !!PREFIX!!/etc/postfix/relocated" to - # build the necessary DBM or DB file after change, then "postfix -*************** -*** 16,21 **** - # -! #relocated_maps = dbm:/etc/postfix/relocated -! #relocated_maps = hash:/etc/postfix/relocated -! #relocated_maps = hash:/etc/postfix/relocated, nis:virtual -! #relocated_maps = hash:/etc/postfix/relocated, netinfo:/relocated - relocated_maps = ---- 16,21 ---- - # -! #relocated_maps = dbm:!!PREFIX!!/etc/postfix/relocated -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated, nis:virtual -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated, netinfo:/relocated - relocated_maps = diff --git a/mail/postfix26/files/patch-al b/mail/postfix26/files/patch-al deleted file mode 100644 index 799206da0c96..000000000000 --- a/mail/postfix26/files/patch-al +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/sample-smtpd.cf.orig Mon Dec 27 19:41:37 1999 ---- ./conf/sample-smtpd.cf Thu Jun 1 22:11:22 2000 -*************** -*** 183,185 **** - #smtpd_sender_restrictions = reject_unknown_sender_domain -! #smtpd_sender_restrictions = reject_unknown_sender_domain, hash:/etc/postfix/access - smtpd_sender_restrictions = ---- 183,185 ---- - #smtpd_sender_restrictions = reject_unknown_sender_domain -! #smtpd_sender_restrictions = reject_unknown_sender_domain, hash:!!PREFIX!!/etc/postfix/access - smtpd_sender_restrictions = diff --git a/mail/postfix26/files/patch-am b/mail/postfix26/files/patch-am deleted file mode 100644 index 2d395fa9ca03..000000000000 --- a/mail/postfix26/files/patch-am +++ /dev/null @@ -1,23 +0,0 @@ -*** ./conf/sample-transport.cf.orig Thu Dec 23 10:50:00 1999 ---- ./conf/sample-transport.cf Thu Jun 1 22:13:09 2000 -*************** -*** 10,18 **** - # By default, this feature is disabled. Specify the types of databases -! # to use. If you use this feature, run "postmap /etc/postfix/transport" - # after change, then "postfix reload". - # -! #transport_maps = dbm:/etc/postfix/transport -! #transport_maps = hash:/etc/postfix/transport -! #transport_maps = hash:/etc/postfix/transport, nis:transport -! #transport_maps = hash:/etc/postfix/transport, netinfo:/transport - transport_maps = ---- 10,18 ---- - # By default, this feature is disabled. Specify the types of databases -! # to use. If you use this feature, run "postmap !!PREFIX!!/etc/postfix/transport" - # after change, then "postfix reload". - # -! #transport_maps = dbm:!!PREFIX!!/etc/postfix/transport -! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport -! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport, nis:transport -! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport, netinfo:/transport - transport_maps = diff --git a/mail/postfix26/files/patch-an b/mail/postfix26/files/patch-an deleted file mode 100644 index af5ac7cc031b..000000000000 --- a/mail/postfix26/files/patch-an +++ /dev/null @@ -1,26 +0,0 @@ -*** ./conf/sample-virtual.cf.orig Mon Dec 20 21:00:42 1999 ---- ./conf/sample-virtual.cf Thu Jun 1 22:13:32 2000 -*************** -*** 12,14 **** - # -! # If you use this feature, run "postmap /etc/postfix/virtual" to - # build the necessary DBM or DB file after change. ---- 12,14 ---- - # -! # If you use this feature, run "postmap !!PREFIX!!/etc/postfix/virtual" to - # build the necessary DBM or DB file after change. -*************** -*** 18,23 **** - # -! #virtual_maps = dbm:/etc/postfix/virtual -! #virtual_maps = hash:/etc/postfix/virtual -! #virtual_maps = hash:/etc/postfix/virtual, nis:virtual -! #virtual_maps = hash:/etc/postfix/virtual, netinfo:/virtual - virtual_maps = ---- 18,23 ---- - # -! #virtual_maps = dbm:!!PREFIX!!/etc/postfix/virtual -! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual -! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual, nis:virtual -! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual, netinfo:/virtual - virtual_maps = diff --git a/mail/postfix26/files/patch-ao b/mail/postfix26/files/patch-ao deleted file mode 100644 index fd854e181601..000000000000 --- a/mail/postfix26/files/patch-ao +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/transport.orig Tue Mar 7 10:42:58 2000 ---- ./conf/transport Thu Jun 1 22:13:41 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/transport - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/transport - # diff --git a/mail/postfix26/files/patch-ap b/mail/postfix26/files/patch-ap deleted file mode 100644 index 4598192cd5c1..000000000000 --- a/mail/postfix26/files/patch-ap +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/virtual.orig Tue Mar 7 10:42:59 2000 ---- ./conf/virtual Thu Jun 1 22:13:54 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/virtual - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/virtual - # diff --git a/mail/postfix26/files/patch-ba b/mail/postfix26/files/patch-ba deleted file mode 100644 index ccb54ec60a7a..000000000000 --- a/mail/postfix26/files/patch-ba +++ /dev/null @@ -1,20 +0,0 @@ -*** ./html/mailq.1.html.orig Sat Apr 22 20:28:36 2000 ---- ./html/mailq.1.html Thu Jun 1 22:19:24 2000 -*************** -*** 83,85 **** - The path name of the <b>sendmail.cf</b> file. Postfix con- -! figuration files are kept in <b>/etc/postfix</b>. - ---- 83,85 ---- - The path name of the <b>sendmail.cf</b> file. Postfix con- -! figuration files are kept in <b>!!PREFIX!!/etc/postfix</b>. - -*************** -*** 231,233 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - ---- 231,233 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - diff --git a/mail/postfix26/files/patch-bb b/mail/postfix26/files/patch-bb deleted file mode 100644 index ea744664dfa7..000000000000 --- a/mail/postfix26/files/patch-bb +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/access.5.html.orig Tue Nov 21 21:24:13 2000 -+++ ./html/access.5.html Tue Nov 21 21:24:34 2000 -@@ -9,7 +9,7 @@ - access - format of Postfix access table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/access</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b> - - <b>DESCRIPTION</b> - The optional <b>access</b> table directs the Postfix SMTP server -@@ -21,7 +21,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/access</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b> in order to rebuild the - indexed file after changing the access table. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix26/files/patch-bc b/mail/postfix26/files/patch-bc deleted file mode 100644 index e407a9650585..000000000000 --- a/mail/postfix26/files/patch-bc +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/canonical.5.html.orig Tue Nov 21 21:32:38 2000 -+++ ./html/canonical.5.html Tue Nov 21 21:33:21 2000 -@@ -9,7 +9,7 @@ - canonical - format of Postfix canonical table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/canonical</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b> - - <b>DESCRIPTION</b> - The optional <b>canonical</b> table specifies an address mapping -@@ -20,7 +20,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/canonical</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b> in order to rebuild the - indexed file after changing the text file. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix26/files/patch-be b/mail/postfix26/files/patch-be deleted file mode 100644 index bef6a3bfaf73..000000000000 --- a/mail/postfix26/files/patch-be +++ /dev/null @@ -1,10 +0,0 @@ ---- ./html/faq.html.orig Sat Oct 28 23:34:51 2000 -+++ ./html/faq.html Sat Oct 28 23:36:04 2000 -@@ -2572,7 +2572,7 @@ - - Answer: instead of using <b>/usr/include/ndbm.h</b>, you're building - Postfix with some incompatible third-party file, typically --<b>/usr/local/include/ndbm.h</b>. -+<b>!!PREFIX!!/include/ndbm.h</b>. - - <p> diff --git a/mail/postfix26/files/patch-bf b/mail/postfix26/files/patch-bf deleted file mode 100644 index d652e1e567b3..000000000000 --- a/mail/postfix26/files/patch-bf +++ /dev/null @@ -1,13 +0,0 @@ -*** ./html/cleanup.8.html.orig Sun May 28 21:58:41 2000 ---- ./html/cleanup.8.html Thu Jun 1 22:29:04 2000 -*************** -*** 174,177 **** - <b>FILES</b> -! /etc/postfix/canonical*, canonical mapping table -! /etc/postfix/virtual*, virtual mapping table - ---- 174,177 ---- - <b>FILES</b> -! !!PREFIX!!/etc/postfix/canonical*, canonical mapping table -! !!PREFIX!!/etc/postfix/virtual*, virtual mapping table - diff --git a/mail/postfix26/files/patch-bg b/mail/postfix26/files/patch-bg deleted file mode 100644 index ce2454eaef01..000000000000 --- a/mail/postfix26/files/patch-bg +++ /dev/null @@ -1,13 +0,0 @@ -*** ./html/master.8.html.orig Tue Mar 7 10:48:56 2000 ---- ./html/master.8.html Thu Jun 1 22:29:24 2000 -*************** -*** 148,151 **** - <b>FILES</b> -! /etc/postfix/main.cf: global configuration file. -! /etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. ---- 148,151 ---- - <b>FILES</b> -! !!PREFIX!!/etc/postfix/main.cf: global configuration file. -! !!PREFIX!!/etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. diff --git a/mail/postfix26/files/patch-bh b/mail/postfix26/files/patch-bh deleted file mode 100644 index a20232e6796a..000000000000 --- a/mail/postfix26/files/patch-bh +++ /dev/null @@ -1,11 +0,0 @@ -*** ./html/goals.html.orig Sun May 9 15:44:18 1999 ---- ./html/goals.html Thu Jun 1 22:30:14 2000 -*************** -*** 45,47 **** - <li>Compatibility. Postfix is designed to be sendmail-compatible -! to make migration easy. Postfix supports <b>/var[/spool]/mail</b>, - <b>/etc/aliases</b>, <b>NIS</b>, and <b>~/.forward</b> files. ---- 45,47 ---- - <li>Compatibility. Postfix is designed to be sendmail-compatible -! to make migration easy. Postfix supports <b>/var/mail</b>, - <b>/etc/aliases</b>, <b>NIS</b>, and <b>~/.forward</b> files. diff --git a/mail/postfix26/files/patch-bi b/mail/postfix26/files/patch-bi deleted file mode 100644 index 7e4acdb0c126..000000000000 --- a/mail/postfix26/files/patch-bi +++ /dev/null @@ -1,11 +0,0 @@ -*** ./html/postdrop.1.html.orig Mon May 3 15:05:12 1999 ---- ./html/postdrop.1.html Thu Jun 1 22:30:47 2000 -*************** -*** 48,50 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - ---- 48,50 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - diff --git a/mail/postfix26/files/patch-bj b/mail/postfix26/files/patch-bj deleted file mode 100644 index 00e78d01ba5a..000000000000 --- a/mail/postfix26/files/patch-bj +++ /dev/null @@ -1,42 +0,0 @@ -*** ./html/uce.html.orig Fri Dec 31 15:06:07 1999 ---- ./html/uce.html Thu Jun 1 22:31:37 2000 -*************** -*** 126,130 **** - -! <dd> <b>header_checks = regexp:/etc/postfix/header_checks</b> - -! <dd> <b>header_checks = pcre:/etc/postfix/header_checks</b> - ---- 126,130 ---- - -! <dd> <b>header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks</b> - -! <dd> <b>header_checks = pcre:!!PREFIX!!/etc/postfix/header_checks</b> - -*************** -*** 169,171 **** - -! <dd> <b>smtpd_client_restrictions = hash:/etc/postfix/access, - reject_maps_rbl</b> ---- 169,171 ---- - -! <dd> <b>smtpd_client_restrictions = hash:!!PREFIX!!/etc/postfix/access, - reject_maps_rbl</b> -*************** -*** 474,476 **** - -! <dd> <b>smtpd_sender_restrictions = hash:/etc/postfix/access, - reject_unknown_sender_domain</b> ---- 474,476 ---- - -! <dd> <b>smtpd_sender_restrictions = hash:!!PREFIX!!/etc/postfix/access, - reject_unknown_sender_domain</b> -*************** -*** 856,858 **** - <dd> <b>smtpd_etrn_restrictions = permit_mynetworks, -! hash:/etc/postfix/etrn_access, reject</b> - ---- 856,858 ---- - <dd> <b>smtpd_etrn_restrictions = permit_mynetworks, -! hash:!!PREFIX!!/etc/postfix/etrn_access, reject</b> - diff --git a/mail/postfix26/files/patch-bk b/mail/postfix26/files/patch-bk deleted file mode 100644 index 62a0573559ae..000000000000 --- a/mail/postfix26/files/patch-bk +++ /dev/null @@ -1,29 +0,0 @@ -*** ./html/rate.html.orig Wed Mar 17 17:55:22 1999 ---- ./html/rate.html Thu Jun 1 22:32:19 2000 -*************** -*** 224,226 **** - -! <dt>/etc/postfix/main.cf: - ---- 224,226 ---- - -! <dt>!!PREFIX!!/etc/postfix/main.cf: - -*************** -*** 237,239 **** - -! <dt>/etc/postfix/<a href="transport.5.html">transport</a>: - ---- 237,239 ---- - -! <dt>!!PREFIX!!/etc/postfix/<a href="transport.5.html">transport</a>: - -*************** -*** 253,255 **** - -! <dt>/etc/postfix/master.cf: - ---- 253,255 ---- - -! <dt>!!PREFIX!!/etc/postfix/master.cf: - diff --git a/mail/postfix26/files/patch-bl b/mail/postfix26/files/patch-bl deleted file mode 100644 index 176c7d1b64de..000000000000 --- a/mail/postfix26/files/patch-bl +++ /dev/null @@ -1,11 +0,0 @@ -*** ./html/regexp_table.5.html.orig Sat Apr 22 20:28:38 2000 ---- ./html/regexp_table.5.html Thu Jun 1 22:32:44 2000 -*************** -*** 11,13 **** - <b>SYNOPSIS</b> -! regexp:/etc/postfix/filename - ---- 11,13 ---- - <b>SYNOPSIS</b> -! regexp:!!PREFIX!!/etc/postfix/filename - diff --git a/mail/postfix26/files/patch-bm b/mail/postfix26/files/patch-bm deleted file mode 100644 index e5ccc2c50b94..000000000000 --- a/mail/postfix26/files/patch-bm +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/relocated.5.html.orig Tue Nov 21 21:37:54 2000 -+++ ./html/relocated.5.html Tue Nov 21 21:38:08 2000 -@@ -9,7 +9,7 @@ - relocated - format of Postfix relocated table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/relocated</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b> - - <b>DESCRIPTION</b> - The optional <b>relocated</b> table provides the information that -@@ -20,7 +20,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/relocated</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b> in order to rebuild the - indexed file after changing the relocated table. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix26/files/patch-bn b/mail/postfix26/files/patch-bn deleted file mode 100644 index 21e69dcaa40c..000000000000 --- a/mail/postfix26/files/patch-bn +++ /dev/null @@ -1,56 +0,0 @@ -*** ./html/rewrite.html.orig Sat May 8 17:51:41 1999 ---- ./html/rewrite.html Thu Jun 1 22:34:21 2000 -*************** -*** 194,196 **** - -! <dd><b>canonical_maps = hash:/etc/postfix/canonical</b> - ---- 194,196 ---- - -! <dd><b>canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical</b> - -*************** -*** 207,209 **** - -! <dd><b>sender_canonical_maps = hash:/etc/postfix/sender_canonical</b> - ---- 207,209 ---- - -! <dd><b>sender_canonical_maps = hash:!!PREFIX!!/etc/postfix/sender_canonical</b> - -*************** -*** 211,213 **** - -! <dd><b>recipient_canonical_maps = hash:/etc/postfix/recipient_canonical</b> - ---- 211,213 ---- - -! <dd><b>recipient_canonical_maps = hash:!!PREFIX!!/etc/postfix/recipient_canonical</b> - -*************** -*** 295,297 **** - -! <dd><b>virtual_maps = hash:/etc/postfix/virtual</b> - ---- 295,297 ---- - -! <dd><b>virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual</b> - -*************** -*** 323,325 **** - -! <dd><b>relocated_maps = hash:/etc/postfix/relocated</b> - ---- 323,325 ---- - -! <dd><b>relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated</b> - -*************** -*** 348,350 **** - -! <dd><b>transport_maps = hash:/etc/postfix/transport</b> - ---- 348,350 ---- - -! <dd><b>transport_maps = hash:!!PREFIX!!/etc/postfix/transport</b> - diff --git a/mail/postfix26/files/patch-bo b/mail/postfix26/files/patch-bo deleted file mode 100644 index b45270be8151..000000000000 --- a/mail/postfix26/files/patch-bo +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/transport.5.html.orig Tue Nov 21 21:43:00 2000 -+++ ./html/transport.5.html Tue Nov 21 21:43:20 2000 -@@ -9,7 +9,7 @@ - transport - format of Postfix transport table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/transport</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b> - - <b>DESCRIPTION</b> - The optional <b>transport</b> table specifies a mapping from -@@ -21,7 +21,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/transport</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b> in order to rebuild the - indexed file after changing the transport table. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix26/files/patch-bp b/mail/postfix26/files/patch-bp deleted file mode 100644 index 5206bfd4bfd0..000000000000 --- a/mail/postfix26/files/patch-bp +++ /dev/null @@ -1,43 +0,0 @@ ---- ./html/virtual.5.html.orig Tue Nov 21 21:46:50 2000 -+++ ./html/virtual.5.html Tue Nov 21 21:47:17 2000 -@@ -9,7 +9,7 @@ - virtual - format of Postfix virtual table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/virtual</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b> - - <b>DESCRIPTION</b> - The optional <b>virtual</b> table specifies address redirections -@@ -27,7 +27,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/virtual</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b> in order to rebuild the - indexed file after changing the text file. - - When the table is provided via other means such as NIS, -@@ -52,7 +52,7 @@ - - Support for a Postfix-style virtual domain looks like: - -- /etc/postfix/virtual: -+ !!PREFIX!!/etc/postfix/virtual: - <i>virtual.domain</i> <i>anything</i> (right-hand content does not matter) - <i>postmaster@virtual.domain</i> <i>postmaster</i> - <i>user1@virtual.domain</i> <i>address1</i> -@@ -94,11 +94,11 @@ - - Support for a Sendmail-style virtual domain looks like: - -- /etc/postfix/main.cf: -+ !!PREFIX!!/etc/postfix/main.cf: - mydestination = $myhostname localhost.$mydomain $mydomain - <i>virtual.domain</i> - -- /etc/postfix/virtual: -+ !!PREFIX!!/etc/postfix/virtual: - <i>user1@virtual.domain</i> <i>address1</i> - <i>user2@virtual.domain</i> <i>address2,</i> <i>address3</i> - diff --git a/mail/postfix26/files/patch-ca b/mail/postfix26/files/patch-ca deleted file mode 100644 index 86d56f80be30..000000000000 --- a/mail/postfix26/files/patch-ca +++ /dev/null @@ -1,11 +0,0 @@ -*** ./man/man1/postdrop.1.orig Mon May 3 15:03:29 1999 ---- ./man/man1/postdrop.1 Thu Jun 1 22:38:54 2000 -*************** -*** 53,55 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS ---- 53,55 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS diff --git a/mail/postfix26/files/patch-cb b/mail/postfix26/files/patch-cb deleted file mode 100644 index 58559c7273d1..000000000000 --- a/mail/postfix26/files/patch-cb +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man1/sendmail.1.orig Thu Mar 30 14:05:28 2000 ---- ./man/man1/sendmail.1 Thu Jun 1 22:39:16 2000 -*************** -*** 63,65 **** - The path name of the \fBsendmail.cf\fR file. Postfix configuration -! files are kept in \fB/etc/postfix\fR. - .IP "\fB-F \fIfull_name\fR ---- 63,65 ---- - The path name of the \fBsendmail.cf\fR file. Postfix configuration -! files are kept in \fB!!PREFIX!!/etc/postfix\fR. - .IP "\fB-F \fIfull_name\fR -*************** -*** 173,175 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS ---- 173,175 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS diff --git a/mail/postfix26/files/patch-cc b/mail/postfix26/files/patch-cc deleted file mode 100644 index cd6946003217..000000000000 --- a/mail/postfix26/files/patch-cc +++ /dev/null @@ -1,11 +0,0 @@ -*** ./man/man5/pcre_table.5.orig Thu Mar 30 14:05:28 2000 ---- ./man/man5/pcre_table.5 Thu Jun 1 22:39:34 2000 -*************** -*** 10,12 **** - .nf -! pcre:/etc/postfix/filename - .SH DESCRIPTION ---- 10,12 ---- - .nf -! pcre:!!PREFIX!!/etc/postfix/filename - .SH DESCRIPTION diff --git a/mail/postfix26/files/patch-cd b/mail/postfix26/files/patch-cd deleted file mode 100644 index b51de44d0bee..000000000000 --- a/mail/postfix26/files/patch-cd +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/access.5.orig Sat Apr 22 20:28:30 2000 ---- ./man/man5/access.5 Thu Jun 1 22:39:55 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/access\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/access\fR - .SH DESCRIPTION -*************** -*** 21,23 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed - file after changing the access table. ---- 21,23 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed - file after changing the access table. diff --git a/mail/postfix26/files/patch-ce b/mail/postfix26/files/patch-ce deleted file mode 100644 index f77053f8b3aa..000000000000 --- a/mail/postfix26/files/patch-ce +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/canonical.5.orig Sat Apr 22 20:28:30 2000 ---- ./man/man5/canonical.5 Thu Jun 1 22:40:18 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/canonical\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR - .SH DESCRIPTION -*************** -*** 21,23 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed - file after changing the canonical table. ---- 21,23 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed - file after changing the canonical table. diff --git a/mail/postfix26/files/patch-cf b/mail/postfix26/files/patch-cf deleted file mode 100644 index 28fb053b94a7..000000000000 --- a/mail/postfix26/files/patch-cf +++ /dev/null @@ -1,11 +0,0 @@ -*** ./man/man5/regexp_table.5.orig Thu Mar 30 14:05:28 2000 ---- ./man/man5/regexp_table.5 Thu Jun 1 22:40:43 2000 -*************** -*** 10,12 **** - .nf -! regexp:/etc/postfix/filename - .SH DESCRIPTION ---- 10,12 ---- - .nf -! regexp:!!PREFIX!!/etc/postfix/filename - .SH DESCRIPTION diff --git a/mail/postfix26/files/patch-cg b/mail/postfix26/files/patch-cg deleted file mode 100644 index 0ae82cc57669..000000000000 --- a/mail/postfix26/files/patch-cg +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/relocated.5.orig Sat Apr 22 20:28:31 2000 ---- ./man/man5/relocated.5 Thu Jun 1 22:41:05 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/relocated\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR - .SH DESCRIPTION -*************** -*** 20,22 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed - file after changing the relocated table. ---- 20,22 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed - file after changing the relocated table. diff --git a/mail/postfix26/files/patch-ch b/mail/postfix26/files/patch-ch deleted file mode 100644 index 3ed047ea474c..000000000000 --- a/mail/postfix26/files/patch-ch +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/transport.5.orig Sat Apr 22 20:28:31 2000 ---- ./man/man5/transport.5 Thu Jun 1 22:41:26 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/transport\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR - .SH DESCRIPTION -*************** -*** 21,23 **** - for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed - file after changing the transport table. ---- 21,23 ---- - for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed - file after changing the transport table. diff --git a/mail/postfix26/files/patch-ci b/mail/postfix26/files/patch-ci deleted file mode 100644 index 1a7cf4abbac7..000000000000 --- a/mail/postfix26/files/patch-ci +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/virtual.5.orig Sat Apr 22 20:28:31 2000 ---- ./man/man5/virtual.5 Thu Jun 1 22:41:51 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/virtual\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR - .SH DESCRIPTION -*************** -*** 26,28 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed - file after changing the virtual table. ---- 26,28 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed - file after changing the virtual table. diff --git a/mail/postfix26/files/patch-cj b/mail/postfix26/files/patch-cj deleted file mode 100644 index 50448f2ec26d..000000000000 --- a/mail/postfix26/files/patch-cj +++ /dev/null @@ -1,13 +0,0 @@ -*** ./man/man8/cleanup.8.orig Sun May 28 21:58:32 2000 ---- ./man/man8/cleanup.8 Thu Jun 1 22:42:21 2000 -*************** -*** 136,139 **** - .nf -! /etc/postfix/canonical*, canonical mapping table -! /etc/postfix/virtual*, virtual mapping table - .SH LICENSE ---- 136,139 ---- - .nf -! !!PREFIX!!/etc/postfix/canonical*, canonical mapping table -! !!PREFIX!!/etc/postfix/virtual*, virtual mapping table - .SH LICENSE diff --git a/mail/postfix26/files/patch-cl b/mail/postfix26/files/patch-cl deleted file mode 100644 index 44c8a3a7aae0..000000000000 --- a/mail/postfix26/files/patch-cl +++ /dev/null @@ -1,13 +0,0 @@ -*** ./man/man8/master.8.orig Tue Mar 7 10:48:19 2000 ---- ./man/man8/master.8 Thu Jun 1 22:43:02 2000 -*************** -*** 120,123 **** - .nf -! /etc/postfix/main.cf: global configuration file. -! /etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. ---- 120,123 ---- - .nf -! !!PREFIX!!/etc/postfix/main.cf: global configuration file. -! !!PREFIX!!/etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. diff --git a/mail/postfix26/files/patch-da b/mail/postfix26/files/patch-da deleted file mode 100644 index e57e31750d18..000000000000 --- a/mail/postfix26/files/patch-da +++ /dev/null @@ -1,11 +0,0 @@ -*** ./proto/regexp_table.orig Wed Mar 8 19:18:20 2000 ---- ./proto/regexp_table Thu Jun 1 22:44:43 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # regexp:/etc/postfix/filename - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # regexp:!!PREFIX!!/etc/postfix/filename - # DESCRIPTION diff --git a/mail/postfix26/files/patch-db b/mail/postfix26/files/patch-db deleted file mode 100644 index 7f89fb770783..000000000000 --- a/mail/postfix26/files/patch-db +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/access.orig Sun Apr 9 16:44:45 2000 ---- ./proto/access Thu Jun 1 22:45:05 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/access\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR - # DESCRIPTION -*************** -*** 15,17 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed - # file after changing the access table. ---- 15,17 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed - # file after changing the access table. diff --git a/mail/postfix26/files/patch-dc b/mail/postfix26/files/patch-dc deleted file mode 100644 index 786f2da45c32..000000000000 --- a/mail/postfix26/files/patch-dc +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/canonical.orig Sun Apr 9 16:43:37 2000 ---- ./proto/canonical Thu Jun 1 22:45:28 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/canonical\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR - # DESCRIPTION -*************** -*** 15,17 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed - # file after changing the canonical table. ---- 15,17 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed - # file after changing the canonical table. diff --git a/mail/postfix26/files/patch-dd b/mail/postfix26/files/patch-dd deleted file mode 100644 index b65a57ff7d57..000000000000 --- a/mail/postfix26/files/patch-dd +++ /dev/null @@ -1,11 +0,0 @@ -*** ./proto/pcre_table.orig Wed Mar 8 19:18:11 2000 ---- ./proto/pcre_table Thu Jun 1 22:45:41 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # pcre:/etc/postfix/filename - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # pcre:!!PREFIX!!/etc/postfix/filename - # DESCRIPTION diff --git a/mail/postfix26/files/patch-de b/mail/postfix26/files/patch-de deleted file mode 100644 index 73bb2af2261d..000000000000 --- a/mail/postfix26/files/patch-de +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/relocated.orig Sun Apr 9 16:47:31 2000 ---- ./proto/relocated Thu Jun 1 22:46:02 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/relocated\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR - # DESCRIPTION -*************** -*** 14,16 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed - # file after changing the relocated table. ---- 14,16 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed - # file after changing the relocated table. diff --git a/mail/postfix26/files/patch-df b/mail/postfix26/files/patch-df deleted file mode 100644 index 8d3fba96a224..000000000000 --- a/mail/postfix26/files/patch-df +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/transport.orig Sun Apr 9 17:05:45 2000 ---- ./proto/transport Thu Jun 1 22:46:23 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/transport\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR - # DESCRIPTION -*************** -*** 15,17 **** - # for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed - # file after changing the transport table. ---- 15,17 ---- - # for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed - # file after changing the transport table. diff --git a/mail/postfix26/files/patch-dg b/mail/postfix26/files/patch-dg deleted file mode 100644 index bff20a2cff3e..000000000000 --- a/mail/postfix26/files/patch-dg +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/virtual.orig Sun Apr 9 17:14:14 2000 ---- ./proto/virtual Thu Jun 1 22:46:40 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/virtual\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR - # DESCRIPTION -*************** -*** 20,22 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed - # file after changing the virtual table. ---- 20,22 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed - # file after changing the virtual table. diff --git a/mail/postfix26/files/patch-ea b/mail/postfix26/files/patch-ea deleted file mode 100644 index 6c3f98d2af4f..000000000000 --- a/mail/postfix26/files/patch-ea +++ /dev/null @@ -1,13 +0,0 @@ -*** ./src/cleanup/cleanup.c.orig Sun May 28 18:33:41 2000 ---- ./src/cleanup/cleanup.c Thu Jun 1 21:52:22 2000 -*************** -*** 118,121 **** - /* FILES -! /* /etc/postfix/canonical*, canonical mapping table -! /* /etc/postfix/virtual*, virtual mapping table - /* LICENSE ---- 118,121 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix/canonical*, canonical mapping table -! /* !!PREFIX!!/etc/postfix/virtual*, virtual mapping table - /* LICENSE diff --git a/mail/postfix26/files/patch-eb b/mail/postfix26/files/patch-eb deleted file mode 100644 index e67680963d2d..000000000000 --- a/mail/postfix26/files/patch-eb +++ /dev/null @@ -1,11 +0,0 @@ -*** ./src/global/mail_conf.c.orig Sun May 7 18:51:16 2000 ---- ./src/global/mail_conf.c Thu Jun 1 22:16:29 2000 -*************** -*** 53,55 **** - /* FILES -! /* /etc/postfix: default Postfix configuration directory. - /* ENVIRONMENT ---- 53,55 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix: default Postfix configuration directory. - /* ENVIRONMENT diff --git a/mail/postfix26/files/patch-ee b/mail/postfix26/files/patch-ee deleted file mode 100644 index ef44eac24b73..000000000000 --- a/mail/postfix26/files/patch-ee +++ /dev/null @@ -1,13 +0,0 @@ -*** ./src/master/master.c.orig Tue Mar 7 10:25:07 2000 ---- ./src/master/master.c Thu Jun 1 22:43:50 2000 -*************** -*** 104,107 **** - /* FILES -! /* /etc/postfix/main.cf: global configuration file. -! /* /etc/postfix/master.cf: master process configuration file. - /* /var/spool/postfix/pid/master.pid: master lock file. ---- 104,107 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix/main.cf: global configuration file. -! /* !!PREFIX!!/etc/postfix/master.cf: master process configuration file. - /* /var/spool/postfix/pid/master.pid: master lock file. diff --git a/mail/postfix26/files/patch-ef b/mail/postfix26/files/patch-ef deleted file mode 100644 index 586b304a103d..000000000000 --- a/mail/postfix26/files/patch-ef +++ /dev/null @@ -1,11 +0,0 @@ -*** ./src/postdrop/postdrop.c.orig Sun Apr 25 18:05:43 1999 ---- ./src/postdrop/postdrop.c Thu Jun 1 22:44:22 2000 -*************** -*** 39,41 **** - /* /var/spool/postfix, mail queue -! /* /etc/postfix, configuration files - /* CONFIGURATION PARAMETERS ---- 39,41 ---- - /* /var/spool/postfix, mail queue -! /* !!PREFIX!!/etc/postfix, configuration files - /* CONFIGURATION PARAMETERS diff --git a/mail/postfix26/files/patch-eg b/mail/postfix26/files/patch-eg deleted file mode 100644 index 2983bbfd86ea..000000000000 --- a/mail/postfix26/files/patch-eg +++ /dev/null @@ -1,20 +0,0 @@ -*** ./src/sendmail/sendmail.c.orig Tue Mar 14 10:42:06 2000 ---- ./src/sendmail/sendmail.c Thu Jun 1 22:47:24 2000 -*************** -*** 57,59 **** - /* The path name of the \fBsendmail.cf\fR file. Postfix configuration -! /* files are kept in \fB/etc/postfix\fR. - /* .IP "\fB-F \fIfull_name\fR ---- 57,59 ---- - /* The path name of the \fBsendmail.cf\fR file. Postfix configuration -! /* files are kept in \fB!!PREFIX!!/etc/postfix\fR. - /* .IP "\fB-F \fIfull_name\fR -*************** -*** 159,161 **** - /* /var/spool/postfix, mail queue -! /* /etc/postfix, configuration files - /* CONFIGURATION PARAMETERS ---- 159,161 ---- - /* /var/spool/postfix, mail queue -! /* !!PREFIX!!/etc/postfix, configuration files - /* CONFIGURATION PARAMETERS diff --git a/mail/postfix26/files/patch-eh b/mail/postfix26/files/patch-eh deleted file mode 100644 index c104c3680d21..000000000000 --- a/mail/postfix26/files/patch-eh +++ /dev/null @@ -1,11 +0,0 @@ -*** ./src/trivial-rewrite/transport.c.orig Tue Nov 16 19:15:41 1999 ---- ./src/trivial-rewrite/transport.c Thu Jun 1 22:47:49 2000 -*************** -*** 32,34 **** - /* FILES -! /* /etc/postfix/transport* - /* CONFIGURATION PARAMETERS ---- 32,34 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix/transport* - /* CONFIGURATION PARAMETERS diff --git a/mail/postfix26/pkg-message b/mail/postfix26/pkg-message index a7ae2b17e2a6..7fb3a804599c 100644 --- a/mail/postfix26/pkg-message +++ b/mail/postfix26/pkg-message @@ -8,10 +8,21 @@ sendmail_outbound_enable="NO" sendmail_submit_enable="NO" sendmail_msp_queue_enable="NO" -This will disable Sendmail completely. + **OR** +sendmail_enable="NONE" -Also, you may wish to disable some Sendmail-specific daily maintenance +then type this command as root: + +ln -s /usr/local/sbin/postfix /usr/local/etc/rc.d/postfix.sh + +Either of these will disable Sendmail completely. The latter form is useful +if you need to wait until other local package initialization (such as ldconfig +for Postgres or MySQL) is done. The former method will start postfix very +early on in the boot process. + + +Also, you will want to disable some Sendmail-specific daily maintenance routines in your /etc/periodic.conf file: daily_status_mail_rejects_enable="NO" diff --git a/mail/postfix27/Makefile b/mail/postfix27/Makefile index 6b47f15e39d2..6adf63b1ee81 100644 --- a/mail/postfix27/Makefile +++ b/mail/postfix27/Makefile @@ -12,7 +12,7 @@ # the options are the same names as in the scripts/configure.postfix file PORTNAME= postfix -PORTVERSION= 1.1.11 +PORTVERSION= 1.1.12 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -28,6 +28,7 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= khera@kciLink.com USE_SUBMAKE= yes +USE_REINPLACE= yes MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \ postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \ @@ -40,6 +41,10 @@ MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \ master.8 nqmgr.8 pickup.8 pipe.8 qmgr.8 qmqpd.8 showq.8 smtp.8 \ smtpd.8 spawn.8 trivial-rewrite.8 virtual.8 +# TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to +# patch it. +MAN8base=$(MAN8:S/tlsmgr.8//) + CONF1= main.cf master.cf access aliases canonical pcre_table regexp_table \ relocated transport virtual @@ -66,6 +71,27 @@ post-patch: CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ ${ECHO} "all: default" >> Makefile) +pre-patch: +.for file in ${MAN1} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/man/man1/${file} ${WRKSRC}/html/${file}.html +.endfor +.for file in ${MAN5} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/man/man5/${file} ${WRKSRC}/html/${file}.html +.endfor +.for file in ${MAN8base} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/man/man8/${file} ${WRKSRC}/html/${file}.html +.endfor +.for file in faq rate rewrite uce + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/html/${file}.html +.endfor +.for file in ${CONF1} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" ${WRKSRC}/conf/${file} +.endfor + pre-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL diff --git a/mail/postfix27/distinfo b/mail/postfix27/distinfo index 379358ed4749..832388cccb96 100644 --- a/mail/postfix27/distinfo +++ b/mail/postfix27/distinfo @@ -1,4 +1,4 @@ -MD5 (postfix/postfix-1.1.11.tar.gz) = b34bb2b5018327c19456a77814141208 +MD5 (postfix/postfix-1.1.12.tar.gz) = d1d0f9792ec6ea063ccca59184e54212 MD5 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz) = 11d82e9a3482f64af9d228f7a4319566 -MD5 (postfix/postfix-1.1.11+ipv6.patch.gz) = dc2a6362518025583a17305607eb8f0e +MD5 (postfix/postfix-1.1.12+ipv6.patch.gz) = add4396ce50ca61b5d9b67454fb51258 MD5 (postfix/postfix-pg.postfix-1.1.8.patch) = e0f4d910a6d6648d9b48e2244f2764ba diff --git a/mail/postfix27/files/patch-aa b/mail/postfix27/files/patch-aa deleted file mode 100644 index 51b40396bd5e..000000000000 --- a/mail/postfix27/files/patch-aa +++ /dev/null @@ -1,86 +0,0 @@ -*** ./conf/main.cf.orig Fri Jan 4 13:09:04 2002 ---- ./conf/main.cf Tue Jan 8 22:41:50 2002 -*************** -*** 31,44 **** - # The command_directory parameter specifies the location of all - # postXXX commands. The default value is $program_directory. - # -! command_directory = /usr/sbin - - # The daemon_directory parameter specifies the location of all Postfix - # daemon programs (i.e. programs listed in the master.cf file). The - # default value is $program_directory. This directory must be owned - # by root. - # -! daemon_directory = /usr/libexec/postfix - - # QUEUE AND PROCESS OWNERSHIP - # ---- 31,44 ---- - # The command_directory parameter specifies the location of all - # postXXX commands. The default value is $program_directory. - # -! command_directory = !!PREFIX!!/sbin - - # The daemon_directory parameter specifies the location of all Postfix - # daemon programs (i.e. programs listed in the master.cf file). The - # default value is $program_directory. This directory must be owned - # by root. - # -! daemon_directory = !!PREFIX!!/libexec/postfix - - # QUEUE AND PROCESS OWNERSHIP - # -*************** -*** 325,332 **** - # - # The home_mailbox parameter specifies the optional pathname of a - # mailbox file relative to a user's home directory. The default -! # mailbox file is /var/spool/mail/user or /var/mail/user. Specify -! # "Maildir/" for qmail-style delivery (the / is required). - # - #home_mailbox = Mailbox - #home_mailbox = Maildir/ ---- 325,332 ---- - # - # The home_mailbox parameter specifies the optional pathname of a - # mailbox file relative to a user's home directory. The default -! # mailbox file is /var/mail/user. Specify "Maildir/" for -! # qmail-style delivery (the / is required). - # - #home_mailbox = Mailbox - #home_mailbox = Maildir/ -*************** -*** 424,430 **** - # - # See also the body_checks example in the sample-filter.cf file. - # -! #header_checks = regexp:/etc/postfix/header_checks - - # FAST ETRN SERVICE - # ---- 424,430 ---- - # - # See also the body_checks example in the sample-filter.cf file. - # -! #header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks - - # FAST ETRN SERVICE - # -*************** -*** 525,531 **** - # commands. This must be a group name with a numerical group ID that - # is not shared with other accounts, not even with the Postfix account. - # -! setgid_group = - - # manpage_path: The location of the Postfix on-line manual pages. - # ---- 525,531 ---- - # commands. This must be a group name with a numerical group ID that - # is not shared with other accounts, not even with the Postfix account. - # -! setgid_group = maildrop - - # manpage_path: The location of the Postfix on-line manual pages. - # diff --git a/mail/postfix27/files/patch-ab b/mail/postfix27/files/patch-ab deleted file mode 100644 index 7c81d3dc12c9..000000000000 --- a/mail/postfix27/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/canonical.orig Tue Mar 7 10:42:58 2000 ---- ./conf/canonical Thu Jun 1 21:53:23 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/canonical - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/canonical - # diff --git a/mail/postfix27/files/patch-ac b/mail/postfix27/files/patch-ac deleted file mode 100644 index 0fb2192cdd84..000000000000 --- a/mail/postfix27/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/access.orig Tue Mar 7 10:42:58 2000 ---- ./conf/access Thu Jun 1 21:53:36 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/access - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/access - # diff --git a/mail/postfix27/files/patch-ad b/mail/postfix27/files/patch-ad deleted file mode 100644 index c1b102574165..000000000000 --- a/mail/postfix27/files/patch-ad +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/pcre_table.orig Thu Mar 9 20:36:19 2000 ---- ./conf/pcre_table Thu Jun 1 22:02:08 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # pcre:/etc/postfix/filename - # ---- 7,9 ---- - # SYNOPSIS -! # pcre:!!PREFIX!!/etc/postfix/filename - # diff --git a/mail/postfix27/files/patch-ae b/mail/postfix27/files/patch-ae deleted file mode 100644 index e396dd8626db..000000000000 --- a/mail/postfix27/files/patch-ae +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/regexp_table.orig Thu Mar 9 20:36:19 2000 ---- ./conf/regexp_table Thu Jun 1 22:03:27 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # regexp:/etc/postfix/filename - # ---- 7,9 ---- - # SYNOPSIS -! # regexp:!!PREFIX!!/etc/postfix/filename - # diff --git a/mail/postfix27/files/patch-af b/mail/postfix27/files/patch-af deleted file mode 100644 index 8fca6b208941..000000000000 --- a/mail/postfix27/files/patch-af +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/relocated.orig Tue Mar 7 10:42:58 2000 ---- ./conf/relocated Thu Jun 1 22:03:59 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/relocated - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/relocated - # diff --git a/mail/postfix27/files/patch-ag b/mail/postfix27/files/patch-ag deleted file mode 100644 index 54c0fa918d3b..000000000000 --- a/mail/postfix27/files/patch-ag +++ /dev/null @@ -1,15 +0,0 @@ -*** ./conf/sample-auth.cf.orig Sun May 28 17:55:19 2000 ---- ./conf/sample-auth.cf Thu Jun 1 22:05:32 2000 -*************** -*** 91,95 **** - # The Postfix SMTP client opens the lookup table before going to -! # chroot jail, so you can leave the password file in /etc/postfix. - # -! smtp_sasl_password_maps = hash:/etc/postfix/saslpass - ---- 91,95 ---- - # The Postfix SMTP client opens the lookup table before going to -! # chroot jail, so you can leave the password file in !!PREFIX!!/etc/postfix. - # -! smtp_sasl_password_maps = hash:!!PREFIX!!/etc/postfix/saslpass - diff --git a/mail/postfix27/files/patch-ah b/mail/postfix27/files/patch-ah deleted file mode 100644 index a8c70a15a78d..000000000000 --- a/mail/postfix27/files/patch-ah +++ /dev/null @@ -1,44 +0,0 @@ -*** ./conf/sample-canonical.cf.orig Thu Sep 23 14:10:38 1999 ---- ./conf/sample-canonical.cf Thu Jun 1 22:07:23 2000 -*************** -*** 14,16 **** - # -! # If you use this feature, run "postmap /etc/postfix/canonical" to - # build the necessary DBM or DB file after every change. The changes ---- 14,16 ---- - # -! # If you use this feature, run "postmap !!PREFIX!!/etc/postfix/canonical" to - # build the necessary DBM or DB file after every change. The changes -*************** -*** 19,24 **** - # -! #canonical_maps = dbm:/etc/postfix/canonical -! #canonical_maps = hash:/etc/postfix/canonical -! #canonical_maps = hash:/etc/postfix/canonical, nis:canonical -! #canonical_maps = hash:/etc/postfix/canonical, netinfo:/canonical - canonical_maps = ---- 19,24 ---- - # -! #canonical_maps = dbm:!!PREFIX!!/etc/postfix/canonical -! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical -! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical, nis:canonical -! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical, netinfo:/canonical - canonical_maps = -*************** -*** 32,34 **** - # -! #recipient_canonical_maps = hash:/etc/postfix/recipient_canonical - recipient_canonical_maps = ---- 32,34 ---- - # -! #recipient_canonical_maps = hash:!!PREFIX!!/etc/postfix/recipient_canonical - recipient_canonical_maps = -*************** -*** 46,48 **** - # -! #sender_canonical_maps = hash:/etc/postfix/sender_canonical - sender_canonical_maps = ---- 46,48 ---- - # -! #sender_canonical_maps = hash:!!PREFIX!!/etc/postfix/sender_canonical - sender_canonical_maps = diff --git a/mail/postfix27/files/patch-ai b/mail/postfix27/files/patch-ai deleted file mode 100644 index f7aa2fd5f4c6..000000000000 --- a/mail/postfix27/files/patch-ai +++ /dev/null @@ -1,18 +0,0 @@ -*** ./conf/sample-filter.cf.orig Mon May 29 11:30:44 2000 ---- ./conf/sample-filter.cf Thu Jun 1 22:07:58 2000 -*************** -*** 15,17 **** - # -! header_checks = regexp:/etc/postfix/header_checks - ---- 15,17 ---- - # -! header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks - -*************** -*** 26,27 **** - # -! body_checks = regexp:/etc/postfix/body_checks ---- 26,27 ---- - # -! body_checks = regexp:!!PREFIX!!/etc/postfix/body_checks diff --git a/mail/postfix27/files/patch-aj b/mail/postfix27/files/patch-aj deleted file mode 100644 index 241d48132551..000000000000 --- a/mail/postfix27/files/patch-aj +++ /dev/null @@ -1,24 +0,0 @@ -*** ./conf/sample-misc.cf.orig Thu Sep 23 14:10:52 1999 ---- ./conf/sample-misc.cf Thu Jun 1 22:09:39 2000 -*************** -*** 220,222 **** - # -! program_directory = /usr/libexec/postfix - ---- 220,222 ---- - # -! program_directory = !!PREFIX!!/libexec/postfix - -*************** -*** 263,267 **** - # Specify the types and names of databases to use. After change, -! # run "postmap /etc/postfix/relocated", then "postfix reload". - # -! #relocated_maps = hash:/etc/postfix/relocated - relocated_maps = ---- 263,267 ---- - # Specify the types and names of databases to use. After change, -! # run "postmap !!PREFIX!!/etc/postfix/relocated", then "postfix reload". - # -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated - relocated_maps = diff --git a/mail/postfix27/files/patch-ak b/mail/postfix27/files/patch-ak deleted file mode 100644 index 250dd411a4bd..000000000000 --- a/mail/postfix27/files/patch-ak +++ /dev/null @@ -1,26 +0,0 @@ -*** ./conf/sample-relocated.cf.orig Thu Sep 23 14:11:17 1999 ---- ./conf/sample-relocated.cf Thu Jun 1 22:10:43 2000 -*************** -*** 12,14 **** - # -! # If you use this feature, run "postmap /etc/postfix/relocated" to - # build the necessary DBM or DB file after change, then "postfix ---- 12,14 ---- - # -! # If you use this feature, run "postmap !!PREFIX!!/etc/postfix/relocated" to - # build the necessary DBM or DB file after change, then "postfix -*************** -*** 16,21 **** - # -! #relocated_maps = dbm:/etc/postfix/relocated -! #relocated_maps = hash:/etc/postfix/relocated -! #relocated_maps = hash:/etc/postfix/relocated, nis:virtual -! #relocated_maps = hash:/etc/postfix/relocated, netinfo:/relocated - relocated_maps = ---- 16,21 ---- - # -! #relocated_maps = dbm:!!PREFIX!!/etc/postfix/relocated -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated, nis:virtual -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated, netinfo:/relocated - relocated_maps = diff --git a/mail/postfix27/files/patch-al b/mail/postfix27/files/patch-al deleted file mode 100644 index 799206da0c96..000000000000 --- a/mail/postfix27/files/patch-al +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/sample-smtpd.cf.orig Mon Dec 27 19:41:37 1999 ---- ./conf/sample-smtpd.cf Thu Jun 1 22:11:22 2000 -*************** -*** 183,185 **** - #smtpd_sender_restrictions = reject_unknown_sender_domain -! #smtpd_sender_restrictions = reject_unknown_sender_domain, hash:/etc/postfix/access - smtpd_sender_restrictions = ---- 183,185 ---- - #smtpd_sender_restrictions = reject_unknown_sender_domain -! #smtpd_sender_restrictions = reject_unknown_sender_domain, hash:!!PREFIX!!/etc/postfix/access - smtpd_sender_restrictions = diff --git a/mail/postfix27/files/patch-am b/mail/postfix27/files/patch-am deleted file mode 100644 index 2d395fa9ca03..000000000000 --- a/mail/postfix27/files/patch-am +++ /dev/null @@ -1,23 +0,0 @@ -*** ./conf/sample-transport.cf.orig Thu Dec 23 10:50:00 1999 ---- ./conf/sample-transport.cf Thu Jun 1 22:13:09 2000 -*************** -*** 10,18 **** - # By default, this feature is disabled. Specify the types of databases -! # to use. If you use this feature, run "postmap /etc/postfix/transport" - # after change, then "postfix reload". - # -! #transport_maps = dbm:/etc/postfix/transport -! #transport_maps = hash:/etc/postfix/transport -! #transport_maps = hash:/etc/postfix/transport, nis:transport -! #transport_maps = hash:/etc/postfix/transport, netinfo:/transport - transport_maps = ---- 10,18 ---- - # By default, this feature is disabled. Specify the types of databases -! # to use. If you use this feature, run "postmap !!PREFIX!!/etc/postfix/transport" - # after change, then "postfix reload". - # -! #transport_maps = dbm:!!PREFIX!!/etc/postfix/transport -! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport -! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport, nis:transport -! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport, netinfo:/transport - transport_maps = diff --git a/mail/postfix27/files/patch-an b/mail/postfix27/files/patch-an deleted file mode 100644 index af5ac7cc031b..000000000000 --- a/mail/postfix27/files/patch-an +++ /dev/null @@ -1,26 +0,0 @@ -*** ./conf/sample-virtual.cf.orig Mon Dec 20 21:00:42 1999 ---- ./conf/sample-virtual.cf Thu Jun 1 22:13:32 2000 -*************** -*** 12,14 **** - # -! # If you use this feature, run "postmap /etc/postfix/virtual" to - # build the necessary DBM or DB file after change. ---- 12,14 ---- - # -! # If you use this feature, run "postmap !!PREFIX!!/etc/postfix/virtual" to - # build the necessary DBM or DB file after change. -*************** -*** 18,23 **** - # -! #virtual_maps = dbm:/etc/postfix/virtual -! #virtual_maps = hash:/etc/postfix/virtual -! #virtual_maps = hash:/etc/postfix/virtual, nis:virtual -! #virtual_maps = hash:/etc/postfix/virtual, netinfo:/virtual - virtual_maps = ---- 18,23 ---- - # -! #virtual_maps = dbm:!!PREFIX!!/etc/postfix/virtual -! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual -! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual, nis:virtual -! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual, netinfo:/virtual - virtual_maps = diff --git a/mail/postfix27/files/patch-ao b/mail/postfix27/files/patch-ao deleted file mode 100644 index fd854e181601..000000000000 --- a/mail/postfix27/files/patch-ao +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/transport.orig Tue Mar 7 10:42:58 2000 ---- ./conf/transport Thu Jun 1 22:13:41 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/transport - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/transport - # diff --git a/mail/postfix27/files/patch-ap b/mail/postfix27/files/patch-ap deleted file mode 100644 index 4598192cd5c1..000000000000 --- a/mail/postfix27/files/patch-ap +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/virtual.orig Tue Mar 7 10:42:59 2000 ---- ./conf/virtual Thu Jun 1 22:13:54 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/virtual - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/virtual - # diff --git a/mail/postfix27/files/patch-ba b/mail/postfix27/files/patch-ba deleted file mode 100644 index ccb54ec60a7a..000000000000 --- a/mail/postfix27/files/patch-ba +++ /dev/null @@ -1,20 +0,0 @@ -*** ./html/mailq.1.html.orig Sat Apr 22 20:28:36 2000 ---- ./html/mailq.1.html Thu Jun 1 22:19:24 2000 -*************** -*** 83,85 **** - The path name of the <b>sendmail.cf</b> file. Postfix con- -! figuration files are kept in <b>/etc/postfix</b>. - ---- 83,85 ---- - The path name of the <b>sendmail.cf</b> file. Postfix con- -! figuration files are kept in <b>!!PREFIX!!/etc/postfix</b>. - -*************** -*** 231,233 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - ---- 231,233 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - diff --git a/mail/postfix27/files/patch-bb b/mail/postfix27/files/patch-bb deleted file mode 100644 index ea744664dfa7..000000000000 --- a/mail/postfix27/files/patch-bb +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/access.5.html.orig Tue Nov 21 21:24:13 2000 -+++ ./html/access.5.html Tue Nov 21 21:24:34 2000 -@@ -9,7 +9,7 @@ - access - format of Postfix access table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/access</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b> - - <b>DESCRIPTION</b> - The optional <b>access</b> table directs the Postfix SMTP server -@@ -21,7 +21,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/access</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b> in order to rebuild the - indexed file after changing the access table. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix27/files/patch-bc b/mail/postfix27/files/patch-bc deleted file mode 100644 index e407a9650585..000000000000 --- a/mail/postfix27/files/patch-bc +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/canonical.5.html.orig Tue Nov 21 21:32:38 2000 -+++ ./html/canonical.5.html Tue Nov 21 21:33:21 2000 -@@ -9,7 +9,7 @@ - canonical - format of Postfix canonical table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/canonical</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b> - - <b>DESCRIPTION</b> - The optional <b>canonical</b> table specifies an address mapping -@@ -20,7 +20,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/canonical</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b> in order to rebuild the - indexed file after changing the text file. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix27/files/patch-be b/mail/postfix27/files/patch-be deleted file mode 100644 index bef6a3bfaf73..000000000000 --- a/mail/postfix27/files/patch-be +++ /dev/null @@ -1,10 +0,0 @@ ---- ./html/faq.html.orig Sat Oct 28 23:34:51 2000 -+++ ./html/faq.html Sat Oct 28 23:36:04 2000 -@@ -2572,7 +2572,7 @@ - - Answer: instead of using <b>/usr/include/ndbm.h</b>, you're building - Postfix with some incompatible third-party file, typically --<b>/usr/local/include/ndbm.h</b>. -+<b>!!PREFIX!!/include/ndbm.h</b>. - - <p> diff --git a/mail/postfix27/files/patch-bf b/mail/postfix27/files/patch-bf deleted file mode 100644 index d652e1e567b3..000000000000 --- a/mail/postfix27/files/patch-bf +++ /dev/null @@ -1,13 +0,0 @@ -*** ./html/cleanup.8.html.orig Sun May 28 21:58:41 2000 ---- ./html/cleanup.8.html Thu Jun 1 22:29:04 2000 -*************** -*** 174,177 **** - <b>FILES</b> -! /etc/postfix/canonical*, canonical mapping table -! /etc/postfix/virtual*, virtual mapping table - ---- 174,177 ---- - <b>FILES</b> -! !!PREFIX!!/etc/postfix/canonical*, canonical mapping table -! !!PREFIX!!/etc/postfix/virtual*, virtual mapping table - diff --git a/mail/postfix27/files/patch-bg b/mail/postfix27/files/patch-bg deleted file mode 100644 index ce2454eaef01..000000000000 --- a/mail/postfix27/files/patch-bg +++ /dev/null @@ -1,13 +0,0 @@ -*** ./html/master.8.html.orig Tue Mar 7 10:48:56 2000 ---- ./html/master.8.html Thu Jun 1 22:29:24 2000 -*************** -*** 148,151 **** - <b>FILES</b> -! /etc/postfix/main.cf: global configuration file. -! /etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. ---- 148,151 ---- - <b>FILES</b> -! !!PREFIX!!/etc/postfix/main.cf: global configuration file. -! !!PREFIX!!/etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. diff --git a/mail/postfix27/files/patch-bh b/mail/postfix27/files/patch-bh deleted file mode 100644 index a20232e6796a..000000000000 --- a/mail/postfix27/files/patch-bh +++ /dev/null @@ -1,11 +0,0 @@ -*** ./html/goals.html.orig Sun May 9 15:44:18 1999 ---- ./html/goals.html Thu Jun 1 22:30:14 2000 -*************** -*** 45,47 **** - <li>Compatibility. Postfix is designed to be sendmail-compatible -! to make migration easy. Postfix supports <b>/var[/spool]/mail</b>, - <b>/etc/aliases</b>, <b>NIS</b>, and <b>~/.forward</b> files. ---- 45,47 ---- - <li>Compatibility. Postfix is designed to be sendmail-compatible -! to make migration easy. Postfix supports <b>/var/mail</b>, - <b>/etc/aliases</b>, <b>NIS</b>, and <b>~/.forward</b> files. diff --git a/mail/postfix27/files/patch-bi b/mail/postfix27/files/patch-bi deleted file mode 100644 index 7e4acdb0c126..000000000000 --- a/mail/postfix27/files/patch-bi +++ /dev/null @@ -1,11 +0,0 @@ -*** ./html/postdrop.1.html.orig Mon May 3 15:05:12 1999 ---- ./html/postdrop.1.html Thu Jun 1 22:30:47 2000 -*************** -*** 48,50 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - ---- 48,50 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - diff --git a/mail/postfix27/files/patch-bj b/mail/postfix27/files/patch-bj deleted file mode 100644 index 00e78d01ba5a..000000000000 --- a/mail/postfix27/files/patch-bj +++ /dev/null @@ -1,42 +0,0 @@ -*** ./html/uce.html.orig Fri Dec 31 15:06:07 1999 ---- ./html/uce.html Thu Jun 1 22:31:37 2000 -*************** -*** 126,130 **** - -! <dd> <b>header_checks = regexp:/etc/postfix/header_checks</b> - -! <dd> <b>header_checks = pcre:/etc/postfix/header_checks</b> - ---- 126,130 ---- - -! <dd> <b>header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks</b> - -! <dd> <b>header_checks = pcre:!!PREFIX!!/etc/postfix/header_checks</b> - -*************** -*** 169,171 **** - -! <dd> <b>smtpd_client_restrictions = hash:/etc/postfix/access, - reject_maps_rbl</b> ---- 169,171 ---- - -! <dd> <b>smtpd_client_restrictions = hash:!!PREFIX!!/etc/postfix/access, - reject_maps_rbl</b> -*************** -*** 474,476 **** - -! <dd> <b>smtpd_sender_restrictions = hash:/etc/postfix/access, - reject_unknown_sender_domain</b> ---- 474,476 ---- - -! <dd> <b>smtpd_sender_restrictions = hash:!!PREFIX!!/etc/postfix/access, - reject_unknown_sender_domain</b> -*************** -*** 856,858 **** - <dd> <b>smtpd_etrn_restrictions = permit_mynetworks, -! hash:/etc/postfix/etrn_access, reject</b> - ---- 856,858 ---- - <dd> <b>smtpd_etrn_restrictions = permit_mynetworks, -! hash:!!PREFIX!!/etc/postfix/etrn_access, reject</b> - diff --git a/mail/postfix27/files/patch-bk b/mail/postfix27/files/patch-bk deleted file mode 100644 index 62a0573559ae..000000000000 --- a/mail/postfix27/files/patch-bk +++ /dev/null @@ -1,29 +0,0 @@ -*** ./html/rate.html.orig Wed Mar 17 17:55:22 1999 ---- ./html/rate.html Thu Jun 1 22:32:19 2000 -*************** -*** 224,226 **** - -! <dt>/etc/postfix/main.cf: - ---- 224,226 ---- - -! <dt>!!PREFIX!!/etc/postfix/main.cf: - -*************** -*** 237,239 **** - -! <dt>/etc/postfix/<a href="transport.5.html">transport</a>: - ---- 237,239 ---- - -! <dt>!!PREFIX!!/etc/postfix/<a href="transport.5.html">transport</a>: - -*************** -*** 253,255 **** - -! <dt>/etc/postfix/master.cf: - ---- 253,255 ---- - -! <dt>!!PREFIX!!/etc/postfix/master.cf: - diff --git a/mail/postfix27/files/patch-bl b/mail/postfix27/files/patch-bl deleted file mode 100644 index 176c7d1b64de..000000000000 --- a/mail/postfix27/files/patch-bl +++ /dev/null @@ -1,11 +0,0 @@ -*** ./html/regexp_table.5.html.orig Sat Apr 22 20:28:38 2000 ---- ./html/regexp_table.5.html Thu Jun 1 22:32:44 2000 -*************** -*** 11,13 **** - <b>SYNOPSIS</b> -! regexp:/etc/postfix/filename - ---- 11,13 ---- - <b>SYNOPSIS</b> -! regexp:!!PREFIX!!/etc/postfix/filename - diff --git a/mail/postfix27/files/patch-bm b/mail/postfix27/files/patch-bm deleted file mode 100644 index e5ccc2c50b94..000000000000 --- a/mail/postfix27/files/patch-bm +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/relocated.5.html.orig Tue Nov 21 21:37:54 2000 -+++ ./html/relocated.5.html Tue Nov 21 21:38:08 2000 -@@ -9,7 +9,7 @@ - relocated - format of Postfix relocated table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/relocated</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b> - - <b>DESCRIPTION</b> - The optional <b>relocated</b> table provides the information that -@@ -20,7 +20,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/relocated</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b> in order to rebuild the - indexed file after changing the relocated table. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix27/files/patch-bn b/mail/postfix27/files/patch-bn deleted file mode 100644 index 21e69dcaa40c..000000000000 --- a/mail/postfix27/files/patch-bn +++ /dev/null @@ -1,56 +0,0 @@ -*** ./html/rewrite.html.orig Sat May 8 17:51:41 1999 ---- ./html/rewrite.html Thu Jun 1 22:34:21 2000 -*************** -*** 194,196 **** - -! <dd><b>canonical_maps = hash:/etc/postfix/canonical</b> - ---- 194,196 ---- - -! <dd><b>canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical</b> - -*************** -*** 207,209 **** - -! <dd><b>sender_canonical_maps = hash:/etc/postfix/sender_canonical</b> - ---- 207,209 ---- - -! <dd><b>sender_canonical_maps = hash:!!PREFIX!!/etc/postfix/sender_canonical</b> - -*************** -*** 211,213 **** - -! <dd><b>recipient_canonical_maps = hash:/etc/postfix/recipient_canonical</b> - ---- 211,213 ---- - -! <dd><b>recipient_canonical_maps = hash:!!PREFIX!!/etc/postfix/recipient_canonical</b> - -*************** -*** 295,297 **** - -! <dd><b>virtual_maps = hash:/etc/postfix/virtual</b> - ---- 295,297 ---- - -! <dd><b>virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual</b> - -*************** -*** 323,325 **** - -! <dd><b>relocated_maps = hash:/etc/postfix/relocated</b> - ---- 323,325 ---- - -! <dd><b>relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated</b> - -*************** -*** 348,350 **** - -! <dd><b>transport_maps = hash:/etc/postfix/transport</b> - ---- 348,350 ---- - -! <dd><b>transport_maps = hash:!!PREFIX!!/etc/postfix/transport</b> - diff --git a/mail/postfix27/files/patch-bo b/mail/postfix27/files/patch-bo deleted file mode 100644 index b45270be8151..000000000000 --- a/mail/postfix27/files/patch-bo +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/transport.5.html.orig Tue Nov 21 21:43:00 2000 -+++ ./html/transport.5.html Tue Nov 21 21:43:20 2000 -@@ -9,7 +9,7 @@ - transport - format of Postfix transport table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/transport</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b> - - <b>DESCRIPTION</b> - The optional <b>transport</b> table specifies a mapping from -@@ -21,7 +21,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/transport</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b> in order to rebuild the - indexed file after changing the transport table. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix27/files/patch-bp b/mail/postfix27/files/patch-bp deleted file mode 100644 index 5206bfd4bfd0..000000000000 --- a/mail/postfix27/files/patch-bp +++ /dev/null @@ -1,43 +0,0 @@ ---- ./html/virtual.5.html.orig Tue Nov 21 21:46:50 2000 -+++ ./html/virtual.5.html Tue Nov 21 21:47:17 2000 -@@ -9,7 +9,7 @@ - virtual - format of Postfix virtual table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/virtual</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b> - - <b>DESCRIPTION</b> - The optional <b>virtual</b> table specifies address redirections -@@ -27,7 +27,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/virtual</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b> in order to rebuild the - indexed file after changing the text file. - - When the table is provided via other means such as NIS, -@@ -52,7 +52,7 @@ - - Support for a Postfix-style virtual domain looks like: - -- /etc/postfix/virtual: -+ !!PREFIX!!/etc/postfix/virtual: - <i>virtual.domain</i> <i>anything</i> (right-hand content does not matter) - <i>postmaster@virtual.domain</i> <i>postmaster</i> - <i>user1@virtual.domain</i> <i>address1</i> -@@ -94,11 +94,11 @@ - - Support for a Sendmail-style virtual domain looks like: - -- /etc/postfix/main.cf: -+ !!PREFIX!!/etc/postfix/main.cf: - mydestination = $myhostname localhost.$mydomain $mydomain - <i>virtual.domain</i> - -- /etc/postfix/virtual: -+ !!PREFIX!!/etc/postfix/virtual: - <i>user1@virtual.domain</i> <i>address1</i> - <i>user2@virtual.domain</i> <i>address2,</i> <i>address3</i> - diff --git a/mail/postfix27/files/patch-ca b/mail/postfix27/files/patch-ca deleted file mode 100644 index 86d56f80be30..000000000000 --- a/mail/postfix27/files/patch-ca +++ /dev/null @@ -1,11 +0,0 @@ -*** ./man/man1/postdrop.1.orig Mon May 3 15:03:29 1999 ---- ./man/man1/postdrop.1 Thu Jun 1 22:38:54 2000 -*************** -*** 53,55 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS ---- 53,55 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS diff --git a/mail/postfix27/files/patch-cb b/mail/postfix27/files/patch-cb deleted file mode 100644 index 58559c7273d1..000000000000 --- a/mail/postfix27/files/patch-cb +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man1/sendmail.1.orig Thu Mar 30 14:05:28 2000 ---- ./man/man1/sendmail.1 Thu Jun 1 22:39:16 2000 -*************** -*** 63,65 **** - The path name of the \fBsendmail.cf\fR file. Postfix configuration -! files are kept in \fB/etc/postfix\fR. - .IP "\fB-F \fIfull_name\fR ---- 63,65 ---- - The path name of the \fBsendmail.cf\fR file. Postfix configuration -! files are kept in \fB!!PREFIX!!/etc/postfix\fR. - .IP "\fB-F \fIfull_name\fR -*************** -*** 173,175 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS ---- 173,175 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS diff --git a/mail/postfix27/files/patch-cc b/mail/postfix27/files/patch-cc deleted file mode 100644 index cd6946003217..000000000000 --- a/mail/postfix27/files/patch-cc +++ /dev/null @@ -1,11 +0,0 @@ -*** ./man/man5/pcre_table.5.orig Thu Mar 30 14:05:28 2000 ---- ./man/man5/pcre_table.5 Thu Jun 1 22:39:34 2000 -*************** -*** 10,12 **** - .nf -! pcre:/etc/postfix/filename - .SH DESCRIPTION ---- 10,12 ---- - .nf -! pcre:!!PREFIX!!/etc/postfix/filename - .SH DESCRIPTION diff --git a/mail/postfix27/files/patch-cd b/mail/postfix27/files/patch-cd deleted file mode 100644 index b51de44d0bee..000000000000 --- a/mail/postfix27/files/patch-cd +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/access.5.orig Sat Apr 22 20:28:30 2000 ---- ./man/man5/access.5 Thu Jun 1 22:39:55 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/access\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/access\fR - .SH DESCRIPTION -*************** -*** 21,23 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed - file after changing the access table. ---- 21,23 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed - file after changing the access table. diff --git a/mail/postfix27/files/patch-ce b/mail/postfix27/files/patch-ce deleted file mode 100644 index f77053f8b3aa..000000000000 --- a/mail/postfix27/files/patch-ce +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/canonical.5.orig Sat Apr 22 20:28:30 2000 ---- ./man/man5/canonical.5 Thu Jun 1 22:40:18 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/canonical\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR - .SH DESCRIPTION -*************** -*** 21,23 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed - file after changing the canonical table. ---- 21,23 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed - file after changing the canonical table. diff --git a/mail/postfix27/files/patch-cf b/mail/postfix27/files/patch-cf deleted file mode 100644 index 28fb053b94a7..000000000000 --- a/mail/postfix27/files/patch-cf +++ /dev/null @@ -1,11 +0,0 @@ -*** ./man/man5/regexp_table.5.orig Thu Mar 30 14:05:28 2000 ---- ./man/man5/regexp_table.5 Thu Jun 1 22:40:43 2000 -*************** -*** 10,12 **** - .nf -! regexp:/etc/postfix/filename - .SH DESCRIPTION ---- 10,12 ---- - .nf -! regexp:!!PREFIX!!/etc/postfix/filename - .SH DESCRIPTION diff --git a/mail/postfix27/files/patch-cg b/mail/postfix27/files/patch-cg deleted file mode 100644 index 0ae82cc57669..000000000000 --- a/mail/postfix27/files/patch-cg +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/relocated.5.orig Sat Apr 22 20:28:31 2000 ---- ./man/man5/relocated.5 Thu Jun 1 22:41:05 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/relocated\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR - .SH DESCRIPTION -*************** -*** 20,22 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed - file after changing the relocated table. ---- 20,22 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed - file after changing the relocated table. diff --git a/mail/postfix27/files/patch-ch b/mail/postfix27/files/patch-ch deleted file mode 100644 index 3ed047ea474c..000000000000 --- a/mail/postfix27/files/patch-ch +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/transport.5.orig Sat Apr 22 20:28:31 2000 ---- ./man/man5/transport.5 Thu Jun 1 22:41:26 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/transport\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR - .SH DESCRIPTION -*************** -*** 21,23 **** - for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed - file after changing the transport table. ---- 21,23 ---- - for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed - file after changing the transport table. diff --git a/mail/postfix27/files/patch-ci b/mail/postfix27/files/patch-ci deleted file mode 100644 index 1a7cf4abbac7..000000000000 --- a/mail/postfix27/files/patch-ci +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/virtual.5.orig Sat Apr 22 20:28:31 2000 ---- ./man/man5/virtual.5 Thu Jun 1 22:41:51 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/virtual\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR - .SH DESCRIPTION -*************** -*** 26,28 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed - file after changing the virtual table. ---- 26,28 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed - file after changing the virtual table. diff --git a/mail/postfix27/files/patch-cj b/mail/postfix27/files/patch-cj deleted file mode 100644 index 50448f2ec26d..000000000000 --- a/mail/postfix27/files/patch-cj +++ /dev/null @@ -1,13 +0,0 @@ -*** ./man/man8/cleanup.8.orig Sun May 28 21:58:32 2000 ---- ./man/man8/cleanup.8 Thu Jun 1 22:42:21 2000 -*************** -*** 136,139 **** - .nf -! /etc/postfix/canonical*, canonical mapping table -! /etc/postfix/virtual*, virtual mapping table - .SH LICENSE ---- 136,139 ---- - .nf -! !!PREFIX!!/etc/postfix/canonical*, canonical mapping table -! !!PREFIX!!/etc/postfix/virtual*, virtual mapping table - .SH LICENSE diff --git a/mail/postfix27/files/patch-cl b/mail/postfix27/files/patch-cl deleted file mode 100644 index 44c8a3a7aae0..000000000000 --- a/mail/postfix27/files/patch-cl +++ /dev/null @@ -1,13 +0,0 @@ -*** ./man/man8/master.8.orig Tue Mar 7 10:48:19 2000 ---- ./man/man8/master.8 Thu Jun 1 22:43:02 2000 -*************** -*** 120,123 **** - .nf -! /etc/postfix/main.cf: global configuration file. -! /etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. ---- 120,123 ---- - .nf -! !!PREFIX!!/etc/postfix/main.cf: global configuration file. -! !!PREFIX!!/etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. diff --git a/mail/postfix27/files/patch-da b/mail/postfix27/files/patch-da deleted file mode 100644 index e57e31750d18..000000000000 --- a/mail/postfix27/files/patch-da +++ /dev/null @@ -1,11 +0,0 @@ -*** ./proto/regexp_table.orig Wed Mar 8 19:18:20 2000 ---- ./proto/regexp_table Thu Jun 1 22:44:43 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # regexp:/etc/postfix/filename - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # regexp:!!PREFIX!!/etc/postfix/filename - # DESCRIPTION diff --git a/mail/postfix27/files/patch-db b/mail/postfix27/files/patch-db deleted file mode 100644 index 7f89fb770783..000000000000 --- a/mail/postfix27/files/patch-db +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/access.orig Sun Apr 9 16:44:45 2000 ---- ./proto/access Thu Jun 1 22:45:05 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/access\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR - # DESCRIPTION -*************** -*** 15,17 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed - # file after changing the access table. ---- 15,17 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed - # file after changing the access table. diff --git a/mail/postfix27/files/patch-dc b/mail/postfix27/files/patch-dc deleted file mode 100644 index 786f2da45c32..000000000000 --- a/mail/postfix27/files/patch-dc +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/canonical.orig Sun Apr 9 16:43:37 2000 ---- ./proto/canonical Thu Jun 1 22:45:28 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/canonical\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR - # DESCRIPTION -*************** -*** 15,17 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed - # file after changing the canonical table. ---- 15,17 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed - # file after changing the canonical table. diff --git a/mail/postfix27/files/patch-dd b/mail/postfix27/files/patch-dd deleted file mode 100644 index b65a57ff7d57..000000000000 --- a/mail/postfix27/files/patch-dd +++ /dev/null @@ -1,11 +0,0 @@ -*** ./proto/pcre_table.orig Wed Mar 8 19:18:11 2000 ---- ./proto/pcre_table Thu Jun 1 22:45:41 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # pcre:/etc/postfix/filename - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # pcre:!!PREFIX!!/etc/postfix/filename - # DESCRIPTION diff --git a/mail/postfix27/files/patch-de b/mail/postfix27/files/patch-de deleted file mode 100644 index 73bb2af2261d..000000000000 --- a/mail/postfix27/files/patch-de +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/relocated.orig Sun Apr 9 16:47:31 2000 ---- ./proto/relocated Thu Jun 1 22:46:02 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/relocated\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR - # DESCRIPTION -*************** -*** 14,16 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed - # file after changing the relocated table. ---- 14,16 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed - # file after changing the relocated table. diff --git a/mail/postfix27/files/patch-df b/mail/postfix27/files/patch-df deleted file mode 100644 index 8d3fba96a224..000000000000 --- a/mail/postfix27/files/patch-df +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/transport.orig Sun Apr 9 17:05:45 2000 ---- ./proto/transport Thu Jun 1 22:46:23 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/transport\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR - # DESCRIPTION -*************** -*** 15,17 **** - # for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed - # file after changing the transport table. ---- 15,17 ---- - # for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed - # file after changing the transport table. diff --git a/mail/postfix27/files/patch-dg b/mail/postfix27/files/patch-dg deleted file mode 100644 index bff20a2cff3e..000000000000 --- a/mail/postfix27/files/patch-dg +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/virtual.orig Sun Apr 9 17:14:14 2000 ---- ./proto/virtual Thu Jun 1 22:46:40 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/virtual\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR - # DESCRIPTION -*************** -*** 20,22 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed - # file after changing the virtual table. ---- 20,22 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed - # file after changing the virtual table. diff --git a/mail/postfix27/files/patch-ea b/mail/postfix27/files/patch-ea deleted file mode 100644 index 6c3f98d2af4f..000000000000 --- a/mail/postfix27/files/patch-ea +++ /dev/null @@ -1,13 +0,0 @@ -*** ./src/cleanup/cleanup.c.orig Sun May 28 18:33:41 2000 ---- ./src/cleanup/cleanup.c Thu Jun 1 21:52:22 2000 -*************** -*** 118,121 **** - /* FILES -! /* /etc/postfix/canonical*, canonical mapping table -! /* /etc/postfix/virtual*, virtual mapping table - /* LICENSE ---- 118,121 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix/canonical*, canonical mapping table -! /* !!PREFIX!!/etc/postfix/virtual*, virtual mapping table - /* LICENSE diff --git a/mail/postfix27/files/patch-eb b/mail/postfix27/files/patch-eb deleted file mode 100644 index e67680963d2d..000000000000 --- a/mail/postfix27/files/patch-eb +++ /dev/null @@ -1,11 +0,0 @@ -*** ./src/global/mail_conf.c.orig Sun May 7 18:51:16 2000 ---- ./src/global/mail_conf.c Thu Jun 1 22:16:29 2000 -*************** -*** 53,55 **** - /* FILES -! /* /etc/postfix: default Postfix configuration directory. - /* ENVIRONMENT ---- 53,55 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix: default Postfix configuration directory. - /* ENVIRONMENT diff --git a/mail/postfix27/files/patch-ee b/mail/postfix27/files/patch-ee deleted file mode 100644 index ef44eac24b73..000000000000 --- a/mail/postfix27/files/patch-ee +++ /dev/null @@ -1,13 +0,0 @@ -*** ./src/master/master.c.orig Tue Mar 7 10:25:07 2000 ---- ./src/master/master.c Thu Jun 1 22:43:50 2000 -*************** -*** 104,107 **** - /* FILES -! /* /etc/postfix/main.cf: global configuration file. -! /* /etc/postfix/master.cf: master process configuration file. - /* /var/spool/postfix/pid/master.pid: master lock file. ---- 104,107 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix/main.cf: global configuration file. -! /* !!PREFIX!!/etc/postfix/master.cf: master process configuration file. - /* /var/spool/postfix/pid/master.pid: master lock file. diff --git a/mail/postfix27/files/patch-ef b/mail/postfix27/files/patch-ef deleted file mode 100644 index 586b304a103d..000000000000 --- a/mail/postfix27/files/patch-ef +++ /dev/null @@ -1,11 +0,0 @@ -*** ./src/postdrop/postdrop.c.orig Sun Apr 25 18:05:43 1999 ---- ./src/postdrop/postdrop.c Thu Jun 1 22:44:22 2000 -*************** -*** 39,41 **** - /* /var/spool/postfix, mail queue -! /* /etc/postfix, configuration files - /* CONFIGURATION PARAMETERS ---- 39,41 ---- - /* /var/spool/postfix, mail queue -! /* !!PREFIX!!/etc/postfix, configuration files - /* CONFIGURATION PARAMETERS diff --git a/mail/postfix27/files/patch-eg b/mail/postfix27/files/patch-eg deleted file mode 100644 index 2983bbfd86ea..000000000000 --- a/mail/postfix27/files/patch-eg +++ /dev/null @@ -1,20 +0,0 @@ -*** ./src/sendmail/sendmail.c.orig Tue Mar 14 10:42:06 2000 ---- ./src/sendmail/sendmail.c Thu Jun 1 22:47:24 2000 -*************** -*** 57,59 **** - /* The path name of the \fBsendmail.cf\fR file. Postfix configuration -! /* files are kept in \fB/etc/postfix\fR. - /* .IP "\fB-F \fIfull_name\fR ---- 57,59 ---- - /* The path name of the \fBsendmail.cf\fR file. Postfix configuration -! /* files are kept in \fB!!PREFIX!!/etc/postfix\fR. - /* .IP "\fB-F \fIfull_name\fR -*************** -*** 159,161 **** - /* /var/spool/postfix, mail queue -! /* /etc/postfix, configuration files - /* CONFIGURATION PARAMETERS ---- 159,161 ---- - /* /var/spool/postfix, mail queue -! /* !!PREFIX!!/etc/postfix, configuration files - /* CONFIGURATION PARAMETERS diff --git a/mail/postfix27/files/patch-eh b/mail/postfix27/files/patch-eh deleted file mode 100644 index c104c3680d21..000000000000 --- a/mail/postfix27/files/patch-eh +++ /dev/null @@ -1,11 +0,0 @@ -*** ./src/trivial-rewrite/transport.c.orig Tue Nov 16 19:15:41 1999 ---- ./src/trivial-rewrite/transport.c Thu Jun 1 22:47:49 2000 -*************** -*** 32,34 **** - /* FILES -! /* /etc/postfix/transport* - /* CONFIGURATION PARAMETERS ---- 32,34 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix/transport* - /* CONFIGURATION PARAMETERS diff --git a/mail/postfix27/pkg-message b/mail/postfix27/pkg-message index a7ae2b17e2a6..7fb3a804599c 100644 --- a/mail/postfix27/pkg-message +++ b/mail/postfix27/pkg-message @@ -8,10 +8,21 @@ sendmail_outbound_enable="NO" sendmail_submit_enable="NO" sendmail_msp_queue_enable="NO" -This will disable Sendmail completely. + **OR** +sendmail_enable="NONE" -Also, you may wish to disable some Sendmail-specific daily maintenance +then type this command as root: + +ln -s /usr/local/sbin/postfix /usr/local/etc/rc.d/postfix.sh + +Either of these will disable Sendmail completely. The latter form is useful +if you need to wait until other local package initialization (such as ldconfig +for Postgres or MySQL) is done. The former method will start postfix very +early on in the boot process. + + +Also, you will want to disable some Sendmail-specific daily maintenance routines in your /etc/periodic.conf file: daily_status_mail_rejects_enable="NO" diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile index 6b47f15e39d2..6adf63b1ee81 100644 --- a/mail/postfix28/Makefile +++ b/mail/postfix28/Makefile @@ -12,7 +12,7 @@ # the options are the same names as in the scripts/configure.postfix file PORTNAME= postfix -PORTVERSION= 1.1.11 +PORTVERSION= 1.1.12 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -28,6 +28,7 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= khera@kciLink.com USE_SUBMAKE= yes +USE_REINPLACE= yes MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \ postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \ @@ -40,6 +41,10 @@ MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \ master.8 nqmgr.8 pickup.8 pipe.8 qmgr.8 qmqpd.8 showq.8 smtp.8 \ smtpd.8 spawn.8 trivial-rewrite.8 virtual.8 +# TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to +# patch it. +MAN8base=$(MAN8:S/tlsmgr.8//) + CONF1= main.cf master.cf access aliases canonical pcre_table regexp_table \ relocated transport virtual @@ -66,6 +71,27 @@ post-patch: CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ ${ECHO} "all: default" >> Makefile) +pre-patch: +.for file in ${MAN1} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/man/man1/${file} ${WRKSRC}/html/${file}.html +.endfor +.for file in ${MAN5} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/man/man5/${file} ${WRKSRC}/html/${file}.html +.endfor +.for file in ${MAN8base} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/man/man8/${file} ${WRKSRC}/html/${file}.html +.endfor +.for file in faq rate rewrite uce + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ + ${WRKSRC}/html/${file}.html +.endfor +.for file in ${CONF1} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" ${WRKSRC}/conf/${file} +.endfor + pre-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL diff --git a/mail/postfix28/distinfo b/mail/postfix28/distinfo index 379358ed4749..832388cccb96 100644 --- a/mail/postfix28/distinfo +++ b/mail/postfix28/distinfo @@ -1,4 +1,4 @@ -MD5 (postfix/postfix-1.1.11.tar.gz) = b34bb2b5018327c19456a77814141208 +MD5 (postfix/postfix-1.1.12.tar.gz) = d1d0f9792ec6ea063ccca59184e54212 MD5 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz) = 11d82e9a3482f64af9d228f7a4319566 -MD5 (postfix/postfix-1.1.11+ipv6.patch.gz) = dc2a6362518025583a17305607eb8f0e +MD5 (postfix/postfix-1.1.12+ipv6.patch.gz) = add4396ce50ca61b5d9b67454fb51258 MD5 (postfix/postfix-pg.postfix-1.1.8.patch) = e0f4d910a6d6648d9b48e2244f2764ba diff --git a/mail/postfix28/files/patch-aa b/mail/postfix28/files/patch-aa deleted file mode 100644 index 51b40396bd5e..000000000000 --- a/mail/postfix28/files/patch-aa +++ /dev/null @@ -1,86 +0,0 @@ -*** ./conf/main.cf.orig Fri Jan 4 13:09:04 2002 ---- ./conf/main.cf Tue Jan 8 22:41:50 2002 -*************** -*** 31,44 **** - # The command_directory parameter specifies the location of all - # postXXX commands. The default value is $program_directory. - # -! command_directory = /usr/sbin - - # The daemon_directory parameter specifies the location of all Postfix - # daemon programs (i.e. programs listed in the master.cf file). The - # default value is $program_directory. This directory must be owned - # by root. - # -! daemon_directory = /usr/libexec/postfix - - # QUEUE AND PROCESS OWNERSHIP - # ---- 31,44 ---- - # The command_directory parameter specifies the location of all - # postXXX commands. The default value is $program_directory. - # -! command_directory = !!PREFIX!!/sbin - - # The daemon_directory parameter specifies the location of all Postfix - # daemon programs (i.e. programs listed in the master.cf file). The - # default value is $program_directory. This directory must be owned - # by root. - # -! daemon_directory = !!PREFIX!!/libexec/postfix - - # QUEUE AND PROCESS OWNERSHIP - # -*************** -*** 325,332 **** - # - # The home_mailbox parameter specifies the optional pathname of a - # mailbox file relative to a user's home directory. The default -! # mailbox file is /var/spool/mail/user or /var/mail/user. Specify -! # "Maildir/" for qmail-style delivery (the / is required). - # - #home_mailbox = Mailbox - #home_mailbox = Maildir/ ---- 325,332 ---- - # - # The home_mailbox parameter specifies the optional pathname of a - # mailbox file relative to a user's home directory. The default -! # mailbox file is /var/mail/user. Specify "Maildir/" for -! # qmail-style delivery (the / is required). - # - #home_mailbox = Mailbox - #home_mailbox = Maildir/ -*************** -*** 424,430 **** - # - # See also the body_checks example in the sample-filter.cf file. - # -! #header_checks = regexp:/etc/postfix/header_checks - - # FAST ETRN SERVICE - # ---- 424,430 ---- - # - # See also the body_checks example in the sample-filter.cf file. - # -! #header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks - - # FAST ETRN SERVICE - # -*************** -*** 525,531 **** - # commands. This must be a group name with a numerical group ID that - # is not shared with other accounts, not even with the Postfix account. - # -! setgid_group = - - # manpage_path: The location of the Postfix on-line manual pages. - # ---- 525,531 ---- - # commands. This must be a group name with a numerical group ID that - # is not shared with other accounts, not even with the Postfix account. - # -! setgid_group = maildrop - - # manpage_path: The location of the Postfix on-line manual pages. - # diff --git a/mail/postfix28/files/patch-ab b/mail/postfix28/files/patch-ab deleted file mode 100644 index 7c81d3dc12c9..000000000000 --- a/mail/postfix28/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/canonical.orig Tue Mar 7 10:42:58 2000 ---- ./conf/canonical Thu Jun 1 21:53:23 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/canonical - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/canonical - # diff --git a/mail/postfix28/files/patch-ac b/mail/postfix28/files/patch-ac deleted file mode 100644 index 0fb2192cdd84..000000000000 --- a/mail/postfix28/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/access.orig Tue Mar 7 10:42:58 2000 ---- ./conf/access Thu Jun 1 21:53:36 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/access - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/access - # diff --git a/mail/postfix28/files/patch-ad b/mail/postfix28/files/patch-ad deleted file mode 100644 index c1b102574165..000000000000 --- a/mail/postfix28/files/patch-ad +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/pcre_table.orig Thu Mar 9 20:36:19 2000 ---- ./conf/pcre_table Thu Jun 1 22:02:08 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # pcre:/etc/postfix/filename - # ---- 7,9 ---- - # SYNOPSIS -! # pcre:!!PREFIX!!/etc/postfix/filename - # diff --git a/mail/postfix28/files/patch-ae b/mail/postfix28/files/patch-ae deleted file mode 100644 index e396dd8626db..000000000000 --- a/mail/postfix28/files/patch-ae +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/regexp_table.orig Thu Mar 9 20:36:19 2000 ---- ./conf/regexp_table Thu Jun 1 22:03:27 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # regexp:/etc/postfix/filename - # ---- 7,9 ---- - # SYNOPSIS -! # regexp:!!PREFIX!!/etc/postfix/filename - # diff --git a/mail/postfix28/files/patch-af b/mail/postfix28/files/patch-af deleted file mode 100644 index 8fca6b208941..000000000000 --- a/mail/postfix28/files/patch-af +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/relocated.orig Tue Mar 7 10:42:58 2000 ---- ./conf/relocated Thu Jun 1 22:03:59 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/relocated - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/relocated - # diff --git a/mail/postfix28/files/patch-ag b/mail/postfix28/files/patch-ag deleted file mode 100644 index 54c0fa918d3b..000000000000 --- a/mail/postfix28/files/patch-ag +++ /dev/null @@ -1,15 +0,0 @@ -*** ./conf/sample-auth.cf.orig Sun May 28 17:55:19 2000 ---- ./conf/sample-auth.cf Thu Jun 1 22:05:32 2000 -*************** -*** 91,95 **** - # The Postfix SMTP client opens the lookup table before going to -! # chroot jail, so you can leave the password file in /etc/postfix. - # -! smtp_sasl_password_maps = hash:/etc/postfix/saslpass - ---- 91,95 ---- - # The Postfix SMTP client opens the lookup table before going to -! # chroot jail, so you can leave the password file in !!PREFIX!!/etc/postfix. - # -! smtp_sasl_password_maps = hash:!!PREFIX!!/etc/postfix/saslpass - diff --git a/mail/postfix28/files/patch-ah b/mail/postfix28/files/patch-ah deleted file mode 100644 index a8c70a15a78d..000000000000 --- a/mail/postfix28/files/patch-ah +++ /dev/null @@ -1,44 +0,0 @@ -*** ./conf/sample-canonical.cf.orig Thu Sep 23 14:10:38 1999 ---- ./conf/sample-canonical.cf Thu Jun 1 22:07:23 2000 -*************** -*** 14,16 **** - # -! # If you use this feature, run "postmap /etc/postfix/canonical" to - # build the necessary DBM or DB file after every change. The changes ---- 14,16 ---- - # -! # If you use this feature, run "postmap !!PREFIX!!/etc/postfix/canonical" to - # build the necessary DBM or DB file after every change. The changes -*************** -*** 19,24 **** - # -! #canonical_maps = dbm:/etc/postfix/canonical -! #canonical_maps = hash:/etc/postfix/canonical -! #canonical_maps = hash:/etc/postfix/canonical, nis:canonical -! #canonical_maps = hash:/etc/postfix/canonical, netinfo:/canonical - canonical_maps = ---- 19,24 ---- - # -! #canonical_maps = dbm:!!PREFIX!!/etc/postfix/canonical -! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical -! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical, nis:canonical -! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical, netinfo:/canonical - canonical_maps = -*************** -*** 32,34 **** - # -! #recipient_canonical_maps = hash:/etc/postfix/recipient_canonical - recipient_canonical_maps = ---- 32,34 ---- - # -! #recipient_canonical_maps = hash:!!PREFIX!!/etc/postfix/recipient_canonical - recipient_canonical_maps = -*************** -*** 46,48 **** - # -! #sender_canonical_maps = hash:/etc/postfix/sender_canonical - sender_canonical_maps = ---- 46,48 ---- - # -! #sender_canonical_maps = hash:!!PREFIX!!/etc/postfix/sender_canonical - sender_canonical_maps = diff --git a/mail/postfix28/files/patch-ai b/mail/postfix28/files/patch-ai deleted file mode 100644 index f7aa2fd5f4c6..000000000000 --- a/mail/postfix28/files/patch-ai +++ /dev/null @@ -1,18 +0,0 @@ -*** ./conf/sample-filter.cf.orig Mon May 29 11:30:44 2000 ---- ./conf/sample-filter.cf Thu Jun 1 22:07:58 2000 -*************** -*** 15,17 **** - # -! header_checks = regexp:/etc/postfix/header_checks - ---- 15,17 ---- - # -! header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks - -*************** -*** 26,27 **** - # -! body_checks = regexp:/etc/postfix/body_checks ---- 26,27 ---- - # -! body_checks = regexp:!!PREFIX!!/etc/postfix/body_checks diff --git a/mail/postfix28/files/patch-aj b/mail/postfix28/files/patch-aj deleted file mode 100644 index 241d48132551..000000000000 --- a/mail/postfix28/files/patch-aj +++ /dev/null @@ -1,24 +0,0 @@ -*** ./conf/sample-misc.cf.orig Thu Sep 23 14:10:52 1999 ---- ./conf/sample-misc.cf Thu Jun 1 22:09:39 2000 -*************** -*** 220,222 **** - # -! program_directory = /usr/libexec/postfix - ---- 220,222 ---- - # -! program_directory = !!PREFIX!!/libexec/postfix - -*************** -*** 263,267 **** - # Specify the types and names of databases to use. After change, -! # run "postmap /etc/postfix/relocated", then "postfix reload". - # -! #relocated_maps = hash:/etc/postfix/relocated - relocated_maps = ---- 263,267 ---- - # Specify the types and names of databases to use. After change, -! # run "postmap !!PREFIX!!/etc/postfix/relocated", then "postfix reload". - # -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated - relocated_maps = diff --git a/mail/postfix28/files/patch-ak b/mail/postfix28/files/patch-ak deleted file mode 100644 index 250dd411a4bd..000000000000 --- a/mail/postfix28/files/patch-ak +++ /dev/null @@ -1,26 +0,0 @@ -*** ./conf/sample-relocated.cf.orig Thu Sep 23 14:11:17 1999 ---- ./conf/sample-relocated.cf Thu Jun 1 22:10:43 2000 -*************** -*** 12,14 **** - # -! # If you use this feature, run "postmap /etc/postfix/relocated" to - # build the necessary DBM or DB file after change, then "postfix ---- 12,14 ---- - # -! # If you use this feature, run "postmap !!PREFIX!!/etc/postfix/relocated" to - # build the necessary DBM or DB file after change, then "postfix -*************** -*** 16,21 **** - # -! #relocated_maps = dbm:/etc/postfix/relocated -! #relocated_maps = hash:/etc/postfix/relocated -! #relocated_maps = hash:/etc/postfix/relocated, nis:virtual -! #relocated_maps = hash:/etc/postfix/relocated, netinfo:/relocated - relocated_maps = ---- 16,21 ---- - # -! #relocated_maps = dbm:!!PREFIX!!/etc/postfix/relocated -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated, nis:virtual -! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated, netinfo:/relocated - relocated_maps = diff --git a/mail/postfix28/files/patch-al b/mail/postfix28/files/patch-al deleted file mode 100644 index 799206da0c96..000000000000 --- a/mail/postfix28/files/patch-al +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/sample-smtpd.cf.orig Mon Dec 27 19:41:37 1999 ---- ./conf/sample-smtpd.cf Thu Jun 1 22:11:22 2000 -*************** -*** 183,185 **** - #smtpd_sender_restrictions = reject_unknown_sender_domain -! #smtpd_sender_restrictions = reject_unknown_sender_domain, hash:/etc/postfix/access - smtpd_sender_restrictions = ---- 183,185 ---- - #smtpd_sender_restrictions = reject_unknown_sender_domain -! #smtpd_sender_restrictions = reject_unknown_sender_domain, hash:!!PREFIX!!/etc/postfix/access - smtpd_sender_restrictions = diff --git a/mail/postfix28/files/patch-am b/mail/postfix28/files/patch-am deleted file mode 100644 index 2d395fa9ca03..000000000000 --- a/mail/postfix28/files/patch-am +++ /dev/null @@ -1,23 +0,0 @@ -*** ./conf/sample-transport.cf.orig Thu Dec 23 10:50:00 1999 ---- ./conf/sample-transport.cf Thu Jun 1 22:13:09 2000 -*************** -*** 10,18 **** - # By default, this feature is disabled. Specify the types of databases -! # to use. If you use this feature, run "postmap /etc/postfix/transport" - # after change, then "postfix reload". - # -! #transport_maps = dbm:/etc/postfix/transport -! #transport_maps = hash:/etc/postfix/transport -! #transport_maps = hash:/etc/postfix/transport, nis:transport -! #transport_maps = hash:/etc/postfix/transport, netinfo:/transport - transport_maps = ---- 10,18 ---- - # By default, this feature is disabled. Specify the types of databases -! # to use. If you use this feature, run "postmap !!PREFIX!!/etc/postfix/transport" - # after change, then "postfix reload". - # -! #transport_maps = dbm:!!PREFIX!!/etc/postfix/transport -! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport -! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport, nis:transport -! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport, netinfo:/transport - transport_maps = diff --git a/mail/postfix28/files/patch-an b/mail/postfix28/files/patch-an deleted file mode 100644 index af5ac7cc031b..000000000000 --- a/mail/postfix28/files/patch-an +++ /dev/null @@ -1,26 +0,0 @@ -*** ./conf/sample-virtual.cf.orig Mon Dec 20 21:00:42 1999 ---- ./conf/sample-virtual.cf Thu Jun 1 22:13:32 2000 -*************** -*** 12,14 **** - # -! # If you use this feature, run "postmap /etc/postfix/virtual" to - # build the necessary DBM or DB file after change. ---- 12,14 ---- - # -! # If you use this feature, run "postmap !!PREFIX!!/etc/postfix/virtual" to - # build the necessary DBM or DB file after change. -*************** -*** 18,23 **** - # -! #virtual_maps = dbm:/etc/postfix/virtual -! #virtual_maps = hash:/etc/postfix/virtual -! #virtual_maps = hash:/etc/postfix/virtual, nis:virtual -! #virtual_maps = hash:/etc/postfix/virtual, netinfo:/virtual - virtual_maps = ---- 18,23 ---- - # -! #virtual_maps = dbm:!!PREFIX!!/etc/postfix/virtual -! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual -! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual, nis:virtual -! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual, netinfo:/virtual - virtual_maps = diff --git a/mail/postfix28/files/patch-ao b/mail/postfix28/files/patch-ao deleted file mode 100644 index fd854e181601..000000000000 --- a/mail/postfix28/files/patch-ao +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/transport.orig Tue Mar 7 10:42:58 2000 ---- ./conf/transport Thu Jun 1 22:13:41 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/transport - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/transport - # diff --git a/mail/postfix28/files/patch-ap b/mail/postfix28/files/patch-ap deleted file mode 100644 index 4598192cd5c1..000000000000 --- a/mail/postfix28/files/patch-ap +++ /dev/null @@ -1,11 +0,0 @@ -*** ./conf/virtual.orig Tue Mar 7 10:42:59 2000 ---- ./conf/virtual Thu Jun 1 22:13:54 2000 -*************** -*** 7,9 **** - # SYNOPSIS -! # postmap /etc/postfix/virtual - # ---- 7,9 ---- - # SYNOPSIS -! # postmap !!PREFIX!!/etc/postfix/virtual - # diff --git a/mail/postfix28/files/patch-ba b/mail/postfix28/files/patch-ba deleted file mode 100644 index ccb54ec60a7a..000000000000 --- a/mail/postfix28/files/patch-ba +++ /dev/null @@ -1,20 +0,0 @@ -*** ./html/mailq.1.html.orig Sat Apr 22 20:28:36 2000 ---- ./html/mailq.1.html Thu Jun 1 22:19:24 2000 -*************** -*** 83,85 **** - The path name of the <b>sendmail.cf</b> file. Postfix con- -! figuration files are kept in <b>/etc/postfix</b>. - ---- 83,85 ---- - The path name of the <b>sendmail.cf</b> file. Postfix con- -! figuration files are kept in <b>!!PREFIX!!/etc/postfix</b>. - -*************** -*** 231,233 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - ---- 231,233 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - diff --git a/mail/postfix28/files/patch-bb b/mail/postfix28/files/patch-bb deleted file mode 100644 index ea744664dfa7..000000000000 --- a/mail/postfix28/files/patch-bb +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/access.5.html.orig Tue Nov 21 21:24:13 2000 -+++ ./html/access.5.html Tue Nov 21 21:24:34 2000 -@@ -9,7 +9,7 @@ - access - format of Postfix access table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/access</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b> - - <b>DESCRIPTION</b> - The optional <b>access</b> table directs the Postfix SMTP server -@@ -21,7 +21,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/access</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b> in order to rebuild the - indexed file after changing the access table. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix28/files/patch-bc b/mail/postfix28/files/patch-bc deleted file mode 100644 index e407a9650585..000000000000 --- a/mail/postfix28/files/patch-bc +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/canonical.5.html.orig Tue Nov 21 21:32:38 2000 -+++ ./html/canonical.5.html Tue Nov 21 21:33:21 2000 -@@ -9,7 +9,7 @@ - canonical - format of Postfix canonical table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/canonical</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b> - - <b>DESCRIPTION</b> - The optional <b>canonical</b> table specifies an address mapping -@@ -20,7 +20,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/canonical</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b> in order to rebuild the - indexed file after changing the text file. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix28/files/patch-be b/mail/postfix28/files/patch-be deleted file mode 100644 index bef6a3bfaf73..000000000000 --- a/mail/postfix28/files/patch-be +++ /dev/null @@ -1,10 +0,0 @@ ---- ./html/faq.html.orig Sat Oct 28 23:34:51 2000 -+++ ./html/faq.html Sat Oct 28 23:36:04 2000 -@@ -2572,7 +2572,7 @@ - - Answer: instead of using <b>/usr/include/ndbm.h</b>, you're building - Postfix with some incompatible third-party file, typically --<b>/usr/local/include/ndbm.h</b>. -+<b>!!PREFIX!!/include/ndbm.h</b>. - - <p> diff --git a/mail/postfix28/files/patch-bf b/mail/postfix28/files/patch-bf deleted file mode 100644 index d652e1e567b3..000000000000 --- a/mail/postfix28/files/patch-bf +++ /dev/null @@ -1,13 +0,0 @@ -*** ./html/cleanup.8.html.orig Sun May 28 21:58:41 2000 ---- ./html/cleanup.8.html Thu Jun 1 22:29:04 2000 -*************** -*** 174,177 **** - <b>FILES</b> -! /etc/postfix/canonical*, canonical mapping table -! /etc/postfix/virtual*, virtual mapping table - ---- 174,177 ---- - <b>FILES</b> -! !!PREFIX!!/etc/postfix/canonical*, canonical mapping table -! !!PREFIX!!/etc/postfix/virtual*, virtual mapping table - diff --git a/mail/postfix28/files/patch-bg b/mail/postfix28/files/patch-bg deleted file mode 100644 index ce2454eaef01..000000000000 --- a/mail/postfix28/files/patch-bg +++ /dev/null @@ -1,13 +0,0 @@ -*** ./html/master.8.html.orig Tue Mar 7 10:48:56 2000 ---- ./html/master.8.html Thu Jun 1 22:29:24 2000 -*************** -*** 148,151 **** - <b>FILES</b> -! /etc/postfix/main.cf: global configuration file. -! /etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. ---- 148,151 ---- - <b>FILES</b> -! !!PREFIX!!/etc/postfix/main.cf: global configuration file. -! !!PREFIX!!/etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. diff --git a/mail/postfix28/files/patch-bh b/mail/postfix28/files/patch-bh deleted file mode 100644 index a20232e6796a..000000000000 --- a/mail/postfix28/files/patch-bh +++ /dev/null @@ -1,11 +0,0 @@ -*** ./html/goals.html.orig Sun May 9 15:44:18 1999 ---- ./html/goals.html Thu Jun 1 22:30:14 2000 -*************** -*** 45,47 **** - <li>Compatibility. Postfix is designed to be sendmail-compatible -! to make migration easy. Postfix supports <b>/var[/spool]/mail</b>, - <b>/etc/aliases</b>, <b>NIS</b>, and <b>~/.forward</b> files. ---- 45,47 ---- - <li>Compatibility. Postfix is designed to be sendmail-compatible -! to make migration easy. Postfix supports <b>/var/mail</b>, - <b>/etc/aliases</b>, <b>NIS</b>, and <b>~/.forward</b> files. diff --git a/mail/postfix28/files/patch-bi b/mail/postfix28/files/patch-bi deleted file mode 100644 index 7e4acdb0c126..000000000000 --- a/mail/postfix28/files/patch-bi +++ /dev/null @@ -1,11 +0,0 @@ -*** ./html/postdrop.1.html.orig Mon May 3 15:05:12 1999 ---- ./html/postdrop.1.html Thu Jun 1 22:30:47 2000 -*************** -*** 48,50 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - ---- 48,50 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - diff --git a/mail/postfix28/files/patch-bj b/mail/postfix28/files/patch-bj deleted file mode 100644 index 00e78d01ba5a..000000000000 --- a/mail/postfix28/files/patch-bj +++ /dev/null @@ -1,42 +0,0 @@ -*** ./html/uce.html.orig Fri Dec 31 15:06:07 1999 ---- ./html/uce.html Thu Jun 1 22:31:37 2000 -*************** -*** 126,130 **** - -! <dd> <b>header_checks = regexp:/etc/postfix/header_checks</b> - -! <dd> <b>header_checks = pcre:/etc/postfix/header_checks</b> - ---- 126,130 ---- - -! <dd> <b>header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks</b> - -! <dd> <b>header_checks = pcre:!!PREFIX!!/etc/postfix/header_checks</b> - -*************** -*** 169,171 **** - -! <dd> <b>smtpd_client_restrictions = hash:/etc/postfix/access, - reject_maps_rbl</b> ---- 169,171 ---- - -! <dd> <b>smtpd_client_restrictions = hash:!!PREFIX!!/etc/postfix/access, - reject_maps_rbl</b> -*************** -*** 474,476 **** - -! <dd> <b>smtpd_sender_restrictions = hash:/etc/postfix/access, - reject_unknown_sender_domain</b> ---- 474,476 ---- - -! <dd> <b>smtpd_sender_restrictions = hash:!!PREFIX!!/etc/postfix/access, - reject_unknown_sender_domain</b> -*************** -*** 856,858 **** - <dd> <b>smtpd_etrn_restrictions = permit_mynetworks, -! hash:/etc/postfix/etrn_access, reject</b> - ---- 856,858 ---- - <dd> <b>smtpd_etrn_restrictions = permit_mynetworks, -! hash:!!PREFIX!!/etc/postfix/etrn_access, reject</b> - diff --git a/mail/postfix28/files/patch-bk b/mail/postfix28/files/patch-bk deleted file mode 100644 index 62a0573559ae..000000000000 --- a/mail/postfix28/files/patch-bk +++ /dev/null @@ -1,29 +0,0 @@ -*** ./html/rate.html.orig Wed Mar 17 17:55:22 1999 ---- ./html/rate.html Thu Jun 1 22:32:19 2000 -*************** -*** 224,226 **** - -! <dt>/etc/postfix/main.cf: - ---- 224,226 ---- - -! <dt>!!PREFIX!!/etc/postfix/main.cf: - -*************** -*** 237,239 **** - -! <dt>/etc/postfix/<a href="transport.5.html">transport</a>: - ---- 237,239 ---- - -! <dt>!!PREFIX!!/etc/postfix/<a href="transport.5.html">transport</a>: - -*************** -*** 253,255 **** - -! <dt>/etc/postfix/master.cf: - ---- 253,255 ---- - -! <dt>!!PREFIX!!/etc/postfix/master.cf: - diff --git a/mail/postfix28/files/patch-bl b/mail/postfix28/files/patch-bl deleted file mode 100644 index 176c7d1b64de..000000000000 --- a/mail/postfix28/files/patch-bl +++ /dev/null @@ -1,11 +0,0 @@ -*** ./html/regexp_table.5.html.orig Sat Apr 22 20:28:38 2000 ---- ./html/regexp_table.5.html Thu Jun 1 22:32:44 2000 -*************** -*** 11,13 **** - <b>SYNOPSIS</b> -! regexp:/etc/postfix/filename - ---- 11,13 ---- - <b>SYNOPSIS</b> -! regexp:!!PREFIX!!/etc/postfix/filename - diff --git a/mail/postfix28/files/patch-bm b/mail/postfix28/files/patch-bm deleted file mode 100644 index e5ccc2c50b94..000000000000 --- a/mail/postfix28/files/patch-bm +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/relocated.5.html.orig Tue Nov 21 21:37:54 2000 -+++ ./html/relocated.5.html Tue Nov 21 21:38:08 2000 -@@ -9,7 +9,7 @@ - relocated - format of Postfix relocated table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/relocated</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b> - - <b>DESCRIPTION</b> - The optional <b>relocated</b> table provides the information that -@@ -20,7 +20,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/relocated</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b> in order to rebuild the - indexed file after changing the relocated table. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix28/files/patch-bn b/mail/postfix28/files/patch-bn deleted file mode 100644 index 21e69dcaa40c..000000000000 --- a/mail/postfix28/files/patch-bn +++ /dev/null @@ -1,56 +0,0 @@ -*** ./html/rewrite.html.orig Sat May 8 17:51:41 1999 ---- ./html/rewrite.html Thu Jun 1 22:34:21 2000 -*************** -*** 194,196 **** - -! <dd><b>canonical_maps = hash:/etc/postfix/canonical</b> - ---- 194,196 ---- - -! <dd><b>canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical</b> - -*************** -*** 207,209 **** - -! <dd><b>sender_canonical_maps = hash:/etc/postfix/sender_canonical</b> - ---- 207,209 ---- - -! <dd><b>sender_canonical_maps = hash:!!PREFIX!!/etc/postfix/sender_canonical</b> - -*************** -*** 211,213 **** - -! <dd><b>recipient_canonical_maps = hash:/etc/postfix/recipient_canonical</b> - ---- 211,213 ---- - -! <dd><b>recipient_canonical_maps = hash:!!PREFIX!!/etc/postfix/recipient_canonical</b> - -*************** -*** 295,297 **** - -! <dd><b>virtual_maps = hash:/etc/postfix/virtual</b> - ---- 295,297 ---- - -! <dd><b>virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual</b> - -*************** -*** 323,325 **** - -! <dd><b>relocated_maps = hash:/etc/postfix/relocated</b> - ---- 323,325 ---- - -! <dd><b>relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated</b> - -*************** -*** 348,350 **** - -! <dd><b>transport_maps = hash:/etc/postfix/transport</b> - ---- 348,350 ---- - -! <dd><b>transport_maps = hash:!!PREFIX!!/etc/postfix/transport</b> - diff --git a/mail/postfix28/files/patch-bo b/mail/postfix28/files/patch-bo deleted file mode 100644 index b45270be8151..000000000000 --- a/mail/postfix28/files/patch-bo +++ /dev/null @@ -1,20 +0,0 @@ ---- ./html/transport.5.html.orig Tue Nov 21 21:43:00 2000 -+++ ./html/transport.5.html Tue Nov 21 21:43:20 2000 -@@ -9,7 +9,7 @@ - transport - format of Postfix transport table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/transport</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b> - - <b>DESCRIPTION</b> - The optional <b>transport</b> table specifies a mapping from -@@ -21,7 +21,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/transport</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b> in order to rebuild the - indexed file after changing the transport table. - - When the table is provided via other means such as NIS, diff --git a/mail/postfix28/files/patch-bp b/mail/postfix28/files/patch-bp deleted file mode 100644 index 5206bfd4bfd0..000000000000 --- a/mail/postfix28/files/patch-bp +++ /dev/null @@ -1,43 +0,0 @@ ---- ./html/virtual.5.html.orig Tue Nov 21 21:46:50 2000 -+++ ./html/virtual.5.html Tue Nov 21 21:47:17 2000 -@@ -9,7 +9,7 @@ - virtual - format of Postfix virtual table - - <b>SYNOPSIS</b> -- <b>postmap</b> <b>/etc/postfix/virtual</b> -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b> - - <b>DESCRIPTION</b> - The optional <b>virtual</b> table specifies address redirections -@@ -27,7 +27,7 @@ - that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The - result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for - fast searching by the mail system. Execute the command -- <b>postmap</b> <b>/etc/postfix/virtual</b> in order to rebuild the -+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b> in order to rebuild the - indexed file after changing the text file. - - When the table is provided via other means such as NIS, -@@ -52,7 +52,7 @@ - - Support for a Postfix-style virtual domain looks like: - -- /etc/postfix/virtual: -+ !!PREFIX!!/etc/postfix/virtual: - <i>virtual.domain</i> <i>anything</i> (right-hand content does not matter) - <i>postmaster@virtual.domain</i> <i>postmaster</i> - <i>user1@virtual.domain</i> <i>address1</i> -@@ -94,11 +94,11 @@ - - Support for a Sendmail-style virtual domain looks like: - -- /etc/postfix/main.cf: -+ !!PREFIX!!/etc/postfix/main.cf: - mydestination = $myhostname localhost.$mydomain $mydomain - <i>virtual.domain</i> - -- /etc/postfix/virtual: -+ !!PREFIX!!/etc/postfix/virtual: - <i>user1@virtual.domain</i> <i>address1</i> - <i>user2@virtual.domain</i> <i>address2,</i> <i>address3</i> - diff --git a/mail/postfix28/files/patch-ca b/mail/postfix28/files/patch-ca deleted file mode 100644 index 86d56f80be30..000000000000 --- a/mail/postfix28/files/patch-ca +++ /dev/null @@ -1,11 +0,0 @@ -*** ./man/man1/postdrop.1.orig Mon May 3 15:03:29 1999 ---- ./man/man1/postdrop.1 Thu Jun 1 22:38:54 2000 -*************** -*** 53,55 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS ---- 53,55 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS diff --git a/mail/postfix28/files/patch-cb b/mail/postfix28/files/patch-cb deleted file mode 100644 index 58559c7273d1..000000000000 --- a/mail/postfix28/files/patch-cb +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man1/sendmail.1.orig Thu Mar 30 14:05:28 2000 ---- ./man/man1/sendmail.1 Thu Jun 1 22:39:16 2000 -*************** -*** 63,65 **** - The path name of the \fBsendmail.cf\fR file. Postfix configuration -! files are kept in \fB/etc/postfix\fR. - .IP "\fB-F \fIfull_name\fR ---- 63,65 ---- - The path name of the \fBsendmail.cf\fR file. Postfix configuration -! files are kept in \fB!!PREFIX!!/etc/postfix\fR. - .IP "\fB-F \fIfull_name\fR -*************** -*** 173,175 **** - /var/spool/postfix, mail queue -! /etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS ---- 173,175 ---- - /var/spool/postfix, mail queue -! !!PREFIX!!/etc/postfix, configuration files - .SH CONFIGURATION PARAMETERS diff --git a/mail/postfix28/files/patch-cc b/mail/postfix28/files/patch-cc deleted file mode 100644 index cd6946003217..000000000000 --- a/mail/postfix28/files/patch-cc +++ /dev/null @@ -1,11 +0,0 @@ -*** ./man/man5/pcre_table.5.orig Thu Mar 30 14:05:28 2000 ---- ./man/man5/pcre_table.5 Thu Jun 1 22:39:34 2000 -*************** -*** 10,12 **** - .nf -! pcre:/etc/postfix/filename - .SH DESCRIPTION ---- 10,12 ---- - .nf -! pcre:!!PREFIX!!/etc/postfix/filename - .SH DESCRIPTION diff --git a/mail/postfix28/files/patch-cd b/mail/postfix28/files/patch-cd deleted file mode 100644 index b51de44d0bee..000000000000 --- a/mail/postfix28/files/patch-cd +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/access.5.orig Sat Apr 22 20:28:30 2000 ---- ./man/man5/access.5 Thu Jun 1 22:39:55 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/access\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/access\fR - .SH DESCRIPTION -*************** -*** 21,23 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed - file after changing the access table. ---- 21,23 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed - file after changing the access table. diff --git a/mail/postfix28/files/patch-ce b/mail/postfix28/files/patch-ce deleted file mode 100644 index f77053f8b3aa..000000000000 --- a/mail/postfix28/files/patch-ce +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/canonical.5.orig Sat Apr 22 20:28:30 2000 ---- ./man/man5/canonical.5 Thu Jun 1 22:40:18 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/canonical\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR - .SH DESCRIPTION -*************** -*** 21,23 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed - file after changing the canonical table. ---- 21,23 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed - file after changing the canonical table. diff --git a/mail/postfix28/files/patch-cf b/mail/postfix28/files/patch-cf deleted file mode 100644 index 28fb053b94a7..000000000000 --- a/mail/postfix28/files/patch-cf +++ /dev/null @@ -1,11 +0,0 @@ -*** ./man/man5/regexp_table.5.orig Thu Mar 30 14:05:28 2000 ---- ./man/man5/regexp_table.5 Thu Jun 1 22:40:43 2000 -*************** -*** 10,12 **** - .nf -! regexp:/etc/postfix/filename - .SH DESCRIPTION ---- 10,12 ---- - .nf -! regexp:!!PREFIX!!/etc/postfix/filename - .SH DESCRIPTION diff --git a/mail/postfix28/files/patch-cg b/mail/postfix28/files/patch-cg deleted file mode 100644 index 0ae82cc57669..000000000000 --- a/mail/postfix28/files/patch-cg +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/relocated.5.orig Sat Apr 22 20:28:31 2000 ---- ./man/man5/relocated.5 Thu Jun 1 22:41:05 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/relocated\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR - .SH DESCRIPTION -*************** -*** 20,22 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed - file after changing the relocated table. ---- 20,22 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed - file after changing the relocated table. diff --git a/mail/postfix28/files/patch-ch b/mail/postfix28/files/patch-ch deleted file mode 100644 index 3ed047ea474c..000000000000 --- a/mail/postfix28/files/patch-ch +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/transport.5.orig Sat Apr 22 20:28:31 2000 ---- ./man/man5/transport.5 Thu Jun 1 22:41:26 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/transport\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR - .SH DESCRIPTION -*************** -*** 21,23 **** - for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed - file after changing the transport table. ---- 21,23 ---- - for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed - file after changing the transport table. diff --git a/mail/postfix28/files/patch-ci b/mail/postfix28/files/patch-ci deleted file mode 100644 index 1a7cf4abbac7..000000000000 --- a/mail/postfix28/files/patch-ci +++ /dev/null @@ -1,20 +0,0 @@ -*** ./man/man5/virtual.5.orig Sat Apr 22 20:28:31 2000 ---- ./man/man5/virtual.5 Thu Jun 1 22:41:51 2000 -*************** -*** 10,12 **** - .nf -! \fBpostmap /etc/postfix/virtual\fR - .SH DESCRIPTION ---- 10,12 ---- - .nf -! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR - .SH DESCRIPTION -*************** -*** 26,28 **** - is used for fast searching by the mail system. Execute the command -! \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed - file after changing the virtual table. ---- 26,28 ---- - is used for fast searching by the mail system. Execute the command -! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed - file after changing the virtual table. diff --git a/mail/postfix28/files/patch-cj b/mail/postfix28/files/patch-cj deleted file mode 100644 index 50448f2ec26d..000000000000 --- a/mail/postfix28/files/patch-cj +++ /dev/null @@ -1,13 +0,0 @@ -*** ./man/man8/cleanup.8.orig Sun May 28 21:58:32 2000 ---- ./man/man8/cleanup.8 Thu Jun 1 22:42:21 2000 -*************** -*** 136,139 **** - .nf -! /etc/postfix/canonical*, canonical mapping table -! /etc/postfix/virtual*, virtual mapping table - .SH LICENSE ---- 136,139 ---- - .nf -! !!PREFIX!!/etc/postfix/canonical*, canonical mapping table -! !!PREFIX!!/etc/postfix/virtual*, virtual mapping table - .SH LICENSE diff --git a/mail/postfix28/files/patch-cl b/mail/postfix28/files/patch-cl deleted file mode 100644 index 44c8a3a7aae0..000000000000 --- a/mail/postfix28/files/patch-cl +++ /dev/null @@ -1,13 +0,0 @@ -*** ./man/man8/master.8.orig Tue Mar 7 10:48:19 2000 ---- ./man/man8/master.8 Thu Jun 1 22:43:02 2000 -*************** -*** 120,123 **** - .nf -! /etc/postfix/main.cf: global configuration file. -! /etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. ---- 120,123 ---- - .nf -! !!PREFIX!!/etc/postfix/main.cf: global configuration file. -! !!PREFIX!!/etc/postfix/master.cf: master process configuration file. - /var/spool/postfix/pid/master.pid: master lock file. diff --git a/mail/postfix28/files/patch-da b/mail/postfix28/files/patch-da deleted file mode 100644 index e57e31750d18..000000000000 --- a/mail/postfix28/files/patch-da +++ /dev/null @@ -1,11 +0,0 @@ -*** ./proto/regexp_table.orig Wed Mar 8 19:18:20 2000 ---- ./proto/regexp_table Thu Jun 1 22:44:43 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # regexp:/etc/postfix/filename - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # regexp:!!PREFIX!!/etc/postfix/filename - # DESCRIPTION diff --git a/mail/postfix28/files/patch-db b/mail/postfix28/files/patch-db deleted file mode 100644 index 7f89fb770783..000000000000 --- a/mail/postfix28/files/patch-db +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/access.orig Sun Apr 9 16:44:45 2000 ---- ./proto/access Thu Jun 1 22:45:05 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/access\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR - # DESCRIPTION -*************** -*** 15,17 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed - # file after changing the access table. ---- 15,17 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed - # file after changing the access table. diff --git a/mail/postfix28/files/patch-dc b/mail/postfix28/files/patch-dc deleted file mode 100644 index 786f2da45c32..000000000000 --- a/mail/postfix28/files/patch-dc +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/canonical.orig Sun Apr 9 16:43:37 2000 ---- ./proto/canonical Thu Jun 1 22:45:28 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/canonical\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR - # DESCRIPTION -*************** -*** 15,17 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed - # file after changing the canonical table. ---- 15,17 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed - # file after changing the canonical table. diff --git a/mail/postfix28/files/patch-dd b/mail/postfix28/files/patch-dd deleted file mode 100644 index b65a57ff7d57..000000000000 --- a/mail/postfix28/files/patch-dd +++ /dev/null @@ -1,11 +0,0 @@ -*** ./proto/pcre_table.orig Wed Mar 8 19:18:11 2000 ---- ./proto/pcre_table Thu Jun 1 22:45:41 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # pcre:/etc/postfix/filename - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # pcre:!!PREFIX!!/etc/postfix/filename - # DESCRIPTION diff --git a/mail/postfix28/files/patch-de b/mail/postfix28/files/patch-de deleted file mode 100644 index 73bb2af2261d..000000000000 --- a/mail/postfix28/files/patch-de +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/relocated.orig Sun Apr 9 16:47:31 2000 ---- ./proto/relocated Thu Jun 1 22:46:02 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/relocated\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR - # DESCRIPTION -*************** -*** 14,16 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed - # file after changing the relocated table. ---- 14,16 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed - # file after changing the relocated table. diff --git a/mail/postfix28/files/patch-df b/mail/postfix28/files/patch-df deleted file mode 100644 index 8d3fba96a224..000000000000 --- a/mail/postfix28/files/patch-df +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/transport.orig Sun Apr 9 17:05:45 2000 ---- ./proto/transport Thu Jun 1 22:46:23 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/transport\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR - # DESCRIPTION -*************** -*** 15,17 **** - # for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed - # file after changing the transport table. ---- 15,17 ---- - # for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed - # file after changing the transport table. diff --git a/mail/postfix28/files/patch-dg b/mail/postfix28/files/patch-dg deleted file mode 100644 index bff20a2cff3e..000000000000 --- a/mail/postfix28/files/patch-dg +++ /dev/null @@ -1,20 +0,0 @@ -*** ./proto/virtual.orig Sun Apr 9 17:14:14 2000 ---- ./proto/virtual Thu Jun 1 22:46:40 2000 -*************** -*** 6,8 **** - # SYNOPSIS -! # \fBpostmap /etc/postfix/virtual\fR - # DESCRIPTION ---- 6,8 ---- - # SYNOPSIS -! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR - # DESCRIPTION -*************** -*** 20,22 **** - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed - # file after changing the virtual table. ---- 20,22 ---- - # is used for fast searching by the mail system. Execute the command -! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed - # file after changing the virtual table. diff --git a/mail/postfix28/files/patch-ea b/mail/postfix28/files/patch-ea deleted file mode 100644 index 6c3f98d2af4f..000000000000 --- a/mail/postfix28/files/patch-ea +++ /dev/null @@ -1,13 +0,0 @@ -*** ./src/cleanup/cleanup.c.orig Sun May 28 18:33:41 2000 ---- ./src/cleanup/cleanup.c Thu Jun 1 21:52:22 2000 -*************** -*** 118,121 **** - /* FILES -! /* /etc/postfix/canonical*, canonical mapping table -! /* /etc/postfix/virtual*, virtual mapping table - /* LICENSE ---- 118,121 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix/canonical*, canonical mapping table -! /* !!PREFIX!!/etc/postfix/virtual*, virtual mapping table - /* LICENSE diff --git a/mail/postfix28/files/patch-eb b/mail/postfix28/files/patch-eb deleted file mode 100644 index e67680963d2d..000000000000 --- a/mail/postfix28/files/patch-eb +++ /dev/null @@ -1,11 +0,0 @@ -*** ./src/global/mail_conf.c.orig Sun May 7 18:51:16 2000 ---- ./src/global/mail_conf.c Thu Jun 1 22:16:29 2000 -*************** -*** 53,55 **** - /* FILES -! /* /etc/postfix: default Postfix configuration directory. - /* ENVIRONMENT ---- 53,55 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix: default Postfix configuration directory. - /* ENVIRONMENT diff --git a/mail/postfix28/files/patch-ee b/mail/postfix28/files/patch-ee deleted file mode 100644 index ef44eac24b73..000000000000 --- a/mail/postfix28/files/patch-ee +++ /dev/null @@ -1,13 +0,0 @@ -*** ./src/master/master.c.orig Tue Mar 7 10:25:07 2000 ---- ./src/master/master.c Thu Jun 1 22:43:50 2000 -*************** -*** 104,107 **** - /* FILES -! /* /etc/postfix/main.cf: global configuration file. -! /* /etc/postfix/master.cf: master process configuration file. - /* /var/spool/postfix/pid/master.pid: master lock file. ---- 104,107 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix/main.cf: global configuration file. -! /* !!PREFIX!!/etc/postfix/master.cf: master process configuration file. - /* /var/spool/postfix/pid/master.pid: master lock file. diff --git a/mail/postfix28/files/patch-ef b/mail/postfix28/files/patch-ef deleted file mode 100644 index 586b304a103d..000000000000 --- a/mail/postfix28/files/patch-ef +++ /dev/null @@ -1,11 +0,0 @@ -*** ./src/postdrop/postdrop.c.orig Sun Apr 25 18:05:43 1999 ---- ./src/postdrop/postdrop.c Thu Jun 1 22:44:22 2000 -*************** -*** 39,41 **** - /* /var/spool/postfix, mail queue -! /* /etc/postfix, configuration files - /* CONFIGURATION PARAMETERS ---- 39,41 ---- - /* /var/spool/postfix, mail queue -! /* !!PREFIX!!/etc/postfix, configuration files - /* CONFIGURATION PARAMETERS diff --git a/mail/postfix28/files/patch-eg b/mail/postfix28/files/patch-eg deleted file mode 100644 index 2983bbfd86ea..000000000000 --- a/mail/postfix28/files/patch-eg +++ /dev/null @@ -1,20 +0,0 @@ -*** ./src/sendmail/sendmail.c.orig Tue Mar 14 10:42:06 2000 ---- ./src/sendmail/sendmail.c Thu Jun 1 22:47:24 2000 -*************** -*** 57,59 **** - /* The path name of the \fBsendmail.cf\fR file. Postfix configuration -! /* files are kept in \fB/etc/postfix\fR. - /* .IP "\fB-F \fIfull_name\fR ---- 57,59 ---- - /* The path name of the \fBsendmail.cf\fR file. Postfix configuration -! /* files are kept in \fB!!PREFIX!!/etc/postfix\fR. - /* .IP "\fB-F \fIfull_name\fR -*************** -*** 159,161 **** - /* /var/spool/postfix, mail queue -! /* /etc/postfix, configuration files - /* CONFIGURATION PARAMETERS ---- 159,161 ---- - /* /var/spool/postfix, mail queue -! /* !!PREFIX!!/etc/postfix, configuration files - /* CONFIGURATION PARAMETERS diff --git a/mail/postfix28/files/patch-eh b/mail/postfix28/files/patch-eh deleted file mode 100644 index c104c3680d21..000000000000 --- a/mail/postfix28/files/patch-eh +++ /dev/null @@ -1,11 +0,0 @@ -*** ./src/trivial-rewrite/transport.c.orig Tue Nov 16 19:15:41 1999 ---- ./src/trivial-rewrite/transport.c Thu Jun 1 22:47:49 2000 -*************** -*** 32,34 **** - /* FILES -! /* /etc/postfix/transport* - /* CONFIGURATION PARAMETERS ---- 32,34 ---- - /* FILES -! /* !!PREFIX!!/etc/postfix/transport* - /* CONFIGURATION PARAMETERS diff --git a/mail/postfix28/pkg-message b/mail/postfix28/pkg-message index a7ae2b17e2a6..7fb3a804599c 100644 --- a/mail/postfix28/pkg-message +++ b/mail/postfix28/pkg-message @@ -8,10 +8,21 @@ sendmail_outbound_enable="NO" sendmail_submit_enable="NO" sendmail_msp_queue_enable="NO" -This will disable Sendmail completely. + **OR** +sendmail_enable="NONE" -Also, you may wish to disable some Sendmail-specific daily maintenance +then type this command as root: + +ln -s /usr/local/sbin/postfix /usr/local/etc/rc.d/postfix.sh + +Either of these will disable Sendmail completely. The latter form is useful +if you need to wait until other local package initialization (such as ldconfig +for Postgres or MySQL) is done. The former method will start postfix very +early on in the boot process. + + +Also, you will want to disable some Sendmail-specific daily maintenance routines in your /etc/periodic.conf file: daily_status_mail_rejects_enable="NO" |