ports/79207: Update port: mail/postfix fix VDA with old gcc

[Marcus Grando]

The following reply was made to PR ports/79207; it has been noted by GNATS.

From: Marcus Grando <marcus at corp.grupos.com.br>
To: freebsd-gnats-submit at FreeBSD.org, vivek at khera.org
Cc:  
Subject: Re: ports/79207: Update port: mail/postfix fix VDA with old gcc
Date: Sat, 02 Apr 2005 13:22:24 -0300

 This is a multi-part message in MIME format.
 --------------040908070409090702090406
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 Update port: mail/postfix to 2.2.2
 
 - Update postfix to 2.2.2
 - Update VDA patch to 2.2.1
 - Fix compile with old GCC
 - Include patch from this PR: ports/79447
 
 Thanks
 
 -- 
 Marcus Grando
 Grupos Internet S/A
 marcus(at)corp.grupos.com.br
 
 --------------040908070409090702090406
 Content-Type: text/plain;
  name="postfix.patch"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="postfix.patch"
 
 diff -ruN postfix.orig/Makefile postfix/Makefile
 --- postfix.orig/Makefile	Sat Mar 19 20:17:54 2005
 +++ postfix/Makefile	Sat Apr  2 12:56:25 2005
 @@ -15,7 +15,7 @@
  # NOTE: PCRE is enabled by default unless you specifically disable it.
  
  PORTNAME=	postfix
 -PORTVERSION=	2.2.1
 +PORTVERSION=	2.2.2
  PORTEPOCH=	1
  CATEGORIES=	mail ipv6
  MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
 diff -ruN postfix.orig/distinfo postfix/distinfo
 --- postfix.orig/distinfo	Sat Mar 19 20:17:54 2005
 +++ postfix/distinfo	Sat Apr  2 12:56:52 2005
 @@ -1,6 +1,6 @@
 -MD5 (postfix/postfix-2.2.1.tar.gz) = 36b982392b2a490f3c861e5e609124cc
 -SIZE (postfix/postfix-2.2.1.tar.gz) = 2407157
 +MD5 (postfix/postfix-2.2.2.tar.gz) = 1f5f54ec8a832af7faaa71607475b19b
 +SIZE (postfix/postfix-2.2.2.tar.gz) = 2408375
  MD5 (postfix/postfix-libspf2-2.2.0-5.patch) = 80be36e0f14e1a1f39a3b30b9b2d4115
  SIZE (postfix/postfix-libspf2-2.2.0-5.patch) = 26077
 -MD5 (postfix/postfix-2.2.0-vda.patch.gz) = 894915546a4e2bc378d69798dabd58d1
 -SIZE (postfix/postfix-2.2.0-vda.patch.gz) = 7785
 +MD5 (postfix/postfix-2.2.1-vda.patch.gz) = d4ee910876119dde7635d0d6ae27351d
 +SIZE (postfix/postfix-2.2.1-vda.patch.gz) = 7798
 diff -ruN postfix.orig/files/vda_old_gcc.patch postfix/files/vda_old_gcc.patch
 --- postfix.orig/files/vda_old_gcc.patch	Wed Dec 31 21:00:00 1969
 +++ postfix/files/vda_old_gcc.patch	Sat Apr  2 12:55:30 2005
 @@ -0,0 +1,18 @@
 +--- src/virtual/maildir.c.orig	Thu Mar 24 13:51:25 2005
 ++++ src/virtual/maildir.c	Thu Mar 24 13:53:15 2005
 +@@ -225,7 +225,6 @@
 +     int     copy_flags;
 +     struct stat st;
 +     struct timeval starttime;
 +-    GETTIMEOFDAY(&starttime);
 + 
 +     /* Maildir Quota */
 +     const char *limit_res;             /* Limit from map */
 +@@ -239,6 +238,7 @@
 +     struct   stat sizefile_stat;       /* To check the size of the maildirsize file (cannot be larger than 5k) */
 +     time_t   tm;
 + 
 ++    GETTIMEOFDAY(&starttime);
 + 
 +     /*
 +      * Make verbose logging easier to understand.
 diff -ruN postfix.orig/pkg-install postfix/pkg-install
 --- postfix.orig/pkg-install	Sat Mar 19 20:17:54 2005
 +++ postfix/pkg-install	Sat Apr  2 12:56:15 2005
 @@ -29,7 +29,7 @@
  	question=$1
  	default=$2
  	if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then
 -		/usr/bin/read -p "${question} [${default}]? " answer
 +		read -p "${question} [${default}]? " answer
  	fi
  	if [ x${answer} = x ]; then
  		answer=${default}
 diff -ruN postfix.orig/scripts/configure.postfix postfix/scripts/configure.postfix
 --- postfix.orig/scripts/configure.postfix	Sat Mar 19 20:17:54 2005
 +++ postfix/scripts/configure.postfix	Sat Apr  2 12:55:30 2005
 @@ -211,7 +211,8 @@
  			;;
  		VDA)
  			/bin/echo "PATCH_SITES+=	http://web.onda.com.br/nadal/postfix/VDA/"
 -			/bin/echo "PATCHFILES+=		postfix-2.2.0-vda.patch.gz"
 +			/bin/echo "PATCHFILES+=		postfix-2.2.1-vda.patch.gz"
 +			/bin/echo "EXTRA_PATCHES+=	${FILESDIR}/vda_old_gcc.patch"
  			/bin/echo "PATCH_DIST_STRIP=	-p1"
  			;;
  		Test)
 
 --------------040908070409090702090406--