[30008] trunk/dports/mail/postfix
source_changes at macosforge.org
source_changes at macosforge.org
Wed Oct 17 22:34:45 PDT 2007
Revision: 30008
http://trac.macosforge.org/projects/macports/changeset/30008
Author: markd at macports.org
Date: 2007-10-17 22:34:44 -0700 (Wed, 17 Oct 2007)
Log Message:
-----------
Update to 2.4.5; convert man page patches to post-patch reinplaces.
Modified Paths:
--------------
trunk/dports/mail/postfix/Portfile
trunk/dports/mail/postfix/files/patch-access.5
trunk/dports/mail/postfix/files/patch-canonical.5
trunk/dports/mail/postfix/files/patch-pcre_table.5
trunk/dports/mail/postfix/files/patch-proxymap.8
trunk/dports/mail/postfix/files/patch-regexp_table.5
trunk/dports/mail/postfix/files/patch-relocated.5
trunk/dports/mail/postfix/files/patch-sys_defs.h
trunk/dports/mail/postfix/files/patch-transport.5
trunk/dports/mail/postfix/files/patch-virtual.5
Removed Paths:
-------------
trunk/dports/mail/postfix/files/patch-sample-misc.cf
Modified: trunk/dports/mail/postfix/Portfile
===================================================================
--- trunk/dports/mail/postfix/Portfile 2007-10-18 05:26:18 UTC (rev 30007)
+++ trunk/dports/mail/postfix/Portfile 2007-10-18 05:34:44 UTC (rev 30008)
@@ -1,8 +1,9 @@
# $Id$
PortSystem 1.0
+
name postfix
-version 2.3.8
+version 2.4.5
categories mail
maintainers nomaintainer at macports.org
description Fast and robust mail transfer agent
@@ -13,7 +14,7 @@
Postfix act as delivery daemon for ezmlm-idx.
homepage http://www.postfix.org/
platforms darwin
-checksums sha1 c40ebae5cdcd53e13ae8ba5cac1a70167576859b
+checksums sha1 dc3616ffd441c23748273527b6693835f3502ad2
master_sites http://postfix.problemlos.ch/release/official/ \
http://www.swissrave.ch/mirror/postfix-source/official/ \
ftp://ftp.matrix.com.br/pub/postfix/official/ \
@@ -21,17 +22,17 @@
ftp://ftp.club-internet.fr/pub/mirrors/ftp.porcupine.org/postfix-release/official/\
ftp://ftp.doc.cs.univ-paris8.fr/mirrors/ftp.porcupine.org/postfix-release/official/
-patchfiles patch-access.5 patch-flush.8 patch-master.8 \
- patch-regexp_table.5 patch-sys_defs.h patch-canonical.5 \
- patch-mail_params.h patch-pcre_table.5 patch-postdrop.1 \
- patch-postqueue.1 patch-relocated.5 patch-transport.5 \
- patch-cleanup.8 patch-main.cf patch-postfix-install \
- patch-proxymap.8 patch-sendmail.1 \
- patch-virtual.5
-#patch-sample-misc.cf
+patchfiles patch-sys_defs.h patch-main.cf patch-mail_params.h patch-postfix-install
+post-patch {
+ eval reinplace "s|/etc/|${prefix}/etc/|g" \
+ [glob ${worksrcpath}/man/man1/*] \
+ [glob ${worksrcpath}/man/man5/*] \
+ [glob ${worksrcpath}/man/man8/*]
+}
+
set CCARGS -DNO_PCRE
-set AUXLIBS -L${prefix}/lib
+set AUXLIBS "-L${prefix}/lib -R${prefix}/lib -L${prefix}/lib"
configure {
cd ${worksrcpath}
@@ -39,21 +40,6 @@
reinplace "s|__PREFIX|${prefix}|g" src/util/sys_defs.h
reinplace "s|__PREFIX|${prefix}|g" conf/main.cf
reinplace "s|__PREFIX|${prefix}|g" src/global/mail_params.h
- reinplace "s|__PREFIX|${prefix}|g" man/man1/postdrop.1
-# reinplace "s|__PREFIX|${prefix}|g" conf/sample-misc.cf
- reinplace "s|__PREFIX|${prefix}|g" man/man1/postqueue.1
- reinplace "s|__PREFIX|${prefix}|g" man/man1/sendmail.1
- reinplace "s|__PREFIX|${prefix}|g" man/man5/access.5
- reinplace "s|__PREFIX|${prefix}|g" man/man5/canonical.5
- reinplace "s|__PREFIX|${prefix}|g" man/man5/pcre_table.5
- reinplace "s|__PREFIX|${prefix}|g" man/man5/regexp_table.5
- reinplace "s|__PREFIX|${prefix}|g" man/man5/relocated.5
- reinplace "s|__PREFIX|${prefix}|g" man/man5/transport.5
- reinplace "s|__PREFIX|${prefix}|g" man/man5/virtual.5
- reinplace "s|__PREFIX|${prefix}|g" man/man8/cleanup.8
- reinplace "s|__PREFIX|${prefix}|g" man/man8/flush.8
- reinplace "s|__PREFIX|${prefix}|g" man/man8/master.8
- reinplace "s|__PREFIX|${prefix}|g" man/man8/proxymap.8
}
build.target
@@ -67,9 +53,7 @@
addgroup postdrop
cd ${worksrcpath}
file mkdir ${destroot}${prefix}/etc/postfix
- file mkdir ${destroot}${prefix}/etc/rc.d
file mkdir ${destroot}${prefix}/share/postfix
- xinstall -d -m 755 ${destroot}${prefix}/etc/rc.d
xinstall -d -o postfix -g postdrop -m \
710 ${destroot}${prefix}/var/spool/postfix/public
xinstall -d -o postfix -g postdrop -m 730 \
@@ -88,8 +72,6 @@
mailq_path=${prefix}/bin/mailq \
sample_directory=${prefix}/share/postfix/sample \
readme_directory=${prefix}/share/postfix/readme"
- xinstall -m 755 -c ${portpath}/files/postfix.sh ${destroot}${prefix}/etc/rc.d
- reinplace "s|__PREFIX|${prefix}|g" ${destroot}${prefix}/etc/rc.d/postfix.sh
}
# This makes sure we don't overwrite user /etc files. This now breaks postfix
# "just working" on fresh installs.
@@ -151,5 +133,3 @@
set CCARGS [concat ${CCARGS} -DHAS_MYSQL -I${prefix}/include/mysql5/mysql]
set AUXLIBS [concat ${AUXLIBS} -L${prefix}/lib/mysql5/mysql -lmysqlclient -lz -lm]
}
-
-
Modified: trunk/dports/mail/postfix/files/patch-access.5
===================================================================
--- trunk/dports/mail/postfix/files/patch-access.5 2007-10-18 05:26:18 UTC (rev 30007)
+++ trunk/dports/mail/postfix/files/patch-access.5 2007-10-18 05:34:44 UTC (rev 30008)
@@ -1,5 +1,5 @@
---- man/man5/access.5 Sat Feb 5 10:50:56 2005
-+++ man/man5/access.5.new Thu Jul 7 11:08:04 2005
+--- man/man5/access.5.org 2007-03-26 17:06:04.000000000 -0700
++++ man/man5/access.5 2007-10-17 21:15:08.000000000 -0700
@@ -8,11 +8,11 @@
.SH "SYNOPSIS"
.na
@@ -15,34 +15,31 @@
.SH DESCRIPTION
.ad
.fi
-@@ -28,7 +28,7 @@
+@@ -27,7 +27,7 @@
that serves as input to the \fBpostmap\fR(1) command.
The result, an indexed file in \fBdbm\fR or \fBdb\fR format,
- is used for fast searching by the mail system. Execute the command
--"\fBpostmap /etc/postfix/access\fR" in order to rebuild the indexed
-+"\fBpostmap __PREFIX/etc/postfix/access\fR" in order to rebuild the indexed
- file after changing the access table.
+ is used for fast searching by the mail system. Execute the
+-command "\fBpostmap /etc/postfix/access\fR" to rebuild an
++command "\fBpostmap __PREFIX/etc/postfix/access\fR" to rebuild an
+ indexed file after changing the corresponding text file.
When the table is provided via other means such as NIS, LDAP
-@@ -318,20 +318,20 @@
+@@ -367,17 +367,17 @@
- .na
.nf
+ .na
-/etc/postfix/main.cf:
+__PREFIX/etc/postfix/main.cf:
- .in +4
- smtpd_client_restrictions =
- .in +4
--check_client_access hash:/etc/postfix/access
-+check_client_access hash:__PREFIX/etc/postfix/access
+ smtpd_client_restrictions =
+- check_client_access hash:/etc/postfix/access
++ check_client_access hash:__PREFIX/etc/postfix/access
- .in -8
-/etc/postfix/access:
+__PREFIX/etc/postfix/access:
- .in +4
- 1.2.3 REJECT
- 1.2.3.4 OK
- .in -4
+ 1.2.3 REJECT
+ 1.2.3.4 OK
+ .fi
+ .ad
-Execute the command "\fBpostmap /etc/postfix/access\fR" after
+Execute the command "\fBpostmap __PREFIX/etc/postfix/access\fR" after
Modified: trunk/dports/mail/postfix/files/patch-canonical.5
===================================================================
--- trunk/dports/mail/postfix/files/patch-canonical.5 2007-10-18 05:26:18 UTC (rev 30007)
+++ trunk/dports/mail/postfix/files/patch-canonical.5 2007-10-18 05:34:44 UTC (rev 30008)
@@ -1,5 +1,5 @@
---- man/man5/canonical.5 Thu Mar 10 07:05:01 2005
-+++ man/man5/canonical.5.new Thu Jul 7 11:09:55 2005
+--- man/man5/canonical.5.org 2007-10-17 21:36:26.000000000 -0700
++++ man/man5/canonical.5 2007-10-17 21:37:40.000000000 -0700
@@ -8,11 +8,11 @@
.SH "SYNOPSIS"
.na
@@ -19,8 +19,8 @@
that serves as input to the \fBpostmap\fR(1) command.
The result, an indexed file in \fBdbm\fR or \fBdb\fR format,
is used for fast searching by the mail system. Execute the command
--"\fBpostmap /etc/postfix/canonical\fR" in order to rebuild the indexed
-+"\fBpostmap __PREFIX/etc/postfix/canonical\fR" in order to rebuild the indexed
- file after changing the text file.
+-"\fBpostmap /etc/postfix/canonical\fR" to rebuild an indexed
++"\fBpostmap __PREFIX/etc/postfix/canonical\fR" to rebuild an indexed
+ file after changing the corresponding text file.
When the table is provided via other means such as NIS, LDAP
Modified: trunk/dports/mail/postfix/files/patch-pcre_table.5
===================================================================
--- trunk/dports/mail/postfix/files/patch-pcre_table.5 2007-10-18 05:26:18 UTC (rev 30007)
+++ trunk/dports/mail/postfix/files/patch-pcre_table.5 2007-10-18 05:34:44 UTC (rev 30008)
@@ -1,14 +1,14 @@
---- man/man5/pcre_table.5 Sat Feb 5 10:50:56 2005
-+++ man/man5/pcre_table.5.new Thu Jul 7 11:08:46 2005
+--- man/man5/pcre_table.5.org 2007-10-17 21:40:59.000000000 -0700
++++ man/man5/pcre_table.5 2007-10-17 21:42:29.000000000 -0700
@@ -8,9 +8,9 @@
.SH "SYNOPSIS"
.na
.nf
--\fBpostmap -fq "\fIstring\fB" pcre:/etc/postfix/\fIfilename\fR
-+\fBpostmap -fq "\fIstring\fB" pcre:__PREFIX/etc/postfix/\fIfilename\fR
+-\fBpostmap -q "\fIstring\fB" pcre:/etc/postfix/\fIfilename\fR
++\fBpostmap -q "\fIstring\fB" pcre:__PREFIX/etc/postfix/\fIfilename\fR
--\fBpostmap -fq - pcre:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
-+\fBpostmap -fq - pcre:__PREFIX/etc/postfix/\fIfilename\fR <\fIinputfile\fR
+-\fBpostmap -q - pcre:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
++\fBpostmap -q - pcre:__PREFIX/etc/postfix/\fIfilename\fR <\fIinputfile\fR
.SH DESCRIPTION
.ad
.fi
Modified: trunk/dports/mail/postfix/files/patch-proxymap.8
===================================================================
--- trunk/dports/mail/postfix/files/patch-proxymap.8 2007-10-18 05:26:18 UTC (rev 30007)
+++ trunk/dports/mail/postfix/files/patch-proxymap.8 2007-10-18 05:34:44 UTC (rev 30008)
@@ -1,11 +0,0 @@
---- man/man8/proxymap.8 Sun Feb 6 10:28:39 2005
-+++ man/man8/proxymap.8.new Thu Jul 7 11:26:25 2005
-@@ -33,7 +33,7 @@
- .sp
- virtual_alias_maps =
- .ti +4
--proxy:mysql:/etc/postfix/virtual_alias.cf
-+proxy:mysql:__PREFIX/etc/postfix/virtual_alias.cf
- .sp
- The total number of connections is limited by the number of
- proxymap server processes.
Modified: trunk/dports/mail/postfix/files/patch-regexp_table.5
===================================================================
--- trunk/dports/mail/postfix/files/patch-regexp_table.5 2007-10-18 05:26:18 UTC (rev 30007)
+++ trunk/dports/mail/postfix/files/patch-regexp_table.5 2007-10-18 05:34:44 UTC (rev 30008)
@@ -1,14 +1,14 @@
---- man/man5/regexp_table.5 Sat Feb 5 11:22:26 2005
-+++ man/man5/regexp_table.5.new Thu Jul 7 11:09:30 2005
+--- man/man5/regexp_table.5.org 2007-10-17 21:20:20.000000000 -0700
++++ man/man5/regexp_table.5 2007-10-17 21:22:48.000000000 -0700
@@ -8,9 +8,9 @@
.SH "SYNOPSIS"
.na
.nf
--\fBpostmap -fq "\fIstring\fB" regexp:/etc/postfix/\fIfilename\fR
-+\fBpostmap -fq "\fIstring\fB" regexp:__PREFIX/etc/postfix/\fIfilename\fR
+-\fBpostmap -q "\fIstring\fB" regexp:/etc/postfix/\fIfilename\fR
++\fBpostmap -q "\fIstring\fB" regexp:__PREFIX/etc/postfix/\fIfilename\fR
--\fBpostmap -fq - regexp:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
-+\fBpostmap -fq - regexp:__PREFIX/etc/postfix/\fIfilename\fR <\fIinputfile\fR
+-\fBpostmap -q - regexp:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
++\fBpostmap -q - regexp:__PREFIX/etc/postfix/\fIfilename\fR <\fIinputfile\fR
.SH DESCRIPTION
.ad
.fi
Modified: trunk/dports/mail/postfix/files/patch-relocated.5
===================================================================
--- trunk/dports/mail/postfix/files/patch-relocated.5 2007-10-18 05:26:18 UTC (rev 30007)
+++ trunk/dports/mail/postfix/files/patch-relocated.5 2007-10-18 05:34:44 UTC (rev 30008)
@@ -1,5 +1,5 @@
---- man/man5/relocated.5 Tue Feb 22 23:46:38 2005
-+++ man/man5/relocated.5.new Thu Jul 7 11:24:34 2005
+--- man/man5/relocated.5.org 2007-10-17 21:47:02.000000000 -0700
++++ man/man5/relocated.5 2007-10-17 21:48:14.000000000 -0700
@@ -8,7 +8,7 @@
.SH "SYNOPSIS"
.na
@@ -13,8 +13,8 @@
that serves as input to the \fBpostmap\fR(1) command.
The result, an indexed file in \fBdbm\fR or \fBdb\fR format,
is used for fast searching by the mail system. Execute the command
--"\fBpostmap /etc/postfix/relocated\fR" in order to rebuild the indexed
-+"\fBpostmap __PREFIX/etc/postfix/relocated\fR" in order to rebuild the indexed
- file after changing the relocated table.
+-"\fBpostmap /etc/postfix/relocated\fR" to rebuild an indexed
++"\fBpostmap __PREFIX/etc/postfix/relocated\fR" to rebuild an indexed
+ file after changing the corresponding relocated table.
When the table is provided via other means such as NIS, LDAP
Deleted: trunk/dports/mail/postfix/files/patch-sample-misc.cf
===================================================================
--- trunk/dports/mail/postfix/files/patch-sample-misc.cf 2007-10-18 05:26:18 UTC (rev 30007)
+++ trunk/dports/mail/postfix/files/patch-sample-misc.cf 2007-10-18 05:34:44 UTC (rev 30008)
@@ -1,31 +0,0 @@
---- conf/sample-misc.cf Sat Jun 21 13:20:44 2003
-+++ conf/sample-misc.cf.new Sat Jun 21 13:22:18 2003
-@@ -357,14 +357,14 @@
- # The daemon_directory parameter specifies the location of Postfix
- # support programs and daemons. This directory must be owned by root.
- #
--daemon_directory = /usr/libexec/postfix
-+daemon_directory = __PREFIX/libexec/postfix
-
- # The queue_directory specifies the location of the Postfix queue.
- # This is also the root directory of Postfix daemons that run chrooted.
- # The files in the examples/chroot-setup subdirectory describe how
- # to set up Postfix chroot environments on different UNIX systems.
- #
--queue_directory = /var/spool/postfix
-+queue_directory = __PREFIX/var/spool/postfix
-
- # The recipient_delimiter parameter specifies the separator between
- # user names and address extensions (user+foo). See canonical(5),
-@@ -421,9 +421,9 @@
- # By default, this feature is disabled.
- #
- # Specify the types and names of databases to use. After change,
--# run "postmap /etc/postfix/relocated", then "postfix reload".
-+# run "postmap __PREFIX/etc/postfix/relocated", then "postfix reload".
- #
--#relocated_maps = hash:/etc/postfix/relocated
-+#relocated_maps = hash:__PREFIX/etc/postfix/relocated
- relocated_maps =
-
- # The resolve_dequoted_address parameter controls how Postfix
Modified: trunk/dports/mail/postfix/files/patch-sys_defs.h
===================================================================
--- trunk/dports/mail/postfix/files/patch-sys_defs.h 2007-10-18 05:26:18 UTC (rev 30007)
+++ trunk/dports/mail/postfix/files/patch-sys_defs.h 2007-10-18 05:34:44 UTC (rev 30008)
@@ -1,6 +1,6 @@
---- src/util/sys_defs.h.orig 2006-07-03 22:37:32.000000000 +1000
-+++ src/util/sys_defs.h 2006-08-11 02:11:36.000000000 +1000
-@@ -161,10 +161,10 @@
+--- src/util/sys_defs.h.org 2007-10-17 21:27:59.000000000 -0700
++++ src/util/sys_defs.h 2007-10-17 21:32:35.000000000 -0700
+@@ -185,10 +185,10 @@
#define HAS_DB
#define HAS_SA_LEN
#define DEF_DB_TYPE "hash"
@@ -13,10 +13,10 @@
#define USE_STATFS
#define STATFS_IN_SYS_MOUNT_H
#define HAS_POSIX_REGEXP
-@@ -178,11 +178,11 @@
- # define HAS_IPV6
+@@ -203,11 +203,11 @@
# define HAVE_GETIFADDRS
#endif
+ #define HAS_FUTIMES /* XXX Guessing */
-#define NATIVE_SENDMAIL_PATH "/usr/sbin/sendmail"
-#define NATIVE_MAILQ_PATH "/usr/bin/mailq"
-#define NATIVE_NEWALIAS_PATH "/usr/bin/newaliases"
@@ -27,6 +27,6 @@
+#define NATIVE_NEWALIAS_PATH "__PREFIX/bin/newaliases"
+#define NATIVE_COMMAND_DIR "__PREFIX/sbin"
+#define NATIVE_DAEMON_DIR "__PREFIX/libexec/postfix"
+ #define SOCKADDR_SIZE socklen_t
+ #define SOCKOPT_SIZE socklen_t
#endif
-
- /*
Modified: trunk/dports/mail/postfix/files/patch-transport.5
===================================================================
--- trunk/dports/mail/postfix/files/patch-transport.5 2007-10-18 05:26:18 UTC (rev 30007)
+++ trunk/dports/mail/postfix/files/patch-transport.5 2007-10-18 05:34:44 UTC (rev 30008)
@@ -1,5 +1,5 @@
---- man/man5/transport.5 Tue Feb 8 04:48:14 2005
-+++ man/man5/transport.5.new Thu Jul 7 11:17:58 2005
+--- man/man5/transport.5.org 2007-10-17 21:51:38.000000000 -0700
++++ man/man5/transport.5 2007-10-17 21:53:52.000000000 -0700
@@ -8,11 +8,11 @@
.SH "SYNOPSIS"
.na
@@ -15,12 +15,12 @@
.SH DESCRIPTION
.ad
.fi
-@@ -40,7 +40,7 @@
+@@ -52,7 +52,7 @@
that serves as input to the \fBpostmap\fR(1) command.
The result, an indexed file in \fBdbm\fR or \fBdb\fR format, is used
for fast searching by the mail system. Execute the command
--"\fBpostmap /etc/postfix/transport\fR" in order to rebuild the indexed
-+"\fBpostmap __PREFIX/etc/postfix/transport\fR" in order to rebuild the indexed
- file after changing the transport table.
+-"\fBpostmap /etc/postfix/transport\fR" to rebuild an indexed
++"\fBpostmap __PREFIX/etc/postfix/transport\fR" to rebuild an indexed
+ file after changing the corresponding transport table.
When the table is provided via other means such as NIS, LDAP
Modified: trunk/dports/mail/postfix/files/patch-virtual.5
===================================================================
--- trunk/dports/mail/postfix/files/patch-virtual.5 2007-10-18 05:26:18 UTC (rev 30007)
+++ trunk/dports/mail/postfix/files/patch-virtual.5 2007-10-18 05:34:44 UTC (rev 30008)
@@ -1,5 +1,5 @@
---- man/man5/virtual.5 Thu Mar 31 01:51:33 2005
-+++ man/man5/virtual.5.new Thu Jul 7 11:17:30 2005
+--- man/man5/virtual.5.org 2007-10-17 22:02:22.000000000 -0700
++++ man/man5/virtual.5 2007-10-17 22:05:13.000000000 -0700
@@ -8,11 +8,11 @@
.SH "SYNOPSIS"
.na
@@ -15,31 +15,31 @@
.SH DESCRIPTION
.ad
.fi
-@@ -44,7 +44,7 @@
+@@ -45,7 +45,7 @@
that serves as input to the \fBpostmap\fR(1) command.
The result, an indexed file in \fBdbm\fR or \fBdb\fR format,
is used for fast searching by the mail system. Execute the command
--"\fBpostmap /etc/postfix/virtual\fR" in order to rebuild the indexed
-+"\fBpostmap __PREFIX/etc/postfix/virtual\fR" in order to rebuild the indexed
- file after changing the text file.
+-"\fBpostmap /etc/postfix/virtual\fR" to rebuild an indexed
++"\fBpostmap __PREFIX/etc/postfix/virtual\fR" to rebuild an indexed
+ file after changing the corresponding text file.
When the table is provided via other means such as NIS, LDAP
-@@ -145,15 +145,15 @@
-
+@@ -164,15 +164,15 @@
Support for a virtual alias domain looks like:
+ .nf
-/etc/postfix/main.cf:
+- virtual_alias_maps = hash:/etc/postfix/virtual
+__PREFIX/etc/postfix/main.cf:
- .in +4
--virtual_alias_maps = hash:/etc/postfix/virtual
-+virtual_alias_maps = hash:__PREFIX/etc/postfix/virtual
++ virtual_alias_maps = hash:__PREFIX/etc/postfix/virtual
+ .fi
Note: some systems use \fBdbm\fR databases instead of \fBhash\fR.
See the output from "\fBpostconf -m\fR" for available database types.
- .ti -4
+ .nf
-/etc/postfix/virtual:
+__PREFIX/etc/postfix/virtual:
- .nf
- .na
- \fIvirtual-alias.domain anything\fR (right-hand content does not matter)
+ \fIvirtual-alias.domain anything\fR (right-hand content does not matter)
+ \fIpostmaster at virtual-alias.domain postmaster\fR
+ \fIuser1 at virtual-alias.domain address1\fR
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071017/116f12ff/attachment-0001.html
More information about the macports-changes
mailing list