From 8bcd8f8426c8831eff2efdc4127ceabc48c8dca4 Mon Sep 17 00:00:00 2001 From: Akinori MUSHA Date: Fri, 8 Nov 2002 10:51:07 +0000 Subject: [PATCH] Apply a hot-fix against a bug where portupgrade(1)/pkgdb(1) leave temporary files ($TMPDIR/+CONTENTS*). Bump PORTREVISION for that. Modify the IGNORE message that is shown when pkg_create(1) is found to be too old. --- ports-mgmt/portupgrade-devel/Makefile | 6 +++++- ports-mgmt/portupgrade/Makefile | 6 +++++- sysutils/portupgrade-devel/Makefile | 6 +++++- sysutils/portupgrade/Makefile | 6 +++++- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile index 500008d293b7..aececc5e6132 100644 --- a/ports-mgmt/portupgrade-devel/Makefile +++ b/ports-mgmt/portupgrade-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= portupgrade PORTVERSION= 20021106 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \ ${MASTER_SITE_LOCAL} @@ -62,9 +63,12 @@ INSTALL_TARGET+= install-doc # XXX: PKG_CMD is not defined yet.. PKG_CREATE_OK!= /usr/sbin/pkg_create 2>&1 | ${GREP} ' -b ' || ${TRUE} .if empty(PKG_CREATE_OK) -IGNORE= pkg_create does not support -b. Please update pkg_* tools or stick with portupgrade-20020920 + pkg_tarup-1.2_3, which work just fine +IGNORE= pkg_create does not support -b. Please update /usr/sbin/pkg_* to those of the latest RELENG_4 .endif +post-patch: + ${RUBY} -i -pe "gsub(/('\/bin\/)cp(', '-f', tmpfile, file)/, '\1mv\2')" ${WRKSRC}/lib/pkgtools.rb + post-install: if [ ! -f ${PREFIX}/etc/pkgtools.conf ]; then \ ${CP} -p ${PREFIX}/etc/pkgtools.conf.sample ${PREFIX}/etc/pkgtools.conf; \ diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile index 500008d293b7..aececc5e6132 100644 --- a/ports-mgmt/portupgrade/Makefile +++ b/ports-mgmt/portupgrade/Makefile @@ -7,6 +7,7 @@ PORTNAME= portupgrade PORTVERSION= 20021106 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \ ${MASTER_SITE_LOCAL} @@ -62,9 +63,12 @@ INSTALL_TARGET+= install-doc # XXX: PKG_CMD is not defined yet.. PKG_CREATE_OK!= /usr/sbin/pkg_create 2>&1 | ${GREP} ' -b ' || ${TRUE} .if empty(PKG_CREATE_OK) -IGNORE= pkg_create does not support -b. Please update pkg_* tools or stick with portupgrade-20020920 + pkg_tarup-1.2_3, which work just fine +IGNORE= pkg_create does not support -b. Please update /usr/sbin/pkg_* to those of the latest RELENG_4 .endif +post-patch: + ${RUBY} -i -pe "gsub(/('\/bin\/)cp(', '-f', tmpfile, file)/, '\1mv\2')" ${WRKSRC}/lib/pkgtools.rb + post-install: if [ ! -f ${PREFIX}/etc/pkgtools.conf ]; then \ ${CP} -p ${PREFIX}/etc/pkgtools.conf.sample ${PREFIX}/etc/pkgtools.conf; \ diff --git a/sysutils/portupgrade-devel/Makefile b/sysutils/portupgrade-devel/Makefile index 500008d293b7..aececc5e6132 100644 --- a/sysutils/portupgrade-devel/Makefile +++ b/sysutils/portupgrade-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= portupgrade PORTVERSION= 20021106 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \ ${MASTER_SITE_LOCAL} @@ -62,9 +63,12 @@ INSTALL_TARGET+= install-doc # XXX: PKG_CMD is not defined yet.. PKG_CREATE_OK!= /usr/sbin/pkg_create 2>&1 | ${GREP} ' -b ' || ${TRUE} .if empty(PKG_CREATE_OK) -IGNORE= pkg_create does not support -b. Please update pkg_* tools or stick with portupgrade-20020920 + pkg_tarup-1.2_3, which work just fine +IGNORE= pkg_create does not support -b. Please update /usr/sbin/pkg_* to those of the latest RELENG_4 .endif +post-patch: + ${RUBY} -i -pe "gsub(/('\/bin\/)cp(', '-f', tmpfile, file)/, '\1mv\2')" ${WRKSRC}/lib/pkgtools.rb + post-install: if [ ! -f ${PREFIX}/etc/pkgtools.conf ]; then \ ${CP} -p ${PREFIX}/etc/pkgtools.conf.sample ${PREFIX}/etc/pkgtools.conf; \ diff --git a/sysutils/portupgrade/Makefile b/sysutils/portupgrade/Makefile index 500008d293b7..aececc5e6132 100644 --- a/sysutils/portupgrade/Makefile +++ b/sysutils/portupgrade/Makefile @@ -7,6 +7,7 @@ PORTNAME= portupgrade PORTVERSION= 20021106 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \ ${MASTER_SITE_LOCAL} @@ -62,9 +63,12 @@ INSTALL_TARGET+= install-doc # XXX: PKG_CMD is not defined yet.. PKG_CREATE_OK!= /usr/sbin/pkg_create 2>&1 | ${GREP} ' -b ' || ${TRUE} .if empty(PKG_CREATE_OK) -IGNORE= pkg_create does not support -b. Please update pkg_* tools or stick with portupgrade-20020920 + pkg_tarup-1.2_3, which work just fine +IGNORE= pkg_create does not support -b. Please update /usr/sbin/pkg_* to those of the latest RELENG_4 .endif +post-patch: + ${RUBY} -i -pe "gsub(/('\/bin\/)cp(', '-f', tmpfile, file)/, '\1mv\2')" ${WRKSRC}/lib/pkgtools.rb + post-install: if [ ! -f ${PREFIX}/etc/pkgtools.conf ]; then \ ${CP} -p ${PREFIX}/etc/pkgtools.conf.sample ${PREFIX}/etc/pkgtools.conf; \