Date: Tue, 17 May 2016 18:18:41 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r415404 - head/databases/mysql57-server Message-ID: <201605171818.u4HIIf04034573@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Tue May 17 18:18:40 2016 New Revision: 415404 URL: https://svnweb.freebsd.org/changeset/ports/415404 Log: databases/mysql57-server: changing the way the SSL libraries are linked PR: 209458 Reported by: gja822@narod.ru Submitted by: Markus Kohlmeyer <rootservice@gmail.com> Reviewed by: jkim Approved by: Mahdi Mokhtari <mokhi64@gmail.com> (maintainer) Modified: head/databases/mysql57-server/Makefile Modified: head/databases/mysql57-server/Makefile ============================================================================== --- head/databases/mysql57-server/Makefile Tue May 17 18:10:09 2016 (r415403) +++ head/databases/mysql57-server/Makefile Tue May 17 18:18:40 2016 (r415404) @@ -1,4 +1,4 @@ -# Created by: "Mahdi Mokhtari <mokhi64@gmail.com>" +# Created by: Mahdi Mokhtari <mokhi64@gmail.com> # $FreeBSD$ PORTNAME= mysql @@ -21,8 +21,6 @@ USES= bison:build cmake:outsource compi USE_OPENSSL= yes USE_PERL5= run -WITH_OPENSSL_PORT= yes - MY_DBDIR= /var/db/mysql MY_SECDIR= /var/db/mysql_secure MY_TMPDIR= /var/db/mysql_tmpdir @@ -57,9 +55,7 @@ CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \ -DWITH_EDITLINE=system \ -DWITH_LIBEVENT=system \ -DWITH_LZ4=system \ - -DWITH_ZLIB=system \ - -DWITH_SSL=${OPENSSLBASE} \ - -DWITH_PIC=1 + -DWITH_ZLIB=system SHEBANG_FILES= scripts/*.pl* scripts/*.sh @@ -139,6 +135,15 @@ PERFSCHM_SUB_LIST_OFF+= PERFSCHEMRC="--s .if !defined(CLIENT_ONLY) EXTRA_PATCHES+= ${PATCHDIR}/rapid_plugin-patch-_x_mysqlxtest__src_mysqlxtest.cc .endif +WITH_OPENSSL_PORT= yes + +### FreeBSD Version > 9.X ### +.else +.if defined(WITH_OPENSSL_BASE) +CMAKE_ARGS+= -DWITH_SSL=system +.else +CMAKE_ARGS+= -DWITH_SSL=${OPENSSLBASE} +.endif .endif post-extract:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605171818.u4HIIf04034573>