diff options
Diffstat (limited to 'databases')
-rw-r--r-- | databases/mariadb100-server/Makefile | 4 | ||||
-rw-r--r-- | databases/mariadb101-server/Makefile | 7 | ||||
-rw-r--r-- | databases/mariadb55-server/Makefile | 4 | ||||
-rw-r--r-- | databases/mongodb32-tools/Makefile | 9 | ||||
-rw-r--r-- | databases/mysql57-server/Makefile | 9 | ||||
-rw-r--r-- | databases/mysql57-server/files/rapid_plugin-patch-_x_mysqlxtest__src_mysqlxtest.cc | 12 | ||||
-rw-r--r-- | databases/percona56-server/Makefile | 5 | ||||
-rw-r--r-- | databases/pg_citus/Makefile | 9 | ||||
-rw-r--r-- | databases/pgbouncer/Makefile | 6 | ||||
-rw-r--r-- | databases/pgmodeler/Makefile | 8 | ||||
-rw-r--r-- | databases/sqlite3/Makefile | 5 |
11 files changed, 8 insertions, 70 deletions
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}" |