Attachment 159342 Details for Bug 201948 – patch

[patch] patch

libarchive.patch (text/plain), 1.59 KB, created by Tijl Coosemans on 2015-07-28 18:17:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2015-07-28 18:17:36 UTC

Size: 1.59 KB

patch

obsolete

>Index: archivers/libarchive/Makefile
>===================================================================
>--- archivers/libarchive/Makefile	(revision 393083)
>+++ archivers/libarchive/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	libarchive
> PORTVERSION=	3.1.2
>-PORTREVISION=	2
>+PORTREVISION=	3
> PORTEPOCH=	1
> CATEGORIES=	archivers
> MASTER_SITES=	http://libarchive.org/downloads/
>@@ -10,19 +10,19 @@ MASTER_SITES=	http://libarchive.org/down
> MAINTAINER=	glewis@FreeBSD.org
> COMMENT=	Library to create and read several streaming archive formats
> 
>-OPTIONS_DEFINE=	LIBXML2 LZO NETTLE
>-OPTIONS_DEFAULT=LIBXML2 LZO
>+LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
>+
>+OPTIONS_DEFINE=	LZO NETTLE
>+OPTIONS_DEFAULT=LZO
> 
>-LIBXML2_DESC=	Support writing xar via libxml2
> LZO_DESC=	Support lzo compression via liblzo2
> NETTLE_DESC=	Use Nettle instead of OpenSSL
> 
> USES=		cpe libtool pathfix
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
>-PATCH_STRIP=	-p1
> 
>-CONFIGURE_ARGS+=	--without-expat
>+CONFIGURE_ARGS=	--without-xml2
> 
> PLIST_FILES=	bin/bsdcpio \
> 		bin/bsdtar \
>@@ -78,11 +78,6 @@ CFLAGS+=	"-I${LOCALBASE}/include"
> CPPFLAGS+=	"-I${LOCALBASE}/include"
> LDFLAGS+=	"-L${LOCALBASE}/lib"
> 
>-LIBXML2_USE=		GNOME=libxml2
>-LIBXML2_CONFIGURE_WITH=	xml2
>-LIBXML2_CFLAGS=		-DHAVE_BSDXML_H=1
>-LIBXML2_LDFLAGS=	-lbsdxml
>-
> LZO_LIB_DEPENDS=	liblzo2.so:${PORTSDIR}/archivers/lzo2
> LZO_CONFIGURE_WITH=	lzo2
> 
>@@ -93,6 +88,6 @@ NETTLE_USE_OFF=		OPENSSL=yes
> NETTLE_CONFIGURE_OFF=	--with-openssl
> 
> check:
>-	(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} check)
>+	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check)
> 
> .include <bsd.port.mk>

Actions: View | Diff

Attachments on bug 201948: 159342