Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 31 Mar 2020 16:15:17 +0000 (UTC)
From:      Rene Ladan <rene@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r529986 - in head: audio/supercollider graphics/drm-kmod graphics/gpu-firmware-kmod graphics/rawtherapee net-mgmt/kapacitor net-mgmt/kapacitor/files net/bnxt-kmod net/ceph13 net/ceph14 ...
Message-ID:  <202003311615.02VGFHkW008151@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rene
Date: Tue Mar 31 16:15:16 2020
New Revision: 529986
URL: https://svnweb.freebsd.org/changeset/ports/529986

Log:
  Clean up ports after FreeBSD 12.0 reached end-of-life.
  
  emulators/mesen is left out for now, as it breaks on 11.3
  
  Submitted by:	rene
  Reviewed by:	jbeich, zeising
  X-Differential Revision:	https://reviews.freebsd.org/D24211

Modified:
  head/audio/supercollider/Makefile
  head/graphics/drm-kmod/Makefile
  head/graphics/gpu-firmware-kmod/Makefile
  head/graphics/rawtherapee/Makefile
  head/net-mgmt/kapacitor/Makefile
  head/net-mgmt/kapacitor/files/kapacitord.in
  head/net/bnxt-kmod/Makefile
  head/net/ceph13/Makefile
  head/net/ceph14/Makefile
  head/net/zerotier/Makefile
  head/science/gromacs/Makefile
  head/sysutils/dwatch-gource/Makefile
  head/sysutils/dwatch-json/Makefile
  head/sysutils/dwatch-pwsnoop/Makefile
  head/sysutils/iichid/Makefile
  head/www/node/Makefile
  head/www/node12/Makefile

Modified: head/audio/supercollider/Makefile
==============================================================================
--- head/audio/supercollider/Makefile	Tue Mar 31 16:12:44 2020	(r529985)
+++ head/audio/supercollider/Makefile	Tue Mar 31 16:15:16 2020	(r529986)
@@ -13,6 +13,8 @@ COMMENT=	Programming language for real time audio synt
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+BROKEN_FreeBSD=	fails to compile with Clang 8 due shipped Boost 1.66 libraries. Not compatible with Boost 1.70+, either
+
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/intrusive/unordered_set.hpp:devel/boost-libs
 LIB_DEPENDS=	libavahi-client.so:net/avahi-app \
 		libavahi-common.so:net/avahi-app \
@@ -52,14 +54,6 @@ SUPERNOVA_CMAKE_BOOL=	SUPERNOVA
 
 .if ! ${ARCH} == amd64 && ! ${ARCH} == i386
 CMAKE_ARGS+=	-DSSE:BOOL=FALSE -DSSE2:BOOL=FALSE
-.endif
-
-.if ${OPSYS} == FreeBSD
-.if ${OSVERSION} < 1200000 || \
-	(${OSVERSION} >= 1200506 && ${OSVERSION} < 1300000) || \
-	${OSVERSION} >= 1300014
-BROKEN=	fails to compile with Clang 8 due shipped Boost 1.66 libraries. Not compatible with Boost 1.70+, either
-.endif
 .endif
 
 post-patch:

Modified: head/graphics/drm-kmod/Makefile
==============================================================================
--- head/graphics/drm-kmod/Makefile	Tue Mar 31 16:12:44 2020	(r529985)
+++ head/graphics/drm-kmod/Makefile	Tue Mar 31 16:15:16 2020	(r529986)
@@ -24,10 +24,6 @@ IGNORE=		legacy kmod not required on less than 12.0
 .else
 .if ${OSVERSION} >= 1103000 && ${OSVERSION} < 1200000
 RUN_DEPENDS=	${KMODDIR}/drm.ko:graphics/drm-fbsd11.2-kmod
-.elif ${OSVERSION} >= 1200000 && ${OSVERSION} < 1200045
-IGNORE=		not supported on older 12, no kernel support
-.elif ${OSVERSION} >= 1200045 && ${OSVERSION} < 1200058
-RUN_DEPENDS=	${KMODDIR}/drm.ko:graphics/drm-fbsd11.2-kmod
 .elif ${OSVERSION} >= 1200058 && ${OSVERSION} < 1300000
 RUN_DEPENDS=	${KMODDIR}/drm.ko:graphics/drm-fbsd12.0-kmod
 .elif ${OSVERSION} >= 1300000 && ${OSVERSION} < 1300029

Modified: head/graphics/gpu-firmware-kmod/Makefile
==============================================================================
--- head/graphics/gpu-firmware-kmod/Makefile	Tue Mar 31 16:12:44 2020	(r529985)
+++ head/graphics/gpu-firmware-kmod/Makefile	Tue Mar 31 16:15:16 2020	(r529986)
@@ -24,10 +24,4 @@ GH_ACCOUNT=	FreeBSDDesktop
 GH_PROJECT=	kms-firmware
 GH_TAGNAME=	c9eb7f3
 
-.include <bsd.port.pre.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200000 && ${OSVERSION} < 1200019
-IGNORE=		not supported on older CURRENT, no kernel support
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/graphics/rawtherapee/Makefile
==============================================================================
--- head/graphics/rawtherapee/Makefile	Tue Mar 31 16:12:44 2020	(r529985)
+++ head/graphics/rawtherapee/Makefile	Tue Mar 31 16:15:16 2020	(r529986)
@@ -41,9 +41,7 @@ USE_BINUTILS=	yes
 # As of 2019-09-29, this port is known to be miscompiled by clang90
 # (SIGSEGV or SIBGUS) and 12.1's base clang.
 #
-# FreeBSD 11.2/12.0's base clang 6.0.1 emits worse code with
-# considerably higher processing times, and on i386 additional calls to
-# __atomic_*(), so we shall stick to GCC 9.x for now
+# so we shall stick to GCC 9.x for now
 USE_GCC=	9+
 
 _LTO_FLAGS=	-flto=${MAKE_JOBS_NUMBER}
@@ -116,7 +114,7 @@ ONLY_FOR_ARCHS_REASON= i386 malfunctions on 11.x - upg
 .if (${OPSYS} == FreeBSD) && (${OSVERSION} >= 1300000)
 # don't waste everybody's time with Tier-2 and moving targets.
 # might add ARM64 or SPARC64 later on if they are established by the
-# time FreeBSD 12 is out.
+# time FreeBSD 13 is out.
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=Only amd64 is supported on non-released FreeBSD versions.
 .endif

Modified: head/net-mgmt/kapacitor/Makefile
==============================================================================
--- head/net-mgmt/kapacitor/Makefile	Tue Mar 31 16:12:44 2020	(r529985)
+++ head/net-mgmt/kapacitor/Makefile	Tue Mar 31 16:15:16 2020	(r529986)
@@ -44,14 +44,6 @@ KAPACITORD_GROUP=	influxd
 USERS=		${KAPACITORD_USER}
 GROUPS=		${KAPACITORD_GROUP}
 
-.include <bsd.port.pre.mk>
-
-.if ${OPSYS} == "FreeBSD" && (${OSVERSION} < 1200000 || ${OSVERSION} >= 1200015)
-SUB_LIST+=	KAPACITORD_LOGCMD="daemon"
-.else
-SUB_LIST+=	KAPACITORD_LOGCMD="logger"
-.endif
-
 KAPACITORD_DBDIR=	/var/db/${PORTNAME}/
 KAPACITORD_LOGDIR=	/var/log/${PORTNAME}/
 
@@ -65,4 +57,4 @@ post-install:
 		${WRKSRC}/etc/${PORTNAME}/${PORTNAME}.conf  \
 		${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/net-mgmt/kapacitor/files/kapacitord.in
==============================================================================
--- head/net-mgmt/kapacitor/files/kapacitord.in	Tue Mar 31 16:12:44 2020	(r529985)
+++ head/net-mgmt/kapacitor/files/kapacitord.in	Tue Mar 31 16:15:16 2020	(r529986)
@@ -35,7 +35,7 @@ start_precmd=kapacitord_prestart
 kapacitord_pidfile="/var/run/${name}.pid"
 procname="%%PREFIX%%/bin/${name}"
 command=/usr/sbin/daemon
-start_cmd="kapacitord_startcmd_%%KAPACITORD_LOGCMD%%"
+start_cmd="kapacitord_startcmd_daemon"
 
 kapacitord_startcmd_daemon()
 {

Modified: head/net/bnxt-kmod/Makefile
==============================================================================
--- head/net/bnxt-kmod/Makefile	Tue Mar 31 16:12:44 2020	(r529985)
+++ head/net/bnxt-kmod/Makefile	Tue Mar 31 16:15:16 2020	(r529986)
@@ -10,6 +10,9 @@ COMMENT=	Driver for Broadcom NetXtreme-C/NetXtreme-E d
 
 LICENSE=	BSD2CLAUSE
 
+DEPRECATED=	Unsupported on all supported FreeBSD versions
+EXPIRATION_DATE=2020-06-28
+
 USES=		kmod
 BUILD_WRKSRC=	${WRKSRC}/sys/modules/bnxt
 
@@ -40,14 +43,4 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/share/man/man4/bnxt.4 ${STAGEDIR}${MAN4PREFIX}/man/man4/
 	${LN} -f ${STAGEDIR}${MAN4PREFIX}/man/man4/bnxt.4 ${STAGEDIR}${MAN4PREFIX}/man/man4/if_bnxt.4
 
-.include <bsd.port.pre.mk>
-
-SUPPORTED=	no
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200002 && ${OSVERSION} <= 1200014
-SUPPORTED=	yes
-.endif
-.if ${SUPPORTED} == no
-IGNORE=		not supported on this version of FreeBSD
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/net/ceph13/Makefile
==============================================================================
--- head/net/ceph13/Makefile	Tue Mar 31 16:12:44 2020	(r529985)
+++ head/net/ceph13/Makefile	Tue Mar 31 16:15:16 2020	(r529986)
@@ -109,18 +109,6 @@ GROUPS=		ceph
 
 PLIST_SUB=	CMAKE_BUILD_TYPE_regex=\bdebug\b
 
-.include <bsd.port.options.mk>
-
-# 11.2 and 12.0 RELEASE has clang60 and will give versioning errors
-.if (${OSVERSION} < 1102507) || (${OSVERSION} >= 1200000 && ${OSVERSION} < 1200099)
-BUILD_DEPENDS+= ${LOCALBASE}/bin/clang80:devel/llvm80
-CC=		clang80
-CXX=		clang++80
-ASM=		clang80
-.endif
-
-.include <bsd.port.pre.mk>
-
 pre-configure:
 	${LN} -s ${CONFIGURE_WRKSRC} ${WRKSRC}/build
 	${CP} files/file-git_version ${WRKSRC}/src/.git_version
@@ -168,4 +156,4 @@ post-install:
 	${RMDIR} ${STAGEDIR}${PREFIX}/etc/init.d
 	${INSTALL_DATA} ${WRKSRC}/src/sample.ceph.conf ${STAGEDIR}${PREFIX}/etc/ceph/ceph.conf.sample
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/net/ceph14/Makefile
==============================================================================
--- head/net/ceph14/Makefile	Tue Mar 31 16:12:44 2020	(r529985)
+++ head/net/ceph14/Makefile	Tue Mar 31 16:15:16 2020	(r529986)
@@ -109,18 +109,6 @@ GROUPS=		ceph
 
 PLIST_SUB=	CMAKE_BUILD_TYPE_regex=\bdebug\b
 
-.include <bsd.port.options.mk>
-
-# 11.2 and 12.0 RELEASE has clang60 and will give versioning errors
-.if (${OSVERSION} < 1102507) || (${OSVERSION} >= 1200000 && ${OSVERSION} < 1200099)
-BUILD_DEPENDS+=	${LOCALBASE}/bin/clang80:devel/llvm80
-CC=		clang80
-CXX=		clang++80
-ASM=		clang80
-.endif
-
-.include <bsd.port.pre.mk>
-
 pre-configure:
 	[ -e ${WRKSRC}/build ] || ${LN} -s ${CONFIGURE_WRKSRC} ${WRKSRC}/build
 	${CP} files/file-git_version ${WRKSRC}/src/.git_version
@@ -169,4 +157,4 @@ post-install:
 	${RM} -rf ${STAGEDIR}${PREFIX}/libexec/systemd
 	${RMDIR} ${STAGEDIR}${PREFIX}/etc/init.d
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/net/zerotier/Makefile
==============================================================================
--- head/net/zerotier/Makefile	Tue Mar 31 16:12:44 2020	(r529985)
+++ head/net/zerotier/Makefile	Tue Mar 31 16:15:16 2020	(r529986)
@@ -34,18 +34,18 @@ LEGAL_TEXT=	No SaaS or Govt usage: https://github.com/
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == "FreeBSD"
-# log output via syslog when daemon(8) supports it
-.if (${OSVERSION} < 1200000 || ${OSVERSION} >= 1200015)
+# log output via syslog
 SUB_LIST+=	ZEROTIER_SYSLOG="-s debug -T zerotier"
-.else
-SUB_LIST+=	ZEROTIER_SYSLOG=""
-.endif
 # after r347241 tun(4) and tap(4) have been merged to tuntap(4)
 .if (${OSVERSION} >= 1300028)
 SUB_LIST+=	ZEROTIER_IF_TAP="if_tuntap"
 .else
 SUB_LIST+=	ZEROTIER_IF_TAP="if_tap"
 .endif
+.else
+# we are not on FreeBSD
+SUB_LIST+=	ZEROTIER_IF_TAP="if_tap" \
+		ZEROTIER_SYSLOG=""
 .endif
 
 do-install:

Modified: head/science/gromacs/Makefile
==============================================================================
--- head/science/gromacs/Makefile	Tue Mar 31 16:12:44 2020	(r529985)
+++ head/science/gromacs/Makefile	Tue Mar 31 16:15:16 2020	(r529986)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gromacs
 DISTVERSION=	2020.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 MASTER_SITES=	ftp://ftp.gromacs.org/pub/gromacs/
 
@@ -18,7 +18,7 @@ BROKEN_i386=	undefined reference to `__atomic_load' an
 BUILD_DEPENDS=	boost-libs>=1.44:devel/boost-libs
 LIB_DEPENDS=	libhwloc.so:devel/hwloc
 
-USES=		cmake fortran gnome perl5 pkgconfig shebangfix xorg # should be compiler:c++14-lang
+USES=		cmake compiler:c++14-lang fortran gnome perl5 pkgconfig shebangfix xorg
 SHEBANG_FILES=	admin/*.sh scripts/*.pl scripts/*.sh src/gromacs/selection/*.sh
 bash_CMD=	${SH}
 USE_GNOME=	libxml2
@@ -80,12 +80,6 @@ OPENMPI_PLIST_SUB=	SUFFIX_MPI="_mpi"
 THREAD_MPI_DESC=	Build a thread-MPI-based multithreaded version of GROMACS
 THREAD_MPI_CMAKE_BOOL=	GMX_THREAD_MPI
 THREAD_MPI_PLIST_SUB=	SUFFIX_MPI=""
-
-# build fails on 12.0 with clang-6, so force a newer compiler
-BUILD_DEPENDS+=	clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
-CPP=		clang-cpp${LLVM_DEFAULT}
-CC=		clang${LLVM_DEFAULT}
-CXX=		clang++${LLVM_DEFAULT}
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "CMakeLists.txt" | ${XARGS} \

Modified: head/sysutils/dwatch-gource/Makefile
==============================================================================
--- head/sysutils/dwatch-gource/Makefile	Tue Mar 31 16:12:44 2020	(r529985)
+++ head/sysutils/dwatch-gource/Makefile	Tue Mar 31 16:15:16 2020	(r529986)
@@ -19,12 +19,6 @@ PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-.if ${OSVERSION} >= 1200000 && ${OSVERSION} < 1200065
-IGNORE=         requires dwatch available in recent FreeBSD 11 or 12
-.endif
-
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/gwatch ${STAGEDIR}${PREFIX}/sbin
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/dwatch

Modified: head/sysutils/dwatch-json/Makefile
==============================================================================
--- head/sysutils/dwatch-json/Makefile	Tue Mar 31 16:12:44 2020	(r529985)
+++ head/sysutils/dwatch-json/Makefile	Tue Mar 31 16:15:16 2020	(r529986)
@@ -20,12 +20,6 @@ PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-.if ${OSVERSION} >= 1200000 && ${OSVERSION} < 1200065
-IGNORE=		requires dwatch available in recent FreeBSD 11 or 12
-.endif
-
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/dwatch
 	${INSTALL_DATA} ${WRKSRC}/json-* ${STAGEDIR}${PREFIX}/libexec/dwatch

Modified: head/sysutils/dwatch-pwsnoop/Makefile
==============================================================================
--- head/sysutils/dwatch-pwsnoop/Makefile	Tue Mar 31 16:12:44 2020	(r529985)
+++ head/sysutils/dwatch-pwsnoop/Makefile	Tue Mar 31 16:15:16 2020	(r529986)
@@ -20,12 +20,6 @@ PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-.if ${OSVERSION} >= 1200000 && ${OSVERSION} < 1200065
-IGNORE=         requires dwatch available in recent FreeBSD 11 or 12
-.endif
-
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/dwatch
 	${INSTALL_DATA} ${WRKSRC}/pwsnoop ${STAGEDIR}${PREFIX}/libexec/dwatch

Modified: head/sysutils/iichid/Makefile
==============================================================================
--- head/sysutils/iichid/Makefile	Tue Mar 31 16:12:44 2020	(r529985)
+++ head/sysutils/iichid/Makefile	Tue Mar 31 16:15:16 2020	(r529986)
@@ -11,6 +11,7 @@ COMMENT=	Generic FreeBSD HID layer for I2C and USB dev
 LICENSE=	BSD2CLAUSE
 #LICENSE_FILE=	Not yet packaged
 
+IGNORE_FreeBSD_11=	Requires FreeBSD 12.1 or later
 ONLY_FOR_ARCHS=		aarch64 amd64 i386
 ONLY_FOR_ARCHS_REASON=	Requires architecture supporting ACPI
 
@@ -30,10 +31,4 @@ PLIST_FILES=	${KMODDIR}/iichid.ko
 post-patch:
 	${REINPLACE_CMD} -e '/usbhid.c/s/^/#/' ${WRKSRC}/Makefile
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 1201000
-IGNORE=	requires FreeBSD versions 12.1+, this system is running ${OSREL}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/www/node/Makefile
==============================================================================
--- head/www/node/Makefile	Tue Mar 31 16:12:44 2020	(r529985)
+++ head/www/node/Makefile	Tue Mar 31 16:15:16 2020	(r529986)
@@ -21,9 +21,6 @@ OPTIONS_DEFINE=		BUNDLED_SSL DOCS NLS DTRACE
 OPTIONS_DEFAULT=	DTRACE
 OPTIONS_DEFAULT_FreeBSD_11=	BUNDLED_SSL
 OPTIONS_DEFAULT+=	${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}}
-# FreeBSD 12.0-RELEASE includes OpenSSL 1.1.1a, but Node.js relies on 1.1.1d
-OPTIONS_DEFAULT_FreeBSD_12_0=	BUNDLED_SSL
-OPTIONS_DEFAULT+=	${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}_${OSREL:E}}
 OPTIONS_SUB=		yes
 
 .if !exists(/usr/sbin/dtrace)

Modified: head/www/node12/Makefile
==============================================================================
--- head/www/node12/Makefile	Tue Mar 31 16:12:44 2020	(r529985)
+++ head/www/node12/Makefile	Tue Mar 31 16:15:16 2020	(r529986)
@@ -22,9 +22,6 @@ OPTIONS_DEFINE=		BUNDLED_SSL DOCS NLS DTRACE
 OPTIONS_DEFAULT=	DTRACE
 OPTIONS_DEFAULT_FreeBSD_11=	BUNDLED_SSL
 OPTIONS_DEFAULT+=	${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}}
-# FreeBSD 12.0-RELEASE includes OpenSSL 1.1.1a, but Node.js relies on 1.1.1d
-OPTIONS_DEFAULT_FreeBSD_12_0=	BUNDLED_SSL
-OPTIONS_DEFAULT+=	${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}_${OSREL:E}}
 OPTIONS_SUB=		yes
 
 .if !exists(/usr/sbin/dtrace)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003311615.02VGFHkW008151>