Ticket #23153: gzip-1.3.13.diff

File gzip-1.3.13.diff, 2.7 KB (added by nox@…, 14 years ago)

  • dports/archivers/gzip/Portfile 

    diff --git a/dports/archivers/gzip/Portfile b/dports/archivers/gzip/Portfile
index 70d41cd..fba0afa 100644
    a b  
    33PortSystem 1.0
    44
    55name            gzip
    6 version         1.3.12
     6version         1.3.13
    77categories      archivers
    88platforms       darwin freebsd
    99maintainers     mww
    … … long_description \ 
    1515
    1616homepage        http://www.gzip.org/
    1717master_sites    gnu
    18 checksums       sha1 264e82876f201d9576626fbb1e0e9fe458efe9b9 \
    19                 rmd160 857172d207d87abe5fb52f6e7dd0474a421b0d79
    2018
    21 configure.args  --mandir=\\\${prefix}/share/man \
    22                 --infodir=\\\${prefix}/share/info \
    23                 DEFS=NO_ASM
     19checksums       md5     c54a31b93e865f6a4410b2dc64662706 \
     20                sha1    7b8cc01af1ba90cb4b5854b6c0510999823174cf \
     21                rmd160  8d797e57ab64e1c29d17869f511292f816143d9d
    2422
    25 test.run        yes
    26 test.target     check
     23patchfiles \
     24    patch-gzip-rsyncable.diff \
     25    patch-getopt.diff
     26
     27configure.args  DEFS=NO_ASM
    2728
    28 destroot.destdir    prefix=${destroot}${prefix}
     29use_parallel_build yes
    2930
    30 variant rsyncable description {support the --rsyncable flag} {
    31     patchfiles-append patch-gzip-rsyncable.diff
     31post-destroot {
     32    set docdir ${prefix}/share/doc/${name}
     33    xinstall -d ${destroot}${docdir}
     34    xinstall -m 644 -W ${worksrcpath} AUTHORS COPYING ChangeLog NEWS README \
     35        THANKS TODO ${destroot}${docdir}
    3236}
     37
     38test.run        yes
     39test.target     check

  • new file dports/archivers/gzip/files/patch-getopt.diff 

    diff --git a/dports/archivers/gzip/files/patch-getopt.diff b/dports/archivers/gzip/files/patch-getopt.diff
new file mode 100644
index 0000000..bfa7b9a
    - +  
     1See http://old.nabble.com/Re%3A-getopt-compilation-failure-on-Darwin-%28gzip-1.3.13%29-p25779891.html
     2
     3--- lib/getopt.in.h
     4+++ lib/getopt.in.h
     5@@ -22,9 +22,13 @@
     6 @PRAGMA_SYSTEM_HEADER@
     7 #endif
     8 
     9-/* The include_next requires a split double-inclusion guard.  */
     10+/* The include_next requires a split double-inclusion guard.  We must
     11+   also inform the replacement unistd.h to not recursively use
     12+   <getopt.h>; our definitions will be present soon enough.  */
     13 #if @HAVE_GETOPT_H@
     14+# define _GL_SYSTEM_GETOPT
     15 # @INCLUDE_NEXT@ @NEXT_GETOPT_H@
     16+# undef _GL_SYSTEM_GETOPT
     17 #endif
     18 
     19 #ifndef _GL_GETOPT_H
     20diff --git lib/unistd.in.h lib/unistd.in.h
     21index 38e2e13..b6ea889 100644
     22--- lib/unistd.in.h
     23+++ lib/unistd.in.h
     24@@ -49,7 +49,7 @@
     25 #endif
     26 
     27 /* Get getopt(), optarg, optind, opterr, optopt.  */
     28-#if @GNULIB_UNISTD_H_GETOPT@
     29+#if @GNULIB_UNISTD_H_GETOPT@ && !defined _GL_SYSTEM_GETOPT
     30 # include <getopt.h>
     31 #endif
     32 
     33 No newline at end of file