- Update to 2.2.0

* Respect INDEXDIR after fetching INDEX (Andrew Pantyukhin <sat@FreeBSD.org>)
* Add --batch opition.
* Add --without-env-upgrade option.
* Remove -DPACKAGE_BUILDING (it was in fetch-only mode) because it's only
  for build cluster, not users. (Pointed out by kris@FreeBSD.org)
* Add detection of stale lock files. They can stay if one of tools suddenly
  terminated.
* Improve pkgdb -F - respect OPTIONS and pkgtools.conf settings.

6 files changed, 38 insertions, 34 deletions

diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile
index 53e85171c9ee..b46f18f17e52 100644
--- a/ports-mgmt/portupgrade-devel/Makefile
+++ b/ports-mgmt/portupgrade-devel/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	portupgrade-devel
-PORTVERSION=	2.1.7
+PORTVERSION=	2.2.0
 CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		http://sunner.elcomnet.ru/~sem/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	portupgrade
 DISTNAME=	pkgtools-${DISTVERSION}
 
@@ -25,8 +24,8 @@ USE_BZIP2=	yes
 USE_RUBY=	yes
 USE_RUBY_FEATURES=	optparse ruby18
 USE_PERL5_RUN=	yes
-
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	${PREFIX}/lib/compat/pkg
+LDCONFIG_DIRS=	%%PREFIX%%/lib/compat/pkg
 
 MAKE_ARGS=	PREFIX="${PREFIX}" RUBY="${RUBY}"
 
@@ -46,6 +45,9 @@ MLINKS=		pkgdb.1 pkg_which.1 \
 		portsdb.1 ports_glob.1
 MANCOMPRESSED=	maybe
 
+EXAMPLESDIR=	${PREFIX}/share/examples/pkgtools
+DOCSDIR=	${PREFIX}/share/doc/pkgtools
+
 INSTALL_TARGET=		install
 .if !defined(NOPORTDOCS)
 INSTALL_TARGET+=	install-doc
diff --git a/ports-mgmt/portupgrade-devel/distinfo b/ports-mgmt/portupgrade-devel/distinfo
index 57a6deee3945..aaba7392eeef 100644
--- a/ports-mgmt/portupgrade-devel/distinfo
+++ b/ports-mgmt/portupgrade-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (pkgtools-2.1.7.tar.bz2) = d7a4b9c0ad0cc86c3dc5bf94cf5c114a
-SHA256 (pkgtools-2.1.7.tar.bz2) = 959ede51b616d32f178b000a3d869ba00e4f3bb95e7cabe90fa740e9978b2c18
-SIZE (pkgtools-2.1.7.tar.bz2) = 111711
+MD5 (pkgtools-2.2.0.tar.bz2) = 19aadd36e8cb1cb301100b4c4acfa839
+SHA256 (pkgtools-2.2.0.tar.bz2) = 8a94e2cdab20cb7969479948147b0fda8810523e1eaf21fcebd672a56b8d04e3
+SIZE (pkgtools-2.2.0.tar.bz2) = 110561
diff --git a/ports-mgmt/portupgrade-devel/pkg-plist b/ports-mgmt/portupgrade-devel/pkg-plist
index 2a39a60ef371..8a14a576c813 100644
--- a/ports-mgmt/portupgrade-devel/pkg-plist
+++ b/ports-mgmt/portupgrade-devel/pkg-plist
@@ -31,12 +31,12 @@ etc/pkgtools.status-pkg.sh
 share/zsh/site-functions/_pkgtools
 @unexec [ -f %D/bin/zsh ] || rmdir %D/share/zsh/site-functions 2>/dev/null || true
 @dirrmtry share/zsh
-%%PORTDOCS%%share/examples/pkgtools/bash/complete.sample
-%%PORTDOCS%%@dirrm share/examples/pkgtools/bash
-%%PORTDOCS%%share/examples/pkgtools/tcsh/complete.sample
-%%PORTDOCS%%@dirrm share/examples/pkgtools/tcsh
-%%PORTDOCS%%@dirrm share/examples/pkgtools
-%%PORTDOCS%%share/doc/pkgtools/ChangeLog
-%%PORTDOCS%%share/doc/pkgtools/NEWS
-%%PORTDOCS%%share/doc/pkgtools/README
-%%PORTDOCS%%@dirrm share/doc/pkgtools
+%%PORTDOCS%%%%EXAMPLESDIR%%/bash/complete.sample
+%%PORTDOCS%%%%EXAMPLESDIR%%/tcsh/complete.sample
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/bash
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/tcsh
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/sysutils/portupgrade-devel/Makefile b/sysutils/portupgrade-devel/Makefile
index 53e85171c9ee..b46f18f17e52 100644
--- a/sysutils/portupgrade-devel/Makefile
+++ b/sysutils/portupgrade-devel/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	portupgrade-devel
-PORTVERSION=	2.1.7
+PORTVERSION=	2.2.0
 CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		http://sunner.elcomnet.ru/~sem/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	portupgrade
 DISTNAME=	pkgtools-${DISTVERSION}
 
@@ -25,8 +24,8 @@ USE_BZIP2=	yes
 USE_RUBY=	yes
 USE_RUBY_FEATURES=	optparse ruby18
 USE_PERL5_RUN=	yes
-
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	${PREFIX}/lib/compat/pkg
+LDCONFIG_DIRS=	%%PREFIX%%/lib/compat/pkg
 
 MAKE_ARGS=	PREFIX="${PREFIX}" RUBY="${RUBY}"
 
@@ -46,6 +45,9 @@ MLINKS=		pkgdb.1 pkg_which.1 \
 		portsdb.1 ports_glob.1
 MANCOMPRESSED=	maybe
 
+EXAMPLESDIR=	${PREFIX}/share/examples/pkgtools
+DOCSDIR=	${PREFIX}/share/doc/pkgtools
+
 INSTALL_TARGET=		install
 .if !defined(NOPORTDOCS)
 INSTALL_TARGET+=	install-doc
diff --git a/sysutils/portupgrade-devel/distinfo b/sysutils/portupgrade-devel/distinfo
index 57a6deee3945..aaba7392eeef 100644
--- a/sysutils/portupgrade-devel/distinfo
+++ b/sysutils/portupgrade-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (pkgtools-2.1.7.tar.bz2) = d7a4b9c0ad0cc86c3dc5bf94cf5c114a
-SHA256 (pkgtools-2.1.7.tar.bz2) = 959ede51b616d32f178b000a3d869ba00e4f3bb95e7cabe90fa740e9978b2c18
-SIZE (pkgtools-2.1.7.tar.bz2) = 111711
+MD5 (pkgtools-2.2.0.tar.bz2) = 19aadd36e8cb1cb301100b4c4acfa839
+SHA256 (pkgtools-2.2.0.tar.bz2) = 8a94e2cdab20cb7969479948147b0fda8810523e1eaf21fcebd672a56b8d04e3
+SIZE (pkgtools-2.2.0.tar.bz2) = 110561
diff --git a/sysutils/portupgrade-devel/pkg-plist b/sysutils/portupgrade-devel/pkg-plist
index 2a39a60ef371..8a14a576c813 100644
--- a/sysutils/portupgrade-devel/pkg-plist
+++ b/sysutils/portupgrade-devel/pkg-plist
@@ -31,12 +31,12 @@ etc/pkgtools.status-pkg.sh
 share/zsh/site-functions/_pkgtools
 @unexec [ -f %D/bin/zsh ] || rmdir %D/share/zsh/site-functions 2>/dev/null || true
 @dirrmtry share/zsh
-%%PORTDOCS%%share/examples/pkgtools/bash/complete.sample
-%%PORTDOCS%%@dirrm share/examples/pkgtools/bash
-%%PORTDOCS%%share/examples/pkgtools/tcsh/complete.sample
-%%PORTDOCS%%@dirrm share/examples/pkgtools/tcsh
-%%PORTDOCS%%@dirrm share/examples/pkgtools
-%%PORTDOCS%%share/doc/pkgtools/ChangeLog
-%%PORTDOCS%%share/doc/pkgtools/NEWS
-%%PORTDOCS%%share/doc/pkgtools/README
-%%PORTDOCS%%@dirrm share/doc/pkgtools
+%%PORTDOCS%%%%EXAMPLESDIR%%/bash/complete.sample
+%%PORTDOCS%%%%EXAMPLESDIR%%/tcsh/complete.sample
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/bash
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/tcsh
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%