Remove compatibility code for FreeBSD < 11.2 from all ports.

Simplify some ports where DragonFlyBSD no longer needs to be special-cased. Submitted by: rene Reviewed by: bapt, jbeich Differential Revision: https://reviews.freebsd.org/D17724
trueos · Nov 2, 2018 · abe8559 · abe8559
1 parent a6ebb88
commit abe8559
Show file tree

Hide file tree

Showing 241 changed files with 117 additions and 1,518 deletions.
diff --git a/Mk/Uses/gssapi.mk b/Mk/Uses/gssapi.mk
@@ -79,7 +79,6 @@ _HEIMDAL_DEPENDS=${GSSAPILIBDIR}/libgssapi.so:security/heimdal
 _MITKRB5_DEPENDS=${GSSAPILIBDIR}/libkrb5support.so:security/krb5
 _HEADERS=	sys/types.h sys/stat.h stdint.h
 
-.undef _FIXUP_KRB5CONFIG
 .if empty(gssapi_ARGS)
 gssapi_ARGS=	base
 .endif
@@ -97,9 +96,6 @@ _HEADERS+=	gssapi/gssapi.h gssapi/gssapi_krb5.h krb5.h
 GSSAPICPPFLAGS=	-I"${GSSAPIINCDIR}"
 GSSAPILIBS=	-lkrb5 -lgssapi -lgssapi_krb5
 GSSAPILDFLAGS=	-L"${GSSAPILIBDIR}"
-.if empty(OSREL:N9.3)
-_FIXUP_KRB5CONFIG=	yes
-.endif
 .elif ${_local} == "heimdal"
 HEIMDAL_HOME?=	${LOCALBASE}
 GSSAPIBASEDIR=	${HEIMDAL_HOME}
@@ -141,18 +137,7 @@ IGNORE=	USES=gssapi - invalid args: [${_local}] specified
 .endif
 .endfor
 
-# Fix up krb5-config if broken.  This script included in 9.X prior to
-# r271474 and in 10.X prior to r271473 are broken because
-# libgssapi_krb5 for some interfaces of GSS-API is missing.
-.if defined(_FIXUP_KRB5CONFIG)
-KRB5CONFIG=${WRKDIR}/krb5-config
-_USES_configure+=	290:krb5config-fix
-krb5config-fix:
-	${SED} -e 's,\$$lib_flags -lgssapi -lheimntlm,\$$lib_flags -lgssapi -lgssapi_krb5 -lheimntlm,' < ${GSSAPIBASEDIR}/bin/krb5-config > ${KRB5CONFIG}
-	${CHMOD} a+rx ${KRB5CONFIG}
-.else
 KRB5CONFIG=${GSSAPIBASEDIR}/bin/krb5-config
-.endif
 
 # Fix up -Wl,-rpath in LDFLAGS
 .if defined(_RPATH) && !empty(_RPATH)

diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
@@ -163,8 +163,6 @@ RUSTFLAGS+=	${CFLAGS:M-mcpu=*:S/-mcpu=/-C target-cpu=/}
 MOZ_EXPORT+=	MOZ_JEMALLOC4=1
 .if ${MOZILLA_VER:R:R} >= 48
 MOZ_OPTIONS+=	--enable-jemalloc=4
-.elif ${OSVERSION} < 1100079
-MOZ_OPTIONS+=	--enable-jemalloc
 .endif # Mozilla >= 48
 .endif # Mozilla < 55
 
@@ -414,9 +412,6 @@ MOZ_OPTIONS+=	--enable-rust-simd
 .if ${PORT_OPTIONS:MDTRACE}
 MOZ_OPTIONS+=	--enable-dtrace \
 		--disable-gold
-. if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100061
-LIBS+=			-lelf
-. endif
 STRIP=
 .else
 MOZ_OPTIONS+=	--disable-dtrace

diff --git a/audio/kwave/Makefile b/audio/kwave/Makefile
@@ -36,14 +36,4 @@ PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.pre.mk>
-
-.  if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100000 && ${OSVERSION} < 1101505
-BUILD_DEPENDS+=		llvm50>=0:devel/llvm50
-# Build is broken on 11.x as clang is not new enough.
-# Workaround by manually setting CC to clang50.
-CC=		${LOCALBASE}/bin/clang50
-CXX=		${LOCALBASE}/bin/clang++50
-.  endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/logitechmediaserver/Makefile b/audio/logitechmediaserver/Makefile
@@ -13,7 +13,6 @@ LICENSE_FILE=	${WRKSRC}/License.txt
 LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell
 
 ONLY_FOR_ARCHS=	amd64 i386
-BROKEN_FreeBSD_10_i386= libmediascan does not compile
 
 BUILD_DEPENDS=	nasm:devel/nasm \
 		bash:shells/bash \

diff --git a/audio/supercollider/Makefile b/audio/supercollider/Makefile
@@ -40,8 +40,6 @@ DESKTOP_ENTRIES="SuperCollider IDE" "" "${LOCALBASE}/share/pixmaps/sc_ide.svg" \
 
 OPTIONS_DEFINE=		HELP SUPERNOVA
 OPTIONS_DEFAULT=	HELP SUPERNOVA
-# SUPERNOVA option BROKEN_FreeBSD_10: No viable conversion from 'boost::lockfree::detail::tagged_ptr<nova::freelist::freelist_node>'
-OPTIONS_EXCLUDE_FreeBSD_10=	SUPERNOVA
 OPTIONS_SUB=	yes
 
 HELP_DESC=	Install on-line help text

diff --git a/audio/teamspeak3-server/Makefile b/audio/teamspeak3-server/Makefile
@@ -56,11 +56,7 @@ MYSQL_VARS_OFF=	SUB_LIST+=MYSQL=
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100000 && ${OSVERSION} < 1100507
-SUB_LIST+=	CD="cd \$$db_dir"
-.else
 SUB_LIST+=	CD=
-.endif
 
 .if ${ARCH} == "i386"
 TEAMSPEAK_ARCH=	x86

diff --git a/audio/wavpack/Makefile b/audio/wavpack/Makefile
@@ -28,13 +28,4 @@ OPTIONS_DEFAULT_armv7=	ASM
 ASM_CONFIGURE_OFF=	--disable-asm
 ASM_DESC=	Optimized assembler routines (requires MMX on x86)
 
-.include <bsd.port.options.mk>
-
-# ASM needs clang 3.8+
-# depend on llvm60 since it's more likely to be installed already than 3.8
-.if ${OSVERSION} < 1100101 && ${PORT_OPTIONS:MASM}
-BUILD_DEPENDS+=	clang60:devel/llvm60
-CC=		clang60
-.endif
-
 .include <bsd.port.mk>
diff --git a/audio/zynaddsubfx/Makefile b/audio/zynaddsubfx/Makefile
@@ -81,16 +81,8 @@ PORTEXAMPLES=	*
 CMAKE_ARGS+=	-DZYN_DATADIR:STRING=${DATADIR}
 CMAKE_ARGS+=	-DZYN_EXAMPLESDIR:STRING=${EXAMPLESDIR}
 
-.include <bsd.port.options.mk>
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000
-# Build fix for ZynAddSubFx
-BUILD_DEPENDS+=	clang60:devel/llvm60
-CC=		clang60
-CXX=		clang++60
-.endif
-
 .if ${ARCH} == "i386" || ${ARCH} == "amd64"
 CFLAGS+=	-DASM_F2I_YES
 .endif

diff --git a/base/binutils/Makefile b/base/binutils/Makefile
@@ -41,12 +41,8 @@ BUREMOVE=	addr2line \
 
 .include "${MASTERDIR}/Makefile"
 
-.if ${OSVERSION} >= 1100100
 PLIST_SUB+=	OBJCOPY="@comment "
 BUREMOVE+=	objcopy
-.else
-PLIST_SUB+=	OBJCOPY=""
-.endif
 
 .if ${ARCH} == "amd64" || ${ARCH} == "i386"
 PLIST_SUB+=	I386=""

diff --git a/cad/calculix/Makefile b/cad/calculix/Makefile
@@ -16,7 +16,6 @@ COMMENT=	Three-Dimensional Structural Finite Element Program
 LICENSE=	GPLv2
 
 BROKEN=		checksum and size mismatch
-BROKEN_FreeBSD_10=	Does not build with clang on FreeBSD 10, causes segfaults when built with gcc
 BROKEN_aarch64=		fails to link: shapeFunctions.c:(function attach_new): relocation R_AARCH64_CALL26 out of range
 
 RUN_DEPENDS=	ccx:cad/calculix-ccx

diff --git a/cad/linuxcnc-devel/Makefile b/cad/linuxcnc-devel/Makefile
@@ -12,8 +12,6 @@ COMMENT=	Open Source CNC machine controller
 
 LICENSE=	GPLv2
 
-BROKEN_FreeBSD_10=	use of undeclared identifier '__builtin_ia32_rdtsc'
-
 LIB_DEPENDS=	libBLT25.so:x11-toolkits/blt \
 		${PY_BOOST} \
 		libfontconfig.so:x11-fonts/fontconfig \

diff --git a/cad/openscad/Makefile b/cad/openscad/Makefile
@@ -43,7 +43,7 @@ post-patch:
 
 #.include <bsd.port.options.mk>
 #
-#.if ${ARCH} == i386 && ${OSVERSION} >= 1100000
+#.if ${ARCH} == i386
 #USE_GCC=        yes
 #.endif
 

diff --git a/cad/sumo/Makefile b/cad/sumo/Makefile
@@ -44,12 +44,4 @@ do-install-DOCS-on:
 	@cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 	@${FIND} ${STAGEDIR}${DOCSDIR} -d -empty -delete
 
-.include <bsd.port.pre.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000
-BUILD_DEPENDS+=	clang60:devel/llvm60
-CC=		clang60
-CXX=		clang++60 # fails to build with the default compiler on 10
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/chinese/opendesktop-fonts/Makefile b/chinese/opendesktop-fonts/Makefile
@@ -20,12 +20,6 @@ PLIST_FILES=	${FONTSDIR_REL}/local.conf-odo
 
 .include "${.CURDIR}/../ttfm/Makefile.ttf"
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100077
-# chmod -R bug
-post-extract:
-	@${CHMOD} 0755 ${WRKSRC}/license
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's,/usr,${LOCALBASE},; s,opendesktop,,g' \
 		${WRKSRC}/FAPIcidfmap.zh_CN ${WRKSRC}/FAPIcidfmap.zh_TW \

diff --git a/comms/airspy/Makefile b/comms/airspy/Makefile
@@ -13,7 +13,6 @@ COMMENT=	AirSpy's usemode driver and associated tools
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/airspy-tools/LICENSE.md
 
-BROKEN_FreeBSD_10=	error: use of undeclared identifier '__m128'
 BROKEN_aarch64=		fails to compile: invalid conversion between vector type '__m64' and integer type 'int'
 BROKEN_powerpc64=	fails to build: iqconverter_float.c:45:23: error: immintrin.h: No such file or directory
 

diff --git a/converters/p5-Unicode-IMAPUtf7/Makefile b/converters/p5-Unicode-IMAPUtf7/Makefile
@@ -22,14 +22,4 @@ USES=		perl5
 USE_PERL5=	configure
 NO_ARCH=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100077
-# chmod -R bug
-post-extract:
-.for d in / /lib /lib/Unicode /t
-	@${CHMOD} 755 ${WRKSRC}${d}
-.endfor
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/arangodb32/Makefile b/databases/arangodb32/Makefile
@@ -16,7 +16,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	"Only builds on amd64"
-BROKEN_FreeBSD_10=	libc++ is too old
 USES=		gmake ssl cmake:outsource,noninja python:2.7 compiler
 USE_GITHUB=	yes
 

diff --git a/databases/arangodb33/Makefile b/databases/arangodb33/Makefile
@@ -15,7 +15,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	"Only builds on amd64: https://github.com/arangodb/arangodb/issues/2334"
-BROKEN_FreeBSD_10=	libc++ is too old
 
 CONFLICTS_INSTALL=	arangodb32
 CONFLICTS_BUILD=	v8

diff --git a/databases/clickhouse/Makefile b/databases/clickhouse/Makefile
@@ -13,7 +13,6 @@ COMMENT=	ClickHouse is a column-oriented database management system
 
 LICENSE=	APACHE20
 
-BROKEN_FreeBSD_10=	Builds but does not work
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	"Only supported on amd64"
 
@@ -81,12 +80,6 @@ SUB_LIST+=	LEGACY_LIMITS="" MODERN_LIMITS="@comment "
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1101513
-BUILD_DEPENDS+=	clang50:devel/llvm50
-CC=		clang50
-CXX=		clang++50
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|/var/lib/clickhouse|/var/db/clickhouse|;s|/var/log/clickhouse-server|/var/log/clickhouse|;s|/etc/clickhouse-server|${PREFIX}/etc/clickhouse-server|' ${WRKSRC}/dbms/programs/server/config.xml
 

diff --git a/databases/db5/Makefile b/databases/db5/Makefile
@@ -74,11 +74,8 @@ DOCS_INSTALL_TARGET=	install_docs
 # db5 uses a deprecated instruction for mutexes on ARM, fbsd bug#197227
 # and also bug#205001
 CONFIGURE_ARGS+=	--enable-posixmutexes
-. if ${OSVERSION} > 1100100
-#                 ^ leave that as ">" it really is greater than but NOT equal
 # force POSIX mutexes - the OS supports PTHREAD_PROCESS_SHARED
 CONFIGURE_ARGS+=	--with-mutex=POSIX/pthreads
-. endif
 .endif
 
 post-patch:

diff --git a/databases/db6/Makefile b/databases/db6/Makefile
@@ -67,11 +67,7 @@ DOCS_INSTALL_TARGET=	install_docs
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == aarch64
-. if ${OSVERSION} > 1100100
 CONFIGURE_ARGS+=	--with-mutex=POSIX/pthreads
-. else
-CONFIGURE_ARGS+=	--enable-posixmutexes
-. endif
 .endif
 
 post-patch:

diff --git a/databases/memcached/Makefile b/databases/memcached/Makefile
@@ -40,7 +40,6 @@ OPTIONS_DEFAULT=	SASL DTRACE
 OPTIONS_EXCLUDE+=	DTRACE
 .endif
 
-OPTIONS_EXCLUDE_FreeBSD_10+=	DTRACE
 OPTIONS_EXCLUDE_i386=		DTRACE
 # ld(1) fails to link probes: Relocations in generic ELF (EM: 0)
 OPTIONS_EXCLUDE_aarch64=	DTRACE

diff --git a/databases/mongodb36/Makefile b/databases/mongodb36/Makefile
@@ -20,7 +20,6 @@ LICENSE_COMB=	multi
 
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	"Only supported on amd64 (i386 deprecated in v3)"
-BROKEN_FreeBSD_10=	libc++ is too old
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheetah>=2.4.4:devel/py-cheetah@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing>=3.6.2:devel/py-typing@${PY_FLAVOR} \

diff --git a/databases/mysql-connector-c++/Makefile b/databases/mysql-connector-c++/Makefile
@@ -17,19 +17,13 @@ LIB_DEPENDS=	libboost_regex.so:devel/boost-libs
 
 USES=		cmake:outsource compiler:c++11-lang mysql ssl
 USE_LDCONFIG=	yes
-CMAKE_ARGS=	-DDOC_DESTINATION="${DOCSDIR}"
+CMAKE_ARGS=	-DDOC_DESTINATION="${DOCSDIR}" -DCMAKE_ENABLE_C++11=ON 
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 PORTDOCS=	*
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.pre.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1100000
-CMAKE_ARGS+=-DCMAKE_ENABLE_C++11=ON
-.endif
-
 post-install:
 	@${RM} ${STAGEDIR}${DOCSDIR}/INSTALL \
 		${STAGEDIR}${DOCSDIR}/COPYING
@@ -67,4 +61,4 @@ do-test:
 	test/unit/classes/statement )
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/deskutils/nextcloudclient/Makefile b/deskutils/nextcloudclient/Makefile
@@ -42,17 +42,11 @@ DEBUG_CMAKE_ON=		-DCMAKE_BUILD_TYPE:STRING=Debug
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
-.include <bsd.port.pre.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|.lst |.lst.sample |' ${WRKSRC}/CMakeLists.txt
-.if ${OSVERSION} < 1100101
-	@${REINPLACE_CMD} -e 's/ -fstack-protector-strong//' \
-		${WRKSRC}/src/CMakeLists.txt
-.endif
 
 pre-configure:
 	@(cd ${WRKSRC} && ${CP} -f sync-exclude.lst sync-exclude.lst.sample)
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/deskutils/owncloudclient/Makefile b/deskutils/owncloudclient/Makefile
@@ -39,17 +39,11 @@ DEBUG_CMAKE_ON=		-DCMAKE_BUILD_TYPE:STRING=Debug
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
-.include <bsd.port.pre.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|.lst |.lst.sample |' ${WRKSRC}/CMakeLists.txt
-.if ${OSVERSION} < 1100101
-	@${REINPLACE_CMD} -e 's/ -fstack-protector-strong//' \
-		${WRKSRC}/src/CMakeLists.txt
-.endif
 
 pre-configure:
 	@cd ${WRKSRC} && ${CP} -f sync-exclude.lst sync-exclude.lst.sample
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/deskutils/simplegroupware/Makefile b/deskutils/simplegroupware/Makefile
@@ -26,13 +26,4 @@ do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
 
-.include <bsd.port.pre.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100077
-# chmod -R bug.
-# Do not use "-exec ... +", because of the same bug, it will not work.
-post-extract:
-	@${FIND} ${WRKSRC} -type d -exec ${CHMOD} 755 {} \;
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/deskutils/treesheets/Makefile b/deskutils/treesheets/Makefile
@@ -35,14 +35,6 @@ PLIST_FILES=	bin/${PORTNAME} \
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-.include <bsd.port.pre.mk>
-
-.if (${OPSYS} == FreeBSD && ${OSVERSION} < 1100000) || make(makesum)
-MASTER_SITES+=	http://releases.llvm.org/6.0.1/:llvm
-DISTFILES+=	libcxx-6.0.1.src.tar.xz:llvm
-CXXFLAGS+=	-isystem ${WRKDIR}/libcxx-6.0.1.src/include
-.endif
-
 post-patch: .SILENT
 	${REINPLACE_CMD} -e 's|sys->frame->GetPath(L"|(L"${DOCSDIR}/|' \
 		${BUILD_WRKSRC}/document.h
@@ -71,4 +63,4 @@ do-install-EXAMPLES-on:
 	(cd ${WRKSRC}/TS/examples && ${COPYTREE_SHARE} "${PORTEXAMPLES}" \
 		${STAGEDIR}${EXAMPLESDIR})
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>