diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2025-01-16 14:14:29 +0100 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2025-01-16 14:18:49 +0100 |
| commit | 22f6c414960d8b0191f39bf0a98bd43f482ac637 (patch) | |
| tree | 4a241a509f4ec8641ffa7c5bb1cc22125d29193f | |
| parent | biology/py-bcbio-gff: Update to 0.7.1 (diff) | |
ports-mgmt/portupgrade: stop warning about wrong package format
pkg expect the compression format to be set via -f option, portupgrade
passes this information extracting the PKG_SUFX variable which is now
invariable since pkg 1.17. the .pkg suffix is always used, but the -f
option still expect the compression format to be defined in same form as
before: .tar, .tbz, .tgz etc.
Remove the call to the -f format to remove a useless warning.
PR: 284054
Submitted by: Terry Kennedy <terry-freebsd@glaver.org>
| -rw-r--r-- | ports-mgmt/portupgrade/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade/files/patch-pkg-compression-format | 20 |
2 files changed, 21 insertions, 1 deletions
diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile index 284b9f651f69..15712420b9df 100644 --- a/ports-mgmt/portupgrade/Makefile +++ b/ports-mgmt/portupgrade/Makefile @@ -1,6 +1,6 @@ PORTNAME= portupgrade PORTVERSION= 2.4.16 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 2 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ diff --git a/ports-mgmt/portupgrade/files/patch-pkg-compression-format b/ports-mgmt/portupgrade/files/patch-pkg-compression-format new file mode 100644 index 000000000000..982d92160dab --- /dev/null +++ b/ports-mgmt/portupgrade/files/patch-pkg-compression-format @@ -0,0 +1,20 @@ +--- bin/portupgrade 2025-01-15 11:54:51.384343000 -0500 ++++ bin/portupgrade 2025-01-15 12:07:01.082999000 -0500 +@@ -1077,7 +1077,7 @@ + end + + if $pkgdb.with_pkgng? +- system!(PkgDB::command(:pkg), 'create', '-o', $packages_dir, '-f', $portsdb.pkg_sufx, pkgname) ++ system!(PkgDB::command(:pkg), 'create', '-o', $packages_dir, pkgname) + else + system!(PkgDB::command(:pkg_create), '-vb', pkgname, + File.join($packages_dir, pkgname + $portsdb.pkg_sufx)) +@@ -2084,7 +2084,7 @@ + + if $pkgdb.with_pkgng? + backup_pkgfile = File.join($tmpdir, pkgname + $portsdb.pkg_sufx) +- backquote!(PkgDB::command(:pkg), 'create', '-o', $tmpdir, '-f', $portsdb.pkg_sufx, pkgname) ++ backquote!(PkgDB::command(:pkg), 'create', '-o', $tmpdir, pkgname) + else + if str = backquote!(PkgDB::command(:pkg_create), '-vb', pkgname, + File.join($tmpdir, pkgname + $portsdb.pkg_sufx)) |