From owner-svn-ports-all@freebsd.org Tue May 17 18:18:42 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0D196B3F9C9; Tue, 17 May 2016 18:18:42 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D295C1A07; Tue, 17 May 2016 18:18:41 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4HIIfJX034574; Tue, 17 May 2016 18:18:41 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4HIIf04034573; Tue, 17 May 2016 18:18:41 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201605171818.u4HIIf04034573@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Tue, 17 May 2016 18:18:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r415404 - head/databases/mysql57-server X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 May 2016 18:18:42 -0000 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 Reviewed by: jkim Approved by: Mahdi Mokhtari (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 " +# Created by: Mahdi Mokhtari # $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: