[pkgsrc/trunk]: pkgsrc/pkgtools/pkgtasks Update pkgtools/pkgtasks to version ...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/pkgtools/pkgtasks Update pkgtools/pkgtasks to version ...
From: jlam <jlam%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 07:37:46 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/e7959e823924
branches:  trunk
changeset: 366287:e7959e823924
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Aug 10 05:38:30 2017 +0000

description:
Update pkgtools/pkgtasks to version 1.13.

* Add a "icon_themes" task to cache GTK+ icon theme directories.
* Change the way that install-info(1) is invoked.
* Clarify the output from the "groups" and "users" tasks.
* Bug fixes.

diffstat:

 pkgtools/pkgtasks/Makefile                   |    4 +-
 pkgtools/pkgtasks/PLIST                      |    7 +-
 pkgtools/pkgtasks/files/Makefile.am          |   29 ++-
 pkgtools/pkgtasks/files/Makefile.in          |   98 +++++---
 pkgtools/pkgtasks/files/NEWS.md              |  215 +++++++++++++++++++++
 pkgtools/pkgtasks/files/README.md            |    3 +-
 pkgtools/pkgtasks/files/build-aux/install-sh |    2 +-
 pkgtools/pkgtasks/files/configure            |   20 +-
 pkgtools/pkgtasks/files/configure.ac         |    2 +-
 pkgtools/pkgtasks/files/fonts.subr           |    3 +
 pkgtools/pkgtasks/files/groups.subr          |    6 +-
 pkgtools/pkgtasks/files/icon_themes.subr     |  221 +++++++++++++++++++++
 pkgtools/pkgtasks/files/info_files.subr      |   20 +-
 pkgtools/pkgtasks/files/load.subr            |    1 -
 pkgtools/pkgtasks/files/ocaml_findlib.subr   |   17 +-
 pkgtools/pkgtasks/files/postinstall.subr     |    4 +
 pkgtools/pkgtasks/files/postremove.subr      |   18 +-
 pkgtools/pkgtasks/files/preremove.subr       |   11 +-
 pkgtools/pkgtasks/files/shells.subr          |   17 +-
 pkgtools/pkgtasks/files/t/Kyuafile           |    1 +
 pkgtools/pkgtasks/files/t/t_icon_themes.sh   |  276 +++++++++++++++++++++++++++
 pkgtools/pkgtasks/files/t/t_ocaml_findlib.sh |    8 +-
 pkgtools/pkgtasks/files/t/t_postinstall.sh   |   26 ++-
 pkgtools/pkgtasks/files/t/t_postremove.sh    |   28 ++-
 pkgtools/pkgtasks/files/t/t_preremove.sh     |   22 +-
 pkgtools/pkgtasks/files/t/t_shells.sh        |    9 +-
 pkgtools/pkgtasks/files/users.subr           |   23 +-
 27 files changed, 972 insertions(+), 119 deletions(-)

diffs (truncated from 1831 to 300 lines):

diff -r 7dca8ee59d83 -r e7959e823924 pkgtools/pkgtasks/Makefile
--- a/pkgtools/pkgtasks/Makefile        Thu Aug 10 05:38:00 2017 +0000
+++ b/pkgtools/pkgtasks/Makefile        Thu Aug 10 05:38:30 2017 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2017/06/03 23:54:53 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2017/08/10 05:38:30 jlam Exp $
 
-DISTNAME=              pkgtasks-1-1.10
+DISTNAME=              pkgtasks-1-1.13
 CATEGORIES=            pkgtools
 MASTER_SITES=          # empty
 DISTFILES=             # empty
diff -r 7dca8ee59d83 -r e7959e823924 pkgtools/pkgtasks/PLIST
--- a/pkgtools/pkgtasks/PLIST   Thu Aug 10 05:38:00 2017 +0000
+++ b/pkgtools/pkgtasks/PLIST   Thu Aug 10 05:38:30 2017 +0000
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2017/06/01 01:58:34 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2017/08/10 05:38:30 jlam Exp $
 share/doc/${PKGBASE}/AUTHORS
+share/doc/${PKGBASE}/README.md
+share/doc/${PKGBASE}/NEWS.md
 share/doc/${PKGBASE}/COPYING
-share/doc/${PKGBASE}/README.md
 share/${PKGBASE}/cleanup.subr
 share/${PKGBASE}/compare.subr
 share/${PKGBASE}/createfile.subr
@@ -11,6 +12,7 @@
 share/${PKGBASE}/files.subr
 share/${PKGBASE}/fonts.subr
 share/${PKGBASE}/groups.subr
+share/${PKGBASE}/icon_themes.subr
 share/${PKGBASE}/info_files.subr
 share/${PKGBASE}/load.subr
 share/${PKGBASE}/lock.subr
@@ -57,6 +59,7 @@
 tests/${PKGBASE}/t_files
 tests/${PKGBASE}/t_fonts
 tests/${PKGBASE}/t_groups
+tests/${PKGBASE}/t_icon_themes
 tests/${PKGBASE}/t_info_files
 tests/${PKGBASE}/t_lock
 tests/${PKGBASE}/t_makedir
diff -r 7dca8ee59d83 -r e7959e823924 pkgtools/pkgtasks/files/Makefile.am
--- a/pkgtools/pkgtasks/files/Makefile.am       Thu Aug 10 05:38:00 2017 +0000
+++ b/pkgtools/pkgtasks/files/Makefile.am       Thu Aug 10 05:38:30 2017 +0000
@@ -25,9 +25,12 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-doc_DATA = AUTHORS COPYING README.md
+doc_DATA = AUTHORS COPYING NEWS.md README.md
 noinst_DATA = README.md
 EXTRA_DIST = $(doc_DATA)
+MAINTAINERCLEANFILES = Makefile.in aclocal.m4
+MAINTAINERCLEANFILES += build-aux/install-sh build-aux/missing
+MAINTAINERCLEANFILES += configure $(DIST_ARCHIVES)
 
 PHONY_TARGETS = 
 
@@ -54,6 +57,7 @@
 dist_pkgdata_DATA += files.subr
 dist_pkgdata_DATA += fonts.subr
 dist_pkgdata_DATA += groups.subr
+dist_pkgdata_DATA += icon_themes.subr
 dist_pkgdata_DATA += info_files.subr
 dist_pkgdata_DATA += load.subr
 dist_pkgdata_DATA += lock.subr
@@ -184,6 +188,14 @@
        $(AM_V_GEN)target="$(builddir)/t/t_groups" source="$(srcdir)/t/t_groups.sh"; \
        $(BUILD_TEST)
 
+pkgtests_SCRIPTS += t/t_icon_themes
+CLEANFILES += t/t_icon_themes
+EXTRA_DIST += t/t_icon_themes.sh
+t/t_icon_themes: t/t_icon_themes.sh t/build_test
+       -$(MKDIR_P) $(builddir)/t
+       $(AM_V_GEN)target="$(builddir)/t/t_icon_themes" source="$(srcdir)/t/t_icon_themes.sh"; \
+       $(BUILD_TEST)
+
 pkgtests_SCRIPTS += t/t_info_files
 CLEANFILES += t/t_info_files
 EXTRA_DIST += t/t_info_files.sh
@@ -490,7 +502,14 @@
 installcheck-local: installcheck-run-tests
 endif # HAVE_KYUA
 
-maintainer-clean-local:
-       -rm -f Makefile.in aclocal.m4 configure
-       -rm -f build-aux/install-sh build-aux/missing
-       -rm -f $(PACKAGE)-*.tar.*
+# Duplicate Automake's check-news target, but verify NEWS.md instead of NEWS.
+dist-hook: check-news-local
+PHONY_TARGETS += check-news-local
+check-news-local:
+       @newsfile="$(srcdir)/NEWS.md"; \
+       case `sed 15q "$$newsfile"` in \
+       *"$(VERSION)"*) : ;; \
+       *) \
+               echo "$$newsfile not updated; not releasing" 1>&2; \
+               exit 1;; \
+       esac
diff -r 7dca8ee59d83 -r e7959e823924 pkgtools/pkgtasks/files/Makefile.in
--- a/pkgtools/pkgtasks/files/Makefile.in       Thu Aug 10 05:38:00 2017 +0000
+++ b/pkgtools/pkgtasks/files/Makefile.in       Thu Aug 10 05:38:30 2017 +0000
@@ -280,23 +280,26 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-doc_DATA = AUTHORS COPYING README.md
+doc_DATA = AUTHORS COPYING NEWS.md README.md
 noinst_DATA = README.md
 EXTRA_DIST = $(doc_DATA) version.subr.in t/build_test.sh \
        t/run_tests.sh t/t_compare.sh t/t_createfile.sh \
        t/t_directories.sh t/t_dirwalk.sh t/t_echo.sh t/t_files.sh \
-       t/t_fonts.sh t/t_groups.sh t/t_info_files.sh t/t_lock.sh \
-       t/t_makedir.sh t/t_maketemp.sh t/t_match.sh \
-       t/t_ocaml_findlib.sh t/t_permissions.sh t/t_platform.sh \
-       t/t_postinstall.sh t/t_postremove.sh t/t_preinstall.sh \
-       t/t_preremove.sh t/t_quote.sh t/t_random.sh t/t_refcount.sh \
-       t/t_shells.sh t/t_shlibs.sh t/t_sort.sh t/t_taskfunc.sh \
-       t/t_tee.sh t/t_truthy.sh t/t_usergroup.sh \
+       t/t_fonts.sh t/t_groups.sh t/t_icon_themes.sh \
+       t/t_info_files.sh t/t_lock.sh t/t_makedir.sh t/t_maketemp.sh \
+       t/t_match.sh t/t_ocaml_findlib.sh t/t_permissions.sh \
+       t/t_platform.sh t/t_postinstall.sh t/t_postremove.sh \
+       t/t_preinstall.sh t/t_preremove.sh t/t_quote.sh t/t_random.sh \
+       t/t_refcount.sh t/t_shells.sh t/t_shlibs.sh t/t_sort.sh \
+       t/t_taskfunc.sh t/t_tee.sh t/t_truthy.sh t/t_usergroup.sh \
        t/t_usergroup_FreeBSD.sh t/t_usergroup_Linux.sh \
        t/t_usergroup_MirBSD.sh t/t_usergroup_NetBSD.sh \
        t/t_usergroup_exists.sh t/t_usergroup_mock.sh t/t_users.sh \
        t/t_valid_options.sh t/t_version.sh t/t_which.sh
-PHONY_TARGETS = check-run-tets installcheck-run-tests $(am__append_1)
+MAINTAINERCLEANFILES = Makefile.in aclocal.m4 build-aux/install-sh \
+       build-aux/missing configure $(DIST_ARCHIVES)
+PHONY_TARGETS = check-run-tets installcheck-run-tests $(am__append_1) \
+       check-news-local
 CHMOD = chmod
 MV = mv
 
@@ -312,9 +315,10 @@
 BUILD_SCRIPT = $(BUILD_FILE) && $(CHMOD) +x "$$target"
 dist_pkgdata_DATA = cleanup.subr compare.subr createfile.subr \
        directories.subr dirwalk.subr echo.subr files.subr fonts.subr \
-       groups.subr info_files.subr load.subr lock.subr makedir.subr \
-       maketemp.subr match.subr ocaml_findlib.subr permissions.subr \
-       platform.subr postinstall.subr postremove.subr preinstall.subr \
+       groups.subr icon_themes.subr info_files.subr load.subr \
+       lock.subr makedir.subr maketemp.subr match.subr \
+       ocaml_findlib.subr permissions.subr platform.subr \
+       postinstall.subr postremove.subr preinstall.subr \
        preremove.subr quote.subr random.subr refcount.subr \
        refcount_file.subr say.subr shells.subr shlibs.subr sort.subr \
        taskfunc.subr tee.subr truthy.subr unittest.subr \
@@ -325,11 +329,11 @@
 pkgdata_DATA = version.subr
 CLEANFILES = version.subr t/build_test t/run_tests t/t_compare \
        t/t_createfile t/t_directories t/t_dirwalk t/t_echo t/t_files \
-       t/t_fonts t/t_groups t/t_info_files t/t_lock t/t_makedir \
-       t/t_maketemp t/t_match t/t_ocaml_findlib t/t_permissions \
-       t/t_platform t/t_postinstall t/t_postremove t/t_preinstall \
-       t/t_preremove t/t_quote t/t_random t/t_refcount t/t_shells \
-       t/t_shlibs t/t_sort t/t_taskfunc t/t_tee t/t_truthy \
+       t/t_fonts t/t_groups t/t_icon_themes t/t_info_files t/t_lock \
+       t/t_makedir t/t_maketemp t/t_match t/t_ocaml_findlib \
+       t/t_permissions t/t_platform t/t_postinstall t/t_postremove \
+       t/t_preinstall t/t_preremove t/t_quote t/t_random t/t_refcount \
+       t/t_shells t/t_shlibs t/t_sort t/t_taskfunc t/t_tee t/t_truthy \
        t/t_usergroup t/t_usergroup_FreeBSD t/t_usergroup_Linux \
        t/t_usergroup_MirBSD t/t_usergroup_NetBSD t/t_usergroup_exists \
        t/t_usergroup_mock t/t_users t/t_valid_options t/t_version \
@@ -344,14 +348,15 @@
 noinst_SCRIPTS = t/build_test
 pkgtests_SCRIPTS = t/run_tests t/t_compare t/t_createfile \
        t/t_directories t/t_dirwalk t/t_echo t/t_files t/t_fonts \
-       t/t_groups t/t_info_files t/t_lock t/t_makedir t/t_maketemp \
-       t/t_match t/t_ocaml_findlib t/t_permissions t/t_platform \
-       t/t_postinstall t/t_postremove t/t_preinstall t/t_preremove \
-       t/t_quote t/t_random t/t_refcount t/t_shells t/t_shlibs \
-       t/t_sort t/t_taskfunc t/t_tee t/t_truthy t/t_usergroup \
-       t/t_usergroup_FreeBSD t/t_usergroup_Linux t/t_usergroup_MirBSD \
-       t/t_usergroup_NetBSD t/t_usergroup_exists t/t_usergroup_mock \
-       t/t_users t/t_valid_options t/t_version t/t_which
+       t/t_groups t/t_icon_themes t/t_info_files t/t_lock t/t_makedir \
+       t/t_maketemp t/t_match t/t_ocaml_findlib t/t_permissions \
+       t/t_platform t/t_postinstall t/t_postremove t/t_preinstall \
+       t/t_preremove t/t_quote t/t_random t/t_refcount t/t_shells \
+       t/t_shlibs t/t_sort t/t_taskfunc t/t_tee t/t_truthy \
+       t/t_usergroup t/t_usergroup_FreeBSD t/t_usergroup_Linux \
+       t/t_usergroup_MirBSD t/t_usergroup_NetBSD t/t_usergroup_exists \
+       t/t_usergroup_mock t/t_users t/t_valid_options t/t_version \
+       t/t_which
 
 # CHECK_ENVIRONMENT
 #      This is used to set variables before calling kyua on the tests in
@@ -558,6 +563,9 @@
            || exit 1; \
          fi; \
        done
+       $(MAKE) $(AM_MAKEFLAGS) \
+         top_distdir="$(top_distdir)" distdir="$(distdir)" \
+         dist-hook
        -test -n "$(am__skip_mode_fix)" \
        || find "$(distdir)" -type d ! -perm -755 \
                -exec chmod u+rwx,go+rx {} \; -o \
@@ -728,6 +736,7 @@
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
        @echo "it deletes files that may require special tools to rebuild."
+       -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
 clean-am: clean-generic mostlyclean-am
@@ -782,8 +791,7 @@
        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
        -rm -rf $(top_srcdir)/autom4te.cache
        -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic \
-       maintainer-clean-local
+maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
@@ -805,10 +813,10 @@
 
 .PHONY: all all-am am--refresh check check-am check-local clean \
        clean-generic cscopelist-am ctags-am dist dist-all dist-bzip2 \
-       dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
-       distcheck distclean distclean-generic distcleancheck distdir \
-       distuninstallcheck dvi dvi-am html html-am info info-am \
-       install install-am install-data install-data-am \
+       dist-gzip dist-hook dist-lzip dist-shar dist-tarZ dist-xz \
+       dist-zip distcheck distclean distclean-generic distcleancheck \
+       distdir distuninstallcheck dvi dvi-am html html-am info \
+       info-am install install-am install-data install-data-am \
        install-dist_pkgdataDATA install-dist_pkgtestsDATA \
        install-docDATA install-dvi install-dvi-am install-exec \
        install-exec-am install-html install-html-am install-info \
@@ -816,11 +824,11 @@
        install-pkgdataDATA install-pkgtestsSCRIPTS install-ps \
        install-ps-am install-strip installcheck installcheck-am \
        installcheck-local installdirs maintainer-clean \
-       maintainer-clean-generic maintainer-clean-local mostlyclean \
-       mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
-       uninstall-am uninstall-dist_pkgdataDATA \
-       uninstall-dist_pkgtestsDATA uninstall-docDATA \
-       uninstall-pkgdataDATA uninstall-pkgtestsSCRIPTS
+       maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+       pdf-am ps ps-am tags-am uninstall uninstall-am \
+       uninstall-dist_pkgdataDATA uninstall-dist_pkgtestsDATA \
+       uninstall-docDATA uninstall-pkgdataDATA \
+       uninstall-pkgtestsSCRIPTS
 
 .PRECIOUS: Makefile
 
@@ -868,6 +876,10 @@
        -$(MKDIR_P) $(builddir)/t
        $(AM_V_GEN)target="$(builddir)/t/t_groups" source="$(srcdir)/t/t_groups.sh"; \
        $(BUILD_TEST)
+t/t_icon_themes: t/t_icon_themes.sh t/build_test
+       -$(MKDIR_P) $(builddir)/t
+       $(AM_V_GEN)target="$(builddir)/t/t_icon_themes" source="$(srcdir)/t/t_icon_themes.sh"; \
+       $(BUILD_TEST)
 t/t_info_files: t/t_info_files.sh t/build_test
        -$(MKDIR_P) $(builddir)/t
        $(AM_V_GEN)target="$(builddir)/t/t_info_files" source="$(srcdir)/t/t_info_files.sh"; \
@@ -1024,10 +1036,16 @@
 @HAVE_KYUA_FALSE@check-local: check-run-tests
 @HAVE_KYUA_FALSE@installcheck-local: installcheck-run-tests
 
-maintainer-clean-local:
-       -rm -f Makefile.in aclocal.m4 configure
-       -rm -f build-aux/install-sh build-aux/missing
-       -rm -f $(PACKAGE)-*.tar.*
+# Duplicate Automake's check-news target, but verify NEWS.md instead of NEWS.
+dist-hook: check-news-local
+check-news-local:
+       @newsfile="$(srcdir)/NEWS.md"; \
+       case `sed 15q "$$newsfile"` in \
+       *"$(VERSION)"*) : ;; \
+       *) \
+               echo "$$newsfile not updated; not releasing" 1>&2; \
+               exit 1;; \
+       esac
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -r 7dca8ee59d83 -r e7959e823924 pkgtools/pkgtasks/files/NEWS.md
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgtools/pkgtasks/files/NEWS.md   Thu Aug 10 05:38:30 2017 +0000
@@ -0,0 +1,215 @@
+Package Tasks
+=============
+
+
+Changes in version 1.13
+-----------------------
+**Released on 2017-08-08.**
+
+* Make the output messages for the `groups` and `users` tasks easier
Prev by Date: [pkgsrc/trunk]: pkgsrc/mk/pkgformat/pkg/templates mk/pkgtasks: Add additional...
Next by Date: [pkgsrc/trunk]: pkgsrc/mk mk/pkgtasks: Add infrastructure to use "icon_themes...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/mk/pkgformat/pkg/templates mk/pkgtasks: Add additional...
Next by Thread: [pkgsrc/trunk]: pkgsrc/mk mk/pkgtasks: Add infrastructure to use "icon_themes...
Indexes:
Home | Main Index | Thread Index | Old Index