[46425] trunk/dports/net/squid

[jmr at macports.org]

Revision: 46425
          http://trac.macports.org/changeset/46425
Author:   jmr at macports.org
Date:     2009-02-04 11:51:37 -0800 (Wed, 04 Feb 2009)
Log Message:
-----------
squid:
 * update to 2.7.STABLE6
 * use ed instead of patch to fix autoconf.h, so it works on all machines

Modified Paths:
--------------
    trunk/dports/net/squid/Portfile

Added Paths:
-----------
    trunk/dports/net/squid/files/include_autoconf.h.ed

Removed Paths:
-------------
    trunk/dports/net/squid/files/patch-include_autoconf.h.diff

Modified: trunk/dports/net/squid/Portfile
===================================================================
--- trunk/dports/net/squid/Portfile	2009-02-04 19:45:21 UTC (rev 46424)
+++ trunk/dports/net/squid/Portfile	2009-02-04 19:51:37 UTC (rev 46425)
@@ -4,8 +4,7 @@
 PortSystem 1.0
 
 name            squid
-version         2.7.STABLE5
-revision        1
+version         2.7.STABLE6
 set branch      [join [lrange [split ${version} .] 0 1] .]
 categories      net
 platforms       darwin
@@ -31,9 +30,9 @@
                 http://www.squid-cache.org/Versions/v2/${branch}/ \
                 ftp://ftp.squid-cache.org/pub/squid-2/STABLE/
 
-checksums       md5 5d495d285b3b951a5859c660463e9832 \
-                sha1 fe187a291050a907b5cc51e21d6304abcb703c16 \
-                rmd160 837ee1564be17f1f5c5d4d6c7e6855b305397221
+checksums       md5 6de3a6a7a56a7ecae092f2d31a04f039 \
+                sha1 b4b323be1ff3617a22070c243b2504f30d6b302d \
+                rmd160 d804175b95c6b026abed505b086eeaa2c479d2e2
 
 use_bzip2       yes
 patchfiles      patch-cf.data.pre.diff
@@ -54,8 +53,8 @@
                 --enable-removal-policies \
                 --enable-storeio=ufs,aufs,diskd,coss,null
 post-configure {
-    if {[variant_isset universal] && [lsearch -glob ${universal_archs} *64] != -1} {
-        system "cd ${worksrcpath} && patch -p0 < ${filespath}/patch-include_autoconf.h.diff && touch include/stamp-h1"
+    if {[variant_isset universal]} {
+        system "cd ${worksrcpath} && ed - ${worksrcpath}/include/autoconf.h < ${filespath}/include_autoconf.h.ed && touch include/stamp-h1"
     }
 }
 

Added: trunk/dports/net/squid/files/include_autoconf.h.ed
===================================================================
--- trunk/dports/net/squid/files/include_autoconf.h.ed	                        (rev 0)
+++ trunk/dports/net/squid/files/include_autoconf.h.ed	2009-02-04 19:51:37 UTC (rev 46425)
@@ -0,0 +1,22 @@
+/#define SIZEOF_LONG/c
+#ifdef __LP64__
+#define SIZEOF_LONG 8
+#else
+#define SIZEOF_LONG 4
+#endif
+.
+/#define SIZEOF_SIZE_T/c
+#ifdef __LP64__
+#define SIZEOF_SIZE_T 8
+#else
+#define SIZEOF_SIZE_T 4
+#endif
+.
+/#define SIZEOF_VOID_P/c
+#ifdef __LP64__
+#define SIZEOF_VOID_P 8
+#else
+#define SIZEOF_VOID_P 4
+#endif
+.
+w

Deleted: trunk/dports/net/squid/files/patch-include_autoconf.h.diff
===================================================================
--- trunk/dports/net/squid/files/patch-include_autoconf.h.diff	2009-02-04 19:45:21 UTC (rev 46424)
+++ trunk/dports/net/squid/files/patch-include_autoconf.h.diff	2009-02-04 19:51:37 UTC (rev 46425)
@@ -1,38 +0,0 @@
---- include/autoconf.h.orig	2009-01-13 02:20:42.000000000 +1100
-+++ include/autoconf.h	2009-01-13 02:35:32.000000000 +1100
-@@ -710,7 +710,11 @@
- #define SIZEOF_INT8_T 1
- 
- /* The size of `long', as computed by sizeof. */
-+#ifdef __LP64__
- #define SIZEOF_LONG 8
-+#else
-+#define SIZEOF_LONG 4
-+#endif
- 
- /* The size of `long long', as computed by sizeof. */
- #define SIZEOF_LONG_LONG 8
-@@ -722,7 +726,11 @@
- #define SIZEOF_SHORT 2
- 
- /* The size of `size_t', as computed by sizeof. */
-+#ifdef __LP64__
- #define SIZEOF_SIZE_T 8
-+#else
-+#define SIZEOF_SIZE_T 4
-+#endif
- 
- /* The size of `uint16_t', as computed by sizeof. */
- #define SIZEOF_UINT16_T 2
-@@ -749,7 +757,11 @@
- #define SIZEOF_U_INT8_T 1
- 
- /* The size of `void *', as computed by sizeof. */
-+#ifdef __LP64__
- #define SIZEOF_VOID_P 8
-+#else
-+#define SIZEOF_VOID_P 4
-+#endif
- 
- /* The size of `__int64', as computed by sizeof. */
- #define SIZEOF___INT64 0
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090204/88df71b0/attachment.html>