[cygport - the Cygwin packaging tool] branch master, updated. 0.34.0-5-g02ee58b

[cygport - the Cygwin packaging tool] branch master, updated. 0.34.0-5-g02ee58b

[Yaakov Selkowitz]

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=02ee58bed56739abf56fcec3c6adc195f654f1fe

commit 02ee58bed56739abf56fcec3c6adc195f654f1fe
Author: Achim Gratz <Stromeko@Stromeko.DE>
Date:   Sun Dec 6 13:32:38 2015 +0100

    pkg_dist: uniquify requirements after the version has been stripped
    
    Move the "sort -fu" command to after the stripping of the version
    part, otherwise some dependencies might get listed twice in rare
    situations (perl_base does this sometimes).

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=9f87ba234365b64303c64eb6d173c2197437b593

commit 9f87ba234365b64303c64eb6d173c2197437b593
Author: Achim Gratz <Stromeko@Stromeko.DE>
Date:   Sun May 18 17:52:10 2014 +0200

    list_deps: correct search order for Perl dependencies
    
    Reverse the search order to pick up overrides for builtin packages
    correctly.  Always skip files in site_perl as these are strictly local
    installs.  Skip search in in vendor_perl if the PERL_NO_VENDOR_DEPS
    indicates that dependencies have already been injected into the cygport
    file by using the META information that comes with the distribution.
    
    Yaakov: changed variable from NO_PERL_DEPS to PERL_NO_VENDOR_DEPS

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=3ed455e9f5b92cb0d7c73db615315e204e999401

commit 3ed455e9f5b92cb0d7c73db615315e204e999401
Author: Achim Gratz <Stromeko@Stromeko.DE>
Date:   Sat Sep 17 10:07:10 2016 +0200

    src_install: correct test in make_etc_defaults
    
    The preremove script should only removes plain files when they match
    the default, so the postinstall script must not install files if
    anything with the same name already exists.  Change the test from
    '-f' to '-e'.

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=a82668b130f41bb0d9bec36df22291afda302d7f

commit a82668b130f41bb0d9bec36df22291afda302d7f
Author: Yaakov Selkowitz <yselkowi@redhat.com>
Date:   Sun May 10 16:32:58 2020 -0400

    doc: ignore CI build directory


Diff:
---
 doc/robodoc.rc          | 1 +
 lib/pkg_info.cygpart    | 2 +-
 lib/pkg_pkg.cygpart     | 4 ++--
 lib/src_install.cygpart | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/robodoc.rc b/doc/robodoc.rc
index cd4b81c..90d2dfd 100644
--- a/doc/robodoc.rc
+++ b/doc/robodoc.rc
@@ -77,6 +77,7 @@ headertypes:
 	P  "Postinstall Steps" cygport_postinstall_steps
 ignore files:
 	README
+	_build
 	build
 	CYGWIN-PATCHES
 	cygport-*.*.*
diff --git a/lib/pkg_info.cygpart b/lib/pkg_info.cygpart
index ac63395..98f7808 100644
--- a/lib/pkg_info.cygpart
+++ b/lib/pkg_info.cygpart
@@ -406,7 +406,7 @@ __list_deps() {
 
 	if check_prog perl
 	then
-		pldirs=($(perl -e 'print join(" ",@INC)'))
+		pldirs=($(perl -e 'my $inc=(exists $ENV{PERL_NO_VENDOR_DEPS}?"(vendor|site)":"(site)")."_perl";print join(" ",reverse grep !/$inc/,@INC)'))
 		pldirs+=" ${DEPS_PATH//:/ }"
 		for pldep in $(find "${@//^_^/ }" -path 'usr/share/doc/*' -prune \
 				${deps_prune} \
diff --git a/lib/pkg_pkg.cygpart b/lib/pkg_pkg.cygpart
index d1771a4..e4f5012 100644
--- a/lib/pkg_pkg.cygpart
+++ b/lib/pkg_pkg.cygpart
@@ -764,8 +764,8 @@ __pkg_dist() {
 			if [ "${CBUILD##*-}" = "cygwin" ]
 			then
 				pkg_bin_requires=$(__list_deps $(sort -fu ${T}/.${pkg_name[${n}]}.lst | sed -e '\|/$|d;s| |^_^|g') \
-						   | sort -fu | sed -e "/^${pkg_name[${n}]}-[0-9].*$/d;s/-[0-9].*$//g" \
-						   | sed -e ':a;N;$!ba;s/\n/ /g')
+						   | sed -e "/^${pkg_name[${n}]}-[0-9].*$/d;s/-[0-9].*$//g" \
+						   | sort -fu | sed -e ':a;N;$!ba;s/\n/ /g' )
 				__step "${pkg_name[${n}]} requires: ${pkg_bin_requires} ${!pkg_requires_var}"
 			else
 				pkg_bin_requires=
diff --git a/lib/src_install.cygpart b/lib/src_install.cygpart
index c017017..cca7347 100644
--- a/lib/src_install.cygpart
+++ b/lib/src_install.cygpart
@@ -848,7 +848,7 @@ make_etc_defaults() {
 
 		dodir /etc/postinstall
 		cat >> ${D}/etc/postinstall/${PN}.sh <<-_EOF
-			if [ ! -f ${etc} ]
+			if [ ! -e ${etc} ]
 			then
 			    /usr/bin/mkdir -p ${etc%/*}
 			    /usr/bin/cp /etc/defaults${etc} ${etc}