aboutsummaryrefslogtreecommitdiffstats
path: root/sysutils
diff options
context:
space:
mode:
authorgarga <garga@FreeBSD.org>2005-07-30 00:34:48 +0800
committergarga <garga@FreeBSD.org>2005-07-30 00:34:48 +0800
commitac4ec2756c7c712754e2fc50ff19521ec5ab8895 (patch)
tree89350c37667324d52954511e773f518591393df7 /sysutils
parent861493fcbe971739db478a985c60f9010ba5529d (diff)
downloadfreebsd-ports-gnome-ac4ec2756c7c712754e2fc50ff19521ec5ab8895.tar.gz
freebsd-ports-gnome-ac4ec2756c7c712754e2fc50ff19521ec5ab8895.tar.zst
freebsd-ports-gnome-ac4ec2756c7c712754e2fc50ff19521ec5ab8895.zip
Pass full path to pkg_{add,info} invoked from portupgrade.
PR: ports/84278 Submitted by: KOMATSU Shinichiro <koma2@lovepeers.org> (maintainer)
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/portupgrade-devel/Makefile2
-rw-r--r--sysutils/portupgrade-devel/files/patch-bin-portupgrade22
-rw-r--r--sysutils/portupgrade/Makefile2
-rw-r--r--sysutils/portupgrade/files/patch-bin-portupgrade22
4 files changed, 46 insertions, 2 deletions
diff --git a/sysutils/portupgrade-devel/Makefile b/sysutils/portupgrade-devel/Makefile
index 7a99dd0ae24f..60f879d2c7c9 100644
--- a/sysutils/portupgrade-devel/Makefile
+++ b/sysutils/portupgrade-devel/Makefile
@@ -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}
diff --git a/sysutils/portupgrade-devel/files/patch-bin-portupgrade b/sysutils/portupgrade-devel/files/patch-bin-portupgrade
new file mode 100644
index 000000000000..063d81beee94
--- /dev/null
+++ b/sysutils/portupgrade-devel/files/patch-bin-portupgrade
@@ -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
+ }
+ }
diff --git a/sysutils/portupgrade/Makefile b/sysutils/portupgrade/Makefile
index 7a99dd0ae24f..60f879d2c7c9 100644
--- a/sysutils/portupgrade/Makefile
+++ b/sysutils/portupgrade/Makefile
@@ -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}
diff --git a/sysutils/portupgrade/files/patch-bin-portupgrade b/sysutils/portupgrade/files/patch-bin-portupgrade
new file mode 100644
index 000000000000..063d81beee94
--- /dev/null
+++ b/sysutils/portupgrade/files/patch-bin-portupgrade
@@ -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
+ }
+ }