From 71a4f12840ad5244d1fd843efa0d04f783a38944 Mon Sep 17 00:00:00 2001 From: Akinori MUSHA Date: Fri, 21 Sep 2001 22:46:14 +0000 Subject: [PATCH] Update to 20010922, with some brand new functionalities. overall: - Implement new package glob patterns: {<|<=|>=|>}{date|pkgname_glob}. For example, you can rebuild and reinstall all the dependent packages of png that had been installed prior to png this way: portupgrade -fr png -x '>=png' - Introduce the packages database, which is currently a simple hash that maps file paths to package names. Inspired by: NetBSD pkgdb(1): (new) - A command to create/update the packages database. pkg_which(1): (new) - A command to check which package a file came from quickly. portsclean(1): - Suppress "can't cd" error messages. Submitted by: Jos Backus ports_glob(1): (new) - Give portsdb(1)'s ports glob expanding feature a suitable name. --- ports-mgmt/portupgrade-devel/Makefile | 12 ++++++++---- ports-mgmt/portupgrade-devel/distinfo | 2 +- ports-mgmt/portupgrade-devel/pkg-descr | 12 ++++++------ ports-mgmt/portupgrade-devel/pkg-plist | 5 ++++- ports-mgmt/portupgrade/Makefile | 12 ++++++++---- ports-mgmt/portupgrade/distinfo | 2 +- ports-mgmt/portupgrade/pkg-descr | 12 ++++++------ ports-mgmt/portupgrade/pkg-plist | 5 ++++- sysutils/portupgrade-devel/Makefile | 12 ++++++++---- sysutils/portupgrade-devel/distinfo | 2 +- sysutils/portupgrade-devel/pkg-descr | 12 ++++++------ sysutils/portupgrade-devel/pkg-plist | 5 ++++- sysutils/portupgrade/Makefile | 12 ++++++++---- sysutils/portupgrade/distinfo | 2 +- sysutils/portupgrade/pkg-descr | 12 ++++++------ sysutils/portupgrade/pkg-plist | 5 ++++- 16 files changed, 76 insertions(+), 48 deletions(-) diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile index 79630674c192..618e3b1b5005 100644 --- a/ports-mgmt/portupgrade-devel/Makefile +++ b/ports-mgmt/portupgrade-devel/Makefile @@ -6,12 +6,12 @@ # PORTNAME= portupgrade -PORTVERSION= 20010921 +PORTVERSION= 20010922 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_LOCAL} \ http://www.iDaemons.org/distfiles/ MASTER_SITE_SUBDIR= knu -DISTNAME= pkgtools-${PORTVERSION:S/a$//} +DISTNAME= pkgtools-${PORTVERSION} #PATCH_SITES= ${MASTER_SITES} #PATCHFILES= pkgtools-${PORTVERSION}.patch.gz @@ -28,6 +28,7 @@ USE_RUBY= yes RUBY_SHEBANG_FILES= \ ${WRKSRC}/pkg_fetch \ ${WRKSRC}/pkg_glob \ + ${WRKSRC}/pkgdb \ ${WRKSRC}/pkgdepfix \ ${WRKSRC}/portcvsweb \ ${WRKSRC}/portsclean \ @@ -40,13 +41,17 @@ NO_BUILD= yes MAN1= pkg_deinstall.1 \ pkg_fetch.1 \ pkg_glob.1 \ + pkg_which.1 \ pkgdepfix.1 \ portcvsweb.1 \ + ports_glob.1 \ portsclean.1 \ portsdb.1 \ portupgrade.1 \ portversion.1 -MLINKS= portupgrade.1 portinstall.1 +MLINKS= pkgdb.1 pkg_which.1 \ + portupgrade.1 portinstall.1 \ + portsdb.1 ports_glob.1 MANCOMPRESSED= yes DOCS= ChangeLog README @@ -57,7 +62,6 @@ post-patch: .for f in pkgdb.rb pkgtools.rb ${RUBY} -i~ -pe 'sub %r:/usr/local:, "${LOCALBASE}"' ${WRKSRC}/${f} .endfor - ${RUBY} -i~ -pe 'sub!(/(make_cmdline\(portdir, .-V PKGNAME 2>\&1.)\}/, "\\1)}")' ${WRKSRC}/portupgrade do-install: cd ${WRKSRC} && ${RUBY} install.rb diff --git a/ports-mgmt/portupgrade-devel/distinfo b/ports-mgmt/portupgrade-devel/distinfo index 6f5939d71a0a..525cdb7eb9a1 100644 --- a/ports-mgmt/portupgrade-devel/distinfo +++ b/ports-mgmt/portupgrade-devel/distinfo @@ -1 +1 @@ -MD5 (pkgtools-20010921.tar.gz) = 078f67b90d642231c82f604b5d567af0 +MD5 (pkgtools-20010922.tar.gz) = aaa46b29adc57622637808c7f82e615e diff --git a/ports-mgmt/portupgrade-devel/pkg-descr b/ports-mgmt/portupgrade-devel/pkg-descr index 4b47bcfcb4c9..a30dd0000040 100644 --- a/ports-mgmt/portupgrade-devel/pkg-descr +++ b/ports-mgmt/portupgrade-devel/pkg-descr @@ -6,18 +6,18 @@ dependency chains up and down to upgrade packages recursively. This package also includes the following utilities: portinstall: Helps you install new ports in a handy way. - Equivalent to `portupgrade -N'. portcvsweb: Instantly browses a history via CVSweb. -portversion: Replaces pkg_version(1). This runs much faster and is +portversion: Replaces pkg_version(1), runs much faster and is cooperative with portupgrade(1). portsclean: Cleans ports workdir's, unreferenced distfiles and old and orphan shared libraries. -portsdb: Creates binary database from the ports INDEX, and - expands ports globs. -pkg_deinstall: Wraps pkg_delete(1) and provides wildcards and - dependency recursion support, plus some more. +portsdb: Creates binary database from the ports INDEX. +ports_glob: Expands ports globs. +pkg_deinstall: Wraps pkg_delete(1) and provides extra features. pkg_fetch: Fetches packages from a remote site. pkg_glob: Expands package globs. +pkg_which: Checks which package a file came from quickly. +pkgdb: Creates packages database from /var/db/pkg. pkgdepfix: Fixes the /var/db/pkg registry interactively. Author: Akinori MUSHA diff --git a/ports-mgmt/portupgrade-devel/pkg-plist b/ports-mgmt/portupgrade-devel/pkg-plist index 8689bbd51bf9..19d8bf44f055 100644 --- a/ports-mgmt/portupgrade-devel/pkg-plist +++ b/ports-mgmt/portupgrade-devel/pkg-plist @@ -4,11 +4,13 @@ etc/rc.d/000.pkgtools.sh sbin/pkg_deinstall sbin/pkg_fetch sbin/pkg_glob +sbin/pkgdb sbin/pkgdepfix sbin/portcvsweb +sbin/portinstall +sbin/ports_glob sbin/portsclean sbin/portsdb -sbin/portinstall sbin/portupgrade sbin/portversion %%RUBY_SITELIBDIR%%/pkg.rb @@ -23,6 +25,7 @@ sbin/portversion share/zsh/site-functions/_pkg_deinstall share/zsh/site-functions/_pkg_fetch share/zsh/site-functions/_pkg_glob +share/zsh/site-functions/_pkgdb share/zsh/site-functions/_pkgdepfix share/zsh/site-functions/_portsclean share/zsh/site-functions/_portsdb diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile index 79630674c192..618e3b1b5005 100644 --- a/ports-mgmt/portupgrade/Makefile +++ b/ports-mgmt/portupgrade/Makefile @@ -6,12 +6,12 @@ # PORTNAME= portupgrade -PORTVERSION= 20010921 +PORTVERSION= 20010922 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_LOCAL} \ http://www.iDaemons.org/distfiles/ MASTER_SITE_SUBDIR= knu -DISTNAME= pkgtools-${PORTVERSION:S/a$//} +DISTNAME= pkgtools-${PORTVERSION} #PATCH_SITES= ${MASTER_SITES} #PATCHFILES= pkgtools-${PORTVERSION}.patch.gz @@ -28,6 +28,7 @@ USE_RUBY= yes RUBY_SHEBANG_FILES= \ ${WRKSRC}/pkg_fetch \ ${WRKSRC}/pkg_glob \ + ${WRKSRC}/pkgdb \ ${WRKSRC}/pkgdepfix \ ${WRKSRC}/portcvsweb \ ${WRKSRC}/portsclean \ @@ -40,13 +41,17 @@ NO_BUILD= yes MAN1= pkg_deinstall.1 \ pkg_fetch.1 \ pkg_glob.1 \ + pkg_which.1 \ pkgdepfix.1 \ portcvsweb.1 \ + ports_glob.1 \ portsclean.1 \ portsdb.1 \ portupgrade.1 \ portversion.1 -MLINKS= portupgrade.1 portinstall.1 +MLINKS= pkgdb.1 pkg_which.1 \ + portupgrade.1 portinstall.1 \ + portsdb.1 ports_glob.1 MANCOMPRESSED= yes DOCS= ChangeLog README @@ -57,7 +62,6 @@ post-patch: .for f in pkgdb.rb pkgtools.rb ${RUBY} -i~ -pe 'sub %r:/usr/local:, "${LOCALBASE}"' ${WRKSRC}/${f} .endfor - ${RUBY} -i~ -pe 'sub!(/(make_cmdline\(portdir, .-V PKGNAME 2>\&1.)\}/, "\\1)}")' ${WRKSRC}/portupgrade do-install: cd ${WRKSRC} && ${RUBY} install.rb diff --git a/ports-mgmt/portupgrade/distinfo b/ports-mgmt/portupgrade/distinfo index 6f5939d71a0a..525cdb7eb9a1 100644 --- a/ports-mgmt/portupgrade/distinfo +++ b/ports-mgmt/portupgrade/distinfo @@ -1 +1 @@ -MD5 (pkgtools-20010921.tar.gz) = 078f67b90d642231c82f604b5d567af0 +MD5 (pkgtools-20010922.tar.gz) = aaa46b29adc57622637808c7f82e615e diff --git a/ports-mgmt/portupgrade/pkg-descr b/ports-mgmt/portupgrade/pkg-descr index 4b47bcfcb4c9..a30dd0000040 100644 --- a/ports-mgmt/portupgrade/pkg-descr +++ b/ports-mgmt/portupgrade/pkg-descr @@ -6,18 +6,18 @@ dependency chains up and down to upgrade packages recursively. This package also includes the following utilities: portinstall: Helps you install new ports in a handy way. - Equivalent to `portupgrade -N'. portcvsweb: Instantly browses a history via CVSweb. -portversion: Replaces pkg_version(1). This runs much faster and is +portversion: Replaces pkg_version(1), runs much faster and is cooperative with portupgrade(1). portsclean: Cleans ports workdir's, unreferenced distfiles and old and orphan shared libraries. -portsdb: Creates binary database from the ports INDEX, and - expands ports globs. -pkg_deinstall: Wraps pkg_delete(1) and provides wildcards and - dependency recursion support, plus some more. +portsdb: Creates binary database from the ports INDEX. +ports_glob: Expands ports globs. +pkg_deinstall: Wraps pkg_delete(1) and provides extra features. pkg_fetch: Fetches packages from a remote site. pkg_glob: Expands package globs. +pkg_which: Checks which package a file came from quickly. +pkgdb: Creates packages database from /var/db/pkg. pkgdepfix: Fixes the /var/db/pkg registry interactively. Author: Akinori MUSHA diff --git a/ports-mgmt/portupgrade/pkg-plist b/ports-mgmt/portupgrade/pkg-plist index 8689bbd51bf9..19d8bf44f055 100644 --- a/ports-mgmt/portupgrade/pkg-plist +++ b/ports-mgmt/portupgrade/pkg-plist @@ -4,11 +4,13 @@ etc/rc.d/000.pkgtools.sh sbin/pkg_deinstall sbin/pkg_fetch sbin/pkg_glob +sbin/pkgdb sbin/pkgdepfix sbin/portcvsweb +sbin/portinstall +sbin/ports_glob sbin/portsclean sbin/portsdb -sbin/portinstall sbin/portupgrade sbin/portversion %%RUBY_SITELIBDIR%%/pkg.rb @@ -23,6 +25,7 @@ sbin/portversion share/zsh/site-functions/_pkg_deinstall share/zsh/site-functions/_pkg_fetch share/zsh/site-functions/_pkg_glob +share/zsh/site-functions/_pkgdb share/zsh/site-functions/_pkgdepfix share/zsh/site-functions/_portsclean share/zsh/site-functions/_portsdb diff --git a/sysutils/portupgrade-devel/Makefile b/sysutils/portupgrade-devel/Makefile index 79630674c192..618e3b1b5005 100644 --- a/sysutils/portupgrade-devel/Makefile +++ b/sysutils/portupgrade-devel/Makefile @@ -6,12 +6,12 @@ # PORTNAME= portupgrade -PORTVERSION= 20010921 +PORTVERSION= 20010922 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_LOCAL} \ http://www.iDaemons.org/distfiles/ MASTER_SITE_SUBDIR= knu -DISTNAME= pkgtools-${PORTVERSION:S/a$//} +DISTNAME= pkgtools-${PORTVERSION} #PATCH_SITES= ${MASTER_SITES} #PATCHFILES= pkgtools-${PORTVERSION}.patch.gz @@ -28,6 +28,7 @@ USE_RUBY= yes RUBY_SHEBANG_FILES= \ ${WRKSRC}/pkg_fetch \ ${WRKSRC}/pkg_glob \ + ${WRKSRC}/pkgdb \ ${WRKSRC}/pkgdepfix \ ${WRKSRC}/portcvsweb \ ${WRKSRC}/portsclean \ @@ -40,13 +41,17 @@ NO_BUILD= yes MAN1= pkg_deinstall.1 \ pkg_fetch.1 \ pkg_glob.1 \ + pkg_which.1 \ pkgdepfix.1 \ portcvsweb.1 \ + ports_glob.1 \ portsclean.1 \ portsdb.1 \ portupgrade.1 \ portversion.1 -MLINKS= portupgrade.1 portinstall.1 +MLINKS= pkgdb.1 pkg_which.1 \ + portupgrade.1 portinstall.1 \ + portsdb.1 ports_glob.1 MANCOMPRESSED= yes DOCS= ChangeLog README @@ -57,7 +62,6 @@ post-patch: .for f in pkgdb.rb pkgtools.rb ${RUBY} -i~ -pe 'sub %r:/usr/local:, "${LOCALBASE}"' ${WRKSRC}/${f} .endfor - ${RUBY} -i~ -pe 'sub!(/(make_cmdline\(portdir, .-V PKGNAME 2>\&1.)\}/, "\\1)}")' ${WRKSRC}/portupgrade do-install: cd ${WRKSRC} && ${RUBY} install.rb diff --git a/sysutils/portupgrade-devel/distinfo b/sysutils/portupgrade-devel/distinfo index 6f5939d71a0a..525cdb7eb9a1 100644 --- a/sysutils/portupgrade-devel/distinfo +++ b/sysutils/portupgrade-devel/distinfo @@ -1 +1 @@ -MD5 (pkgtools-20010921.tar.gz) = 078f67b90d642231c82f604b5d567af0 +MD5 (pkgtools-20010922.tar.gz) = aaa46b29adc57622637808c7f82e615e diff --git a/sysutils/portupgrade-devel/pkg-descr b/sysutils/portupgrade-devel/pkg-descr index 4b47bcfcb4c9..a30dd0000040 100644 --- a/sysutils/portupgrade-devel/pkg-descr +++ b/sysutils/portupgrade-devel/pkg-descr @@ -6,18 +6,18 @@ dependency chains up and down to upgrade packages recursively. This package also includes the following utilities: portinstall: Helps you install new ports in a handy way. - Equivalent to `portupgrade -N'. portcvsweb: Instantly browses a history via CVSweb. -portversion: Replaces pkg_version(1). This runs much faster and is +portversion: Replaces pkg_version(1), runs much faster and is cooperative with portupgrade(1). portsclean: Cleans ports workdir's, unreferenced distfiles and old and orphan shared libraries. -portsdb: Creates binary database from the ports INDEX, and - expands ports globs. -pkg_deinstall: Wraps pkg_delete(1) and provides wildcards and - dependency recursion support, plus some more. +portsdb: Creates binary database from the ports INDEX. +ports_glob: Expands ports globs. +pkg_deinstall: Wraps pkg_delete(1) and provides extra features. pkg_fetch: Fetches packages from a remote site. pkg_glob: Expands package globs. +pkg_which: Checks which package a file came from quickly. +pkgdb: Creates packages database from /var/db/pkg. pkgdepfix: Fixes the /var/db/pkg registry interactively. Author: Akinori MUSHA diff --git a/sysutils/portupgrade-devel/pkg-plist b/sysutils/portupgrade-devel/pkg-plist index 8689bbd51bf9..19d8bf44f055 100644 --- a/sysutils/portupgrade-devel/pkg-plist +++ b/sysutils/portupgrade-devel/pkg-plist @@ -4,11 +4,13 @@ etc/rc.d/000.pkgtools.sh sbin/pkg_deinstall sbin/pkg_fetch sbin/pkg_glob +sbin/pkgdb sbin/pkgdepfix sbin/portcvsweb +sbin/portinstall +sbin/ports_glob sbin/portsclean sbin/portsdb -sbin/portinstall sbin/portupgrade sbin/portversion %%RUBY_SITELIBDIR%%/pkg.rb @@ -23,6 +25,7 @@ sbin/portversion share/zsh/site-functions/_pkg_deinstall share/zsh/site-functions/_pkg_fetch share/zsh/site-functions/_pkg_glob +share/zsh/site-functions/_pkgdb share/zsh/site-functions/_pkgdepfix share/zsh/site-functions/_portsclean share/zsh/site-functions/_portsdb diff --git a/sysutils/portupgrade/Makefile b/sysutils/portupgrade/Makefile index 79630674c192..618e3b1b5005 100644 --- a/sysutils/portupgrade/Makefile +++ b/sysutils/portupgrade/Makefile @@ -6,12 +6,12 @@ # PORTNAME= portupgrade -PORTVERSION= 20010921 +PORTVERSION= 20010922 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_LOCAL} \ http://www.iDaemons.org/distfiles/ MASTER_SITE_SUBDIR= knu -DISTNAME= pkgtools-${PORTVERSION:S/a$//} +DISTNAME= pkgtools-${PORTVERSION} #PATCH_SITES= ${MASTER_SITES} #PATCHFILES= pkgtools-${PORTVERSION}.patch.gz @@ -28,6 +28,7 @@ USE_RUBY= yes RUBY_SHEBANG_FILES= \ ${WRKSRC}/pkg_fetch \ ${WRKSRC}/pkg_glob \ + ${WRKSRC}/pkgdb \ ${WRKSRC}/pkgdepfix \ ${WRKSRC}/portcvsweb \ ${WRKSRC}/portsclean \ @@ -40,13 +41,17 @@ NO_BUILD= yes MAN1= pkg_deinstall.1 \ pkg_fetch.1 \ pkg_glob.1 \ + pkg_which.1 \ pkgdepfix.1 \ portcvsweb.1 \ + ports_glob.1 \ portsclean.1 \ portsdb.1 \ portupgrade.1 \ portversion.1 -MLINKS= portupgrade.1 portinstall.1 +MLINKS= pkgdb.1 pkg_which.1 \ + portupgrade.1 portinstall.1 \ + portsdb.1 ports_glob.1 MANCOMPRESSED= yes DOCS= ChangeLog README @@ -57,7 +62,6 @@ post-patch: .for f in pkgdb.rb pkgtools.rb ${RUBY} -i~ -pe 'sub %r:/usr/local:, "${LOCALBASE}"' ${WRKSRC}/${f} .endfor - ${RUBY} -i~ -pe 'sub!(/(make_cmdline\(portdir, .-V PKGNAME 2>\&1.)\}/, "\\1)}")' ${WRKSRC}/portupgrade do-install: cd ${WRKSRC} && ${RUBY} install.rb diff --git a/sysutils/portupgrade/distinfo b/sysutils/portupgrade/distinfo index 6f5939d71a0a..525cdb7eb9a1 100644 --- a/sysutils/portupgrade/distinfo +++ b/sysutils/portupgrade/distinfo @@ -1 +1 @@ -MD5 (pkgtools-20010921.tar.gz) = 078f67b90d642231c82f604b5d567af0 +MD5 (pkgtools-20010922.tar.gz) = aaa46b29adc57622637808c7f82e615e diff --git a/sysutils/portupgrade/pkg-descr b/sysutils/portupgrade/pkg-descr index 4b47bcfcb4c9..a30dd0000040 100644 --- a/sysutils/portupgrade/pkg-descr +++ b/sysutils/portupgrade/pkg-descr @@ -6,18 +6,18 @@ dependency chains up and down to upgrade packages recursively. This package also includes the following utilities: portinstall: Helps you install new ports in a handy way. - Equivalent to `portupgrade -N'. portcvsweb: Instantly browses a history via CVSweb. -portversion: Replaces pkg_version(1). This runs much faster and is +portversion: Replaces pkg_version(1), runs much faster and is cooperative with portupgrade(1). portsclean: Cleans ports workdir's, unreferenced distfiles and old and orphan shared libraries. -portsdb: Creates binary database from the ports INDEX, and - expands ports globs. -pkg_deinstall: Wraps pkg_delete(1) and provides wildcards and - dependency recursion support, plus some more. +portsdb: Creates binary database from the ports INDEX. +ports_glob: Expands ports globs. +pkg_deinstall: Wraps pkg_delete(1) and provides extra features. pkg_fetch: Fetches packages from a remote site. pkg_glob: Expands package globs. +pkg_which: Checks which package a file came from quickly. +pkgdb: Creates packages database from /var/db/pkg. pkgdepfix: Fixes the /var/db/pkg registry interactively. Author: Akinori MUSHA diff --git a/sysutils/portupgrade/pkg-plist b/sysutils/portupgrade/pkg-plist index 8689bbd51bf9..19d8bf44f055 100644 --- a/sysutils/portupgrade/pkg-plist +++ b/sysutils/portupgrade/pkg-plist @@ -4,11 +4,13 @@ etc/rc.d/000.pkgtools.sh sbin/pkg_deinstall sbin/pkg_fetch sbin/pkg_glob +sbin/pkgdb sbin/pkgdepfix sbin/portcvsweb +sbin/portinstall +sbin/ports_glob sbin/portsclean sbin/portsdb -sbin/portinstall sbin/portupgrade sbin/portversion %%RUBY_SITELIBDIR%%/pkg.rb @@ -23,6 +25,7 @@ sbin/portversion share/zsh/site-functions/_pkg_deinstall share/zsh/site-functions/_pkg_fetch share/zsh/site-functions/_pkg_glob +share/zsh/site-functions/_pkgdb share/zsh/site-functions/_pkgdepfix share/zsh/site-functions/_portsclean share/zsh/site-functions/_portsdb