Skip to content

Commit

Permalink
cleanup: drop support for EOL FreeBSD 11.X
Browse files Browse the repository at this point in the history
Search criteria used:
- 11.4
- OSREL*
- OSVER*
- *_FreeBSD_11

Input from:
- adridg: devel/qca-legacy
- jbeich: _WITH_DPRINTF, _WITH_GETLINE, GNU bfd workarounds
- sunpoet: security/p5-*OpenSSL*

Reviewed by:	doceng, kde, multimedia, perl, python, ruby, rust
Differential Revision: https://reviews.freebsd.org/D32008
Test Plan: make index
  • Loading branch information
rene0 committed Sep 30, 2021
1 parent b9a93c0 commit 620968a
Show file tree
Hide file tree
Showing 399 changed files with 171 additions and 3,400 deletions.
2 changes: 2 additions & 0 deletions MOVED
Original file line number Diff line number Diff line change
Expand Up @@ -16498,3 +16498,5 @@ multimedia/sms1xxx-kmod|multimedia/webcamd|2021-09-30|Has expired: Supports DVB
sysutils/cfengine311|sysutils/cfengine317|2021-09-30|Has expired: OpenSSL 1.1.X is not supported.
sysutils/cfengine-masterfiles311|sysutils/cfengine-masterfiles317|2021-09-30|Has expired: cfengine311 will retire at FreeBSD 11 EOL
mail/postfix35|mail/postfix|2021-09-30|Has expired: It is only here until FreeBSD 11 is EoL (Postfix >= 3.6 requires OpenSSL >= 1.1.x)
graphics/drm-fbsd11.2-kmod||2021-09-30|Removed, only useful on EOL FreeBSD 11.4
devel/qca-legacy|devel/qca|2021-09-30|Removed, only useful on EOL FreeBSD 11.4
2 changes: 1 addition & 1 deletion Mk/Scripts/rust-compat11-canary.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -eu
set -o pipefail

if [ "${OPSYS}" != FreeBSD ] || [ "${OSVERSION}" -lt 1200000 ]; then
if [ "${OPSYS}" != FreeBSD ] ; then
exit 0
fi

Expand Down
6 changes: 0 additions & 6 deletions Mk/Uses/qca.mk
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,7 @@ IGNORE+= USES=qca takes no arguments
_QCA_LIB= libqca-qt5.so

_QCA_DEFAULT_PORT= devel/qca
_QCA_LEGACY_PORT= devel/qca-legacy

. if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 && ${SSL_DEFAULT} == base
_QCA_CHOSEN_PORT= LEGACY
. else
_QCA_CHOSEN_PORT= DEFAULT
. endif

LIB_DEPENDS+= ${_QCA_LIB}:${_QCA_${_QCA_CHOSEN_PORT}_PORT}

Expand Down
2 changes: 1 addition & 1 deletion Mk/bsd.port.mk
Original file line number Diff line number Diff line change
Expand Up @@ -1177,7 +1177,7 @@ OSVERSION!= ${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < ${SRC
.endif
_EXPORTED_VARS+= OSVERSION

.if (${OPSYS} == FreeBSD && (${OSVERSION} < 1104000 || (${OSVERSION} >= 1200000 && ${OSVERSION} < 1202000))) || \
.if (${OPSYS} == FreeBSD && ${OSVERSION} < 1202000) || \
(${OPSYS} == DragonFly && ${DFLYVERSION} < 400400)
_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.
Expand Down
8 changes: 2 additions & 6 deletions Tools/scripts/tindex
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ ERROR_ADDRESS=root@localhost
# Location of ports tree and source trees
export BASEDIR=/a/tindex
export PORTSDIR=${BASEDIR}/ports
export SRCDIR11=${BASEDIR}/src.11
export SRCDIR12=${BASEDIR}/src.12
export SRCDIR13=${BASEDIR}/src.13
export SRCDIR14=${BASEDIR}/src.14
Expand Down Expand Up @@ -114,9 +113,6 @@ export INDEX_JOBS=3
export INDEX_QUIET=1

# First update the source trees to get current OSVERSION
${SVN} -q up ${SRCDIR11}/sys/sys
OSVERSION11=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR11}/sys/sys/param.h)

${SVN} -q up ${SRCDIR12}/sys/sys
OSVERSION12=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR12}/sys/sys/param.h)

Expand All @@ -127,15 +123,15 @@ ${GIT} -C ${SRCDIR14} pull --rebase -q
OSVERSION14=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR14}/sys/sys/param.h)

cd ${PORTSDIR}
rm -f INDEX-11 INDEX-11.bz2 INDEX-12 INDEX-12.bz2 INDEX-13 INDEX-13.bz2 INDEX-14 INDEX-14.bz2
rm -f INDEX-12 INDEX-12.bz2 INDEX-13 INDEX-13.bz2 INDEX-14 INDEX-14.bz2
OLD_HEAD=$(${GIT} rev-parse HEAD)
if ! ${GIT} pull --ff-only > git.log 2>&1 ; then
(echo "Git update failed with conflicts:";
cat git.log) | mail -s "Ports Git update failed" ${ERROR_ADDRESS}
exit 1
fi

for branch in 11.x 12.x 13.x 14.x; do
for branch in 12.x 13.x 14.x; do
release=$(echo $branch | sed -e 's,.x,,')

eval _osver=\$OSVERSION${release}
Expand Down
1 change: 0 additions & 1 deletion archivers/py-zstandard/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ COMMENT= Zstandard bindings for Python, a full-featured version

LICENSE= BSD2CLAUSE

BROKEN_FreeBSD_11_powerpc64= fails to build: cffi.error.CDefError: parse error
BROKEN_FreeBSD_12_powerpc64= fails to build: cffi.error.CDefError: parse error

BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.8.0:devel/py-cffi@${PY_FLAVOR}
Expand Down
21 changes: 3 additions & 18 deletions astro/kosmorro/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ LICENSE= AGPLv3
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tabulate>0:devel/py-tabulate@${PY_FLAVOR}\
${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR}\
${PYTHON_PKGNAMEPREFIX}termcolor>0:devel/py-termcolor@${PY_FLAVOR}\
${PYTHON_PKGNAMEPREFIX}kosmorrolib>0:astro/py-kosmorrolib@${PY_FLAVOR}
${PYTHON_PKGNAMEPREFIX}kosmorrolib>0:astro/py-kosmorrolib@${PY_FLAVOR} \
ronn:textproc/rubygem-ronn
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tabulate>0:devel/py-tabulate@${PY_FLAVOR}\
${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR}\
${PYTHON_PKGNAMEPREFIX}termcolor>0:devel/py-termcolor@${PY_FLAVOR}\
Expand All @@ -32,25 +33,9 @@ PDF_RUN_DEPENDS=pdflatex:print/tex-formats

NO_ARCH= yes

.include <bsd.port.pre.mk>

# ronn is broken on 11.x => do not build manpages
.if ${OSVERSION} < 1200000
PLIST_SUB+= MAN="@comment "
.else
BUILD_DEPENDS+= ronn:textproc/rubygem-ronn
PLIST_SUB+= MAN=""
.endif

pre-configure:
${REINPLACE_CMD} -e 's|python3|${PYTHON_CMD}|' ${WRKSRC}/Makefile
.if ${OSVERSION} < 1200000
${REINPLACE_CMD} -e 's|i18n manpages|manpages|' ${WRKSRC}/Makefile
${REINPLACE_CMD} -e '/manpage\/kosmorro/d' ${WRKSRC}/setup.py
.else

post-build:
(cd ${WRKSRC} && LC_ALL=C.UTF-8 ${MAKE} manpages)
.endif

.include <bsd.port.post.mk>
.include <bsd.port.mk>
4 changes: 2 additions & 2 deletions astro/kosmorro/pkg-plist
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,5 @@ bin/kosmorro
%%PYTHON_SITELIBDIR%%/_kosmorro/locales/nl/LC_MESSAGES/messages.po
%%PYTHON_SITELIBDIR%%/_kosmorro/locales/ru/LC_MESSAGES/messages.po
%%PYTHON_SITELIBDIR%%/_kosmorro/main.py
%%MAN%%man/man1/kosmorro.1.gz
%%MAN%%man/man7/kosmorro.7.gz
man/man1/kosmorro.1.gz
man/man7/kosmorro.7.gz
2 changes: 0 additions & 2 deletions astro/qmapshack/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
DEPRECATED= Uses EOL Python 2.7 via www/qt5-webengine
EXPIRATION_DATE=2021-06-23

BROKEN_FreeBSD_11= Requires OpenSSL 1.1.0+

LIB_DEPENDS= libgdal.so:graphics/gdal \
libproj.so:graphics/proj \
libquazip1-qt5.so:archivers/quazip \
Expand Down
8 changes: 1 addition & 7 deletions audio/csound/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -169,12 +169,6 @@ WIIMOTE_DESC= Build the Wiimote opcodes
WIIMOTE_CMAKE_BOOL= BUILD_WIIMOTE_OPCODES
WIIMOTE_BROKEN= Need to port wiiuse: https://github.com/rpavlik/wiiuse

.include <bsd.port.pre.mk>

.if ${ARCH} == "i386"
BROKEN_FreeBSD_11= libcsound64.so.6.0: undefined reference to `__atomic_store_8' / undefined reference to `__atomic_load_8'
.endif
post-patch:
@${REINPLACE_CMD} -e \
's|/usr/include/Python2.7|${PYTHON_INCLUDEDIR}| ; \
Expand All @@ -196,4 +190,4 @@ post-install:
post-install-FLTK-on:
@${LN} -sf libCsoundAC.so.6.0 ${STAGEDIR}${PREFIX}/lib/libCsoundAC.so.6

.include <bsd.port.post.mk>
.include <bsd.port.mk>
2 changes: 0 additions & 2 deletions audio/moony-lv2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ PKGNAMESUFFIX= -lv2
MAINTAINER= [email protected]
COMMENT= Realtime Lua as programmable glue in LV2

BROKEN_FreeBSD_11= undefined reference to `clog', see bug#237771
LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/COPYING

Expand Down
17 changes: 1 addition & 16 deletions audio/musicpd/files/patch-meson.build
Original file line number Diff line number Diff line change
@@ -1,21 +1,6 @@
--- meson.build.orig 2021-06-23 18:56:13 UTC
+++ meson.build
@@ -28,6 +28,14 @@ elif compiler.get_id() == 'clang' and compiler.version
warning('Your clang version is too old. You need at least version 7.')
endif

+test_ldflags = [
+]
+
+if compiler.get_id() == 'clang'
+ # This can probably go away after FreeBSD 11 is EOL'd
+ test_ldflags += '-fuse-ld=%%MPD_CLANG_LD%%'
+endif
+
version_conf = configuration_data()
version_conf.set_quoted('PACKAGE', meson.project_name())
version_conf.set_quoted('PACKAGE_NAME', meson.project_name())
@@ -102,7 +110,7 @@ test_cflags = test_common_flags + [
@@ -102,7 +102,7 @@ test_cflags = test_common_flags + [
'-Wwrite-strings',
]

Expand Down
2 changes: 0 additions & 2 deletions audio/surge-synthesizer-lv2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ COMMENT= Surge Synthesizer LV2 and VST plug-in
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE

BROKEN_FreeBSD_11= error: use of undeclared identifier 'getline'; did you mean 'std::getline'?

BUILD_DEPENDS= lv2>0:audio/lv2 \
${LOCALBASE}/include/nanosvg.h:graphics/nanosvg \
${LOCALBASE}/include/simde/simde-common.h:devel/simde \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
--- vstgui.surge/vstgui/lib/platform/linux/x11fileselector.cpp.orig 2020-09-24 01:49:47 UTC
--- vstgui.surge/vstgui/lib/platform/linux/x11fileselector.cpp.orig 2021-04-02 18:04:51 UTC
+++ vstgui.surge/vstgui/lib/platform/linux/x11fileselector.cpp
@@ -3,6 +3,8 @@
@@ -3,6 +3,7 @@
// distribution and at http://github.com/steinbergmedia/vstgui/LICENSE

#include "../../cfileselector.h"
+#define _WITH_GETLINE // for FreeBSD 11
+#include <stdio.h> // https://github.com/surge-synthesizer/vstgui/issues/7
#include <unistd.h>
#include <string>
Expand Down
3 changes: 0 additions & 3 deletions audio/tagutil/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ GH_ACCOUNT= kAworu
CMAKE_ARGS= -DMAN_PATH=${PREFIX}/man
CMAKE_SOURCE_PATH= ${WRKSRC}/src

LDFLAGS_FreeBSD_11= -fuse-ld=lld
LDFLAGS+= ${LDFLAGS_${OPSYS}_${OSREL:R}}

PLIST_FILES= bin/tagutil \
man/man1/tagutil.1.gz

Expand Down
1 change: 0 additions & 1 deletion audio/vst3sdk/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE.txt

BROKEN_i386= fails to build: static_assert failed due to requirement 'alignof(Steinberg::Vst::ProcessContext) == (0 ? 8U : 0 ? 1U : 1 ? 8U : 8U)
BROKEN_FreeBSD_11= x11fileselector.cpp:57:9: error: use of undeclared identifier 'getline'; did you mean 'std::getline'?

BUILD_DEPENDS= bash:shells/bash
LIB_DEPENDS= libexpat.so:textproc/expat2 \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@

--- vstgui4/vstgui/lib/platform/linux/x11fileselector.cpp.orig 2020-08-20 14:14:27 UTC
+++ vstgui4/vstgui/lib/platform/linux/x11fileselector.cpp
@@ -6,6 +6,9 @@
@@ -6,6 +6,8 @@
#include <unistd.h>
#include <string>

+#define _WITH_GETLINE // this is still required on FreeBSD 11
+#include <stdio.h>
+
//------------------------------------------------------------------------
Expand Down
7 changes: 2 additions & 5 deletions base/gcc6/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,14 @@ CONFIGURE_ARGS+= \
--with-gxx-include-dir=/usr/include/c++/v1/ \
--with-sysroot="/" \
--with-build-sysroot=${CROSS_SYSROOT} \
-with-pkgversion="GNU Collection for FreeBSD"
-with-pkgversion="GNU Collection for FreeBSD" \
--enable-initfini-array

ALL_TARGET?= all-gcc
INSTALL_TARGET?= install-gcc

.include <bsd.port.pre.mk>

.if ${OSVERSION} >= 1200000
CONFIGURE_ARGS+= --enable-initfini-array
.endif

.if ${HOSTARCH} == "amd64"
CONFIGURE_TARGET= x86_64-unknown-${OPSYS:tl}${OSREL}
.else
Expand Down
1 change: 0 additions & 1 deletion biology/abyss/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE

BROKEN_i386= result of comparison of constant 18446744073709551615 with expression of type 'size_t', see https://github.com/bcgsc/abyss/issues/310
BROKEN_FreeBSD_11= error: use of undeclared identifier 'getline'; did you mean 'std::getline'?

BUILD_DEPENDS= ${LOCALBASE}/include/boost/version.hpp:devel/boost-libs \
ghc:lang/ghc \
Expand Down
4 changes: 1 addition & 3 deletions biology/ddocent/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ COMMENT= Bash pipeline for RAD sequencing

LICENSE= MIT

# ddocent test data do not unpack with FreeBSD 11.1 /usr/bin/unzip
RUN_DEPENDS= unzip>=0:archivers/unzip \
mawk>=0:lang/mawk \
RUN_DEPENDS= mawk>=0:lang/mawk \
gawk>=0:lang/gawk \
coreutils>=0:sysutils/coreutils \
gnuplot>=0:math/gnuplot \
Expand Down
2 changes: 0 additions & 2 deletions biology/igv/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ COMMENT= Visualization tool for genomic datasets
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/license.txt

BROKEN_FreeBSD_11= FAILURE: Build failed with an exception.

BUILD_DEPENDS= openjfx14>0:java/openjfx14 \
gradle:devel/gradle6
RUN_DEPENDS= openjfx14>0:java/openjfx14
Expand Down
2 changes: 0 additions & 2 deletions biology/jalview/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ COMMENT= Viewer and editor for multiple sequence alignments
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE

BROKEN_FreeBSD_11= gradle daemon systematically fails on 11: The message received from the daemon indicates that the daemon has disappeared.

BUILD_DEPENDS= gradle:devel/gradle6

USE_JAVA= yes
Expand Down
2 changes: 0 additions & 2 deletions biology/ncbi-cxx-toolkit/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ COMMENT= NCBI C++ Toolkit
LICENSE= PD
LICENSE_FILE= ${WRKSRC}/doc/public/LICENSE

BROKEN_FreeBSD_11= libxconnserv.so, not found (try using -rpath or -rpath-link)

LIB_DEPENDS= libcdd.so:math/cddlib \
liblmdb.so:databases/lmdb \
libpcre.so:devel/pcre
Expand Down
45 changes: 0 additions & 45 deletions cad/PrusaSlicer/files/patch-src_libslic3r_Thread.cpp

This file was deleted.

3 changes: 1 addition & 2 deletions cad/astk-serveur/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,7 @@ conf_dir= ${WRKSRC}/etc/astkrc

.include <bsd.port.pre.mk>

.if ${OPSYS} == FreeBSD && ((${OSREL:R} <= 12 && ${OSVERSION} < 1201506) \
|| (${OSREL:R} > 12 && ${OSVERSION} < 1300068))
.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300068
# ASTK is not useful without french/aster
IGNORE= a larger value of ARG_MAX is needed for Code_Aster, please upgrade your system
.endif
Expand Down
1 change: 0 additions & 1 deletion cad/openvsp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

BROKEN_aarch64= fails to compile: invokes x86 asm
BROKEN_FreeBSD_11= undefined reference to __atomic_load

BUILD_DEPENDS= ${LOCALBASE}/lib/libopenNURBS.a:graphics/opennurbs \
${LOCALBASE}/include/glm/glm.hpp:math/glm \
Expand Down
1 change: 0 additions & 1 deletion cad/stepcode/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ COMMENT= Generates C++ and Python from ISO10303 files
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING

BROKEN_FreeBSD_11_powerpc64= fails to configure: Schema scan for 15926-0002-lifecycle_integration.exp exited with error code 1
BROKEN_FreeBSD_12_powerpc64= fails to configure: Schema scan for 15926-0002-lifecycle_integration.exp exited with error code 1

USES= cmake compiler:c++11-lang
Expand Down
10 changes: 0 additions & 10 deletions chinese/fcitx-libpinyin/files/patch-src__CMakeLists.txt

This file was deleted.

Loading

0 comments on commit 620968a

Please sign in to comment.