diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2018-11-02 13:32:34 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2018-11-02 13:32:34 +0000 |
| commit | 8a502cb2d43b4059a5678ee4539ca03603104107 (patch) | |
| tree | 2c2c3d0def8d9d1ad349013f7b532f0065f57789 | |
| parent | f60d4bacdc58ec061406d72cace1ac1266952e39 (diff) | |
| download | ports-8a502cb2d43b4059a5678ee4539ca03603104107.tar.gz ports-8a502cb2d43b4059a5678ee4539ca03603104107.zip | |
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
Notes
Notes:
svn path=/head/; revision=483807
241 files changed, 117 insertions, 1518 deletions
diff --git a/Mk/Uses/gssapi.mk b/Mk/Uses/gssapi.mk index f1e76ffc40b3..c09051ef2554 100644 --- 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 index c8d630316112..f8d2400ce36b 100644 --- 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 index 2e94737f199d..0fbc47490ec4 100644 --- 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 index e22462e3319c..f28a426ce72f 100644 --- 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 index d491a763454f..e0426bcf76fa 100644 --- 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 index 812cf4144839..14a4b8ade37f 100644 --- 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 index e8196d7b3b45..5057e31d3da0 100644 --- 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 index 626aaace82df..c5b741943d60 100644 --- 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 index 8e1b175504c9..128485f467c4 100644 --- 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 index 60598a861134..831181eb292e 100644 --- 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 index 905394872393..850910812726 100644 --- 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 index 3e8581aa9f69..0172e8a4f4dc 100644 --- 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 index fd8133fb3a05..994a746ab9aa 100644 --- 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 index 0c9c59e883c8..2cdbbc387971 100644 --- 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 index a60fef60162a..525048e7cb6e 100644 --- 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 index ddcc79c5fd6a..e67ebd56f79a 100644 --- 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 index 26121b1f640e..39fd410d3278 100644 --- 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 index c392c15afbfe..5dc0e6923efe 100644 --- 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 index c588824a2dbd..7c8fb8f620bd 100644 --- 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 index 1ebcc15dd841..7a55628f815b 100644 --- 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 index 41b133b6a431..2c419c1a28ca 100644 --- 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 index 5e050444171f..95a0be453781 100644 --- 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 index bb74bbd8dbd2..6cf37d345c70 100644 --- 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 index 9e1ca96aed17..f07b287c57be 100644 --- 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 index 8c41ef16df9a..2b65a5c4d8c6 100644 --- 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 index 4a37a6de3840..1a4a30c43ac7 100644 --- 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 index f194988181a6..7c374dfd5a40 100644 --- 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 index e6442dc70067..4bc7f4123d87 100644 --- 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> diff --git a/deskutils/treesheets/distinfo b/deskutils/treesheets/distinfo index 1dd6019c2708..ead35571ad60 100644 --- a/deskutils/treesheets/distinfo +++ b/deskutils/treesheets/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1538869581 -SHA256 (libcxx-6.0.1.src.tar.xz) = 7654fbc810a03860e6f01a54c2297a0b9efb04c0b9aa0409251d9bdb3726fc67 -SIZE (libcxx-6.0.1.src.tar.xz) = 1552328 +TIMESTAMP = 1541105162 SHA256 (aardappel-treesheets-v1.0.1_GH0.tar.gz) = cacf0593e12c484f68adf4d462147efed202b1c2d09e58e90c9fb98cb3e7b874 SIZE (aardappel-treesheets-v1.0.1_GH0.tar.gz) = 2316388 diff --git a/devel/R-cran-data.table/Makefile b/devel/R-cran-data.table/Makefile index 213e428839ba..095ef523a7be 100644 --- a/devel/R-cran-data.table/Makefile +++ b/devel/R-cran-data.table/Makefile @@ -12,9 +12,7 @@ COMMENT= Extension of Data.frame LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_FreeBSD_11_i386= unable to load datatable.so -BROKEN_FreeBSD_12_i386= unable to load datatable.so -BROKEN_FreeBSD_13_i386= unable to load datatable.so +BROKEN_i386= unable to load datatable.so USES= cran:auto-plist,compiles diff --git a/devel/arpc/Makefile b/devel/arpc/Makefile index c083d888cf53..b785b2415cc3 100644 --- a/devel/arpc/Makefile +++ b/devel/arpc/Makefile @@ -12,8 +12,6 @@ COMMENT= GRPC-like RPC library that supports file descriptor passing LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -IGNORE_FreeBSD_10= requires various C++17 features - BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyPEG2>=2.15.2:textproc/py-pyPEG2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}toposort>=1.5:devel/py-toposort@${PY_FLAVOR} LIB_DEPENDS= libargdata.so:devel/argdata diff --git a/devel/boost-libs/Makefile b/devel/boost-libs/Makefile index a738f00cd4cf..689d47bf2234 100644 --- a/devel/boost-libs/Makefile +++ b/devel/boost-libs/Makefile @@ -10,9 +10,6 @@ BROKEN_sparc64= https://github.com/boostorg/context/commit/f2ef6326b6ed BUILD_DEPENDS+= bjam:devel/boost-jam -# libs/config/test/boost_no_cxx11_thread_local.ipp fails (see base r303795) -PLIST_SUB+= FIBER="${"${OPSYS}"=="FreeBSD" && ${OSREL:R} < 11:?@comment :}" - OPTIONS_DEFINE= DEBUG OPTIMIZED_CFLAGS OPTIONS_MULTI= LOCALE OPTIONS_MULTI_LOCALE= ICONV ICU diff --git a/devel/boost-libs/pkg-plist b/devel/boost-libs/pkg-plist index fda0a76abda4..acf048d27f8d 100644 --- a/devel/boost-libs/pkg-plist +++ b/devel/boost-libs/pkg-plist @@ -13594,9 +13594,9 @@ lib/libboost_date_time.a lib/libboost_date_time.so lib/libboost_date_time.so.%%BOOST_SHARED_LIB_VER%% lib/libboost_exception.a -%%FIBER%%lib/libboost_fiber.a -%%FIBER%%lib/libboost_fiber.so -%%FIBER%%lib/libboost_fiber.so.%%BOOST_SHARED_LIB_VER%% +lib/libboost_fiber.a +lib/libboost_fiber.so +lib/libboost_fiber.so.%%BOOST_SHARED_LIB_VER%% lib/libboost_filesystem.a lib/libboost_filesystem.so lib/libboost_filesystem.so.%%BOOST_SHARED_LIB_VER%% diff --git a/devel/cvschangelogbuilder/Makefile b/devel/cvschangelogbuilder/Makefile index c832b7134011..fb9c08f095b2 100644 --- a/devel/cvschangelogbuilder/Makefile +++ b/devel/cvschangelogbuilder/Makefile @@ -24,14 +24,6 @@ PORTDOCS= * OPTIONS_DEFINE= DOCS -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100077 -# chmod -R bug. -post-extract: - @${CHMOD} 755 ${WRKSRC}/docs/images -.endif - do-install: ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl \ ${STAGEDIR}${PREFIX}/bin/${PORTNAME} @@ -41,4 +33,4 @@ do-install-DOCS-on: ${INSTALL_DATA} ${WRKSRC}/docs/*.* ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/images/* ${STAGEDIR}${DOCSDIR}/images -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/elfutils/Makefile b/devel/elfutils/Makefile index af564206cc96..79a2d257c46f 100644 --- a/devel/elfutils/Makefile +++ b/devel/elfutils/Makefile @@ -16,8 +16,6 @@ LICENSE_FILE_GPLv3+ = ${WRKSRC}/COPYING LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING-GPLV2 LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING-LGPLV3 -IGNORE_FreeBSD_10= stable/10 base libelf.h lacks needed ELF types - BROKEN_aarch64= fails to build: fatal error: linux/uio.h: No such file or directory BROKEN_armv6= fails to build: fails to compile i386_disasm.c BROKEN_armv7= fails to build: fails to compile i386_disasm.c diff --git a/devel/flang-clang/Makefile b/devel/flang-clang/Makefile index d6e74752a934..60919fcf8caa 100644 --- a/devel/flang-clang/Makefile +++ b/devel/flang-clang/Makefile @@ -15,7 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.TXT LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept ONLY_FOR_ARCHS= amd64 -IGNORE_FreeBSD_10= base compiler too old BUILD_DEPENDS= llvm60>=0:devel/llvm60 RUN_DEPENDS= llvm60>=0:devel/llvm60 diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 344176643e68..af1f6bda2f1e 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -48,24 +48,11 @@ gio_MAN= gdbus.1 gsettings.1 gio-querymodules.1 gio.1 \ glib-compile-resources.1 gresource.1 gdbus-codegen.1 gobject_MAN= glib-genmarshal.1 glib-mkenums.1 gobject-query.1 -OPTIONS_DEFINE= COLLATION_FIX DEBUG NLS +OPTIONS_DEFINE= DEBUG NLS OPTIONS_SUB= yes -# libc collation was fixed by https://svnweb.freebsd.org/changeset/base/290494 -COLLATION_FIX_DESC= Use ICU for UTF-8 string collation (if libc is broken) - -OPTIONS_EXCLUDE_FreeBSD_11= COLLATION_FIX -OPTIONS_EXCLUDE_FreeBSD_12= COLLATION_FIX -OPTIONS_EXCLUDE_FreeBSD_13= COLLATION_FIX DEBUG_CONFIGURE_ON= --enable-debug=yes -COLLATION_FIX_LIB_DEPENDS+= libicui18n.so:devel/icu -COLLATION_FIX_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-glib_Makefile.in \ - ${FILESDIR}/extra-patch-glib_gunicollate.c -# Disable it until someone can figure why it causes net-im/pidgin crashed. -# http://www.freebsd.org/cgi/query-pr.cgi?pr=175930 see comment by ed@ -#COLLATION_FIX_CONFIGURE_ENV+= CFLAGS="-D__STDC_ISO_10646__" - .include <bsd.port.pre.mk> # doesn't build yet diff --git a/devel/glib20/files/extra-patch-glib_Makefile.in b/devel/glib20/files/extra-patch-glib_Makefile.in deleted file mode 100644 index 04e45460c4c8..000000000000 --- a/devel/glib20/files/extra-patch-glib_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- glib/Makefile.in.orig 2012-09-27 15:07:28.000000000 +0000 -+++ glib/Makefile.in 2012-09-27 15:08:02.000000000 +0000 -@@ -415,7 +415,7 @@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ - LD = @LD@ --LDFLAGS = @LDFLAGS@ -+LDFLAGS = @LDFLAGS@ -licui18n - LIBELF_CFLAGS = @LIBELF_CFLAGS@ - LIBELF_LIBS = @LIBELF_LIBS@ - LIBFFI_CFLAGS = @LIBFFI_CFLAGS@ diff --git a/devel/glib20/files/extra-patch-glib_gunicollate.c b/devel/glib20/files/extra-patch-glib_gunicollate.c deleted file mode 100644 index 1d9af5fa72ca..000000000000 --- a/devel/glib20/files/extra-patch-glib_gunicollate.c +++ /dev/null @@ -1,124 +0,0 @@ ---- glib/gunicollate.c.orig 2012-11-24 20:50:39.000000000 +0000 -+++ glib/gunicollate.c 2013-03-08 12:16:59.000000000 +0000 -@@ -26,6 +26,10 @@ - #include <wchar.h> - #endif - -+#include <unicode/umachine.h> -+#include <unicode/ustring.h> -+#include <unicode/ucol.h> -+ - #ifdef HAVE_CARBON - #include <CoreServices/CoreServices.h> - #endif -@@ -36,11 +40,54 @@ - #include "gstring.h" - #include "gstrfuncs.h" - #include "gtestutils.h" -+#include "gthread.h" - #include "gcharset.h" - #ifndef __STDC_ISO_10646__ - #include "gconvert.h" - #endif - -+static gboolean icu_collator_initialized = FALSE; -+static UCollator *icu_collator = NULL; -+G_LOCK_DEFINE_STATIC(icu_collator); -+ -+static void -+init_icu_collator (void) -+{ -+ G_LOCK(icu_collator); -+ if (! icu_collator_initialized) -+ { -+ UErrorCode error = U_ZERO_ERROR; -+ -+ icu_collator = ucol_open(NULL, &error); -+ if (icu_collator == NULL) -+ g_warning("unable to initialize the ICU collator (%s), FreeBSD collation routines will be used", u_errorName(error)); -+ -+ icu_collator_initialized = TRUE; -+ } -+ G_UNLOCK(icu_collator); -+} -+ -+static UChar * -+utf8_to_uchar (const char *str, int32_t len, int32_t *result_len) -+{ -+ UErrorCode error = U_ZERO_ERROR; -+ UChar *result = NULL; -+ -+ u_strFromUTF8(NULL, 0, result_len, str, len, &error); -+ if (error <= U_ZERO_ERROR || error == U_BUFFER_OVERFLOW_ERROR) -+ { -+ error = U_ZERO_ERROR; -+ result = g_new(UChar, *result_len); -+ u_strFromUTF8(result, *result_len, NULL, str, len, &error); -+ if (error > U_ZERO_ERROR) -+ { -+ g_free(result); -+ result = NULL; -+ } -+ } -+ -+ return result; -+} - - #ifdef _MSC_VER - /* Workaround for bug in MSVCR80.DLL */ -@@ -128,6 +175,28 @@ - g_return_val_if_fail (str1 != NULL, 0); - g_return_val_if_fail (str2 != NULL, 0); - -+ init_icu_collator(); -+ if (icu_collator != NULL) -+ { -+ int32_t wstr1_len; -+ UChar *wstr1 = utf8_to_uchar(str1, -1, &wstr1_len); -+ if (wstr1 != NULL) -+ { -+ int32_t wstr2_len; -+ UChar *wstr2 = utf8_to_uchar(str2, -1, &wstr2_len); -+ if (wstr2 != NULL) -+ { -+ result = ucol_strcoll(icu_collator, wstr1, wstr1_len, wstr2, wstr2_len); -+ -+ g_free(wstr1); -+ g_free(wstr2); -+ -+ return result; -+ } -+ g_free(wstr1); -+ } -+ } -+ - str1_norm = g_utf8_normalize (str1, -1, G_NORMALIZE_ALL_COMPOSE); - str2_norm = g_utf8_normalize (str2, -1, G_NORMALIZE_ALL_COMPOSE); - -@@ -419,6 +488,26 @@ - - g_return_val_if_fail (str != NULL, NULL); - -+ init_icu_collator(); -+ if (icu_collator != NULL) -+ { -+ int32_t wstr_len; -+ UChar *wstr = utf8_to_uchar(str, len, &wstr_len); -+ if (wstr != NULL) -+ { -+ int32_t result_len; -+ -+ /* get size of result */ -+ result_len = ucol_getSortKey(icu_collator, wstr, wstr_len, NULL, 0); -+ -+ result = g_new(char, result_len); -+ ucol_getSortKey(icu_collator, wstr, wstr_len, result, result_len); -+ g_free(wstr); -+ -+ return result; -+ } -+ } -+ - str_norm = g_utf8_normalize (str, len, G_NORMALIZE_ALL_COMPOSE); - - result = NULL; diff --git a/devel/heimdall/Makefile b/devel/heimdall/Makefile index cc3763b51ff6..68a2ffb0cafd 100644 --- a/devel/heimdall/Makefile +++ b/devel/heimdall/Makefile @@ -32,7 +32,7 @@ PORTDOCS= README .include <bsd.port.pre.mk> # does not compile with clang 6.0.0 -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1101513 +.if ${OPSYS} == FreeBSD USE_GCC= yes .endif diff --git a/devel/kcov/Makefile b/devel/kcov/Makefile index bbbeba39f191..b08df521e453 100644 --- a/devel/kcov/Makefile +++ b/devel/kcov/Makefile @@ -12,7 +12,6 @@ LICENSE= GPLv2 MIT # MIT for bundled handlebars, jquery, tablesorter LICENSE_COMB= multi LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING -BROKEN_FreeBSD_10= PR228478 devel/elfutils: undefined symbols on 10.4-RELEASE ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= ptrace code is only implemented for amd64 diff --git a/devel/libzim/Makefile b/devel/libzim/Makefile index ce1fba54910f..148fdfc2d555 100644 --- a/devel/libzim/Makefile +++ b/devel/libzim/Makefile @@ -16,7 +16,6 @@ USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= openzim # Using gcc6 and libstdc++ leads to error because xapian-core is linked with libc++ -BROKEN_FreeBSD_10= /usr/include/c++/v1/memory:4004:35: error: no viable overloaded '=' BINARY_ALIAS= python3=python${PYTHON_VER} python3-config=python${PYTHON_VER}-config diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile index d93596fdcc15..564163e8ed8d 100644 --- a/devel/llvm-devel/Makefile +++ b/devel/llvm-devel/Makefile @@ -33,8 +33,6 @@ SHEBANG_FILES= utils/lit/lit.py utils/llvm-lit/llvm-lit.in \ tools/clang/tools/extra/clang-tidy/tool/run-clang-tidy.py \ tools/clang/tools/extra/include-fixer/find-all-symbols/tool/run-find-all-symbols.py -BROKEN_FreeBSD_10= error: anonymous union can only contain non-static data members - SUB_FILES= llvm-wrapper.sh SUB_LIST= LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}" @@ -62,7 +60,6 @@ OPTIONS_DEFINE_i386= COMPILER_RT OPENMP OPTIONS_DEFAULT= CLANG EXTRAS LIT LLD LLDB OPTIONS_DEFAULT_amd64= COMPILER_RT GOLD OPENMP OPTIONS_DEFAULT_i386= COMPILER_RT OPENMP -OPTIONS_EXCLUDE_FreeBSD_10= LLDB OPENMP OPTIONS_SUB= yes PLIST_FILES= diff --git a/devel/llvm50/Makefile b/devel/llvm50/Makefile index e9dc3bae286e..c26e49566ef8 100644 --- a/devel/llvm50/Makefile +++ b/devel/llvm50/Makefile @@ -55,7 +55,6 @@ OPTIONS_DEFINE_i386= COMPILER_RT OPENMP OPTIONS_DEFAULT= CLANG EXTRAS LIT LLD LLDB OPTIONS_DEFAULT_amd64= COMPILER_RT GOLD OPENMP OPTIONS_DEFAULT_i386= COMPILER_RT OPENMP -OPTIONS_EXCLUDE_FreeBSD_10= LLDB OPTIONS_SUB= yes CLANG_DESC= Build clang diff --git a/devel/llvm60/Makefile b/devel/llvm60/Makefile index 26f7afc4cb54..4591517c4609 100644 --- a/devel/llvm60/Makefile +++ b/devel/llvm60/Makefile @@ -52,7 +52,6 @@ OPTIONS_DEFINE_i386= COMPILER_RT OPENMP OPTIONS_DEFAULT= CLANG EXTRAS LIT LLD LLDB OPTIONS_DEFAULT_amd64= COMPILER_RT GOLD OPENMP OPTIONS_DEFAULT_i386= COMPILER_RT OPENMP -OPTIONS_EXCLUDE_FreeBSD_10= LLDB OPENMP OPTIONS_SUB= yes CLANG_DESC= Build clang diff --git a/devel/lua-sysctl/Makefile b/devel/lua-sysctl/Makefile index ed7ca6e96623..b1936315de35 100644 --- a/devel/lua-sysctl/Makefile +++ b/devel/lua-sysctl/Makefile @@ -11,8 +11,6 @@ COMMENT= Small sysctl(3) interface for lua LICENSE= BSD2CLAUSE -BROKEN_FreeBSD_10= does not build (error: use of undeclared identifier 'CTLTYPE_S8') - USES= pkgconfig lua USE_GITHUB= yes diff --git a/devel/mdb/Makefile b/devel/mdb/Makefile index 475b71dbf9d9..b4071a9c13f0 100644 --- a/devel/mdb/Makefile +++ b/devel/mdb/Makefile @@ -25,14 +25,6 @@ MAKE_ARGS+= FREEBSD_SRC_DIR=${SRC_BASE} WRKSRC_SUBDIR= freebsd/cddl/usr.bin/mdb CFLAGS+= -DMDB_PREFIX=\\\"${PREFIX}\\\" -g -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 1100021 -# This port uses CWARNFLAGS.clang to silence warnings which only works -# in 11.0 and later. -MAKE_ARGS+= NO_WERROR=yes -.endif - .if !exists(${SRC_BASE}/cddl/compat) || !exists(${SRC_BASE}/sys/cddl/compat) IGNORE= requires full source tree with CDDL sources .endif @@ -40,4 +32,4 @@ IGNORE= requires full source tree with CDDL sources pre-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/mdb/kvm/${MACHINE_ARCH} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/oclgrind/Makefile b/devel/oclgrind/Makefile index cb4b6b450935..95008ca759fc 100644 --- a/devel/oclgrind/Makefile +++ b/devel/oclgrind/Makefile @@ -13,8 +13,6 @@ COMMENT= SPIR interpreter and virtual OpenCL device simulator LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_FreeBSD_10= oclgrind is only supported on FreeBSD 11.0 and newer, crashes LLVM 3.4 - BUILD_DEPENDS= opencl>=0:devel/opencl \ llvm-config50:devel/llvm50 LIB_DEPENDS= libOpenCL.so:devel/ocl-icd diff --git a/devel/openocd/pkg-message b/devel/openocd/pkg-message index 551e98d953d1..b2883a39ea2c 100644 --- a/devel/openocd/pkg-message +++ b/devel/openocd/pkg-message @@ -12,16 +12,12 @@ FreeBSD USB NOTE: add him/her to the operator group (pw groupmod operator -m username), then setup the devfs subsystem by adding these lines to the following files: - ***/etc/devfs.rules (FreeBSD >= 8): + ***/etc/devfs.rules: [localrules=10] add path 'ugen*' mode 0660 group operator add path 'usb/*' mode 0660 group operator add path 'usb' mode 0770 group operator - ***/etc/devfs.rules (FreeBSD <= 7): - [localrules=10] - add path 'ugen*' mode 0660 group operator - ***/etc/rc.conf: devfs_system_ruleset="localrules" diff --git a/devel/py-cffi/Makefile b/devel/py-cffi/Makefile index 357efc414749..464e624e63ed 100644 --- a/devel/py-cffi/Makefile +++ b/devel/py-cffi/Makefile @@ -23,11 +23,9 @@ USE_PYTHON= autoplist distutils .include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100000 .if ${COMPILER_TYPE:Mclang} CFLAGS+= -Wno-shift-negative-value .endif -.endif post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_cffi_backend.so diff --git a/devel/py-freebsd/Makefile b/devel/py-freebsd/Makefile index 6b30963e1009..e81bec92351a 100644 --- a/devel/py-freebsd/Makefile +++ b/devel/py-freebsd/Makefile @@ -19,14 +19,7 @@ LICENSE_FILE= ${WRKSRC}/COPYRIGHT USES= python:2.7 USE_PYTHON= autoplist distutils -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100002 -EXTRA_PATCHES+= ${FILESDIR}/freebsd11_patch-src__.const.def \ - ${FILESDIR}/freebsd11_patch-src__netstat.c -.endif - post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/freebsd.so -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-freebsd/files/freebsd11_patch-src__.const.def b/devel/py-freebsd/files/patch-src__.const.def index d196ac34920a..d196ac34920a 100644 --- a/devel/py-freebsd/files/freebsd11_patch-src__.const.def +++ b/devel/py-freebsd/files/patch-src__.const.def diff --git a/devel/py-freebsd/files/freebsd11_patch-src__netstat.c b/devel/py-freebsd/files/patch-src__netstat.c index 97309d6dabab..97309d6dabab 100644 --- a/devel/py-freebsd/files/freebsd11_patch-src__netstat.c +++ b/devel/py-freebsd/files/patch-src__netstat.c diff --git a/devel/qtcreator/Makefile b/devel/qtcreator/Makefile index 9816d795e92c..294f431a5009 100644 --- a/devel/qtcreator/Makefile +++ b/devel/qtcreator/Makefile @@ -58,12 +58,6 @@ DOCS_INSTALL_TARGET= install_docs PLIST_SUB= SHLIB_VER="${PORTVERSION}" -.include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000 -# The detection of is_trivially_destructible fails with clang-3.4 from 10.3. -QMAKE_ARGS+= DEFINES+=TR2_OPTIONAL_DISABLE_EMULATION_OF_TYPE_TRAITS -.endif - # Fix paths for gnuplot and ant. post-patch: ${REINPLACE_CMD} -e 's|/usr/bin/gnuplot|${LOCALBASE}/bin/gnuplot|' \ @@ -82,4 +76,4 @@ pre-configure: # See QTBUG-40825 and ports bugs 194088, 195105 and 198720. ${ECHO_CMD} 'QMAKE_LIBDIR_FLAGS = -L${WRKSRC}/lib' >> ${WRKSRC}/.qmake.cache -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/sfio/Makefile b/devel/sfio/Makefile index 6e4f32c6e84e..894bb5257270 100644 --- a/devel/sfio/Makefile +++ b/devel/sfio/Makefile @@ -16,18 +16,14 @@ EXTRACT_BEFORE_ARGS= -idF EXTRACT_AFTER_ARGS= # empty NO_WRKSUBDIR= yes -.include <bsd.port.pre.mk> - # Remove a test that's too clever for its own good post-extract: @${MV} ${WRKSRC}/src/lib/sfio/Sfio_t/tmmap2read.c \ ${WRKSRC}/src/lib/sfio/Sfio_t/.tmmap2read.c -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100093 post-patch: @${REINPLACE_CMD} -e 's|SF_FLAGS|SFIO_FLAGS|g' \ ${WRKSRC}/src/lib/sfio/*.[ch] -.endif do-build: @cd ${WRKSRC}/src/lib/sfio && ${MAKE} all -f makefile @@ -39,4 +35,4 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/man/man1/iffe.1 ${STAGEDIR}${PREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/man/man3/sfio.3 ${STAGEDIR}${PREFIX}/man/man3 -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/zapcc/Makefile b/devel/zapcc/Makefile index a4604140b3d9..e4aa37bc4412 100644 --- a/devel/zapcc/Makefile +++ b/devel/zapcc/Makefile @@ -10,8 +10,6 @@ COMMENT= C++ caching compiler based on clang LICENSE= NCSA LICENSE_FILE= ${WRKSRC}/LICENSE.TXT -BROKEN_FreeBSD_10= error: expected a class or namespace const NoneType None = NoneType::None - BUILD_DEPENDS= googletest>0:devel/googletest USES= cmake:outsource libedit python:3.4+ shebangfix diff --git a/dns/knot1/files/pkg-message.in b/dns/knot1/files/pkg-message.in index 35557a5d1898..4800b55cdd22 100644 --- a/dns/knot1/files/pkg-message.in +++ b/dns/knot1/files/pkg-message.in @@ -8,10 +8,4 @@ sysrc knot_config=%%ETCDIR%%/knot.conf service knot start - Traditional (pre-FreeBSD 9.2) method, for last three commands: - - echo knot_enable=\"YES\" >> /etc/rc.conf - echo knot_config=\"%%PREFIX%%/etc/knot/knot.conf\" >> /etc/rc.conf - %%PREFIX%%/etc/rc.d/knot start - ###################################################################### diff --git a/dns/knot2/Makefile b/dns/knot2/Makefile index 8aa3fecb4ce5..c3854eaff1bb 100644 --- a/dns/knot2/Makefile +++ b/dns/knot2/Makefile @@ -14,6 +14,9 @@ COMMENT= High performance authoritative-only DNS server LICENSE= GPLv3 +NOT_FOR_ARCHS= i386 +NOT_FOR_ARCHS_REASON_i386=Uses 64 bit atomics that clang cannot generate on i386 on FreeBSD >= 11.2 + LIB_DEPENDS= libgnutls.so:security/gnutls \ libidn2.so:dns/libidn2 \ liblmdb.so:databases/lmdb \ @@ -60,13 +63,6 @@ FASTPARSER_CONFIGURE_ENABLE= fastparser IDN_CONFIGURE_WITH= libidn IDN_LIB_DEPENDS= libidn.so:dns/libidn -.include <bsd.port.options.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1120000 -NOT_FOR_ARCHS= i386 -NOT_FOR_ARCHS_REASON_i386=Uses 64 bit atomics that clang cannot generate on i386 on FreeBSD >= 11.2 -.endif - post-patch: @${REINPLACE_CMD} 's|$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|#$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|' \ ${WRKSRC}/src/Makefile.in diff --git a/editors/hte/Makefile b/editors/hte/Makefile index 7b42fb5294f0..a52f2c80dd59 100644 --- a/editors/hte/Makefile +++ b/editors/hte/Makefile @@ -11,8 +11,6 @@ COMMENT= File editor/viewer/analyzer for executables LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_FreeBSD_10= misgenerated yacc code - USES= autoreconf compiler:c++14-lang makeinfo ncurses tar:bzip2 USE_GITHUB= yes GH_ACCOUNT= sebastianbiallas diff --git a/emulators/citra/Makefile b/emulators/citra/Makefile index 5cd516e3f2a5..c65b4d50dee5 100644 --- a/emulators/citra/Makefile +++ b/emulators/citra/Makefile @@ -17,8 +17,6 @@ LICENSE_FILE_GPLv2+ = ${WRKSRC}/license.txt LICENSE_FILE_MIT= ${WRKSRC}/externals/enet/LICENSE LICENSE_FILE_LGPL21+ = ${_LICENSE_STORE}/LGPL21 # soundtouch -BROKEN_FreeBSD_10= libc++ does not support C++17 features - BUILD_DEPENDS= boost-libs>=1.66:devel/boost-libs USE_GITHUB= yes diff --git a/emulators/dolphin-emu/Makefile b/emulators/dolphin-emu/Makefile index a37e7daa02dc..4329613e9024 100644 --- a/emulators/dolphin-emu/Makefile +++ b/emulators/dolphin-emu/Makefile @@ -11,8 +11,6 @@ COMMENT= Gamecube and Wii Emulator LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/license.txt -BROKEN_FreeBSD_10= conflicting types for '__hash_table<_Tp, _Hash, _Equal, _Alloc>' - # Notes on dependencies: # - alsa support disabled (not optimal) # - enet and soundtouch come from Externals/ as Dolphin's versions diverge diff --git a/emulators/i386-wine-devel/Makefile.inc b/emulators/i386-wine-devel/Makefile.inc index 9a0557f1ff6a..036e346020e8 100644 --- a/emulators/i386-wine-devel/Makefile.inc +++ b/emulators/i386-wine-devel/Makefile.inc @@ -48,7 +48,7 @@ MONO_RUN_DEPENDS= ${DATADIR}/mono/wine-mono-4.7.1.msi:emulators/wine-mono-devel # Included for OPSYS and OSVERSION .include <bsd.port.pre.mk> -.for osrel in 10 11 12 +.for osrel in 11 12 .if ${OSREL:C/\..*//} == ${osrel} PLIST_SUB+= OSREL${osrel}="" .if ${PKGNAMESUFFIX} == -devel @@ -65,7 +65,7 @@ PLIST_SUB+= OSREL${osrel}-DEVEL="@comment " .endfor .if ${OPSYS} != FreeBSD || (!(${OSVERSION} < 1100000) && !(${OSVERSION} >= 1101000 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1200060 && ${OSVERSION} < 1300000)) -IGNORE= binaries compiled for FreeBSD 10.3+, 11.1+ and -current only +IGNORE= binaries compiled for FreeBSD 11.2+ only DISTFILES= .endif @@ -83,7 +83,7 @@ ${PLIST}: fetch port-update: ${RM} ${SLAVEDIR}/distinfo ${SLAVEDIR}/distinfo~ ${SLAVEDIR}/pkg-plist.* -.for osrel in 10 11 12 +.for osrel in 11 12 ${MAKE} fetch OSREL=${osrel} OSVERSION=${osrel}99999 _OSRELEASE=${osrel} ${MAKE} makesum OSREL=${osrel} OSVERSION=${osrel}99999 _OSRELEASE=${osrel} ${CAT} ${SLAVEDIR}/distinfo >> ${SLAVEDIR}/distinfo~ diff --git a/emulators/i386-wine/Makefile.inc b/emulators/i386-wine/Makefile.inc index c164570b0569..8f4f4c3f1c65 100644 --- a/emulators/i386-wine/Makefile.inc +++ b/emulators/i386-wine/Makefile.inc @@ -49,7 +49,7 @@ PORTSCOUT= limitw:1,even # Included for OPSYS and OSVERSION .include <bsd.port.pre.mk> -.for osrel in 10 11 12 +.for osrel in 11 12 .if ${OSREL:C/\..*//} == ${osrel} PLIST_SUB+= OSREL${osrel}="" .else @@ -58,7 +58,7 @@ PLIST_SUB+= OSREL${osrel}="@comment " .endfor .if ${OPSYS} != FreeBSD || (!(${OSVERSION} < 1000000) && !(${OSVERSION} >= 1003000 && ${OSVERSION} < 1100000) && !(${OSVERSION} >= 1101000 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1200056 && ${OSVERSION} < 1300000)) -IGNORE= binaries compiled for FreeBSD 10.3+, 11.0+ and -current only +IGNORE= binaries compiled for FreeBSD 11.2+ only DISTFILES= .endif @@ -75,7 +75,7 @@ ${PLIST}: fetch port-update: ${RM} ${SLAVEDIR}/distinfo ${SLAVEDIR}/distinfo~ ${SLAVEDIR}/pkg-plist.* -.for osrel in 10 11 12 +.for osrel in 11 12 ${MAKE} fetch OSREL=${osrel} OSVERSION=${osrel}99999 _OSRELEASE=${osrel} ${MAKE} makesum OSREL=${osrel} OSVERSION=${osrel}99999 _OSRELEASE=${osrel} ${CAT} ${SLAVEDIR}/distinfo >> ${SLAVEDIR}/distinfo~ diff --git a/emulators/linux_base-c6/Makefile b/emulators/linux_base-c6/Makefile index 3a74a5714e14..3a7778d76055 100644 --- a/emulators/linux_base-c6/Makefile +++ b/emulators/linux_base-c6/Makefile @@ -120,7 +120,7 @@ REMOVE_FILES= bin/df bin/su etc/exports etc/group etc/gshadow etc/motd \ .include <bsd.port.pre.mk> -.if ${LINUX_ARCH} == x86_64 && ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100105 +.if ${LINUX_ARCH} == x86_64 SYSCTLMIB= kern.features.linux64 .else SYSCTLMIB= compat.linux.osrelease diff --git a/emulators/linux_base-c7/Makefile b/emulators/linux_base-c7/Makefile index 9af49d4ee4e0..99e16b3abc12 100644 --- a/emulators/linux_base-c7/Makefile +++ b/emulators/linux_base-c7/Makefile @@ -125,7 +125,7 @@ REMOVE_FILES= bin/df bin/su etc/exports etc/group etc/gshadow etc/motd \ .include <bsd.port.pre.mk> -.if ${LINUX_ARCH} == x86_64 && ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100105 +.if ${LINUX_ARCH} == x86_64 SYSCTLMIB= kern.features.linux64 .else SYSCTLMIB= compat.linux.osrelease diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile index 4368be4115b0..97a9bd43a072 100644 --- a/emulators/open-vm-tools/Makefile +++ b/emulators/open-vm-tools/Makefile @@ -63,10 +63,6 @@ INSTALL_TARGET= install-strip .include <bsd.port.options.mk> -.if ${OSVERSION} < 1100000 -CFLAGS+= -Wno-unknown-warning-option -.endif - .if ${PORT_OPTIONS:MX11} CONFLICTS= open-vm-tools-nox11-[0-9]* .else diff --git a/emulators/py-nova/Makefile b/emulators/py-nova/Makefile index 431f7fc7728b..62b43ea543db 100644 --- a/emulators/py-nova/Makefile +++ b/emulators/py-nova/Makefile @@ -114,10 +114,6 @@ GROUPS= nova IGNORE= only supported on FreeBSD .endif -.if ${OSVERSION} < 1100055 -IGNORE= only supported on recent FreeBSD 11 -.endif - post-extract: @(cd ${WRKSRC}/etc/nova; ${MV} logging_sample.conf logging.conf.sample) @(cd ${WRKSRC}/etc/nova; for f in *.conf; do ${MV} $${f} $${f}.sample; done) diff --git a/emulators/qemu-cheri/Makefile b/emulators/qemu-cheri/Makefile index 4766b8eb6fb1..d62710fd2f88 100644 --- a/emulators/qemu-cheri/Makefile +++ b/emulators/qemu-cheri/Makefile @@ -26,7 +26,6 @@ USES= gettext-runtime gmake libtool makeinfo pkgconfig python:2.7,build USE_XORG= pixman USE_GNOME+= glib20 ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 -BROKEN_FreeBSD_10= Default toolchain lacks support for .cfi_sections OPTIONS_DEFINE= DOCS diff --git a/emulators/qemu-ppcnv/Makefile b/emulators/qemu-ppcnv/Makefile index 346acadf73c0..bcbe8c52926c 100644 --- a/emulators/qemu-ppcnv/Makefile +++ b/emulators/qemu-ppcnv/Makefile @@ -15,8 +15,6 @@ COMMENT= Fork of QEMU with experimental PowerPCNV emulation support LICENSE= GPLv2 -IGNORE_FreeBSD_10= does not build - BUILD_DEPENDS+= ${LOCALBASE}/lib/libfdt.so:sysutils/dtc USE_GITHUB= yes diff --git a/emulators/qemu-riscv/Makefile b/emulators/qemu-riscv/Makefile index c5b859ac1509..fc157c92c2cd 100644 --- a/emulators/qemu-riscv/Makefile +++ b/emulators/qemu-riscv/Makefile @@ -50,14 +50,8 @@ CONFIGURE_ARGS=--target-list=riscv64-softmmu,riscv32-softmmu \ PLIST_FILES= bin/qemu-system-riscv32 \ bin/qemu-system-riscv64 -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 1100000 -IGNORE= does not build -.endif - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/riscv32-softmmu/qemu-system-riscv32 ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/riscv64-softmmu/qemu-system-riscv64 ${STAGEDIR}${PREFIX}/bin -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/emulators/qemu-sbruno/Makefile b/emulators/qemu-sbruno/Makefile index fc9840fce189..78e96f648575 100644 --- a/emulators/qemu-sbruno/Makefile +++ b/emulators/qemu-sbruno/Makefile @@ -244,24 +244,10 @@ CONFIGURE_ARGS+= --sparc_cpu=v9 CONFIGURE_ARGS+= --python=${PYTHON_CMD} -# clang in freebsd 10 is unable to assemble linuxboot_dma.bin -.if (${OPSYS} == FreeBSD && ${OSVERSION} < 1100000) -PLIST_SUB+= LINUXBOOT_DMA="@comment " -.else PLIST_SUB+= LINUXBOOT_DMA="" -.endif post-patch: @${REINPLACE_CMD} -e '/libs_qga=/s|glib_libs|glib_libs -lintl|' ${WRKSRC}/configure -# clang in freebsd 10 is unable to assemble linuxboot_dma.bin -.if (${OPSYS} == FreeBSD && ${OSVERSION} < 1100000) - @${REINPLACE_CMD} -E \ - -e 's|linuxboot_dma.bin||' \ - ${WRKSRC}/pc-bios/optionrom/Makefile - @${REINPLACE_CMD} -E \ - -e 's|linuxboot_dma.bin||' \ - ${WRKSRC}/Makefile -.endif .if empty(PORT_OPTIONS:MCDROM_DMA) @cd ${WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/cdrom-dma-patch diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile index b49b373fe15b..0e502ea93da7 100644 --- a/emulators/qemu/Makefile +++ b/emulators/qemu/Makefile @@ -116,12 +116,7 @@ MAKE_ARGS+= ARCH=ppc64 CONFIGURE_ARGS+= --sparc_cpu=v9 .endif -# clang in freebsd 10 is unable to assemble linuxboot_dma.bin -.if (${OSVERSION} < 1100000) -PLIST_SUB+= LINUXBOOT_DMA="@comment " -.else PLIST_SUB+= LINUXBOOT_DMA="" -.endif # -lprocstat actually only _needs_ -lelf after r249666 or r250870 (MFC) # but it shouldn't matter much @@ -144,15 +139,6 @@ post-patch: @${REINPLACE_CMD} -E \ -e "1s|^(#! )/usr/bin/perl|\1${PERL}|" \ ${WRKSRC}/scripts/texi2pod.pl -# clang in freebsd 10 is unable to assemble linuxboot_dma.bin -.if (${OSVERSION} < 1100000) - @${REINPLACE_CMD} -E \ - -e 's|linuxboot_dma.bin||' \ - ${WRKSRC}/pc-bios/optionrom/Makefile - @${REINPLACE_CMD} -E \ - -e 's|linuxboot_dma.bin||' \ - ${WRKSRC}/Makefile -.endif post-patch-CDROM_DMA-off: @${REINPLACE_CMD} -e '/USE_DMA_CDROM/d' ${WRKSRC}/include/hw/ide/internal.h diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile index bd0a45726771..4c6cc7adb882 100644 --- a/emulators/rpcs3/Makefile +++ b/emulators/rpcs3/Makefile @@ -18,8 +18,6 @@ LICENSE_FILE_BSD3CLAUSE=${WRKSRC_cereal}/LICENSE LICENSE_FILE_MIT= ${WRKSRC_GSL}/LICENSE LICENSE_FILE_ZLIB= ${WRKSRC_asmjit}/LICENSE.md -BROKEN_FreeBSD_10= libc++ does not support C++17 features - LIB_DEPENDS= libpng.so:graphics/png \ libavcodec.so:multimedia/ffmpeg diff --git a/emulators/virtualbox-ose-kmod/Makefile b/emulators/virtualbox-ose-kmod/Makefile index efb09ba46c5f..0ba2e3f892b0 100644 --- a/emulators/virtualbox-ose-kmod/Makefile +++ b/emulators/virtualbox-ose-kmod/Makefile @@ -76,11 +76,7 @@ KMK_ARCH= freebsd.${ARCH} .include <bsd.port.pre.mk> -.if ${OSREL:R} >= 11 SYMBOLSUFFIX= debug -.else -SYMBOLSUFFIX= symbols -.endif PLIST_SUB+= SYMBOLSUFFIX=${SYMBOLSUFFIX} post-patch: diff --git a/emulators/xen-kernel47/Makefile b/emulators/xen-kernel47/Makefile index 2ed1764f942a..b47849a759c7 100644 --- a/emulators/xen-kernel47/Makefile +++ b/emulators/xen-kernel47/Makefile @@ -101,10 +101,6 @@ EXTRA_PATCHES= ${FILESDIR}/0001-xen-logdirty-prevent-preemption-if-finished.patc IGNORE= only supported on FreeBSD .endif -.if ${OSVERSION} < 1100055 -IGNORE= only supported on recent FreeBSD 11 -.endif - pre-build: ${MAKE_CMD} -C ${WRKSRC}/xen defconfig ${MAKE_ARGS} # Enable hypervisor hot-patching. diff --git a/finance/quantlib/Makefile b/finance/quantlib/Makefile index d7b2b14b9a4d..c018152c83db 100644 --- a/finance/quantlib/Makefile +++ b/finance/quantlib/Makefile @@ -32,11 +32,6 @@ OPTIONS_DEFINE+=THREAD_SAFE_OBSERVER_PATTERN OPTIONS_DEFINE+=THREAD_SAFE_SINGLETON_INIT OPTIONS_DEFINE+=${OPTIONS_DEFAULT} -.if ${CC} == "cc" -# The base cc/c++ on FreeBSD-10 is too old for OpenMP. -OPTIONS_EXCLUDE_FreeBSD_10=OPENMP -.endif - BENCHMARK_DESC= Install benchmark (it is always built) EXTRA_SAFETY_CHECKS_DESC=Trade performance for run-time checks INDEXED_COUPONS_DESC= Use indexed rather than par coupons diff --git a/ftp/netdumpd/Makefile b/ftp/netdumpd/Makefile index c47f03eae376..bb2a8d224d90 100644 --- a/ftp/netdumpd/Makefile +++ b/ftp/netdumpd/Makefile @@ -12,7 +12,6 @@ COMMENT= UDP server capable of handling netdump transfers LICENSE= BSD2CLAUSE -IGNORE_FreeBSD_10= Depends on libcasper BROKEN_powerpc64= fails to build: netdumpd.c:270: warning: declaration of 'index' shadows a global declaration MAKE_ARGS+= BINDIR=${PREFIX}/sbin diff --git a/games/gzdoom/Makefile b/games/gzdoom/Makefile index 5694c8938c0b..22390a788954 100644 --- a/games/gzdoom/Makefile +++ b/games/gzdoom/Makefile @@ -43,16 +43,10 @@ PLIST_FILES= bin/${PORTNAME} \ .include "${.CURDIR}/../doom-data/Makefile.include" -.include <bsd.port.pre.mk> - -.if ${OPSYS} == "FreeBSD" && ${OSVERSION} < 1100000 && ${MACHINE_ARCH} == "i386" -STRIP= # 10.4/i386 strip(1) is incapable of stripping the gzdoom binary -.endif - do-install: ${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_PROGRAM} ${CONFIGURE_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${CONFIGURE_WRKSRC}/${PORTNAME}.pk3 ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.xpm ${STAGEDIR}${PREFIX}/share/pixmaps -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/games/supertux2/Makefile b/games/supertux2/Makefile index 6d83f2a7c6f0..439c91aa6b9a 100644 --- a/games/supertux2/Makefile +++ b/games/supertux2/Makefile @@ -15,8 +15,6 @@ LIB_DEPENDS= libphysfs.so:devel/physfs \ libcurl.so:ftp/curl \ libvorbis.so:audio/libvorbis -BROKEN_FreeBSD_10= does not build on 10.x - LLD_UNSAFE= yes USE_SDL= sdl2 image2 USE_GL= glew diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile index 127de90d90dc..996def3f8e75 100644 --- a/games/wesnoth/Makefile +++ b/games/wesnoth/Makefile @@ -15,7 +15,6 @@ LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_FreeBSD_10= fails to build with boost 1.66, see bug 224130 BROKEN_powerpc64= fails to link: schema_validator.cpp: undefined reference to boost::match_results LIB_DEPENDS= libfreetype.so:print/freetype2 \ diff --git a/graphics/blender-doc/Makefile b/graphics/blender-doc/Makefile index c44875c3e828..28e88e5d0326 100644 --- a/graphics/blender-doc/Makefile +++ b/graphics/blender-doc/Makefile @@ -17,15 +17,6 @@ NO_ARCH= yes SUB_FILES= pkg-message -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100077 -post-extract: -# chmod -R bug. -# Do not use "-exec ... +", because of the same bug, it will not work. - @${FIND} ${WRKSRC} -type d -exec ${CHMOD} 755 {} \; -.endif - pre-patch: @cd ${WRKSRC}/htmlI/PartAT/volumetrics/gfx/ && \ ${RM} -r "Nuova cartella" "Nuova cartella (2)" @@ -34,4 +25,4 @@ do-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} @cd ${WRKSRC} && ${COPYTREE_SHARE} "htmlI htmlII" ${STAGEDIR}${DOCSDIR}/ -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/cloudcompare/Makefile b/graphics/cloudcompare/Makefile index 689c838d4052..4cdaccddc402 100644 --- a/graphics/cloudcompare/Makefile +++ b/graphics/cloudcompare/Makefile @@ -13,7 +13,6 @@ COMMENT= 3D point cloud processing software LICENSE= GPLv2+ LGPL20+ LICENSE_COMB= multi -BROKEN_FreeBSD_10= error: "SSE instruction set not enabled" BROKEN_aarch64= fails to compile: mmintrin.h:47:5: use of undeclared identifier '__builtin_ia32_emms'; did you mean '__builtin_isless'? USES= cmake:outsource localbase:ldflags qt:5 diff --git a/graphics/drm-kmod/Makefile b/graphics/drm-kmod/Makefile index 7bbd2a0a162a..aec438abb4c3 100644 --- a/graphics/drm-kmod/Makefile +++ b/graphics/drm-kmod/Makefile @@ -22,9 +22,7 @@ RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-legacy-kmod IGNORE= legacy kmod not required on less than 12.0 .endif .else -.if ${OSVERSION} < 1101510 -IGNORE= not supported on 11.1 or older, no kernel support -.elif ${OSVERSION} >= 1101510 && ${OSVERSION} < 1200000 +.if ${OSVERSION} >= 1101510 && ${OSVERSION} < 1200000 RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-stable-kmod .elif ${OSVERSION} >= 1200000 && ${OSVERSION} < 1200045 IGNORE= not supported on older 12, no kernel support diff --git a/graphics/drm-next-kmod/Makefile b/graphics/drm-next-kmod/Makefile index 2295715fcaec..45439f30f314 100644 --- a/graphics/drm-next-kmod/Makefile +++ b/graphics/drm-next-kmod/Makefile @@ -29,9 +29,6 @@ GH_TAGNAME= b545cc4 .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1101511 -IGNORE= not supported on 11.1 or older, no kernel support -.endif .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200000 && ${OSVERSION} < 1200058 IGNORE= not supported on older CURRENT, no kernel support .endif diff --git a/graphics/drm-stable-kmod/Makefile b/graphics/drm-stable-kmod/Makefile index c07e23c549cc..d00b0a144c1e 100644 --- a/graphics/drm-stable-kmod/Makefile +++ b/graphics/drm-stable-kmod/Makefile @@ -29,9 +29,6 @@ GH_TAGNAME= ef4d156 .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1101510 -IGNORE= not supported on 11.1 or older, no kernel support -.endif .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200000 && ${OSVERSION} < 1200045 IGNORE= not supported on older CURRENT, no kernel support .endif diff --git a/graphics/dspdfviewer/Makefile b/graphics/dspdfviewer/Makefile index 463878caa679..5cc6d2fda15f 100644 --- a/graphics/dspdfviewer/Makefile +++ b/graphics/dspdfviewer/Makefile @@ -35,16 +35,12 @@ PLIST_FILES= bin/dspdfviewer \ # Build fails with LLVM 4.0. Reported upstream as #191: # https://github.com/dannyedel/dspdfviewer/issues/191 -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100511 CFLAGS+= -Wno-error=undefined-func-template -.endif .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200039 CFLAGS+= -Wno-error=zero-as-null-pointer-constant .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1102000 CFLAGS+= -Wno-error=redundant-parens -.endif .include <bsd.port.post.mk> diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile index bd7acc7e9bb4..f433491fb562 100644 --- a/graphics/giflib/Makefile +++ b/graphics/giflib/Makefile @@ -35,11 +35,7 @@ CONFIGURE_ENV+= have_xmlto=no .endif .if ${OPSYS} == FreeBSD -. if ${OSVERSION} >= 1100072 EXTRA_PATCHES= ${FILESDIR}/extra-patch-unbundle-reallocarray -. else -EXTRA_PATCHES= ${FILESDIR}/extra-patch-hide-reallocarray -. endif .elif ${OPSYS} == DragonFly EXTRA_PATCHES= ${FILESDIR}/extra-patch-hide-reallocarray-dfly .endif diff --git a/graphics/giflib/files/extra-patch-hide-reallocarray b/graphics/giflib/files/extra-patch-hide-reallocarray deleted file mode 100644 index 3329a623bc8a..000000000000 --- a/graphics/giflib/files/extra-patch-hide-reallocarray +++ /dev/null @@ -1,24 +0,0 @@ ---- lib/dgif_lib.c.orig 2016-04-02 15:34:00 UTC -+++ lib/dgif_lib.c -@@ -41,6 +41,9 @@ static int DGifDecompressInput(GifFileTy - static int DGifBufferedInput(GifFileType *GifFile, GifByteType *Buf, - GifByteType *NextByte); - -+extern void * -+reallocarray(void *optr, size_t nmemb, size_t size) __hidden; -+ - /****************************************************************************** - Open a new GIF file for read, given by its name. - Returns dynamically allocated GifFileType pointer which serves as the GIF ---- lib/gifalloc.c.orig 2015-07-13 04:05:46 UTC -+++ lib/gifalloc.c -@@ -12,6 +12,9 @@ - - #define MAX(x, y) (((x) > (y)) ? (x) : (y)) - -+extern void * -+reallocarray(void *optr, size_t nmemb, size_t size) __hidden; -+ - /****************************************************************************** - Miscellaneous utility functions - ******************************************************************************/ diff --git a/graphics/gimp-app/pkg-message b/graphics/gimp-app/pkg-message deleted file mode 100644 index b7f8044b0baa..000000000000 --- a/graphics/gimp-app/pkg-message +++ /dev/null @@ -1,7 +0,0 @@ -On FreeBSD 10.4 gimp can cause the following error. - -(script-fu:3985): LibGimp-ERROR **: shmat() failed: Invalid argument -Could not attach to gimp shared memory segment - -This can be fixed by setting kern.ipc.shm_allow_removed=1 in /etc/sysctl.conf. -FreeBSD 11.0-R and newer have this set by default. diff --git a/graphics/glfw/Makefile b/graphics/glfw/Makefile index 8acb17c219b9..ef623481efc4 100644 --- a/graphics/glfw/Makefile +++ b/graphics/glfw/Makefile @@ -26,7 +26,6 @@ OPTIONS_DEFAULT=X11 PLATFORM_DESC= Window creation platform OPTIONS_SINGLE= PLATFORM OPTIONS_SINGLE_PLATFORM= WAYLAND X11 -OPTIONS_EXCLUDE_FreeBSD_10= WAYLAND # needs dev/evdev/input.h WAYLAND_BUILD_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols WAYLAND_CMAKE_BOOL= GLFW_USE_WAYLAND diff --git a/graphics/gpu-firmware-kmod/Makefile b/graphics/gpu-firmware-kmod/Makefile index bb1c2839821b..f04ad21e313c 100644 --- a/graphics/gpu-firmware-kmod/Makefile +++ b/graphics/gpu-firmware-kmod/Makefile @@ -26,9 +26,6 @@ GH_TAGNAME= da173cc .include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1101510 -IGNORE= not supported on 11.1 or older, no kernel support -.endif .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200000 && ${OSVERSION} < 1200019 IGNORE= not supported on older CURRENT, no kernel support .endif diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile index 8c25d7021570..8e483d83ced3 100644 --- a/graphics/graphviz/Makefile +++ b/graphics/graphviz/Makefile @@ -255,10 +255,8 @@ post-patch: ${REINPLACE_CMD} -e 's|GTS_LIBS)|GTS_LIBS) $$(MATH_LIBS)|' \ ${WRKSRC}/cmd/smyrna/Makefile.in ${CP} ${WRKSRC}/lib/cgraph/cgraph.h ${WRKSRC}/plugin/ming/ -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100093 ${REINPLACE_CMD} -e 's|SF_FLAGS|SFIO_FLAGS|g' \ ${WRKSRC}/lib/sfio/*.[ch] -.endif post-patch-DOCS-off: ${REINPLACE_CMD} -e 's| install-txtDATA$$||' \ diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile index d6e186b98eb1..e3da32cf784b 100644 --- a/irc/irssi/Makefile +++ b/irc/irssi/Makefile @@ -20,9 +20,6 @@ USE_GNOME= glib20 OPTIONS_DEFINE= PERL PROXY SOCKS BOT DOCS TRUECOLOR CAPSICUM OPTIONS_DEFAULT= PERL CAPSICUM -# If we're on FreeBSD 10 don't offer the Capsicum option. -OPTIONS_EXCLUDE_FreeBSD_10= CAPSICUM - OPTIONS_SUB= yes SOCKS_DESC= Socks proxy support SOCKS_CONFIGURE_WITH= socks diff --git a/lang/crystal/Makefile b/lang/crystal/Makefile index 2c871f15e066..b0752f82822a 100644 --- a/lang/crystal/Makefile +++ b/lang/crystal/Makefile @@ -58,9 +58,6 @@ BOOTSTRAP_PATH= crystal-0.25.0-freebsd11.2 IGNORE= prebuilt bootstrap for aarch64 only exists for 12-CURRENT . endif .endif -.if ${OSVERSION} < 1100000 -IGNORE= not supported on 10.x or older -.endif .if ${OPSYS} != FreeBSD IGNORE= not supported on anything but FreeBSD .endif diff --git a/lang/erlang-runtime15/Makefile b/lang/erlang-runtime15/Makefile index 75733b12d329..0ded1face669 100644 --- a/lang/erlang-runtime15/Makefile +++ b/lang/erlang-runtime15/Makefile @@ -44,7 +44,6 @@ OPTIONS_EXCLUDE+= DTRACE .endif OPTIONS_EXCLUDE_DragonFly= HIPE SCTP -OPTIONS_EXCLUDE_FreeBSD_10= DTRACE GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib @@ -76,7 +75,7 @@ WX_VARS= USE_WX=2.8+ WX_COMPS="wx contrib" USE_GL="gl glu" .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1100000 +.if ${OPSYS} == FreeBSD CFLAGS+= -DMAP_NORESERVE=0 .endif diff --git a/lang/erlang-runtime16/Makefile b/lang/erlang-runtime16/Makefile index 239d9a28d501..07bb416b2c0c 100644 --- a/lang/erlang-runtime16/Makefile +++ b/lang/erlang-runtime16/Makefile @@ -44,7 +44,6 @@ OPTIONS_EXCLUDE+= DTRACE .endif OPTIONS_EXCLUDE_DragonFly= HIPE SCTP -OPTIONS_EXCLUDE_FreeBSD_10= DTRACE GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib @@ -76,7 +75,7 @@ WX_VARS= USE_WX=2.8+ WX_COMPS="wx contrib" USE_GL="gl glu" .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1100000 +.if ${OPSYS} == FreeBSD CFLAGS+= -DMAP_NORESERVE=0 .endif diff --git a/lang/erlang-runtime17/Makefile b/lang/erlang-runtime17/Makefile index 320c5cf60e11..4aefa6eb9dd7 100644 --- a/lang/erlang-runtime17/Makefile +++ b/lang/erlang-runtime17/Makefile @@ -58,7 +58,6 @@ OPTIONS_EXCLUDE+= DTRACE .endif OPTIONS_EXCLUDE_DragonFly= HIPE NATIVE SCTP -OPTIONS_EXCLUDE_FreeBSD_10= DTRACE # ld(1) fails to link probes: missing __dtrace_erlang___* symbols OPTIONS_EXCLUDE_aarch64= DTRACE OPTIONS_EXCLUDE_armv6= DTRACE @@ -99,7 +98,7 @@ WX_VARS= USE_WX=2.8+ WX_COMPS="wx contrib" USE_GL="gl glu" .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1100000 +.if ${OPSYS} == FreeBSD CFLAGS+= -DMAP_NORESERVE=0 .endif diff --git a/lang/erlang-runtime18/Makefile b/lang/erlang-runtime18/Makefile index f42a1fd6f6d3..f3bf66073c36 100644 --- a/lang/erlang-runtime18/Makefile +++ b/lang/erlang-runtime18/Makefile @@ -59,7 +59,6 @@ OPTIONS_EXCLUDE+= DTRACE .endif OPTIONS_EXCLUDE_DragonFly= HIPE NATIVE SCTP -OPTIONS_EXCLUDE_FreeBSD_10= DTRACE # ld(1) fails to link probes: missing __dtrace_erlang___* symbols OPTIONS_EXCLUDE_aarch64= DTRACE OPTIONS_EXCLUDE_armv6= DTRACE @@ -100,7 +99,7 @@ WX_VARS= USE_WX=2.8+ WX_COMPS="wx contrib" USE_GL="gl glu" .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1100000 +.if ${OPSYS} == FreeBSD CFLAGS+= -DMAP_NORESERVE=0 .endif diff --git a/lang/erlang-runtime19/Makefile b/lang/erlang-runtime19/Makefile index 40a214fe69a8..fd0f0498f4d5 100644 --- a/lang/erlang-runtime19/Makefile +++ b/lang/erlang-runtime19/Makefile @@ -62,7 +62,6 @@ OPTIONS_EXCLUDE+= DTRACE .endif OPTIONS_EXCLUDE_DragonFly= HIPE NATIVE SCTP -OPTIONS_EXCLUDE_FreeBSD_10= DTRACE # ld(1) fails to link probes: missing __dtrace_erlang___* symbols OPTIONS_EXCLUDE_aarch64= DTRACE OPTIONS_EXCLUDE_armv6= DTRACE @@ -103,7 +102,7 @@ WX_VARS= USE_WX=2.8+ WX_COMPS="wx contrib" USE_GL="gl glu" .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1100000 +.if ${OPSYS} == FreeBSD CFLAGS+= -DMAP_NORESERVE=0 .endif diff --git a/lang/erlang-runtime20/Makefile b/lang/erlang-runtime20/Makefile index 397c76509135..17198bf013b2 100644 --- a/lang/erlang-runtime20/Makefile +++ b/lang/erlang-runtime20/Makefile @@ -66,7 +66,6 @@ OPTIONS_EXCLUDE+= DTRACE # respectively)" you probably misconfigured DTrace in some way. OPTIONS_EXCLUDE_DragonFly= HIPE NATIVE SCTP -OPTIONS_EXCLUDE_FreeBSD_10= DTRACE # ld(1) fails to link probes: missing __dtrace_erlang___* symbols OPTIONS_EXCLUDE_aarch64= DTRACE OPTIONS_EXCLUDE_armv6= DTRACE @@ -103,7 +102,7 @@ WX_VARS= USE_WX=2.8+ WX_COMPS="wx contrib" USE_GL="gl glu" .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1100000 +.if ${OPSYS} == FreeBSD CFLAGS+= -DMAP_NORESERVE=0 .endif diff --git a/lang/erlang-runtime21/Makefile b/lang/erlang-runtime21/Makefile index 0c45d9fd7892..dc4610028e67 100644 --- a/lang/erlang-runtime21/Makefile +++ b/lang/erlang-runtime21/Makefile @@ -60,7 +60,6 @@ OPTIONS_EXCLUDE+= DTRACE # respectively)" you probably misconfigured DTrace in some way. OPTIONS_EXCLUDE_DragonFly= HIPE NATIVE SCTP -OPTIONS_EXCLUDE_FreeBSD_10= DTRACE # ld(1) fails to link probes: missing __dtrace_erlang___* symbols OPTIONS_EXCLUDE_aarch64= DTRACE OPTIONS_EXCLUDE_armv6= DTRACE @@ -97,7 +96,7 @@ WX_VARS= USE_WX=2.8+ WX_COMPS="wx contrib" USE_GL="gl glu" .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1100000 +.if ${OPSYS} == FreeBSD CFLAGS+= -DMAP_NORESERVE=0 .endif diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile index fd4fb5f10582..4a727d44ec97 100644 --- a/lang/erlang/Makefile +++ b/lang/erlang/Makefile @@ -62,7 +62,6 @@ OPTIONS_EXCLUDE+= DTRACE .endif OPTIONS_EXCLUDE_DragonFly= HIPE NATIVE SCTP -OPTIONS_EXCLUDE_FreeBSD_10= DTRACE # ld(1) fails to link probes: missing __dtrace_erlang___* symbols OPTIONS_EXCLUDE_aarch64= DTRACE OPTIONS_EXCLUDE_armv6= DTRACE @@ -112,7 +111,7 @@ MANPAGES_DISTFILES= ${ERLANG_MAN}:erlangorg .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1100000 +.if ${OPSYS} == FreeBSD CFLAGS+= -DMAP_NORESERVE=0 .endif diff --git a/lang/hla/Makefile b/lang/hla/Makefile index d99534352465..7340a026fa3a 100644 --- a/lang/hla/Makefile +++ b/lang/hla/Makefile @@ -39,11 +39,6 @@ post-extract: ${MKDIR} ${WRKDIR}/stdlib && \ ${TAR} -zxf ${_DISTDIR}/bsd.${PORTNAME}.tar.gz -C ${WRKDIR}/stdlib ${CP} ${_DISTDIR}/lex.yy.c ${WRKSRC} -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100077 -# chmod -R bug. -# Do not use "-exec ... +", because of the same bug, it will not work. - @${FIND} ${WRKDIR} -type d -exec ${CHMOD} 755 {} \; -.endif post-extract-TEST-on: ${CP} ${_DISTDIR}/hello.hla ${WRKSRC} diff --git a/lang/nyan/Makefile b/lang/nyan/Makefile index efdf56d8d620..6c34fcf1e6a3 100644 --- a/lang/nyan/Makefile +++ b/lang/nyan/Makefile @@ -11,8 +11,6 @@ COMMENT= Data description language designed for openage LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/legal/LGPLv3 -BROKEN_FreeBSD_10= conflicting types for '__hash_table<_Tp, _Hash, _Equal, _Alloc>' - USES= cmake:outsource compiler:c++17-lang USE_GITHUB= yes GH_ACCOUNT= SFTtech diff --git a/lang/perl5-devel/Makefile b/lang/perl5-devel/Makefile index 7d34d0a4bf31..7b80207c5ea4 100644 --- a/lang/perl5-devel/Makefile +++ b/lang/perl5-devel/Makefile @@ -41,7 +41,6 @@ OPTIONS_DEFINE= DEBUG GDBM PERL_64BITINT MULTIPLICITY SITECUSTOMIZE \ THREADS PERL_MALLOC DTRACE DOT_INC OPTIONS_DEFAULT= PERL_64BITINT THREADS MULTIPLICITY DTRACE -OPTIONS_EXCLUDE_FreeBSD_10= DTRACE .if !exists(/usr/sbin/dtrace) OPTIONS_EXCLUDE+= DTRACE .endif diff --git a/lang/perl5.24/Makefile b/lang/perl5.24/Makefile index 7171c7fc669c..7e04bf66a629 100644 --- a/lang/perl5.24/Makefile +++ b/lang/perl5.24/Makefile @@ -30,7 +30,6 @@ OPTIONS_RADIO= EXCLUSIVE OPTIONS_RADIO_EXCLUSIVE= THREADS PERL_MALLOC OPTIONS_DEFAULT= PERL_64BITINT THREADS PTHREAD MULTIPLICITY DTRACE -OPTIONS_EXCLUDE_FreeBSD_10= DTRACE .if !exists(/usr/sbin/dtrace) OPTIONS_EXCLUDE+= DTRACE .endif diff --git a/lang/perl5.28/Makefile b/lang/perl5.28/Makefile index f9ec600c153f..b0b6a965f820 100644 --- a/lang/perl5.28/Makefile +++ b/lang/perl5.28/Makefile @@ -28,7 +28,6 @@ OPTIONS_DEFINE= DEBUG GDBM PERL_64BITINT MULTIPLICITY SITECUSTOMIZE \ THREADS PERL_MALLOC DTRACE DOT_INC OPTIONS_DEFAULT= PERL_64BITINT THREADS MULTIPLICITY DTRACE -OPTIONS_EXCLUDE_FreeBSD_10= DTRACE .if !exists(/usr/sbin/dtrace) OPTIONS_EXCLUDE+= DTRACE .endif diff --git a/lang/pocl/Makefile b/lang/pocl/Makefile index 474bb7b02084..6088fb00ca98 100644 --- a/lang/pocl/Makefile +++ b/lang/pocl/Makefile @@ -12,7 +12,6 @@ COMMENT= POrtable Computing Language (POCL) LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_FreeBSD_10= pocl is not supported on 10.x ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= only tested on x86 diff --git a/lang/ponyc/Makefile b/lang/ponyc/Makefile index 417231ddeefe..6791bdf3c6c9 100644 --- a/lang/ponyc/Makefile +++ b/lang/ponyc/Makefile @@ -12,7 +12,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= aarch64 amd64 ONLY_FOR_ARCHS_REASON= Undefined reference to __atomic_compare_exchange_8 -BROKEN_FreeBSD_10= Undefined reference to __atomic_compare_exchange LIB_DEPENDS= libunwind.so:devel/libunwind BUILD_DEPENDS= llvm-link${LLVM_VERSION}:devel/llvm${LLVM_VERSION} diff --git a/lang/python27/Makefile b/lang/python27/Makefile index 77f7c361b7cd..6d55e55960b0 100644 --- a/lang/python27/Makefile +++ b/lang/python27/Makefile @@ -109,13 +109,6 @@ PLIST_SUB+= NO_NIS="" .endif post-patch: -# readline shared library is present on base before FreeBSD 11 - r268461 -# force setup.py ignore base and use readline from ports -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000 - @${REINPLACE_CMD} -e \ - "s|lib_dirs,\ \'readline\'|[\'${LOCALBASE}/lib\',\ \'.\'],\ \'readline\'|" \ - ${WRKSRC}/setup.py -.endif @${REINPLACE_CMD} -e 's|/usr/local/bin/python|${python_CMD}|' \ ${WRKSRC}/Lib/cgi.py @${REINPLACE_CMD} -e \ diff --git a/lang/python34/Makefile b/lang/python34/Makefile index 92e07f3f7964..02fb48cdea55 100644 --- a/lang/python34/Makefile +++ b/lang/python34/Makefile @@ -124,15 +124,6 @@ DISABLED_EXTENSIONS+= nis PLIST_SUB+= NO_NIS="" .endif -post-patch: -# readline shared library is present on base before FreeBSD 11 - r268461 -# force setup.py ignore base and use readline from ports -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000 - @${REINPLACE_CMD} -e \ - "s|lib_dirs,\ \'readline\'|[\'${LOCALBASE}/lib\',\ \'.\'],\ \'readline\'|" \ - ${WRKSRC}/setup.py -.endif - post-install: .if ! ${PORT_OPTIONS:MDEBUG} ${RM} ${STAGEDIR}${PREFIX}/lib/libpython3.so # Upstream Issue: https://bugs.python.org/issue17975 diff --git a/lang/python35/Makefile b/lang/python35/Makefile index 2fbbe445e0fc..f43f2643cf43 100644 --- a/lang/python35/Makefile +++ b/lang/python35/Makefile @@ -121,15 +121,6 @@ DISABLED_EXTENSIONS+= nis PLIST_SUB+= NO_NIS="" .endif -post-patch: -# readline shared library is present on base before FreeBSD 11 - r268461 -# force setup.py ignore base and use readline from ports -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000 - @${REINPLACE_CMD} -e \ - "s|lib_dirs,\ \'readline\'|[\'${LOCALBASE}/lib\',\ \'.\'],\ \'readline\'|" \ - ${WRKSRC}/setup.py -.endif - post-install: .if ! ${PORT_OPTIONS:MDEBUG} ${RM} ${STAGEDIR}${PREFIX}/lib/libpython3.so # Upstream Issue: https://bugs.python.org/issue17975 diff --git a/lang/python36/Makefile b/lang/python36/Makefile index 10276165c4cd..e4d9e671d219 100644 --- a/lang/python36/Makefile +++ b/lang/python36/Makefile @@ -117,15 +117,6 @@ DISABLED_EXTENSIONS+= nis PLIST_SUB+= NO_NIS="" .endif -post-patch: -# readline shared library is present on base before FreeBSD 11 - r268461 -# force setup.py ignore base and use readline from ports -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000 - @${REINPLACE_CMD} -e \ - "s|lib_dirs,\ \'readline\'|[\'${LOCALBASE}/lib\',\ \'.\'],\ \'readline\'|" \ - ${WRKSRC}/setup.py -.endif - post-install: .if ! ${PORT_OPTIONS:MDEBUG} ${RM} ${STAGEDIR}${PREFIX}/lib/libpython3.so # Upstream Issue: https://bugs.python.org/issue17975 diff --git a/lang/python37/Makefile b/lang/python37/Makefile index 6f4edb9816fb..fe87ffb87a4c 100644 --- a/lang/python37/Makefile +++ b/lang/python37/Makefile @@ -114,23 +114,6 @@ DISABLED_EXTENSIONS+= nis PLIST_SUB+= NO_NIS="" .endif -# python37 fails to build ssl module on FreeBSD10 with base SSL because X509_VERIFY_PARAM_set1_host check fails. -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000 && ${SSL_DEFAULT} == base -PLIST_SUB+= NO_SSL="@comment " -WARNING+= "No SSL support for FreeBSD ${OSREL} with base SSL! OpenSSL must be greater than/equal to 1.0.2" -.else -PLIST_SUB+= NO_SSL="" -.endif - -post-patch: -# readline shared library is present on base before FreeBSD 11 - r268461 -# force setup.py ignore base and use readline from ports -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000 - @${REINPLACE_CMD} -e \ - "s|lib_dirs,\ \'readline\'|[\'${LOCALBASE}/lib\',\ \'.\'],\ \'readline\'|" \ - ${WRKSRC}/setup.py -.endif - post-install: .if ! ${PORT_OPTIONS:MDEBUG} ${RM} ${STAGEDIR}${PREFIX}/lib/libpython3.so # Upstream Issue: https://bugs.python.org/issue17975 diff --git a/lang/python37/pkg-plist b/lang/python37/pkg-plist index cc2457f8c206..f8744da5baa7 100644 --- a/lang/python37/pkg-plist +++ b/lang/python37/pkg-plist @@ -2784,7 +2784,7 @@ lib/python%%XYDOT%%/lib-dynload/_sha256.so lib/python%%XYDOT%%/lib-dynload/_sha3.so lib/python%%XYDOT%%/lib-dynload/_sha512.so lib/python%%XYDOT%%/lib-dynload/_socket.so -%%NO_SSL%%lib/python%%XYDOT%%/lib-dynload/_ssl.so +lib/python%%XYDOT%%/lib-dynload/_ssl.so lib/python%%XYDOT%%/lib-dynload/_struct.so lib/python%%XYDOT%%/lib-dynload/_testbuffer.so lib/python%%XYDOT%%/lib-dynload/_testcapi.so diff --git a/lang/racket/Makefile b/lang/racket/Makefile index 536ba6a924ff..166557adfbb6 100644 --- a/lang/racket/Makefile +++ b/lang/racket/Makefile @@ -23,10 +23,7 @@ LIB_DEPENDS= libffi.so:devel/libffi \ libpng.so:graphics/png IGNORE_powerpc64= ./lightning/lightning.h:81:2: GNU lightning does not support the current target -BROKEN_FreeBSD_10_i386= segfaults during build -BROKEN_FreeBSD_11_i386= segfaults during build -BROKEN_FreeBSD_12_i386= segfaults during build -BROKEN_FreeBSD_13_i386= segfaults during build +BROKEN_i386= segfaults during build MAKE_JOBS_UNSAFE=yes diff --git a/lang/ruby23/Makefile b/lang/ruby23/Makefile index 6a20f1c39ea5..e3cfded2f93d 100644 --- a/lang/ruby23/Makefile +++ b/lang/ruby23/Makefile @@ -91,7 +91,7 @@ _SUF2= ,${PORTEPOCH} .endif .if ${OPSYS} == "FreeBSD" -.if exists(/usr/sbin/dtrace) && (${OSVERSION} > 1100032) && (${ARCH} == amd64 || ${ARCH} == i386) +.if exists(/usr/sbin/dtrace) && (${ARCH} == amd64 || ${ARCH} == i386) CONFIGURE_ARGS+=--enable-dtrace .else CONFIGURE_ARGS+=--disable-dtrace diff --git a/lang/ruby24/Makefile b/lang/ruby24/Makefile index a470e02e670e..2fcbd561b838 100644 --- a/lang/ruby24/Makefile +++ b/lang/ruby24/Makefile @@ -85,7 +85,7 @@ _SUF2= ,${PORTEPOCH} .endif .if ${OPSYS} == "FreeBSD" -.if exists(/usr/sbin/dtrace) && (${OSVERSION} > 1100032) && (${ARCH} == amd64 || ${ARCH} == i386) +.if exists(/usr/sbin/dtrace) && (${ARCH} == amd64 || ${ARCH} == i386) CONFIGURE_ARGS+=--enable-dtrace .else CONFIGURE_ARGS+=--disable-dtrace diff --git a/lang/ruby25/Makefile b/lang/ruby25/Makefile index d8a6ee890a31..b12812b22d01 100644 --- a/lang/ruby25/Makefile +++ b/lang/ruby25/Makefile @@ -85,7 +85,7 @@ _SUF2= ,${PORTEPOCH} .endif .if ${OPSYS} == "FreeBSD" -.if exists(/usr/sbin/dtrace) && (${OSVERSION} > 1100032) && (${ARCH} == amd64 || ${ARCH} == i386) +.if exists(/usr/sbin/dtrace) && (${ARCH} == amd64 || ${ARCH} == i386) CONFIGURE_ARGS+=--enable-dtrace .else CONFIGURE_ARGS+=--disable-dtrace diff --git a/lang/swift/Makefile b/lang/swift/Makefile index 5f5fc2c9c73e..c88a7baf9b2f 100644 --- a/lang/swift/Makefile +++ b/lang/swift/Makefile @@ -43,7 +43,6 @@ USES= autoreconf:build compiler:c++14-lang libtool localbase:ldflags iconv libe USE_GNOME= libxml2 USE_LDCONFIG= yes ONLY_FOR_ARCHS= amd64 -BROKEN_FreeBSD_10= Builds but does not work CONFLICTS_BUILD= googletest LDFLAGS+= -lobjc diff --git a/lang/tcl86/Makefile b/lang/tcl86/Makefile index a450be96de30..57bb0d2d0a68 100644 --- a/lang/tcl86/Makefile +++ b/lang/tcl86/Makefile @@ -30,8 +30,6 @@ OPTIONS_SUB= yes OPTIONS_EXCLUDE+= DTRACE .endif -OPTIONS_EXCLUDE_FreeBSD_10= DTRACE - PATCH_WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION} WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION}/unix diff --git a/lang/tcl87/Makefile b/lang/tcl87/Makefile index 288eb2fb808a..fe7f60bef5bd 100644 --- a/lang/tcl87/Makefile +++ b/lang/tcl87/Makefile @@ -31,8 +31,6 @@ USES= pathfix OPTIONS_EXCLUDE+= DTRACE .endif -OPTIONS_EXCLUDE_FreeBSD_10= DTRACE - PATCH_WRKSRC= ${WRKDIR}/${PORTNAME}${DISTVERSION} WRKSRC= ${PATCH_WRKSRC}/unix diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile index 131bcb60e967..a244c05ba566 100644 --- a/mail/bogofilter/Makefile +++ b/mail/bogofilter/Makefile @@ -12,9 +12,6 @@ COMMENT= Fast, teachable, learning spam detector LICENSE= GPLv2 -BROKEN_FreeBSD_10_armv6= fails to configure: Cannot open a shared environment in Berkeley DB -BROKEN_FreeBSD_10_armv7= fails to configure: Cannot open a shared environment in Berkeley DB - .if !defined(MASTERDIR) || ${MASTERDIR} == ${.CURDIR} # building master port USES+= bdb:5+ diff --git a/mail/dma/Makefile b/mail/dma/Makefile index b70393bfeb17..1db2da9f1eb1 100644 --- a/mail/dma/Makefile +++ b/mail/dma/Makefile @@ -36,14 +36,8 @@ EXTRA_PATCHES= ${FILESDIR}/fix-security-hole.patch:-p1 # Allow subports to extend. CONFFILES+= dma.conf auth.conf -.include <bsd.port.pre.mk> - # 11.x has dma imported into base and /var/spool/dma added to mtree -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100009 -PLIST_SUB+= VARDIR="" -.else PLIST_SUB+= VARDIR="@comment " -.endif post-patch: @${REINPLACE_CMD} -e 's,/etc/dma,${PREFIX}/etc/dma,g' \ @@ -59,4 +53,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/dma.conf ${STAGEDIR}${ETCDIR}/dma.conf.sample ${INSTALL_DATA} ${WRKSRC}/auth.conf ${STAGEDIR}${ETCDIR}/auth.conf.sample -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/mail/gotmail/Makefile b/mail/gotmail/Makefile index 08ebe6d0def2..ab9a7add9f5a 100644 --- a/mail/gotmail/Makefile +++ b/mail/gotmail/Makefile @@ -25,14 +25,6 @@ PLIST_FILES= bin/gotmail man/man1/gotmail.1.gz OPTIONS_DEFINE= DOCS -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100077 -# chmod -R bug -post-extract: - @${CHMOD} 755 ${WRKSRC} -.endif - do-install: ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.man \ ${STAGEDIR}${MANPREFIX}/man/man1/${PORTNAME}.1 @@ -44,4 +36,4 @@ do-install-DOCS-on: ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index c7fc8fb79283..24da29f68682 100644 --- a/mail/postfix-current/Makefile +++ b/mail/postfix-current/Makefile @@ -198,7 +198,7 @@ POSTFIX_AUXLIBS+= -L${BDB_LIB_DIR} -l${BDB_LIB_NAME} .endif .if ${PORT_OPTIONS:MBLACKLISTD} -. if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1100122) +. if ${OPSYS} == FreeBSD POSTFIX_AUXLIBS+= -lblacklist . else IGNORE= blacklistd is only supported on FreeBSD >= 11.0 diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index 1902a937e8e0..3542ad1a5721 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -198,7 +198,7 @@ POSTFIX_AUXLIBS+= -L${BDB_LIB_DIR} -l${BDB_LIB_NAME} .endif .if ${PORT_OPTIONS:MBLACKLISTD} -. if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1100122) +. if ${OPSYS} == FreeBSD POSTFIX_AUXLIBS+= -lblacklist . else IGNORE= blacklistd is only supported on FreeBSD >= 11.0 diff --git a/mail/rss2email2/Makefile b/mail/rss2email2/Makefile index 3e0ad821cf32..6297a503ace3 100644 --- a/mail/rss2email2/Makefile +++ b/mail/rss2email2/Makefile @@ -45,12 +45,4 @@ do-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/config.py.example ${STAGEDIR}${EXAMPLESDIR} -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100077 -# chmod -R bug. -post-extract: - @${CHMOD} 0755 ${WRKSRC} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile index e51a62507634..6230c962877b 100644 --- a/mail/sendmail/Makefile +++ b/mail/sendmail/Makefile @@ -49,7 +49,6 @@ OPTIONS_DEFINE?= SHMEM SEM LA NIS IPV6 TLS SASL SASLAUTHD LDAP BDB \ PICKY_HELO_CHECK MILTER DOCS OPTIONS_DEFAULT?= SHMEM SEM LA NIS TLS SASL SASLAUTHD BDB1 \ BLACKLISTD PICKY_HELO_CHECK MILTER -OPTIONS_EXCLUDE_FreeBSD_10= BLACKLISTD NO_OPTIONS_SORT=yes SHMEM_DESC= System V shared memory support LA_DESC= load averages support diff --git a/math/R/Makefile b/math/R/Makefile index e207a0fc1c76..1b481adf2e8a 100644 --- a/math/R/Makefile +++ b/math/R/Makefile @@ -12,7 +12,6 @@ COMMENT= Language for statistical computing and graphics LICENSE= GPLv2 -BROKEN_FreeBSD_10_armv6= Fails to build ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 LIB_DEPENDS= libcurl.so:ftp/curl \ diff --git a/math/adept/Makefile b/math/adept/Makefile index 9397a8d3d248..977b25945929 100644 --- a/math/adept/Makefile +++ b/math/adept/Makefile @@ -12,8 +12,6 @@ COMMENT= Combined array and automatic differentiation library in C++ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_FreeBSD_10_amd64= error: use of undeclared identifier '_mm_undefined_ps' - USES= autoreconf gmake fortran blaslapack:openblas libtool GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-static diff --git a/math/ambit/Makefile b/math/ambit/Makefile index 4b59a848d2eb..38e2556f00ed 100644 --- a/math/ambit/Makefile +++ b/math/ambit/Makefile @@ -27,14 +27,4 @@ CMAKE_ARGS+= -DSHARED_ONLY:BOOL=ON CMAKE_ARGS+= -DENABLE_OPENMP:BOOL=ON # bug#223678: find_package(OpenMP) doesn't find the openmp package CMAKE_ARGS+= -DENABLE_TESTS:BOOL=OFF # https://github.com/jturney/ambit/issues/24 -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000 -# It requires clang version >3.6 -BUILD_DEPENDS+= clang60:devel/llvm60 -RUN_DEPENDS+= clang60:devel/llvm60 -CC= clang60 -CXX= clang++60 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/math/eprover/Makefile b/math/eprover/Makefile index dc063ab9a05e..f76f5d8131b8 100644 --- a/math/eprover/Makefile +++ b/math/eprover/Makefile @@ -36,14 +36,4 @@ post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f} .endfor -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000 -# the default compiler hangs on 10 -BUILD_DEPENDS+= clang60:devel/llvm60 -RUN_DEPENDS+= clang60:devel/llvm60 -CC= clang60 -CXX= clang++60 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/math/libRmath/Makefile b/math/libRmath/Makefile index e83c2caf8838..d13ef1738544 100644 --- a/math/libRmath/Makefile +++ b/math/libRmath/Makefile @@ -13,7 +13,6 @@ COMMENT= Standalone math library from R LICENSE= GPLv2 -BROKEN_FreeBSD_10_armv6= Fails to build ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 LIB_DEPENDS= libcurl.so:ftp/curl \ diff --git a/math/libpgmath/Makefile b/math/libpgmath/Makefile index 173f06fbd6fe..977395637522 100644 --- a/math/libpgmath/Makefile +++ b/math/libpgmath/Makefile @@ -12,7 +12,6 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt ONLY_FOR_ARCHS= amd64 -IGNORE_FreeBSD_10= not supported on older than 12.0, no cpuid bit support IGNORE_FreeBSD_11= not supported on older than 12.0, no cpuid bit support BUILD_DEPENDS= llvm60>=0:devel/llvm60 diff --git a/math/maxima/Makefile b/math/maxima/Makefile index 0c6d8151c077..13e2c7158553 100644 --- a/math/maxima/Makefile +++ b/math/maxima/Makefile @@ -76,12 +76,6 @@ PLIST_SUB+= LISPBINARY="@comment " MAXIMABINARY= maxima_core .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000 -# The older makeinfo from the base fails in 10.3 -BUILD_DEPENDS+= ${LOCALBASE}/bin/makeinfo:print/texinfo -CONFIGURE_ENV+= MAKEINFO="${LOCALBASE}/bin/makeinfo" -.endif - post-patch: @${GREP} -Fe '.core' -l -r ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \ -e 's;\.core;_core;g' diff --git a/math/mkl-dnn/Makefile b/math/mkl-dnn/Makefile index c8cb3e6d1987..ec9de701e61f 100644 --- a/math/mkl-dnn/Makefile +++ b/math/mkl-dnn/Makefile @@ -11,7 +11,6 @@ COMMENT= Intel(R) Math Kernel Library for Deep Neural Networks LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_FreeBSD_10= invalid value 'internal' in '-fvisibility internal' BROKEN_i386= error: shift count >= width of type (and other errors), see https://github.com/intel/mkl-dnn/issues/315 TEST_DEPENDS= bash:shells/bash diff --git a/math/opensolaris-libm/Makefile b/math/opensolaris-libm/Makefile index ea0ec2126985..7749ced82dfc 100644 --- a/math/opensolaris-libm/Makefile +++ b/math/opensolaris-libm/Makefile @@ -34,7 +34,6 @@ MAKE_ENV= ARCH=${ARCH} USE_ASSEMBLY_VERSIONS=yes # proper functioning. OPTIONS_DEFINE= GCC -OPTIONS_EXCLUDE_FreeBSD_10= GCC OPTIONS_EXCLUDE_DragonFly= GCC GCC_USE= GCC=yes @@ -42,10 +41,6 @@ GCC_USE= GCC=yes .include <bsd.port.options.mk> .if ${OPSYS} == FreeBSD -. if ${OSREL:R} < 11 -USE_GCC= yes -. endif - RUN_DEPENDS= ${LOCALBASE}/bin/addr2line:devel/binutils post-patch: diff --git a/math/sleef/Makefile b/math/sleef/Makefile index a29a55b0a43f..c51c8d49e5d7 100644 --- a/math/sleef/Makefile +++ b/math/sleef/Makefile @@ -12,8 +12,6 @@ COMMENT= SIMD Library for Evaluating Elementary Functions, vectorized libm LICENSE= BSL LICENSE_FILE= ${WRKSRC}/LICENSE.txt -IGNORE_FreeBSD_10= base compiler too old - USES= cmake:outsource compiler:c11 USE_LDCONFIG= yes diff --git a/misc/rump/Makefile b/misc/rump/Makefile index c6cd4bcc7b39..58fb35664f90 100644 --- a/misc/rump/Makefile +++ b/misc/rump/Makefile @@ -29,9 +29,7 @@ PLIST_SUB+= X8664="" PLIST_SUB+= X8664="@comment " .endif -.if ${OSVERSION} >= 1100508 CFLAGS+= -Wno-address-of-packed-member -.endif do-build: cd ${WRKSRC}; ${SETENV} CC=${CC} AR=${AR} NM=${NM} OBJCOPY=${OBJCOPY} ./buildrump.sh -F CFLAGS="${CFLAGS}" -r fullbuild diff --git a/multimedia/kodi-devel/Makefile b/multimedia/kodi-devel/Makefile index f63d98a9c8d5..9ad6ecb7e01d 100644 --- a/multimedia/kodi-devel/Makefile +++ b/multimedia/kodi-devel/Makefile @@ -86,7 +86,6 @@ OPTIONS_SINGLE= PLATFORM OPTIONS_SINGLE_PLATFORM= GBM RPI WAYLAND X11 OPTIONS_EXCLUDE_amd64= RPI OPTIONS_EXCLUDE_i386= RPI -OPTIONS_EXCLUDE_FreeBSD_10= GBM WAYLAND OPTIONS_SUB= yes OPTIONS_GROUP= SOUND diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile index abbda4d68c95..b14250f2412e 100644 --- a/multimedia/totem/Makefile +++ b/multimedia/totem/Makefile @@ -59,7 +59,7 @@ MAKE_JOBS_UNSAFE=yes .include <bsd.port.options.mk> -.if ${ARCH} == i386 || ${OSVERSION} <= 1100000 +.if ${ARCH} == i386 MESON_ARGS= -Denable-vala=no PLIST_SUB+= VALA="@comment " .else diff --git a/net-im/skype-devel/pkg-message b/net-im/skype-devel/pkg-message index 0d32f6f9c488..28a087d97b8b 100644 --- a/net-im/skype-devel/pkg-message +++ b/net-im/skype-devel/pkg-message @@ -1,22 +1,9 @@ ******************************************************************************* In the current version, video doesn't work. The instructions below are left in -for completness. +for completeness. ******************************************************************************* -1. Minimum OS version. - -Skype is a Linux binary package that we run on FreeBSD via our Linux compat. -In order for Skype to work OK, you need your kernel and modules to be: -- post 2011-05-03 in on HEAD -- post 2011-05-08 in on 7,8-STABLE -The port tries to check for this, but there is a smaller or bigger interval for -which this can't be done automatically. So in case of any trouble please make -sure you run kernel/modules built from sources after above dates. -Tests were only done on HEAD and 8-STALBE with linux-fc10, and I don't think it -can work with fc4. - - -2. Sound +1. Sound Since the OSS interface was removed, Skype now uses linux-alsa compat packages. By default you get one device corresponding to your default OSS dsp device (so @@ -46,13 +33,13 @@ ctl.oss1 { } -3. Video +2. Video -3.1. Receiving video +2.1. Receiving video Should work out of the box. Please make sure you have Options --> Video Devices --> Enable Skype Video checked. -3.2. Sending video +2.2. Sending video Skype uses /dev/videoX (usually /dev/video0). This device node is created by the drivers for your webcam (eg. multimedia/webcamd). If you selected the VIDEO option (default) multimedia/webcamd will be pulled in. @@ -68,26 +55,26 @@ To make it permanent you can: # echo 'linux_v4l2wrapper_load="YES"' >> /boot/loader.conf -4. SMSes +3. SMSes You can send SMSes with this version (provided you have Skype credit, of course). Check Options --> SMS for details. -5. Screen sharing +4. Screen sharing You should be able to receive and send. Please make sure you have Options --> Video Devices --> Enable Skype Video checked to use this feature (yes, even if you don't use video). -6. Skype Access +5. Skype Access Doesn't work and it is likely not very probable it will ever work since it uses a lot of Linux-specific things. -7. Problems and bug reports +6. Problems and bug reports First of all, please understand that this is a closed, binary Linux application that makes use for some more-or-less cutting edge Linux features/interfaces, diff --git a/net-im/skype4/pkg-message b/net-im/skype4/pkg-message index f9f6db4d536f..ac09bc0287dd 100644 --- a/net-im/skype4/pkg-message +++ b/net-im/skype4/pkg-message @@ -1,21 +1,4 @@ -1. Minimum OS version. -====================== - -Skype is a Linux binary package that we run on FreeBSD via our Linux compat. - -In order for Skype to work at all, you need to be running FreeBSD 11.0-CURRENT with -a Kernel and modules later than 2015-05-24. - -The port tries to check for this, and determines your kernel's osversion. -Chances are, if your kernel isn't new enough, the installation will fail. - -So in case of any trouble please make -sure you run kernel/modules built from sources after above dates. -Tests were only done on HEAD with linux CentOS 6, and it's certainly broken -with Fedora 10 (legacy). - - -2. Sound +1. Sound ======== Since the OSS interface was removed, Skype now uses linux-pulseaudio compat packages. @@ -30,15 +13,15 @@ Chances are, if you want to use Skype 4.3 *and* something that actually requires (Linux) PulseAudio, you'll be better off running Linux natively. -3. Video +2. Video ======== -3.1. Receiving video +2.1. Receiving video -------------------- Should work out of the box. Please make sure you have Options --> Video Devices --> Enable Skype Video checked. -3.2. Sending video +2.2. Sending video ------------------ Skype uses /dev/videoX (usually /dev/video0). This device node is created by the drivers for your webcam (eg. multimedia/webcamd). If you selected the VIDEO @@ -56,28 +39,28 @@ To make it permanent you can: # echo 'linux_v4l2wrapper_load="YES"' >> /boot/loader.conf -4. SMSes +3. SMSes ======== You can send SMSes with this version (provided you have Skype credit, of course). Check Options --> SMS for details. -5. Screen sharing +4. Screen sharing ================= You should be able to receive and send once you have enabled Skype Video (check -§3) +§2) -6. Skype Access +5. Skype Access =============== Doesn't work and it is likely not very probable it will ever work since it uses a lot of Linux-specific things. -7. Troubleshooting +6. Troubleshooting ================== If Skype coredumps after displaying a (grey) About screen, you need to mount @@ -91,7 +74,7 @@ This should work: linprocfs /compat/linux/proc linprocfs rw,late 0 0 -8. Problems and bug reports +7. Problems and bug reports =========================== First of all, please understand that this is a closed, binary Linux application diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile index 103b83d550ec..43be0e3af18c 100644 --- a/net-im/telegram-desktop/Makefile +++ b/net-im/telegram-desktop/Makefile @@ -65,21 +65,6 @@ GYP_DEFINES:= ${GYP_DEFINES},TDESKTOP_DISABLE_GTK_INTEGRATION .include <bsd.port.pre.mk> -# This port needs C++17 libs/compiler. -# Currently, this is not supported by USES=compiler -# Using clang does not work: libc++ in base does not support C++17. -# Using gcc does not work: using both libc++ and libstdc++ causes crashes. -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000 -IGNORE= need C++17 support in compiler and runtime -.endif - -# Since 1.3.14, the clang compiler provided in 11.1 (4.0.0) gets a segmentation -# fault. -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1102000 -CXXFLAGS+= -DGSL_USE_STD_BYTE=0 -QMAKE_COMPILER= clang -.endif - post-patch: @cd ${WRKSRC} && \ (${SED} -e " \ diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile index 6a338e6fbd92..c2c2f25d897d 100644 --- a/net-mgmt/net-snmp/Makefile +++ b/net-mgmt/net-snmp/Makefile @@ -165,11 +165,7 @@ NET_SNMP_LOGFILE?= /var/log/snmpd.log NET_SNMP_PERSISTENTDIR?=/var/net-snmp NET_SNMP_WITH_MIB_MODULE_LIST+= host disman/event-mib mibII/mta_sendmail mibII/tcpTable ucd-snmp/diskio sctp-mib -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100062 -CFLAGS+= -D_WANT_IFADDR -.endif - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100062 +.if ${OPSYS} == FreeBSD NET_SNMP_WITHOUT_MIB_MODULE_LIST+= mibII/ipv6 .endif diff --git a/net-mgmt/seafile-client/Makefile b/net-mgmt/seafile-client/Makefile index d6b71b033a4f..c106ea54e7d2 100644 --- a/net-mgmt/seafile-client/Makefile +++ b/net-mgmt/seafile-client/Makefile @@ -46,13 +46,9 @@ OPTIONS_DEFINE= NLS NLS_USES= gettext -.include <bsd.port.options.mk> - post-patch: # Fix P_KTHREAD r295435 -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100097 ${REINPLACE_CMD} 's/P_KTHREAD/P_KPROC/' ${WRKSRC}/lib/utils.c -.endif makesum-all: .for PORT in net-mgmt/ccnet-client net-mgmt/seafile-client net-mgmt/seafile-gui diff --git a/net-mgmt/seafile-server/Makefile b/net-mgmt/seafile-server/Makefile index ba5bc0604210..60a6c63c5ae5 100644 --- a/net-mgmt/seafile-server/Makefile +++ b/net-mgmt/seafile-server/Makefile @@ -61,13 +61,9 @@ FUSE_LIB_DEPENDS= libfuse.so:sysutils/fusefs-libs NLS_USES= gettext -.include <bsd.port.options.mk> - post-patch: # Fix P_KTHREAD r295435 -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100097 ${REINPLACE_CMD} 's/P_KTHREAD/P_KPROC/' ${WRKSRC}/lib/utils.c -.endif ${REINPLACE_CMD} 's/python/${PYTHON_VERSION}/' \ ${WRKSRC}/scripts/upgrade/regenerate_secret_key.sh ${REINPLACE_CMD} -e 's|^INSTALL.*|INSTALLPATH="${PREFIX}/${SEAFILE_SERVER}/seafile"|' \ diff --git a/net-p2p/bitcoin/Makefile b/net-p2p/bitcoin/Makefile index 72412e73e069..7800c2df8180 100644 --- a/net-p2p/bitcoin/Makefile +++ b/net-p2p/bitcoin/Makefile @@ -113,10 +113,6 @@ CPPFLAGS+= -I${BDB_INCLUDE_DIR} LIBS+= -L${BDB_LIB_DIR} .endif -.if ${OSVERSION} < 1100000 -CONFIGURE_ARGS+=--disable-asm -.endif - .if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no" post-install: diff --git a/net-p2p/litecoin/Makefile b/net-p2p/litecoin/Makefile index a198f1ef9d3f..4b11ac72dbef 100644 --- a/net-p2p/litecoin/Makefile +++ b/net-p2p/litecoin/Makefile @@ -97,12 +97,6 @@ PLIST_FILES?= bin/litecoin-qt man/man1/litecoin-qt.1.gz \ .include <bsd.port.pre.mk> -.if ${OSVERSION} < 1100000 -EXTRA_PATCHES= ${FILESDIR}/extra-patch-src_crypto_scrypt.cpp \ - ${FILESDIR}/extra-patch-src_crypto_scrypt.h -CONFIGURE_ARGS+=--disable-asm -.endif - .if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no" post-patch: diff --git a/net-p2p/litecoin/files/extra-patch-src_crypto_scrypt.cpp b/net-p2p/litecoin/files/extra-patch-src_crypto_scrypt.cpp deleted file mode 100644 index 513d19e8b866..000000000000 --- a/net-p2p/litecoin/files/extra-patch-src_crypto_scrypt.cpp +++ /dev/null @@ -1,35 +0,0 @@ ---- src/crypto/scrypt.cpp.orig 2018-02-26 19:37:55.000000000 -0500 -+++ src/crypto/scrypt.cpp 2018-05-23 11:25:45.718849000 -0400 -@@ -32,6 +32,7 @@ - #include <stdlib.h> - #include <stdint.h> - #include <string.h> -+#include <sys/endian.h> - #include <openssl/sha.h> - - #if defined(USE_SSE2) && !defined(USE_SSE2_ALWAYS) -@@ -42,24 +43,6 @@ - // GCC Linux or i686-w64-mingw32 - #include <cpuid.h> - #endif --#endif --#ifndef __FreeBSD__ --static inline uint32_t be32dec(const void *pp) --{ -- const uint8_t *p = (uint8_t const *)pp; -- return ((uint32_t)(p[3]) + ((uint32_t)(p[2]) << 8) + -- ((uint32_t)(p[1]) << 16) + ((uint32_t)(p[0]) << 24)); --} -- --static inline void be32enc(void *pp, uint32_t x) --{ -- uint8_t *p = (uint8_t *)pp; -- p[3] = x & 0xff; -- p[2] = (x >> 8) & 0xff; -- p[1] = (x >> 16) & 0xff; -- p[0] = (x >> 24) & 0xff; --} -- - #endif - typedef struct HMAC_SHA256Context { - SHA256_CTX ictx; diff --git a/net-p2p/litecoin/files/extra-patch-src_crypto_scrypt.h b/net-p2p/litecoin/files/extra-patch-src_crypto_scrypt.h deleted file mode 100644 index 80a204515069..000000000000 --- a/net-p2p/litecoin/files/extra-patch-src_crypto_scrypt.h +++ /dev/null @@ -1,24 +0,0 @@ ---- src/crypto/scrypt.h.orig 2018-05-23 11:31:01.662350000 -0400 -+++ src/crypto/scrypt.h 2018-05-23 11:31:25.771775000 -0400 -@@ -28,21 +28,4 @@ void - PBKDF2_SHA256(const uint8_t *passwd, size_t passwdlen, const uint8_t *salt, - size_t saltlen, uint64_t c, uint8_t *buf, size_t dkLen); - --#ifndef __FreeBSD__ --static inline uint32_t le32dec(const void *pp) --{ -- const uint8_t *p = (uint8_t const *)pp; -- return ((uint32_t)(p[0]) + ((uint32_t)(p[1]) << 8) + -- ((uint32_t)(p[2]) << 16) + ((uint32_t)(p[3]) << 24)); --} -- --static inline void le32enc(void *pp, uint32_t x) --{ -- uint8_t *p = (uint8_t *)pp; -- p[0] = x & 0xff; -- p[1] = (x >> 8) & 0xff; -- p[2] = (x >> 16) & 0xff; -- p[3] = (x >> 24) & 0xff; --} --#endif - #endif diff --git a/net-p2p/qbittorrent/Makefile b/net-p2p/qbittorrent/Makefile index 37add2203667..4875d0d4c0ad 100644 --- a/net-p2p/qbittorrent/Makefile +++ b/net-p2p/qbittorrent/Makefile @@ -13,8 +13,6 @@ COMMENT= Bittorrent client using Qt4/5 and libtorrent-rasterbar LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_FreeBSD_10= error: no matching constructor for initialization of 'const QString' - LIB_DEPENDS= libtorrent-rasterbar.so:net-p2p/libtorrent-rasterbar \ libboost_system.so:devel/boost-libs diff --git a/net/ceph/Makefile b/net/ceph/Makefile index 3e2d4a7904c8..022f94380986 100644 --- a/net/ceph/Makefile +++ b/net/ceph/Makefile @@ -15,7 +15,6 @@ LICENSE_COMB= dual # even though i386 will build, it is not really advised. ONLY_FOR_ARCHS= amd64 -IGNORE_FreeBSD_10= Does not build for FreeBSD 10.x BUILD_DEPENDS= \ yasm:devel/yasm \ diff --git a/net/cjdns/Makefile b/net/cjdns/Makefile index d0cc198fb72d..b51bcfe4716e 100644 --- a/net/cjdns/Makefile +++ b/net/cjdns/Makefile @@ -12,7 +12,6 @@ COMMENT= Routing engine designed for security, scalability, speed LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_FreeBSD_10_i386= fails CC_OUTPUT_921dbbb2_65ad290d=error: invalid value 'c++14' in '-std=c++14' yes BROKEN_armv6= fails to build: Killing runaway build after 21600 seconds with no output BROKEN_armv7= fails to build: Killing runaway build after 21600 seconds with no output diff --git a/net/flower/Makefile b/net/flower/Makefile index aa19c99a5552..caf9e7e0ea72 100644 --- a/net/flower/Makefile +++ b/net/flower/Makefile @@ -21,14 +21,8 @@ GH_ACCOUNT= NuxiNL CFLAGS+= -I${LOCALBASE}/include/jsoncpp -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100511 -IGNORE= requires various C++17 features -.endif - # Require the unit tests to pass prior to installing. post-build: @trap '' PIPE && ${WRKSRC}/flower_unittests -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/freebsd-uucp/Makefile b/net/freebsd-uucp/Makefile index 525ef68a51cd..f66692219243 100644 --- a/net/freebsd-uucp/Makefile +++ b/net/freebsd-uucp/Makefile @@ -41,7 +41,7 @@ VAR_LOG_DESC= put logfiles into /var/log .if ${PORT_OPTIONS:MPAM} PAM_SUFFIX= -pam MAKE_ENV+= WITH_PAM=${WITH_PAM} -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 110000 +.if ${OPSYS} == FreeBSD MAKE_ENV+= MINUSLPAM=-lpam .endif .endif diff --git a/net/freerdp/Makefile b/net/freerdp/Makefile index 14d391c9b586..7ee0237b6d7b 100644 --- a/net/freerdp/Makefile +++ b/net/freerdp/Makefile @@ -89,8 +89,7 @@ X11_USE= xorg=x11,xcursor,xext,xorgproto,xfixes,xi,xinerama,xkbfile,xrandr,xren .include <bsd.port.pre.mk> .if ${OPSYS} == "FreeBSD" && ${ARCH} == "armv6" -.if ${OSVERSION} < 1100500 || \ - (${OSVERSION} >= 1100500 && ${OSVERSION} < 1100504) || \ +.if ${OSVERSION} < 1100504 || \ (${OSVERSION} >= 1200000 && ${OSVERSION} < 1200008) BROKEN= Fails to build on ARMv6 (libm bug). See: r305380 (HEAD), r305971 (stable/11) [\#199422, \#211965] \ Please update to a later (fixed) version. diff --git a/net/freerdp1/Makefile b/net/freerdp1/Makefile index 4c2778406ba0..13005e06b307 100644 --- a/net/freerdp1/Makefile +++ b/net/freerdp1/Makefile @@ -73,8 +73,7 @@ X11_USE= xorg=x11,xkbfile,xcursor,xorgproto,xv,xinerama,xext,xrandr,xi,xfixes,x .include <bsd.port.pre.mk> .if ${OPSYS} == FreeBSD && (${ARCH} == armv6 || ${ARCH} == armv7) -.if ${OSVERSION} < 1100500 || \ - (${OSVERSION} >= 1100500 && ${OSVERSION} < 1100504) || \ +.if ${OSVERSION} < 1100504 || \ (${OSVERSION} >= 1200000 && ${OSVERSION} < 1200008) BROKEN= Fails to build on ARMv6/7 (libm bug). See: r305380 (HEAD), r305971 (stable/11) [\#199422, \#211965] \ Please update to a later (fixed) version. diff --git a/net/glusterfs/Makefile b/net/glusterfs/Makefile index 50684e57e94f..3eb7a5a52d5e 100644 --- a/net/glusterfs/Makefile +++ b/net/glusterfs/Makefile @@ -57,10 +57,4 @@ KMODDIR?= /boot/modules OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1101001 -USE_GCC= yes -.endif - .include <bsd.port.mk> diff --git a/net/hping/Makefile b/net/hping/Makefile index 53d19c6e606f..d557354a5b4f 100644 --- a/net/hping/Makefile +++ b/net/hping/Makefile @@ -29,11 +29,7 @@ PORTDOCS= AS-BACKDOOR HPING2-HOWTO.txt HPING2-IS-OPEN \ OPTIONS_DEFINE= DOCS -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100030 EXTRA_PATCHES= ${FILESDIR}/extra-patch-sendip.c -.endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/hping2 ${STAGEDIR}${PREFIX}/sbin/hping @@ -44,4 +40,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/docs/${i} ${STAGEDIR}${DOCSDIR} .endfor -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/intel-ixl-kmod/Makefile b/net/intel-ixl-kmod/Makefile index 7bec5311b9e9..5ffd69888fd0 100644 --- a/net/intel-ixl-kmod/Makefile +++ b/net/intel-ixl-kmod/Makefile @@ -55,7 +55,7 @@ ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= Not supported on other architectures, amd64 only. .endif -.if ${PORT_OPTIONS:MNETMAP_AUTO} && ${OSVERSION} >= 1100000 && ${OSVERSION} <= ${MAX_NETMAP_OSVERSION} +.if ${PORT_OPTIONS:MNETMAP_AUTO} && ${OSVERSION} <= ${MAX_NETMAP_OSVERSION} CFLAGS+= -DDEV_NETMAP .endif diff --git a/net/libnet/Makefile b/net/libnet/Makefile index d100afc9ffb0..7812159dbd04 100644 --- a/net/libnet/Makefile +++ b/net/libnet/Makefile @@ -46,10 +46,6 @@ post-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/ ${INSTALL_DATA} ${WRKSRC}/sample/*.c ${STAGEDIR}${EXAMPLESDIR}/ -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100030 EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-configure -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/nss-pam-ldapd/files/pkg-message.in b/net/nss-pam-ldapd/files/pkg-message.in index 68e00e60f396..8a60fbe3ac54 100644 --- a/net/nss-pam-ldapd/files/pkg-message.in +++ b/net/nss-pam-ldapd/files/pkg-message.in @@ -15,7 +15,5 @@ To start nslcd add nslcd_enable="YES" to /etc/rc.conf and run: If you also want to supervise the nslcd daemon add nslcd_supervisor="YES" to rc.conf as well. -NOTE: supervision requires FreeBSD 8.4, 9.1 or greater. - See the comments in %%PREFIX%%/etc/rc.d/nslcd for additional tunables. ===================================================================== diff --git a/net/ntraceroute/Makefile b/net/ntraceroute/Makefile index 276b133d45db..5016b1b9d6a3 100644 --- a/net/ntraceroute/Makefile +++ b/net/ntraceroute/Makefile @@ -21,11 +21,7 @@ EXTRACT_AFTER_ARGS= . PLIST_FILES= sbin/${PORTNAME} -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100030 BUILD_FLAGS= -DBYTESWAP_IP_FLAGS -DBYTESWAP_IP_LEN -.endif do-build: ${CC} ${BUILD_FLAGS} -o ${WRKSRC}/${PORTNAME} -lm \ @@ -34,4 +30,4 @@ do-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/openafs/Makefile b/net/openafs/Makefile index fea2470dbc6b..766fbac4cd42 100644 --- a/net/openafs/Makefile +++ b/net/openafs/Makefile @@ -79,52 +79,10 @@ FUSE_CONFIGURE_OFF= --disable-fuse-client CFLAGS+= -mstackrealign .endif -.if ${OSREL:R} >= 11 # Upstream does not support the client on 11 and newer CONFIGURE_ARGS += --disable-kernel-module -PLIST_SUB+= KMOD="@comment " post-install: @${RMDIR} ${STAGEDIR}${PREFIX}/lib/openafs -.else -CONFIGURE_ARGS += --enable-kernel-module -PLIST_SUB+= KMOD= -USE_RC_SUBR+= afsd - -KERNCONF?= GENERIC -KERNCONFDIR?= ${SRC_BASE}/sys/${ARCH}/conf - -# Use the first component of ${KERNCONF}. -.for K in ${KERNCONF} -_KERNCONF?=$K -.endfor - -.if !exists(${KERNCONFDIR}/${_KERNCONF}) -IGNORE= requires kernel configuration file ${_KERNCONF} to build -.endif - -# Do not show users the reminder about cleandepend and depend -post-extract: - ${MKDIR} ${WRKDIR}/conf - cd ${KERNCONFDIR} && \ - /usr/sbin/config -d ${WRKDIR}/conf ${_KERNCONF} >/dev/null - -create-sample-files: - @${ECHO_CMD} openafs.org > ${WRKDIR}/ThisCell - @${ECHO_CMD} "${AFSMNTDIR}:${AFSCACHEDIR}:150000" > ${WRKDIR}/cacheinfo - ${INSTALL_DATA} ${DISTDIR}/CellServDB.${DBVERSION} ${WRKDIR}/CellServDB - -post-install: create-sample-files - @${MKDIR} ${STAGEDIR}${ETCDIR} -.for F in CellServDB ThisCell cacheinfo - ${INSTALL_DATA} ${WRKDIR}/${F} ${STAGEDIR}${ETCDIR}/${F}.sample -.endfor - ${INSTALL_KLD} ${STAGEDIR}${PREFIX}/lib/openafs/libafs.ko \ - ${STAGEDIR}${KMODDIR} - @${RM} ${STAGEDIR}${PREFIX}/lib/openafs/libafs.ko - @${RMDIR} ${STAGEDIR}${PREFIX}/lib/openafs - @${MKDIR} ${STAGEDIR}${AFSMNTDIR} \ - ${STAGEDIR}${AFSSTATEDIR} ${STAGEDIR}${AFSCACHEDIR} -.endif # ${OSREL} blacklist .include <bsd.port.post.mk> diff --git a/net/openafs/pkg-plist b/net/openafs/pkg-plist index 6d62af54c438..0c133b493891 100644 --- a/net/openafs/pkg-plist +++ b/net/openafs/pkg-plist @@ -23,9 +23,6 @@ bin/unlog bin/up bin/xstat_cm_test bin/xstat_fs_test -%%KMOD%%@sample etc/openafs/CellServDB.sample -%%KMOD%%@sample etc/openafs/ThisCell.sample -%%KMOD%%@sample etc/openafs/cacheinfo.sample include/openafs/afs/acl.h include/openafs/afs/afs.h include/openafs/afs/afs_args.h @@ -574,7 +571,3 @@ sbin/vsys %%DATADIR%%/C/afszcm.cat %%FUSE%%man/man8/afsd.fuse.8.gz %%FUSE%%sbin/afsd.fuse -%%KMOD%%/%%KMODDIR%%/libafs.ko -%%KMOD%%@dir /%%AFSCACHEDIR%% -%%KMOD%%@dir /%%AFSMNTDIR%% -%%KMOD%%@dir /%%AFSSTATEDIR%% diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile index 8793abeba060..8edc11c8ef60 100644 --- a/net/openldap24-server/Makefile +++ b/net/openldap24-server/Makefile @@ -202,10 +202,6 @@ CONFIGURE_ARGS= --with-threads=posix \ --disable-dependency-tracking \ --enable-dynamic -.if ${OSVERSION} < 1101000 -CFLAGS+= -DMDB_DSYNC=O_SYNC -Dfdatasync=fsync -.endif - .if ${PORT_OPTIONS:MSASL} LIB_DEPENDS+= libsasl2.so:security/cyrus-sasl2 CONFIGURE_ARGS+= --with-cyrus-sasl diff --git a/net/packetdrill/Makefile b/net/packetdrill/Makefile index 330cfe1e9521..e1ba99a4c9eb 100644 --- a/net/packetdrill/Makefile +++ b/net/packetdrill/Makefile @@ -9,9 +9,6 @@ COMMENT= Network stack testing tool LICENSE= GPLv2 -# Need SCTP_PR_SCTP_PRIO and pcap_set_immediate_mode -IGNORE_FreeBSD_10= not supported on 10.x or older - USES= bison uidfix USE_GITHUB= yes GH_ACCOUNT= freebsd-net diff --git a/net/samba47/Makefile b/net/samba47/Makefile index ebeb385842d5..c9a12ee1800f 100644 --- a/net/samba47/Makefile +++ b/net/samba47/Makefile @@ -453,7 +453,7 @@ SUB_LIST+= SAMBA4_PYTHON3="@comment " .if !defined(SAMBA4_SUBPORT) # Require llvm 4.0 and AMD64 -.if ${PORT_OPTIONS:MAESNI} && ${ARCH} == "amd64" && ${OSVERSION} >= 1100511 +.if ${PORT_OPTIONS:MAESNI} && ${ARCH} == "amd64" CONFIGURE_ARGS+= --accel-aes=intelaesni PLIST_FILES+= lib/samba4/private/libaesni-intel-samba4.so .else diff --git a/net/samba48/Makefile b/net/samba48/Makefile index 1c46f6da1dc1..e68a204d473c 100644 --- a/net/samba48/Makefile +++ b/net/samba48/Makefile @@ -471,7 +471,7 @@ SUB_LIST+= SAMBA4_PYTHON3="@comment " .if !defined(SAMBA4_SUBPORT) # Require llvm 4.0 and AMD64 -.if ${PORT_OPTIONS:MAESNI} && ${ARCH} == "amd64" && ${OSVERSION} >= 1100511 +.if ${PORT_OPTIONS:MAESNI} && ${ARCH} == "amd64" CONFIGURE_ARGS+= --accel-aes=intelaesni PLIST_FILES+= lib/samba4/private/libaesni-intel-samba4.so .else diff --git a/science/ALPSCore/Makefile b/science/ALPSCore/Makefile index 66f4445bcda5..8f5d7cc38f2d 100644 --- a/science/ALPSCore/Makefile +++ b/science/ALPSCore/Makefile @@ -12,8 +12,6 @@ COMMENT= Generic algorithms and utilities for condensed matter physics LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE.TXT -BROKEN_FreeBSD_10= error: no matching function for call to 'deserialize' - LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libhdf5.so:science/hdf5 \ libsz.so:science/szip diff --git a/science/clhep/Makefile b/science/clhep/Makefile index c8fa41f7291c..b036607ee278 100644 --- a/science/clhep/Makefile +++ b/science/clhep/Makefile @@ -13,8 +13,6 @@ COMMENT= Object-oriented toolkit for particle physics applications by CERN LICENSE= GPLv3 LGPL3 LICENSE_COMB= multi -BROKEN_FreeBSD_10= does not compile on clang3.4, requires 3.5+ - WRKSRC= ${WRKDIR}/${PORTVERSION}/${PORTNAME:tu} USES= cmake:outsource compiler:c++11-lang perl5 tar:tgz diff --git a/science/libint2/Makefile b/science/libint2/Makefile index 93bd2ee4d167..320a71b683ed 100644 --- a/science/libint2/Makefile +++ b/science/libint2/Makefile @@ -15,8 +15,6 @@ COMMENT= Evaluate the integrals in modern atomic and molecular theory LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_FreeBSD_10= /usr/include/c++/v1/memory:4004:35: error: no viable overloaded '=': __e->__weak_this_ = *this; - LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libgmpxx.so:math/gmp diff --git a/science/qmcpack/Makefile b/science/qmcpack/Makefile index 7d59112bb2dd..ed3a30131a3c 100644 --- a/science/qmcpack/Makefile +++ b/science/qmcpack/Makefile @@ -12,7 +12,6 @@ COMMENT= Many-body ab initio Quantum Monte Carlo code for quantum chemstry LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_FreeBSD_10= error: use of undeclared identifier '__builtin_assume_aligned' BROKEN_i386= undefined reference to `__atomic_load' LIB_DEPENDS= libboost_system.so:devel/boost-libs \ diff --git a/science/simlib/Makefile b/science/simlib/Makefile index 8c10b255a929..4b30a3cf2605 100644 --- a/science/simlib/Makefile +++ b/science/simlib/Makefile @@ -24,7 +24,7 @@ NOT_FOR_ARCHS_REASON= contains not working ${ARCH}-dependent assembly code .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1101000 +.if ${OPSYS} == FreeBSD # nm crashes during the build: # Assertion failed: (ddata->output.size > 0), function cpp_demangle_read_sname, file /usr/src/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c, line 2137. USE_BINUTILS= yes diff --git a/science/triqs/Makefile b/science/triqs/Makefile index 0f90d60fc6f9..abdfd61820c8 100644 --- a/science/triqs/Makefile +++ b/science/triqs/Makefile @@ -12,7 +12,6 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING.txt BROKEN= wrong LIB_DEPENDS -BROKEN_FreeBSD_10= fatal error: 'optional' file not found BROKEN_i386= error: no matching function for call to 'max': https://github.com/TRIQS/triqs/issues/596 BUILD_DEPENDS= boost-libs>=1.53:devel/boost-libs \ diff --git a/security/bugs/Makefile b/security/bugs/Makefile index 17cfef35fb42..18a0b1284542 100644 --- a/security/bugs/Makefile +++ b/security/bugs/Makefile @@ -53,12 +53,4 @@ post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} @(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100077 -# chmod -R bug -post-extract: - ${CHMOD} +x ${WRKSRC}/lib/unix ${WRKSRC}/lib/windows -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/kickpass/Makefile b/security/kickpass/Makefile index afa280bbd9eb..491eb7cd60fa 100644 --- a/security/kickpass/Makefile +++ b/security/kickpass/Makefile @@ -18,8 +18,6 @@ BUILD_DEPENDS= checkmk:devel/check USES= cmake USE_XORG= x11 -BROKEN_FreeBSD_10= requires reallocarray(3) - PLIST_FILES= bin/kickpass \ lib/libkickpass.so \ lib/libkickpass.so.0 \ diff --git a/security/libhijack/Makefile b/security/libhijack/Makefile index 01f7c5fdadee..ff5cda48bbea 100644 --- a/security/libhijack/Makefile +++ b/security/libhijack/Makefile @@ -23,8 +23,6 @@ PLIST_FILES= include/hijack.h \ lib/libhijack.so.1 \ sbin/hijack -BROKEN_FreeBSD_10= Designed for 11.0 and newer - do-install: # the original install fails: https://github.com/SoldierX/libhijack/issues/6 ${INSTALL_DATA} ${WRKSRC}/include/hijack.h ${STAGEDIR}${PREFIX}/include ${INSTALL_LIB} ${WRKSRC}/libhijack/obj/libhijack.so* ${STAGEDIR}${PREFIX}/lib diff --git a/security/masscan/Makefile b/security/masscan/Makefile index 18c3c385cc01..1f93aa68cef2 100644 --- a/security/masscan/Makefile +++ b/security/masscan/Makefile @@ -21,13 +21,6 @@ MAKE_ARGS= SYS=freebsd CC="${CC}" CFLAGS="${CFLAGS}" PLIST_FILES= bin/masscan man/man8/masscan.8.gz -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000 -BUILD_DEPENDS+= clang60:devel/llvm60 -CC= clang60 -.endif - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/masscan ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/doc/masscan.8 ${STAGEDIR}${MANPREFIX}/man/man8 @@ -35,4 +28,4 @@ do-install: do-test: ${WRKSRC}/bin/masscan --selftest -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/trezord/Makefile b/security/trezord/Makefile index af0963d031da..0e8f394f40c4 100644 --- a/security/trezord/Makefile +++ b/security/trezord/Makefile @@ -22,10 +22,4 @@ GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} PLIST_FILES= bin/${GH_PROJECT} -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1102000 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-usb_libusb.go -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/trezord/files/extra-patch-usb_libusb.go b/security/trezord/files/extra-patch-usb_libusb.go deleted file mode 100644 index 9918e32c7c4c..000000000000 --- a/security/trezord/files/extra-patch-usb_libusb.go +++ /dev/null @@ -1,38 +0,0 @@ ---- usb/libusb.go.orig 2018-10-01 19:43:54 UTC -+++ usb/libusb.go -@@ -3,6 +3,7 @@ package usb - import ( - "encoding/hex" - "fmt" -+ "runtime" - "strings" - "sync" - "sync/atomic" -@@ -311,13 +312,21 @@ func (b *LibUSB) matchVidPid(vid uint16, - } - - func (b *LibUSB) identify(dev lowlevel.Device) string { -- var ports [8]byte -- p, err := lowlevel.Get_Port_Numbers(dev, ports[:]) -- if err != nil { -- b.mw.Println(fmt.Sprintf("libusb - identify - error getting port numbers %s", err.Error())) -- return "" -+ var path string -+ if runtime.GOOS != "freebsd" { -+ var ports [8]byte -+ p, err := lowlevel.Get_Port_Numbers(dev, ports[:]) -+ if err != nil { -+ b.mw.Println(fmt.Sprintf("webusb - identify - error getting port numbers %s", err.Error())) -+ return "" -+ } -+ path = hex.EncodeToString(p) -+ } else { -+ bn := lowlevel.Get_Bus_Number(dev) -+ da := lowlevel.Get_Device_Address(dev) -+ path = fmt.Sprintf("%02x%02x", bn, da) - } -- return libusbPrefix + hex.EncodeToString(p) -+ return libusbPrefix + path - } - - type WUD struct { diff --git a/security/vpnc/Makefile b/security/vpnc/Makefile index f5990eb77ee5..0241a84956e5 100644 --- a/security/vpnc/Makefile +++ b/security/vpnc/Makefile @@ -61,11 +61,9 @@ CFLAGS+= -DCISCO_PATCH_VERSION .endif post-patch: -.if ${OSVERSION} >= 1100042 @${REINPLACE_CMD} \ -e 's|.*%%FREEBSD_IPLEN_FIX%%.*|#define NEED_IPLEN_FIX 1|' \ ${WRKSRC}/sysdep.h -.endif @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/config.c @${REINPLACE_CMD} -e 's|\(/etc/vpnc\)|${PREFIX}\1|' \ ${WRKSRC}/${MANPAGE8}.template diff --git a/shells/ksh93-devel/Makefile b/shells/ksh93-devel/Makefile index 83c43f49032f..cb04a5e66e4d 100644 --- a/shells/ksh93-devel/Makefile +++ b/shells/ksh93-devel/Makefile @@ -52,14 +52,12 @@ KSH93_DESC= Install to ${PREFIX}/bin/ksh93 KSH_PLIST_SUB= 93="" KSH93_PLIST_SUB= 93="93" -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> post-patch: -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100093 @${REINPLACE_CMD} -e 's|SF_FLAGS|SFIO_FLAGS|g' ${WRKSRC}/src/lib/libast/include/sfio*.h ${WRKSRC}/src/lib/libast/sfio/*.c -.endif .if ${PORT_OPTIONS:MKSH93} @${MV} ${WRKSRC}/src/cmd/ksh93/ksh.1 ${WRKSRC}/src/cmd/ksh93/ksh93.1 .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/shells/ksh93/Makefile b/shells/ksh93/Makefile index 000f54e40e5f..5535114ff480 100644 --- a/shells/ksh93/Makefile +++ b/shells/ksh93/Makefile @@ -40,12 +40,8 @@ STATIC_MAKE_ENV= LDFLAGS+=-static BROKEN_aarch64= Fails to compile: needs sbrk -.include <bsd.port.pre.mk> - post-patch: -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100093 @${REINPLACE_CMD} -e 's|SF_FLAGS|SFIO_FLAGS|g' ${WRKSRC}/src/lib/libast/include/sfio*.h ${WRKSRC}/src/lib/libast/sfio/*.c -.endif do-build: @cd ${WRKSRC}/ && ${SETENV} -i ${MAKE_ENV} ${SH} bin/package flat make @@ -59,4 +55,4 @@ do-install: do-test: cd ${WRKSRC}/src/cmd/ksh93/tests/ && ${SETENV} SHELL=${WRKSRC}/bin/ksh ${WRKSRC}/bin/ksh shtests -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/and/Makefile b/sysutils/and/Makefile index f62f6e22303d..08c4a55186f9 100644 --- a/sysutils/and/Makefile +++ b/sysutils/and/Makefile @@ -17,12 +17,8 @@ USES= gmake ALL_TARGET= default NOPRECIOUSMAKEVARS= yes -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100095 post-patch: @${REINPLACE_CMD} "s,P_KTHREAD,P_KPROC,g" \ ${WRKSRC}/Makefile ${WRKSRC}/and-OpenBSD.c -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/cloudabi-utils/Makefile b/sysutils/cloudabi-utils/Makefile index 592ab948a21b..57e21786cfb2 100644 --- a/sysutils/cloudabi-utils/Makefile +++ b/sysutils/cloudabi-utils/Makefile @@ -15,8 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 ONLY_FOR_ARCHS_REASON= CloudABI has not yet been ported to other architectures -IGNORE_FreeBSD_10= requires various C++17 features - BUILD_DEPENDS= ${LOCALBASE}/include/cloudabi_types.h:devel/cloudabi \ ${LOCALBASE}/include/flower/protocol/switchboard.ad.h:net/flower \ ${LOCALBASE}/include/yaml2argdata/yaml_builder.h:devel/yaml2argdata diff --git a/sysutils/dwatch-gource/Makefile b/sysutils/dwatch-gource/Makefile index e67e8d0e1f37..a84d807d5412 100644 --- a/sysutils/dwatch-gource/Makefile +++ b/sysutils/dwatch-gource/Makefile @@ -21,7 +21,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.options.mk> -.if ${OSVERSION} < 1101516 || (${OSVERSION} >= 1200000 && ${OSVERSION} < 1200065) +.if ${OSVERSION} >= 1200000 && ${OSVERSION} < 1200065 IGNORE= requires dwatch available in recent FreeBSD 11 or 12 .endif diff --git a/sysutils/dwatch-json/Makefile b/sysutils/dwatch-json/Makefile index bf142de411f9..f76d74e00269 100644 --- a/sysutils/dwatch-json/Makefile +++ b/sysutils/dwatch-json/Makefile @@ -22,7 +22,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.options.mk> -.if ${OSVERSION} < 1101516 || (${OSVERSION} >= 1200000 && ${OSVERSION} < 1200065) +.if ${OSVERSION} >= 1200000 && ${OSVERSION} < 1200065 IGNORE= requires dwatch available in recent FreeBSD 11 or 12 .endif diff --git a/sysutils/dwatch-pwsnoop/Makefile b/sysutils/dwatch-pwsnoop/Makefile index 83bb8b281890..84dddd6cf64b 100644 --- a/sysutils/dwatch-pwsnoop/Makefile +++ b/sysutils/dwatch-pwsnoop/Makefile @@ -22,7 +22,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.options.mk> -.if ${OSVERSION} < 1101516 || (${OSVERSION} >= 1200000 && ${OSVERSION} < 1200065) +.if ${OSVERSION} >= 1200000 && ${OSVERSION} < 1200065 IGNORE= requires dwatch available in recent FreeBSD 11 or 12 .endif diff --git a/sysutils/fusefs-lkl/Makefile b/sysutils/fusefs-lkl/Makefile index 2eec4c837013..86d2463144fd 100644 --- a/sysutils/fusefs-lkl/Makefile +++ b/sysutils/fusefs-lkl/Makefile @@ -29,8 +29,6 @@ GH_TAGNAME= 86dd3afb590eccc1903611bdaa8bac87757eb80d ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON=No one has added other architecture ld formats yet -IGNORE_FreeBSD_10= requires FreeBSD 11 or newer - WRKSRC_SUBDIR= tools/lkl MAKE_JOBS_UNSAFE=yes MAKE_ARGS+= V=1 diff --git a/sysutils/nvme-cli/Makefile b/sysutils/nvme-cli/Makefile index 517e8b492347..3ecdd1c1da04 100644 --- a/sysutils/nvme-cli/Makefile +++ b/sysutils/nvme-cli/Makefile @@ -14,7 +14,6 @@ LICENSE= GPLv2 # And there's plenty in amd64 that compiles, but won't run (eg using /sys/, etc) ONLY_FOR_ARCHS= amd64 BROKEN_FreeBSD_11= Uses newer API than in 11.x -BROKEN_FreeBSD_10= Uses newer API than in 10.x USES= gmake diff --git a/sysutils/osquery/Makefile b/sysutils/osquery/Makefile index 25cd0799c371..2464150f2757 100644 --- a/sysutils/osquery/Makefile +++ b/sysutils/osquery/Makefile @@ -67,12 +67,6 @@ LLDPD_CONFIGURE_ENV_OFF=SKIP_LLDPD=1 .include <bsd.port.pre.mk> -.if ${OSVERSION} < 1100000 -BUILD_DEPENDS+= clang60:devel/llvm60 -CC= clang60 -CXX= clang++60 -.endif - post-patch: ${REINPLACE_CMD} -e 's|/var/osquery/|/var/db/osquery/|g' \ ${WRKSRC}/tools/deployment/osquery.example.conf diff --git a/sysutils/passwordsafe/Makefile b/sysutils/passwordsafe/Makefile index 1e26222d1425..426d7154a7fd 100644 --- a/sysutils/passwordsafe/Makefile +++ b/sysutils/passwordsafe/Makefile @@ -66,10 +66,4 @@ post-install-NLS-on: ${STAGEDIR}${PREFIX}/locale/$l/LC_MESSAGES .endfor -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000 -BROKEN= clang segfaults on 10.x -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/pefs-kmod/Makefile b/sysutils/pefs-kmod/Makefile index f8bd203b2623..5233dfbcbb5a 100644 --- a/sysutils/pefs-kmod/Makefile +++ b/sysutils/pefs-kmod/Makefile @@ -40,11 +40,7 @@ MAKE_ENV+= PEFS_AESNI=yes .endif .if ${OPSYS} == FreeBSD -. if ${OSVERSION} >= 1100117 PLIST_FILES+= lib/pam_pefs.so.6 -. else -PLIST_FILES+= lib/pam_pefs.so.5 -. endif .endif .include <bsd.port.mk> diff --git a/sysutils/pfstat/Makefile b/sysutils/pfstat/Makefile index b5e2147dd793..c6a014290828 100644 --- a/sysutils/pfstat/Makefile +++ b/sysutils/pfstat/Makefile @@ -27,16 +27,12 @@ PLIST_FILES= bin/pfstat \ man/man8/pfstat.8.gz \ man/man8/pfstatd.8.gz -.include <bsd.port.pre.mk> - post-patch: @${REINPLACE_CMD} -e 's|-lgd|-l$${LD_GD}|; s| -lttf||' \ ${WRKSRC}/Makefile @${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \ ${WRKSRC}/pfstat.[c8] -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100070 @${REINPLACE_CMD} 's|altq/|net/&|' ${WRKSRC}/pf.c -.endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/pfstat ${STAGEDIR}/${PREFIX}/bin @@ -44,4 +40,4 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/pfstat.8 ${STAGEDIR}/${PREFIX}/man/man8 ${INSTALL_MAN} ${WRKSRC}/pfstatd/pfstatd.8 ${STAGEDIR}/${PREFIX}/man/man8 -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/pftop/Makefile b/sysutils/pftop/Makefile index 6064762f7d9e..abeec6b2c5b6 100644 --- a/sysutils/pftop/Makefile +++ b/sysutils/pftop/Makefile @@ -16,15 +16,14 @@ OPTIONS_DEFINE= ALTQ ALTQ_DESC= ALTQ support for queue statistics -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100080 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-bpf_dump.c \ ${FILESDIR}/extra-patch-sf-gencode.h -.endif MAKE_ARGS= LOCALBASE="${PREFIX}" OSLEVEL=45 -CFLAGS+= -DHAVE_SNPRINTF=1 -DHAVE_VSNPRINTF=1 +CFLAGS+= -DHAVE_SNPRINTF=1 -DHAVE_VSNPRINTF=1 \ + -DHAVE_FINE_GRAINED_LOCKING=1 .if ${PORT_OPTIONS:MALTQ} CFLAGS+= -DHAVE_ALTQ=1 .endif @@ -33,9 +32,6 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-cache.c \ ${FILESDIR}/extra-patch-config.h \ ${FILESDIR}/extra-patch-pftop.c \ ${FILESDIR}/extra-patch-sf-gencode.c -.if ${OPSYS} == FreeBSD -CFLAGS+= -DHAVE_FINE_GRAINED_LOCKING=1 -.endif EXTRA_PATCHES+= ${FILESDIR}/extra-patch-engine.c @@ -45,20 +41,16 @@ MAKE_ENV+= __MAKE_CONF=/dev/null PLIST_FILES= sbin/pftop man/man8/pftop.8.gz post-patch: -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100000 @${ECHO_MSG} "===> Applying FairQ/Codel patches to ${PORTNAME}." @${CAT} ${FILESDIR}/extra-patch-fairq_codel.diff | \ ${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -.endif @${REINPLACE_CMD} -e 's|<sys/queue.h>|"${FILESDIR}/queue.h"|g' \ ${WRKSRC}/engine.c @${REINPLACE_CMD} -e 's|__dead|__dead2|g' ${WRKSRC}/sf-gencode.h @${REINPLACE_CMD} -e 's|__dead|__dead2|g' ${WRKSRC}/sf-gencode.c @${REINPLACE_CMD} -e 's|#include <net/if_pflog.h>||g' \ ${WRKSRC}/sf-gencode.c -.if ${OPSYS} == DragonFly || ${OSVERSION} >= 1100070 @${REINPLACE_CMD} -e 's|altq/|net/&|' ${WRKSRC}/pftop.c -.endif @${REINPLACE_CMD} -e 's|#include .pcap-int.h.|#include <pcap/pcap.h>|g' \ ${WRKSRC}/bpf_image.c \ ${WRKSRC}/bpf_optimize.c \ @@ -72,4 +64,4 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/pftop ${STAGEDIR}${PREFIX}/sbin ${INSTALL_MAN} ${WRKSRC}/pftop.8 ${STAGEDIR}${MANPREFIX}/man/man8 -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/qjail/Makefile b/sysutils/qjail/Makefile index ed2f2e7f2077..594f1b664408 100644 --- a/sysutils/qjail/Makefile +++ b/sysutils/qjail/Makefile @@ -24,8 +24,6 @@ USES= tar:bzip2 NO_BUILD= yes NO_ARCH= yes -IGNORE_FreeBSD_10= This version only for FreeBSD 11+ - do-install: ${INSTALL_SCRIPT} ${WRKSRC}/qjail \ ${STAGEDIR}${PREFIX}/bin diff --git a/sysutils/rdate/Makefile b/sysutils/rdate/Makefile index c7220c26c669..128ec078cbb8 100644 --- a/sysutils/rdate/Makefile +++ b/sysutils/rdate/Makefile @@ -18,7 +18,7 @@ PLIST_FILES= sbin/rdate man/man8/${PORTNAME}.8.gz post-patch: ${REINPLACE_CMD} -e 's,/right,,' ${WRKSRC}/rdate.8 -.if ${OPSYS} == DragonFly || ${OSVERSION} < 1100072 +.if ${OPSYS} == DragonFly ${REINPLACE_CMD} -e '/^SRCS/s/$$/ reallocarray.c/' ${WRKSRC}/Makefile ${ECHO} 'void *reallocarray(void *optr, size_t nmemb, size_t size);' \ >> ${WRKSRC}/ntpleaps.h diff --git a/sysutils/rsyslog8/Makefile b/sysutils/rsyslog8/Makefile index 45f5c185a161..eca94650a175 100644 --- a/sysutils/rsyslog8/Makefile +++ b/sysutils/rsyslog8/Makefile @@ -145,9 +145,6 @@ post-patch: @${GREP} -rl '/etc/rsyslog.conf' ${WRKSRC}|${XARGS} ${REINPLACE_CMD} -e\ 's|/etc/rsyslog.conf|${PREFIX}/etc/rsyslog.conf|' @${REINPLACE_CMD} -e 's,/lib/rsyslog,${PREFIX}/lib/rsyslog,' ${WRKSRC}/tools/syslogd.c -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100504 - @${REINPLACE_CMD} -e 's,recvmmsg ,,' ${WRKSRC}/configure.ac -.endif @${FIND} ${WRKSRC} -name '*.bak' -delete post-install-DOCS-on: diff --git a/sysutils/shuf/Makefile b/sysutils/shuf/Makefile index d83af50f1494..dccb1ad66c6e 100644 --- a/sysutils/shuf/Makefile +++ b/sysutils/shuf/Makefile @@ -11,8 +11,6 @@ COMMENT= Randomly permute input lines LICENSE= ISCL -BROKEN_FreeBSD_10= Requires reallocarray - GNU_CONFIGURE= yes PLIST_FILES= bin/shuf man/man1/shuf.1.gz diff --git a/sysutils/smart/Makefile b/sysutils/smart/Makefile index 19bdb087ec9f..8201b1e8b339 100644 --- a/sysutils/smart/Makefile +++ b/sysutils/smart/Makefile @@ -9,8 +9,6 @@ COMMENT= Output disk SMART values LICENSE= ISCL -IGNORE_FreeBSD_10= Requires FreeBSD 11 or later - USE_GITHUB= yes GH_ACCOUNT= ctuffli diff --git a/sysutils/symon/Makefile b/sysutils/symon/Makefile index 2d06d8e7b0bd..73965a49d31f 100644 --- a/sysutils/symon/Makefile +++ b/sysutils/symon/Makefile @@ -62,7 +62,7 @@ post-extract: post-patch: # We need to teach symon about mbstat changes/removal in r253351 and r253361. @${RM} ${WRKSRC}/platform/FreeBSD/sm_mbuf.c -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100070 +.if ${OPSYS} == FreeBSD @${REINPLACE_CMD} 's|altq/|net/&|' ${WRKSRC}/platform/FreeBSD/sm_pfq.c .endif diff --git a/sysutils/xen-tools411/Makefile b/sysutils/xen-tools411/Makefile index a4e73cc70be9..46a47a90c67f 100644 --- a/sysutils/xen-tools411/Makefile +++ b/sysutils/xen-tools411/Makefile @@ -13,8 +13,6 @@ COMMENT= Xen management tools LICENSE= GPLv2 LGPL3 LICENSE_COMB= multi -BROKEN_FreeBSD_10= does not build - LIB_DEPENDS= libyajl.so:devel/yajl \ liblzo2.so:archivers/lzo2 \ libpixman-1.so:x11/pixman \ diff --git a/sysutils/xen-tools47/Makefile b/sysutils/xen-tools47/Makefile index 2554aa1cf486..a9f0535afa46 100644 --- a/sysutils/xen-tools47/Makefile +++ b/sysutils/xen-tools47/Makefile @@ -13,8 +13,6 @@ COMMENT= Xen management tool, based on LibXenlight LICENSE= GPLv2 LGPL3 LICENSE_COMB= multi -BROKEN_FreeBSD_10= does not build - LIB_DEPENDS= libyajl.so:devel/yajl \ liblzo2.so:archivers/lzo2 \ libpixman-1.so:x11/pixman \ diff --git a/textproc/castxml/Makefile b/textproc/castxml/Makefile index f07f52c56f91..0e89ed2d2760 100644 --- a/textproc/castxml/Makefile +++ b/textproc/castxml/Makefile @@ -10,8 +10,6 @@ COMMENT= C-family Abstract Syntax Tree XML Output LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_FreeBSD_10= plist mismatch: extra items are installed for some reason - BUILD_DEPENDS= clang${LLVM_VERSION}:devel/llvm${LLVM_VERSION} RUN_DEPENDS= clang${LLVM_VERSION}:devel/llvm${LLVM_VERSION} diff --git a/textproc/sgmlformat/pkg-descr b/textproc/sgmlformat/pkg-descr index 8f62de55403c..ee3c094aa02a 100644 --- a/textproc/sgmlformat/pkg-descr +++ b/textproc/sgmlformat/pkg-descr @@ -3,9 +3,5 @@ of the base FreeBSD distribution. This port should be regarded as a temporary solution to formatting SGML files until the wrinkles in jade, a DSSSL processor, get ironed out. -If you are running FreeBSD 2.1.x, you should fetch the groff mm -macros from FreeBSD 2.2 or later because the macros in 2.1.x are -seriously broken. - July 16, 1997 jfieber@FreeBSD.org diff --git a/www/apache24/Makefile b/www/apache24/Makefile index a30aa850b47d..cc9f6b9aefff 100644 --- a/www/apache24/Makefile +++ b/www/apache24/Makefile @@ -175,11 +175,6 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-server_buildmark.c CONFIGURE_ARGS+= --enable-exception-hook .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100085 &&\ - ${PORT_OPTIONS:MHTTP2} && ${OPENSSLBASE} == /usr -SUB_FILES+= pkg-message -.endif - pre-extract-SUEXEC-on: @${ECHO_CMD} "" @${ECHO_CMD} "suexec builds with user '${USERS}' and docroot '${PREFIX}/www' by default," diff --git a/www/apache24/files/pkg-message.in b/www/apache24/files/pkg-message.in deleted file mode 100644 index f8002da34690..000000000000 --- a/www/apache24/files/pkg-message.in +++ /dev/null @@ -1,5 +0,0 @@ -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! mod_http2 on FreeBSD with OpenSSL from base results in a mostly !! -!! functionally unusable module due to lack of "Upgrade" !! -!! capability in OpenSSL 1.0.1. !! -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 6d7b0247d9cd..a3568c88dba7 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -204,15 +204,8 @@ TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX} \ .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1101513 -BUILD_DEPENDS+= clang60:devel/llvm60 -CC= clang60 -CXX= clang++60 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-llvm-port -.else BUILD_DEPENDS+= ${LOCALBASE}/bin/ar:devel/binutils EXTRA_PATCHES+= ${FILESDIR}/extra-patch-llvm-base -.endif # TODO: -isystem, would be just as ugly as this approach, but more reliably # build would fail without C_INCLUDE_PATH/CPLUS_INCLUDE_PATH env var set. diff --git a/www/chromium/files/extra-patch-llvm-port b/www/chromium/files/extra-patch-llvm-port deleted file mode 100644 index 4dd601b5b8e2..000000000000 --- a/www/chromium/files/extra-patch-llvm-port +++ /dev/null @@ -1,59 +0,0 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2018-06-13 00:10:02.000000000 +0200 -+++ build/toolchain/gcc_toolchain.gni 2018-07-21 12:38:45.107087000 +0200 -@@ -25,6 +25,11 @@ - rebase_path("//build/toolchain/clang_static_analyzer_wrapper.py", - root_build_dir) + " --mode=clang" - -+declare_args() { -+ extra_cxxflags = "" -+ extra_ldflags = "" -+} -+ - # This template defines a toolchain for something that works like gcc - # (including clang). - # -@@ -343,12 +348,12 @@ - # We use slightly different arflags for AIX. - extra_arflags = "-r -c -s" - } else { -- extra_arflags = "-r -c -s -D" -+ extra_arflags = "rcsD" - } - - # Almost all targets build with //build/config/compiler:thin_archive which - # adds -T to arflags. -- command = "$python_path \"$ar_wrapper\"$whitelist_flag --output={{output}} --ar=\"$ar\" \"{{arflags}} $extra_arflags\" @\"$rspfile\"" -+ command = "$python_path \"$ar_wrapper\"$whitelist_flag --output={{output}} --ar=\"$ar\" {{arflags}} $extra_arflags @\"$rspfile\"" - description = "AR {{output}}" - rspfile_content = "{{inputs}}" - outputs = [ -@@ -608,13 +613,22 @@ - } - - gcc_toolchain(target_name) { -- prefix = rebase_path("$clang_base_path/bin", root_build_dir) -- cc = "$prefix/clang" -- cxx = "$prefix/clang++" -- ld = cxx -- readelf = "${toolprefix}readelf" -- ar = "${prefix}/llvm-ar" -- nm = "${toolprefix}nm" -+ if (is_bsd) { -+ cc = "${toolprefix}clang60" -+ cxx = "${toolprefix}clang++60" -+ ld = cxx -+ readelf = "readelf" -+ ar = "${toolprefix}llvm-ar60" -+ nm = "${toolprefix}llvm-nm60" -+ } else { -+ prefix = rebase_path("$clang_base_path/bin", root_build_dir) -+ cc = "$prefix/clang" -+ cxx = "$prefix/clang++" -+ ld = cxx -+ readelf = "${toolprefix}readelf" -+ ar = "${prefix}/llvm-ar" -+ nm = "${toolprefix}nm" -+ } - - forward_variables_from(invoker, - [ diff --git a/www/firefox/Makefile.options b/www/firefox/Makefile.options index 827f7cfbf189..5a6d5ad16a27 100644 --- a/www/firefox/Makefile.options +++ b/www/firefox/Makefile.options @@ -19,11 +19,6 @@ JACK_IMPLIES= ALSA OPTIONS_EXCLUDE+= DTRACE .endif -# dtrace -G crashes with clang++70 (conditional from Mk/bsd.gecko.mk) -.if ${CC} == cc && ${CXX} == c++ && exists(/usr/lib/libc++.so) -OPTIONS_EXCLUDE_FreeBSD_10= DTRACE -.endif - # opensolaris/lib/libdtrace/common/dt_link.c: # <arch> not implemented # failed to allocate space for probe diff --git a/www/firefox/files/patch-ipc_glue_MessageChannel.cpp b/www/firefox/files/patch-ipc_glue_MessageChannel.cpp deleted file mode 100644 index 9f6881a64620..000000000000 --- a/www/firefox/files/patch-ipc_glue_MessageChannel.cpp +++ /dev/null @@ -1,16 +0,0 @@ -To be removed after FreeBSD 10.* EOL - ---- ipc/glue/MessageChannel.cpp.orig 2017-11-02 16:16:32 UTC -+++ ipc/glue/MessageChannel.cpp -@@ -685,6 +685,11 @@ MessageChannel::WillDestroyCurrentMessageLoop() - mWorkerLoop = nullptr; - } - -+#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 4000 -+// Work around UB in __tree crashing mPendingPromises.clear() -+// http://llvm.org/viewvc/llvm-project?view=revision&revision=276003 -+[[clang::optnone]] -+#endif - void - MessageChannel::Clear() - { diff --git a/www/gitea/Makefile b/www/gitea/Makefile index cf58c9babe64..3f4ded3fc8d2 100644 --- a/www/gitea/Makefile +++ b/www/gitea/Makefile @@ -40,7 +40,7 @@ SQLITE_VARS= GO_TAGS+=sqlite .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100513 +.if ${OPSYS} == FreeBSD DAEMONARGS= -S -l \$${gitea_facility} -s \$${gitea_priority} -T \$${name} .else DAEMONARGS= -f diff --git a/www/iridium/Makefile b/www/iridium/Makefile index 31023db91447..17e1ab59eb1c 100644 --- a/www/iridium/Makefile +++ b/www/iridium/Makefile @@ -162,17 +162,8 @@ SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_VARS= GN_ARGS+=use_sndio=true SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false -.include <bsd.port.options.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1101513 -BUILD_DEPENDS+= clang60:devel/llvm60 -CC= clang60 -CXX= clang++60 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-llvm-port -.else BUILD_DEPENDS+= ${LOCALBASE}/bin/ar:devel/binutils EXTRA_PATCHES+= ${FILESDIR}/extra-patch-llvm-base -.endif # TODO: -isystem, would be just as ugly as this approach, but more reliably # build would fail without C_INCLUDE_PATH/CPLUS_INCLUDE_PATH env var set. diff --git a/www/iridium/files/extra-patch-llvm-port b/www/iridium/files/extra-patch-llvm-port deleted file mode 100644 index a1ef24de0b17..000000000000 --- a/www/iridium/files/extra-patch-llvm-port +++ /dev/null @@ -1,148 +0,0 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2018-06-13 00:10:02.000000000 +0200 -+++ build/toolchain/gcc_toolchain.gni 2018-07-21 12:38:45.107087000 +0200 -@@ -25,6 +25,11 @@ - rebase_path("//build/toolchain/clang_static_analyzer_wrapper.py", - root_build_dir) + " --mode=clang" - -+declare_args() { -+ extra_cxxflags = "" -+ extra_ldflags = "" -+} -+ - # This template defines a toolchain for something that works like gcc - # (including clang). - # -@@ -343,12 +348,12 @@ - # We use slightly different arflags for AIX. - extra_arflags = "-r -c -s" - } else { -- extra_arflags = "-r -c -s -D" -+ extra_arflags = "rcsD" - } - - # Almost all targets build with //build/config/compiler:thin_archive which - # adds -T to arflags. -- command = "$python_path \"$ar_wrapper\"$whitelist_flag --output={{output}} --ar=\"$ar\" \"{{arflags}} $extra_arflags\" @\"$rspfile\"" -+ command = "$python_path \"$ar_wrapper\"$whitelist_flag --output={{output}} --ar=\"$ar\" {{arflags}} $extra_arflags @\"$rspfile\"" - description = "AR {{output}}" - rspfile_content = "{{inputs}}" - outputs = [ -@@ -608,13 +613,22 @@ - } - - gcc_toolchain(target_name) { -- prefix = rebase_path("$clang_base_path/bin", root_build_dir) -- cc = "$prefix/clang" -- cxx = "$prefix/clang++" -- ld = cxx -- readelf = "${toolprefix}readelf" -- ar = "${prefix}/llvm-ar" -- nm = "${toolprefix}nm" -+ if (is_bsd) { -+ cc = "${toolprefix}clang60" -+ cxx = "${toolprefix}clang++60" -+ ld = cxx -+ readelf = "readelf" -+ ar = "${toolprefix}llvm-ar60" -+ nm = "${toolprefix}llvm-nm60" -+ } else { -+ prefix = rebase_path("$clang_base_path/bin", root_build_dir) -+ cc = "$prefix/clang" -+ cxx = "$prefix/clang++" -+ ld = cxx -+ readelf = "${toolprefix}readelf" -+ ar = "${prefix}/llvm-ar" -+ nm = "${toolprefix}nm" -+ } - - forward_variables_from(invoker, - [ ---- build/config/compiler/BUILD.gn.orig 2018-06-13 00:10:02.000000000 +0200 -+++ build/config/compiler/BUILD.gn 2018-07-21 12:57:03.823912000 +0200 -@@ -51,7 +51,7 @@ - # only two architectures that are currently checked in). Turn this off when - # you are using a custom toolchain and need to control -B in cflags. - linux_use_bundled_binutils = -- linux_use_bundled_binutils_override && is_linux && -+ linux_use_bundled_binutils_override && (is_linux && !is_bsd) && - (current_cpu == "x64" || current_cpu == "x86") - binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin", - root_build_dir) -@@ -375,8 +375,6 @@ - "-Wl,-z,relro", - ] - if (!using_sanitizer) { -- ldflags += [ "-Wl,-z,defs" ] -- - # Functions interposed by the sanitizers can make ld think - # that some libraries aren't needed when they actually are, - # http://crbug.com/234010. As workaround, disable --as-needed. -@@ -467,7 +465,7 @@ - # TODO(hans): Remove this once Clang generates better optimized debug info by - # default. https://crbug.com/765793 - if (is_clang && !is_nacl && current_toolchain == host_toolchain && -- target_os != "chromeos") { -+ target_os != "chromeos" && !is_bsd) { - cflags += [ - "-Xclang", - "-mllvm", -@@ -708,7 +706,7 @@ - cflags += [ "-mtune=$arm_tune" ] - } - } else if (current_cpu == "arm64") { -- if (is_clang && !is_android && !is_nacl && !is_fuchsia) { -+ if (is_clang && !is_android && !is_nacl && !is_fuchsia && !is_bsd) { - cflags += [ "--target=aarch64-linux-gnu" ] - ldflags += [ "--target=aarch64-linux-gnu" ] - } -@@ -1387,10 +1385,6 @@ - - # TODO(hans): https://crbug.com/766891 - "-Wno-null-pointer-arithmetic", -- -- # Ignore warnings about MSVC optimization pragmas. -- # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314 -- "-Wno-ignored-pragma-optimize", - ] - if (llvm_force_head_revision) { - cflags += [ -@@ -1572,9 +1566,9 @@ - if ((is_posix && !is_nacl) || is_fuchsia) { - # TODO(thomasanderson): Enable on ChromeOS builds once - # https://crbug.com/829956 is fixed. -- if (default_toolchain != "//build/toolchain/cros:target") { -- arflags = [ "-T" ] -- } -+ # if (default_toolchain != "//build/toolchain/cros:target") { -+ # arflags = [ "-T" ] -+ # } - } - } - -@@ -2096,7 +2090,7 @@ - # [1] crrev.com/a81d5ade0b043208e06ad71a38bcf9c348a1a52f - cflags += [ "-gdwarf-3" ] - } -- cflags += [ "-g2" ] -+ cflags += [ "-g0" ] - } - if (use_debug_fission && !is_nacl) { - cflags += [ "-gsplit-dwarf" ] -@@ -2110,7 +2104,7 @@ - # DWARF info may be corrupt; offsets in a range list entry are in different - # sections" there. Maybe just a bug in nacl_switch_32.S. - if (!is_mac && !is_ios && !is_nacl && target_cpu != "x86" && -- (use_gold || use_lld)) { -+ (use_gold || use_lld) && !is_bsd) { - if (is_clang) { - # This flag enables the GNU-format pubnames and pubtypes sections, - # which lld needs in order to generate a correct GDB index. -@@ -2207,7 +2201,7 @@ - if (!is_win && fatal_linker_warnings && - !(is_chromeos && current_cpu == "arm") && - !(is_android && use_order_profiling) && !is_mac && !is_ios && -- current_os != "aix") { -+ current_os != "aix" && !is_bsd) { - # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580 - # TODO(lizeb,pasko): Fix link errors when linking with order_profiling=1 - # crbug.com/485542 diff --git a/www/mod_md-devel/Makefile b/www/mod_md-devel/Makefile index 5c2ceee6fbcc..d060396f2bc3 100644 --- a/www/mod_md-devel/Makefile +++ b/www/mod_md-devel/Makefile @@ -41,12 +41,6 @@ PORTDOCS= README README.md OPTIONS_DEFINE= DOCS -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100085 && ${SSL_DEFAULT} == base -IGNORE= port requires OpenSSL 1.0.2 or later, set DEFAULT_VERSIONS+= ssl=openssl -.endif - post-install: ${RM} ${STAGEDIR}${PREFIX}/share/doc/mod_md/LICENSE ${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d @@ -58,4 +52,4 @@ post-install: (cd ${STAGEDIR}${PREFIX}/${APACHEMODDIR} && \ ${LN} mod_manageddomain.so.0.0.0 mod_manageddomain.so) -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 5fcc2f3bc4a7..513bbfa8871b 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -217,10 +217,6 @@ IGNORE= requires at least HTTP or MAIL to \ be defined. Please do 'make config' again .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100085 && ${SSL_DEFAULT} == base && ${PORT_OPTIONS:MCT} -IGNORE= CT option requires OpenSSL 1.0.2, add DEFAULT_VERSIONS+=ssl=openssl to /etc/make.conf -.endif - .if !${PORT_OPTIONS:MHTTP_REWRITE} && !defined(USE_HTTP_REWRITE) PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-nopcre .endif diff --git a/www/nginx/Makefile b/www/nginx/Makefile index 9f291552f481..5a0314c836e3 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -219,10 +219,6 @@ IGNORE= requires at least HTTP or MAIL to \ be defined. Please do 'make config' again .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100085 && ${SSL_DEFAULT} == base && ${PORT_OPTIONS:MCT} -IGNORE= CT option requires OpenSSL 1.0.2, add DEFAULT_VERSIONS+=ssl=openssl to /etc/make.conf -.endif - .if !${PORT_OPTIONS:MHTTP_REWRITE} && !defined(USE_HTTP_REWRITE) PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-nopcre .endif diff --git a/www/node/Makefile b/www/node/Makefile index 29b8a2e49222..603aa037a175 100644 --- a/www/node/Makefile +++ b/www/node/Makefile @@ -24,7 +24,6 @@ OPTIONS_SUB= yes OPTIONS_EXCLUDE+= DTRACE .endif -OPTIONS_EXCLUDE_FreeBSD_10= DTRACE OPTIONS_EXCLUDE_aarch64= DTRACE # dt_modtext:/usr/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c(820): arm not implemented OPTIONS_EXCLUDE_armv6= DTRACE diff --git a/www/node10/Makefile b/www/node10/Makefile index 0f7ca5f0cfc8..a06cc1b253fc 100644 --- a/www/node10/Makefile +++ b/www/node10/Makefile @@ -24,7 +24,6 @@ OPTIONS_SUB= yes OPTIONS_EXCLUDE+= DTRACE .endif -OPTIONS_EXCLUDE_FreeBSD_10= DTRACE OPTIONS_EXCLUDE_aarch64= DTRACE # dt_modtext:/usr/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c(820): arm not implemented OPTIONS_EXCLUDE_armv6= DTRACE diff --git a/www/node6/Makefile b/www/node6/Makefile index ee89e3ae8ec4..088539590dc9 100644 --- a/www/node6/Makefile +++ b/www/node6/Makefile @@ -20,14 +20,10 @@ OPTIONS_DEFINE= BUNDLED_SSL DOCS NLS DTRACE OPTIONS_DEFAULT=DTRACE OPTIONS_SUB= yes -OPTIONS_DEFAULT_FreeBSD_10= BUNDLED_SSL -OPTIONS_DEFAULT+= ${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}} - .if !exists(/usr/sbin/dtrace) OPTIONS_EXCLUDE+= DTRACE .endif -OPTIONS_EXCLUDE_FreeBSD_10= DTRACE # dt_modtext:/usr/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c(820): arm not implemented OPTIONS_EXCLUDE_armv6= DTRACE OPTIONS_EXCLUDE_armv7= DTRACE @@ -67,10 +63,6 @@ LIB_DEPENDS+= libcares.so:dns/c-ares\ .if empty(PORT_OPTIONS:MBUNDLED_SSL) -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100085 && ${SSL_DEFAULT} == base -IGNORE= node.js requires openssl 1.0.2, add DEFAULT_VERSIONS+=ssl=openssl to /etc/make.conf or enable BUNDLED_SSL option -.endif - .if !empty(SSL_DEFAULT:Mlibressl*) IGNORE= cannot build node.js with LibreSSL. You must enable BUNDLED_SSL .endif diff --git a/www/node8/Makefile b/www/node8/Makefile index 5f386588743d..46db714f250b 100644 --- a/www/node8/Makefile +++ b/www/node8/Makefile @@ -20,14 +20,10 @@ OPTIONS_DEFINE= BUNDLED_SSL DOCS NLS DTRACE OPTIONS_DEFAULT=DTRACE OPTIONS_SUB= yes -OPTIONS_DEFAULT_FreeBSD_10= BUNDLED_SSL -OPTIONS_DEFAULT+= ${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}} - .if !exists(/usr/sbin/dtrace) OPTIONS_EXCLUDE+= DTRACE .endif -OPTIONS_EXCLUDE_FreeBSD_10= DTRACE OPTIONS_EXCLUDE_aarch64= DTRACE # dt_modtext:/usr/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c(820): arm not implemented OPTIONS_EXCLUDE_armv6= DTRACE @@ -71,10 +67,6 @@ LIB_DEPENDS+= libcares.so:dns/c-ares\ .if empty(PORT_OPTIONS:MBUNDLED_SSL) -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100085 && ${SSL_DEFAULT} == base -IGNORE= node.js requires openssl 1.0.2, add DEFAULT_VERSIONS+=ssl=openssl to /etc/make.conf or enable BUNDLED_SSL option -.endif - .if !empty(SSL_DEFAULT:Mlibressl*) IGNORE= cannot build node.js with LibreSSL. You must enable BUNDLED_SSL .endif diff --git a/www/qt5-webengine/Makefile b/www/qt5-webengine/Makefile index a5bf72360d22..3817aff190bc 100644 --- a/www/qt5-webengine/Makefile +++ b/www/qt5-webengine/Makefile @@ -87,20 +87,6 @@ QMAKE_CONFIGURE_ARGS= -proprietary-codecs -system-ffmpeg # dependencies correctly in the generated Makefiles, use the right target here. ALL_TARGET= first -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-10 -.endif # ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000 - -# 1101513 is 11-STABLE after merging clang, llvm, lld, lldb, compiler-rt and -# libc++ 6.0.0 release, and several follow-up fixes. -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1101513 -BUILD_DEPENDS+= clang60:devel/llvm60 -CC= clang60 -CXX= clang++60 -.endif # ${OPSYS} == FreeBSD && ${OSVERSION} < 1101513 - # We need ar(1) from ports because the Chromium code uses the @file syntax. # We then need to ensure ld(1) from ports is used because of the archives ar(1) # generated. @@ -144,4 +130,4 @@ pre-configure: # Rerun syncqt.pl -- otherwise the resulting package misses some forwarding headers. cd ${WRKSRC} && ${QT_BINDIR}/syncqt.pl -version ${QT5_VERSION} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/qt5-webengine/files/extra-patch-10 b/www/qt5-webengine/files/extra-patch-10 deleted file mode 100644 index e3b99ae8aed1..000000000000 --- a/www/qt5-webengine/files/extra-patch-10 +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/third_party/skia/src/core/SkSmallAllocator.h.orig 2017-02-01 20:16:14.715097000 +0100 -+++ src/3rdparty/chromium/third_party/skia/src/core/SkSmallAllocator.h 2017-02-01 20:24:56.680605000 +0100 -@@ -20,7 +20,7 @@ - // abstract type. The complication with max_align_t is that it is defined differently for - // different builds. - namespace { --#if defined(SK_BUILD_FOR_WIN32) || defined(SK_BUILD_FOR_MAC) -+#if defined(SK_BUILD_FOR_WIN32) || defined(SK_BUILD_FOR_MAC) || defined(__FreeBSD__) - // Use std::max_align_t for compiles that follow the standard. - #include <cstddef> - using SystemAlignment = std::max_align_t; diff --git a/www/tomcat-native/Makefile b/www/tomcat-native/Makefile index 362fa441031d..8ad5384a4e4f 100644 --- a/www/tomcat-native/Makefile +++ b/www/tomcat-native/Makefile @@ -34,10 +34,4 @@ PLIST_FILES= lib/libtcnative-1.a \ post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtcnative-1.so.0.2.16 -.include <bsd.port.pre.mk> - -.if ${SSL_DEFAULT} == base -IGNORE_FreeBSD_10= Requires OpenSSL 1.0.2 (set DEFAULT_VERSIONS+=ssl=openssl) -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/webhook/Makefile b/www/webhook/Makefile index 22159a6bff62..b4d677f000a1 100644 --- a/www/webhook/Makefile +++ b/www/webhook/Makefile @@ -20,7 +20,7 @@ PLIST_FILES= "@sample etc/webhook.yaml.sample" sbin/webhook .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100513 +.if ${OPSYS} == FreeBSD DAEMONARGS= -S -l \$${webhook_facility} -s \$${webhook_priority} -t \$${name} .else DAEMONARGS= -f diff --git a/www/xombrero/Makefile b/www/xombrero/Makefile index ceac388f5eac..dfb29e6dd93a 100644 --- a/www/xombrero/Makefile +++ b/www/xombrero/Makefile @@ -14,8 +14,6 @@ LICENSE= ISCL LIB_DEPENDS= libgnutls.so:security/gnutls \ libsoup-2.4.so:devel/libsoup -BROKEN_FreeBSD_10= does not build - USES= desktop-file-utils groff pkgconfig perl5 tar:tgz USE_PERL5= build INSTALLS_ICONS= yes diff --git a/x11-drivers/xf86-video-amdgpu/Makefile b/x11-drivers/xf86-video-amdgpu/Makefile index 59a6c229d76c..b09f44a1b088 100644 --- a/x11-drivers/xf86-video-amdgpu/Makefile +++ b/x11-drivers/xf86-video-amdgpu/Makefile @@ -22,12 +22,6 @@ ONLY_FOR_ARCHS_REASON= KMS is required and currently only available on x86 CONFIGURE_ARGS+=--disable-udev -.include <bsd.port.options.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1101510 -IGNORE= not supported on 11.1 or older, no kernel support -.endif - PLIST_FILES= lib/xorg/modules/drivers/amdgpu_drv.so \ man/man4/amdgpu.4x.gz \ share/X11/xorg.conf.d/10-amdgpu.conf diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index 209b3fc13016..ef9ba24ef73c 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -55,7 +55,6 @@ GLIB_SCHEMAS= org.gtk.Demo.gschema.xml \ OPTIONS_DEFINE= CUPS CLOUDPRINT COLORD DEBUG BROADWAY WAYLAND OPTIONS_DEFAULT=CUPS COLORD BROADWAY -OPTIONS_EXCLUDE_FreeBSD_10= WAYLAND OPTIONS_SUB= yes BROADWAY_DESC= Enable GDK Broadway backend for showing GTK+ in the webbrowser using HTML5 and web sockets. diff --git a/x11-toolkits/vte3/Makefile b/x11-toolkits/vte3/Makefile index cdec5b10cf16..335d2ca81b04 100644 --- a/x11-toolkits/vte3/Makefile +++ b/x11-toolkits/vte3/Makefile @@ -34,10 +34,4 @@ INSTALL_TARGET= install-strip PLIST_SUB= VERSION=2.91 -.include <bsd.port.options.mk> - -.if ${OSVERSION} <= 1100000 -EXTRA_PATCHES= ${FILESDIR}/extra-src_app_app.cc -.endif - .include <bsd.port.mk> diff --git a/x11-toolkits/vte3/files/extra-src_app_app.cc b/x11-toolkits/vte3/files/extra-src_app_app.cc deleted file mode 100644 index ad01a9c2a267..000000000000 --- a/x11-toolkits/vte3/files/extra-src_app_app.cc +++ /dev/null @@ -1,13 +0,0 @@ -# fix on 104-i386 with clang 3.4 - ---- src/app/app.cc.orig 2018-06-07 17:57:35.192459000 +0200 -+++ src/app/app.cc 2018-06-07 17:58:50.068954000 +0200 -@@ -306,7 +306,7 @@ - else - alpha = get_alpha(); - -- GdkRGBA color{bg_color}; -+ GdkRGBA color = bg_color; - color.alpha = alpha; - return color; - } diff --git a/x11-wm/cwm/Makefile b/x11-wm/cwm/Makefile index dcbbdbff137d..ea819e906f42 100644 --- a/x11-wm/cwm/Makefile +++ b/x11-wm/cwm/Makefile @@ -28,7 +28,7 @@ post-patch: @${REINPLACE_CMD} 's@/usr/X11R6@${LOCALBASE}@' ${WRKSRC}/cwmrc.5 @${REINPLACE_CMD} -e 's@strlcpy.o strlcat.o@@' \ -e 's@strtonum.o@@' ${WRKSRC}/Makefile -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100072 +.if ${OPSYS} == FreeBSD @${REINPLACE_CMD} 's@reallocarray.o@@' ${WRKSRC}/Makefile .endif diff --git a/x11-wm/plasma5-kwin/Makefile b/x11-wm/plasma5-kwin/Makefile index 59843fca4d55..20e39ed40133 100644 --- a/x11-wm/plasma5-kwin/Makefile +++ b/x11-wm/plasma5-kwin/Makefile @@ -43,14 +43,8 @@ USE_QT= concurrent core dbus gui multimedia network qml quick script \ quickcontrols2_run virtualkeyboard_run USE_XORG= ice sm x11 xcb xext xi -.include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000 -# Base compiler clang 3.5 does not understand -Winconsistent-missing-override -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-fbsd10 -.endif - post-patch: ${REINPLACE_CMD} '/sysmacros.h/d' \ ${PATCH_WRKSRC}/logind.cpp -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-wm/plasma5-kwin/files/extra-patch-fbsd10 b/x11-wm/plasma5-kwin/files/extra-patch-fbsd10 deleted file mode 100644 index a5b793dfb540..000000000000 --- a/x11-wm/plasma5-kwin/files/extra-patch-fbsd10 +++ /dev/null @@ -1,16 +0,0 @@ -Clang 3.4 (base compiler in 10-STABLE) does not know --Winconsistent-missing-override, and having that flag -in the CXX flags messes up visibility detection. So -don't warn about unknown warnings. - ---- CMakeLists.txt.orig 2017-09-21 18:34:57.176858000 +0200 -+++ CMakeLists.txt 2017-09-21 18:35:15.580988000 +0200 -@@ -53,7 +53,7 @@ - set(CMAKE_CXX_STANDARD_REQUIRED ON) - - if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-inconsistent-missing-override") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-warning-option -Wno-inconsistent-missing-override") - endif() - - find_package(Qt5Multimedia QUIET) diff --git a/x11/fluxbg/Makefile b/x11/fluxbg/Makefile index a10349e2827a..192db102f7bc 100644 --- a/x11/fluxbg/Makefile +++ b/x11/fluxbg/Makefile @@ -25,12 +25,4 @@ post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \ s|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/src/fluxbg_conf.cc -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100077 -# chmod -R bug -post-extract: - ${CHMOD} +x ${WRKSRC}/autom4te.cache -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11/gnome-shell/pkg-message b/x11/gnome-shell/pkg-message index e0f247cadbe4..42f1f2ba077b 100644 --- a/x11/gnome-shell/pkg-message +++ b/x11/gnome-shell/pkg-message @@ -9,11 +9,3 @@ gdm user also needs this access. Access can be granted by adding the user(s) to the video group. % pw groupmod video -m jerry - -Additional for FreeBSD versions before FreeBSD 11.0-CURRENT revision -286524, and any FreeBSD 10.x version. - -By using a devfs.rules(5) to change the mode of the /dev/dri/card0 on creation. - - add path 'dri/*' mode 0666 group video - diff --git a/x11/sterm/Makefile b/x11/sterm/Makefile index cbd3319849ad..1e58e15e896e 100644 --- a/x11/sterm/Makefile +++ b/x11/sterm/Makefile @@ -41,8 +41,6 @@ SOLARIZED_EXTRA_PATCHES= ${PATCHDIR}/extra-solarized-patch-config.def.h \ ${PATCHDIR}/extra-solarized-patch-x.c \ ${PATCHDIR}/extra-solarized-patch-st.h -SUB_FILES= pkg-message - pre-everything:: @${ECHO_MSG} "You can build st with your own config.h using the ST_CONF knob:" @${ECHO_MSG} "make ST_CONF=/path/to/st/config.h install clean" diff --git a/x11/sterm/files/pkg-message.in b/x11/sterm/files/pkg-message.in deleted file mode 100644 index 85616e94b470..000000000000 --- a/x11/sterm/files/pkg-message.in +++ /dev/null @@ -1,14 +0,0 @@ -If you are running FreeBSD 11.1 or older then in order to add st.info -to the terminal capability database it is required to - - * Install tic (included in devel/ncurses) - * Run - - # tic -C -K -s -x %%DATADIR%%/st.info >> /usr/share/misc/termcap - # cd /usr/share/misc - # cap_mkdb termcap - -Thanks to [1], this hack is not necessary on FreeBSD 11.2-RELEASE, -11-STABLE, and 12-CURRENT. - -[1] https://svnweb.freebsd.org/changeset/base/331006 diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile index ca30be50067f..eb22bee882e1 100644 --- a/x11/xlockmore/Makefile +++ b/x11/xlockmore/Makefile @@ -162,7 +162,7 @@ post-patch: @${REINPLACE_CMD} -e '/xglockrc/ s|PROGRAM|DATA|' ${WRKSRC}/xglock/Makefile.in @${REINPLACE_CMD} -e 's|$$(SOUNDPATH)|$$(DESTDIR)$$(SOUNDPATH)|g' ${WRKSRC}/modes/Makefile.in @${REINPLACE_CMD} -e '/$$(ETCDIR)play.sh/ s|$$(INSTALL_PROGRAM)|$$(INSTALL_PROGRAM:N-s)|' ${WRKSRC}/modes/Makefile.in -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100000 +.if exists(/usr/bin/fortune) @${REINPLACE_CMD} -e 's|/usr/games/fortune|/usr/bin/fortune|' ${WRKSRC}/modes/Makefile.in .endif |