Skip to content

Commit

Permalink
*/*: Sunset 12.4-RELEASE/12-STABLE from ports tree
Browse files Browse the repository at this point in the history
- Remove all references to defunct ARCH arm
- Remove all references to defunct ARCH sparc64
- Remove x11-drivers/xf86-video-sunffb which requires defunct sparc64
  ARCH
- Remove sysutils/afbinit requires defunct sparc64 ARCH
- Remove all references to bktr driver
- Remove all references to defunct FreeBSD_12
- Remove all references to OSVERSION/OSREL corresponding to 12
- Remove conditionals in Mk/Uses/cabal.mk
- Remove sparc reference from Mk/Uses/qt-dist.mk
- Remove BROKEN_sparc64/NOT_FOR_ARCH=sparc64
- Remove BROKEN_FreeBSD_12* from:
- Remove OpenSSL patches from:
- Remove conditional flags for OSVERSION >= 1300000 to fixed flags.
  Also move conditional flags for non sparc64/arm ARCH to fixed flags.

Reviewed by:	brooks, jbeich, rene, salvadore
Differential Revision: https://reviews.freebsd.org/D42068
  • Loading branch information
5u623l20 committed Dec 31, 2023
1 parent a1bc4fb commit bbab7f5
Show file tree
Hide file tree
Showing 475 changed files with 312 additions and 3,031 deletions.
6 changes: 0 additions & 6 deletions Mk/Uses/cabal.mk
Expand Up @@ -81,12 +81,6 @@ IGNORE= CABAL_PROJECT: invalid value: ${CABAL_PROJECT}
BROKEN= ${USE_CABAL:Mbasement-0.0.1[4-5]} package doesn't compile on i386
. endif

. if ${OSVERSION} < 1302000 && defined(USE_CABAL) && ${USE_CABAL:Mtext-2.*}
# Band-aids for a Clang bug that is shipped with FreeBSD < 13.2
BUILD_DEPENDS+= clang15:devel/llvm15
BUILD_ARGS+= --ghc-options='-pgmc clang++15'
. endif

PKGNAMEPREFIX?= hs-

CABAL_EXECUTABLES?= ${PORTNAME}
Expand Down
3 changes: 1 addition & 2 deletions Mk/Uses/qt-dist.mk
Expand Up @@ -261,7 +261,7 @@ _EXTRA_PATCHES_QT5= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_fe
${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_qt__module.prf \
${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_common_bsd_bsd.conf \
${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_freebsd-clang_qmake.conf
. if ${ARCH:Mmips*} || (${ARCH:Mpowerpc*} && !exists(/usr/bin/clang)) || ${ARCH} == sparc64
. if ${ARCH:Mmips*} || (${ARCH:Mpowerpc*} && !exists(/usr/bin/clang))
_EXTRA_PATCHES_QT5+= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_g++-base.conf \
${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_gcc-base.conf \
${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_freebsd-g++_qmake.conf
Expand Down Expand Up @@ -548,4 +548,3 @@ qt-create-kde-distfile:
${_KDE_${_QT_DIST}_BRANCH}

.endif # defined(_QT_DIST_MK_INCLUDED)

4 changes: 2 additions & 2 deletions Mk/bsd.port.mk
Expand Up @@ -42,7 +42,7 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org
# OSREL - The release version of the operating system as a text
# string (e.g., "12.4").
# OSVERSION - The operating system version as a comparable integer;
# the value of __FreeBSD_version (e.g., 1204000).
# the value of __FreeBSD_version (e.g., 1302000).
#
# This is the beginning of the list of all variables that need to be
# defined in a port, listed in order that they should be included
Expand Down Expand Up @@ -1184,7 +1184,7 @@ OSVERSION!= ${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < ${SRC
. endif
_EXPORTED_VARS+= OSVERSION

. if ${OPSYS} == FreeBSD && (${OSVERSION} < 1204000 || (${OSVERSION} >= 1300000 && ${OSVERSION} < 1302000))
. if ${OPSYS} == FreeBSD && (${OSVERSION} < 1302000 )
_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)
Expand Down
2 changes: 0 additions & 2 deletions archivers/innoextract/Makefile
Expand Up @@ -11,8 +11,6 @@ WWW= https://constexpr.org/innoextract/
LICENSE= ZLIB
LICENSE_FILE= ${WRKSRC}/LICENSE

BROKEN_sparc64= does not build: undefined reference to std::ctype<char>::_M_widen_init()

BUILD_DEPENDS= boost-libs>0:devel/boost-libs

USES= cmake compiler:c++11-lang iconv
Expand Down
8 changes: 0 additions & 8 deletions archivers/libarchive/Makefile
Expand Up @@ -63,12 +63,4 @@ CONFIGURE_ENV+= ac_cv_header_localcharset_h=no \
ac_cv_lib_charset_locale_charset=no
.endif

# Prior to 1301508 we didn't ship openssl.pc which libarchive now expects
# so we need to use the old approach on older versions of FreeBSD
# which is not to define Requires.private in libarchive.pc

.if ${PORT_OPTIONS:MOPENSSL} && ${OPSYS} == FreeBSD && ${OSVERSION} < 1301508
EXTRA_PATCHES= ${PATCHDIR}/extra-patch-pkgconfig-compat
.endif

.include <bsd.port.post.mk>
7 changes: 0 additions & 7 deletions archivers/libarchive/files/extra-patch-pkgconfig-compat

This file was deleted.

2 changes: 0 additions & 2 deletions archivers/py-zstandard/Makefile
Expand Up @@ -10,8 +10,6 @@ WWW= https://github.com/indygreg/python-zstandard

LICENSE= BSD2CLAUSE

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}
#LIB_DEPENDS= libzstd.so:archivers/zstd
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis@${PY_FLAVOR}
Expand Down
2 changes: 0 additions & 2 deletions astro/libgal/Makefile
Expand Up @@ -14,6 +14,4 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX} --sysconfdir=${PREFIX} --enable-shared=yes
USE_LDCONFIG= yes

BROKEN_sparc64= Does not compile on sparc64: gcc coredump

.include <bsd.port.mk>
1 change: 0 additions & 1 deletion astro/oskar/Makefile
Expand Up @@ -12,7 +12,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE

ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 powerpc64le
ONLY_FOR_ARCHS_REASON= gccfeatures.h:54:4: This code has only been tested on x86 and powerpc platforms
BROKEN_FreeBSD_12_powerpc64= fails to compile: oskar_convert_cirs_relative_directions_to_enu_directions.c:67:29: 'csinl' undeclared (first use in this function)

LIB_DEPENDS= libcfitsio.so:astro/cfitsio \
libhdf5.so:science/hdf5 \
Expand Down
9 changes: 2 additions & 7 deletions audio/cheesecutter/Makefile
Expand Up @@ -22,6 +22,7 @@ GH_ACCOUNT= ehaupt
GH_PROJECT= CheeseCutter

MAKEFILE= Makefile.ldc
MAKE_ARGS= DLDFLAGS=-L=-Wl,-z,nostart-stop-gc
MAKE_ENV+= EXAMPLESDIR=${EXAMPLESDIR}

OPTIONS_DEFINE= EXAMPLES
Expand All @@ -35,10 +36,4 @@ post-install:
${INSTALL_MAN} ${WRKSRC}/doc/${f}.fr.1 ${STAGEDIR}${MANPREFIX}/share/man/fr/man1
.endfor

.include <bsd.port.pre.mk>

.if (${OSVERSION} >= 1301000)
MAKE_ARGS= DLDFLAGS=-L=-Wl,-z,nostart-stop-gc
.endif

.include <bsd.port.post.mk>
.include <bsd.port.mk>
3 changes: 0 additions & 3 deletions audio/fdk-aac/Makefile
Expand Up @@ -12,9 +12,6 @@ LICENSE_NAME= Software License for The Fraunhofer FDK AAC Codec Library for Andr
LICENSE_FILE= ${WRKSRC}/NOTICE
LICENSE_PERMS= dist-mirror pkg-mirror auto-accept

NOT_FOR_ARCHS= sparc64
NOT_FOR_ARCHS_REASON= not yet ported to this architecture

USES= cmake
USE_LDCONFIG= yes

Expand Down
1 change: 0 additions & 1 deletion audio/mhwaveedit/Makefile
Expand Up @@ -24,7 +24,6 @@ CONFIGURE_ARGS= --without-alsalib \
--with-build-time="-"

BROKEN_powerpc64= fails to compile on powerpc64: convert_inc.c: conflicting types for 'C_FLOAT_PCM32SBEPM'
BROKEN_sparc64= fails to compile on sparc64

OPTIONS_DEFINE= DOUBLE_SAMPLES JACK LADSPA OSS PORTAUDIO \
PULSEAUDIO SAMPLERATE SDL SNDFILE NLS
Expand Down
9 changes: 1 addition & 8 deletions audio/mixertui/Makefile
Expand Up @@ -12,6 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE

LIB_DEPENDS= libsysctlmibinfo2.so:devel/libsysctlmibinfo2

USES= ncurses
USE_GITLAB= yes

GL_ACCOUNT= alfix
Expand All @@ -24,12 +25,4 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin
${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${STAGEDIR}${MAN8PREFIX}/share/man/man8

.include <bsd.port.options.mk>

.if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1300079
USES+= ncurses
.else
USES+= ncurses:port
.endif

.include <bsd.port.mk>
10 changes: 2 additions & 8 deletions audio/nas/Makefile
Expand Up @@ -18,7 +18,7 @@ USE_LDCONFIG= yes
MAKE_ENV+= COMPRESS_CMD="${COMPRESS_CMD:S/c//}"
MAKE_JOBS_UNSAFE= yes

.include <bsd.port.pre.mk>
FPIC= -fpic

post-configure:
# Work around shortcomings of the Imake.rules et. al:
Expand All @@ -27,13 +27,7 @@ post-configure:
-e 's,\(\$$(AR) \$$@ \$$\)(OBJS),\1(OBJS:S|^|unshared/|),' \
${WRKSRC}/lib/audio/Makefile

.if ${ARCH} == "sparc64"
FPIC= -fPIC
.else
FPIC= -fpic
.endif

post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaudio.so.2

.include <bsd.port.post.mk>
.include <bsd.port.mk>
11 changes: 1 addition & 10 deletions audio/ncpamixer/Makefile
Expand Up @@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/../LICENSE

LIB_DEPENDS= libpulse.so:audio/pulseaudio

USES= cmake compiler:c++17-lang
USES= cmake compiler:c++17-lang ncurses

USE_GITHUB= yes
GH_ACCOUNT= fulhax
Expand All @@ -21,13 +21,4 @@ WRKSRC_SUBDIR= src

PLIST_FILES= bin/${PORTNAME}

.include <bsd.port.options.mk>

.if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1300079
USES+= ncurses
.else
USES+= ncurses:port
CFLAGS+= -I${LOCALBASE}/include/ncurses
.endif

.include <bsd.port.mk>
7 changes: 0 additions & 7 deletions audio/opus/Makefile
Expand Up @@ -21,11 +21,4 @@ CONFIGURE_ARGS= --enable-custom-modes \
INSTALL_TARGET= install-strip
TEST_TARGET= check

.include <bsd.port.options.mk>

# drop after FreeBSD 12 EOL
.if ${ARCH} == "arm"
CONFIGURE_ARGS+=--enable-fixed-point
.endif

.include <bsd.port.mk>
2 changes: 0 additions & 2 deletions audio/rhvoice/Makefile
Expand Up @@ -12,8 +12,6 @@ LICENSE_COMB= multi
LICENSE_FILE_LGPL21+ = ${WRKSRC}/licenses/lgpl-2.1.txt
LICENSE_FILE_GPLv3+ = ${WRKSRC}/licenses/gpl-3.0.txt

BROKEN_FreeBSD_12_powerpc64= fails to configure: The C++ compiler is not working

USES= compiler:c++0x pkgconfig scons
USE_LDCONFIG= yes

Expand Down
4 changes: 0 additions & 4 deletions audio/sfizz/Makefile
Expand Up @@ -69,10 +69,6 @@ VST_CMAKE_BOOL= SFIZZ_VST

.include <bsd.port.pre.mk>

.if (${OSVERSION} < 1301505) # 20d21e43514502c0a346f3c2cdb1d8cd8c7cc6b0 commit in 13 fixed booleans in stdatomic.h that were causing breakage
BROKEN= fails to compile: unknown type name '_Bool'
.endif

post-install-LV2-on:
@${STRIP_CMD} \
${STAGEDIR}${PREFIX}/lib/lv2/sfizz.lv2/Contents/Binary/sfizz.so \
Expand Down
2 changes: 0 additions & 2 deletions benchmarks/sipp/Makefile
Expand Up @@ -10,8 +10,6 @@ WWW= https://sipp.sourceforge.net/

LICENSE= GPLv2

BROKEN_FreeBSD_12_powerpc64= fails to compile: /usr/local/lib/gcc9/include/c++/cstddef:52:8: expected unqualified-id before string constant

BUILD_DEPENDS= help2man:misc/help2man

USES= autoreconf compiler:c++11-lang gmake ncurses pkgconfig
Expand Down
1 change: 0 additions & 1 deletion biology/avida/Makefile
Expand Up @@ -16,7 +16,6 @@ BROKEN_armv7= invokes x86 assembler
BROKEN_mips= invokes x86 assembler
BROKEN_mips64= invokes x86 assembler
BROKEN_riscv64= invokes x86 assembler
BROKEN_sparc64= missing atomics implementation

USES= compiler:c11 cmake ncurses
USE_CXXSTD= gnu++98
Expand Down
2 changes: 0 additions & 2 deletions biology/gatk/Makefile
Expand Up @@ -10,8 +10,6 @@ WWW= https://gatk.broadinstitute.org/hc/en-us
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.TXT

BROKEN_FreeBSD_12_powerpc64= fails to build: String index out of range: -1

BUILD_DEPENDS= gradle:devel/gradle

USES= gettext-runtime
Expand Down
8 changes: 0 additions & 8 deletions biology/mafft/Makefile
Expand Up @@ -28,14 +28,6 @@ MAKE_ENV= INSTALL_LIB="${INSTALL_LIB}" \
MKDIR="${MKDIR}" \
LN="${LN}"

.include <bsd.port.options.mk>

post-patch:
.if ${ARCH} == sparc64
@${REINPLACE_CMD} -e 's|ENABLE_MULTITHREAD = -Denablemultithread||' \
${BUILD_WRKSRC}/Makefile
.endif

post-install:
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
@${MKDIR} ${STAGEDIR}${DOCSDIR}
Expand Down
2 changes: 1 addition & 1 deletion biology/plink/Makefile
Expand Up @@ -11,7 +11,7 @@ WWW= https://www.cog-genomics.org/plink/
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE

NOT_FOR_ARCHS= aarch64 mips64 powerpc64 powerpc64le sparc64
NOT_FOR_ARCHS= aarch64 mips64 powerpc64 powerpc64le
NOT_FOR_ARCHS_REASON= 64bit code requires SSE2 instructions

USES= gmake fortran
Expand Down
5 changes: 0 additions & 5 deletions cad/astk-serveur/Makefile
Expand Up @@ -60,11 +60,6 @@ conf_dir= ${WRKSRC}/etc/astkrc

.include <bsd.port.pre.mk>

.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

WRKCONF= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}/configuration
.if !defined(CLIENT_SEUL)
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}/ASTK_SERV
Expand Down
2 changes: 0 additions & 2 deletions cad/brlcad/Makefile
Expand Up @@ -10,8 +10,6 @@ WWW= https://brlcad.org/
LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING

BROKEN_sparc64= does not compile: invokes i386 assembler

BUILD_DEPENDS= xsltproc:textproc/libxslt
LIB_DEPENDS= liblz4.so:archivers/liblz4 \
libdrm.so:graphics/libdrm \
Expand Down
11 changes: 3 additions & 8 deletions cad/calculix-ccx/Makefile
Expand Up @@ -32,6 +32,9 @@ WRKSRC= ${WRKDIR}/CalculiX/${CCX_VER}/src

OPTIONS_DEFINE= DOCS EXAMPLES

CFLAGS+= -fpic
FFLAGS+= -fpic

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MDOCS}
Expand All @@ -44,14 +47,6 @@ DISTFILES+= ${DIST_EXAMPLES}
EXTRACT_ONLY+= ${DIST_EXAMPLES}
.endif

.if ${ARCH} == "sparc64"
CFLAGS+= -fPIC
FFLAGS+= -fPIC
.else
CFLAGS+= -fpic
FFLAGS+= -fpic
.endif

.if ${GCC_DEFAULT} >= 10
# workaround for Missing actual argument for argument '_formal_15' at (1)
FFLAGS+= -fallow-argument-mismatch
Expand Down
11 changes: 3 additions & 8 deletions cad/calculix/Makefile
Expand Up @@ -45,20 +45,15 @@ PSVIEWER?= gv
USES+= llvm:max=15
.endif

CFLAGS+= -fpic
FFLAGS+= -fpic

.include <bsd.port.pre.mk>

.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
CPPFLAGS+= -Wno-error=int-conversion
.endif

.if ${ARCH} == "sparc64"
CFLAGS+= -fPIC
FFLAGS+= -fPIC
.else
CFLAGS+= -fpic
FFLAGS+= -fpic
.endif

pre-build:
@${REINPLACE_CMD} -e 's!c++!${CXX}!g;' \
${WRKSRC}/libSNL/src/makefile
Expand Down
1 change: 0 additions & 1 deletion cad/klayout/Makefile
Expand Up @@ -11,7 +11,6 @@ LICENSE= GPLv2

BROKEN_i386= type 'hash<long long>' does not provide a call operator
BROKEN_powerpc= type 'hash<long long>' does not provide a call operator
BROKEN_sparc64= does not compile on sparc64: gcc bug

USES= compiler:c++0x gmake gl python ruby qt:5
USE_GITHUB= yes
Expand Down
2 changes: 1 addition & 1 deletion cad/libredwg/Makefile
Expand Up @@ -42,7 +42,7 @@ PYTHON_PORTEXAMPLES= load_dwg.py
PYTHON_VARS= SHEBANG_FILES+=examples/load_dwg.py

post-patch:
# XXX: switch the order of #include's to unbreak on powerpc/sparc64
# XXX: switch the order of #include's to unbreak on powerpc
# which are still based on gcc-4.2.1 (should be no-op elsewhere)
@${REINPLACE_CMD} -e '/#include "com/ { x; s/^/#include <stdlib.h>/; \
G; }; 24d' ${WRKSRC}/src/common.c
Expand Down
3 changes: 0 additions & 3 deletions cad/nvc/Makefile
Expand Up @@ -21,9 +21,6 @@ LIB_DEPENDS= libelf.so:devel/elfutils \
RUN_DEPENDS= llvm${LLVM_VERSION}>0:devel/llvm${LLVM_VERSION} \
bash:shells/bash
TEST_DEPENDS= check>0:devel/check
.if !exists(/usr/include/unwind.h)
LIB_DEPENDS+= libunwind.so:devel/libunwind
.endif

USES= autoreconf compiler:c++14-lang localbase pkgconfig shebangfix

Expand Down
2 changes: 0 additions & 2 deletions cad/stepcode/Makefile
Expand Up @@ -10,8 +10,6 @@ WWW= https://github.com/stepcode/stepcode/wiki
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING

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
USE_GITHUB= yes
USE_LDCONFIG= yes
Expand Down

0 comments on commit bbab7f5

Please sign in to comment.