Skip to content

Commit 620968a

Browse files
rene0rene0
committed
cleanup: drop support for EOL FreeBSD 11.X
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
1 parent b9a93c0 commit 620968a

399 files changed

Lines changed: 171 additions & 3400 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎MOVED‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16498,3 +16498,5 @@ multimedia/sms1xxx-kmod|multimedia/webcamd|2021-09-30|Has expired: Supports DVB
1649816498
sysutils/cfengine311|sysutils/cfengine317|2021-09-30|Has expired: OpenSSL 1.1.X is not supported.
1649916499
sysutils/cfengine-masterfiles311|sysutils/cfengine-masterfiles317|2021-09-30|Has expired: cfengine311 will retire at FreeBSD 11 EOL
1650016500
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)
16501+
graphics/drm-fbsd11.2-kmod||2021-09-30|Removed, only useful on EOL FreeBSD 11.4
16502+
devel/qca-legacy|devel/qca|2021-09-30|Removed, only useful on EOL FreeBSD 11.4

‎Mk/Scripts/rust-compat11-canary.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set -eu
44
set -o pipefail
55

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

‎Mk/Uses/qca.mk‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,7 @@ IGNORE+= USES=qca takes no arguments
1616
_QCA_LIB= libqca-qt5.so
1717

1818
_QCA_DEFAULT_PORT= devel/qca
19-
_QCA_LEGACY_PORT= devel/qca-legacy
20-
21-
. if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 && ${SSL_DEFAULT} == base
22-
_QCA_CHOSEN_PORT= LEGACY
23-
. else
2419
_QCA_CHOSEN_PORT= DEFAULT
25-
. endif
2620

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

‎Mk/bsd.port.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1177,7 +1177,7 @@ OSVERSION!= ${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < ${SRC
11771177
.endif
11781178
_EXPORTED_VARS+= OSVERSION
11791179

1180-
.if (${OPSYS} == FreeBSD && (${OSVERSION} < 1104000 || (${OSVERSION} >= 1200000 && ${OSVERSION} < 1202000))) || \
1180+
.if (${OPSYS} == FreeBSD && ${OSVERSION} < 1202000) || \
11811181
(${OPSYS} == DragonFly && ${DFLYVERSION} < 400400)
11821182
_UNSUPPORTED_SYSTEM_MESSAGE= Ports Collection support for your ${OPSYS} version has ended, and no ports\
11831183
are guaranteed to build on this system. Please upgrade to a supported release.

‎Tools/scripts/tindex‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ ERROR_ADDRESS=root@localhost
2727
# Location of ports tree and source trees
2828
export BASEDIR=/a/tindex
2929
export PORTSDIR=${BASEDIR}/ports
30-
export SRCDIR11=${BASEDIR}/src.11
3130
export SRCDIR12=${BASEDIR}/src.12
3231
export SRCDIR13=${BASEDIR}/src.13
3332
export SRCDIR14=${BASEDIR}/src.14
@@ -114,9 +113,6 @@ export INDEX_JOBS=3
114113
export INDEX_QUIET=1
115114

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

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

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

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

141137
eval _osver=\$OSVERSION${release}

‎archivers/py-zstandard/Makefile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ COMMENT= Zstandard bindings for Python, a full-featured version
99

1010
LICENSE= BSD2CLAUSE
1111

12-
BROKEN_FreeBSD_11_powerpc64= fails to build: cffi.error.CDefError: parse error
1312
BROKEN_FreeBSD_12_powerpc64= fails to build: cffi.error.CDefError: parse error
1413

1514
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.8.0:devel/py-cffi@${PY_FLAVOR}

‎astro/kosmorro/Makefile‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ LICENSE= AGPLv3
1313
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tabulate>0:devel/py-tabulate@${PY_FLAVOR}\
1414
${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR}\
1515
${PYTHON_PKGNAMEPREFIX}termcolor>0:devel/py-termcolor@${PY_FLAVOR}\
16-
${PYTHON_PKGNAMEPREFIX}kosmorrolib>0:astro/py-kosmorrolib@${PY_FLAVOR}
16+
${PYTHON_PKGNAMEPREFIX}kosmorrolib>0:astro/py-kosmorrolib@${PY_FLAVOR} \
17+
ronn:textproc/rubygem-ronn
1718
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tabulate>0:devel/py-tabulate@${PY_FLAVOR}\
1819
${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR}\
1920
${PYTHON_PKGNAMEPREFIX}termcolor>0:devel/py-termcolor@${PY_FLAVOR}\
@@ -32,25 +33,9 @@ PDF_RUN_DEPENDS=pdflatex:print/tex-formats
3233

3334
NO_ARCH= yes
3435

35-
.include <bsd.port.pre.mk>
36-
37-
# ronn is broken on 11.x => do not build manpages
38-
.if ${OSVERSION} < 1200000
39-
PLIST_SUB+= MAN="@comment "
40-
.else
41-
BUILD_DEPENDS+= ronn:textproc/rubygem-ronn
42-
PLIST_SUB+= MAN=""
43-
.endif
44-
4536
pre-configure:
4637
${REINPLACE_CMD} -e 's|python3|${PYTHON_CMD}|' ${WRKSRC}/Makefile
47-
.if ${OSVERSION} < 1200000
48-
${REINPLACE_CMD} -e 's|i18n manpages|manpages|' ${WRKSRC}/Makefile
49-
${REINPLACE_CMD} -e '/manpage\/kosmorro/d' ${WRKSRC}/setup.py
50-
.else
51-
5238
post-build:
5339
(cd ${WRKSRC} && LC_ALL=C.UTF-8 ${MAKE} manpages)
54-
.endif
5540

56-
.include <bsd.port.post.mk>
41+
.include <bsd.port.mk>

‎astro/kosmorro/pkg-plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,5 @@ bin/kosmorro
6868
%%PYTHON_SITELIBDIR%%/_kosmorro/locales/nl/LC_MESSAGES/messages.po
6969
%%PYTHON_SITELIBDIR%%/_kosmorro/locales/ru/LC_MESSAGES/messages.po
7070
%%PYTHON_SITELIBDIR%%/_kosmorro/main.py
71-
%%MAN%%man/man1/kosmorro.1.gz
72-
%%MAN%%man/man7/kosmorro.7.gz
71+
man/man1/kosmorro.1.gz
72+
man/man7/kosmorro.7.gz

‎astro/qmapshack/Makefile‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
1515
DEPRECATED= Uses EOL Python 2.7 via www/qt5-webengine
1616
EXPIRATION_DATE=2021-06-23
1717

18-
BROKEN_FreeBSD_11= Requires OpenSSL 1.1.0+
19-
2018
LIB_DEPENDS= libgdal.so:graphics/gdal \
2119
libproj.so:graphics/proj \
2220
libquazip1-qt5.so:archivers/quazip \

‎audio/csound/Makefile‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -169,12 +169,6 @@ WIIMOTE_DESC= Build the Wiimote opcodes
169169
WIIMOTE_CMAKE_BOOL= BUILD_WIIMOTE_OPCODES
170170
WIIMOTE_BROKEN= Need to port wiiuse: https://github.com/rpavlik/wiiuse
171171

172-
.include <bsd.port.pre.mk>
173-
174-
.if ${ARCH} == "i386"
175-
BROKEN_FreeBSD_11= libcsound64.so.6.0: undefined reference to `__atomic_store_8' / undefined reference to `__atomic_load_8'
176-
.endif
177-
178172
post-patch:
179173
@${REINPLACE_CMD} -e \
180174
's|/usr/include/Python2.7|${PYTHON_INCLUDEDIR}| ; \
@@ -196,4 +190,4 @@ post-install:
196190
post-install-FLTK-on:
197191
@${LN} -sf libCsoundAC.so.6.0 ${STAGEDIR}${PREFIX}/lib/libCsoundAC.so.6
198192

199-
.include <bsd.port.post.mk>
193+
.include <bsd.port.mk>

0 commit comments

Comments
 (0)