diff options
author | Akinori MUSHA <knu@FreeBSD.org> | 2002-02-13 11:19:34 +0000 |
---|---|---|
committer | Akinori MUSHA <knu@FreeBSD.org> | 2002-02-13 11:19:34 +0000 |
commit | b470af54783361212edc3795628f5a6e4523cf4f (patch) | |
tree | c1d40934864bb35c17573a339ba2ec5d7996d77f /ports-mgmt | |
parent | de245e7e2bfffd61a609f2d8963ed2d24b7321fd (diff) | |
download | ports-b470af54783361212edc3795628f5a6e4523cf4f.tar.gz ports-b470af54783361212edc3795628f5a6e4523cf4f.zip |
Update to 20020213.1 which fixes the PKG_DBDRIVER problem introduced
in the last version. For the victims please manually reinstall the
portupgrade port, as always. ;)
Reported by: many users (Sorry!)
Use some logic and keep pkg_add/pkg_delete from complaining about the
@exec/@unexec return codes.
Submitted by: olgeni
Notes
Notes:
svn path=/head/; revision=54653
Diffstat (limited to 'ports-mgmt')
-rw-r--r-- | ports-mgmt/portupgrade-devel/Makefile | 2 | ||||
-rw-r--r-- | ports-mgmt/portupgrade-devel/distinfo | 2 | ||||
-rw-r--r-- | ports-mgmt/portupgrade-devel/pkg-plist | 4 | ||||
-rw-r--r-- | ports-mgmt/portupgrade/Makefile | 2 | ||||
-rw-r--r-- | ports-mgmt/portupgrade/distinfo | 2 | ||||
-rw-r--r-- | ports-mgmt/portupgrade/pkg-plist | 4 |
6 files changed, 8 insertions, 8 deletions
diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile index 252842ea2a77..993b9c1a2d77 100644 --- a/ports-mgmt/portupgrade-devel/Makefile +++ b/ports-mgmt/portupgrade-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= portupgrade -PORTVERSION= 20020213 +PORTVERSION= 20020213.1 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_LOCAL} \ http://www.iDaemons.org/distfiles/ diff --git a/ports-mgmt/portupgrade-devel/distinfo b/ports-mgmt/portupgrade-devel/distinfo index 420dd87ad1b1..4e418ecd4b68 100644 --- a/ports-mgmt/portupgrade-devel/distinfo +++ b/ports-mgmt/portupgrade-devel/distinfo @@ -1,2 +1,2 @@ MD5 (pkgtools-20020204.tar.bz2) = 7bf7db180578c8e87871520ef9ff79b9 -MD5 (pkgtools-20020204-20020213.diff.bz2) = ec2ccc50d12a3332c07c05e699e7f415 +MD5 (pkgtools-20020204-20020213.1.diff.bz2) = 28bb3ee1f73297ef81fec7d5a47fe36f diff --git a/ports-mgmt/portupgrade-devel/pkg-plist b/ports-mgmt/portupgrade-devel/pkg-plist index 1301988ae6cd..182e78432786 100644 --- a/ports-mgmt/portupgrade-devel/pkg-plist +++ b/ports-mgmt/portupgrade-devel/pkg-plist @@ -28,11 +28,11 @@ sbin/portversion %%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 +@exec [ -f %B/pkgtools.conf ] || cp %B/%f %B/pkgtools.conf etc/pkgtools.status-pkg.sh share/zsh/site-functions/_pkgtools share/zsh/site-functions/_pkg_tarup -@unexec [ ! -f %D/bin/zsh ] && rmdir %D/share/zsh/site-functions 2>/dev/null || true +@unexec [ -f %D/bin/zsh ] || rmdir %D/share/zsh/site-functions 2>/dev/null || true @unexec rmdir %D/share/zsh 2>/dev/null || true %%PORTDOCS%%share/examples/pkgtools/bash/complete.sample %%PORTDOCS%%@dirrm share/examples/pkgtools/bash diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile index 252842ea2a77..993b9c1a2d77 100644 --- a/ports-mgmt/portupgrade/Makefile +++ b/ports-mgmt/portupgrade/Makefile @@ -6,7 +6,7 @@ # PORTNAME= portupgrade -PORTVERSION= 20020213 +PORTVERSION= 20020213.1 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_LOCAL} \ http://www.iDaemons.org/distfiles/ diff --git a/ports-mgmt/portupgrade/distinfo b/ports-mgmt/portupgrade/distinfo index 420dd87ad1b1..4e418ecd4b68 100644 --- a/ports-mgmt/portupgrade/distinfo +++ b/ports-mgmt/portupgrade/distinfo @@ -1,2 +1,2 @@ MD5 (pkgtools-20020204.tar.bz2) = 7bf7db180578c8e87871520ef9ff79b9 -MD5 (pkgtools-20020204-20020213.diff.bz2) = ec2ccc50d12a3332c07c05e699e7f415 +MD5 (pkgtools-20020204-20020213.1.diff.bz2) = 28bb3ee1f73297ef81fec7d5a47fe36f diff --git a/ports-mgmt/portupgrade/pkg-plist b/ports-mgmt/portupgrade/pkg-plist index 1301988ae6cd..182e78432786 100644 --- a/ports-mgmt/portupgrade/pkg-plist +++ b/ports-mgmt/portupgrade/pkg-plist @@ -28,11 +28,11 @@ sbin/portversion %%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 +@exec [ -f %B/pkgtools.conf ] || cp %B/%f %B/pkgtools.conf etc/pkgtools.status-pkg.sh share/zsh/site-functions/_pkgtools share/zsh/site-functions/_pkg_tarup -@unexec [ ! -f %D/bin/zsh ] && rmdir %D/share/zsh/site-functions 2>/dev/null || true +@unexec [ -f %D/bin/zsh ] || rmdir %D/share/zsh/site-functions 2>/dev/null || true @unexec rmdir %D/share/zsh 2>/dev/null || true %%PORTDOCS%%share/examples/pkgtools/bash/complete.sample %%PORTDOCS%%@dirrm share/examples/pkgtools/bash |