Attachment 122168 Details for Bug 165291 – libarchive-3.0.3,1.patch

[patch] libarchive-3.0.3,1.patch

libarchive-3.0.3,1.patch (text/plain), 2.86 KB, created by Martin Matuska on 2012-02-19 12:00:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Matuska

Created: 2012-02-19 12:00:07 UTC

Size: 2.86 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/pcvs/ports/archivers/libarchive/Makefile,v
>retrieving revision 1.68
>diff -u -r1.68 Makefile
>--- Makefile	20 Nov 2011 04:56:53 -0000	1.68
>+++ Makefile	19 Feb 2012 11:58:16 -0000
>@@ -5,7 +5,7 @@
> # $FreeBSD: ports/archivers/libarchive/Makefile,v 1.68 2011/11/20 04:56:53 glewis Exp $
> 
> PORTNAME=	libarchive
>-PORTVERSION=	2.8.5
>+PORTVERSION=	3.0.3
> PORTEPOCH=	1
> CATEGORIES=	archivers
> MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
>@@ -13,9 +13,14 @@
> MAINTAINER=	glewis@FreeBSD.org
> COMMENT=	Library to create and read several streaming archive formats
> 
>+OPTIONS=	LIBXML2 "Support writing xar via libxml2" On \
>+		NETTLE "Use nettle instad of OpenSSL" Off
>+
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
>-USE_GNOME=	gnomehack libxml2
>+USE_GNOME=	gnomehack
>+
>+CONFIGURE_ARGS+=	--without-expat
> 
> PLIST_FILES=	bin/bsdcpio \
> 		bin/bsdtar \
>@@ -24,18 +29,26 @@
> 		lib/libarchive.a \
> 		lib/libarchive.la \
> 		lib/libarchive.so \
>-		lib/libarchive.so.10 \
>+		lib/libarchive.so.12 \
> 		libdata/pkgconfig/libarchive.pc
> 
> MANCOMPRESSED=	no
> MAN1=		bsdcpio.1 \
> 		bsdtar.1
> MAN3=		archive_entry.3 \
>+		archive_entry_acl.3 \
>+		archive_entry_linkify.3 \
>+		archive_entry_paths.3 \
>+		archive_entry_perms.3 \
>+		archive_entry_stat.3 \
>+		archive_entry_time.3 \
> 		archive_read.3 \
> 		archive_read_disk.3 \
>+		archive_read_set_options.3 \
> 		archive_util.3 \
> 		archive_write.3 \
> 		archive_write_disk.3 \
>+		archive_write_set_options.3 \
> 		libarchive.3 \
> 		libarchive_internals.3
> MAN5=		cpio.5 \
>@@ -47,8 +60,24 @@
> CPPFLAGS+=	"-I${LOCALBASE}/include"
> LDFLAGS+=	"-L${LOCALBASE}/lib"
> 
>-check:
>-	(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} check)
>+.include <bsd.port.options.mk>
>+
>+.if !defined(WITHOUT_LIBXML2)
>+USE_GNOME+=	libxml2
>+CONFIGURE_ARGS+=	--with-xml2
>+.else
>+CFLAGS+=	-DHAVE_BSDXML_H=1
>+LDFLAGS+=	-lbsdxml
>+CONFIGURE_ARGS+=	--without-xml2
>+.endif
>+
>+.if defined(WITH_NETTLE)
>+LIB_DEPENDS+=	nettle.4:${PORTSDIR}/security/nettle
>+CONFIGURE_ARGS+=	--without-openssl --with-nettle
>+.else
>+USE_OPENSSL=	yes
>+CONFIGURE_ARGS+=	--with-openssl --without-nettle
>+.endif
> 
> .include <bsd.port.pre.mk>
> 
>@@ -56,4 +85,7 @@
> LIB_DEPENDS+=	lzma.5:${PORTSDIR}/archivers/xz
> .endif
> 
>+check:
>+	(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} check)
>+
> .include <bsd.port.post.mk>
>Index: distinfo
>===================================================================
>RCS file: /home/pcvs/ports/archivers/libarchive/distinfo,v
>retrieving revision 1.55
>diff -u -r1.55 distinfo
>--- distinfo	20 Nov 2011 04:56:53 -0000	1.55
>+++ distinfo	19 Feb 2012 11:58:16 -0000
>@@ -1,2 +1,2 @@
>-SHA256 (libarchive-2.8.5.tar.gz) = 13993e0ffbd121ccda46ea226b1f8eac218de0fa8da7d8b1f998093d5c32a72d
>-SIZE (libarchive-2.8.5.tar.gz) = 1410485
>+SHA256 (libarchive-3.0.3.tar.gz) = c5fc7620f74a54b1717e4aed38aee85dc27a988ad1db7640f28eb63a82ea62d7
>+SIZE (libarchive-3.0.3.tar.gz) = 3509104

Actions: View | Diff

Attachments on bug 165291: 122168