diff options
| author | knu <knu@FreeBSD.org> | 2001-10-24 13:08:20 +0000 |
|---|---|---|
| committer | knu <knu@FreeBSD.org> | 2001-10-24 13:08:20 +0000 |
| commit | 14a1ed45d68b579af8428abed1e0802d1903b69c (patch) | |
| tree | 4b5f427b3e514525d6e8c52362963e36db3a4789 /sysutils/portupgrade | |
| parent | 8db2a69f9f0056f15cf796b5f685a0c3ac280e37 (diff) | |
| download | FreeBSD-ports-14a1ed45d68b579af8428abed1e0802d1903b69c.zip FreeBSD-ports-14a1ed45d68b579af8428abed1e0802d1903b69c.tar.gz | |
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.
Diffstat (limited to 'sysutils/portupgrade')
| -rw-r--r-- | sysutils/portupgrade/Makefile | 5 | ||||
| -rw-r--r-- | sysutils/portupgrade/distinfo | 2 | ||||
| -rw-r--r-- | sysutils/portupgrade/pkg-plist | 5 |
3 files changed, 10 insertions, 2 deletions
diff --git a/sysutils/portupgrade/Makefile b/sysutils/portupgrade/Makefile index 07e3091..c6e0850 100644 --- a/sysutils/portupgrade/Makefile +++ b/sysutils/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/sysutils/portupgrade/distinfo b/sysutils/portupgrade/distinfo index 78fb7ad..050a3c5 100644 --- a/sysutils/portupgrade/distinfo +++ b/sysutils/portupgrade/distinfo @@ -1 +1 @@ -MD5 (pkgtools-20011015.tar.gz) = f3ebffd289e4c78c2e8fa767e93045dd +MD5 (pkgtools-20011024.tar.gz) = 2c36cc58bd360fba2e3edc1cdc7591fb diff --git a/sysutils/portupgrade/pkg-plist b/sysutils/portupgrade/pkg-plist index 198e7bf..c4e7d68 100644 --- a/sysutils/portupgrade/pkg-plist +++ b/sysutils/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 |
