From 8244fe99bcdbad7a2d0b22d66183394f5ffacd03 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Wed, 11 Jan 2017 10:08:38 +0000 Subject: [PATCH] - Remove always-true/false conditions after FreeBSD 9, 10.1, 10.2 EOL Approved by: portmgr blanket --- databases/mysql80-server/Makefile | 9 --------- ...gin-patch-_x_mysqlxtest__src_mysqlxtest.cc | 12 ------------ devel/kf5-solid/Makefile | 8 +------- devel/lxqt-build-tools/Makefile | 14 ++------------ ...h-cmake_modules_LXQtCompilerSettings.cmake | 13 ------------- dns/unbound/Makefile | 8 -------- editors/focuswriter/Makefile | 19 ++++--------------- editors/libreoffice/Makefile | 5 ----- editors/libreoffice4/Makefile | 5 ----- emulators/linux_base-c7/Makefile | 5 ----- emulators/wine/Makefile | 9 +-------- games/corsix-th/Makefile | 8 +------- games/vultures-eye/Makefile | 5 ----- graphics/inkscape/Makefile | 12 ------------ graphics/luminance-qt5/Makefile | 8 +------- graphics/openshadinglanguage/Makefile | 6 ------ java/eclipse/Makefile | 4 ---- lang/mono/Makefile | 9 +-------- lang/smlnj/Makefile | 17 ++--------------- lang/swift/Makefile | 4 +--- mail/opensmtpd-devel/Makefile | 14 ++------------ mail/opensmtpd/Makefile | 14 ++------------ math/R/compiler.mk | 8 +------- .../gstreamer1-editing-services/Makefile | 7 ------- multimedia/plexhometheater/Makefile | 11 ----------- multimedia/transcode/Makefile | 5 ----- multimedia/zoneminder-h264/Makefile | 13 +------------ multimedia/zoneminder/Makefile | 13 +------------ net-im/skype4/Makefile | 4 ---- net-mgmt/collectd5/Makefile | 12 ++---------- net-mgmt/collectd5/pkg-plist | 2 +- net-mgmt/icinga2/Makefile | 9 --------- net/freediameter/Makefile | 9 +-------- net/glusterfs/Makefile | 7 ------- net/openntpd/Makefile | 7 ------- science/clhep/Makefile | 10 +--------- science/libxc/Makefile | 9 +-------- science/meep/Makefile | 4 ---- security/afl/Makefile | 10 ---------- security/afl/pkg-plist | 12 ++++++------ security/bro/Makefile | 12 ------------ security/fastd-devel/Makefile | 9 +-------- security/libotr/Makefile | 6 ------ sysutils/arcconf/Makefile | 2 +- sysutils/bulk_extractor/Makefile | 7 ------- sysutils/lsof/Makefile | 4 ---- sysutils/osquery/Makefile | 8 +------- textproc/xxdiff/Makefile | 13 +------------ www/chromium/Makefile | 6 ------ www/nextcloud/Makefile | 10 +--------- www/owncloud/Makefile | 6 ------ www/webkit-gtk2/Makefile | 5 ----- www/webkit-gtk3/Makefile | 5 ----- www/webkit2-gtk3/Makefile | 5 ----- x11-toolkits/gnome-pty-helper/Makefile | 8 -------- x11-toolkits/vte3/Makefile | 8 -------- x11/leechcraft/Makefile | 6 ------ 57 files changed, 38 insertions(+), 442 deletions(-) delete mode 100644 databases/mysql80-server/files/rapid_plugin-patch-_x_mysqlxtest__src_mysqlxtest.cc delete mode 100644 devel/lxqt-build-tools/files/extra-patch-cmake_modules_LXQtCompilerSettings.cmake diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile index 43006ffd2c86..54fc3375557e 100644 --- a/databases/mysql80-server/Makefile +++ b/databases/mysql80-server/Makefile @@ -131,15 +131,6 @@ PERFSCHM_SUB_LIST+= PERFSCHEMRC="" PERFSCHM_SUB_LIST_OFF+= PERFSCHEMRC="--skip-performance-schema" .endif -.include - -### Just for the sake of FreeBSD 9.X ### -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -. if !defined(CLIENT_ONLY) -EXTRA_PATCHES+= ${PATCHDIR}/rapid_plugin-patch-_x_mysqlxtest__src_mysqlxtest.cc -. endif -.endif - .include .if ${SSL_DEFAULT} == base diff --git a/databases/mysql80-server/files/rapid_plugin-patch-_x_mysqlxtest__src_mysqlxtest.cc b/databases/mysql80-server/files/rapid_plugin-patch-_x_mysqlxtest__src_mysqlxtest.cc deleted file mode 100644 index 078f3106848b..000000000000 --- a/databases/mysql80-server/files/rapid_plugin-patch-_x_mysqlxtest__src_mysqlxtest.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- rapid/plugin/x/mysqlxtest_src/mysqlxtest.cc.orig 2016-03-28 18:06:12 UTC -+++ rapid/plugin/x/mysqlxtest_src/mysqlxtest.cc -@@ -1661,7 +1661,8 @@ private: - if (2 == argl.size()) - tolerance = atoi(argl[1].c_str()); - -- if (abs(expected_msec - msec) > tolerance) -+#define my_abs_64(x) ((x) < 0 ? (-x) : (x)) -+ if (my_abs_64((expected_msec - msec)) > tolerance) - { - std::cerr << "Timeout should occur after " << expected_msec << "ms, but it was " << msec <<"ms. \n"; - return Stop_with_failure; diff --git a/devel/kf5-solid/Makefile b/devel/kf5-solid/Makefile index 13c8a0439f63..60eb477f07c4 100644 --- a/devel/kf5-solid/Makefile +++ b/devel/kf5-solid/Makefile @@ -18,10 +18,4 @@ BSDISKS_DESC= Use bsdisks instead of hald to mount drives BSDISKS_CMAKE_BOOL= EXPERIMENTAL_BSDISKS BSDISKS_RUN_DEPENDS= bsdisks:sysutils/bsdisks -.include -# Flex on FreeBSD 9 and older 10 is too old -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000033 -BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:textproc/flex -.endif - -.include +.include diff --git a/devel/lxqt-build-tools/Makefile b/devel/lxqt-build-tools/Makefile index c6e011d5a271..f37d8c1e83c5 100644 --- a/devel/lxqt-build-tools/Makefile +++ b/devel/lxqt-build-tools/Makefile @@ -12,17 +12,7 @@ COMMENT= Helpers CMake modules for LXQt LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/BSD-3-Clause -USES= cmake:outsource lxqt pkgconfig tar:xz +USES= cmake:outsource lxqt pkgconfig tar:xz USE_QT5= qmake_build buildtools_build core -.include - -# When the CXX compiler is GNU 4.2.1 (DragonFlyBSD seems to have >= 4.7.x) -# we get the following errors: -# cc1plus: error: unrecognized command line option "-flto" -# cc1plus: error: unrecognized command line option "-fuse-linker-plugin" -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000024 -EXTRA_PATCHES= ${FILESDIR}/extra-patch-cmake_modules_LXQtCompilerSettings.cmake -.endif - -.include +.include diff --git a/devel/lxqt-build-tools/files/extra-patch-cmake_modules_LXQtCompilerSettings.cmake b/devel/lxqt-build-tools/files/extra-patch-cmake_modules_LXQtCompilerSettings.cmake deleted file mode 100644 index 324f31c4fdc9..000000000000 --- a/devel/lxqt-build-tools/files/extra-patch-cmake_modules_LXQtCompilerSettings.cmake +++ /dev/null @@ -1,13 +0,0 @@ ---- cmake/modules/LXQtCompilerSettings.cmake.orig 2017-01-01 21:46:43 UTC -+++ cmake/modules/LXQtCompilerSettings.cmake -@@ -144,7 +144,9 @@ endif() - if (CMAKE_COMPILER_IS_GNUCXX OR LXQT_COMPILER_IS_CLANGCXX) - # -flto: use link-time optimizations to generate more efficient code - if (CMAKE_COMPILER_IS_GNUCXX) -- set(LTO_FLAGS "-flto -fuse-linker-plugin") -+ if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") -+ set(LTO_FLAGS "-flto -fuse-linker-plugin") -+ endif() - # When building static libraries with LTO in gcc >= 4.9, - # "gcc-ar" and "gcc-ranlib" should be used instead of "ar" and "ranlib". - # references: diff --git a/dns/unbound/Makefile b/dns/unbound/Makefile index 30235995fafd..5435454e0385 100644 --- a/dns/unbound/Makefile +++ b/dns/unbound/Makefile @@ -66,14 +66,6 @@ PYTHON_USES= python:2 PYTHON_VARS= STRIP_FILES+=.libs/_unbound.so THREADS_CONFIGURE_WITH= pthreads -.include - -.if ${PORT_OPTIONS:MGOST} -. if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000015 -WITH_OPENSSL_PORT= yes -. endif -.endif - post-patch: @${RM} ${WRKSRC}/util/configlexer.c @${REINPLACE_CMD} -e 's|if test ! -e $$(DESTDIR)$$(configfile); then || ; \ diff --git a/editors/focuswriter/Makefile b/editors/focuswriter/Makefile index 49490450cfe5..ea1778aac331 100644 --- a/editors/focuswriter/Makefile +++ b/editors/focuswriter/Makefile @@ -31,26 +31,15 @@ PORTDOCS= CREDITS NEWS README OPTIONS_DEFINE= DOCS -.include - post-patch: @${REINPLACE_CMD} -e '/INSTALLS/s/man //' \ ${WRKSRC}/focuswriter.pro -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000054 - @${REINPLACE_CMD} -e 's/std::lround/lround/g' \ - ${WRKSRC}/src/daily_progress_dialog.cpp \ - ${WRKSRC}/src/scene_list.cpp \ - ${WRKSRC}/src/theme_dialog.cpp \ - ${WRKSRC}/src/fileformats/docx_reader.cpp \ - ${WRKSRC}/src/fileformats/odt_reader.cpp \ - ${WRKSRC}/src/fileformats/rtf_reader.cpp -.endif - -do-install-DOCS-on: - (cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) post-install: ${INSTALL_MAN} ${WRKSRC}/resources/unix/focuswriter.1 \ ${STAGEDIR}${PREFIX}/man/man1 -.include +post-install-DOCS-on: + (cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) + +.include diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index ce28204bb807..2106833f73c2 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -270,11 +270,6 @@ _MAKE_JOBS= # .if ${COMPILER_FEATURES:Mlibstdc++} BROKEN= Build with system libstdc++ is unsupported .endif - -.if ${OSVERSION} < 1000033 -BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:textproc/flex -CONFIGURE_ENV+= FLEX=${LOCALBASE}/bin/flex -.endif .endif # FreeBSD .if ${COMPILER_TYPE} == "clang" diff --git a/editors/libreoffice4/Makefile b/editors/libreoffice4/Makefile index 081ae65ac1ee..ba9f3f427583 100644 --- a/editors/libreoffice4/Makefile +++ b/editors/libreoffice4/Makefile @@ -337,11 +337,6 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-libc++.i386:-p0 EXTRA_PATCHES+= ${FILESDIR}/extra-configure.ac .endif -.if ${OSVERSION} < 1000033 -BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:textproc/flex -CONFIGURE_ENV+= FLEX=${LOCALBASE}/bin/flex -.endif - ACLOCAL_ARGS= -I "${WRKSRC}/m4" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/emulators/linux_base-c7/Makefile b/emulators/linux_base-c7/Makefile index 24bc97b578e1..c718bbe36e29 100644 --- a/emulators/linux_base-c7/Makefile +++ b/emulators/linux_base-c7/Makefile @@ -123,11 +123,6 @@ REMOVE_FILES= bin/df bin/su etc/exports etc/group etc/gshadow etc/motd \ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} < 1002507 || \ - ( ${OSVERSION} >= 1100000 && ${OSVERSION} < 1100074 )) -IGNORE= Requires FreeBSD 10.3 or higher -.endif - .if ${LINUX_ARCH} == x86_64 && ${OPSYS} == FreeBSD && ${OSVERSION} >= 11000105 SYSCTLMIB= kern.features.linux64 .else diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index a66a64893488..0883bb90fed8 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -117,18 +117,11 @@ X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ CONFIGURE_ARGS+= --enable-win64 --libdir=${PREFIX}/lib PLIST_SUB+= WINE32="@comment " WINE64="" -# Force the use of GCC where it is the system compiler since -# COMPILER_VERSION will be 42 (the GCC version) even if clang -# is CHOSEN_COMPILER_TYPE in that case. -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000054 -USE_GCC= yes -.else -. if ${CHOSEN_COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 38 +.if ${CHOSEN_COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 38 CPPFLAGS+= -D__builtin_ms_va_list=__builtin_va_list \ -D__builtin_ms_va_start=__builtin_va_start \ -D__builtin_ms_va_end=__builtin_va_end \ -D__builtin_ms_va_copy=__builtin_va_copy -. endif .endif # Wine assumes a WoW64 package is available however WoW64 is not yet available on FreeBSD. diff --git a/games/corsix-th/Makefile b/games/corsix-th/Makefile index 60b0774079bc..0f3441beaa1d 100644 --- a/games/corsix-th/Makefile +++ b/games/corsix-th/Makefile @@ -36,12 +36,6 @@ MOVIES_CMAKE_ON= -DWITH_MOVIES=ON MOVIES_CMAKE_OFF= -DWITH_MOVIES=OFF MOVIES_LIB_DEPENDS= libswresample.so:multimedia/ffmpeg -.include - -.if ${OSVERSION} < 1000024 && ${CHOSEN_COMPILER_TYPE} == gcc -CXXFLAGS+= -D_GLIBCXX_USE_C99 -.endif - post-patch: # Allow the game to find its resources without wrapper scripts @${REINPLACE_CMD} -e \ @@ -55,4 +49,4 @@ do-install: cd ${WRKSRC}/CorsixTH && ${COPYTREE_SHARE} "Bitmap Levels Lua" \ ${STAGEDIR}${DATADIR} -.include +.include diff --git a/games/vultures-eye/Makefile b/games/vultures-eye/Makefile index a3182fd82088..2a05015a710e 100644 --- a/games/vultures-eye/Makefile +++ b/games/vultures-eye/Makefile @@ -36,12 +36,7 @@ DESKTOP_ENTRIES="Vulture's Eye" "" "" "vulture-nethack" "" "" .include -.if ${OSVERSION} < 1000033 -BUILD_DEPENDS+= flex>0:textproc/flex -MAKE_ENV+= FLEX="${LOCALBASE}/bin/flex" -.else MAKE_ENV+= FLEX="${FLEX}" -.endif pre-patch: @(cd ${WRKSRC}/win && ${LN} -sf ../../vulture) diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile index 1fd322501dea..21c55be3399e 100644 --- a/graphics/inkscape/Makefile +++ b/graphics/inkscape/Makefile @@ -68,18 +68,6 @@ WPG_LIB_DEPENDS= libwpg-0.3.so:graphics/libwpg03 CPPFLAGS+= -Wno-mismatched-tags -Wno-unknown-attributes .endif -# Base clang 3.4.1 in FreeBSD 9.3 fails to compile this code on i386 -# but base clang 3.4.1 in FreeBSD 10.1 succeeds. The difference *appears* -# to be the patch applied in r271597 (head) / r271739 (stable/10). The -# latter happened shortly before 10.1 was branched. -.if ${ARCH} == i386 && ${OPSYS} == FreeBSD && ${OSVERSION} < 1001000 && \ - ( ${COMPILER_TYPE} == clang || ${ALT_COMPILER_TYPE} == clang ) -BUILD_DEPENDS+= clang34:lang/clang34 -CPP= ${LOCALBASE}/bin/clang-cpp34 -CC= ${LOCALBASE}/bin/clang34 -CXX= ${LOCALBASE}/bin/clang++34 -.endif - post-patch: @${REINPLACE_CMD} -e 's|-ldl||g' \ ${WRKSRC}/configure diff --git a/graphics/luminance-qt5/Makefile b/graphics/luminance-qt5/Makefile index b4d1377d5f51..cc43c09f47c3 100644 --- a/graphics/luminance-qt5/Makefile +++ b/graphics/luminance-qt5/Makefile @@ -34,12 +34,6 @@ CONFLICTS_INSTALL= luminance-hdr-[0-9]* OPTIONS_DEFINE= DOCS -.include - -.if ${OSVERSION} < 1000024 -USE_GCC= yes -.endif - post-patch: # Do not install yet another copy of GPL (we use license framework instead) # and fix installation path for docs (but not for internal help files) @@ -60,4 +54,4 @@ post-patch: pre-install: QT_BINDIR_REL=bin -.include +.include diff --git a/graphics/openshadinglanguage/Makefile b/graphics/openshadinglanguage/Makefile index 06b339af73cb..8d7f56ca7395 100644 --- a/graphics/openshadinglanguage/Makefile +++ b/graphics/openshadinglanguage/Makefile @@ -34,12 +34,6 @@ USES= bison cmake:outsource compiler:c11 USE_GCC= yes .endif -.if ${OSVERSION} < 1000033 -BUILD_DEPENDS+= flex>=2.5.37:textproc/flex -CMAKE_ARGS+= -DFLEX_EXECUTABLE:STRING=${LOCALBASE}/bin/flex -CXXFLAGS+= -I${LOCALBASE}/include/flex -.endif - post-patch: @${REINPLACE_CMD} -e 's,/bin/bash,/bin/sh,' \ ${WRKSRC}/src/liboslexec/serialize-bc.bash diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile index 62f7e087a411..9e13a8862ee4 100644 --- a/java/eclipse/Makefile +++ b/java/eclipse/Makefile @@ -43,10 +43,6 @@ OPTIONS_DEFAULT= FULL_SDK .include -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -PATCH_DEPENDS+= gpatch:devel/patch -PATCH= gpatch -.endif PATCH_STRIP= -p1 .if ${PORT_OPTIONS:MSWT_GTK3_SUPPORT} diff --git a/lang/mono/Makefile b/lang/mono/Makefile index ce4f98beb0a8..bc34caef281d 100644 --- a/lang/mono/Makefile +++ b/lang/mono/Makefile @@ -39,8 +39,6 @@ MAKE_ENV= MONO_SHARED_DIR="${MONO_SHARED_DIR}" \ ONLY_FOR_ARCHS= i386 amd64 powerpc PORTSCOUT= limit:^\d+\.\d+\.[1-9]\d* -.include - post-patch: @${REINPLACE_CMD} -e 's|^#!/bin/bash|#!/usr/bin/env bash|g' \ ${WRKSRC}/scripts/mono-find-provides.in \ @@ -53,14 +51,9 @@ post-patch: post-configure: @${REINPLACE_CMD} -e 's|share\/man|man|g' \ ${WRKSRC}/mcs/jay/Makefile -# Fix build on FreeBSD 9.3 (and maybe other unsupported releases) -.if ${OSVERSION} < 1000000 - @${REINPLACE_CMD} 's/^#define HAVE_LOCALCHARSET_H 1/#undef HAVE_LOCALCHARSET_H/' \ - ${WRKSRC}/eglib/config.h -.endif do-test: @(cd ${WRKSRC}/mono/tests && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} Makefile ${MAKE_ARGS} check) -.include +.include diff --git a/lang/smlnj/Makefile b/lang/smlnj/Makefile index ddf0b7ada9a8..9e90a2f5675a 100644 --- a/lang/smlnj/Makefile +++ b/lang/smlnj/Makefile @@ -18,6 +18,8 @@ LICENSE_TEXT= The text of the license can be obtained from the following URL:\ http://www.smlnj.org/license.html LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept +ONLY_FOR_ARCHS= i386 amd64 + NO_WRKSUBDIR= yes SUB_FILES= pkg-install @@ -41,21 +43,6 @@ POSITION64_DESC= use 64bit file${CALM} positions - implies RECOMPILE ML_RECOMPILE_OPTIONS= RECOMPILE POSITION64 .endif -.if (${ARCH} == "amd64") && (${OSVERSION} >= 1000029) -ONLY_FOR_ARCHS= i386 amd64 -.elif (${ARCH} == "amd64") -ONLY_FOR_ARCHS= i386 amd64 -# Compilation of the i386 runtime source on older amd64 systems requires -# i386 system headers from the respective FreeBSD Version, taken from -# stable/N/sys/i386/include, r196045 (N=8) and r225736 (N=9). -EXTRA_DEFS+= -DINCLUDE_FREEBSD_I386_SIGNAL=\\\"freebsd-8-i386-signal.h\\\" -EXTRA_DEFS+= -DINCLUDE_FREEBSD_I386_IEEEFP=\\\"freebsd-8-i386-ieeefp.h\\\" -EXTRA_DEFS+= -DINCLUDE_FREEBSD_I386__TYPES=\\\"freebsd-9-i386-_types.h\\\" -EXTRA_DEFS+= -DINCLUDE_FREEBSD_I386_ENDIAN=\\\"freebsd-9-i386-endian.h\\\" -.else -ONLY_FOR_ARCHS= i386 -.endif - .if (${ARCH} == "amd64") CFLAGS+= -m32 AS?= as diff --git a/lang/swift/Makefile b/lang/swift/Makefile index 3c5a323e93ac..6e54985f5374 100644 --- a/lang/swift/Makefile +++ b/lang/swift/Makefile @@ -45,12 +45,10 @@ PORTDOCS= * .include -.if ${OPSYS} == FreeBSD -.if (${OSVERSION} < 1002000) || (${OSVERSION} < 1100079) +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100079 BUILD_DEPENDS+= clang38:devel/llvm38 EXTRA_FLAGS= --host-cc=${LOCALBASE}/bin/clang38 --host-cxx=${LOCALBASE}/bin/clang++38 .endif -.endif post-extract: @${MKDIR} ${WRKSRC} diff --git a/mail/opensmtpd-devel/Makefile b/mail/opensmtpd-devel/Makefile index f9c4f43ceb50..2213aafb9a10 100644 --- a/mail/opensmtpd-devel/Makefile +++ b/mail/opensmtpd-devel/Makefile @@ -53,14 +53,6 @@ PAM_CONFIGURE_WITH= auth-pam=smtpd SSL_PORT_VARS= with_openssl_port=yes TABLE_DB_CONFIGURE_WITH= table-db -.include - -.if ${OPSYS} == FreeBSD && ${OSVERSION} <= 1000015 -WITH_OPENSSL_PORT= yes -.endif - -.include - CONFIGURE_ARGS+= --with-libasr=${LOCALBASE} \ --with-libevent=${LOCALBASE} \ --with-libssl=${OPENSSLBASE} \ @@ -73,9 +65,7 @@ post-patch: '/SMTPD_VERSION/s/"[^"]+"$$/"${PORTVERSION}${DISTVERSIONSUFFIX}"/' \ ${WRKSRC}/smtpd/smtpd.h -.if ${PORT_OPTIONS:MTABLE_DB} -post-install: +post-install-TABLE_DB-on: @${LN} -sf ${PREFIX}/sbin/smtpctl ${STAGEDIR}${PREFIX}/libexec/opensmtpd/makemap -.endif -.include +.include diff --git a/mail/opensmtpd/Makefile b/mail/opensmtpd/Makefile index 348a99bfc25f..f0ff781f0e89 100644 --- a/mail/opensmtpd/Makefile +++ b/mail/opensmtpd/Makefile @@ -52,14 +52,6 @@ PAM_CONFIGURE_WITH= auth-pam=smtpd SSL_PORT_VARS= with_openssl_port=yes TABLE_DB_CONFIGURE_WITH= table-db -.include - -.if ${OPSYS} == FreeBSD && ${OSVERSION} <= 1000015 -WITH_OPENSSL_PORT= yes -.endif - -.include - CONFIGURE_ARGS+= --with-libasr=${LOCALBASE} \ --with-libevent=${LOCALBASE} \ --with-libssl=${OPENSSLBASE} \ @@ -68,9 +60,7 @@ CONFIGURE_ARGS+= --with-libasr=${LOCALBASE} \ post-patch: ${REINPLACE_CMD} -e '/chmod 2555/d' ${WRKSRC}/mk/smtpctl/Makefile.in -.if ${PORT_OPTIONS:MTABLE_DB} -post-install: +post-install-TABLE_DB-on: @${LN} -sf ${PREFIX}/sbin/smtpctl ${STAGEDIR}${PREFIX}/libexec/opensmtpd/makemap -.endif -.include +.include diff --git a/math/R/compiler.mk b/math/R/compiler.mk index 51ce77479d6f..29bf01ff8e5b 100644 --- a/math/R/compiler.mk +++ b/math/R/compiler.mk @@ -1,10 +1,4 @@ # Compiler settings required for R and the R-cran ports. -.if ${OPSYS} == FreeBSD -. if ${OSVERSION} < 1000015 -USE_GCC= yes -. endif -.else -. if ${OPSYS} == DragonFly +.if ${OPSYS} == DragonFly USE_GCC= 6 -. endif .endif diff --git a/multimedia/gstreamer1-editing-services/Makefile b/multimedia/gstreamer1-editing-services/Makefile index 2c96ab965cd3..7f6630642352 100644 --- a/multimedia/gstreamer1-editing-services/Makefile +++ b/multimedia/gstreamer1-editing-services/Makefile @@ -23,11 +23,4 @@ CONFIGURE_ARGS= --enable-introspection=yes \ --with-bash-completion-dir=${PREFIX}/share/bash-completion/completions PLIST_SUB= VERSION=1.0 SOVERSION=0.800.0 -.include - -.if ${OSVERSION} < 1000033 -BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:textproc/flex -CONFIGURE_ENV+= FLEX_PATH="${LOCALBASE}/bin/flex" -.endif - .include diff --git a/multimedia/plexhometheater/Makefile b/multimedia/plexhometheater/Makefile index 40abc1718c91..8611da612794 100644 --- a/multimedia/plexhometheater/Makefile +++ b/multimedia/plexhometheater/Makefile @@ -110,8 +110,6 @@ LIRC_RUN_DEPENDS= lircd:comms/lirc PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_PulseAudio:BOOL=true -.include - post-patch: @${REINPLACE_CMD} 's/[[:<:]]ARCH[[:>:]]/FFMPEG_ARCH/' \ ${WRKSRC}/lib/ffmpeg/Makefile \ @@ -122,15 +120,6 @@ post-patch: ${WRKSRC}/plex/CMakeModules/FindIconv.cmake @${REINPLACE_CMD} 's/COMMAND\ make/COMMAND\ gmake/g' \ ${WRKSRC}/lib/ffmpeg/CMakeLists.txt -.if ${OPSYS} == "FreeBSD" && ${OSVERSION} < 1000024 - @${REINPLACE_CMD} 's/__builtin_bswap/__bswap/g' \ - ${WRKSRC}/plex/Third-Party/hash-library/crc32.cpp \ - ${WRKSRC}/plex/Third-Party/hash-library/keccak.cpp \ - ${WRKSRC}/plex/Third-Party/hash-library/md5.cpp \ - ${WRKSRC}/plex/Third-Party/hash-library/sha1.cpp \ - ${WRKSRC}/plex/Third-Party/hash-library/sha256.cpp \ - ${WRKSRC}/plex/Third-Party/hash-library/sha3.cpp -.endif post-install: ${RM} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/*.so diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile index 7dd1d1808cce..80b38885e624 100644 --- a/multimedia/transcode/Makefile +++ b/multimedia/transcode/Makefile @@ -114,11 +114,6 @@ V4L_CONFIGURE_ENABLE= v4l .include -#Disable mmx on FreeBSD 10.1 due to a transient bug in clang -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 && ${OSVERSION} < 1002000 -CONFIGURE_ARGS+= --disable-mmx -.endif - .if empty(ICONV_LIB) CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv_open=no \ ac_cv_lib_iconv_libiconv_open=no diff --git a/multimedia/zoneminder-h264/Makefile b/multimedia/zoneminder-h264/Makefile index ae89cc143235..2b0d4dd57a53 100644 --- a/multimedia/zoneminder-h264/Makefile +++ b/multimedia/zoneminder-h264/Makefile @@ -83,17 +83,6 @@ CMAKE_ARGS+= -DZM_PERL_MM_PARMS=INSTALLDIRS=site \ -DGNUTLS_LIBRARIES=0 \ -DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include" -.include - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 && ${ARCH} == i386 -CFLAGS+= -msse -.endif - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -LIB_DEPENDS+= libexecinfo.so:devel/libexecinfo -LDFLAGS+= -L${LOCALBASE}/lib -.endif - PKGMESSAGE= ${WRKDIR}/pkg-message post-extract: @@ -118,4 +107,4 @@ post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_MAN} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} -.include +.include diff --git a/multimedia/zoneminder/Makefile b/multimedia/zoneminder/Makefile index 376b4f3c8f45..3de93697f586 100644 --- a/multimedia/zoneminder/Makefile +++ b/multimedia/zoneminder/Makefile @@ -78,17 +78,6 @@ CMAKE_ARGS+= -DZM_PERL_MM_PARMS=INSTALLDIRS=site \ -DGNUTLS_LIBRARIES=0 \ -DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include" -.include - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 && ${ARCH} == i386 -CFLAGS+= -msse -.endif - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -LIB_DEPENDS+= libexecinfo.so:devel/libexecinfo -LDFLAGS+= -L${LOCALBASE}/lib -.endif - PKGMESSAGE= ${WRKDIR}/pkg-message post-extract: @@ -113,4 +102,4 @@ post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_MAN} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} -.include +.include diff --git a/net-im/skype4/Makefile b/net-im/skype4/Makefile index 6f04bb5ed79f..47442062266b 100644 --- a/net-im/skype4/Makefile +++ b/net-im/skype4/Makefile @@ -34,10 +34,6 @@ SUB_LIST+= SKYPEDIR=${SKYPEDIR} .include -.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100075 || ${OSVERSION} >= 1000000 && ${OSVERSION} < 1002507) -BROKEN= Skype 4.3 requires Linux 2.6.32 emulation -.endif - .if ${PORT_OPTIONS:MVIDEO} RUN_DEPENDS+= webcamd:multimedia/webcamd USE_LINUX+= libv4l diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile index 985f91705bc8..8b0e0c11fb93 100644 --- a/net-mgmt/collectd5/Makefile +++ b/net-mgmt/collectd5/Makefile @@ -108,7 +108,8 @@ CONFIGURE_ARGS= --localstatedir=/var \ --without-lvm \ --without-mic \ --without-oracle \ - --disable-turbostat + --disable-turbostat \ + --enable-disk CGI_RUN_DEPENDS= p5-URI>=0:net/p5-URI \ p5-CGI>=0:www/p5-CGI \ @@ -323,15 +324,6 @@ CONFIGURE_ARGS+=--enable-aggregation \ --enable-write_log \ --enable-zfs_arc \ -.include - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -PLIST_SUB+= DISK="@comment " -.else -CONFIGURE_ARGS+=--enable-disk -PLIST_SUB+= DISK="" -.endif - INSTALL_TARGET= install-strip SHEBANG_FILES= contrib/collection.cgi diff --git a/net-mgmt/collectd5/pkg-plist b/net-mgmt/collectd5/pkg-plist index fdf22215ebb7..65283d622a16 100644 --- a/net-mgmt/collectd5/pkg-plist +++ b/net-mgmt/collectd5/pkg-plist @@ -27,7 +27,7 @@ lib/collectd/csv.so %%CURL_XML%%lib/collectd/curl_xml.so %%DBI%%lib/collectd/dbi.so lib/collectd/df.so -%%DISK%%lib/collectd/disk.so +lib/collectd/disk.so lib/collectd/dns.so lib/collectd/email.so lib/collectd/exec.so diff --git a/net-mgmt/icinga2/Makefile b/net-mgmt/icinga2/Makefile index 705685cac07d..0d88f8001d7b 100644 --- a/net-mgmt/icinga2/Makefile +++ b/net-mgmt/icinga2/Makefile @@ -89,19 +89,10 @@ PLIST_SUB+= DBBACKEND="@comment " PLIST_SUB+= DBBACKEND="" .endif -.if ${OSVERSION} < 1000033 -BUILD_DEPENDS+= flex>=2.5.31:textproc/flex -CMAKE_ARGS+= -DFLEX_EXECUTABLE:STRING=${LOCALBASE}/bin/flex -CXXFLAGS+= -I${LOCALBASE}/include/flex -.endif - post-patch: .for f in ${LINUX_CONFIG} ${REINPLACE_CMD} 's,[Ll]inux,FreeBSD,g' ${WRKSRC}/etc/icinga2/conf.d/${f} .endfor -.if ${OSVERSION} < 1000000 - ${REINPLACE_CMD} 's|,--no-export-dynamic||' ${WRKSRC}/CMakeLists.txt -.endif pre-install: ${FIND} ${WRKSRC}/etc -type f -name "*.conf" -exec ${MV} {} {}.sample \; diff --git a/net/freediameter/Makefile b/net/freediameter/Makefile index 056f97a1b3f0..0f86dcf1785d 100644 --- a/net/freediameter/Makefile +++ b/net/freediameter/Makefile @@ -15,13 +15,6 @@ LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ USES= cmake bison USE_LDCONFIG= yes -CMAKE_ARGS+= -DSCTP_USE_MAPPED_ADDRESSES:BOOL=ON - -.include - -.if ${OSVERSION} < 1000033 -BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:textproc/flex -CMAKE_ARGS+= -DFLEX_EXECUTABLE:FILEPATH="${LOCALBASE}/bin/flex" -.endif +CMAKE_ARGS= -DSCTP_USE_MAPPED_ADDRESSES:BOOL=ON .include diff --git a/net/glusterfs/Makefile b/net/glusterfs/Makefile index 78c090ee7fb0..b1ffdbe3eb56 100644 --- a/net/glusterfs/Makefile +++ b/net/glusterfs/Makefile @@ -42,11 +42,4 @@ INSTALL_TARGET= install-strip PLIST_SUB= GLUSTERLIBDIR="lib/${PORTNAME}/3.7.6" KMODDIR?= /boot/modules -.include - -.if ${OSVERSION} < 1000000 -WITH_OPENSSL_PORT= yes -RUN_DEPENDS+= ${KMODDIR}/fuse.ko:sysutils/fusefs-kmod -.endif - .include diff --git a/net/openntpd/Makefile b/net/openntpd/Makefile index 13cca82c2f69..b1098be10d14 100644 --- a/net/openntpd/Makefile +++ b/net/openntpd/Makefile @@ -40,13 +40,6 @@ LDFLAGS+= -L${OPENSSLLIB} BUILD_DEPENDS+= ${NONEXISTENT}:security/libressl:stage CPPFLAGS+= -I${WRKDIR}/libressl/include LDFLAGS+= -L${WRKDIR}/libressl/lib -# security/libressl ignores implicit SSP_UNSAFE, see Mk/bsd.ssp.mk -. if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000036 && ${ARCH} == i386 -SSP_CFLAGS?= -fstack-protector -CFLAGS+= ${SSP_CFLAGS} -LDFLAGS+= -fstack-protector -LIBS+= -lssp_nonshared -. endif # Don't use COPYTREE_SHARE here as it hard links files, and the original files # are owned by root, which creates problems of its own. diff --git a/science/clhep/Makefile b/science/clhep/Makefile index 75483ce3b3fe..a11426377a8b 100644 --- a/science/clhep/Makefile +++ b/science/clhep/Makefile @@ -15,20 +15,12 @@ LICENSE_COMB= multi WRKSRC= ${WRKDIR}/${PORTVERSION}/${PORTNAME:tu} -USES= cmake:outsource perl5 tar:tgz +USES= cmake:outsource compiler:openmp perl5 tar:tgz USE_PERL5= build USE_LDCONFIG= yes PLIST_SUB= VERSION="${PORTVERSION}" -.include - -.if ${OSVERSION} < 1000000 -USES+= compiler:c++11-lib -.else -USES+= compiler:openmp -.endif - post-patch: @${REINPLACE_CMD} -e \ '/DESTINATION/s|lib$${LIB_SUFFIX}|libdata|' \ diff --git a/science/libxc/Makefile b/science/libxc/Makefile index 7c83d4a0502f..3587abff5f3c 100644 --- a/science/libxc/Makefile +++ b/science/libxc/Makefile @@ -24,11 +24,4 @@ post-patch: @${REINPLACE_CMD} -e '/^pkgconfigdir =/s,libdir),prefix)/libdata,' \ ${WRKSRC}/build/Makefile.in -.include - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000034 -LIB_DEPENDS+= libml.so:math/ldouble -LDFLAGS+= -lml -.endif - -.include +.include diff --git a/science/meep/Makefile b/science/meep/Makefile index 1668d61d39bf..fcc5e8f90b4b 100644 --- a/science/meep/Makefile +++ b/science/meep/Makefile @@ -33,11 +33,7 @@ OPENMPI_DESC= MPI support (with OpenMPI) .include .if ${OPSYS} == FreeBSD -. if ${OSVERSION} < 1000000 -MPI_DEFAULT= OPENMPI -. else MPI_DEFAULT= MPICH2 -. endif .endif .if ${PORT_OPTIONS:MMPICH2} || ${PORT_OPTIONS:MOPENMPI} diff --git a/security/afl/Makefile b/security/afl/Makefile index ca75cefa08de..1495fa01893e 100644 --- a/security/afl/Makefile +++ b/security/afl/Makefile @@ -34,13 +34,6 @@ MINIMIZE_CORPUS_RUN_DEPENDS= ${LOCALBASE}/bin/bash:shells/bash .include -.if ${OSVERSION} < 1000013 -# Broken on FreeBSD 9 -PLIST_SUB+= LLVM_SUB="@comment " -.else -PLIST_SUB+= LLVM_SUB="" -.endif - .if ${ARCH} == "i386" # Clang i386 emits .cfi_sections which base as(1) doesn't understand BUILD_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils @@ -69,8 +62,6 @@ post-patch-LLVM-on: -e 's|"clang\+\+"|"clang\+\+${LLVM_VERSION}"|g' \ ${WRKSRC}/llvm_mode/afl-clang-fast.c -.if ! ${OSVERSION} < 1000013 -# Broken on FreeBSD 9 post-build-LLVM-on: @(cd ${WRKSRC}/llvm_mode; ${SETENV} \ CC=clang${LLVM_VERSION} \ @@ -79,7 +70,6 @@ post-build-LLVM-on: CFLAGS="${CFLAGS}" \ CXXFLAGS="${CXXFLAGS}" \ ${GMAKE}) -.endif post-install: ${INSTALL_DATA} ${WRKSRC}/docs/COPYING ${STAGEDIR}${DOCSDIR}/ diff --git a/security/afl/pkg-plist b/security/afl/pkg-plist index 69f5805b32c4..50ca2557e775 100644 --- a/security/afl/pkg-plist +++ b/security/afl/pkg-plist @@ -1,12 +1,12 @@ bin/afl-analyze bin/afl-clang bin/afl-clang++ -%%LLVM_SUB%%%%LLVM%%bin/afl-clang-fast -%%LLVM_SUB%%%%LLVM%%bin/afl-clang-fast++ -%%LLVM_SUB%%%%LLVM%%lib/afl/afl-llvm-pass.so -%%LLVM_SUB%%%%LLVM%%lib/afl/afl-llvm-rt.o -%%LLVM_SUB%%%%LLVM%%lib/afl/afl-llvm-rt-32.o -%%LLVM_SUB%%%%LLVM%%lib/afl/afl-llvm-rt-64.o +%%LLVM%%bin/afl-clang-fast +%%LLVM%%bin/afl-clang-fast++ +%%LLVM%%lib/afl/afl-llvm-pass.so +%%LLVM%%lib/afl/afl-llvm-rt.o +%%LLVM%%lib/afl/afl-llvm-rt-32.o +%%LLVM%%lib/afl/afl-llvm-rt-64.o %%MINIMIZE_CORPUS%%bin/afl-cmin bin/afl-fuzz bin/afl-g++ diff --git a/security/bro/Makefile b/security/bro/Makefile index 56a129d2b015..6f8745d0f952 100644 --- a/security/bro/Makefile +++ b/security/bro/Makefile @@ -84,18 +84,6 @@ LBL_CF_RUN_DEPENDS= ${LOCALBASE}/bin/cf:sysutils/lbl-cf PERFTOOLS_CMAKE_BOOL= ENABLE_PERFTOOLS PERFTOOLS_RUN_DEPENDS= ${LOCALBASE}/bin/pprof:devel/google-perftools -.include - -.if ${PORT_OPTIONS:MBROKER} -. if ${OPSYS} == FreeBSD && ${OSVERSION} < 1001000 -# Bro 2.4 with BROKER requires caf, clang and libc++ -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang++34:lang/clang34 \ - ${LOCALBASE}/lib/c++/libstdc++.so:devel/libc++ -CXXFLAGS+= -stdlib=libc++ -I${LOCALBASE}/include/c++/v1 -L${LOCALBASE}/lib -CXX= ${LOCALBASE}/bin/clang++34 -. endif -.endif - post-install-BROCTL-on: @${MKDIR} ${STAGEDIR}${PREFIX}/logs @${MKDIR} ${STAGEDIR}${PREFIX}/spool/tmp diff --git a/security/fastd-devel/Makefile b/security/fastd-devel/Makefile index 37cfa5ca9a78..44ede8576cb4 100644 --- a/security/fastd-devel/Makefile +++ b/security/fastd-devel/Makefile @@ -25,14 +25,7 @@ USE_RC_SUBR= fastd_devel PLIST_FILES= bin/fastd-devel \ man/man1/fastd-devel.1.gz -.include - -# GCC from base does not support -mpclmul. -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000024 -CMAKE_ARGS+= -DWITH_MAC_GHASH_PCLMULQDQ=FALSE -.endif - post-install: ${INSTALL_MAN} ${WRKSRC}/doc/fastd.1 ${STAGEDIR}${PREFIX}/man/man1/fastd-devel.1 -.include +.include diff --git a/security/libotr/Makefile b/security/libotr/Makefile index 00740d3f36f9..a6258fd98f47 100644 --- a/security/libotr/Makefile +++ b/security/libotr/Makefile @@ -24,12 +24,6 @@ USE_LDCONFIG= yes INSTALL_TARGET= install-strip CPE_VENDOR= cypherpunks -.include - -.if ${OSVERSION} < 1000036 && ${ARCH} == i386 -LDFLAGS+= -lssp_nonshared -.endif - verify: checksum gpg --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.asc diff --git a/sysutils/arcconf/Makefile b/sysutils/arcconf/Makefile index 4b54143beadd..361e588d58e0 100644 --- a/sysutils/arcconf/Makefile +++ b/sysutils/arcconf/Makefile @@ -35,7 +35,7 @@ DIST_OSVER= 10 .if ${ARCH} == amd64 DIST_EXT= _x64 .elif ${ARCH} == i386 -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 +.if ${OPSYS} == FreeBSD # use the 9 i386 version for 10 i386 DIST_OSVER= 9 RUN_DEPENDS+= ${LOCALBASE}/lib/compat/libstdc++.so.6:misc/compat9x diff --git a/sysutils/bulk_extractor/Makefile b/sysutils/bulk_extractor/Makefile index cbcbaeb4105d..f1fd351bd20c 100644 --- a/sysutils/bulk_extractor/Makefile +++ b/sysutils/bulk_extractor/Makefile @@ -34,11 +34,4 @@ BEVIEWER_CONFIGURE_OFF= --disable-BEViewer BEVIEWER_USE= JAVA=yes BEVIEWER_PLIST_FILES= bin/BEViewer bin/BEViewer.jar -.include - -.if ${OSVERSION} < 1000033 -BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex -CONFIGURE_ENV= LEX=${LOCALBASE}/bin/flex -.endif - .include diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile index 2cc182698162..93df746ba1d5 100644 --- a/sysutils/lsof/Makefile +++ b/sysutils/lsof/Makefile @@ -45,10 +45,6 @@ SHEBANG_FILES= scripts/sort_res.perl5 .include -.if !empty(ARCH:Marm*) && ((${OSVERSION} < 1001505) || (${OSVERSION} > 1100000 && ${OSVERSION} < 1100052)) -BROKEN= Not supported on ARM platform below release 10.1 or a more recent current -.endif - CONFIGURE_SCRIPT= Configure CONFIGURE_ARGS= -n freebsd CONFIGURE_ENV= LSOF_CC="${CC}" FREEBSD_SYS="${SRC_BASE}/sys" diff --git a/sysutils/osquery/Makefile b/sysutils/osquery/Makefile index 103cc46f40c3..3078f3b34e2b 100644 --- a/sysutils/osquery/Makefile +++ b/sysutils/osquery/Makefile @@ -43,12 +43,6 @@ GH_PROJECT= third-party:tp GH_SUBDIR= third-party:tp MAKE_JOBS_UNSAFE= yes -.include - -.if ${OSVERSION} <= 1000000 -CFLAGS+= -D_GLIBCXX_USE_C99 -.endif - post-patch: ${REINPLACE_CMD} -e 's|/var/osquery|/var/db/osquery|g' \ ${WRKSRC}/osquery/core/init.cpp @@ -74,4 +68,4 @@ do-install: ${MKDIR} ${STAGEDIR}/var/db/osquery -.include +.include diff --git a/textproc/xxdiff/Makefile b/textproc/xxdiff/Makefile index b56e7dbd2650..b2dacb28a4b1 100644 --- a/textproc/xxdiff/Makefile +++ b/textproc/xxdiff/Makefile @@ -22,17 +22,6 @@ PORTDOCS= * OPTIONS_DEFINE= DOCS -.include - -# base flex(1) v2.5.4 is not sufficient -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000033 -BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:textproc/flex - -post-patch: - @${REINPLACE_CMD} -e 's!flex!${LOCALBASE}/bin/&!' \ - ${BUILD_WRKSRC}/xxdiff.pro -.endif - pre-build: @(cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} QMAKE=${QMAKE} \ ${MAKE_CMD} -f Makefile.bootstrap ${MAKE_ARGS} Makefile) @@ -44,4 +33,4 @@ do-install-DOCS-on: cd ${WRKSRC}/doc && ${COPYTREE_SHARE} "${PORTDOCS} ! -name Makefile" \ ${STAGEDIR}/${DOCSDIR} -.include +.include diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 5e89055f87d2..491c69fb5874 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -187,12 +187,6 @@ GN_ARGS+= is_clang=true EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1002000 -BUILD_DEPENDS+= ${LOCALBASE}/lib/c++/libstdc++.so:devel/libc++ -GN_ARGS+= extra_cxxflags="-stdlib=libc++ -isystem ${LOCALBASE}/include/c++/v1" \ - extra_ldflags="-L${LOCALBASE}/lib" -.endif - .if ${OSVERSION} < 1100000 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-10 .endif diff --git a/www/nextcloud/Makefile b/www/nextcloud/Makefile index 3a17a8865575..c514955f6357 100644 --- a/www/nextcloud/Makefile +++ b/www/nextcloud/Makefile @@ -42,18 +42,10 @@ SQLITE_USE= PHP=pdo_sqlite,sqlite3 SMB_RUN_DEPENDS= pecl-smbclient>=0.8.0:net/pecl-smbclient SSL_USE= PHP=openssl -.include - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1002000 -WITH_OPENSSL_PORT= yes -.endif - -post-stage: - ${RM} ${STAGEDIR}${WWWDIR}/updater/updater.phar - do-install: @${MKDIR} -m 0755 ${STAGEDIR}${WWWDIR} @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} + @${RM} ${STAGEDIR}${WWWDIR}/updater/updater.phar @${MKDIR} ${STAGEDIR}${WWWDIR}/data .include diff --git a/www/owncloud/Makefile b/www/owncloud/Makefile index c3fc935527bc..13d99fad904c 100644 --- a/www/owncloud/Makefile +++ b/www/owncloud/Makefile @@ -46,12 +46,6 @@ SQLITE_USE= PHP=pdo_sqlite,sqlite3 SMB_RUN_DEPENDS= pecl-smbclient>=0.8.0:net/pecl-smbclient SSL_USE= PHP=openssl -.include - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1002000 -WITH_OPENSSL_PORT= yes -.endif - do-install: @${MKDIR} -m 0755 ${STAGEDIR}${WWWDIR} @cd ${WRKSRC} && \ diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile index ed8b92f48f20..71638d5f9c1d 100644 --- a/www/webkit-gtk2/Makefile +++ b/www/webkit-gtk2/Makefile @@ -86,11 +86,6 @@ CFLAGS+= -mminimal-toc .include -.if ${OSVERSION} < 1000033 -BUILD_DEPENDS+= flex>=0:textproc/flex -CONFIGURE_ENV+= FLEX="${LOCALBASE}/bin/flex" -.endif - .if ${CHOSEN_COMPILER_TYPE} == clang CXXFLAGS+= -Wno-c++11-extensions # Shutup warning spam CXXFLAGS+= -Qunused-arguments diff --git a/www/webkit-gtk3/Makefile b/www/webkit-gtk3/Makefile index c59c9b402c43..b1dfb68b8b36 100644 --- a/www/webkit-gtk3/Makefile +++ b/www/webkit-gtk3/Makefile @@ -88,11 +88,6 @@ CFLAGS+= -mminimal-toc .include -.if ${OSVERSION} < 1000033 -BUILD_DEPENDS+= flex>=0:textproc/flex -CONFIGURE_ENV+= FLEX="${LOCALBASE}/bin/flex" -.endif - .if ${ARCH} == i386 && ! ${CFLAGS:M-march=*} # Needed for __atomic_fetch_add_8 CFLAGS+= -march=i586 diff --git a/www/webkit2-gtk3/Makefile b/www/webkit2-gtk3/Makefile index d43a070c762c..d6e7705db68b 100644 --- a/www/webkit2-gtk3/Makefile +++ b/www/webkit2-gtk3/Makefile @@ -64,11 +64,6 @@ CMAKE_ARGS+= -DENABLE_JIT:BOOL=OFF CFLAGS+= -mminimal-toc .endif -.if ${OSVERSION} < 1000033 -BUILD_DEPENDS+= flex>=0:textproc/flex -CONFIGURE_ENV+= FLEX_PATH="${LOCALBASE}/bin/flex" -.endif - post-patch: @${REINPLACE_CMD} -e 's|%%BROWSER_PLUGINS_DIR%%|${BROWSER_PLUGINS_DIR}|' \ ${WRKSRC}/Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp diff --git a/x11-toolkits/gnome-pty-helper/Makefile b/x11-toolkits/gnome-pty-helper/Makefile index ab2a079a361d..71fa369c0435 100644 --- a/x11-toolkits/gnome-pty-helper/Makefile +++ b/x11-toolkits/gnome-pty-helper/Makefile @@ -26,15 +26,7 @@ CONFIGURE_WRKSRC= ${WRKSRC}/gnome-pty-helper BUILD_WRKSRC= ${WRKSRC}/gnome-pty-helper INSTALL_WRKSRC= ${WRKSRC}/gnome-pty-helper -.include - post-patch: -# borrowed osversion from bsd.ssp.mk -.if ${OSVERSION} < 1000036 && ${ARCH} == i386 - @${REINPLACE_CMD} -e 's|-fstack-protector-strong||g; \ - s|-fstack-protector||g' \ - ${WRKSRC}/configure -.endif @${REINPLACE_CMD} -e 's|(AM_MAKEFLAGS) install-exec-hook|(AM_MAKEFLAGS)|g' \ ${WRKSRC}/gnome-pty-helper/Makefile.in diff --git a/x11-toolkits/vte3/Makefile b/x11-toolkits/vte3/Makefile index 3481f18641d3..1392555eabc6 100644 --- a/x11-toolkits/vte3/Makefile +++ b/x11-toolkits/vte3/Makefile @@ -32,16 +32,8 @@ INSTALL_TARGET= install-strip PLIST_SUB= VERSION=2.91 -.include - post-patch: @${REINPLACE_CMD} -e 's|-Wno-unused-but-set-variable||g' \ ${WRKSRC}/src/Makefile.in -# borrowed osversion from bsd.ssp.mk -.if ${OSVERSION} < 1000036 && ${ARCH} == i386 - @${REINPLACE_CMD} -e 's|-fstack-protector-strong||g; \ - s|-fstack-protector||g' \ - ${WRKSRC}/configure -.endif .include diff --git a/x11/leechcraft/Makefile b/x11/leechcraft/Makefile index 298c0d42b910..6c484c5f4689 100644 --- a/x11/leechcraft/Makefile +++ b/x11/leechcraft/Makefile @@ -406,12 +406,6 @@ BROKEN= Lemon has not supported yet because depended by libnl BROKEN= Otlozhu has not supported yet (not ported liblaretz) .endif -.if ${OSVERSION} < 1000000 -PORT_OPTIONS:= ${PORT_OPTIONS:O:u} -PORT_OPTIONS:= ${PORT_OPTIONS:NBITTORRENT} -USE_GCC= yes -.endif - post-install: @${FIND} -d ${STAGEDIR}${PREFIX}/include/leechcraft \ -type d -empty -exec ${RMDIR} {} \;