From owner-svn-ports-all@freebsd.org Wed Sep 19 17:31:05 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 428BA10A27E7; Wed, 19 Sep 2018 17:31:05 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E8E0F8AFC3; Wed, 19 Sep 2018 17:31:04 +0000 (UTC) (envelope-from amdmi3@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E3AAD1210F; Wed, 19 Sep 2018 17:31:04 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8JHV4RR087206; Wed, 19 Sep 2018 17:31:04 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8JHV4Tt087205; Wed, 19 Sep 2018 17:31:04 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201809191731.w8JHV4Tt087205@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 19 Sep 2018 17:31:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r480098 - head/archivers/libarchive X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: head/archivers/libarchive X-SVN-Commit-Revision: 480098 X-SVN-Commit-Repository: ports 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.27 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: Wed, 19 Sep 2018 17:31:05 -0000 Author: amdmi3 Date: Wed Sep 19 17:31:04 2018 New Revision: 480098 URL: https://svnweb.freebsd.org/changeset/ports/480098 Log: - Openssl and nettle support are not mutually exclusive, add independent options for each - Add LICENSE_FILE - Switch to USES=localbase - Switch to new test framework PR: 231150 Approved by: maintainer timeout (glewis, 2 weeks) Modified: head/archivers/libarchive/Makefile Modified: head/archivers/libarchive/Makefile ============================================================================== --- head/archivers/libarchive/Makefile Wed Sep 19 17:19:18 2018 (r480097) +++ head/archivers/libarchive/Makefile Wed Sep 19 17:31:04 2018 (r480098) @@ -3,6 +3,7 @@ PORTNAME= libarchive PORTVERSION= 3.3.2 PORTEPOCH= 1 +PORTREVISION= 1 CATEGORIES= archivers MASTER_SITES= https://libarchive.org/downloads/ @@ -10,20 +11,23 @@ MAINTAINER= glewis@FreeBSD.org COMMENT= Library to create and read several streaming archive formats LICENSE= BSD2CLAUSE +LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libexpat.so:textproc/expat2 -OPTIONS_DEFINE= LZ4 LZO NETTLE -OPTIONS_DEFAULT=LZ4 LZO +OPTIONS_DEFINE= LZ4 LZO OPENSSL NETTLE +OPTIONS_DEFAULT=LZ4 LZO OPENSSL LZ4_DESC= Support lz4 compression via liblz4 LZO_DESC= Support lzo compression via liblzo2 -NETTLE_DESC= Use Nettle instead of OpenSSL +OPENSSL_DESC= Mtree and xar hashes support through openssl +NETTLE_DESC= Crypto support from Nettle -USES= cpe iconv libtool pathfix +USES= cpe iconv libtool localbase:ldflags pathfix GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_LDCONFIG= yes +TEST_TARGET= check CONFIGURE_ARGS= --without-xml2 @@ -81,10 +85,6 @@ PLIST_FILES= bin/bsdcat \ man/man5/mtree.5.gz \ man/man5/tar.5.gz -CFLAGS+= "-I${LOCALBASE}/include" -CPPFLAGS+= "-I${LOCALBASE}/include" -LDFLAGS+= "-L${LOCALBASE}/lib" - LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2 LZO_CONFIGURE_WITH= lzo2 LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 @@ -92,9 +92,8 @@ LZ4_CONFIGURE_WITH= lz4 NETTLE_LIB_DEPENDS= libnettle.so:security/nettle NETTLE_CONFIGURE_WITH= nettle -NETTLE_CONFIGURE_ON= --without-openssl -NETTLE_USES_OFF= ssl -NETTLE_CONFIGURE_OFF= --with-openssl +OPENSSL_USES= ssl +OPENSSL_CONFIGURE_WITH= openssl .include @@ -103,8 +102,5 @@ CONFIGURE_ENV+= ac_cv_header_localcharset_h=no \ ac_cv_func_locale_charset=no \ ac_cv_lib_charset_locale_charset=no .endif - -check: - @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check) .include