diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2017-01-09 13:16:49 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2017-01-09 13:16:49 +0000 |
| commit | 9d79e7b1469f6887d302e13ce7c67c54408a2453 (patch) | |
| tree | 263754af5ddd95f1ad55b06c101378a0cf71009b | |
| parent | a0e384abe8236d5d12c69354d90c0de5342f7efb (diff) | |
| download | ports-9d79e7b1469f6887d302e13ce7c67c54408a2453.tar.gz ports-9d79e7b1469f6887d302e13ce7c67c54408a2453.zip | |
- Remove always-true/false conditions after FreeBSD 9, 10.1, 10.2 EOL
Approved by: portmgr blanket
Notes
Notes:
svn path=/head/; revision=430947
103 files changed, 63 insertions, 895 deletions
diff --git a/archivers/unarchiver/Makefile b/archivers/unarchiver/Makefile index 12e0ddfe07c7..14ec06b83863 100644 --- a/archivers/unarchiver/Makefile +++ b/archivers/unarchiver/Makefile @@ -31,13 +31,6 @@ PORTEXAMPLES= lsar.bash_completion unar.bash_completion OPTIONS_DEFINE= DOCS EXAMPLES -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000024 -CC= clang -CXX= clang++ -.endif - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/XADMaster/??ar ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/Extra/??ar.1 ${STAGEDIR}${MANPREFIX}/man/man1 @@ -51,4 +44,4 @@ do-install-EXAMPLES-on: ${INSTALL_DATA} ${WRKSRC}/Extra/??ar.bash_completion \ ${STAGEDIR}${EXAMPLESDIR} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/audio/csound/Makefile b/audio/csound/Makefile index 808dc41a71e1..7847613749b7 100644 --- a/audio/csound/Makefile +++ b/audio/csound/Makefile @@ -105,16 +105,7 @@ DOCS_DISTFILES= Csound${PORTVERSION:R}_manual_html.zip:manual MAKE_ARGS+= Word64=1 .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000033 -BUILD_DEPENDS+= flex>0:textproc/flex -MAKE_ENV+= PATH=${LOCALBASE}/bin:$$PATH -.endif - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000054 CXXLIB= c++ -.else -CXXLIB= # empty -.endif BROKEN_powerpc64= Does not build diff --git a/audio/csound6/Makefile b/audio/csound6/Makefile index 7e351b26adc7..155739cd16c1 100644 --- a/audio/csound6/Makefile +++ b/audio/csound6/Makefile @@ -100,13 +100,6 @@ PULSEAUDIO_DESC= Build PulseAudio I/O module PULSEAUDIO_LIB_DEPENDS= libpulse-simple.so:audio/pulseaudio PULSEAUDIO_CMAKE_OFF= -DUSE_PULSEAUDIO:BOOL=OFF -.include <bsd.port.options.mk> - -.if ${OSVERSION} < 1000033 -BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:textproc/flex -CMAKE_ARGS+= -DFLEX_EXECUTABLE:STRING="${LOCALBASE}/bin/flex" -.endif - post-patch: @${REINPLACE_CMD} -e \ '/-O3/s|^|#| ; \ diff --git a/audio/optimfrog/Makefile b/audio/optimfrog/Makefile index 23eb498509a7..5a2ad91dfcee 100644 --- a/audio/optimfrog/Makefile +++ b/audio/optimfrog/Makefile @@ -14,6 +14,8 @@ LICENSE_NAME= OptimFROG - License LICENSE_FILE= ${WRKSRC}/license.html #only available as html LICENSE_PERMS= dist-mirror pkg-mirror auto-accept +RUN_DEPENDS+= ${LOCALBASE}/lib/compat/libstdc++.so.6:misc/compat9x + CONFLICTS_INSTALL?= optimfrog-sse2-[0-9]* ONLY_FOR_ARCHS?= amd64 i386 @@ -40,10 +42,6 @@ DISTNAME= OptimFROG_FreeBSD_x86_${DISTVERSION:S/.//} . endif .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 -RUN_DEPENDS+= ${LOCALBASE}/lib/compat/libstdc++.so.6:misc/compat9x -.endif - do-install: @(cd ${WRKSRC} && ./install.sh -d ${STAGEDIR}) diff --git a/audio/praat/Makefile b/audio/praat/Makefile index 5f68bab0b20e..17e21c587a65 100644 --- a/audio/praat/Makefile +++ b/audio/praat/Makefile @@ -19,13 +19,6 @@ USE_GNOME= gtk20 MAKEFILE= makefile PLIST_FILES= bin/praat man/man1/praat.1.gz -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 1000000 -# Requires std=g++11 -USE_GCC= yes -.endif - post-patch: @${FIND} ${WRKSRC} -name Makefile -exec \ ${REINPLACE_CMD} -e 's|^CFLAGS =|CFLAGS +=|' {} \; @@ -46,4 +39,4 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/praat ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${FILESDIR}/praat.1 ${STAGEDIR}${PREFIX}/man/man1 -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/audio/shoutcast/Makefile b/audio/shoutcast/Makefile index f1b98cfa49bf..1e35660f64bf 100644 --- a/audio/shoutcast/Makefile +++ b/audio/shoutcast/Makefile @@ -57,13 +57,11 @@ PLIST_FILES+= "@postunexec if [ ! -s ${SHOUTCASTDIR}/sc_serv.${ext} ];\ .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000010 .if ${ARCH} == "i386" RUN_DEPENDS+= ${LOCALBASE}/lib/compat/libstdc++.so.6:misc/compat9x .else RUN_DEPENDS+= ${LOCALBASE}/lib32/compat/libstdc++.so.6:misc/compat9x .endif -.endif post-patch: @${REINPLACE_CMD} -e '/sc_serv2 directory/d' \ diff --git a/audio/sndio/Makefile b/audio/sndio/Makefile index 44ddceb0b8cf..e45e68cce4ab 100644 --- a/audio/sndio/Makefile +++ b/audio/sndio/Makefile @@ -17,15 +17,8 @@ CONFIGURE_ARGS= --prefix=${PREFIX} --mandir=${PREFIX}/man USE_LDCONFIG= yes USE_RC_SUBR= sndiod -.include <bsd.port.pre.mk> - -# FreeBSD 9.x does not have SOCK_CLOEXEC -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -CFLAGS+= -DSOCK_CLOEXEC=0 -.endif - -USERS= _sndio -GROUPS= _sndio +USERS= _sndio +GROUPS= _sndio # Parallel build leads to problems, but sndio is very quick to compile # as is so not worth fixing @@ -38,4 +31,4 @@ post-install: ${STAGEDIR}${PREFIX}/bin/aucat \ ${STAGEDIR}${PREFIX}/bin/midicat -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/benchmarks/fio/Makefile b/benchmarks/fio/Makefile index 61d2ce99d19a..dbef29fd8517 100644 --- a/benchmarks/fio/Makefile +++ b/benchmarks/fio/Makefile @@ -18,16 +18,6 @@ GNUPLOT_DESC= Support for plotting graphs GNUPLOT_BUILD_DEPENDS= ${LOCALBASE}/bin/gnuplot:math/gnuplot -.include <bsd.port.options.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000013 -BUILD_DEPENDS+= byacc>0:devel/byacc -MAKE_ARGS+= YACC=${LOCALBASE}/bin/yacc - -BUILD_DEPENDS+= flex>0:textproc/flex -MAKE_ARGS+= LEX=${LOCALBASE}/bin/flex -.endif - BROKEN_powerpc64= Does not build on powerpc64 do-install: diff --git a/biology/seqan-apps/Makefile b/biology/seqan-apps/Makefile index 7ef0d3d826f0..a8bd2161b730 100644 --- a/biology/seqan-apps/Makefile +++ b/biology/seqan-apps/Makefile @@ -28,16 +28,6 @@ USE_GCC= yes .include <bsd.port.pre.mk> -.if ${OSVERSION} < 1000000 -post-patch: - # missing C99 functions in FreeBSD's math.h, use C++ instead - @${REINPLACE_CMD} -e 's|expl(|std::exp(|g' ${WRKSRC}/apps/snp_store/snp_store.h - @${REINPLACE_CMD} -e 's|logl(|std::log(|g' ${WRKSRC}/apps/snp_store/snp_store.h - # the other way around (use math.h instead of cmath) - @${REINPLACE_CMD} -e 's|std::round|round|g' ${WRKSRC}/apps/yara/mapper_writer.h - @${REINPLACE_CMD} -e 's|std::erfc|erfc|g' ${WRKSRC}/apps/yara/bits_matches.h -.endif - .if ${ARCH} == "i386" PLIST_SUB+= RM_I386="@comment " .else diff --git a/biology/ugene/Makefile b/biology/ugene/Makefile index 337315a28f48..15b540e19e63 100644 --- a/biology/ugene/Makefile +++ b/biology/ugene/Makefile @@ -31,6 +31,9 @@ QMAKE_ARGS= INSTALL_PREFIX="${PREFIX}" UGENE_INSTALL_DATA="${DATADIR}" \ LUPDATE="${LUPDATE}" ALL_TARGET= release +# Required for Google Test code +CXXFLAGS+= -std=c++11 + DOCSDIR= ${DATADIR}/manuals OPTIONS_DEFINE= DOCS @@ -38,11 +41,6 @@ DOCS_DESC= Install official UGENE documentation (PDF) .include <bsd.port.pre.mk> -# Required for Google Test code -.if ${OSVERSION} > 1000054 -CXXFLAGS+= -std=c++11 -.endif - .if ${ARCH} == amd64 # XXX: need to manually tell the build we are on x64 QMAKE_ARGS+= CONFIG+=x64 diff --git a/cad/iverilog/Makefile b/cad/iverilog/Makefile index 7b7f17f501f0..8658975c275e 100644 --- a/cad/iverilog/Makefile +++ b/cad/iverilog/Makefile @@ -13,17 +13,9 @@ COMMENT= Verilog simulation and synthesis tool LICENSE= GPLv2 GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-suffix USES= bison gmake MAKE_JOBS_UNSAFE= yes -.include <bsd.port.options.mk> - -.if ${OSVERSION} < 1000033 -BUILD_DEPENDS+= flex>=0:textproc/flex -CONFIGURE_ENV+= ac_cv_prog_LEX="${LOCALBASE}/bin/flex" -.endif - -CONFIGURE_ARGS= --disable-suffix - .include <bsd.port.mk> diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile index 11ac218081c2..4bdbb1a746a8 100644 --- a/cad/kicad-devel/Makefile +++ b/cad/kicad-devel/Makefile @@ -184,10 +184,8 @@ PLIST_SHAREDDIR_LIST= share/mimelnk/application \ .include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD -.if ${OSVERSION} < 1000000 || ${CHOSEN_COMPILER_TYPE} == gcc - IGNORE= builds only on greater than 10 and with clang -.endif +.if ${OPSYS} == FreeBSD && ${CHOSEN_COMPILER_TYPE} == gcc +IGNORE= builds only with clang .endif .include <bsd.port.post.mk> diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile index 314f2b94d42c..080773c5f06f 100644 --- a/comms/gnuradio/Makefile +++ b/comms/gnuradio/Makefile @@ -102,9 +102,6 @@ TESTING_BUILD_DEPENDS= cppunit-config:devel/cppunit LIBSTRIP_FILES+= uhd LIB_DEPENDS+= libuhd.so:comms/uhd .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -USE_GCC= yes -.endif PATCH_FILES= docs/doxygen/Doxyfile.in \ gr-fec/lib/CMakeLists.txt diff --git a/comms/gqrx/Makefile b/comms/gqrx/Makefile index 47a5f21d443c..f555be8c28c5 100644 --- a/comms/gqrx/Makefile +++ b/comms/gqrx/Makefile @@ -43,11 +43,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/gqrx.desktop \ ${STAGEDIR}${PREFIX}/share/applications -.include <bsd.port.pre.mk> - -# Chase comms/gnuradio compiler choice -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -USE_GCC= yes -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/comms/libsdr-gui/Makefile b/comms/libsdr-gui/Makefile index 4ea169f9e05d..eae58c112759 100644 --- a/comms/libsdr-gui/Makefile +++ b/comms/libsdr-gui/Makefile @@ -23,10 +23,4 @@ USE_QT5= core buildtools_build qmake widgets USES= cmake pkgconfig USE_LDCONFIG= yes -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -USE_GCC= yes -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/mariadb100-server/Makefile b/databases/mariadb100-server/Makefile index 6dadc0c5824f..67f59030b5a1 100644 --- a/databases/mariadb100-server/Makefile +++ b/databases/mariadb100-server/Makefile @@ -139,7 +139,7 @@ post-install: .include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000012 +.if ${OPSYS} == FreeBSD CMAKE_ARGS+= -DWITH_JEMALLOC="system" .else CMAKE_ARGS+= -DWITH_JEMALLOC="no" @@ -151,7 +151,7 @@ NOT_FOR_ARCHS_REASON= TokuDB not supported on 32-bit platforms, see \ https://github.com/percona/PerconaFT/blob/master/README.md .endif -.if ${ARCH} == 'i386' && ${OSVERSION} >= 1001000 +.if ${ARCH} == 'i386' # Server segfaults on i386 when built with clang >= 3.4 USE_GCC= yes .endif diff --git a/databases/mariadb101-server/Makefile b/databases/mariadb101-server/Makefile index e82643d096a6..80bd2afced37 100644 --- a/databases/mariadb101-server/Makefile +++ b/databases/mariadb101-server/Makefile @@ -154,14 +154,7 @@ IGNORE= BASE_GSSAPI is not compatible with OpenSSL from ports. Use other GSSAPI .endif .if ${OPSYS} == FreeBSD -. if ${OSVERSION} >= 1000012 CMAKE_ARGS+= -DWITH_JEMALLOC="system" -. else -CMAKE_ARGS+= -DWITH_JEMALLOC="no" -. if ${PORT_OPTIONS:MGSSAPI_BASE} -IGNORE= requires a Kerberos implementation from ports on FreeBSD < 10. Select GSSAPI_HEIMDAL or GSSAPI_MIT option -. endif -. endif .endif post-patch: diff --git a/databases/mariadb55-server/Makefile b/databases/mariadb55-server/Makefile index 9d25ba7e72c4..29d635f7f80b 100644 --- a/databases/mariadb55-server/Makefile +++ b/databases/mariadb55-server/Makefile @@ -108,14 +108,14 @@ MAXKEY_EXTRA_PATCHES= ${FILESDIR}/extra-patch-include_my_compare.h .include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000012 +.if ${OPSYS} == FreeBSD CMAKE_ARGS+= -DWITH_JEMALLOC="system" .else CMAKE_ARGS+= -DWITH_JEMALLOC="no" .endif # Server segfaults on i386 when built with clang >= 3.4 -.if ${ARCH} == 'i386' && ${OSVERSION} >= 1001000 +.if ${ARCH} == 'i386' USE_GCC= yes .endif diff --git a/databases/mongodb32-tools/Makefile b/databases/mongodb32-tools/Makefile index cd7b48706024..76d34f280a0e 100644 --- a/databases/mongodb32-tools/Makefile +++ b/databases/mongodb32-tools/Makefile @@ -39,13 +39,6 @@ MAKE_ENV= GOPATH="${WRKSRC}/.gopath:${WRKSRC}/vendor" \ USES= localbase MY_TAGS= -tags "${USE_MY_TAGS}" -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 1000000 -# Cannot be built -IGNORE= unsupported on FreeBSD 9 or older -.endif - post-patch: @cd ${WRKSRC} ; ${MKDIR} ${WRKSRC}/.gopath/src/github.com/${GH_ACCOUNT} ; \ ${LN} -sf ${WRKSRC} ${WRKSRC}/.gopath/src/github.com/${GH_ACCOUNT}/${GH_PROJECT} @@ -68,4 +61,4 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/${x} ${STAGEDIR}${DOCSDIR} .endfor -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile index 0de63ddfca64..dca4ea980dd1 100644 --- a/databases/mysql57-server/Makefile +++ b/databases/mysql57-server/Makefile @@ -129,15 +129,6 @@ PERFSCHM_SUB_LIST+= PERFSCHEMRC="" PERFSCHM_SUB_LIST_OFF+= PERFSCHEMRC="--skip-performance-schema" .endif -.include <bsd.port.options.mk> - -### 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 <bsd.port.pre.mk> .if ${SSL_DEFAULT} == base diff --git a/databases/mysql57-server/files/rapid_plugin-patch-_x_mysqlxtest__src_mysqlxtest.cc b/databases/mysql57-server/files/rapid_plugin-patch-_x_mysqlxtest__src_mysqlxtest.cc deleted file mode 100644 index 078f3106848b..000000000000 --- a/databases/mysql57-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/databases/percona56-server/Makefile b/databases/percona56-server/Makefile index 6856adbdffa2..b19b95432729 100644 --- a/databases/percona56-server/Makefile +++ b/databases/percona56-server/Makefile @@ -105,11 +105,6 @@ BROKEN= Does not compile on arm NOT_FOR_ARCHS= i386 NOT_FOR_ARCHS_REASON= TokuDB not supported on 32-bit platforms, see \ https://github.com/percona/PerconaFT/blob/master/README.md - -.if ${OPSYS} == FreeBSD && ${OSVERSION} <= 1000000 -IGNORE= unsupported on FreeBSD 9 or older -.endif - .endif .include <bsd.port.post.mk> diff --git a/databases/pg_citus/Makefile b/databases/pg_citus/Makefile index c8ffcb9f68c0..8cf5a4d25331 100644 --- a/databases/pg_citus/Makefile +++ b/databases/pg_citus/Makefile @@ -22,11 +22,4 @@ GNU_CONFIGURE= yes INSTALL_TARGET= install-strip MAKE_ARGS= INSTALL="${INSTALL} -c" -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000033 -BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:textproc/flex -MAKE_ARGS+= FLEX=${LOCALBASE}/bin/flex -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/pgbouncer/Makefile b/databases/pgbouncer/Makefile index 86b82bc101e0..8fc01fe1779d 100644 --- a/databases/pgbouncer/Makefile +++ b/databases/pgbouncer/Makefile @@ -41,12 +41,6 @@ PLIST_SUB+= PGBOUNCER_USER="${USERS}" \ PGBOUNCER_RUNDIR="${PGBOUNCER_RUNDIR}" SUB_LIST+= PGBOUNCER_RUNDIR="${PGBOUNCER_RUNDIR}" -.include <bsd.port.options.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -WITH_OPENSSL_PORT= yes -.endif - post-patch: @${REINPLACE_CMD} -e "s|= pgbouncer.log|= ${PGBOUNCER_LOGDIR}/pgbouncer.log|g" \ -e "s|= pgbouncer.pid|= ${PGBOUNCER_RUNDIR}/pgbouncer.pid|g" \ diff --git a/databases/pgmodeler/Makefile b/databases/pgmodeler/Makefile index e2df5f97ab00..e2e93505a43f 100644 --- a/databases/pgmodeler/Makefile +++ b/databases/pgmodeler/Makefile @@ -33,10 +33,4 @@ pre-install: post-install: @${RM} ${STAGEDIR}${PREFIX}/bin/tests -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 && ${OSVERSION} < 1002000 -USE_GCC= yes -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile index 7c73f98571f5..b8d0a4274200 100644 --- a/databases/sqlite3/Makefile +++ b/databases/sqlite3/Makefile @@ -197,10 +197,7 @@ UNKNOWN_SQL_CPPFLAGS= -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION=1 .if !defined(WITH_DEBUG) CFLAGS+= -Os .endif -CPPFLAGS+= -DHAVE_ISNAN=1 -DHAVE_MALLOC_USABLE_SIZE=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_USLEEP=1 -.if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && ${OSVERSION} >= 1000029) -CPPFLAGS+= -DHAVE_STRCHRNUL=1 -.endif +CPPFLAGS+= -DHAVE_ISNAN=1 -DHAVE_MALLOC_USABLE_SIZE=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_USLEEP=1 -DHAVE_STRCHRNUL=1 post-configure: @${ECHO_MSG} "===> CONFIGURE_ARGS=${CONFIGURE_ARGS}" diff --git a/deskutils/gnote/Makefile b/deskutils/gnote/Makefile index a5287512d8ab..bc057551ae55 100644 --- a/deskutils/gnote/Makefile +++ b/deskutils/gnote/Makefile @@ -39,12 +39,6 @@ DOCS= AUTHORS ChangeLog NEWS README TODO PLIST_SUB+= VERSION=${PORTVERSION} -.include <bsd.port.options.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -EXTRA_PATCHES= ${FILESDIR}/extra-src_base_macros.hpp -.endif - post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${DOCS} diff --git a/deskutils/gnote/files/extra-src_base_macros.hpp b/deskutils/gnote/files/extra-src_base_macros.hpp deleted file mode 100644 index a04e604f38ab..000000000000 --- a/deskutils/gnote/files/extra-src_base_macros.hpp +++ /dev/null @@ -1,46 +0,0 @@ -Working around c++11 issues with the port compiler used on 9.3. - ---- src/base/macros.hpp.orig 2016-01-06 21:33:38.207318000 +0100 -+++ src/base/macros.hpp 2016-01-06 21:45:25.932524000 +0100 -@@ -29,14 +29,16 @@ - #ifndef __BASE_MACROS_ - #define __BASE_MACROS_ - --#if __cplusplus < 201103L -+//#if __cplusplus < 201103L - #include <tr1/memory> - #include <boost/foreach.hpp> - #include <boost/lexical_cast.hpp> -+/* - #else - #include <memory> - #include <string> - #endif -+*/ - - #if __GNUC__ - #define _PRINTF_FORMAT(f,a) \ -@@ -46,7 +48,7 @@ - #endif - - // define 'final' and 'override' for pre-C++11 compilers --#if __cplusplus < 201103L -+//#if __cplusplus < 201103L - #define final - #define override - #define FOREACH(var, container) BOOST_FOREACH(var, container) -@@ -58,6 +60,7 @@ - using std::tr1::enable_shared_from_this; - using std::tr1::dynamic_pointer_cast; - using std::tr1::static_pointer_cast; -+/* - #else - #define FOREACH(var, container) for(var : container) - #define TO_STRING(x) std::to_string(x) -@@ -69,5 +72,6 @@ - using std::dynamic_pointer_cast; - using std::static_pointer_cast; - #endif -+*/ - - #endif diff --git a/deskutils/owncloudclient/Makefile b/deskutils/owncloudclient/Makefile index ae45b4a8d838..3af8e9e85529 100644 --- a/deskutils/owncloudclient/Makefile +++ b/deskutils/owncloudclient/Makefile @@ -40,7 +40,7 @@ PLIST_SUB= VERSION=${PORTVERSION} .include <bsd.port.options.mk> -.if ${OPSYS} != FreeBSD || ${OSVERSION} < 1000015 +.if ${OPSYS} != FreeBSD WITH_OPENSSL_PORT= yes # CMake 3.3.x will use $PATH when looking for headers and libraries by default, diff --git a/devel/appstream-glib/Makefile b/devel/appstream-glib/Makefile index a137755a4e11..fdee3dd24031 100644 --- a/devel/appstream-glib/Makefile +++ b/devel/appstream-glib/Makefile @@ -44,12 +44,4 @@ MANPAGE_BUILD_DEPENDS= docbook-xml>=0:textproc/docbook-xml \ docbook-xsl>=0:textproc/docbook-xsl MANPAGES_USE= GNOME=libxslt:build -.include <bsd.port.options.mk> - -.if ${OSVERSION} < 1000000 && ${OPSYS} == FreeBSD -post-patch: - ${REINPLACE_CMD} -e 's|-Wtype-limits||g' \ - ${WRKSRC}/configure -.endif - .include <bsd.port.mk> diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile index c813c3d2570e..956745121b5e 100644 --- a/devel/binutils/Makefile +++ b/devel/binutils/Makefile @@ -82,10 +82,6 @@ PLIST_SUB+= GOLD="" PLIST_SUB+= GOLD="@comment " .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -CONFIGURE_ARGS+= --disable-initfini-array -.endif - .if ${ARCH} == "amd64" CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL} .else diff --git a/devel/caf/Makefile b/devel/caf/Makefile index 67e023889279..d82ac9f141a4 100644 --- a/devel/caf/Makefile +++ b/devel/caf/Makefile @@ -51,15 +51,4 @@ LOG_LEVEL_INFO_CMAKE_ON= -DCAF_LOG_LEVEL:STRING=2 LOG_LEVEL_DEBUG_CMAKE_ON= -DCAF_LOG_LEVEL:STRING=3 LOG_LEVEL_TRACE_CMAKE_ON= -DCAF_LOG_LEVEL:STRING=4 -.include <bsd.port.options.mk> - -regression-test: test - -.if ${OSVERSION} < 1001000 -# require clang & libc++ -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang34:lang/clang34 \ - ${LOCALBASE}/lib/c++/libstdc++.so:devel/libc++ -CXXFLAGS+= -stdlib=libc++ -I${LOCALBASE}/include/c++/v1 -L${LOCALBASE}/lib -.endif - .include <bsd.port.mk> diff --git a/devel/cvsd/Makefile b/devel/cvsd/Makefile index b036b717d458..fef6ad3c7384 100644 --- a/devel/cvsd/Makefile +++ b/devel/cvsd/Makefile @@ -12,7 +12,8 @@ COMMENT= CVS pserver daemon LICENSE= GPLv2 -EXTRA_PATCHES= ${FILESDIR}/extra-cvsd-buildroot.in +BUILD_DEPENDS= cvs:devel/cvs +RUN_DEPENDS= cvs:devel/cvs USE_RC_SUBR= cvsd USES= perl5 @@ -25,13 +26,6 @@ OPTIONS_DEFINE= DOCS PORTDOCS= FAQ NEWS README -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1000000 -BUILD_DEPENDS+= cvs:devel/cvs -RUN_DEPENDS+= cvs:devel/cvs -.endif - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/cvsd ${STAGEDIR}${PREFIX}/sbin/cvsd .for f in cvsd-buginfo cvsd-buildroot cvsd-passwd @@ -46,4 +40,4 @@ do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/cvsd/files/extra-cvsd-buildroot.in b/devel/cvsd/files/patch-cvsd-buildroot.in index 6e7ed4b33e1b..6e7ed4b33e1b 100644 --- a/devel/cvsd/files/extra-cvsd-buildroot.in +++ b/devel/cvsd/files/patch-cvsd-buildroot.in diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile index 57cbfc2075f6..e266e0670983 100644 --- a/devel/gdb/Makefile +++ b/devel/gdb/Makefile @@ -69,15 +69,8 @@ TUI_CONFIGURE_ENABLE= tui .include <bsd.port.options.mk> -.if ${OSVERSION} < 1000010 -# FreeBSD 9.x and earlier do not define SIGLIBRT in <sys/signal.h> -CFLAGS+= -DSIGLIBRT=33 -.endif - -.if ${OSVERSION} > 1000010 # The option -Wno-extended-offsetof is supported by clang only CFLAGS+= -Wno-extended-offsetof -.endif .if ! ${PORT_OPTIONS:MBUNDLED_READLINE} EXCLUDE+= readline diff --git a/devel/libdispatch/Makefile b/devel/libdispatch/Makefile index 96c54859ebae..be5240f4c0f4 100644 --- a/devel/libdispatch/Makefile +++ b/devel/libdispatch/Makefile @@ -76,19 +76,6 @@ _MAN3= dispatch.3 \ dispatch_walltime.3 PLIST_FILES+= ${_MAN3:S|^|man/man3/|:S|$|.gz|} -.include <bsd.port.pre.mk> - -.if (${OSVERSION} < 1000024) -OPTIONS_DEFINE= CLANG -OPTIONS_DEFAULT= CLANG -CLANG_DESC= Build with LLVM/Clang (required for blocks support) -.endif - -.if ${PORT_OPTIONS:MCLANG} -CONFIGURE_ARGS+= --with-blocks-runtime=/usr/lib -CONFIGURE_ENV+= CC="/usr/bin/clang" -.endif - # # Get rid of .la and static library files # @@ -97,4 +84,4 @@ post-configure: '/Install the pseudo-library/,/staticlibs=/s,^,#,' ${WRKSRC}/libtool -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/libsigrok/Makefile b/devel/libsigrok/Makefile index 75305b87b434..daebadf5775e 100644 --- a/devel/libsigrok/Makefile +++ b/devel/libsigrok/Makefile @@ -28,11 +28,4 @@ post-patch: -e '/\*freebsd\*/,/;;/d' \ ${WRKSRC}/configure -.include <bsd.port.pre.mk> - -# Workaround for libusb not knowing LIBUSB_CLASS_APPLICATION -.if (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100029) || (${OSVERSION} < 1000715) -CFLAGS+= -DLIBUSB_CLASS_APPLICATION=0xfe -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/libsigrokdecode/Makefile b/devel/libsigrokdecode/Makefile index 4406ba9dc02e..caec6d817197 100644 --- a/devel/libsigrokdecode/Makefile +++ b/devel/libsigrokdecode/Makefile @@ -19,11 +19,4 @@ MAKE_JOBS_UNSAFE= yes USE_LDCONFIG= yes INSTALL_TARGET= install-strip -.include <bsd.port.pre.mk> - -# Workaround for libusb not knowing LIBUSB_CLASS_APPLICATION -.if (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100029) || (${OSVERSION} < 1000715) -CFLAGS+= -DLIBUSB_CLASS_APPLICATION=0xfe -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/qt5-qdoc/Makefile b/devel/qt5-qdoc/Makefile index 36f616822c69..eee3e4e3c0fe 100644 --- a/devel/qt5-qdoc/Makefile +++ b/devel/qt5-qdoc/Makefile @@ -17,10 +17,4 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC} PLIST_FILES= ${QT_BINDIR}/qdoc -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -EXTRA_PATCHES= ${FILESDIR}/extrapatch-src_qdoc_qdocindexfiles.cpp -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/qt5-qdoc/files/extrapatch-src_qdoc_qdocindexfiles.cpp b/devel/qt5-qdoc/files/extrapatch-src_qdoc_qdocindexfiles.cpp deleted file mode 100644 index a6625cb2c0b2..000000000000 --- a/devel/qt5-qdoc/files/extrapatch-src_qdoc_qdocindexfiles.cpp +++ /dev/null @@ -1,21 +0,0 @@ -There is a bug [1] in the old gcc used on FreeBSD 9.3, which makes -qdoc segfault on sorting while generating its index sections. - -As mentioned in [2] by Michael Hansen, we can circument this by using -qSort instead of std::sort on FreeBSD 9.x. - - -[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59391 -[2] https://bugreports.qt.io/browse/QTBUG-43057 - ---- src/qdoc/qdocindexfiles.cpp.orig 2016-10-09 21:13:42.831072000 +0200 -+++ src/qdoc/qdocindexfiles.cpp 2016-10-09 21:13:56.153968000 +0200 -@@ -1412,7 +1412,7 @@ - const Aggregate* inner = static_cast<const Aggregate*>(node); - - NodeList cnodes = inner->childNodes(); -- std::sort(cnodes.begin(), cnodes.end(), Node::nodeNameLessThan); -+ qSort(cnodes.begin(), cnodes.end(), Node::nodeNameLessThan); - - foreach (Node* child, cnodes) { - generateIndexSections(writer, child, generateInternalNodes); diff --git a/ftp/lftp/Makefile b/ftp/lftp/Makefile index 4478256ca024..02de79bbc458 100644 --- a/ftp/lftp/Makefile +++ b/ftp/lftp/Makefile @@ -47,15 +47,6 @@ GNUTLS_CONFIGURE_WITH= gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_USES= pkgconfig -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MOPENSSL} -. if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000015 -WITH_OPENSSL_PORT= yes -CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} -. endif -.endif - post-install: ${MV} ${STAGEDIR}${PREFIX}/etc/lftp.conf \ ${STAGEDIR}${PREFIX}/etc/lftp.conf.sample diff --git a/ftp/vsftpd-ext/Makefile b/ftp/vsftpd-ext/Makefile index 64f9d426d8ee..48379d447ae2 100644 --- a/ftp/vsftpd-ext/Makefile +++ b/ftp/vsftpd-ext/Makefile @@ -38,15 +38,6 @@ CONFLICTS= vsftpd-3* vsftpd${SSL_SUFFIX}${PKGNAMESUFFIX2}-3* .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -.if exists(/usr/bin/clang) -CC= clang -.else -BUILD_DEPENDS+= clang33:lang/clang33 -CC= clang33 -.endif -.endif - .if ${PORT_OPTIONS:MRC_SCRIPT} USE_RC_SUBR= vsftpd .endif diff --git a/games/bunnysay/Makefile b/games/bunnysay/Makefile index 38f2ae733e20..b2d2bad71237 100644 --- a/games/bunnysay/Makefile +++ b/games/bunnysay/Makefile @@ -20,16 +20,7 @@ GH_ACCOUNT= co60ca PLIST_FILES= bin/bunnysay -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -LIB_DEPENDS+= libc++.so.1:devel/libc++ -CFLAGS+= -isystem${LOCALBASE}/include/c++/v1 -CXXFLAGS+= -isystem${LOCALBASE}/include/c++/v1 -LDFLAGS+= -L${LOCALBASE}/lib/c++ -.endif - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/games/darkplaces/Makefile b/games/darkplaces/Makefile index 4f600400e918..117b3ca569a4 100644 --- a/games/darkplaces/Makefile +++ b/games/darkplaces/Makefile @@ -41,10 +41,6 @@ SERVER_DESC= Build dedicated server .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -USE_GCC= yes # internal compiler error on base gcc -.endif - .if ${PORT_OPTIONS:MGLX} || ${PORT_OPTIONS:MSDL} USE_GL= glu PLIST_SUB+= CLIENT="" diff --git a/games/pioneer/Makefile b/games/pioneer/Makefile index fa0b31095977..0e8c953dd8c8 100644 --- a/games/pioneer/Makefile +++ b/games/pioneer/Makefile @@ -80,10 +80,6 @@ CXXFLAGS+= -D_GLIBCXX_USE_C99 post-patch: .SILENT ${REINPLACE_CMD} -e '/^OPTIMISE=/d' \ ${WRKSRC}/configure.ac -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000054 - ${REINPLACE_CMD} -e 's/std::acosh/acosh/g ; s/std::copysign/copysign/g' \ - ${WRKSRC}/src/Orbit.cpp -.endif post-patch-MODELCOMPILER-off: .SILENT ${REINPLACE_CMD} -e 's/pioneer modelcompiler/pioneer/' \ diff --git a/games/stonesoup/Makefile b/games/stonesoup/Makefile index 197ef1296b7b..104eef85ef30 100644 --- a/games/stonesoup/Makefile +++ b/games/stonesoup/Makefile @@ -74,12 +74,6 @@ LUA_MAKE_ARGS_OFF= NO_LUA_BINDINGS=yes CFLAGS+= -D_GLIBCXX_USE_C99 .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -MAKE_ARGS+= NO_YACC=YesPlease -CFLAGS+= -std=c++11 -LDFLAGS:= -Wl,-rpath=${_GCC_RUNTIME} ${LDFLAGS} -.endif - post-patch-SOUND-on: @${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/AppHdr.h @${REINPLACE_CMD} -e "s,%%SOUND%%,," ${WRKSRC}/AppHdr.h diff --git a/games/ufoai/Makefile b/games/ufoai/Makefile index 4b8f82f66e74..4b0497ae2564 100644 --- a/games/ufoai/Makefile +++ b/games/ufoai/Makefile @@ -79,10 +79,6 @@ CONFIGURE_ARGS+=--disable-uforadiant PLIST_SUB+= UFORADIANT="@comment " .endif -.if ${OSVERSION} < 1000024 -FAVORITE_COMPILER= gcc -.endif - .include <bsd.port.pre.mk> post-extract: diff --git a/graphics/hdr_tools/Makefile b/graphics/hdr_tools/Makefile index 02c2d13866c6..a6889f2ea501 100644 --- a/graphics/hdr_tools/Makefile +++ b/graphics/hdr_tools/Makefile @@ -36,11 +36,6 @@ CXXFLAGS+= -msse2 -mfpmath=sse CXXFLAGS+= -fopenmp .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000034 -LIB_DEPENDS+= libml.so:math/ldouble -LDFLAGS+= -lml -.endif - post-patch: @${REINPLACE_CMD} -e 's,RGBColorspace,s&,' ${WRKSRC}/image.cc diff --git a/graphics/libGL/Makefile.common b/graphics/libGL/Makefile.common index e3d6e223bbe0..255b6178d734 100644 --- a/graphics/libGL/Makefile.common +++ b/graphics/libGL/Makefile.common @@ -46,11 +46,6 @@ PKGDEINSTALL= ${.CURDIR}/pkg-deinstall PORTSCOUT= ignore:1 .endif -.if ${OSVERSION} < 1000033 -BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:textproc/flex -CONFIGURE_ENV+= ac_cv_prog_LEX=${LOCALBASE}/bin/flex -.endif - python_OLD_CMD= "/usr/bin/env[[:space:]]python" python_CMD= ${LOCALBASE}/bin/python2 SHEBANG_FILES= src/gallium/*/*/*.py src/gallium/tools/trace/*.py \ diff --git a/graphics/libgphoto2/Makefile b/graphics/libgphoto2/Makefile index ec20aac91d51..de220c70198d 100644 --- a/graphics/libgphoto2/Makefile +++ b/graphics/libgphoto2/Makefile @@ -45,8 +45,6 @@ NLS_CONFIGURE_ENABLE= nls XML_USE= GNOME=libxml2 XML_CONFIGURE_OFF= --with-libxml-2.0=no -.include <bsd.port.options.mk> - post-patch: .for i in configure libgphoto2_port/configure @${REINPLACE_CMD} -e \ diff --git a/graphics/mitsuba/Makefile b/graphics/mitsuba/Makefile index 113a0bf8e3b2..8a2744168d6f 100644 --- a/graphics/mitsuba/Makefile +++ b/graphics/mitsuba/Makefile @@ -39,16 +39,6 @@ MAKE_JOBS_UNSAFE= yes HG_REVISION= 11ee1d7236f3 FETCH_ARGS= -o ${DISTNAME}${EXTRACT_SUFX} -.include <bsd.port.pre.mk> - -# Unfortunately, the code is not GCC 4.2.1 compatible (due to bugs in GCC -# itself). Use system compiler if it is Clang. -.if ${OSVERSION} < 1000024 -CC= clang -CXX= clang++ -CPP= clang-cpp -.endif - post-patch: @${REINPLACE_CMD} -e '/CMAKE_SYSTEM_NAME/s,Linux,${OPSYS},' \ ${WRKSRC}/data/cmake/MitsubaExternal.cmake \ @@ -61,4 +51,4 @@ post-install: @${RMDIR} ${STAGEDIR}${PREFIX}/share/mitsuba/data/ior/CMakeFiles/ior_database.dir @${RMDIR} ${STAGEDIR}${PREFIX}/share/mitsuba/data/ior/CMakeFiles -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/ocrad/Makefile b/graphics/ocrad/Makefile index 8ed15ef63fb0..1bfa071b5d54 100644 --- a/graphics/ocrad/Makefile +++ b/graphics/ocrad/Makefile @@ -22,15 +22,6 @@ PLIST_FILES= bin/${PORTNAME} man/man1/ocrad.1.gz OPTIONS_DEFINE= DOCS EXAMPLES -.include <bsd.port.options.mk> - -.if ${OSVERSION} < 1000024 -EXTRACT_DEPENDS= lzip:archivers/lzip -EXTRACT_CMD= ${LOCALBASE}/bin/lzip -EXTRACT_BEFORE_ARGS= -cd -EXTRACT_AFTER_ARGS= | ${TAR} -xf - -.endif - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/doc/ocrad.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 diff --git a/graphics/pixie/Makefile b/graphics/pixie/Makefile index 806b55f33f63..11854381f2f3 100644 --- a/graphics/pixie/Makefile +++ b/graphics/pixie/Makefile @@ -46,13 +46,6 @@ BROKEN_sparc64= Does not compile on sparc64 OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - -.if ${OSVERSION} < 1000033 -BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:textproc/flex -CONFIGURE_ENV+= ac_cv_path_FLEX="${LOCALBASE}/bin/flex" -.endif - post-patch: @${REINPLACE_CMD} -e '/test/s|==|=|g ; \ s|-lpthread|-pthread|g' ${WRKSRC}/configure @@ -63,7 +56,7 @@ post-patch: ${WRKSRC}/src/ri/Makefile.in \ ${WRKSRC}/src/sdr/Makefile.in -post-install: +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} AUTHORS ChangeLog DEVNOTES NEWS \ README ${STAGEDIR}${DOCSDIR}) diff --git a/graphics/seexpr/Makefile b/graphics/seexpr/Makefile index 440308d49a36..3fbc85480a98 100644 --- a/graphics/seexpr/Makefile +++ b/graphics/seexpr/Makefile @@ -27,19 +27,8 @@ CXXFLAGS+= -I${LOCALBASE}/include CMAKE_ARGS+= -DUSE_SSE41:BOOL=ON .endif -.include <bsd.port.pre.mk> - -# base flex(1) v2.5.4 is not sufficient -.if ${OSVERSION} < 1000033 -BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:textproc/flex -.endif - post-patch: @${REINPLACE_CMD} -e '/<alloca\.h>/d' ${WRKSRC}/src/SeExpr/SePlatform.h @${REINPLACE_CMD} -e 's, "dl",,' ${WRKSRC}/src/SeExpr/CMakeLists.txt -.if ${OSVERSION} < 1000033 - @${REINPLACE_CMD} -e '/COMMAND/s,flex,${LOCALBASE}/bin/&,' \ - ${WRKSRC}/src/build/macros.cmake -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/xfractint/Makefile b/graphics/xfractint/Makefile index b06270efd72e..a7e2af0da8ff 100644 --- a/graphics/xfractint/Makefile +++ b/graphics/xfractint/Makefile @@ -17,12 +17,6 @@ ALL_TARGET= ${PORTNAME} DESKTOP_ENTRIES= "Xfracint" "${COMMENT}" "" "${PORTNAME}" "" "false" -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 1000034 -EXTRA_PATCHES= ${FILESDIR}/pre-1000034-libm-patch -.endif - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xfractint ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/unix/xfractint.man \ @@ -34,4 +28,4 @@ do-install: cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${STAGEDIR}${DATADIR} .endfor -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/xfractint/files/pre-1000034-libm-patch b/graphics/xfractint/files/pre-1000034-libm-patch deleted file mode 100644 index 5d2ad985bb3c..000000000000 --- a/graphics/xfractint/files/pre-1000034-libm-patch +++ /dev/null @@ -1,44 +0,0 @@ ---- common/mpmath_c.c.orig 2012-03-10 17:28:37.000000000 -0500 -+++ common/mpmath_c.c 2012-03-10 17:34:32.000000000 -0500 -@@ -220,7 +220,7 @@ - if(t.x < -690) - e2x = 0.0; - else -- e2x = expl(t.x); -+ e2x = exp(t.x); - #ifdef XFRACT - if (isnan(e2x) || isinf(e2x)) - e2x = 1.0; ---- common/soi.c.orig 2011-05-07 15:36:36.000000000 -0500 -+++ common/soi.c 2012-03-10 17:08:47.000000000 -0500 -@@ -25,7 +25,7 @@ - #define FABS(x) fabsl(x) - /* the following needs to be changed back to frexpl once the portability - issue has been addressed JCO */ --#ifndef XFRACT -+#ifndef __FreeBSD__ - #define FREXP(x,y) frexpl(x,y) - #else - #define FREXP(x,y) frexp(x,y) ---- unix/fpu087.c.orig 2012-03-10 17:28:49.000000000 -0500 -+++ unix/fpu087.c 2012-03-10 17:36:40.000000000 -0500 -@@ -86,8 +86,8 @@ - *Sinh = 1.0; - *Cosh = 1.0; - } else { -- *Sinh = (LDBL)sinhl(*Angle); -- *Cosh = (LDBL)coshl(*Angle); -+ *Sinh = (LDBL)sinh(*Angle); -+ *Cosh = (LDBL)cosh(*Angle); - } - if (isnan(*Sinh) || isinf(*Sinh)) - *Sinh = 1.0; -@@ -119,7 +119,7 @@ - { - LDBL pwr,y; - y = x->y; -- pwr = expl(x->x); -+ pwr = exp(x->x); - if (isnan(pwr) || isinf(pwr)) - pwr = 1.0; - z->x = (double)(pwr*cosl(y)); diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile index e46e5d758421..49c2d28531ee 100644 --- a/java/openjdk8/Makefile +++ b/java/openjdk8/Makefile @@ -351,11 +351,6 @@ BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/openjdk7 . endif .endif -# PR193009: work around the rtld bug -.if ${OSVERSION} < 1001511 -CONFIGURE_ARGS+= --enable-static-libjli -.endif - .if ${COMPILER_TYPE} == clang .if ${COMPILER_VERSION} >= 35 MAKE_ENV+= COMPILER_WARNINGS_FATAL=false diff --git a/mail/alpine/Makefile b/mail/alpine/Makefile index 0a4069a03600..63d32c038ce4 100644 --- a/mail/alpine/Makefile +++ b/mail/alpine/Makefile @@ -61,10 +61,6 @@ MAKE_ARGS+= CC="${CC}" CXX="${CXX}" GCCCFLAGS="${CFLAGS}" .if ${PORT_OPTIONS:MSSL} USE_OPENSSL= yes -.if ${OSVERSION} < 1000000 -# OpenSSL is pre v1.0 in FBSD9.x so the ports version needs to be used -WITH_OPENSSL_PORT= yes -.endif CONFIGURE_ARGS+= --with-ssl-dir=${OPENSSLDIR} \ --with-ssl-include-dir=${OPENSSLINC} \ diff --git a/mail/dma/Makefile b/mail/dma/Makefile index e3c0aae6f124..6a893eb0119d 100644 --- a/mail/dma/Makefile +++ b/mail/dma/Makefile @@ -53,9 +53,6 @@ post-patch: ${WRKSRC}/dma.conf @${REINPLACE_CMD} -e '/^MK_MAN/d' -e 's/^NOMAN/NO_MAN/' \ ${WRKSRC}/bsd/dma-mbox-create/Makefile -.if ${OSVERSION} < 1000013 - @${REINPLACE_CMD} -e 's,^YFLAGS.*,,' ${WRKSRC}/bsd/dma/Makefile -.endif post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile index c8de14bdca52..43d99b6d3a77 100644 --- a/mail/dovecot2/Makefile +++ b/mail/dovecot2/Makefile @@ -132,18 +132,9 @@ LDAP_VARS= _REQUIRE+=slapd MYSQL_VARS= _REQUIRE+=mysql PGSQL_VARS= _REQUIRE+=postgresql -.include <bsd.port.options.mk> - SUB_LIST+= REQUIRE="${_REQUIRE}" SUB_FILES+= pkg-message -.if ${OPSYS} == "FreeBSD" && ${OSVERSION} < 1000011 -USES+= compiler:c11 -WITH_OPENSSL_PORT= yes -.endif - -.include <bsd.port.pre.mk> - CPPFLAGS+= -I${LOCALBASE}/include -I${OPENSSLINC} LDFLAGS+= -L${LOCALBASE}/lib -L${OPENSSLLIB} @@ -169,4 +160,4 @@ post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}) -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/mail/exim/Makefile b/mail/exim/Makefile index 346bcd096e4e..a55ba33322ed 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -83,12 +83,6 @@ IGNORE= you cannot enable DMARC without SPF and DKIM support .if ! ${PORT_OPTIONS:MDNSSEC} || ! ${PORT_OPTIONS:MTLS} IGNORE= you cannot enable DANE without DNSSEC support or without TLS support .endif -# Use Openssl from the ports -.if ${OSVERSION} < 1000000 -. if ! ${PORT_OPTIONS:MGNUTLS} -WITH_OPENSSL_PORT= yes -. endif -.endif .endif .if ${PORT_OPTIONS:MSA_EXIM} || defined(FETCH_ALL) diff --git a/math/hfst/Makefile b/math/hfst/Makefile index e96507def5a8..bbb31abb8e2b 100644 --- a/math/hfst/Makefile +++ b/math/hfst/Makefile @@ -20,12 +20,4 @@ LDFLAGS+= -L${LOCALBASE}/lib SHEBANG_FILES= tools/src/hfst-tagger/src/hfst_tagger_compute_data_statistics.py USE_LDCONFIG= yes -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000033 -BUILD_DEPENDS+= flex>2.5.33:textproc/flex -CONFIGURE_ENV+= LEX="${FLEX}" -FLEX= ${LOCALBASE}/bin/flex -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/multimedia/ffmpeg0/Makefile b/multimedia/ffmpeg0/Makefile index bcbf1464f4a3..1dc0381fec28 100644 --- a/multimedia/ffmpeg0/Makefile +++ b/multimedia/ffmpeg0/Makefile @@ -163,10 +163,6 @@ COMPAT_HEADERS=libavcodec/avcodec.h \ .include <bsd.port.pre.mk> -.if ${OPSYS} == "FreeBSD" && ${OSVERSION} < 1000000 -CONFIGURE_ARGS+= --enable-memalign-hack -.endif - .if ${ARCH} == armv6 CONFIGURE_ENV+= ASFLAGS=-no-integrated-as CFLAGS+= -no-integrated-as diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile index edf4f1fa31c0..9c3303c467d3 100644 --- a/multimedia/gstreamer-plugins/Makefile +++ b/multimedia/gstreamer-plugins/Makefile @@ -161,12 +161,4 @@ post-patch: -e 's|-Wmissing-include-dirs||g' \ ${WRKSRC}/configure -# workaround a crash in clang 3.3 crash llvm bug # 15840 -.if ${OPSYS} == FreeBSD -.if ((${OSVERSION} >= 901504 && ${OSVERSION} < 902502) || \ - (${OSVERSION} >= 1000037 && ${OSVERSION} < 1000056)) -USE_GCC= any -.endif -.endif - .include <bsd.port.mk> diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile index aa63007546a2..514bea5534af 100644 --- a/multimedia/gstreamer/Makefile +++ b/multimedia/gstreamer/Makefile @@ -42,21 +42,8 @@ LIBCHECK_CONFIGURE_OFF= --disable-check NLS_USES= gettext NLS_CONFIGURE_OFF= --disable-nls -.include <bsd.port.pre.mk> - -# workaround a crash in clang 3.3 crash llvm bug # 15840 -.if ((${OSVERSION} >= 901504 && ${OSVERSION} < 902502) || \ - (${OSVERSION} >= 1000037 && ${OSVERSION} < 1000056)) -USE_GCC= any -.endif - -.if ${OSVERSION} < 1000033 -BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:textproc/flex -CONFIGURE_ENV+= FLEX_PATH="${LOCALBASE}/bin/flex" -.endif - post-patch: @${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \ ${WRKSRC}/configure -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/multimedia/gstreamer1-plugins/Makefile b/multimedia/gstreamer1-plugins/Makefile index d81fa5954853..7cc4e0d07a0f 100644 --- a/multimedia/gstreamer1-plugins/Makefile +++ b/multimedia/gstreamer1-plugins/Makefile @@ -125,11 +125,6 @@ DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE} DEFAULT_DVD_DEVICE=/dev/cd0 .endif -# openssl in 9.x is too old -.if ${GST_PLUGIN} == dtls && ${OSVERSION} < 1000000 -WITH_OPENSSL_PORT=yes -.endif - post-patch: .if ${DIST} == bad # custom rule to fix opencv detection in configure @@ -171,12 +166,6 @@ post-patch: s|$$(top_builddir)/gst-libs/gst/video/libgstbadvideo-$$(GST_API_VERSION).la|-lgstbadvideo-${VERSION}|' .endif -# workaround a crash in clang 3.3 crash llvm bug # 15840 -.if ((${OSVERSION} >= 901504 && ${OSVERSION} < 902502) || \ - (${OSVERSION} >= 1000037 && ${OSVERSION} < 1000056)) -USE_GCC= any -.endif - pre-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/gstreamer-1.0 diff --git a/multimedia/gstreamer1/Makefile b/multimedia/gstreamer1/Makefile index 97b9654899d5..4d1d745f758f 100644 --- a/multimedia/gstreamer1/Makefile +++ b/multimedia/gstreamer1/Makefile @@ -37,13 +37,6 @@ LIBCHECK_DESC= Unit tests support LIBCHECK_CONFIGURE_ENABLE= check LIBCHECK_LIB_DEPENDS= libcheck.so:devel/libcheck -.include <bsd.port.options.mk> - -.if ${OSVERSION} < 1000033 -BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:textproc/flex -CONFIGURE_ENV+= FLEX_PATH="${LOCALBASE}/bin/flex" -.endif - post-patch: @${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \ ${WRKSRC}/configure diff --git a/multimedia/libdvbcsa/Makefile b/multimedia/libdvbcsa/Makefile index 6327465c50de..af7353281b19 100644 --- a/multimedia/libdvbcsa/Makefile +++ b/multimedia/libdvbcsa/Makefile @@ -20,12 +20,6 @@ USE_LDCONFIG= yes .include <bsd.port.options.mk> -# Workaround for GCC in 9.x post r260075 -# OSVERSION taken from r260135, the closest OSVERSION -.if ${OSVERSION} > 902505 && ${OSVERSION} < 1000000 -CFLAGS+= -flax-vector-conversions -.endif - .if defined(MACHINE_CPU) && ${MACHINE_CPU:Msse2} CONFIGURE_ARGS+=--enable-sse2 .elif defined(MACHINE_CPU) && ${MACHINE_CPU:Mmmx} diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile index 619dd3fc5d1f..57f0a59a41c5 100644 --- a/multimedia/mkvtoolnix/Makefile +++ b/multimedia/mkvtoolnix/Makefile @@ -49,33 +49,7 @@ QT5_USES= desktop-file-utils shared-mime-info QT5_USE= QT5=buildtools_build,concurrent,core,gui,network,quick,widgets QT5_CONFIGURE_ENABLE= qt -.include <bsd.port.options.mk> - post-patch: -.if ${OSVERSION} < 1000000 - @${REINPLACE_CMD} -e 's|std::llround|llround|g' \ - ${WRKSRC}/src/common/hevc.cpp \ - ${WRKSRC}/src/common/mpeg4_p10.cpp \ - ${WRKSRC}/src/common/theora.cpp \ - ${WRKSRC}/src/extract/cuesheets.cpp \ - ${WRKSRC}/src/extract/xtr_avi.cpp \ - ${WRKSRC}/src/info/mkvinfo.cpp \ - ${WRKSRC}/src/input/r_avi.cpp \ - ${WRKSRC}/src/input/r_matroska.cpp \ - ${WRKSRC}/src/input/r_ogm.cpp \ - ${WRKSRC}/src/input/r_tta.cpp \ - ${WRKSRC}/src/merge/cluster_helper.h \ - ${WRKSRC}/src/merge/generic_packetizer.cpp \ - ${WRKSRC}/src/merge/output_control.cpp \ - ${WRKSRC}/src/merge/timestamp_factory.h \ - ${WRKSRC}/src/output/p_dirac.cpp \ - ${WRKSRC}/src/output/p_hevc.cpp \ - ${WRKSRC}/src/output/p_mpeg4_p10.cpp \ - ${WRKSRC}/src/output/p_tta.cpp \ - ${WRKSRC}/src/output/p_wavpack.cpp - @${REINPLACE_CMD} -e 's|std::lround|lround|g' \ - ${WRKSRC}/src/propedit/tag_target.cpp -.endif @${REINPLACE_CMD} -e '/LIBS="-lintl/s,-liconv,$$ICONV_LIBS,' \ ${WRKSRC}/configure diff --git a/net-mgmt/ccnet-client/Makefile b/net-mgmt/ccnet-client/Makefile index 3f8cf735eb11..6cbb20442334 100644 --- a/net-mgmt/ccnet-client/Makefile +++ b/net-mgmt/ccnet-client/Makefile @@ -37,10 +37,4 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-ldap INSTALL_TARGET= install-strip -.include <bsd.port.options.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -WITH_OPENSSL_PORT= yes -.endif - .include <bsd.port.mk> diff --git a/net-mgmt/ccnet-server/Makefile b/net-mgmt/ccnet-server/Makefile index 89a403969ad2..d0c247a6e4b2 100644 --- a/net-mgmt/ccnet-server/Makefile +++ b/net-mgmt/ccnet-server/Makefile @@ -49,12 +49,6 @@ PLIST_SUB= USERS=${USERS} \ SEAFILE_SERVER=${SEAFILE_SERVER} \ HAIWENDIR=${HAIWENDIR} -.include <bsd.port.options.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -WITH_OPENSSL_PORT= yes -.endif - post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${SEABIN} ${STAGEDIR}${PREFIX}/${SEALIB} ${INSTALL_PROGRAM} ${STAGEDIR}${PREFIX}/bin/ccnet-init ${STAGEDIR}${PREFIX}/${SEABIN} diff --git a/net-p2p/twister/Makefile b/net-p2p/twister/Makefile index 993cd9b01efd..113b65512c9c 100644 --- a/net-p2p/twister/Makefile +++ b/net-p2p/twister/Makefile @@ -43,14 +43,8 @@ MAKE_ENV= BOOST_INCLUDE_PATH=${LOCALBASE}/include \ PLIST_FILES= bin/twisterd PORTDOCS= README.md -.include <bsd.port.options.mk> - -.if (${OPSYS} == FreeBSD && ${OSVERSION} < 1000000) -WITH_OPENSSL_PORT= yes -.endif - post-patch: - ${REINPLACE_CMD} 's|%%PORTVERSION%%|${PORTVERSION}|' \ + @${REINPLACE_CMD} 's|%%PORTVERSION%%|${PORTVERSION}|' \ ${WRKSRC}/share/genbuild.sh pre-configure: @@ -60,7 +54,7 @@ do-install: ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/twisterd ${STAGEDIR}${PREFIX}/bin do-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile index 489fa115197a..e8c0d2d88f3e 100644 --- a/net/freeradius3/Makefile +++ b/net/freeradius3/Makefile @@ -286,14 +286,6 @@ CONFIGURE_ARGS+=--with-udpfromto WITH_OPENSSL_PORT=yes .endif -# rlm_eap_fast is currently broken under 9.x: -# https://github.com/FreeRADIUS/freeradius-server/issues/1803 -.if ${OSVERSION} < 1000015 -PLIST_SUB+= EAPFAST="@comment " -.else -PLIST_SUB+= EAPFAST="" -.endif - .include <bsd.port.pre.mk> # if we're installing, place sample configs into ${EXAMPLESDIR} @@ -350,9 +342,6 @@ SUB_LIST+= RADIUS_USER="${RADIUS_USER}" \ SUB_LIST+= REQUIRE="${_REQUIRE}" post-patch: -.if ${OSVERSION} < 1000015 - ${RM} -r ${WRKSRC}/src/modules/rlm_eap/types/rlm_eap_fast -.endif # never try to find execinfo.h (needed until we can enable/disable backtrace @${REINPLACE_CMD} -e '/#include <execinfo.h>/d' ${WRKSRC}/configure @${REINPLACE_CMD} -Ee "s:tests/all.mk ::" ${WRKSRC}/src/all.mk diff --git a/net/freeradius3/pkg-plist b/net/freeradius3/pkg-plist index 51090bf4e620..f028d7aeaa3d 100644 --- a/net/freeradius3/pkg-plist +++ b/net/freeradius3/pkg-plist @@ -141,9 +141,9 @@ include/freeradius/vqp.h %%LIBDIR%%/rlm_eap_gtc.a %%LIBDIR%%/rlm_eap_gtc.la %%LIBDIR%%/rlm_eap_gtc.so -%%EAPFAST%%%%LIBDIR%%/rlm_eap_fast.a -%%EAPFAST%%%%LIBDIR%%/rlm_eap_fast.la -%%EAPFAST%%%%LIBDIR%%/rlm_eap_fast.so +%%LIBDIR%%/rlm_eap_fast.a +%%LIBDIR%%/rlm_eap_fast.la +%%LIBDIR%%/rlm_eap_fast.so %%LIBDIR%%/rlm_eap_leap.a %%LIBDIR%%/rlm_eap_leap.la %%LIBDIR%%/rlm_eap_leap.so diff --git a/net/haproxy-devel/Makefile b/net/haproxy-devel/Makefile index 224fb459d9a4..93808114a139 100644 --- a/net/haproxy-devel/Makefile +++ b/net/haproxy-devel/Makefile @@ -63,9 +63,6 @@ IGNORE?= enable PCRE support to use DeviceAtlas .if ${PORT_OPTIONS:MOPENSSL} USES+= ssl MAKE_ARGS+= USE_OPENSSL=1 -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000015 -WITH_OPENSSL_PORT= yes -.endif .if !empty(SSL_DEFAULT:Mlibressl*) BROKEN= does not build with libressl .endif diff --git a/net/ladvd/Makefile b/net/ladvd/Makefile index 62cc727723a9..b8d04545112c 100644 --- a/net/ladvd/Makefile +++ b/net/ladvd/Makefile @@ -34,13 +34,7 @@ PLIST_FILES= man/man8/ladvd.8.gz \ OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - -.if ${OSVERSION} < 1000000 -CFLAGS_amd64= -fPIC -.endif - post-patch: - ${REINPLACE_CMD} -e 's|LICENSE||' ${WRKSRC}/doc/Makefile.am + @${REINPLACE_CMD} -e 's|LICENSE||' ${WRKSRC}/doc/Makefile.am .include <bsd.port.mk> diff --git a/net/librdkafka/Makefile b/net/librdkafka/Makefile index 9fa1bfb58eb1..204bb9819dfb 100644 --- a/net/librdkafka/Makefile +++ b/net/librdkafka/Makefile @@ -27,13 +27,7 @@ MAKE_ARGS= pkgconfigdir=${PREFIX}/libdata/pkgconfig USE_LDCONFIG= yes -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 && ${ARCH} == "i386" -CFLAGS+= -march=pentium -.endif - post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.* -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/pen/Makefile b/net/pen/Makefile index bf0173aa56c1..91cf17550be8 100644 --- a/net/pen/Makefile +++ b/net/pen/Makefile @@ -39,14 +39,7 @@ KQUEUE_CONFIGURE_ON= --with-kqueue KQUEUE_CONFIGURE_OFF= --with-poll DEBUG_CONFIGURE_ENABLE= debugging -.include <bsd.port.pre.mk> - -# DSR needs a newer version of the netmap's API -.if ${OSVERSION} < 903000 || (${OSVERSION} >= 1000000 && ${OSVERSION} < 1001000) -CONFIGURE_ARGS+= --without-dsr -.endif - post-patch: @${REINPLACE_CMD} 's/-pg//' ${WRKSRC}/configure -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/remmina/Makefile b/net/remmina/Makefile index c529f7713f94..524a529cd8e3 100644 --- a/net/remmina/Makefile +++ b/net/remmina/Makefile @@ -49,13 +49,6 @@ SSH_CMAKE_BOOL= WITH_LIBSSH TERM_USE= gnome=vte3 TERM_CMAKE_BOOL= WITH_VTE -.include <bsd.port.pre.mk> - -# utimensat(5) only available in FreeBSD from 10.3-RELEASE -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1002506 -EXTRA_PATCHES= ${FILESDIR}/extrapatch-remmina_src_remmina__file.c -.endif - post-patch: # do not build plugins and locales , they are provided by separated ports ${REINPLACE_CMD} -e's|add_subdirectory(remmina-plugins)||' \ @@ -66,4 +59,4 @@ post-patch: -e 's,FreeBSD,FreeBSD|DragonFly,' \ ${WRKSRC}/remmina/CMakeLists.txt -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/remmina/files/extrapatch-remmina_src_remmina__file.c b/net/remmina/files/extrapatch-remmina_src_remmina__file.c deleted file mode 100644 index e3cf33578df6..000000000000 --- a/net/remmina/files/extrapatch-remmina_src_remmina__file.c +++ /dev/null @@ -1,37 +0,0 @@ ---- remmina/src/remmina_file.c.orig 2016-10-31 23:54:16 UTC -+++ remmina/src/remmina_file.c -@@ -64,7 +64,7 @@ - #define MIN_WINDOW_WIDTH 10 - #define MIN_WINDOW_HEIGHT 10 - --static struct timespec times[2]; -+static struct timeval times[2]; - - typedef struct _RemminaSetting - { -@@ -631,16 +631,21 @@ remmina_file_touch(RemminaFile *remminaf - TRACE_CALL("remmina_file_touch"); - int fd; - struct stat st; -+ struct timeval tv_atim, tv_mtim; - int r; - - if ((r = stat(remminafile->filename, &st)) < 0) { - if (errno != ENOENT) - remmina_log_printf("stat %s:", remminafile->filename); - } else if (!r) { -- times[0] = st.st_atim; -- times[1] = st.st_mtim; -- if (utimensat(AT_FDCWD, remminafile->filename, times, 0) < 0) -- remmina_log_printf("utimensat %s:", remminafile->filename); -+ tv_atim.tv_sec = st.st_atim.tv_sec; -+ tv_atim.tv_usec = st.st_atim.tv_nsec / 1000; -+ tv_mtim.tv_sec = st.st_mtim.tv_sec; -+ tv_mtim.tv_usec = st.st_mtim.tv_nsec / 1000; -+ times[0] = tv_atim; -+ times[1] = tv_mtim; -+ if (utimes(remminafile->filename, times) < 0) -+ remmina_log_printf("utimes %s:", remminafile->filename); - return; - } - diff --git a/news/nzbget/Makefile b/news/nzbget/Makefile index dcc779a1ff71..b5aaef41e8a7 100644 --- a/news/nzbget/Makefile +++ b/news/nzbget/Makefile @@ -58,10 +58,6 @@ GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls \ CONFIGURE_ARGS+= --disable-sigchld-handler .endif -.if ${OSVERSION} < 1000500 -USE_GCC= yes -.endif - post-install: ${INSTALL_DATA} ${WRKSRC}/nzbget.conf \ ${STAGEDIR}${PREFIX}/etc/nzbget.conf.sample diff --git a/ports-mgmt/synth/Makefile b/ports-mgmt/synth/Makefile index 275f82d269f2..2b88fcb85c41 100644 --- a/ports-mgmt/synth/Makefile +++ b/ports-mgmt/synth/Makefile @@ -26,9 +26,8 @@ MAKE_ENV= NCURSES_LINK=static .include <bsd.port.pre.mk> post-extract: -.if (${OPSYS} == FreeBSD && ${OSVERSION} < 1000000) || \ - (${OPSYS} == DragonFly && ${OSVERSION} < 400600) - ${REINPLACE_CMD} -e 's|"re"|"r"|' ${WRKSRC}/src/unix.adb +.if ${OPSYS} == DragonFly && ${OSVERSION} < 400600 + @${REINPLACE_CMD} -e 's|"re"|"r"|' ${WRKSRC}/src/unix.adb .endif @${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|" \ ${WRKSRC}/src/definitions.ads diff --git a/print/lyx/Makefile b/print/lyx/Makefile index 75ae2074fbea..7dffe808aa5f 100644 --- a/print/lyx/Makefile +++ b/print/lyx/Makefile @@ -50,10 +50,4 @@ HUNSPELL_LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell NLS_CONFIGURE_OFF= --disable-nls NLS_USES= gettext -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1000000 && ${OSVERSION} < 1002000) -EXTRA_PATCHES= ${FILESDIR}/extrapatch-src_frontends_qt4_GuiWorkArea.cpp -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/print/lyx/files/extrapatch-src_frontends_qt4_GuiWorkArea.cpp b/print/lyx/files/extrapatch-src_frontends_qt4_GuiWorkArea.cpp deleted file mode 100644 index fa35a656373a..000000000000 --- a/print/lyx/files/extrapatch-src_frontends_qt4_GuiWorkArea.cpp +++ /dev/null @@ -1,28 +0,0 @@ -This patch is necessary for FreeBSD 10.0 and 10.1, whose libc++ does not work -with boost and std::bind() and leads to the following failure: - -frontends/qt4/liblyxqt4.a(GuiWorkArea.o): In function `_ZN5boost6detail8function26void_function_obj_invoker0INSt3__16__bindIMN3lyx8frontend11GuiWorkAreaEFvvEJPS7_EEEvE6invokeERNS1_15function_bufferE': -GuiWorkArea.cpp:(.text._ZN5boost6detail8function26void_function_obj_invoker0INSt3__16__bindIMN3lyx8frontend11GuiWorkAreaEFvvEJPS7_EEEvE6invokeERNS1_15function_bufferE[_ZN5boost6detail8function26void_function_obj_invoker0INSt3__16__bindIMN3lyx8frontend11GuiWorkAreaEFvvEJPS7_EEEvE6invokeERNS1_15function_bufferE]+0xa): undefined reference to `_ZNSt3__18__invokeIRMN3lyx8frontend11GuiWorkAreaEFvvERPS3_JEvEEDTcldsdeclsr3std3__1E7forwardIT0_Efp0_Efp_spclsr3std3__1E7forwardIT1_Efp1_EEEOT_OS9_DpOSA_' -/usr/bin/ld: lyx: hidden symbol `_ZNSt3__18__invokeIRMN3lyx8frontend11GuiWorkAreaEFvvERPS3_JEvEEDTcldsdeclsr3std3__1E7forwardIT0_Efp0_Efp_spclsr3std3__1E7forwardIT1_Efp1_EEEOT_OS9_DpOSA_' isn't defined -/usr/bin/ld: final link failed: Nonrepresentable section on output - ---- src/frontends/qt4/GuiWorkArea.cpp.orig 2016-05-23 23:47:31 UTC -+++ src/frontends/qt4/GuiWorkArea.cpp -@@ -55,6 +55,8 @@ - #include "frontends/FontMetrics.h" - #include "frontends/WorkAreaManager.h" - -+#include <boost/bind.hpp> -+ - #include <QContextMenuEvent> - #if (QT_VERSION < 0x050000) - #include <QInputContext> -@@ -320,7 +322,7 @@ void GuiWorkArea::init() - d->setCursorShape(Qt::IBeamCursor); - - d->synthetic_mouse_event_.timeout.timeout.connect( -- bind(&GuiWorkArea::generateSyntheticMouseEvent, -+ boost::bind(&GuiWorkArea::generateSyntheticMouseEvent, - this)); - - // Initialize the vertical Scroll Bar diff --git a/security/acme-client/Makefile b/security/acme-client/Makefile index 9004b071123c..35eb3a7233e1 100644 --- a/security/acme-client/Makefile +++ b/security/acme-client/Makefile @@ -53,14 +53,7 @@ LDFLAGS+= -L${WRKDIR}/libressl/lib . ifnmake describe STAGEDIR_libressl!= ${MAKE} -V STAGEDIR -C ${PORTSDIR}/security/libressl . endif -# 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 - + pre-configure: @(cd ${STAGEDIR_libressl}${LOCALBASE} && ${COPYTREE_SHARE} \ . ${WRKDIR}/libressl "! -name *.so*") diff --git a/security/fastd/Makefile b/security/fastd/Makefile index a9e8af2efdfa..f9a09de529fc 100644 --- a/security/fastd/Makefile +++ b/security/fastd/Makefile @@ -23,14 +23,7 @@ USE_RC_SUBR= fastd PLIST_FILES= bin/fastd \ man/man1/fastd.1.gz -.include <bsd.port.pre.mk> - -# 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 -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/hpenc/Makefile b/security/hpenc/Makefile index 548e58031bd2..e89c0e4027ce 100644 --- a/security/hpenc/Makefile +++ b/security/hpenc/Makefile @@ -27,12 +27,6 @@ CXXFLAGS+= -std=c++11 \ -I${OPENSSLINC} LDFLAGS+= -pthread -lcrypto -L${OPENSSLLIB} -.include <bsd.port.options.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000036 -WITH_OPENSSL_PORT= yes -.endif - post-install: ${INSTALL_MAN} ${WRKSRC}/doc/hpenc.1 ${STAGEDIR}${MANPREFIX}/man/man1 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/hpenc diff --git a/security/pidgin-otr/Makefile b/security/pidgin-otr/Makefile index 6326d7552482..a0b8a9f0a749 100644 --- a/security/pidgin-otr/Makefile +++ b/security/pidgin-otr/Makefile @@ -37,10 +37,4 @@ OPTIONS_SUB= yes NLS_USES= gettext NLS_USES_OFF= gettext-tools -.include <bsd.port.options.mk> - -.if ${OSVERSION} < 1000036 && ${ARCH} == i386 -LDFLAGS+= -lssp_nonshared -.endif - .include <bsd.port.mk> diff --git a/security/s2n/Makefile b/security/s2n/Makefile index 999e1977cf14..b99a8647724c 100644 --- a/security/s2n/Makefile +++ b/security/s2n/Makefile @@ -23,13 +23,6 @@ NO_CONFIGURE= yes SUB_FILES= pkg-message Makefile ALL_TARGET= bin -.include <bsd.port.options.mk> - -.if ${OSVERSION} < 1000015 -WITH_OPENSSL_PORT= yes -CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib -.endif - post-patch: @${REINPLACE_CMD} -e 's|CFLAGS |&+|' ${WRKSRC}/s2n.mk @${REINPLACE_CMD} -e 's|CRYPTO_LDFLAGS |&+|' \ diff --git a/security/tor-devel/Makefile b/security/tor-devel/Makefile index 857c7683b102..d1619003bad7 100644 --- a/security/tor-devel/Makefile +++ b/security/tor-devel/Makefile @@ -49,10 +49,6 @@ STATIC_TOR_USES_OFF= ssl .include <bsd.port.options.mk> -.if ${OSVERSION} < 1000000 -WITH_OPENSSL_PORT= yes -.endif - .if !defined(USE_GCC) && empty(CC:T:M*gcc4*) && \ empty(PORT_OPTIONS:MSTATIC_TOR) && empty(ARCH:Mia64) CONFIGURE_ARGS+= --enable-gcc-hardening diff --git a/security/tor/Makefile b/security/tor/Makefile index 3c04bc632669..c5b4fee6eb98 100644 --- a/security/tor/Makefile +++ b/security/tor/Makefile @@ -48,10 +48,6 @@ STATIC_TOR_USES_OFF= ssl .include <bsd.port.options.mk> -.if ${OSVERSION} < 1000000 -WITH_OPENSSL_PORT= yes -.endif - .if !defined(USE_GCC) && empty(CC:T:M*gcc4*) && \ empty(PORT_OPTIONS:MSTATIC_TOR) && empty(ARCH:Mia64) CONFIGURE_ARGS+= --enable-gcc-hardening diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile index c08887cc00ae..01604b53d8dc 100644 --- a/sysutils/e2fsprogs/Makefile +++ b/sysutils/e2fsprogs/Makefile @@ -123,13 +123,6 @@ post-patch:: u_mke2fs_opt_offset @${MV} ${WRKSRC}/tests/${i} ${WRKSRC}/tests/disabled_test-${i} .endfor -# m_rootdir behaves erratically on 9.x and fails randomly, -# but may succeed when run again. Disable for now. -.if ${OSVERSION} < 1000000 -.for i in m_rootdir - @${MV} ${WRKSRC}/tests/${i} ${WRKSRC}/tests/disabled_test-${i} -.endfor -.endif .endif # Master port stuff that is not to be seen by the slave ports. diff --git a/sysutils/x86info/Makefile b/sysutils/x86info/Makefile index d4dc48eb68f1..d246fdffba9f 100644 --- a/sysutils/x86info/Makefile +++ b/sysutils/x86info/Makefile @@ -24,12 +24,6 @@ USES= gmake pkgconfig python:build PLIST_FILES= bin/lsmsr bin/x86info man/man8/lsmsr.8.gz man/man1/x86info.1.gz -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -USE_GCC= yes -.endif - post-patch: @${REINPLACE_CMD} \ -e 's|python createheader.py|${PYTHON_CMD} createheader.py|' \ @@ -45,4 +39,4 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/x86info.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/lsmsr/lsmsr.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/libmicrohttpd/Makefile b/www/libmicrohttpd/Makefile index c137fee20cae..e43731cc137a 100644 --- a/www/libmicrohttpd/Makefile +++ b/www/libmicrohttpd/Makefile @@ -31,26 +31,21 @@ GNUTLS_CONFIGURE_ENABLE=https INFO= libmicrohttpd libmicrohttpd-tutorial PLIST_FILES= include/microhttpd.h \ + include/microspdy.h \ lib/libmicrohttpd.a \ lib/libmicrohttpd.so \ lib/libmicrohttpd.so.10 \ lib/libmicrohttpd.so.10.27.0 \ - libdata/pkgconfig/libmicrohttpd.pc \ - libdata/pkgconfig/libmicrospdy.pc \ - man/man3/libmicrohttpd.3.gz - -.include <bsd.port.pre.mk> - -.if !(${SSL_DEFAULT} == base && ${OPSYS} == FreeBSD && ${OSVERSION} < 1000015) -PLIST_FILES+= include/microspdy.h \ lib/libmicrospdy.a \ lib/libmicrospdy.so \ lib/libmicrospdy.so.0 \ - lib/libmicrospdy.so.0.0.0 -.endif + lib/libmicrospdy.so.0.0.0 \ + libdata/pkgconfig/libmicrohttpd.pc \ + libdata/pkgconfig/libmicrospdy.pc \ + man/man3/libmicrohttpd.3.gz post-patch: @${REINPLACE_CMD} -e 's|bin_PROGRAMS =|noinst_PROGRAMS +=|' \ ${WRKSRC}/src/examples/Makefile.in -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/mod_auth_gssapi/Makefile b/www/mod_auth_gssapi/Makefile index 122fb40261a9..bc1fc784ac28 100644 --- a/www/mod_auth_gssapi/Makefile +++ b/www/mod_auth_gssapi/Makefile @@ -31,9 +31,7 @@ PLIST_SUB+= APMOD_FILE=${APMOD_FILE} .include <bsd.port.pre.mk> -.if ${OSVERSION} < 1000000 && ${SSL_DEFAULT} == base -IGNORE= mod_auth_gssapi requires OpenSSL 1.0.0+ -.elif ${SSL_DEFAULT:Mlibressl*} +.if ${SSL_DEFAULT:Mlibressl*} IGNORE= mod_auth_gssapi currently only supports OpenSSL .endif diff --git a/www/ufdbguard/Makefile b/www/ufdbguard/Makefile index 4dcc5ede9a8f..edd8023239f0 100644 --- a/www/ufdbguard/Makefile +++ b/www/ufdbguard/Makefile @@ -62,20 +62,12 @@ UNIXSOCKETS_CONFIGURE_OFF= --without-unix-sockets UNIXSOCKETS_DESC= Unix sockets support -.include <bsd.port.options.mk> - -.if ${OSVERSION} < 1002000 -USES+= gmake -.endif - -.include <bsd.port.pre.mk> - post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ufdbguardd \ + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ufdbguardd \ ${STAGEDIR}${PREFIX}/bin/ufdbgclient \ ${STAGEDIR}${PREFIX}/bin/ufdbsignal \ ${STAGEDIR}${PREFIX}/bin/ufdbGenTable \ ${STAGEDIR}${PREFIX}/bin/ufdbAnalyse \ ${STAGEDIR}${PREFIX}/bin/ufdbhttpd -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile index 6809b2a9a33b..af97c84ee183 100644 --- a/x11-drivers/xf86-video-ati/Makefile +++ b/x11-drivers/xf86-video-ati/Makefile @@ -22,14 +22,4 @@ ONLY_FOR_ARCHS= i386 amd64 CONFIGURE_ARGS+=--disable-udev CONFIGURE_ARGS+=--disable-glamor -.include <bsd.port.options.mk> - -.if (${OSVERSION} >= 903000 && ${OSVERSION} < 1000000) -RUN_DEPENDS+= drm-kmod>=9:x11-drivers/drm-kmod - -post-patch: - @${REINPLACE_CMD} -e 's|"radeonkms"|"radeonkms_port"|g' \ - ${WRKSRC}/src/radeon_kms.c -.endif - .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile index 14a103ced14f..9c54f0a5165e 100644 --- a/x11-drivers/xf86-video-intel/Makefile +++ b/x11-drivers/xf86-video-intel/Makefile @@ -33,14 +33,4 @@ CONFIGURE_ARGS+= --enable-sna CONFIGURE_ARGS+= --disable-glamor INSTALL_TARGET= install-strip -.include <bsd.port.options.mk> - -.if (${OSVERSION} >= 903000 && ${OSVERSION} < 1000000) -RUN_DEPENDS+= drm-kmod>=9:x11-drivers/drm-kmod - -post-patch: - @${REINPLACE_CMD} -e 's|"i915kms"|"i915kms_port"|g' \ - ${WRKSRC}/src/intel_device.c -.endif - .include <bsd.port.mk> diff --git a/x11-toolkits/py-fltk/Makefile b/x11-toolkits/py-fltk/Makefile index 062276ca715d..4f4a1ce336c9 100644 --- a/x11-toolkits/py-fltk/Makefile +++ b/x11-toolkits/py-fltk/Makefile @@ -29,12 +29,6 @@ PORTDOCS= * PORTEXAMPLES= * WRKSRC= ${WRKDIR}/pyFltk-${PORTVERSION} -.include <bsd.port.options.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -USE_GCC= yes -.endif - post-patch: @${REINPLACE_CMD} -e "s|/usr/X11R6|${LOCALBASE}|g;s|package_data.*},||g;s|sunos5|dragonfly4', 'freebsd8', 'freebsd9', 'freebsd10', 'freebsd11', 'freebsd12|g" ${WRKSRC}/setup.py diff --git a/x11-toolkits/qt5-gui/Makefile b/x11-toolkits/qt5-gui/Makefile index aebaea1b5e62..e5c4b828186f 100644 --- a/x11-toolkits/qt5-gui/Makefile +++ b/x11-toolkits/qt5-gui/Makefile @@ -83,10 +83,6 @@ CFLAGS_powerpc64= -mminimal-toc CXXFLAGS+= -flax-vector-conversions .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -EXTRA_PATCHES+= ${FILESDIR}/extrapatch-src_gui_painting_qcolor.cpp -.endif - post-build: .for d in ${MORE_WRKSRCS} @cd ${WRKSRC}/${d} && \ diff --git a/x11-toolkits/qt5-gui/files/extrapatch-src_gui_painting_qcolor.cpp b/x11-toolkits/qt5-gui/files/extrapatch-src_gui_painting_qcolor.cpp deleted file mode 100644 index 7760f66a4034..000000000000 --- a/x11-toolkits/qt5-gui/files/extrapatch-src_gui_painting_qcolor.cpp +++ /dev/null @@ -1,20 +0,0 @@ -On FreeBSD 9.3 with gcc-4.2 we need to mark the constant as an unsigned long long. -Else the compiler will choke on it being too large: - -c++ -c -O2 -pipe [...] itemmodels/qstandarditemmodel.cpp -painting/qcolor.cpp:527: error: integer constant is too large for 'long' type -*** [.obj/qcolor.o] Error code 1 -1 error - - ---- src/gui/painting/qcolor.cpp.orig 2016-10-10 16:17:59 UTC -+++ src/gui/painting/qcolor.cpp -@@ -524,7 +524,7 @@ QString QColor::name(NameFormat format) - return QLatin1Char('#') + QString::number(rgba() | 0x1000000, 16).rightRef(6); - case HexArgb: - // it's called rgba() but it does return AARRGGBB -- return QLatin1Char('#') + QString::number(rgba() | 0x100000000, 16).rightRef(8); -+ return QLatin1Char('#') + QString::number(rgba() | 0x100000000ULL, 16).rightRef(8); - } - return QString(); - } diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile index 78001eeb2410..773000b9f94d 100644 --- a/x11/gnome-terminal/Makefile +++ b/x11/gnome-terminal/Makefile @@ -43,17 +43,9 @@ MIGRATION_CONFIGURE_ENABLE= migration MIGRATION_USE= GNOME=gconf2 MIGRATION_DESC= Profile migration to gsettings (pulls in gconf2) -.include <bsd.port.options.mk> - post-patch: @${TOUCH} ${WRKSRC}/aclocal.m4 ${WRKSRC}/Makefile.in \ ${WRKSRC}/configure ${WRKSRC}/config.h.in -.if ${OSVERSION} < 1000000 - @${REINPLACE_CMD} -e 's|-Wno-suggest-attribute=format||g ; \ - s|-Wno-unused-but-set-variable||g' \ - ${WRKSRC}/src/Makefile.in -EXTRA_PATCHES+= ${FILESDIR}/extra-src_terminal-screen.c -.endif post-install: .for i in ca cs de el es fi fr gl hu pt_BR ru diff --git a/x11/gnome-terminal/files/extra-src_terminal-screen.c b/x11/gnome-terminal/files/extra-src_terminal-screen.c deleted file mode 100644 index 3ea47ebc9a1d..000000000000 --- a/x11/gnome-terminal/files/extra-src_terminal-screen.c +++ /dev/null @@ -1,24 +0,0 @@ ---- src/terminal-screen.c.orig 2014-09-23 20:15:23.000000000 +0200 -+++ src/terminal-screen.c 2014-11-09 20:19:35.759291981 +0100 -@@ -1192,7 +1192,21 @@ - for (j = 0; j < n_fds; j++) { - if (fds[j] == target_fd) { - do { -+#if defined(F_DUPFD_CLOEXEC) - fd = fcntl (fds[j], F_DUPFD_CLOEXEC, 3); -+#else -+ fd = fcntl (fds[j], F_DUPFD, 3); -+ int flags = fcntl (fd, F_GETFD); -+ if (flags == -1) -+ { -+ //errror -+ } -+ flags |= FD_CLOEXEC; -+ if (fcntl (fd, F_SETFD, FD_CLOEXEC) == -1) -+ { -+ //error -+ } -+#endif - } while (fd == -1 && errno == EINTR); - if (fd == -1) - _exit (127); |