Revision: 26365
http://sourceforge.net/p/gar/code/26365
Author: dmichelsen
Date: 2018-02-21 16:02:00 +0000 (Wed, 21 Feb 2018)
Log Message:
-----------
zutils/trunk: Update to 1.7
Modified Paths:
--------------
csw/mgar/pkg/zutils/trunk/Makefile
csw/mgar/pkg/zutils/trunk/checksums
csw/mgar/pkg/zutils/trunk/files/0001-Add-headers-for-kill-2.patch
Added Paths:
-----------
csw/mgar/pkg/zutils/trunk/files/0002-Use-test-f-instead-of-e.patch
Removed Paths:
-------------
csw/mgar/pkg/zutils/trunk/files/0003-Use-Zutils-instead-of-zutils.patch
Modified: csw/mgar/pkg/zutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/zutils/trunk/Makefile 2018-02-20 17:06:11 UTC (rev 26364)
+++ csw/mgar/pkg/zutils/trunk/Makefile 2018-02-21 16:02:00 UTC (rev 26365)
@@ -1,5 +1,5 @@
NAME = zutils
-VERSION = 1.0
+VERSION = 1.7
GARTYPE = v2
DESCRIPTION = Utilities to deal with compressed and non-compressed files
@@ -13,19 +13,27 @@
endef
-MASTER_SITES = http://download.savannah.gnu.org/releases/zutils/
-DISTFILES = $(DISTNAME).tar.lz
+MASTER_SITES += http://download.savannah.gnu.org/releases/zutils/
+DISTFILES += $(DISTNAME).tar.lz
PATCHFILES += 0001-Add-headers-for-kill-2.patch
-PATCHFILES += 0003-Use-Zutils-instead-of-zutils.patch
+PATCHFILES += 0002-Use-test-f-instead-of-e.patch
+VENDOR_URL = http://www.nongnu.org/zutils/zutils.html
+
BUILD_DEP_PKGS += CSWhelp2man
BUILD_DEP_PKGS += CSWlzip
# The lzip binary is used from the scripts which is not detected by checkpkg
-RUNTIME_DEP_PKGS = CSWlzip
+RUNTIME_DEP_PKGS_CSWzutils = CSWlzip
+RUNTIME_DEP_PKGS_CSWzutils = CSWdiffutils
+RUNTIME_DEP_PKGS_CSWzutils = CSWggrep
CHECKPKG_OVERRIDES_CSWzutils += surplus-dependency|CSWlzip
+CHECKPKG_OVERRIDES_CSWzutils += surplus-dependency|CSWggrep
-VENDOR_URL = http://www.nongnu.org/zutils/zutils.html
+REINPLACEMENTS += bash
+REINPLACE_MATCH_bash = /bin/sh
+REINPLACE_WITH_bash = /bin/bash
+REINPLACE_FILES_bash += testsuite/check.sh
EXTRA_LINKER_FLAGS = -norunpath
@@ -38,10 +46,15 @@
CONFIGURE_ARGS += CPPFLAGS="$(CPPFLAGS)"
CONFIGURE_ARGS += CXXFLAGS="$(CXXFLAGS)"
CONFIGURE_ARGS += LDFLAGS="$(LDFLAGS)"
+CONFIGURE_ARGS += DIFF=/opt/csw/bin/gdiff
+CONFIGURE_ARGS += GREP=/opt/csw/bin/ggrep
INSTALL_OVERRIDE_VARS = INSTALL
INSTALL_OVERRIDE_VAR_INSTALL = /opt/csw/bin/ginstall
+EXTRA_INSTALL_EXPORTS += SHELL
+INSTALL_ENV_SHELL = /usr/bin/bash
+
EXTRA_PAX_ARGS = -s ",/z,/Z,p"
TEST_ENV_PATH = $(bindir):$(prefix)/gnu:$(PATH)
@@ -48,6 +61,6 @@
include gar/category.mk
-post-extract-modulated:
+post-extract:
-gln -s zutils $(WORKSRC)/Zutils
@$(MAKECOOKIE)
Modified: csw/mgar/pkg/zutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/zutils/trunk/checksums 2018-02-20 17:06:11 UTC (rev 26364)
+++ csw/mgar/pkg/zutils/trunk/checksums 2018-02-21 16:02:00 UTC (rev 26365)
@@ -1 +1 @@
-26b85fac69e83454d00354635e3f787d zutils-1.0.tar.lz
+7e80bbf1e9f578fa283cba0c9887a2d0 zutils-1.7.tar.lz
Modified: csw/mgar/pkg/zutils/trunk/files/0001-Add-headers-for-kill-2.patch
===================================================================
--- csw/mgar/pkg/zutils/trunk/files/0001-Add-headers-for-kill-2.patch
2018-02-20 17:06:11 UTC (rev 26364)
+++ csw/mgar/pkg/zutils/trunk/files/0001-Add-headers-for-kill-2.patch
2018-02-21 16:02:00 UTC (rev 26365)
@@ -1,53 +1,25 @@
-From 1bf577c42323a4d018f4d674b7617f6c09379498 Mon Sep 17 00:00:00 2001
+From 60a5c239a31b997ebce877b948bed98fe1a91d00 Mon Sep 17 00:00:00 2001
From: Dagobert Michelsen <d...@opencsw.org>
-Date: Fri, 5 Jul 2013 13:13:37 +0200
+Date: Wed, 21 Feb 2018 16:18:20 +0100
Subject: [PATCH] Add headers for kill(2)
---
- main.cc | 2 ++
- zcmp.cc | 2 ++
- zdiff.cc | 2 ++
- 3 files changed, 6 insertions(+)
+ zutils.cc | 2 ++
+ 1 file changed, 2 insertions(+)
-diff --git a/main.cc b/main.cc
-index f0a66e1..f98ac85 100644
---- a/main.cc
-+++ b/main.cc
-@@ -20,6 +20,8 @@
- #include <cerrno>
- #include <climits>
- #include <csignal>
+diff --git a/zutils.cc b/zutils.cc
+index 2b11532..3b9ca13 100644
+--- a/zutils.cc
++++ b/zutils.cc
+@@ -27,6 +27,8 @@
+ #include <stdint.h>
+ #include <unistd.h>
+ #include <sys/wait.h>
+#include <sys/types.h>
+#include <signal.h>
- #include <cstdio>
- #include <cstdlib>
- #include <cstring>
-diff --git a/zcmp.cc b/zcmp.cc
-index 0e5b781..52cbe6a 100644
---- a/zcmp.cc
-+++ b/zcmp.cc
-@@ -22,6 +22,8 @@
- #include <cerrno>
- #include <climits>
- #include <csignal>
-+#include <sys/types.h>
-+#include <signal.h>
- #include <cstdio>
- #include <cstdlib>
- #include <cstring>
-diff --git a/zdiff.cc b/zdiff.cc
-index 14b679e..c5b3ff9 100644
---- a/zdiff.cc
-+++ b/zdiff.cc
-@@ -22,6 +22,8 @@
- #include <cerrno>
- #include <climits>
- #include <csignal>
-+#include <sys/types.h>
-+#include <signal.h>
- #include <cstdio>
- #include <cstdlib>
- #include <cstring>
+
+ #include "rc.h"
+ #include "zutils.h"
--
-1.8.3.1
+2.4.0
Added: csw/mgar/pkg/zutils/trunk/files/0002-Use-test-f-instead-of-e.patch
===================================================================
--- csw/mgar/pkg/zutils/trunk/files/0002-Use-test-f-instead-of-e.patch
(rev 0)
+++ csw/mgar/pkg/zutils/trunk/files/0002-Use-test-f-instead-of-e.patch
2018-02-21 16:02:00 UTC (rev 26365)
@@ -0,0 +1,25 @@
+From c45c292f7ebaa90ea4ab2ec9e7d4647909f08b1b Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <d...@opencsw.org>
+Date: Wed, 21 Feb 2018 16:39:28 +0100
+Subject: [PATCH] Use test -f instead of -e
+
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 67b6998..6911492 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -134,7 +134,7 @@ install-bin : all
+ $(INSTALL_PROGRAM) ./zgrep "$(DESTDIR)$(bindir)/zgrep"
+ $(INSTALL_PROGRAM) ./ztest "$(DESTDIR)$(bindir)/ztest"
+ $(INSTALL_PROGRAM) ./zupdate "$(DESTDIR)$(bindir)/zupdate"
+- if [ ! -e "$(DESTDIR)$(sysconfdir)/$(pkgname)rc" ] ; then \
++ if [ ! -f "$(DESTDIR)$(sysconfdir)/$(pkgname)rc" ] ; then \
+ if [ ! -d "$(DESTDIR)$(sysconfdir)" ] ; then $(INSTALL_DIR)
"$(DESTDIR)$(sysconfdir)" ; fi ; \
+ $(INSTALL_DATA) $(VPATH)/$(pkgname)rc
"$(DESTDIR)$(sysconfdir)/$(pkgname)rc" ; \
+ fi
+--
+2.4.0
+
Deleted: csw/mgar/pkg/zutils/trunk/files/0003-Use-Zutils-instead-of-zutils.patch
===================================================================
--- csw/mgar/pkg/zutils/trunk/files/0003-Use-Zutils-instead-of-zutils.patch
2018-02-20 17:06:11 UTC (rev 26364)
+++ csw/mgar/pkg/zutils/trunk/files/0003-Use-Zutils-instead-of-zutils.patch
2018-02-21 16:02:00 UTC (rev 26365)
@@ -1,61 +0,0 @@
-From 6b133e98acfe1262b598878f1c3dc5e91c5ea587 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <d...@opencsw.org>
-Date: Fri, 19 Nov 2010 14:09:29 +0100
-Subject: [PATCH 3/3] Use Zutils instead of zutils
-
----
- zcat.in | 2 +-
- zegrep.in | 2 +-
- zfgrep.in | 2 +-
- zgrep.in | 2 +-
- ztest.in | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/zcat.in b/zcat.in
-index d88eef1..fb080d9 100644
---- a/zcat.in
-+++ b/zcat.in
-@@ -1,3 +1,3 @@
- #! /bin/sh
- bindir=`echo "$0" | sed -e 's,[^/]*$,,'`
--exec "${bindir}"zutils --zcat "$@"
-+exec "${bindir}"Zutils --zcat "$@"
-diff --git a/zegrep.in b/zegrep.in
-index e01f655..d2dc371 100644
---- a/zegrep.in
-+++ b/zegrep.in
-@@ -1,3 +1,3 @@
- #! /bin/sh
- bindir=`echo "$0" | sed -e 's,[^/]*$,,'`
--exec "${bindir}"zutils --zgrep -E "$@"
-+exec "${bindir}"Zutils --zgrep -E "$@"
-diff --git a/zfgrep.in b/zfgrep.in
-index a3d54f3..74c6a95 100644
---- a/zfgrep.in
-+++ b/zfgrep.in
-@@ -1,3 +1,3 @@
- #! /bin/sh
- bindir=`echo "$0" | sed -e 's,[^/]*$,,'`
--exec "${bindir}"zutils --zgrep -F "$@"
-+exec "${bindir}"Zutils --zgrep -F "$@"
-diff --git a/zgrep.in b/zgrep.in
-index bfbc490..ba5a3de 100644
---- a/zgrep.in
-+++ b/zgrep.in
-@@ -1,3 +1,3 @@
- #! /bin/sh
- bindir=`echo "$0" | sed -e 's,[^/]*$,,'`
--exec "${bindir}"zutils --zgrep "$@"
-+exec "${bindir}"Zutils --zgrep "$@"
-diff --git a/ztest.in b/ztest.in
-index cc7dc9b..f973603 100644
---- a/ztest.in
-+++ b/ztest.in
-@@ -1,3 +1,3 @@
- #! /bin/sh
- bindir=`echo "$0" | sed -e 's,[^/]*$,,'`
--exec "${bindir}"zutils --ztest "$@"
-+exec "${bindir}"Zutils --ztest "$@"
---
-1.7.3
-
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
