Attachment #239177 for bug #268693

View | Details | Raw Unified | Return to bug 268693
Collapse All | Expand All




PORTNAME=	libarchive
DISTVERSION=	3.6.2
PORTREVISION=	1
PORTEPOCH=	1
CATEGORIES=	archivers
MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/ \
		https://libarchive.org/downloads/

PATCH_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/commit/
PATCHFILES=	1f35c466aaa9444335a1b854b0b7223b0d2346c2.patch:-p1

MAINTAINER=	glewis@FreeBSD.org
COMMENT=	Library to create and read several streaming archive formats

CRYPTO_DESC=	Crypto and hashing support
NETTLE_DESC=	Crypto support via Nettle

USES=		autoreconf cpe iconv libtool localbase:ldflags pathfix \
		pkgconfig tar:xz
GNU_CONFIGURE=	yes
USE_LDCONFIG=	yes


		ac_cv_lib_charset_locale_charset=no
.endif

# Prior to 1301508 we didn't ship openssl.pc which libarchive now excepts
# so we need to use the old approach on older versions of FreeBSD
# which is not to define Requires.private in libarchive.pc

.if ${PORT_OPTIONS:MOPENSSL} && ${OPSYS} == FreeBSD && ${OSVERSION} < 1301508
EXTRA_PATCHES=	${PATCHDIR}/extra-patch-pkgconfig-compat
.endif

.include <bsd.port.post.mk>

Lines 1-5 Link Here

(-)b/archivers/libarchive/distinfo (-5 / +5 lines)
1	TIMESTAMP = 1670315616	1	TIMESTAMP = 1672469724
2	SHA256 (libarchive-3.6.1.tar.xz) = 5a411aceb978f43e626f0c2d1812ddd8807b645ed892453acabd532376c148e6	2	SHA256 (libarchive-3.6.2.tar.xz) = 9e2c1b80d5fbe59b61308fdfab6c79b5021d7ff4ff2489fb12daf0a96a83551d
3	SIZE (libarchive-3.6.1.tar.xz) = 5241148	3	SIZE (libarchive-3.6.2.tar.xz) = 5213196
4	SHA256 (bff38efe8c110469c5080d387bec62a6ca15b1a5.patch) = 4f93c5a102cce1fc672d59888471017b545704bfa9d762c630e84b28215162e7	4	SHA256 (1f35c466aaa9444335a1b854b0b7223b0d2346c2.patch) = 6db4da971fb4d5b3974bfec4c75a4d920a98b1b3bc9a9ccc381055a02205a272
5	SIZE (bff38efe8c110469c5080d387bec62a6ca15b1a5.patch) = 1124	5	SIZE (1f35c466aaa9444335a1b854b0b7223b0d2346c2.patch) = 1329

Added Link Here

(-)b/archivers/libarchive/files/extra-patch-pkgconfig-compat (+7 lines)
1	--- build/pkgconfig/libarchive.pc.in.orig 2022-12-09 13:38:31 UTC
2	+++ build/pkgconfig/libarchive.pc.in
3	@@ -10,4 +10,3 @@ Cflags: -I${includedir}
4	Cflags.private: -DLIBARCHIVE_STATIC
5	Libs: -L${libdir} -larchive
6	Libs.private: @LIBS@
7	-Requires.private: @LIBSREQUIRED@

Return to bug 268693

Lines 1-13 Link Here

(-)b/archivers/libarchive/Makefile (-4 / +12 lines)
1	PORTNAME= libarchive	1	PORTNAME= libarchive
2	DISTVERSION= 3.6.1	2	DISTVERSION= 3.6.2
3	PORTREVISION= 1
4	PORTEPOCH= 1	3	PORTEPOCH= 1
5	CATEGORIES= archivers	4	CATEGORIES= archivers
6	MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/ \	5	MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/ \
7	https://libarchive.org/downloads/	6	https://libarchive.org/downloads/
8		7
9	PATCH_SITES= https://github.com/${PORTNAME}/${PORTNAME}/commit/	8	PATCH_SITES= https://github.com/${PORTNAME}/${PORTNAME}/commit/
10	PATCHFILES= bff38efe8c110469c5080d387bec62a6ca15b1a5.patch:-p1	9	PATCHFILES= 1f35c466aaa9444335a1b854b0b7223b0d2346c2.patch:-p1
11		10
12	MAINTAINER= glewis@FreeBSD.org	11	MAINTAINER= glewis@FreeBSD.org
13	COMMENT= Library to create and read several streaming archive formats	12	COMMENT= Library to create and read several streaming archive formats
Lines 27-33 OPTIONS_RADIO_CRYPTO= OPENSSL MBEDTLS NETTLE Link Here
27	CRYPTO_DESC= Crypto and hashing support	26	CRYPTO_DESC= Crypto and hashing support
28	NETTLE_DESC= Crypto support via Nettle	27	NETTLE_DESC= Crypto support via Nettle
29		28
30	USES= cpe iconv libtool localbase:ldflags pathfix tar:xz	29	USES= autoreconf cpe iconv libtool localbase:ldflags pathfix \
		30	pkgconfig tar:xz
31	GNU_CONFIGURE= yes	31	GNU_CONFIGURE= yes
32	USE_LDCONFIG= yes	32	USE_LDCONFIG= yes
33		33
Lines 117-120 CONFIGURE_ENV+= ac_cv_header_localcharset_h=no \ Link Here
117	ac_cv_lib_charset_locale_charset=no	117	ac_cv_lib_charset_locale_charset=no
118	.endif	118	.endif
119		119
		120	# Prior to 1301508 we didn't ship openssl.pc which libarchive now excepts
		121	# so we need to use the old approach on older versions of FreeBSD
		122	# which is not to define Requires.private in libarchive.pc
		123
		124	.if ${PORT_OPTIONS:MOPENSSL} && ${OPSYS} == FreeBSD && ${OSVERSION} < 1301508
		125	EXTRA_PATCHES= ${PATCHDIR}/extra-patch-pkgconfig-compat
		126	.endif
		127
120	.include <bsd.port.post.mk>	128	.include <bsd.port.post.mk>