From dbfbf7ae92436830b554f69f80d01b19407a2e6a Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Sun, 19 Jul 2015 21:31:52 +0000 Subject: [PATCH] Drop libarchive.pc We want to ensure we always use libarchive from ports in the ports tree. It simplifies ports maintainance and anyway libarchive.pc was not reflecting the different way libarchive can be built in base --- ObsoleteFiles.inc | 2 ++ lib/libarchive/Makefile | 6 ------ lib/libarchive/libarchive.pc | 12 ------------ 3 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 lib/libarchive/libarchive.pc diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index fc909c488845..236da23f1cc2 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -38,6 +38,8 @@ # xargs -n1 | sort | uniq -d; # done +# 20150719: Remove libarchive.pc +OLD_FILES+=usr/libdata/pkgconfig/libarchive.pc # 20150705: Rename DTrace provider man pages. OLD_FILES+=usr/share/man/man4/dtrace-io.4.gz OLD_FILES+=usr/share/man/man4/dtrace-ip.4.gz diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile index 9dfad77aaf94..3870de2a40b9 100644 --- a/lib/libarchive/Makefile +++ b/lib/libarchive/Makefile @@ -37,12 +37,6 @@ CFLAGS+= -DPPMD_32BIT .endif NO_WCAST_ALIGN.clang= -.ifndef COMPAT_32BIT -beforeinstall: - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${.CURDIR}/libarchive.pc ${DESTDIR}${LIBDATADIR}/pkgconfig -.endif - .PATH: ${LIBARCHIVEDIR}/libarchive # Headers to be installed in /usr/include diff --git a/lib/libarchive/libarchive.pc b/lib/libarchive/libarchive.pc deleted file mode 100644 index 3aa1d0453cce..000000000000 --- a/lib/libarchive/libarchive.pc +++ /dev/null @@ -1,12 +0,0 @@ -# $FreeBSD$ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: libarchive -Description: library that can create and read several streaming archive formats -Version: 3.1.2 -Cflags: -I${includedir} -Libs: -L${libdir} -larchive -Libs.private: -lz -lbz2 -llzma -lbsdxml -lcrypto