From owner-svn-ports-head@FreeBSD.ORG Tue Sep 25 15:23:15 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6EF39106566B; Tue, 25 Sep 2012 15:23:15 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3F90B8FC08; Tue, 25 Sep 2012 15:23:15 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8PFNFED051775; Tue, 25 Sep 2012 15:23:15 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8PFNFwb051770; Tue, 25 Sep 2012 15:23:15 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201209251523.q8PFNFwb051770@svn.freebsd.org> From: Alexey Dokuchaev Date: Tue, 25 Sep 2012 15:23:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r304840 - in head/x11: nvidia-driver nvidia-driver-173 nvidia-driver-71 nvidia-driver-96 X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Sep 2012 15:23:15 -0000 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