aboutsummaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
authordanfe <danfe@FreeBSD.org>2012-09-25 23:23:14 +0800
committerdanfe <danfe@FreeBSD.org>2012-09-25 23:23:14 +0800
commit3b1b9e6147dd3385132d1fb9add93db9f5a201b3 (patch)
tree5e4573fa957199286d3772a1246e9b7efa405ed6 /x11
parent464a34f0649742e2622b64ce53fbfee88ebce184 (diff)
downloadfreebsd-ports-gnome-3b1b9e6147dd3385132d1fb9add93db9f5a201b3.tar.gz
freebsd-ports-gnome-3b1b9e6147dd3385132d1fb9add93db9f5a201b3.tar.zst
freebsd-ports-gnome-3b1b9e6147dd3385132d1fb9add93db9f5a201b3.zip
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
Diffstat (limited to 'x11')
-rw-r--r--x11/nvidia-driver-173/Makefile2
-rw-r--r--x11/nvidia-driver-71/Makefile1
-rw-r--r--x11/nvidia-driver-96/Makefile2
-rw-r--r--x11/nvidia-driver/Makefile3
4 files changed, 7 insertions, 1 deletions
diff --git a/x11/nvidia-driver-173/Makefile b/x11/nvidia-driver-173/Makefile
index ab266aa2a466..d548d97b2a09 100644
--- a/x11/nvidia-driver-173/Makefile
+++ b/x11/nvidia-driver-173/Makefile
@@ -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
diff --git a/x11/nvidia-driver-71/Makefile b/x11/nvidia-driver-71/Makefile
index a6f12fee6eb2..fbb3a7f7dd25 100644
--- a/x11/nvidia-driver-71/Makefile
+++ b/x11/nvidia-driver-71/Makefile
@@ -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
diff --git a/x11/nvidia-driver-96/Makefile b/x11/nvidia-driver-96/Makefile
index b3270896bf72..2aa1352a9074 100644
--- a/x11/nvidia-driver-96/Makefile
+++ b/x11/nvidia-driver-96/Makefile
@@ -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
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index a41bb911dae9..7fd1fd71bda6 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -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