Date: Sun, 19 Feb 2012 12:59:11 +0100 (CET) From: Martin Matuska <mm@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: glewis@FreeBSD.org Subject: ports/165291: [PATCH] archivers/libarchive: update to 3.0.3 Message-ID: <20120219115911.45E63AED6@neo.vx.sk> Resent-Message-ID: <201202191200.q1JC07Bv037975@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 165291
>Category: ports
>Synopsis: [PATCH] archivers/libarchive: update to 3.0.3
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Feb 19 12:00:07 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Martin Matuska
>Release: FreeBSD 9.0-STABLE amd64
>Organization:
>Environment:
System: FreeBSD neo.vx.sk 9.0-STABLE FreeBSD 9.0-STABLE #14 r231187M: Wed Feb 8 08:19:42
>Description:
- Update to 3.0.3
- Add option to build without libxml2
- Add option to use nettle instead of OpenSSL
Port maintainer (glewis@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- libarchive-3.0.3,1.patch begins here ---
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
--- libarchive-3.0.3,1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120219115911.45E63AED6>