From b555b6e3dc4cef5ebd7408ad284b202ac2828ff4 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Wed, 3 Dec 2014 11:44:45 -0500 Subject: [PATCH] Gzip: add recipe for 1.6, delete old recipes. --- app-arch/gzip/gzip-1.2.4a.recipe | 24 ------- app-arch/gzip/gzip-1.3.12.recipe | 24 ------- app-arch/gzip/gzip-1.4.recipe | 28 -------- app-arch/gzip/gzip-1.6.recipe | 58 ++++++++++++++++ app-arch/gzip/patches/gzip-1.2.4a.patch | 68 ------------------- .../gzip/patches/gzip-1.3.12-downstream.patch | 19 ------ .../gzip/patches/gzip-1.3.12-stdbool_.h.diff | 20 ------ app-arch/gzip/patches/gzip-1.4.patch | 18 ----- 8 files changed, 58 insertions(+), 201 deletions(-) delete mode 100644 app-arch/gzip/gzip-1.2.4a.recipe delete mode 100644 app-arch/gzip/gzip-1.3.12.recipe delete mode 100644 app-arch/gzip/gzip-1.4.recipe create mode 100644 app-arch/gzip/gzip-1.6.recipe delete mode 100644 app-arch/gzip/patches/gzip-1.2.4a.patch delete mode 100644 app-arch/gzip/patches/gzip-1.3.12-downstream.patch delete mode 100644 app-arch/gzip/patches/gzip-1.3.12-stdbool_.h.diff delete mode 100644 app-arch/gzip/patches/gzip-1.4.patch diff --git a/app-arch/gzip/gzip-1.2.4a.recipe b/app-arch/gzip/gzip-1.2.4a.recipe deleted file mode 100644 index 41c28df97..000000000 --- a/app-arch/gzip/gzip-1.2.4a.recipe +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY="gzip compression utilities and libraries" -DESCRIPTION=" -gzip (GNU zip) is a compression utility designed to be a \ -replacement for compress. It provides better compression than compress \ -and although bzip2 produces smaller files is not as fast as bzip2 is. -" -HOMEPAGE="http://www.gzip.org/" -SRC_URI="ftp://ftp.gnu.org/gnu/gzip/gzip-1.2.4a.tar.gz" -CHECKSUM_MD5="39053e044b18ecd0627f80fbe7cfeaad" -REVISION="1" -STATUS_HAIKU="untested" -DEPEND="" -BUILD() -{ - cd gzip-1.2.4a - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd gzip-1.2.4a - make install -} diff --git a/app-arch/gzip/gzip-1.3.12.recipe b/app-arch/gzip/gzip-1.3.12.recipe deleted file mode 100644 index 6698f89c6..000000000 --- a/app-arch/gzip/gzip-1.3.12.recipe +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY="gzip compression utilities and libraries" -DESCRIPTION=" -gzip (GNU zip) is a compression utility designed to be a \ -replacement for compress. It provides better compression than compress \ -and although bzip2 produces smaller files is not as fast as bzip2 is. -" -HOMEPAGE="http://www.gzip.org/" -SRC_URI="ftp://ftp.gnu.org/gnu/gzip/gzip-1.3.12.tar.gz" -CHECKSUM_MD5="b5bac2d21840ae077e0217bc5e4845b1" -REVISION="1" -STATUS_HAIKU="untested" -DEPEND="" -BUILD() -{ - cd gzip-1.3.12 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd gzip-1.3.12 - make install -} diff --git a/app-arch/gzip/gzip-1.4.recipe b/app-arch/gzip/gzip-1.4.recipe deleted file mode 100644 index fe8532ed1..000000000 --- a/app-arch/gzip/gzip-1.4.recipe +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY="gzip compression utilities and libraries" -DESCRIPTION=" -gzip (GNU zip) is a compression utility designed to be a \ -replacement for compress. It provides better compression than compress \ -and although bzip2 produces smaller files is not as fast as bzip2 is. -" -HOMEPAGE="http://www.gzip.org/" -SRC_URI="ftp://ftp.gnu.org/gnu/gzip/gzip-1.4.tar.gz" -CHECKSUM_MD5="e381b8506210c794278f5527cba0e765" -REVISION="1" -STATUS_HAIKU="untested" -DEPEND="" -BUILD() -{ - cd gzip-1.4 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd gzip-1.4 - make install -} -LICENSE="GNU GPL v3" -COPYRIGHT="1999, 2001-2002, 2006-2007, 2009-2010 Free Software Foundation, Inc. - 1992-1993 Jean-loup Gailly" - diff --git a/app-arch/gzip/gzip-1.6.recipe b/app-arch/gzip/gzip-1.6.recipe new file mode 100644 index 000000000..8e1ee5898 --- /dev/null +++ b/app-arch/gzip/gzip-1.6.recipe @@ -0,0 +1,58 @@ +SUMMARY="The gzip compression utilities" +DESCRIPTION="gzip (GNU zip) is a compression utility designed to be a \ +replacement for compress. Its main advantages over compress are much \ +better compression and freedom from patented algorithms. It has been \ +adopted by the GNU project and is now relatively popular on the Internet." +HOMEPAGE="http://www.gzip.org/" +SRC_URI="https://ftp.gnu.org/gnu/gzip/gzip-1.6.tar.xz" +CHECKSUM_SHA256="37dfed1a485d53212c43b3fa2a7c7952f09bf5cd86e37121c222341ee1b27847" +SOURCE_DIR="$portVersionedName" +REVISION="1" +LICENSE="GNU GPL v3" +COPYRIGHT="1992-1993 Jean-loup Gailly + 1999-2013 Free Software Foundation, Inc." + +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + gzip = $portVersion + cmd:gzip = $portVersion + cmd:gunzip = $portVersion + cmd:gzexe = $portVersion + cmd:uncompress = $portVersion + cmd:zcat = $portVersion + cmd:zcmp = $portVersion + cmd:zdiff = $portVersion + cmd:zegrep = $portVersion + cmd:zfgrep = $portVersion + cmd:zforce = $portVersion + cmd:zgrep = $portVersion + cmd:zless = $portVersion + cmd:zmore = $portVersion + cmd:znew = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " +BUILD_PREREQUIRES=" + cmd:make + cmd:gcc + cmd:awk + " + +BUILD() +{ + export CFLAGS="-Wno-error" + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install +} diff --git a/app-arch/gzip/patches/gzip-1.2.4a.patch b/app-arch/gzip/patches/gzip-1.2.4a.patch deleted file mode 100644 index d82f3ba29..000000000 --- a/app-arch/gzip/patches/gzip-1.2.4a.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff -Naur gzip-1.2.4a/Makefile.in gzip-1.2.4a-beos/Makefile.in ---- gzip-1.2.4a/Makefile.in Tue Aug 17 19:12:40 1993 -+++ gzip-1.2.4a-beos/Makefile.in Thu Jan 3 00:19:57 2008 -@@ -102,7 +102,7 @@ - # Where to install the manual pages. - mandir = $(prefix)/man/man$(manext) - # Use manlinks=so to use the .so method instead of hard links --manlinks = ln -+manlinks = ln -s - - alldirs = $(bindir) $(scriptdir) $(datadir) $(libdir) $(infodir) $(mandir) - -@@ -208,7 +208,7 @@ - for f in $(SCRIPTS); do \ - $(INSTALL_PROGRAM) $${f} $(scriptdir)/$${f}; done - rm -f $(scriptdir)/$(G)zcmp; \ -- ln $(scriptdir)/$(G)zdiff $(scriptdir)/$(G)zcmp -+ ln -s $(scriptdir)/$(G)zdiff $(scriptdir)/$(G)zcmp - for f in gunzip$X ungzip$X $(ZCAT)$X ; do \ - rm -f $(bindir)/$${f}; done - @if echo $(DEFS) | grep GNU_STANDARD > /dev/null; then \ -@@ -216,8 +216,8 @@ - echo 'exec gzip -dc $${1+"$$@"}' > $(bindir)/$(ZCAT)$X; \ - chmod 755 $(bindir)/gunzip$X $(bindir)/$(ZCAT)$X; \ - else \ -- ln $(bindir)/gzip$X $(bindir)/gunzip$X; \ -- ln $(bindir)/gzip$X $(bindir)/$(ZCAT)$X; \ -+ ln -s $(bindir)/gzip$X $(bindir)/gunzip$X; \ -+ ln -s $(bindir)/gzip$X $(bindir)/$(ZCAT)$X; \ - fi - - installman: gzip.info -@@ -233,9 +233,9 @@ - echo .so man$(manext)/gzip.$(manext) > gunzip.$(manext);\ - chmod 644 $(ZCAT).$(manext) $(G)zcmp.$(manext) gunzip.$(manext);\ - else \ -- ln gzip.$(manext) $(ZCAT).$(manext);\ -- ln $(G)zdiff.$(manext) $(G)zcmp.$(manext);\ -- ln gzip.$(manext) gunzip.$(manext);\ -+ ln -s gzip.$(manext) $(ZCAT).$(manext);\ -+ ln -s $(G)zdiff.$(manext) $(G)zcmp.$(manext);\ -+ ln -s gzip.$(manext) gunzip.$(manext);\ - fi - -cd $(srcdir); for f in gzip.info* ; do $(INSTALL_DATA) $${f} \ - $(infodir)/$${f}; done -@@ -251,9 +251,9 @@ - install_compress: install - -test -f $(bindir)/compress.old || \ - mv $(bindir)/compress$X $(bindir)/compress.old -- ln $(bindir)/gzip$X $(bindir)/compress$X -+ ln -s $(bindir)/gzip$X $(bindir)/compress$X - rm -f $(bindir)/uncompress$X -- ln $(bindir)/gzip$X $(bindir)/uncompress$X -+ ln -s $(bindir)/gzip$X $(bindir)/uncompress$X - - # Make sure all installation directories, e.g. $(bindir) actually exist by - # making them if necessary. At most one level is created (except for man). -@@ -329,8 +329,8 @@ - gzip$X: Makefile $(OBJS) - $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) - rm -f gunzip$X $(ZCAT)$X -- ln gzip$X gunzip$X -- ln gzip$X $(ZCAT)$X -+ ln -s gzip$X gunzip$X -+ ln -s gzip$X $(ZCAT)$X - - gzip$O zip$O deflate$O trees$O bits$O unzip$O inflate$O: gzip.h tailor.h - util$O lzw$O unlzw$O unpack$O unlzh$O crypt$O: gzip.h tailor.h diff --git a/app-arch/gzip/patches/gzip-1.3.12-downstream.patch b/app-arch/gzip/patches/gzip-1.3.12-downstream.patch deleted file mode 100644 index 9853c3894..000000000 --- a/app-arch/gzip/patches/gzip-1.3.12-downstream.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Naur gzip-1.3.12-original/configure.ac gzip-1.3.12/configure.ac ---- gzip-1.3.12-original/configure.ac 2009-04-06 23:31:48.000000000 -0400 -+++ gzip-1.3.12/configure.ac 2009-04-06 23:37:45.000000000 -0400 -@@ -26,13 +26,14 @@ - AC_CONFIG_AUX_DIR(build-aux) - AC_CONFIG_HEADERS([lib/config.h:lib/config.hin]) - AM_INIT_AUTOMAKE([gnits]) -+AC_CONFIG_MACRO_DIR([m4]) - - AC_PROG_CC_STDC - AM_PROG_CC_C_O - AC_PROG_CPP - AC_CHECK_TOOL([NM], [nm], [nm]) - AC_PROG_LN_S --AC_PROG_RANLIB -+LT_INIT - AC_PROG_SHELL - - gl_EARLY diff --git a/app-arch/gzip/patches/gzip-1.3.12-stdbool_.h.diff b/app-arch/gzip/patches/gzip-1.3.12-stdbool_.h.diff deleted file mode 100644 index 0b0db8017..000000000 --- a/app-arch/gzip/patches/gzip-1.3.12-stdbool_.h.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- stdbool_.h 2008-05-14 14:48:48.000000000 +0000 -+++ gzip-1.3.12/lib/stdbool_.h 2007-03-30 23:56:06.000000000 +0000 -@@ -58,7 +58,7 @@ - - /* BeOS already #defines false 0, true 1. We use the same - definitions below, but temporarily we have to #undef them. */ --#if defined __BEOS__ && !defined __HAIKU__ -+#ifdef __BEOS__ - # include /* defines bool but not _Bool */ - # undef false - # undef true -@@ -73,7 +73,7 @@ - (see ISO C 99 6.7.2.2.(4)); however, '_Bool' must promote to 'int' - (see ISO C 99 6.3.1.1.(2)). So we add a negative value to the - enum; this ensures that '_Bool' promotes to 'int'. */ --#if defined __cplusplus || (defined __BEOS__ && !defined __HAIKU__) -+#if defined __cplusplus || defined __BEOS__ - /* A compiler known to have 'bool'. */ - /* If the compiler already has both 'bool' and '_Bool', we can assume they - are the same types. */ diff --git a/app-arch/gzip/patches/gzip-1.4.patch b/app-arch/gzip/patches/gzip-1.4.patch deleted file mode 100644 index d682f553e..000000000 --- a/app-arch/gzip/patches/gzip-1.4.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- gzip-1.4/inflate.c 2010-01-20 14:15:12.017039360 +0100 -+++ gzip-1.4/inflate.c 2011-12-03 00:03:37.421003264 +0100 -@@ -588,6 +588,7 @@ - /* do the copy */ - do { - n -= (e = (e = WSIZE - ((d &= WSIZE-1) > w ? d : w)) > n ? n : e); -+ { - #if !defined(NOMEMCPY) && !defined(DEBUG) - unsigned int delta = w > d ? w - d : d - w; - if (delta >= e) -@@ -602,6 +603,7 @@ - slide[w++] = slide[d++]; - Tracevv((stderr, "%c", slide[w-1])); - } while (--e); -+ } - if (w == WSIZE) - { - flush_output(w);