Date: Tue, 25 Sep 2012 15:23:14 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r304840 - in head/x11: nvidia-driver nvidia-driver-173 nvidia-driver-71 nvidia-driver-96 Message-ID: <201209251523.q8PFNFwb051770@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Tue Sep 25 15:23:14 2012 New Revision: 304840 URL: http://svn.freebsd.org/changeset/ports/304840 Log: Fix the problem that PKGVERSION for 173.14.xx legacy driver went backwards when it was updated to .35 on the 12th. That moment, it kept PORTREVISION 1 from the master port. When the master port was updated and PORTREVISION removed on the 22nd, PKGVERSION of nvidia-driver-173 went backwards as its PORTREVISION dropped from 1 to 0. While I am at it, provide a comments in all makefiles that keeping PORTREVISION setting (even when it is seemingly zero) is important. Reported by: erwin Modified: head/x11/nvidia-driver-173/Makefile head/x11/nvidia-driver-71/Makefile head/x11/nvidia-driver-96/Makefile head/x11/nvidia-driver/Makefile Modified: head/x11/nvidia-driver-173/Makefile ============================================================================== --- head/x11/nvidia-driver-173/Makefile Tue Sep 25 14:55:49 2012 (r304839) +++ head/x11/nvidia-driver-173/Makefile Tue Sep 25 15:23:14 2012 (r304840) @@ -6,6 +6,8 @@ # DISTVERSION= 173.14.35 +# Explicitly set PORTREVISION as it can be overridden by the master port +PORTREVISION= 1 MASTERDIR= ${.CURDIR}/../nvidia-driver NO_LATEST_LINK= yes Modified: head/x11/nvidia-driver-71/Makefile ============================================================================== --- head/x11/nvidia-driver-71/Makefile Tue Sep 25 14:55:49 2012 (r304839) +++ head/x11/nvidia-driver-71/Makefile Tue Sep 25 15:23:14 2012 (r304840) @@ -6,6 +6,7 @@ # DISTVERSION= 71.86.15 +# Explicitly set PORTREVISION as it can be overridden by the master port PORTREVISION= 2 MASTERDIR= ${.CURDIR}/../nvidia-driver Modified: head/x11/nvidia-driver-96/Makefile ============================================================================== --- head/x11/nvidia-driver-96/Makefile Tue Sep 25 14:55:49 2012 (r304839) +++ head/x11/nvidia-driver-96/Makefile Tue Sep 25 15:23:14 2012 (r304840) @@ -6,6 +6,8 @@ # DISTVERSION= 96.43.23 +# Explicitly set PORTREVISION as it can be overridden by the master port +PORTREVISION= 0 MASTERDIR= ${.CURDIR}/../nvidia-driver NO_LATEST_LINK= yes Modified: head/x11/nvidia-driver/Makefile ============================================================================== --- head/x11/nvidia-driver/Makefile Tue Sep 25 14:55:49 2012 (r304839) +++ head/x11/nvidia-driver/Makefile Tue Sep 25 15:23:14 2012 (r304840) @@ -7,7 +7,8 @@ PORTNAME= nvidia-driver DISTVERSION?= 304.43 -PORTREVISION?= 0 # As a reminder it can be overridden +# Always try to set PORTREVISION as can be overridden by the slave ports +PORTREVISION?= 0 CATEGORIES= x11 kld MASTER_SITES= ${MASTER_SITE_NVIDIA} # MASTER_SITE_SUBDIR has to be set later because it depends on NVVERSION
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209251523.q8PFNFwb051770>