[65036] trunk/dports/archivers/zlib

[ryandesign at macports.org]

Revision: 65036
          http://trac.macports.org/changeset/65036
Author:   ryandesign at macports.org
Date:     2010-03-19 17:45:05 -0700 (Fri, 19 Mar 2010)
Log Message:
-----------
zlib: fix build problems many ports have with zlib 1.2.4 when they erroneously define _LARGEFILE64_SOURCE; see #24067

Modified Paths:
--------------
    trunk/dports/archivers/zlib/Portfile

Added Paths:
-----------
    trunk/dports/archivers/zlib/files/
    trunk/dports/archivers/zlib/files/zlib.h.diff

Modified: trunk/dports/archivers/zlib/Portfile
===================================================================
--- trunk/dports/archivers/zlib/Portfile	2010-03-19 23:57:34 UTC (rev 65035)
+++ trunk/dports/archivers/zlib/Portfile	2010-03-20 00:45:05 UTC (rev 65036)
@@ -4,6 +4,7 @@
 
 name                    zlib
 version                 1.2.4
+revision                1
 categories              archivers
 maintainers             landonf ryandesign openmaintainer
 license                 zlib
@@ -25,6 +26,8 @@
                         sha1    8cf10521c1927daa5e12efc5e1725a0d70e579f3 \
                         rmd160  8f0f17e33e36fa1427f8186b6d12cf5b2240294a
 
+patchfiles              zlib.h.diff
+
 configure.universal_args
 
 # Respect build_arch

Added: trunk/dports/archivers/zlib/files/zlib.h.diff
===================================================================
--- trunk/dports/archivers/zlib/files/zlib.h.diff	                        (rev 0)
+++ trunk/dports/archivers/zlib/files/zlib.h.diff	2010-03-20 00:45:05 UTC (rev 65036)
@@ -0,0 +1,20 @@
+--- zlib.h.orig	2010-03-15 03:23:32.000000000 +1100
++++ zlib.h	2010-03-17 15:53:25.000000000 +1100
+@@ -1556,7 +1556,7 @@
+         inflateBackInit_((strm), (windowBits), (window), \
+                                             ZLIB_VERSION, sizeof(z_stream))
+ 
+-#ifdef _LARGEFILE64_SOURCE
++#if defined(_LARGEFILE64_SOURCE) && !defined(__APPLE__)
+    ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+    ZEXTERN off64_t ZEXPORT gzseek64 OF((gzFile, off64_t, int));
+    ZEXTERN off64_t ZEXPORT gztell64 OF((gzFile));
+@@ -1572,7 +1572,7 @@
+ #  define gzoffset gzoffset64
+ #  define adler32_combine adler32_combine64
+ #  define crc32_combine crc32_combine64
+-#  ifndef _LARGEFILE64_SOURCE
++#  if !defined(_LARGEFILE64_SOURCE) || defined(__APPLE__)
+      ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+      ZEXTERN off_t ZEXPORT gzseek64 OF((gzFile, off_t, int));
+      ZEXTERN off_t ZEXPORT gztell64 OF((gzFile));
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100319/f13e76fc/attachment.html>