kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Pass full path to pkg_{add,info} invoked from portupgrade.

Browse source 
PR:		ports/84278
Submitted by:	KOMATSU Shinichiro <koma2@lovepeers.org> (maintainer)
This commit is contained in:
Renato Botelho 2005-07-29 16:34:48 +00:00
parent 8852673677
commit 12b59934e5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=140411
8 changed files with 92 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ports-mgmt/portupgrade-devel/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= portupgrade
PORTVERSION= 20041226
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \
${MASTER_SITE_LOCAL}

22
ports-mgmt/portupgrade-devel/files/patch-bin-portupgrade Normal file
View file

@ -0,0 +1,22 @@
Index: bin/portupgrade
===================================================================
--- bin/portupgrade (revision 34)
+++ bin/portupgrade (revision 36)
@@ -1560,7 +1560,7 @@
timer_start(time_key = "Installation of #{pkgname}")
- cmdargs = [PkgDB::command(:pkg_add), '-f', pkgname]
+ cmdargs = [PkgDB::command(:pkg_add), '-f', pkgfile]
progress_message "Installing the new version via the package"
@@ -1705,7 +1705,7 @@
id_pkgname, id_origin, pkgdep = identify_pkg(file)
if id_origin == origin
- pkglist << [PkgInfo.new(id_pkgname), file]
+ pkglist << [PkgInfo.new(id_pkgname), File.join(dir, file)]
end
}
}

2
ports-mgmt/portupgrade/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= portupgrade
PORTVERSION= 20041226
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \
${MASTER_SITE_LOCAL}

22
ports-mgmt/portupgrade/files/patch-bin-portupgrade Normal file
View file

@ -0,0 +1,22 @@
Index: bin/portupgrade
===================================================================
--- bin/portupgrade (revision 34)
+++ bin/portupgrade (revision 36)
@@ -1560,7 +1560,7 @@
timer_start(time_key = "Installation of #{pkgname}")
- cmdargs = [PkgDB::command(:pkg_add), '-f', pkgname]
+ cmdargs = [PkgDB::command(:pkg_add), '-f', pkgfile]
progress_message "Installing the new version via the package"
@@ -1705,7 +1705,7 @@
id_pkgname, id_origin, pkgdep = identify_pkg(file)
if id_origin == origin
- pkglist << [PkgInfo.new(id_pkgname), file]
+ pkglist << [PkgInfo.new(id_pkgname), File.join(dir, file)]
end
}
}

2
sysutils/portupgrade-devel/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= portupgrade
PORTVERSION= 20041226
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \
${MASTER_SITE_LOCAL}

22
sysutils/portupgrade-devel/files/patch-bin-portupgrade Normal file
View file

@ -0,0 +1,22 @@
Index: bin/portupgrade
===================================================================
--- bin/portupgrade (revision 34)
+++ bin/portupgrade (revision 36)
@@ -1560,7 +1560,7 @@
timer_start(time_key = "Installation of #{pkgname}")
- cmdargs = [PkgDB::command(:pkg_add), '-f', pkgname]
+ cmdargs = [PkgDB::command(:pkg_add), '-f', pkgfile]
progress_message "Installing the new version via the package"
@@ -1705,7 +1705,7 @@
id_pkgname, id_origin, pkgdep = identify_pkg(file)
if id_origin == origin
- pkglist << [PkgInfo.new(id_pkgname), file]
+ pkglist << [PkgInfo.new(id_pkgname), File.join(dir, file)]
end
}
}

2
sysutils/portupgrade/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= portupgrade
PORTVERSION= 20041226
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \
${MASTER_SITE_LOCAL}

22
sysutils/portupgrade/files/patch-bin-portupgrade Normal file
View file

@ -0,0 +1,22 @@
Index: bin/portupgrade
===================================================================
--- bin/portupgrade (revision 34)
+++ bin/portupgrade (revision 36)
@@ -1560,7 +1560,7 @@
timer_start(time_key = "Installation of #{pkgname}")
- cmdargs = [PkgDB::command(:pkg_add), '-f', pkgname]
+ cmdargs = [PkgDB::command(:pkg_add), '-f', pkgfile]
progress_message "Installing the new version via the package"
@@ -1705,7 +1705,7 @@
id_pkgname, id_origin, pkgdep = identify_pkg(file)
if id_origin == origin
- pkglist << [PkgInfo.new(id_pkgname), file]
+ pkglist << [PkgInfo.new(id_pkgname), File.join(dir, file)]
end
}
}