Update to 20011024.

portupgrade, portversion, pkg_deinstall, pkg_glob:

  Introduce the configuration file `pkgtools.conf' for the pkgtools
  suite.  Currently portupgrade(1), portversion(1), pkg_deinstall(1)
  and pkg_glob(1) use it.

  Add a new option -q/--no-config to avoid reading the configuration
  file.

  Introduce dependency sanity checks.  If an inconsistency is
  detected, immediately abort a process suggesting the user should run
  `pkgdb -F'.

  Add a new option -O/--omit-check to omit the sanity checks.

pkgdb:

  Fix the origin guesser's minor bug when the origin port directory
  does not exist.

portupgrade:

  Add a new option -y/--yes, which lets portupgrade assume user
  answers yes to all the questions.

  Make sure to ask user where it should. (Get -N and -i right)

  Fix a bug where portinstall -i didn't work interactively.
  [Submitted by: Gregory Neil Shapiro <gshapiro@gshapiro.net>]

portsdb:

  Attempt to offer fast INDEX generation.  Now it generates an INDEX
  file more than a few minutes faster.

overall:

  Emit a warning when pkgdb cannot be updated though it is not
  up-to-date.

  Finally remove -E/--regex.  Use the ':RE' glob pattern instead.

6 files changed, 20 insertions, 4 deletions

diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile
index 07e30915e5ff..c6e0850a2257 100644
--- a/ports-mgmt/portupgrade-devel/Makefile
+++ b/ports-mgmt/portupgrade-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20011015
+PORTVERSION=	20011024
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
@@ -70,6 +70,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/misc/tcsh/* ${EXAMPLESDIR}/tcsh/
 	# Remove old database
 	${RM} -f /var/db/pkg/pkgdb.byfile.db
+	if [ ! -f ${PREFIX}/etc/pkgtools.conf ]; then \
+		${CP} -p ${PREFIX}/etc/pkgtools.conf.sample ${PREFIX}/etc/pkgtools.conf; \
+	fi
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for f in ${DOCS}
diff --git a/ports-mgmt/portupgrade-devel/distinfo b/ports-mgmt/portupgrade-devel/distinfo
index 78fb7ad066eb..050a3c549782 100644
--- a/ports-mgmt/portupgrade-devel/distinfo
+++ b/ports-mgmt/portupgrade-devel/distinfo
@@ -1 +1 @@
-MD5 (pkgtools-20011015.tar.gz) = f3ebffd289e4c78c2e8fa767e93045dd
+MD5 (pkgtools-20011024.tar.gz) = 2c36cc58bd360fba2e3edc1cdc7591fb
diff --git a/ports-mgmt/portupgrade-devel/pkg-plist b/ports-mgmt/portupgrade-devel/pkg-plist
index 198e7bfe16a0..c4e7d68b8b66 100644
--- a/ports-mgmt/portupgrade-devel/pkg-plist
+++ b/ports-mgmt/portupgrade-devel/pkg-plist
@@ -1,6 +1,8 @@
 etc/rc.d/000.pkgtools.sh
 @exec /bin/mkdir -p %D/lib/compat/pkg
 @unexec /bin/rmdir %D/lib/compat/pkg 2>/dev/null || true
+sbin/make_describe_pass1
+sbin/make_describe_pass2
 sbin/pkg_deinstall
 sbin/pkg_fetch
 sbin/pkg_glob
@@ -22,6 +24,9 @@ sbin/portversion
 %%RUBY_SITELIBDIR%%/ports.rb
 %%RUBY_SITELIBDIR%%/portsdb.rb
 %%RUBY_SITELIBDIR%%/tsort.rb
+@unexec if cmp -s %D/etc/pkgtools.conf %D/etc/pkgtools.conf.sample; then rm -f %D/etc/pkgtools.conf; fi
+etc/pkgtools.conf.sample
+@exec [ ! -f %B/pkgtools.conf ] && cp %B/%f %B/pkgtools.conf
 share/zsh/site-functions/_pkg_deinstall
 share/zsh/site-functions/_pkg_fetch
 share/zsh/site-functions/_pkg_glob
diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile
index 07e30915e5ff..c6e0850a2257 100644
--- a/ports-mgmt/portupgrade/Makefile
+++ b/ports-mgmt/portupgrade/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20011015
+PORTVERSION=	20011024
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
@@ -70,6 +70,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/misc/tcsh/* ${EXAMPLESDIR}/tcsh/
 	# Remove old database
 	${RM} -f /var/db/pkg/pkgdb.byfile.db
+	if [ ! -f ${PREFIX}/etc/pkgtools.conf ]; then \
+		${CP} -p ${PREFIX}/etc/pkgtools.conf.sample ${PREFIX}/etc/pkgtools.conf; \
+	fi
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for f in ${DOCS}
diff --git a/ports-mgmt/portupgrade/distinfo b/ports-mgmt/portupgrade/distinfo
index 78fb7ad066eb..050a3c549782 100644
--- a/ports-mgmt/portupgrade/distinfo
+++ b/ports-mgmt/portupgrade/distinfo
@@ -1 +1 @@
-MD5 (pkgtools-20011015.tar.gz) = f3ebffd289e4c78c2e8fa767e93045dd
+MD5 (pkgtools-20011024.tar.gz) = 2c36cc58bd360fba2e3edc1cdc7591fb
diff --git a/ports-mgmt/portupgrade/pkg-plist b/ports-mgmt/portupgrade/pkg-plist
index 198e7bfe16a0..c4e7d68b8b66 100644
--- a/ports-mgmt/portupgrade/pkg-plist
+++ b/ports-mgmt/portupgrade/pkg-plist
@@ -1,6 +1,8 @@
 etc/rc.d/000.pkgtools.sh
 @exec /bin/mkdir -p %D/lib/compat/pkg
 @unexec /bin/rmdir %D/lib/compat/pkg 2>/dev/null || true
+sbin/make_describe_pass1
+sbin/make_describe_pass2
 sbin/pkg_deinstall
 sbin/pkg_fetch
 sbin/pkg_glob
@@ -22,6 +24,9 @@ sbin/portversion
 %%RUBY_SITELIBDIR%%/ports.rb
 %%RUBY_SITELIBDIR%%/portsdb.rb
 %%RUBY_SITELIBDIR%%/tsort.rb
+@unexec if cmp -s %D/etc/pkgtools.conf %D/etc/pkgtools.conf.sample; then rm -f %D/etc/pkgtools.conf; fi
+etc/pkgtools.conf.sample
+@exec [ ! -f %B/pkgtools.conf ] && cp %B/%f %B/pkgtools.conf
 share/zsh/site-functions/_pkg_deinstall
 share/zsh/site-functions/_pkg_fetch
 share/zsh/site-functions/_pkg_glob