Date: Thu, 19 Apr 2001 14:39:03 -0700 From: "Bruce A. Mah" <bmah@FreeBSD.ORG> To: bmah@FreeBSD.ORG Cc: "Akinori MUSHA" <knu@iDaemons.org>, Kris Kennaway <kris@obsecurity.org>, "David O'Brien" <obrien@FreeBSD.ORG>, Chris Faulhaber <jedgar@fxp.org>, freebsd-ports@FreeBSD.ORG Subject: Re: cvs commit: ports/editors/vim6 Makefile distinfo pkg-plist Message-ID: <200104192139.f3JLd3Z63871@bmah-freebsd-0.cisco.com> In-Reply-To: <200104192113.f3JLDGj63092@bmah-freebsd-0.cisco.com> References: <200104111956.f3BJukl93003@freefall.freebsd.org> <20010419140501.A253@jive.44bsd.net> <8666g0d8ws.wl@archon.local.idaemons.org> <20010419122255.B29435@dragon.nuxi.com> <20010419123216.A53260@xor.obsecurity.org> <200104191955.f3JJtQV60074@bmah-freebsd-0.cisco.com> <864rvkd47m.wl@archon.local.idaemons.org> <200104192113.f3JLDGj63092@bmah-freebsd-0.cisco.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--==_Exmh_6232390P
Content-Type: text/plain; charset=us-ascii
[really a -ports post, but fixing a patch that was cross-posted]
Oh heck. This isn't my day. I feel like Joe Karthauser. :-)
Patch again....
Bruce.
? pkg_version.diff
Index: pkg_version.pl
===================================================================
RCS file: /home/ncvs/src/usr.sbin/pkg_install/version/pkg_version.pl,v
retrieving revision 1.17
diff -u -r1.17 pkg_version.pl
--- pkg_version.pl 2001/04/03 21:26:32 1.17
+++ pkg_version.pl 2001/04/19 21:34:27
@@ -148,7 +148,18 @@
else {
$c1 =~ s/\d+//;
$c2 =~ s/\d+//;
- return &CompareNumbers($c1, $c2);
+ if ($c1 eq $c2) {
+ return 0;
+ }
+ elsif ($c1 eq "") {
+ return -1;
+ }
+ elsif ($c2 eq "") {
+ return 1;
+ }
+ else {
+ return &CompareNumbers($c1, $c2);
+ }
}
}
}
Index: test-pkg_version.sh
===================================================================
RCS file: /home/ncvs/src/usr.sbin/pkg_install/version/test-pkg_version.sh,v
retrieving revision 1.1
diff -u -r1.1 test-pkg_version.sh
--- test-pkg_version.sh 2001/04/03 21:26:32 1.1
+++ test-pkg_version.sh 2001/04/19 21:34:27
@@ -61,8 +61,9 @@
test-pv 2.3p10 ">" 2.3p9 number/letter
test-pv 1.6.0 ">" 1.6.0.p3 number/letter
test-pv 1.0.b ">" 1.0.a3 number/letter
-test-pv 1.0a "<" 1.0 number/letter
-test-pv 5.0a "<" 5.0.b number/letter
+test-pv 1.0a ">" 1.0 number/letter
+test-pv 1.0a "<" 1.0b number/letter
+test-pv 5.0a ">" 5.0.b number/letter
test-pv 1.5_1 ">" 1.5 portrevision
test-pv 1.5_2 ">" 1.5_1 portrevision
--==_Exmh_6232390P
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.4 (FreeBSD)
Comment: Exmh version 2.2 06/23/2000
iD8DBQE631r22MoxcVugUsMRAjY1AJ91jc2dbW90dA1cqLOmCTrVSST0awCgwhGt
DYQXn052dbQzrZvNol89DIk=
=GzVT
-----END PGP SIGNATURE-----
--==_Exmh_6232390P--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200104192139.f3JLd3Z63871>