Page MenuHomeFreeBSD
Files F173784438

D58581.id.diff
No OneTemporary
Actions

D58581.id.diff
View Options

diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1164,7 +1164,7 @@
. endif
_EXPORTED_VARS+= OSVERSION
-. if ${OPSYS} == FreeBSD && ${OSVERSION} < 1404000
+. if ${OPSYS} == FreeBSD && (${OSVERSION} < 1404000 || (${OSVERSION} >= 1500000 && ${OSVERSION} < 1501000))
_UNSUPPORTED_SYSTEM_MESSAGE= Ports Collection support for your ${OPSYS} version has ended, and no ports\
are guaranteed to build on this system. Please upgrade to a supported release.
. if defined(ALLOW_UNSUPPORTED_SYSTEM)
diff --git a/archivers/pbzip2/Makefile b/archivers/pbzip2/Makefile
--- a/archivers/pbzip2/Makefile
+++ b/archivers/pbzip2/Makefile
@@ -14,16 +14,9 @@
PLIST_FILES= bin/pbzip2 bin/pbunzip2 \
share/man/man1/pbzip2.1.gz share/man/man1/pbunzip2.1.gz
-.include <bsd.port.options.mk>
-
post-patch:
@${REINPLACE_CMD} -e 's,PRI[iu]MAX, & ,g' ${WRKSRC}/pbzip2.cpp \
${WRKSRC}/BZ2StreamScanner.cpp
-.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1500000 && ${OSVERSION} < 1500053)
-# Spell target sources to be understood by both BSD and GNU make(1)
- @${REINPLACE_CMD} -e '/-O2/s,^,#, ; s,$$^,$$>&,' \
- ${WRKSRC}/Makefile
-.endif
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
diff --git a/graphics/nvidia-drm-515-kmod/files/extra-patch-nvidia-drm-conftest.h b/graphics/nvidia-drm-515-kmod/files/extra-patch-nvidia-drm-conftest.h
deleted file mode 100644
--- a/graphics/nvidia-drm-515-kmod/files/extra-patch-nvidia-drm-conftest.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- nvidia-drm-conftest.h.orig 2024-02-22 01:03:15 UTC
-+++ nvidia-drm-conftest.h
-@@ -85,7 +85,11 @@
-
- /* For nv_drm_gem_prime_force_fence_signal */
- #ifndef spin_is_locked
-+#if ((__FreeBSD_version >= 1500000) && (__FreeBSD_version < 1500018)) || (__FreeBSD_version < 1401501)
- #define spin_is_locked(lock) mtx_owned(lock.m)
-+#else
-+#define spin_is_locked(lock) mtx_owned(lock)
-+#endif
- #endif
-
- #ifndef rwsem_is_locked
diff --git a/graphics/nvidia-drm-61-kmod/files/extra-patch-nvidia-drm-conftest.h b/graphics/nvidia-drm-61-kmod/files/extra-patch-nvidia-drm-conftest.h
deleted file mode 100644
--- a/graphics/nvidia-drm-61-kmod/files/extra-patch-nvidia-drm-conftest.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- nvidia-drm-conftest.h.orig 2024-02-22 01:03:15 UTC
-+++ nvidia-drm-conftest.h
-@@ -85,7 +85,11 @@
-
- /* For nv_drm_gem_prime_force_fence_signal */
- #ifndef spin_is_locked
-+#if ((__FreeBSD_version >= 1500000) && (__FreeBSD_version < 1500018)) || (__FreeBSD_version < 1401501)
- #define spin_is_locked(lock) mtx_owned(lock.m)
-+#else
-+#define spin_is_locked(lock) mtx_owned(lock)
-+#endif
- #endif
-
- #ifndef rwsem_is_locked
diff --git a/graphics/nvidia-drm-612-kmod/files/extra-patch-nvidia-drm-conftest.h b/graphics/nvidia-drm-612-kmod/files/extra-patch-nvidia-drm-conftest.h
deleted file mode 100644
--- a/graphics/nvidia-drm-612-kmod/files/extra-patch-nvidia-drm-conftest.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- nvidia-drm-conftest.h.orig 2024-02-22 01:03:15 UTC
-+++ nvidia-drm-conftest.h
-@@ -85,7 +85,11 @@
-
- /* For nv_drm_gem_prime_force_fence_signal */
- #ifndef spin_is_locked
-+#if ((__FreeBSD_version >= 1500000) && (__FreeBSD_version < 1500018)) || (__FreeBSD_version < 1401501)
- #define spin_is_locked(lock) mtx_owned(lock.m)
-+#else
-+#define spin_is_locked(lock) mtx_owned(lock)
-+#endif
- #endif
-
- #ifndef rwsem_is_locked
diff --git a/graphics/nvidia-drm-66-kmod/files/extra-patch-nvidia-drm-conftest.h b/graphics/nvidia-drm-66-kmod/files/extra-patch-nvidia-drm-conftest.h
deleted file mode 100644
--- a/graphics/nvidia-drm-66-kmod/files/extra-patch-nvidia-drm-conftest.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- nvidia-drm-conftest.h.orig 2024-02-22 01:03:15 UTC
-+++ nvidia-drm-conftest.h
-@@ -85,7 +85,11 @@
-
- /* For nv_drm_gem_prime_force_fence_signal */
- #ifndef spin_is_locked
-+#if ((__FreeBSD_version >= 1500000) && (__FreeBSD_version < 1500018)) || (__FreeBSD_version < 1401501)
- #define spin_is_locked(lock) mtx_owned(lock.m)
-+#else
-+#define spin_is_locked(lock) mtx_owned(lock)
-+#endif
- #endif
-
- #ifndef rwsem_is_locked
diff --git a/graphics/nvidia-drm-kmod/Makefile.common b/graphics/nvidia-drm-kmod/Makefile.common
--- a/graphics/nvidia-drm-kmod/Makefile.common
+++ b/graphics/nvidia-drm-kmod/Makefile.common
@@ -91,7 +91,3 @@
linenum=$$(${SED} -ne '/^#if __FreeBSD_version/ { = ; q ; }' \
${WRKSRC}/../nvidia/nv-freebsd.h) ; ${REINPLACE_CMD} \
-e "$$linenum,+2d" ${WRKSRC}/../nvidia/nv-freebsd.h
- # Workaround for build failure on any base without pm_vt_switch_required().
- # 13.5, 14.3 and 15.0 doesn't have the stub (blank) function.
- ${REINPLACE_CMD} -e 's/.*pm_vt_switch_required(dev->dev, true);.*/#if __FreeBSD_version >= 1403507 \&\& __FreeBSD_version < 1500000 || __FreeBSD_version >= 1500504\n&\n#endif/' \
- ${WRKSRC}/nvidia-drm-drv.c
diff --git a/graphics/nvidia-drm-latest-kmod/files/extra-patch-nvidia-drm-conftest.h b/graphics/nvidia-drm-latest-kmod/files/extra-patch-nvidia-drm-conftest.h
deleted file mode 100644
--- a/graphics/nvidia-drm-latest-kmod/files/extra-patch-nvidia-drm-conftest.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- nvidia-drm-conftest.h.orig 2024-02-22 01:03:15 UTC
-+++ nvidia-drm-conftest.h
-@@ -85,7 +85,11 @@
-
- /* For nv_drm_gem_prime_force_fence_signal */
- #ifndef spin_is_locked
-+#if ((__FreeBSD_version >= 1500000) && (__FreeBSD_version < 1500018)) || (__FreeBSD_version < 1401501)
- #define spin_is_locked(lock) mtx_owned(lock.m)
-+#else
-+#define spin_is_locked(lock) mtx_owned(lock)
-+#endif
- #endif
-
- #ifndef rwsem_is_locked

File Metadata

Mime Type
text/plain
Expires
Tue, Sep 29, 9:38 AM (8 h, 21 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
39870285
Default Alt Text
D58581.id.diff (5 KB)

Event Timeline