d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a bug in which pkg_version(1) was ignoring $PORTREVISION

Browse Source 
or $PORTEPOCH from ports' Makefile definitions.
This commit is contained in:
Bruce A. Mah 2000-10-26 21:38:44 +00:00
parent 45ddd9af7d
commit 8a755120e7
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
usr.sbin/pkg_install/version/pkg_version.pl
View File

@ -42,7 +42,7 @@ $CurrentPackagesCommand = '/usr/sbin/pkg_info -aI';
$CatProgram = "cat ";
$FetchProgram = "fetch -o - ";
$OriginCommand = '/usr/sbin/pkg_info -qo';
$GetPortVersionCommand = 'make -V PORTVERSION';
$GetPkgNameCommand = 'make -V PKGNAME';
#$IndexFile = "ftp://ftp.freebsd.org/pub/FreeBSD/branches/-current/ports/INDEX";
$PortsDirectory = '/usr/ports';
@ -109,7 +109,7 @@ sub CompareNumbers {
# 1.349 of ports/Mk/bsd.port.mk for more information.
#
sub CompareVersions {
local($fv1, $fv2, $v1, $v2, $v1, $r2, $e1, $e2, $rc);
local($fv1, $fv2, $v1, $v2, $r1, $r2, $e1, $e2, $rc);
$fv1 = $_[0];
$fv2 = $_[1];
@ -283,9 +283,12 @@ foreach $packageString (sort keys %currentPackages) {
# will fail.
chdir "$PortsDirectory/$origin" or next;
open VERSION, "$GetPortVersionCommand|";
$portversion = <VERSION>;
close VERSION;
open PKGNAME, "$GetPkgNameCommand|";
$portversion = <PKGNAME>;
close PKGNAME;
$pkgname =~ /(.+)-(.+)/;
$portversion = $2;
if ($portversion ne "") {
chomp $portversion;