[93223] trunk/dports/php/php5-esmtp

[ryandesign at macports.org]

Revision: 93223
          https://trac.macports.org/changeset/93223
Author:   ryandesign at macports.org
Date:     2012-05-17 17:08:59 -0700 (Thu, 17 May 2012)
Log Message:
-----------
php5-esmtp: use an upstream patch file instead of a reinplace

Modified Paths:
--------------
    trunk/dports/php/php5-esmtp/Portfile

Added Paths:
-----------
    trunk/dports/php/php5-esmtp/files/
    trunk/dports/php/php5-esmtp/files/309809.diff

Modified: trunk/dports/php/php5-esmtp/Portfile
===================================================================
--- trunk/dports/php/php5-esmtp/Portfile	2012-05-18 00:00:32 UTC (rev 93222)
+++ trunk/dports/php/php5-esmtp/Portfile	2012-05-18 00:08:59 UTC (rev 93223)
@@ -19,10 +19,7 @@
                 sha1    2c0c206decfd2e87e2731ca33ce55215ca713b92 \
                 rmd160  96dec77e466461d57bf3fe244be6adba08c08969
 
-post-patch {
-    # Fix typo
-    reinplace {s/"esmtp/"$esmtp/} ${worksrcpath}/config.m4
-}
+patchfiles      309809.diff
 
 depends_lib-append \
     port:libesmtp

Added: trunk/dports/php/php5-esmtp/files/309809.diff
===================================================================
--- trunk/dports/php/php5-esmtp/files/309809.diff	                        (rev 0)
+++ trunk/dports/php/php5-esmtp/files/309809.diff	2012-05-18 00:08:59 UTC (rev 93223)
@@ -0,0 +1,45 @@
+http://svn.php.net/viewvc?view=revision&revision=309809
+--- config.m4	2011/03/29 13:33:24	309808
++++ config.m4	2011/03/29 15:30:43	309809
+@@ -23,10 +23,10 @@
+     echo "Error: libesmtp-config not found."
+     exit 1
+   fi
+-  
++
+   IFS=".r"; set $libesmtp_version; IFS=' '
+   esmtp_libesmtp_version=`expr [$]1 \* 1000000 + [$]2 \* 1000 + [$]3`
+-  if test "esmtp_libesmtp_version" -ge 1000003; then
++  if test "$esmtp_libesmtp_version" -ge 1000003; then
+     echo "checking for libESMTP version ... $libesmtp_version (ok)"
+   else
+     echo "checking for libESMTP version ... $libesmtp_version (Error: you need libESMTP version 1.0.3r1 or newer installed to build esmtp)"
+@@ -34,15 +34,15 @@
+   fi
+ 
+   dnl check PHP version
+-  php_version=`$PHP_CONFIG --version 2>/dev/null|head -n 1|sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'`
++  php_version=`$PHP_CONFIG --version 2>/dev/null|head -n 1|sed -e 's/^[^0-9]*//' -e 's/[a-z-]* *$//'`
+   if test -z "$php_version"; then
+     echo "Error: php/php-config not found."
+     exit 1
+   fi
+-  
+-  IFS=.; set $php_version; IFS=' '
++
++  IFS=".-"; set $php_version; IFS=' '
+   esmtp_php_version=`expr [$]1 \* 1000000 + [$]2 \* 1000 + [$]3`
+-  if test "esmtp_php_version" -ge 4003002; then
++  if test "$esmtp_php_version" -ge 4003002; then
+     echo "checking for PHP version ... $php_version (ok)"
+   else
+     echo "checking for PHP version ... $php_version (Error: you need PHP version 4.3.2 or newer installed to build esmtp)"
+@@ -68,7 +68,7 @@
+         PHP_NEW_EXTENSION(esmtp, esmtp.c, $ext_shared)
+       else
+         echo "Error: php version $php_version is unsupported."
+-	exit 1
++        exit 1
+       fi
+     fi
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120517/65646d6f/attachment.html>