pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/pkgtools/pkgtasks
Module Name: pkgsrc
Committed By: jlam
Date: Sat Jun 3 23:54:53 UTC 2017
Modified Files:
pkgsrc/pkgtools/pkgtasks: Makefile
pkgsrc/pkgtools/pkgtasks/files: Makefile.am Makefile.in README.md
configure configure.ac directories.subr files.subr
pkgsrc/pkgtools/pkgtasks/files/build-aux: install-sh
Log Message:
Update pkgtools/pkgtasks to version 1.10.
Change the output of the "directories" and "files" tasks to be less
verbose by halving the number of lines in the most common cases.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/pkgtools/pkgtasks/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/pkgtools/pkgtasks/files/Makefile.am \
pkgsrc/pkgtools/pkgtasks/files/Makefile.in \
pkgsrc/pkgtools/pkgtasks/files/README.md \
pkgsrc/pkgtools/pkgtasks/files/configure \
pkgsrc/pkgtools/pkgtasks/files/configure.ac \
pkgsrc/pkgtools/pkgtasks/files/directories.subr \
pkgsrc/pkgtools/pkgtasks/files/files.subr
cvs rdiff -u -r1.1 -r1.2 pkgsrc/pkgtools/pkgtasks/files/build-aux/install-sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/pkgtools/pkgtasks/Makefile
diff -u pkgsrc/pkgtools/pkgtasks/Makefile:1.3 pkgsrc/pkgtools/pkgtasks/Makefile:1.4
--- pkgsrc/pkgtools/pkgtasks/Makefile:1.3 Thu Jun 1 23:38:29 2017
+++ pkgsrc/pkgtools/pkgtasks/Makefile Sat Jun 3 23:54:53 2017
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2017/06/01 23:38:29 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2017/06/03 23:54:53 jlam Exp $
-DISTNAME= pkgtasks-1-1.9
+DISTNAME= pkgtasks-1-1.10
CATEGORIES= pkgtools
MASTER_SITES= # empty
DISTFILES= # empty
Index: pkgsrc/pkgtools/pkgtasks/files/Makefile.am
diff -u pkgsrc/pkgtools/pkgtasks/files/Makefile.am:1.1 pkgsrc/pkgtools/pkgtasks/files/Makefile.am:1.2
--- pkgsrc/pkgtools/pkgtasks/files/Makefile.am:1.1 Thu Jun 1 01:58:34 2017
+++ pkgsrc/pkgtools/pkgtasks/files/Makefile.am Sat Jun 3 23:54:53 2017
@@ -123,7 +123,7 @@ t/run_tests: t/run_tests.sh
pkgtests_SCRIPTS += t/t_compare
CLEANFILES += t/t_compare
EXTRA_DIST += t/t_compare.sh
-t/t_compare: t/t_compare.sh $(builddir)/t/build_test
+t/t_compare: t/t_compare.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_compare" source="$(srcdir)/t/t_compare.sh"; \
$(BUILD_TEST)
@@ -131,7 +131,7 @@ t/t_compare: t/t_compare.sh $(builddir)/
pkgtests_SCRIPTS += t/t_createfile
CLEANFILES += t/t_createfile
EXTRA_DIST += t/t_createfile.sh
-t/t_createfile: t/t_createfile.sh $(builddir)/t/build_test
+t/t_createfile: t/t_createfile.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_createfile" source="$(srcdir)/t/t_createfile.sh"; \
$(BUILD_TEST)
@@ -139,7 +139,7 @@ t/t_createfile: t/t_createfile.sh $(buil
pkgtests_SCRIPTS += t/t_directories
CLEANFILES += t/t_directories
EXTRA_DIST += t/t_directories.sh
-t/t_directories: t/t_directories.sh $(builddir)/t/build_test
+t/t_directories: t/t_directories.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_directories" source="$(srcdir)/t/t_directories.sh"; \
$(BUILD_TEST)
@@ -147,7 +147,7 @@ t/t_directories: t/t_directories.sh $(bu
pkgtests_SCRIPTS += t/t_dirwalk
CLEANFILES += t/t_dirwalk
EXTRA_DIST += t/t_dirwalk.sh
-t/t_dirwalk: t/t_dirwalk.sh $(builddir)/t/build_test
+t/t_dirwalk: t/t_dirwalk.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_dirwalk" source="$(srcdir)/t/t_dirwalk.sh"; \
$(BUILD_TEST)
@@ -155,7 +155,7 @@ t/t_dirwalk: t/t_dirwalk.sh $(builddir)/
pkgtests_SCRIPTS += t/t_echo
CLEANFILES += t/t_echo
EXTRA_DIST += t/t_echo.sh
-t/t_echo: t/t_echo.sh $(builddir)/t/build_test
+t/t_echo: t/t_echo.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_echo" source="$(srcdir)/t/t_echo.sh"; \
$(BUILD_TEST)
@@ -163,7 +163,7 @@ t/t_echo: t/t_echo.sh $(builddir)/t/buil
pkgtests_SCRIPTS += t/t_files
CLEANFILES += t/t_files
EXTRA_DIST += t/t_files.sh
-t/t_files: t/t_files.sh $(builddir)/t/build_test
+t/t_files: t/t_files.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_files" source="$(srcdir)/t/t_files.sh"; \
$(BUILD_TEST)
@@ -171,7 +171,7 @@ t/t_files: t/t_files.sh $(builddir)/t/bu
pkgtests_SCRIPTS += t/t_fonts
CLEANFILES += t/t_fonts
EXTRA_DIST += t/t_fonts.sh
-t/t_fonts: t/t_fonts.sh $(builddir)/t/build_test
+t/t_fonts: t/t_fonts.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_fonts" source="$(srcdir)/t/t_fonts.sh"; \
$(BUILD_TEST)
@@ -179,7 +179,7 @@ t/t_fonts: t/t_fonts.sh $(builddir)/t/bu
pkgtests_SCRIPTS += t/t_groups
CLEANFILES += t/t_groups
EXTRA_DIST += t/t_groups.sh
-t/t_groups: t/t_groups.sh $(builddir)/t/build_test
+t/t_groups: t/t_groups.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_groups" source="$(srcdir)/t/t_groups.sh"; \
$(BUILD_TEST)
@@ -187,7 +187,7 @@ t/t_groups: t/t_groups.sh $(builddir)/t/
pkgtests_SCRIPTS += t/t_info_files
CLEANFILES += t/t_info_files
EXTRA_DIST += t/t_info_files.sh
-t/t_info_files: t/t_info_files.sh $(builddir)/t/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"; \
$(BUILD_TEST)
@@ -195,7 +195,7 @@ t/t_info_files: t/t_info_files.sh $(buil
pkgtests_SCRIPTS += t/t_lock
CLEANFILES += t/t_lock
EXTRA_DIST += t/t_lock.sh
-t/t_lock: t/t_lock.sh $(builddir)/t/build_test
+t/t_lock: t/t_lock.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_lock" source="$(srcdir)/t/t_lock.sh"; \
$(BUILD_TEST)
@@ -203,7 +203,7 @@ t/t_lock: t/t_lock.sh $(builddir)/t/buil
pkgtests_SCRIPTS += t/t_makedir
CLEANFILES += t/t_makedir
EXTRA_DIST += t/t_makedir.sh
-t/t_makedir: t/t_makedir.sh $(builddir)/t/build_test
+t/t_makedir: t/t_makedir.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_makedir" source="$(srcdir)/t/t_makedir.sh"; \
$(BUILD_TEST)
@@ -211,7 +211,7 @@ t/t_makedir: t/t_makedir.sh $(builddir)/
pkgtests_SCRIPTS += t/t_maketemp
CLEANFILES += t/t_maketemp
EXTRA_DIST += t/t_maketemp.sh
-t/t_maketemp: t/t_maketemp.sh $(builddir)/t/build_test
+t/t_maketemp: t/t_maketemp.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_maketemp" source="$(srcdir)/t/t_maketemp.sh"; \
$(BUILD_TEST)
@@ -219,7 +219,7 @@ t/t_maketemp: t/t_maketemp.sh $(builddir
pkgtests_SCRIPTS += t/t_match
CLEANFILES += t/t_match
EXTRA_DIST += t/t_match.sh
-t/t_match: t/t_match.sh $(builddir)/t/build_test
+t/t_match: t/t_match.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_match" source="$(srcdir)/t/t_match.sh"; \
$(BUILD_TEST)
@@ -227,7 +227,7 @@ t/t_match: t/t_match.sh $(builddir)/t/bu
pkgtests_SCRIPTS += t/t_ocaml_findlib
CLEANFILES += t/t_ocaml_findlib
EXTRA_DIST += t/t_ocaml_findlib.sh
-t/t_ocaml_findlib: t/t_ocaml_findlib.sh $(builddir)/t/build_test
+t/t_ocaml_findlib: t/t_ocaml_findlib.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_ocaml_findlib" source="$(srcdir)/t/t_ocaml_findlib.sh"; \
$(BUILD_TEST)
@@ -235,7 +235,7 @@ t/t_ocaml_findlib: t/t_ocaml_findlib.sh
pkgtests_SCRIPTS += t/t_permissions
CLEANFILES += t/t_permissions
EXTRA_DIST += t/t_permissions.sh
-t/t_permissions: t/t_permissions.sh $(builddir)/t/build_test
+t/t_permissions: t/t_permissions.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_permissions" source="$(srcdir)/t/t_permissions.sh"; \
$(BUILD_TEST)
@@ -243,7 +243,7 @@ t/t_permissions: t/t_permissions.sh $(bu
pkgtests_SCRIPTS += t/t_platform
CLEANFILES += t/t_platform
EXTRA_DIST += t/t_platform.sh
-t/t_platform: t/t_platform.sh $(builddir)/t/build_test
+t/t_platform: t/t_platform.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_platform" source="$(srcdir)/t/t_platform.sh"; \
$(BUILD_TEST)
@@ -251,7 +251,7 @@ t/t_platform: t/t_platform.sh $(builddir
pkgtests_SCRIPTS += t/t_postinstall
CLEANFILES += t/t_postinstall
EXTRA_DIST += t/t_postinstall.sh
-t/t_postinstall: t/t_postinstall.sh $(builddir)/t/build_test
+t/t_postinstall: t/t_postinstall.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_postinstall" source="$(srcdir)/t/t_postinstall.sh"; \
$(BUILD_TEST)
@@ -259,7 +259,7 @@ t/t_postinstall: t/t_postinstall.sh $(bu
pkgtests_SCRIPTS += t/t_postremove
CLEANFILES += t/t_postremove
EXTRA_DIST += t/t_postremove.sh
-t/t_postremove: t/t_postremove.sh $(builddir)/t/build_test
+t/t_postremove: t/t_postremove.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_postremove" source="$(srcdir)/t/t_postremove.sh"; \
$(BUILD_TEST)
@@ -267,7 +267,7 @@ t/t_postremove: t/t_postremove.sh $(buil
pkgtests_SCRIPTS += t/t_preinstall
CLEANFILES += t/t_preinstall
EXTRA_DIST += t/t_preinstall.sh
-t/t_preinstall: t/t_preinstall.sh $(builddir)/t/build_test
+t/t_preinstall: t/t_preinstall.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_preinstall" source="$(srcdir)/t/t_preinstall.sh"; \
$(BUILD_TEST)
@@ -275,7 +275,7 @@ t/t_preinstall: t/t_preinstall.sh $(buil
pkgtests_SCRIPTS += t/t_preremove
CLEANFILES += t/t_preremove
EXTRA_DIST += t/t_preremove.sh
-t/t_preremove: t/t_preremove.sh $(builddir)/t/build_test
+t/t_preremove: t/t_preremove.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_preremove" source="$(srcdir)/t/t_preremove.sh"; \
$(BUILD_TEST)
@@ -283,7 +283,7 @@ t/t_preremove: t/t_preremove.sh $(buildd
pkgtests_SCRIPTS += t/t_quote
CLEANFILES += t/t_quote
EXTRA_DIST += t/t_quote.sh
-t/t_quote: t/t_quote.sh $(builddir)/t/build_test
+t/t_quote: t/t_quote.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_quote" source="$(srcdir)/t/t_quote.sh"; \
$(BUILD_TEST)
@@ -291,7 +291,7 @@ t/t_quote: t/t_quote.sh $(builddir)/t/bu
pkgtests_SCRIPTS += t/t_random
CLEANFILES += t/t_random
EXTRA_DIST += t/t_random.sh
-t/t_random: t/t_random.sh $(builddir)/t/build_test
+t/t_random: t/t_random.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_random" source="$(srcdir)/t/t_random.sh"; \
$(BUILD_TEST)
@@ -299,7 +299,7 @@ t/t_random: t/t_random.sh $(builddir)/t/
pkgtests_SCRIPTS += t/t_refcount
CLEANFILES += t/t_refcount
EXTRA_DIST += t/t_refcount.sh
-t/t_refcount: t/t_refcount.sh $(builddir)/t/build_test
+t/t_refcount: t/t_refcount.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_refcount" source="$(srcdir)/t/t_refcount.sh"; \
$(BUILD_TEST)
@@ -307,7 +307,7 @@ t/t_refcount: t/t_refcount.sh $(builddir
pkgtests_SCRIPTS += t/t_shells
CLEANFILES += t/t_shells
EXTRA_DIST += t/t_shells.sh
-t/t_shells: t/t_shells.sh $(builddir)/t/build_test
+t/t_shells: t/t_shells.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_shells" source="$(srcdir)/t/t_shells.sh"; \
$(BUILD_TEST)
@@ -315,7 +315,7 @@ t/t_shells: t/t_shells.sh $(builddir)/t/
pkgtests_SCRIPTS += t/t_shlibs
CLEANFILES += t/t_shlibs
EXTRA_DIST += t/t_shlibs.sh
-t/t_shlibs: t/t_shlibs.sh $(builddir)/t/build_test
+t/t_shlibs: t/t_shlibs.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_shlibs" source="$(srcdir)/t/t_shlibs.sh"; \
$(BUILD_TEST)
@@ -323,7 +323,7 @@ t/t_shlibs: t/t_shlibs.sh $(builddir)/t/
pkgtests_SCRIPTS += t/t_sort
CLEANFILES += t/t_sort
EXTRA_DIST += t/t_sort.sh
-t/t_sort: t/t_sort.sh $(builddir)/t/build_test
+t/t_sort: t/t_sort.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_sort" source="$(srcdir)/t/t_sort.sh"; \
$(BUILD_TEST)
@@ -331,7 +331,7 @@ t/t_sort: t/t_sort.sh $(builddir)/t/buil
pkgtests_SCRIPTS += t/t_taskfunc
CLEANFILES += t/t_taskfunc
EXTRA_DIST += t/t_taskfunc.sh
-t/t_taskfunc: t/t_taskfunc.sh $(builddir)/t/build_test
+t/t_taskfunc: t/t_taskfunc.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_taskfunc" source="$(srcdir)/t/t_taskfunc.sh"; \
$(BUILD_TEST)
@@ -339,7 +339,7 @@ t/t_taskfunc: t/t_taskfunc.sh $(builddir
pkgtests_SCRIPTS += t/t_tee
CLEANFILES += t/t_tee
EXTRA_DIST += t/t_tee.sh
-t/t_tee: t/t_tee.sh $(builddir)/t/build_test
+t/t_tee: t/t_tee.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_tee" source="$(srcdir)/t/t_tee.sh"; \
$(BUILD_TEST)
@@ -347,7 +347,7 @@ t/t_tee: t/t_tee.sh $(builddir)/t/build_
pkgtests_SCRIPTS += t/t_truthy
CLEANFILES += t/t_truthy
EXTRA_DIST += t/t_truthy.sh
-t/t_truthy: t/t_truthy.sh $(builddir)/t/build_test
+t/t_truthy: t/t_truthy.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_truthy" source="$(srcdir)/t/t_truthy.sh"; \
$(BUILD_TEST)
@@ -355,7 +355,7 @@ t/t_truthy: t/t_truthy.sh $(builddir)/t/
pkgtests_SCRIPTS += t/t_usergroup
CLEANFILES += t/t_usergroup
EXTRA_DIST += t/t_usergroup.sh
-t/t_usergroup: t/t_usergroup.sh $(builddir)/t/build_test
+t/t_usergroup: t/t_usergroup.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_usergroup" source="$(srcdir)/t/t_usergroup.sh"; \
$(BUILD_TEST)
@@ -363,7 +363,7 @@ t/t_usergroup: t/t_usergroup.sh $(buildd
pkgtests_SCRIPTS += t/t_usergroup_FreeBSD
CLEANFILES += t/t_usergroup_FreeBSD
EXTRA_DIST += t/t_usergroup_FreeBSD.sh
-t/t_usergroup_FreeBSD: t/t_usergroup_FreeBSD.sh $(builddir)/t/build_test
+t/t_usergroup_FreeBSD: t/t_usergroup_FreeBSD.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_usergroup_FreeBSD" source="$(srcdir)/t/t_usergroup_FreeBSD.sh"; \
$(BUILD_TEST)
@@ -371,7 +371,7 @@ t/t_usergroup_FreeBSD: t/t_usergroup_Fre
pkgtests_SCRIPTS += t/t_usergroup_Linux
CLEANFILES += t/t_usergroup_Linux
EXTRA_DIST += t/t_usergroup_Linux.sh
-t/t_usergroup_Linux: t/t_usergroup_Linux.sh $(builddir)/t/build_test
+t/t_usergroup_Linux: t/t_usergroup_Linux.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_usergroup_Linux" source="$(srcdir)/t/t_usergroup_Linux.sh"; \
$(BUILD_TEST)
@@ -379,7 +379,7 @@ t/t_usergroup_Linux: t/t_usergroup_Linux
pkgtests_SCRIPTS += t/t_usergroup_MirBSD
CLEANFILES += t/t_usergroup_MirBSD
EXTRA_DIST += t/t_usergroup_MirBSD.sh
-t/t_usergroup_MirBSD: t/t_usergroup_MirBSD.sh $(builddir)/t/build_test
+t/t_usergroup_MirBSD: t/t_usergroup_MirBSD.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_usergroup_MirBSD" source="$(srcdir)/t/t_usergroup_MirBSD.sh"; \
$(BUILD_TEST)
@@ -387,7 +387,7 @@ t/t_usergroup_MirBSD: t/t_usergroup_MirB
pkgtests_SCRIPTS += t/t_usergroup_NetBSD
CLEANFILES += t/t_usergroup_NetBSD
EXTRA_DIST += t/t_usergroup_NetBSD.sh
-t/t_usergroup_NetBSD: t/t_usergroup_NetBSD.sh $(builddir)/t/build_test
+t/t_usergroup_NetBSD: t/t_usergroup_NetBSD.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_usergroup_NetBSD" source="$(srcdir)/t/t_usergroup_NetBSD.sh"; \
$(BUILD_TEST)
@@ -395,7 +395,7 @@ t/t_usergroup_NetBSD: t/t_usergroup_NetB
pkgtests_SCRIPTS += t/t_usergroup_exists
CLEANFILES += t/t_usergroup_exists
EXTRA_DIST += t/t_usergroup_exists.sh
-t/t_usergroup_exists: t/t_usergroup_exists.sh $(builddir)/t/build_test
+t/t_usergroup_exists: t/t_usergroup_exists.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_usergroup_exists" source="$(srcdir)/t/t_usergroup_exists.sh"; \
$(BUILD_TEST)
@@ -403,7 +403,7 @@ t/t_usergroup_exists: t/t_usergroup_exis
pkgtests_SCRIPTS += t/t_usergroup_mock
CLEANFILES += t/t_usergroup_mock
EXTRA_DIST += t/t_usergroup_mock.sh
-t/t_usergroup_mock: t/t_usergroup_mock.sh $(builddir)/t/build_test
+t/t_usergroup_mock: t/t_usergroup_mock.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_usergroup_mock" source="$(srcdir)/t/t_usergroup_mock.sh"; \
$(BUILD_TEST)
@@ -411,7 +411,7 @@ t/t_usergroup_mock: t/t_usergroup_mock.s
pkgtests_SCRIPTS += t/t_users
CLEANFILES += t/t_users
EXTRA_DIST += t/t_users.sh
-t/t_users: t/t_users.sh $(builddir)/t/build_test
+t/t_users: t/t_users.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_users" source="$(srcdir)/t/t_users.sh"; \
$(BUILD_TEST)
@@ -419,7 +419,7 @@ t/t_users: t/t_users.sh $(builddir)/t/bu
pkgtests_SCRIPTS += t/t_valid_options
CLEANFILES += t/t_valid_options
EXTRA_DIST += t/t_valid_options.sh
-t/t_valid_options: t/t_valid_options.sh $(builddir)/t/build_test
+t/t_valid_options: t/t_valid_options.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_valid_options" source="$(srcdir)/t/t_valid_options.sh"; \
$(BUILD_TEST)
@@ -427,7 +427,7 @@ t/t_valid_options: t/t_valid_options.sh
pkgtests_SCRIPTS += t/t_version
CLEANFILES += t/t_version
EXTRA_DIST += t/t_version.sh
-t/t_version: t/t_version.sh version.subr $(builddir)/t/build_test
+t/t_version: t/t_version.sh version.subr t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_version" source="$(srcdir)/t/t_version.sh"; \
$(BUILD_TEST)
@@ -435,7 +435,7 @@ t/t_version: t/t_version.sh version.subr
pkgtests_SCRIPTS += t/t_which
CLEANFILES += t/t_which
EXTRA_DIST += t/t_which.sh
-t/t_which: t/t_which.sh $(builddir)/t/build_test
+t/t_which: t/t_which.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_which" source="$(srcdir)/t/t_which.sh"; \
$(BUILD_TEST)
Index: pkgsrc/pkgtools/pkgtasks/files/Makefile.in
diff -u pkgsrc/pkgtools/pkgtasks/files/Makefile.in:1.1 pkgsrc/pkgtools/pkgtasks/files/Makefile.in:1.2
--- pkgsrc/pkgtools/pkgtasks/files/Makefile.in:1.1 Thu Jun 1 01:58:34 2017
+++ pkgsrc/pkgtools/pkgtasks/files/Makefile.in Sat Jun 3 23:54:53 2017
@@ -836,163 +836,163 @@ t/run_tests: t/run_tests.sh
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/run_tests" source="$(srcdir)/t/run_tests.sh"; \
$(BUILD_SCRIPT)
-t/t_compare: t/t_compare.sh $(builddir)/t/build_test
+t/t_compare: t/t_compare.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_compare" source="$(srcdir)/t/t_compare.sh"; \
$(BUILD_TEST)
-t/t_createfile: t/t_createfile.sh $(builddir)/t/build_test
+t/t_createfile: t/t_createfile.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_createfile" source="$(srcdir)/t/t_createfile.sh"; \
$(BUILD_TEST)
-t/t_directories: t/t_directories.sh $(builddir)/t/build_test
+t/t_directories: t/t_directories.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_directories" source="$(srcdir)/t/t_directories.sh"; \
$(BUILD_TEST)
-t/t_dirwalk: t/t_dirwalk.sh $(builddir)/t/build_test
+t/t_dirwalk: t/t_dirwalk.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_dirwalk" source="$(srcdir)/t/t_dirwalk.sh"; \
$(BUILD_TEST)
-t/t_echo: t/t_echo.sh $(builddir)/t/build_test
+t/t_echo: t/t_echo.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_echo" source="$(srcdir)/t/t_echo.sh"; \
$(BUILD_TEST)
-t/t_files: t/t_files.sh $(builddir)/t/build_test
+t/t_files: t/t_files.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_files" source="$(srcdir)/t/t_files.sh"; \
$(BUILD_TEST)
-t/t_fonts: t/t_fonts.sh $(builddir)/t/build_test
+t/t_fonts: t/t_fonts.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_fonts" source="$(srcdir)/t/t_fonts.sh"; \
$(BUILD_TEST)
-t/t_groups: t/t_groups.sh $(builddir)/t/build_test
+t/t_groups: t/t_groups.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_groups" source="$(srcdir)/t/t_groups.sh"; \
$(BUILD_TEST)
-t/t_info_files: t/t_info_files.sh $(builddir)/t/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"; \
$(BUILD_TEST)
-t/t_lock: t/t_lock.sh $(builddir)/t/build_test
+t/t_lock: t/t_lock.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_lock" source="$(srcdir)/t/t_lock.sh"; \
$(BUILD_TEST)
-t/t_makedir: t/t_makedir.sh $(builddir)/t/build_test
+t/t_makedir: t/t_makedir.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_makedir" source="$(srcdir)/t/t_makedir.sh"; \
$(BUILD_TEST)
-t/t_maketemp: t/t_maketemp.sh $(builddir)/t/build_test
+t/t_maketemp: t/t_maketemp.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_maketemp" source="$(srcdir)/t/t_maketemp.sh"; \
$(BUILD_TEST)
-t/t_match: t/t_match.sh $(builddir)/t/build_test
+t/t_match: t/t_match.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_match" source="$(srcdir)/t/t_match.sh"; \
$(BUILD_TEST)
-t/t_ocaml_findlib: t/t_ocaml_findlib.sh $(builddir)/t/build_test
+t/t_ocaml_findlib: t/t_ocaml_findlib.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_ocaml_findlib" source="$(srcdir)/t/t_ocaml_findlib.sh"; \
$(BUILD_TEST)
-t/t_permissions: t/t_permissions.sh $(builddir)/t/build_test
+t/t_permissions: t/t_permissions.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_permissions" source="$(srcdir)/t/t_permissions.sh"; \
$(BUILD_TEST)
-t/t_platform: t/t_platform.sh $(builddir)/t/build_test
+t/t_platform: t/t_platform.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_platform" source="$(srcdir)/t/t_platform.sh"; \
$(BUILD_TEST)
-t/t_postinstall: t/t_postinstall.sh $(builddir)/t/build_test
+t/t_postinstall: t/t_postinstall.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_postinstall" source="$(srcdir)/t/t_postinstall.sh"; \
$(BUILD_TEST)
-t/t_postremove: t/t_postremove.sh $(builddir)/t/build_test
+t/t_postremove: t/t_postremove.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_postremove" source="$(srcdir)/t/t_postremove.sh"; \
$(BUILD_TEST)
-t/t_preinstall: t/t_preinstall.sh $(builddir)/t/build_test
+t/t_preinstall: t/t_preinstall.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_preinstall" source="$(srcdir)/t/t_preinstall.sh"; \
$(BUILD_TEST)
-t/t_preremove: t/t_preremove.sh $(builddir)/t/build_test
+t/t_preremove: t/t_preremove.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_preremove" source="$(srcdir)/t/t_preremove.sh"; \
$(BUILD_TEST)
-t/t_quote: t/t_quote.sh $(builddir)/t/build_test
+t/t_quote: t/t_quote.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_quote" source="$(srcdir)/t/t_quote.sh"; \
$(BUILD_TEST)
-t/t_random: t/t_random.sh $(builddir)/t/build_test
+t/t_random: t/t_random.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_random" source="$(srcdir)/t/t_random.sh"; \
$(BUILD_TEST)
-t/t_refcount: t/t_refcount.sh $(builddir)/t/build_test
+t/t_refcount: t/t_refcount.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_refcount" source="$(srcdir)/t/t_refcount.sh"; \
$(BUILD_TEST)
-t/t_shells: t/t_shells.sh $(builddir)/t/build_test
+t/t_shells: t/t_shells.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_shells" source="$(srcdir)/t/t_shells.sh"; \
$(BUILD_TEST)
-t/t_shlibs: t/t_shlibs.sh $(builddir)/t/build_test
+t/t_shlibs: t/t_shlibs.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_shlibs" source="$(srcdir)/t/t_shlibs.sh"; \
$(BUILD_TEST)
-t/t_sort: t/t_sort.sh $(builddir)/t/build_test
+t/t_sort: t/t_sort.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_sort" source="$(srcdir)/t/t_sort.sh"; \
$(BUILD_TEST)
-t/t_taskfunc: t/t_taskfunc.sh $(builddir)/t/build_test
+t/t_taskfunc: t/t_taskfunc.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_taskfunc" source="$(srcdir)/t/t_taskfunc.sh"; \
$(BUILD_TEST)
-t/t_tee: t/t_tee.sh $(builddir)/t/build_test
+t/t_tee: t/t_tee.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_tee" source="$(srcdir)/t/t_tee.sh"; \
$(BUILD_TEST)
-t/t_truthy: t/t_truthy.sh $(builddir)/t/build_test
+t/t_truthy: t/t_truthy.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_truthy" source="$(srcdir)/t/t_truthy.sh"; \
$(BUILD_TEST)
-t/t_usergroup: t/t_usergroup.sh $(builddir)/t/build_test
+t/t_usergroup: t/t_usergroup.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_usergroup" source="$(srcdir)/t/t_usergroup.sh"; \
$(BUILD_TEST)
-t/t_usergroup_FreeBSD: t/t_usergroup_FreeBSD.sh $(builddir)/t/build_test
+t/t_usergroup_FreeBSD: t/t_usergroup_FreeBSD.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_usergroup_FreeBSD" source="$(srcdir)/t/t_usergroup_FreeBSD.sh"; \
$(BUILD_TEST)
-t/t_usergroup_Linux: t/t_usergroup_Linux.sh $(builddir)/t/build_test
+t/t_usergroup_Linux: t/t_usergroup_Linux.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_usergroup_Linux" source="$(srcdir)/t/t_usergroup_Linux.sh"; \
$(BUILD_TEST)
-t/t_usergroup_MirBSD: t/t_usergroup_MirBSD.sh $(builddir)/t/build_test
+t/t_usergroup_MirBSD: t/t_usergroup_MirBSD.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_usergroup_MirBSD" source="$(srcdir)/t/t_usergroup_MirBSD.sh"; \
$(BUILD_TEST)
-t/t_usergroup_NetBSD: t/t_usergroup_NetBSD.sh $(builddir)/t/build_test
+t/t_usergroup_NetBSD: t/t_usergroup_NetBSD.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_usergroup_NetBSD" source="$(srcdir)/t/t_usergroup_NetBSD.sh"; \
$(BUILD_TEST)
-t/t_usergroup_exists: t/t_usergroup_exists.sh $(builddir)/t/build_test
+t/t_usergroup_exists: t/t_usergroup_exists.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_usergroup_exists" source="$(srcdir)/t/t_usergroup_exists.sh"; \
$(BUILD_TEST)
-t/t_usergroup_mock: t/t_usergroup_mock.sh $(builddir)/t/build_test
+t/t_usergroup_mock: t/t_usergroup_mock.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_usergroup_mock" source="$(srcdir)/t/t_usergroup_mock.sh"; \
$(BUILD_TEST)
-t/t_users: t/t_users.sh $(builddir)/t/build_test
+t/t_users: t/t_users.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_users" source="$(srcdir)/t/t_users.sh"; \
$(BUILD_TEST)
-t/t_valid_options: t/t_valid_options.sh $(builddir)/t/build_test
+t/t_valid_options: t/t_valid_options.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_valid_options" source="$(srcdir)/t/t_valid_options.sh"; \
$(BUILD_TEST)
-t/t_version: t/t_version.sh version.subr $(builddir)/t/build_test
+t/t_version: t/t_version.sh version.subr t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_version" source="$(srcdir)/t/t_version.sh"; \
$(BUILD_TEST)
-t/t_which: t/t_which.sh $(builddir)/t/build_test
+t/t_which: t/t_which.sh t/build_test
-$(MKDIR_P) $(builddir)/t
$(AM_V_GEN)target="$(builddir)/t/t_which" source="$(srcdir)/t/t_which.sh"; \
$(BUILD_TEST)
Index: pkgsrc/pkgtools/pkgtasks/files/README.md
diff -u pkgsrc/pkgtools/pkgtasks/files/README.md:1.1 pkgsrc/pkgtools/pkgtasks/files/README.md:1.2
--- pkgsrc/pkgtools/pkgtasks/files/README.md:1.1 Thu Jun 1 01:58:34 2017
+++ pkgsrc/pkgtools/pkgtasks/files/README.md Sat Jun 3 23:54:53 2017
@@ -26,7 +26,7 @@ same entry more than once.
Getting sources
---------------
-The latest version of *pkgtasks* is 1.9 and was released on May 31st, 2017.
+The latest version of *pkgtasks* is 1.10 and was released on June 3rd, 2017.
See the [release notes](NEWS.md) for information about the changes in this
and all previous releases.
Index: pkgsrc/pkgtools/pkgtasks/files/configure
diff -u pkgsrc/pkgtools/pkgtasks/files/configure:1.1 pkgsrc/pkgtools/pkgtasks/files/configure:1.2
--- pkgsrc/pkgtools/pkgtasks/files/configure:1.1 Thu Jun 1 01:58:34 2017
+++ pkgsrc/pkgtools/pkgtasks/files/configure Sat Jun 3 23:54:53 2017
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for pkgtasks-1 1.9.
+# Generated by GNU Autoconf 2.69 for pkgtasks-1 1.10.
#
# Report bugs to <jlam%NetBSD.org@localhost>.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='pkgtasks-1'
PACKAGE_TARNAME='pkgtasks-1'
-PACKAGE_VERSION='1.9'
-PACKAGE_STRING='pkgtasks-1 1.9'
+PACKAGE_VERSION='1.10'
+PACKAGE_STRING='pkgtasks-1 1.10'
PACKAGE_BUGREPORT='jlam%NetBSD.org@localhost'
PACKAGE_URL=''
@@ -1209,7 +1209,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures pkgtasks-1 1.9 to adapt to many kinds of systems.
+\`configure' configures pkgtasks-1 1.10 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1275,7 +1275,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of pkgtasks-1 1.9:";;
+ short | recursive ) echo "Configuration of pkgtasks-1 1.10:";;
esac
cat <<\_ACEOF
@@ -1355,7 +1355,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-pkgtasks-1 configure 1.9
+pkgtasks-1 configure 1.10
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1372,7 +1372,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by pkgtasks-1 $as_me 1.9, which was
+It was created by pkgtasks-1 $as_me 1.10, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2242,7 +2242,7 @@ fi
# Define the identity of the package.
PACKAGE='pkgtasks-1'
- VERSION='1.9'
+ VERSION='1.10'
cat >>confdefs.h <<_ACEOF
@@ -3078,7 +3078,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by pkgtasks-1 $as_me 1.9, which was
+This file was extended by pkgtasks-1 $as_me 1.10, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3131,7 +3131,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-pkgtasks-1 config.status 1.9
+pkgtasks-1 config.status 1.10
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Index: pkgsrc/pkgtools/pkgtasks/files/configure.ac
diff -u pkgsrc/pkgtools/pkgtasks/files/configure.ac:1.1 pkgsrc/pkgtools/pkgtasks/files/configure.ac:1.2
--- pkgsrc/pkgtools/pkgtasks/files/configure.ac:1.1 Thu Jun 1 01:58:34 2017
+++ pkgsrc/pkgtools/pkgtasks/files/configure.ac Sat Jun 3 23:54:53 2017
@@ -26,7 +26,7 @@ dnl ARISING IN ANY WAY OUT OF THE USE OF
dnl POSSIBILITY OF SUCH DAMAGE.
dnl
-AC_INIT([pkgtasks-1], [1.9], [jlam%NetBSD.org@localhost])
+AC_INIT([pkgtasks-1], [1.10], [jlam%NetBSD.org@localhost])
AC_CONFIG_AUX_DIR([build-aux])
Index: pkgsrc/pkgtools/pkgtasks/files/directories.subr
diff -u pkgsrc/pkgtools/pkgtasks/files/directories.subr:1.1 pkgsrc/pkgtools/pkgtasks/files/directories.subr:1.2
--- pkgsrc/pkgtools/pkgtasks/files/directories.subr:1.1 Thu Jun 1 01:58:34 2017
+++ pkgsrc/pkgtools/pkgtasks/files/directories.subr Sat Jun 3 23:54:53 2017
@@ -274,7 +274,8 @@ task_directories()
elif [ "$makedir" = "seen" ]; then
$echo "${TASK_MSG}! $dir_msg creation skipped: $d_path"
elif task_makedir "$d_path"; then
- $echo "${TASK_MSG}> $dir_msg created: $d_path"
+ # Defer writing output until permissions are set.
+ #$echo "${TASK_MSG}> $dir_msg created: $d_path"
changes="$changes create"
else
$echo "${TASK_MSG}! $dir_msg not created: $d_path"
@@ -296,7 +297,11 @@ task_directories()
esac
if [ $line_result -eq 0 ]; then
case $mode/$user/$group in
- //) : "no permissions to set" ;;
+ //) case " $changes " in
+ *" create "*)
+ $echo "${TASK_MSG}> $dir_msg created: $d_path" ;;
+ *) : "no permissions to set" ;;
+ esac ;;
*) case $action in
add|perms)
task_refcount prop_put dirs "$path" permissions "$mode" "$user" "$group" || line_result=1
@@ -312,8 +317,17 @@ task_directories()
# "perms" action, but PKG_CONFIG_PERMS is not trutyy.
$echo "${TASK_MSG}! $dir_msg permissions skipped: $msg"
elif task_set_permissions "$d_path" "$mode" "$user" "$group"; then
- $echo "${TASK_MSG}> $dir_msg permissions set: $msg"
+ case " $changes " in
+ *" create "*)
+ $echo "${TASK_MSG}> $dir_msg created: $msg" ;;
+ *) $echo "${TASK_MSG}> $dir_msg permissions set: $msg" ;;
+ esac
else
+ case " $changes " in
+ *" create "*)
+ $echo "${TASK_MSG}> $dir_msg created: $d_path" ;;
+ *) : "no directory was created" ;;
+ esac
$echo "${TASK_MSG}! $dir_msg permissions not set: $msg"
line_result=1
fi ;;
Index: pkgsrc/pkgtools/pkgtasks/files/files.subr
diff -u pkgsrc/pkgtools/pkgtasks/files/files.subr:1.1 pkgsrc/pkgtools/pkgtasks/files/files.subr:1.2
--- pkgsrc/pkgtools/pkgtasks/files/files.subr:1.1 Thu Jun 1 01:58:34 2017
+++ pkgsrc/pkgtools/pkgtasks/files/files.subr Sat Jun 3 23:54:53 2017
@@ -286,7 +286,8 @@ task_files()
elif [ "$copy" = "seen" ]; then
$echo "${TASK_MSG}! file copy skipped: $d_path"
elif ${CP} "$egfile" "$d_path"; then
- $echo "${TASK_MSG}> file copied: $d_path"
+ # Defer writing output until after permissions are set.
+ #$echo "${TASK_MSG}> file copied: $d_path"
changes="$changes copy"
else
$echo "${TASK_MSG}! file not copied: $d_path"
@@ -317,22 +318,35 @@ task_files()
esac
if [ $line_result -eq 0 ]; then
case $mode/$user/$group in
- //) : "no permissions to set" ;;
+ //) case " $changes " in
+ *" copy "*)
+ $echo "${TASK_MSG}> file copied: $d_path" ;;
+ *) : "no permissions to set" ;;
+ esac ;;
*) case $action in
add|perms)
task_refcount prop_put files "$path" permissions "$mode" "$user" "$group" || line_result=1
if [ ! -f "$d_path" ]; then
$echo "${TASK_MSG}! file permissions not set on missing: $msg"
if [ "$copy" = "yes" ]; then
- # The should have been copied; otherwise, it's an error.
+ # The file should have been copied; otherwise, it's an error.
line_result=1
fi
elif [ "$action" = "perms" -a -z "$pkg_config_perms" ]; then
# "perms" action, but PKG_CONFIG_PERMS is not truthy.
$echo "${TASK_MSG}! file permissions skipped: $msg"
elif task_set_permissions "$d_path" "$mode" "$user" "$group"; then
- $echo "${TASK_MSG}> file permissions set: $msg"
+ case " $changes " in
+ *" copy "*)
+ $echo "${TASK_MSG}> file copied: $msg" ;;
+ *) $echo "${TASK_MSG}> file permissions set: $msg" ;;
+ esac
else
+ case " $changes " in
+ *" copy "*)
+ $echo "${TASK_MSG}> file copied: $d_path" ;;
+ *) : "no file was copied" ;;
+ esac
$echo "${TASK_MSG}! file permissions not set: $msg"
line_result=1
fi ;;
Index: pkgsrc/pkgtools/pkgtasks/files/build-aux/install-sh
diff -u pkgsrc/pkgtools/pkgtasks/files/build-aux/install-sh:1.1 pkgsrc/pkgtools/pkgtasks/files/build-aux/install-sh:1.2
--- pkgsrc/pkgtools/pkgtasks/files/build-aux/install-sh:1.1 Thu Jun 1 01:58:34 2017
+++ pkgsrc/pkgtools/pkgtasks/files/build-aux/install-sh Sat Jun 3 23:54:53 2017
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: install-sh,v 1.1 2017/06/01 01:58:34 jlam Exp $
+# $NetBSD: install-sh,v 1.2 2017/06/03 23:54:53 jlam Exp $
# This script now also installs multiple files, but might choke on installing
# multiple files with spaces in the file names.
#
Home |
Main Index |
Thread Index |
Old Index