[62516] trunk/dports/archivers/gzip

[nox at macports.org]

Revision: 62516
          http://trac.macports.org/changeset/62516
Author:   nox at macports.org
Date:     2010-01-09 11:34:21 -0800 (Sat, 09 Jan 2010)
Log Message:
-----------
Update gzip to 1.3.13 (#23153)

Also install documentation and enable parallel building; the rsyncable patch
is also always applied (a additional flag shouldn't be a variant).

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

Added Paths:
-----------
    trunk/dports/archivers/gzip/files/patch-getopt.diff

Modified: trunk/dports/archivers/gzip/Portfile
===================================================================
--- trunk/dports/archivers/gzip/Portfile	2010-01-09 19:34:07 UTC (rev 62515)
+++ trunk/dports/archivers/gzip/Portfile	2010-01-09 19:34:21 UTC (rev 62516)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name            gzip
-version         1.3.12
+version         1.3.13
 categories      archivers
 platforms       darwin freebsd
 maintainers     mww
@@ -15,18 +15,25 @@
 
 homepage        http://www.gzip.org/
 master_sites    gnu
-checksums       sha1 264e82876f201d9576626fbb1e0e9fe458efe9b9 \
-                rmd160 857172d207d87abe5fb52f6e7dd0474a421b0d79
 
-configure.args  --mandir=\\\${prefix}/share/man \
-                --infodir=\\\${prefix}/share/info \
-                DEFS=NO_ASM
+checksums       md5     c54a31b93e865f6a4410b2dc64662706 \
+                sha1    7b8cc01af1ba90cb4b5854b6c0510999823174cf \
+                rmd160  8d797e57ab64e1c29d17869f511292f816143d9d
 
-test.run        yes
-test.target     check
+patchfiles \
+    patch-gzip-rsyncable.diff \
+    patch-getopt.diff
 
-destroot.destdir    prefix=${destroot}${prefix}
+configure.args  DEFS=NO_ASM
 
-variant rsyncable description {support the --rsyncable flag} {
-    patchfiles-append patch-gzip-rsyncable.diff
+use_parallel_build yes
+
+post-destroot {
+    set docdir ${prefix}/share/doc/${name}
+    xinstall -d ${destroot}${docdir}
+    xinstall -m 644 -W ${worksrcpath} AUTHORS COPYING ChangeLog NEWS README \
+        THANKS TODO ${destroot}${docdir}
 }
+
+test.run        yes
+test.target     check

Added: trunk/dports/archivers/gzip/files/patch-getopt.diff
===================================================================
--- trunk/dports/archivers/gzip/files/patch-getopt.diff	                        (rev 0)
+++ trunk/dports/archivers/gzip/files/patch-getopt.diff	2010-01-09 19:34:21 UTC (rev 62516)
@@ -0,0 +1,32 @@
+See http://old.nabble.com/Re%3A-getopt-compilation-failure-on-Darwin-%28gzip-1.3.13%29-p25779891.html
+
+--- lib/getopt.in.h
++++ lib/getopt.in.h
+@@ -22,9 +22,13 @@
+ @PRAGMA_SYSTEM_HEADER@
+ #endif
+ 
+-/* The include_next requires a split double-inclusion guard.  */
++/* The include_next requires a split double-inclusion guard.  We must
++   also inform the replacement unistd.h to not recursively use
++   <getopt.h>; our definitions will be present soon enough.  */
+ #if @HAVE_GETOPT_H@
++# define _GL_SYSTEM_GETOPT
+ # @INCLUDE_NEXT@ @NEXT_GETOPT_H@
++# undef _GL_SYSTEM_GETOPT
+ #endif
+ 
+ #ifndef _GL_GETOPT_H
+diff --git lib/unistd.in.h lib/unistd.in.h
+index 38e2e13..b6ea889 100644
+--- lib/unistd.in.h
++++ lib/unistd.in.h
+@@ -49,7 +49,7 @@
+ #endif
+ 
+ /* Get getopt(), optarg, optind, opterr, optopt.  */
+-#if @GNULIB_UNISTD_H_GETOPT@
++#if @GNULIB_UNISTD_H_GETOPT@ && !defined _GL_SYSTEM_GETOPT
+ # include <getopt.h>
+ #endif
+ 
\ No newline at end of file
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100109/10d85a56/attachment-0001.html>