(pkgsrc)

   - (Makefile) Add following lines
      CONFIGURE_ARGS+=        --sysconfdir=${PREFIX}/etc
      CONF_FILES=             ${EGDIR}/zutilsrc ${PREFIX}/etc/zutilsrc
   - (PLIST)
      delete bin/zutils, see 2014-02-01 Changes Below.
(upstream)
   - Update 0.9 to 1.3
   ----------
2014-08-30  Antonio Diaz Diaz  <antonio@gnu.org>

	* Version 1.3 released.
	* testsuite/check.sh: Fixed two values of expected exit status.
	* zutils.texi: Documented that '--format' does not verify format.
	* Added two missing #includes.
	* License changed to GPL version 2 or later.

2014-02-01  Antonio Diaz Diaz  <antonio@gnu.org>

	* Version 1.2 released.
	* Added new utility; zupdate.
	* Removed zutils executable. Utils are now independent executables.
	* zgrep.cc: Fixed the exit status returned on error.
	* zutils.texinfo: Renamed to zutils.texi.

2013-08-02  Antonio Diaz Diaz  <antonio@gnu.org>

	* Version 1.1 released.
	* Added options '--bz2', '--gz', '--lz' and '--xz' to all utilities.
	* Added runtime configuration file 'zutilsrc'.
	* New function 'good_status' checks exit status of all children.
	* Fixed all uses of decompressed/uncompressed in the documentation.

2013-05-31  Antonio Diaz Diaz  <antonio@gnu.org>

	* Version 1.0 released.
	* Added new option '--format' to all utilities.
	* main.cc (main): Make 'grep_show_name' tri-state so that file
	  name is no prefixed to output by default when searching one
	  file and '--recursive' has not been selected.
	* Zgrep: Fixed output of option '-L' (it behaved like '-l').
	* zcmp.cc: Fixed deadlock when '-n' option is used.
	* zdiff.cc (set_data_feeder): Call compressor with option "-q"
	  only if verbosity < 0.
	* zutils.cc (set_data_feeder): Likewise.
	* Changed quote characters in messages as advised by GNU Standards.
	* configure: Options now accept a separate argument.
	* configure: 'datadir' renamed to 'datarootdir'.
	* Makefile.in: Added new target 'install-bin'.
	* Use 'setmode' instead of '_setmode' on Windows and OS/2.
	* zcat.cc (Line_number): Fixed a portability issue with Solaris 9.
	* INSTALL: Document installing zutils along with GNU gzip.

3 files changed, 24 insertions, 8 deletions

diff --git a/archivers/zutils/Makefile b/archivers/zutils/Makefile
index ff0bd972fa9..1c187b907ba 100644
--- a/archivers/zutils/Makefile
+++ b/archivers/zutils/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2013/04/06 03:45:06 rodent Exp $
+# $NetBSD: Makefile,v 1.6 2014/12/31 01:25:22 mef Exp $
 #
 
-DISTNAME=	zutils-0.9
+DISTNAME=	zutils-1.3
 CATEGORIES=	archivers
 MASTER_SITES=	http://download.savannah.gnu.org/releases/zutils/
+EXTRACT_SUFX=	.tar.lz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.nongnu.org/zutils/zutils.html
@@ -16,8 +17,21 @@ HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR}
 CONFIGURE_ARGS+=	--infodir=${PREFIX}/${PKGINFODIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc
 USE_LANGUAGES=		c++
+AUTO_MKDIRS=		yes
 
 INFO_FILES=		yes
+EGDIR=			${PREFIX}/share/examples/zutils
+CONF_FILES=		${EGDIR}/zutilsrc ${PREFIX}/etc/zutilsrc
+
+SUBST_CLASSES+=		sysconfdir
+SUBST_STAGE.sysconfdir=	post-patch
+SUBST_FILES.sysconfdir= zutilsrc
+SUBST_MESSAGE.sysconfdir= path of sysconfdir in example (zutilsrc)
+SUBST_SED.sysconfdir=	-e '/sysconfdir/s,$${sysconfdir},${PREFIX}/etc,'
+
+post-install:
+	${MV}	${DESTDIR}${PREFIX}/etc/zutilsrc ${DESTDIR}${EGDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/zutils/PLIST b/archivers/zutils/PLIST
index 57519eaa11f..abd10db05f9 100644
--- a/archivers/zutils/PLIST
+++ b/archivers/zutils/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/10/21 21:41:09 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/12/31 01:25:22 mef Exp $
 bin/zcat
 bin/zcmp
 bin/zdiff
@@ -6,10 +6,12 @@ bin/zegrep
 bin/zfgrep
 bin/zgrep
 bin/ztest
-bin/zutils
+bin/zupdate
 info/zutils.info
 man/man1/zcat.1
 man/man1/zcmp.1
 man/man1/zdiff.1
 man/man1/zgrep.1
 man/man1/ztest.1
+man/man1/zupdate.1
+share/examples/zutils/zutilsrc
diff --git a/archivers/zutils/distinfo b/archivers/zutils/distinfo
index cef7df666d6..7a68bc05d27 100644
--- a/archivers/zutils/distinfo
+++ b/archivers/zutils/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2011/10/21 21:41:09 ryoon Exp $
+$NetBSD: distinfo,v 1.2 2014/12/31 01:25:22 mef Exp $
 
-SHA1 (zutils-0.9.tar.gz) = 69ecf5632c73fc67d5387e0b4e2f429d960e2648
-RMD160 (zutils-0.9.tar.gz) = 59187ba1fa821e3d8314f036f0c39f287b5db595
-Size (zutils-0.9.tar.gz) = 66382 bytes
+SHA1 (zutils-1.3.tar.lz) = 7a9c8cbdc43c2d1d07d4d261a3c76cbfca73fc50
+RMD160 (zutils-1.3.tar.lz) = fb1b0d86f1b38f0769b6abd7d5039a82ee618da2
+Size (zutils-1.3.tar.lz) = 40838 bytes