Attachment 196850 Details for Bug 231150 – Patch

[patch] Patch

libarchive.patch (text/plain), 1.66 KB, created by Dmitry Marakasov on 2018-09-04 12:24:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2018-09-04 12:24:39 UTC

Size: 1.66 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 478950)
>+++ Makefile	(working copy)
>@@ -3,6 +3,7 @@
> PORTNAME=	libarchive
> PORTVERSION=	3.3.2
> PORTEPOCH=	1
>+PORTREVISION=	1
> CATEGORIES=	archivers
> MASTER_SITES=	https://libarchive.org/downloads/
> 
>@@ -13,17 +14,19 @@
> 
> 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 +84,6 @@
> 		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 +91,8 @@
> 
> 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 <bsd.port.pre.mk>
> 
>@@ -104,7 +102,4 @@
> 		ac_cv_lib_charset_locale_charset=no
> .endif
> 
>-check:
>-	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check)
>-
> .include <bsd.port.post.mk>

Actions: View | Diff

Attachments on bug 231150: 196850