Page MenuHomeFreeBSD
Files F166968272

D50142.id155251.diff
No OneTemporary
Actions

D50142.id155251.diff
View Options

diff --git a/x11/linux-nvidia-libs-304/Makefile b/linux-nvidia-libs-304/Makefile
--- a/x11/linux-nvidia-libs-304/Makefile
+++ b/linux-nvidia-libs-304/Makefile
@@ -1,6 +1,6 @@
DISTVERSION= 304.137
# Explicitly set PORTREVISION as it can be overridden by the master port
-PORTREVISION= 0
+PORTREVISION= 1
MASTERDIR= ${.CURDIR}/../linux-nvidia-libs
PKGNAMESUFFIX= -304
diff --git a/x11/linux-nvidia-libs-340/Makefile b/linux-nvidia-libs-340/Makefile
--- a/x11/linux-nvidia-libs-340/Makefile
+++ b/linux-nvidia-libs-340/Makefile
@@ -1,6 +1,6 @@
DISTVERSION= 340.108
# Explicitly set PORTREVISION as it can be overridden by the master port
-PORTREVISION= 0
+PORTREVISION= 1
MASTERDIR= ${.CURDIR}/../linux-nvidia-libs
PKGNAMESUFFIX= -340
diff --git a/x11/linux-nvidia-libs-390/Makefile b/linux-nvidia-libs-390/Makefile
--- a/x11/linux-nvidia-libs-390/Makefile
+++ b/linux-nvidia-libs-390/Makefile
@@ -1,6 +1,6 @@
DISTVERSION= 390.157
# Explicitly set PORTREVISION as it can be overridden by the master port
-PORTREVISION= 0
+-PORTREVISION= 1
MASTERDIR= ${.CURDIR}/../linux-nvidia-libs
PKGNAMESUFFIX= -390
diff --git a/x11/linux-nvidia-libs-470/Makefile b/linux-nvidia-libs-470/Makefile
--- a/x11/linux-nvidia-libs-470/Makefile
+++ b/linux-nvidia-libs-470/Makefile
@@ -1,6 +1,6 @@
DISTVERSION= 470.256.02
# Explicitly set PORTREVISION as it can be overridden by the master port
-PORTREVISION= 0
+PORTREVISION= 1
MASTERDIR= ${.CURDIR}/../linux-nvidia-libs
PKGNAMESUFFIX= -470
diff --git a/x11/linux-nvidia-libs-304/distinfo b/x11/linux-nvidia-libs-304/distinfo
--- a/x11/linux-nvidia-libs-304/distinfo
+++ b/x11/linux-nvidia-libs-304/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1745330825
+SHA256 (NVIDIA-Linux-x86_64-304.137.run) = eb1f56db3a2bea13e3ccde7b5ae14abe8cd6c6dbe69af4c71c68a623cc96e3e2
+SIZE (NVIDIA-Linux-x86_64-304.137.run) = 70087133
+SHA256 (NVIDIA-Linux-x86-304.137.run) = ca98379fc2090bdfe8b74113d6ac7bcc7eadbd86a489c3c4ec4cd5ba9f6064f8
+SIZE (NVIDIA-Linux-x86-304.137.run) = 41504115
diff --git a/x11/linux-nvidia-libs-340/distinfo b/x11/linux-nvidia-libs-340/distinfo
--- a/x11/linux-nvidia-libs-340/distinfo
+++ b/x11/linux-nvidia-libs-340/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1745330825
+SHA256 (NVIDIA-Linux-x86_64-340.108.run) = c671d4f1b7c09bc1af079b98b447adb06d704b04f802f7045a611fa50133b71b
+SIZE (NVIDIA-Linux-x86_64-340.108.run) = 70165522
+SHA256 (NVIDIA-Linux-x86-340.108.run) = 2032aad612d9f3af1aecf979cfdfe423d79aa76929ef8bf8d3a403076f507cca
+SIZE (NVIDIA-Linux-x86-340.108.run) = 38902892
diff --git a/x11/linux-nvidia-libs-390/distinfo b/x11/linux-nvidia-libs-390/distinfo
--- a/x11/linux-nvidia-libs-390/distinfo
+++ b/x11/linux-nvidia-libs-390/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1745330825
+SHA256 (NVIDIA-Linux-x86_64-390.157.run) = 5bebbca6e8fed5d6b9d81070fb9e351f18edc534952553cbdc71e8fd0b9b328a
+SIZE (NVIDIA-Linux-x86_64-390.157.run) = 85835541
+SHA256 (NVIDIA-Linux-x86-390.157.run) = 55d65e0a4539a9cb796200c5f1082fe263fb0951deaaf96a9cffeb8a80f70799
+SIZE (NVIDIA-Linux-x86-390.157.run) = 49417041
diff --git a/x11/linux-nvidia-libs-470/distinfo b/x11/linux-nvidia-libs-470/distinfo
--- a/x11/linux-nvidia-libs-470/distinfo
+++ b/x11/linux-nvidia-libs-470/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1745330825
+SHA256 (NVIDIA-Linux-x86_64-470.256.02.run) = d6451862deb695bb0447f3b7cd6268f73e81168c10e2c10597ff3fa01349b1de
+SIZE (NVIDIA-Linux-x86_64-470.256.02.run) = 272850014
diff --git a/x11/linux-nvidia-libs/Makefile b/x11/linux-nvidia-libs/Makefile
--- a/x11/linux-nvidia-libs/Makefile
+++ b/x11/linux-nvidia-libs/Makefile
@@ -1,7 +1,7 @@
PORTNAME= nvidia-libs
DISTVERSION?= ${NVIDIA_DISTVERSION}
# Always try to set PORTREVISION as it can be overridden by the slave ports
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= x11 linux
MASTER_SITES= NVIDIA/XFree86/Linux-${ARCH_SUFX}/${DISTVERSION}/
DISTNAME= NVIDIA-Linux-${ARCH_SUFX}-${DISTVERSION}
@@ -16,6 +16,12 @@
.include "${.CURDIR}/../nvidia-driver/Makefile.version"
.include "${.CURDIR}/../nvidia-driver/Makefile.common"
+# Choose proper distinfo file using PKGNAMESUFFIX for slave ports.
+# Kept for switching to centralized distinfo with suffixes.
+.ifdef PKGNAMESUFFIX
+DISTINFO_FILE= ${.CURDIR}/distinfo
+.endif
+
.if ${DISTVERSION:R} > 390
PORTSCOUT= limit:\.\d+$$ # ignore *-no-compat32 distfiles
.else
diff --git a/x11/linux-nvidia-libs/distinfo b/x11/linux-nvidia-libs/distinfo
--- a/x11/linux-nvidia-libs/distinfo
+++ b/x11/linux-nvidia-libs/distinfo
@@ -1,17 +1,3 @@
TIMESTAMP = 1745330825
SHA256 (NVIDIA-Linux-x86_64-570.144.run) = c0b8d7ecf2e20b83767674bab8fee4d1323dc55580274d8e934635e8955f3be6
SIZE (NVIDIA-Linux-x86_64-570.144.run) = 375742470
-SHA256 (NVIDIA-Linux-x86_64-470.256.02.run) = d6451862deb695bb0447f3b7cd6268f73e81168c10e2c10597ff3fa01349b1de
-SIZE (NVIDIA-Linux-x86_64-470.256.02.run) = 272850014
-SHA256 (NVIDIA-Linux-x86_64-390.157.run) = 5bebbca6e8fed5d6b9d81070fb9e351f18edc534952553cbdc71e8fd0b9b328a
-SIZE (NVIDIA-Linux-x86_64-390.157.run) = 85835541
-SHA256 (NVIDIA-Linux-x86-390.157.run) = 55d65e0a4539a9cb796200c5f1082fe263fb0951deaaf96a9cffeb8a80f70799
-SIZE (NVIDIA-Linux-x86-390.157.run) = 49417041
-SHA256 (NVIDIA-Linux-x86_64-340.108.run) = c671d4f1b7c09bc1af079b98b447adb06d704b04f802f7045a611fa50133b71b
-SIZE (NVIDIA-Linux-x86_64-340.108.run) = 70165522
-SHA256 (NVIDIA-Linux-x86-340.108.run) = 2032aad612d9f3af1aecf979cfdfe423d79aa76929ef8bf8d3a403076f507cca
-SIZE (NVIDIA-Linux-x86-340.108.run) = 38902892
-SHA256 (NVIDIA-Linux-x86_64-304.137.run) = eb1f56db3a2bea13e3ccde7b5ae14abe8cd6c6dbe69af4c71c68a623cc96e3e2
-SIZE (NVIDIA-Linux-x86_64-304.137.run) = 70087133
-SHA256 (NVIDIA-Linux-x86-304.137.run) = ca98379fc2090bdfe8b74113d6ac7bcc7eadbd86a489c3c4ec4cd5ba9f6064f8
-SIZE (NVIDIA-Linux-x86-304.137.run) = 41504115
diff --git a/x11/nvidia-driver-304/Makefile b/x11/nvidia-driver-304/Makefile
--- a/x11/nvidia-driver-304/Makefile
+++ b/x11/nvidia-driver-304/Makefile
@@ -1,6 +1,6 @@
DISTVERSION= 304.137
# Explicitly set PORTREVISION as it can be overridden by the master port
-PORTREVISION= 10
+PORTREVISION= 11
MASTERDIR= ${.CURDIR}/../nvidia-driver
PKGNAMESUFFIX= -304
diff --git a/x11/nvidia-driver-304/distinfo b/x11/nvidia-driver-304/distinfo
--- a/x11/nvidia-driver-304/distinfo
+++ b/x11/nvidia-driver-304/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1745330770
+SHA256 (NVIDIA-FreeBSD-x86_64-304.137.tar.gz) = 231693189e1bdf5c1dd02315cde5ef9ed6c0854564314438f2f40f9788a34120
+SIZE (NVIDIA-FreeBSD-x86_64-304.137.tar.gz) = 36474676
+SHA256 (NVIDIA-FreeBSD-x86-304.137.tar.gz) = 5f874133853eacc5b9a10311cec22d3c4898db7f75b92bb6c12d5be5126516fb
+SIZE (NVIDIA-FreeBSD-x86-304.137.tar.gz) = 35399011
diff --git a/x11/nvidia-driver-340/Makefile b/x11/nvidia-driver-340/Makefile
--- a/x11/nvidia-driver-340/Makefile
+++ b/x11/nvidia-driver-340/Makefile
@@ -1,6 +1,6 @@
DISTVERSION= 340.108
# Explicitly set PORTREVISION as it can be overridden by the master port
-PORTREVISION= 4
+PORTREVISION= 5
MASTERDIR= ${.CURDIR}/../nvidia-driver
PKGNAMESUFFIX= -340
diff --git a/x11/nvidia-driver-340/distinfo b/x11/nvidia-driver-340/distinfo
--- a/x11/nvidia-driver-340/distinfo
+++ b/x11/nvidia-driver-340/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1745330770
+SHA256 (NVIDIA-FreeBSD-x86_64-340.108.tar.gz) = f58fc793995008fd07719e3d001b1ad4b3547cfbc7084aec769098daa02e336f
+SIZE (NVIDIA-FreeBSD-x86_64-340.108.tar.gz) = 61500286
+SHA256 (NVIDIA-FreeBSD-x86-340.108.tar.gz) = 87b8523fb29e2bf51c2daf555e6dc46bbc6e5fd76b07a2034d3a5485a7cf99bf
+SIZE (NVIDIA-FreeBSD-x86-340.108.tar.gz) = 60616768
diff --git a/x11/nvidia-driver-390/Makefile b/x11/nvidia-driver-390/Makefile
--- a/x11/nvidia-driver-390/Makefile
+++ b/x11/nvidia-driver-390/Makefile
@@ -1,6 +1,6 @@
DISTVERSION= 390.157
# Explicitly set PORTREVISION as it can be overridden by the master port
-PORTREVISION= 0
+PORTREVISION= 1
MASTERDIR= ${.CURDIR}/../nvidia-driver
PKGNAMESUFFIX= -390
diff --git a/x11/nvidia-driver-390/distinfo b/x11/nvidia-driver-390/distinfo
--- a/x11/nvidia-driver-390/distinfo
+++ b/x11/nvidia-driver-390/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1745330770
+SHA256 (NVIDIA-FreeBSD-x86_64-390.157.tar.gz) = 51db7d824e9f190a0bff792f520cab029a10c94aedf92ab267fb5916a2f272b0
+SIZE (NVIDIA-FreeBSD-x86_64-390.157.tar.gz) = 65337455
+SHA256 (NVIDIA-FreeBSD-x86-390.157.tar.gz) = 2553ea15568dea95714a8560075c84af8a797f290f2621fb6986d0d105bab247
+SIZE (NVIDIA-FreeBSD-x86-390.157.tar.gz) = 65983616
diff --git a/x11/nvidia-driver-470/Makefile b/x11/nvidia-driver-470/Makefile
--- a/x11/nvidia-driver-470/Makefile
+++ b/x11/nvidia-driver-470/Makefile
@@ -1,6 +1,6 @@
DISTVERSION= 470.256.02
# Explicitly set PORTREVISION as it can be overridden by the master port
-PORTREVISION= 1
+PORTREVISION= 2
MASTERDIR= ${.CURDIR}/../nvidia-driver
PKGNAMESUFFIX= -470
diff --git a/x11/nvidia-driver-470/distinfo b/x11/nvidia-driver-470/distinfo
--- a/x11/nvidia-driver-470/distinfo
+++ b/x11/nvidia-driver-470/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1745330770
+SHA256 (NVIDIA-FreeBSD-x86_64-470.256.02.tar.xz) = 40d787fae82d653893b08afac4e0ec37a88f37154406bfb13d02bfc986881f5c
+SIZE (NVIDIA-FreeBSD-x86_64-470.256.02.tar.xz) = 99491020
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -14,7 +14,7 @@
PORTNAME?= nvidia-driver
DISTVERSION?= ${NVIDIA_DISTVERSION}
# Always try to set PORTREVISION as it can be overridden by the slave ports
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= x11
MASTER_SITES= NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}
DISTNAME= NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}
@@ -33,6 +33,12 @@
# to end up depending on non existing libraries
NO_SHLIB_REQUIRES_GLOB=*:32
+# Choose proper distinfo file using PKGNAMESUFFIX for slave ports.
+# Kept for switching to centralized distinfo with suffixes.
+.ifdef PKGNAMESUFFIX
+DISTINFO_FILE= ${.CURDIR}/distinfo
+.endif
+
# Pull GNU sed(1) for "binary" patching of obj/libglvnd/libEGL.so.1 and
# obj/libEGL_nvidia.so.0 (see below)
.if ${NVVERSION} >= 410.057
diff --git a/x11/nvidia-driver/Makefile.common b/x11/nvidia-driver/Makefile.common
--- a/x11/nvidia-driver/Makefile.common
+++ b/x11/nvidia-driver/Makefile.common
@@ -29,13 +29,11 @@
# Target below can be used instead of standard `makesum' to correctly
# update distinfo (i.e., keeping other driver version entries intact)
-.if ${.TARGETS:Mupdate-distinfo}
-DISTINFO_FILE= ${MASTERDIR}/distinfo.new
-.endif
+# This was somehow broken as TIMESTAMP line was not updated correctly
+# (duplicated) and archs other than build host (i.e., i386 on amd64
+# host) cannot be updated.
+# So switching to usual makesum on switching to separated distinfo,
+# as DISTINFO?FILE is already set properly in ${MASTERDIR}/Makefile,
+# keeping make target itself not to violate POLA.
update-distinfo: makesum .SILENT
- ${REINPLACE_CMD} -e '/${ARCH_SUFX}-${NVVERSION:R}/s/^/~/' \
- ${MASTERDIR}/distinfo
- ${REINPLACE_CMD} -e '/^~SHA256/r ${DISTINFO_FILE}' -e '/^~/d' \
- ${MASTERDIR}/distinfo
- ${RM} ${DISTINFO_FILE} ${MASTERDIR}/distinfo.bak
diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo
--- a/x11/nvidia-driver/distinfo
+++ b/x11/nvidia-driver/distinfo
@@ -1,17 +1,3 @@
TIMESTAMP = 1745330770
SHA256 (NVIDIA-FreeBSD-x86_64-570.144.tar.xz) = 7912c9f101b29fec10c434b1389b1403489fa3008fae67d1b76ef3d9f4b5388f
SIZE (NVIDIA-FreeBSD-x86_64-570.144.tar.xz) = 260506500
-SHA256 (NVIDIA-FreeBSD-x86_64-470.256.02.tar.xz) = 40d787fae82d653893b08afac4e0ec37a88f37154406bfb13d02bfc986881f5c
-SIZE (NVIDIA-FreeBSD-x86_64-470.256.02.tar.xz) = 99491020
-SHA256 (NVIDIA-FreeBSD-x86_64-390.157.tar.gz) = 51db7d824e9f190a0bff792f520cab029a10c94aedf92ab267fb5916a2f272b0
-SIZE (NVIDIA-FreeBSD-x86_64-390.157.tar.gz) = 65337455
-SHA256 (NVIDIA-FreeBSD-x86-390.157.tar.gz) = 2553ea15568dea95714a8560075c84af8a797f290f2621fb6986d0d105bab247
-SIZE (NVIDIA-FreeBSD-x86-390.157.tar.gz) = 65983616
-SHA256 (NVIDIA-FreeBSD-x86_64-340.108.tar.gz) = f58fc793995008fd07719e3d001b1ad4b3547cfbc7084aec769098daa02e336f
-SIZE (NVIDIA-FreeBSD-x86_64-340.108.tar.gz) = 61500286
-SHA256 (NVIDIA-FreeBSD-x86-340.108.tar.gz) = 87b8523fb29e2bf51c2daf555e6dc46bbc6e5fd76b07a2034d3a5485a7cf99bf
-SIZE (NVIDIA-FreeBSD-x86-340.108.tar.gz) = 60616768
-SHA256 (NVIDIA-FreeBSD-x86_64-304.137.tar.gz) = 231693189e1bdf5c1dd02315cde5ef9ed6c0854564314438f2f40f9788a34120
-SIZE (NVIDIA-FreeBSD-x86_64-304.137.tar.gz) = 36474676
-SHA256 (NVIDIA-FreeBSD-x86-304.137.tar.gz) = 5f874133853eacc5b9a10311cec22d3c4898db7f75b92bb6c12d5be5126516fb
-SIZE (NVIDIA-FreeBSD-x86-304.137.tar.gz) = 35399011

File Metadata

Mime Type
text/plain
Expires
Wed, Aug 19, 6:20 AM (7 h, 46 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
36919768
Default Alt Text
D50142.id155251.diff (12 KB)

Event Timeline