[110777] trunk/dports/mail/postfix

pixilla at macports.org pixilla at macports.org
Thu Sep 5 12:42:01 PDT 2013


Revision: 110777
          https://trac.macports.org/changeset/110777
Author:   pixilla at macports.org
Date:     2013-09-05 12:42:00 -0700 (Thu, 05 Sep 2013)
Log Message:
-----------
mail/postfix:
- Update to version 2.10.2. (openmaintainer)
- Update patchfile line numbers. (hunk warnings)

Modified Paths:
--------------
    trunk/dports/mail/postfix/Portfile
    trunk/dports/mail/postfix/files/patch-mail_params.h
    trunk/dports/mail/postfix/files/patch-makedefs
    trunk/dports/mail/postfix/files/patch-postfix-install
    trunk/dports/mail/postfix/files/patch-sys_defs.h

Modified: trunk/dports/mail/postfix/Portfile
===================================================================
--- trunk/dports/mail/postfix/Portfile	2013-09-05 15:54:58 UTC (rev 110776)
+++ trunk/dports/mail/postfix/Portfile	2013-09-05 19:42:00 UTC (rev 110777)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
 PortSystem  1.0
@@ -3,5 +4,5 @@
 
 name            postfix
-version         2.10.1
+version         2.10.2
 categories      mail
 license         IBMPL-1
@@ -15,8 +16,8 @@
             Postfix act as delivery daemon for ezmlm-idx.
 homepage        http://www.postfix.org/
 platforms       darwin
-checksums       rmd160 b288bf24cadcf2ccf3306a395bad084ba23e3683 \
-                sha256 2e85a62e97418bbb022b4d4433098a7f25adc7dc707c37d9984db2c2f314b1c1
+checksums       rmd160  c5c7ecdc1a4e27b8eba2125e22f39860488db0e0 \
+                sha256  f1a735a5a9ffeac8fca59046c437c3b76e7f923fb4249db2a55b2bff0306ddd4
 
 master_sites    http://archive.mgm51.com/mirrors/postfix-source/official/ \
                 http://de.postfix.org/ftpmirror/official/ \
@@ -149,6 +150,14 @@
 sudo launchctl unload -w /System/Library/LaunchDaemons/org.postfix.master.plist
 "
 
+if {[variant_isset mariadb]} {
+    default_variants +mariadb55
+}
+
+if {[variant_isset percona]} {
+    default_variants +percona55
+}
+
 variant pcre description "add pcre support" {
     set CCARGS      [ldelete ${CCARGS} -DNO_PCRE]
     lappend CCARGS  -DHAS_PCRE "-I${prefix}/include"
@@ -175,34 +184,34 @@
 }
 
 # Keep the mysql5 variant until the mysql5 port is replaced_by mysql51 port.
-variant mysql5  conflicts mysql51 mysql55 mariadb percona description "add MySQL support via mysql5" {
+variant mysql5  conflicts mysql51 mysql55 mariadb55 percona55 description "add MySQL support via mysql5" {
     depends_lib-append path:bin/mysql_config5:mysql5
     lappend CCARGS  -DHAS_MYSQL "-I${prefix}/include/mysql5/mysql"
     lappend AUXLIBS "-L${prefix}/lib/mysql5/mysql" -lmysqlclient -lz -lm
 }
 
-variant mysql51 conflicts mysql5 mysql55 mariadb percona description "add MySQL support via mysql51" {
+variant mysql51 conflicts mysql5 mysql55 mariadb55 percona55 description "add MySQL support via mysql51" {
     depends_lib-append port:mysql51
     lappend CCARGS  -DHAS_MYSQL "-I${prefix}/include/mysql51/mysql"
     lappend AUXLIBS "-L${prefix}/lib/mysql51/mysql" -lmysqlclient -lz -lm
 }
 
-variant mysql55 conflicts mysql5 mysql51 mariadb percona description "add MySQL support via mysql55" {
+variant mysql55 conflicts mysql5 mysql51 mariadb55 percona55 description "add MySQL support via mysql55" {
     depends_lib-append port:mysql55
     lappend CCARGS  -DHAS_MYSQL "-I${prefix}/include/mysql55/mysql"
     lappend AUXLIBS "-L${prefix}/lib/mysql55/mysql" -lmysqlclient -lz -lm
 }
 
-variant mariadb conflicts mysql5 mysql51 mysql55 percona description "add MySQL support via mariadb" {
-    depends_lib-append port:mariadb
-    lappend CCARGS  -DHAS_MYSQL "-I${prefix}/include/mariadb/mysql"
-    lappend AUXLIBS "-L${prefix}/lib/mariadb/mysql" -lmysqlclient -lz -lm
+variant mariadb55 conflicts mysql5 mysql51 mysql55 percona55 description "add MySQL support via mariadb55" {
+    depends_lib-append port:mariadb55
+    lappend CCARGS  -DHAS_MYSQL "-I${prefix}/include/mariadb55/mysql"
+    lappend AUXLIBS "-L${prefix}/lib/mariadb55/mysql" -lmysqlclient -lz -lm
 }
 
-variant percona conflicts mysql5 mysql51 mysql55 mariadb description "add MySQL support via percona" {
-    depends_lib-append port:percona
-    lappend CCARGS  -DHAS_MYSQL "-I${prefix}/include/percona/mysql"
-    lappend AUXLIBS "-L${prefix}/lib/percona/mysql" -lmysqlclient -lz -lm
+variant percona55 conflicts mysql5 mysql51 mysql55 mariadb55 description "add MySQL support via percona55" {
+    depends_lib-append port:percona55
+    lappend CCARGS  -DHAS_MYSQL "-I${prefix}/include/percona55/mysql"
+    lappend AUXLIBS "-L${prefix}/lib/percona55/mysql" -lmysqlclient -lz -lm
 }
 
 variant postgresql83 conflicts postgresql84 postgresql90 postgresql91 postgresql92 description "add postgresql support via postgresql83" {

Modified: trunk/dports/mail/postfix/files/patch-mail_params.h
===================================================================
--- trunk/dports/mail/postfix/files/patch-mail_params.h	2013-09-05 15:54:58 UTC (rev 110776)
+++ trunk/dports/mail/postfix/files/patch-mail_params.h	2013-09-05 19:42:00 UTC (rev 110777)
@@ -1,6 +1,6 @@
---- src/global/mail_params.h	Mon Feb 28 02:06:07 2005
-+++ src/global/mail_params.h.new	Thu Jul  7 11:35:14 2005
-@@ -212,7 +212,7 @@
+--- src/global/mail_params.h	2013-09-05 12:24:12.000000000 -0700
++++ src/global/mail_params.h.new	2013-09-05 12:22:41.000000000 -0700
+@@ -241,7 +241,7 @@
    */
  #define VAR_QUEUE_DIR	"queue_directory"
  #ifndef DEF_QUEUE_DIR
@@ -9,7 +9,7 @@
  #endif
  extern char *var_queue_dir;
  
-@@ -221,13 +221,13 @@
+@@ -250,13 +250,13 @@
    */
  #define VAR_DAEMON_DIR		"daemon_directory"
  #ifndef DEF_DAEMON_DIR
@@ -25,7 +25,7 @@
  #endif
  extern char *var_command_dir;
  
-@@ -250,7 +250,7 @@
+@@ -288,7 +288,7 @@
    */
  #define VAR_CONFIG_DIR		"config_directory"
  #ifndef DEF_CONFIG_DIR
@@ -34,7 +34,7 @@
  #endif
  extern char *var_config_dir;
  
-@@ -1966,22 +1966,22 @@
+@@ -2489,22 +2489,22 @@
    */
  #define VAR_SENDMAIL_PATH		"sendmail_path"
  #ifndef DEF_SENDMAIL_PATH

Modified: trunk/dports/mail/postfix/files/patch-makedefs
===================================================================
--- trunk/dports/mail/postfix/files/patch-makedefs	2013-09-05 15:54:58 UTC (rev 110776)
+++ trunk/dports/mail/postfix/files/patch-makedefs	2013-09-05 19:42:00 UTC (rev 110777)
@@ -1,6 +1,6 @@
---- makedefs.orig	2011-01-17 08:02:31.000000000 +1100
-+++ makedefs	2011-01-30 11:06:45.000000000 +1100
-@@ -413,8 +413,7 @@
+--- makedefs.orig	2013-09-05 12:24:11.000000000 -0700
++++ makedefs	2013-09-05 12:22:40.000000000 -0700
+@@ -458,8 +458,7 @@
  		# Darwin > 1.3 uses awk and flat_namespace
  		case $RELEASE in
  		 1.[0-3]) AWK=gawk;;

Modified: trunk/dports/mail/postfix/files/patch-postfix-install
===================================================================
--- trunk/dports/mail/postfix/files/patch-postfix-install	2013-09-05 15:54:58 UTC (rev 110776)
+++ trunk/dports/mail/postfix/files/patch-postfix-install	2013-09-05 19:42:00 UTC (rev 110777)
@@ -1,6 +1,6 @@
---- postfix-install	Thu Feb  3 08:39:36 2005
-+++ postfix-install.new	Thu Jul  7 11:48:35 2005
-@@ -614,24 +614,17 @@
+--- postfix-install	2013-09-05 12:24:11.000000000 -0700
++++ postfix-install.new	2013-09-05 12:22:40.000000000 -0700
+@@ -625,24 +625,17 @@
      [hl]) eval source=$owner;;
      esac
  

Modified: trunk/dports/mail/postfix/files/patch-sys_defs.h
===================================================================
--- trunk/dports/mail/postfix/files/patch-sys_defs.h	2013-09-05 15:54:58 UTC (rev 110776)
+++ trunk/dports/mail/postfix/files/patch-sys_defs.h	2013-09-05 19:42:00 UTC (rev 110777)
@@ -1,6 +1,6 @@
---- src/util/sys_defs.h.orig	2010-06-02 09:56:57.000000000 +1000
-+++ src/util/sys_defs.h	2010-06-16 00:51:47.000000000 +1000
-@@ -206,9 +206,9 @@
+--- src/util/sys_defs.h.orig	2013-09-05 12:24:13.000000000 -0700
++++ src/util/sys_defs.h	2013-09-05 12:22:41.000000000 -0700
+@@ -216,9 +216,9 @@
  #define HAS_DB
  #define HAS_SA_LEN
  #define DEF_DB_TYPE	"hash"
@@ -12,7 +12,7 @@
  #define USE_STATFS
  #define STATFS_IN_SYS_MOUNT_H
  #define HAS_POSIX_REGEXP
-@@ -223,11 +223,11 @@
+@@ -233,11 +233,11 @@
  # define HAVE_GETIFADDRS
  #endif
  #define HAS_FUTIMES			/* XXX Guessing */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130905/82aeb331/attachment.html>


More information about the macports-changes mailing list