sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-04-28 01:26:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ports-mgmt/portupgrade: stop warning about wrong package format

Browse source 
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>
This commit is contained in:
Baptiste Daroussin 2025-01-16 14:14:29 +01:00
parent 695d1ac4d1
commit 22f6c41496
2 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ports-mgmt/portupgrade/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= portupgrade
PORTVERSION= 2.4.16
PORTREVISION= 3
PORTREVISION= 4
PORTEPOCH= 2
CATEGORIES= ports-mgmt
MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \

20
ports-mgmt/portupgrade/files/patch-pkg-compression-format Normal file
View file

@ -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))