From owner-svn-ports-head@freebsd.org Thu May 26 12:13:38 2016 Return-Path: Delivered-To: svn-ports-head@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 133E8B49427; Thu, 26 May 2016 12:13:38 +0000 (UTC) (envelope-from mat@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 E07D71F3A; Thu, 26 May 2016 12:13:37 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4QCDbKZ024892; Thu, 26 May 2016 12:13:37 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4QCDbdE024891; Thu, 26 May 2016 12:13:37 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201605261213.u4QCDbdE024891@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Thu, 26 May 2016 12:13:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r415887 - head/Mk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 May 2016 12:13:38 -0000 Author: mat Date: Thu May 26 12:13:36 2016 New Revision: 415887 URL: https://svnweb.freebsd.org/changeset/ports/415887 Log: Indent the .if's for easier reading. Sponsored by: Absolight Modified: head/Mk/bsd.openssl.mk Modified: head/Mk/bsd.openssl.mk ============================================================================== --- head/Mk/bsd.openssl.mk Thu May 26 10:26:24 2016 (r415886) +++ head/Mk/bsd.openssl.mk Thu May 26 12:13:36 2016 (r415887) @@ -44,7 +44,7 @@ WITH_OPENSSL_BASE=yes OPENSSLBASE= /usr OPENSSLDIR?= /etc/ssl -.if !exists(${DESTDIR}/usr/lib/libcrypto.so) +. if !exists(${DESTDIR}/usr/lib/libcrypto.so) check-depends:: @${ECHO_CMD} "Dependency error: This port requires the OpenSSL library, which is part of" @${ECHO_CMD} "the FreeBSD crypto distribution, but not installed on your" @@ -53,63 +53,63 @@ check-depends:: @${ECHO_CMD} "for instructions on how to obtain and install the FreeBSD" @${ECHO_CMD} "OpenSSL distribution." @${FALSE} -.endif -.if exists(${LOCALBASE}/lib/libcrypto.so) +. endif +. if exists(${LOCALBASE}/lib/libcrypto.so) check-depends:: @${ECHO_CMD} "Dependency error: This port wants the OpenSSL library from the FreeBSD" @${ECHO_CMD} "base system. You can't build against it, while a newer" @${ECHO_CMD} "version is installed by a port." @${ECHO_CMD} "Please deinstall the port or undefine WITH_OPENSSL_BASE." @${FALSE} -.endif +. endif # OpenSSL in the base system may not include IDEA for patent licensing reasons. -.if defined(MAKE_IDEA) && !defined(OPENSSL_IDEA) +. if defined(MAKE_IDEA) && !defined(OPENSSL_IDEA) OPENSSL_IDEA= ${MAKE_IDEA} -.else +. else OPENSSL_IDEA?= NO -.endif +. endif -.if ${OPENSSL_IDEA} == "NO" +. if ${OPENSSL_IDEA} == "NO" # XXX This is a hack to work around the fact that /etc/make.conf clobbers # our CFLAGS. It might not be enough for all future ports. -.if defined(HAS_CONFIGURE) +. if defined(HAS_CONFIGURE) CFLAGS+= -DNO_IDEA -.else +. else OPENSSL_CFLAGS+= -DNO_IDEA -.endif +. endif MAKE_ARGS+= OPENSSL_CFLAGS="${OPENSSL_CFLAGS}" -.endif +. endif -.else +.else # !defined(WITH_OPENSSL_BASE) OPENSSLBASE= ${LOCALBASE} -.if !defined(OPENSSL_PORT) && \ +. if !defined(OPENSSL_PORT) && \ exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so) # find installed port and use it for dependency -.if !defined(OPENSSL_INSTALLED) -.if defined(DESTDIR) +. if !defined(OPENSSL_INSTALLED) +. if defined(DESTDIR) PKGARGS= -c ${DESTDIR} -.else +. else PKGARGS= -.endif +. endif OPENSSL_INSTALLED!= ${PKG_BIN} ${PKGARGS} which -qo ${LOCALBASE}/lib/libcrypto.so || : -.endif -.if defined(OPENSSL_INSTALLED) && ${OPENSSL_INSTALLED} != "" +. endif +. if defined(OPENSSL_INSTALLED) && ${OPENSSL_INSTALLED} != "" OPENSSL_PORT= ${OPENSSL_INSTALLED} OPENSSL_SHLIBFILE!= ${PKG_INFO} -ql ${OPENSSL_INSTALLED} | ${GREP} "^`${PKG_QUERY} "%p" ${OPENSSL_INSTALLED}`/lib/libcrypto.so.[0-9]*$$" OPENSSL_SHLIBVER?= ${OPENSSL_SHLIBFILE:E} -.endif -.endif +. endif +. endif # LibreSSL and OpenSSL-BETA specific SHLIBVER -.if defined(OPENSSL_PORT) && ${OPENSSL_PORT} == security/libressl +. if defined(OPENSSL_PORT) && ${OPENSSL_PORT} == security/libressl OPENSSL_SHLIBVER?= 37 -.elif defined(OPENSSL_PORT) && ${OPENSSL_PORT} == security/libressl-devel +. elif defined(OPENSSL_PORT) && ${OPENSSL_PORT} == security/libressl-devel OPENSSL_SHLIBVER?= 37 -.elif defined(OPENSSL_PORT) && ${OPENSSL_PORT} == security/openssl-devel +. elif defined(OPENSSL_PORT) && ${OPENSSL_PORT} == security/openssl-devel OPENSSL_SHLIBVER?= 9 -.endif +. endif # default OPENSSL_PORT?= security/openssl @@ -131,9 +131,9 @@ MAKE_ENV+= OPENSSLINC=${OPENSSLINC} MAKE_ENV+= OPENSSLLIB=${OPENSSLLIB} .if defined(OPENSSLRPATH) -.if defined(USE_OPENSSL_RPATH) +. if defined(USE_OPENSSL_RPATH) CFLAGS+= -Wl,-rpath,${OPENSSLRPATH} -.endif +. endif MAKE_ENV+= OPENSSLRPATH=${OPENSSLRPATH} OPENSSL_LDFLAGS+= -Wl,-rpath,${OPENSSLRPATH} .endif