From 919298e7a093e4df14d065723b3de5d5dfaf30d8 Mon Sep 17 00:00:00 2001 From: Ying-Chieh Liao Date: Fri, 23 Nov 2001 17:30:56 +0000 Subject: [PATCH] - Conditionalize bzip2 dependencies - Fix pkg-plist PR: 32212 Submitted by: KATO Tsuguru --- archivers/libcomprex/Makefile | 9 +++++---- archivers/libcomprex/pkg-plist | 5 +++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/archivers/libcomprex/Makefile b/archivers/libcomprex/Makefile index a052a5c82bc7..cc77cdbac768 100644 --- a/archivers/libcomprex/Makefile +++ b/archivers/libcomprex/Makefile @@ -14,14 +14,15 @@ MASTER_SITE_SUBDIR= gnupdate MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= bz2:${PORTSDIR}/archivers/bzip2 \ - curl:${PORTSDIR}/ftp/curl +LIB_DEPENDS= curl.2:${PORTSDIR}/ftp/curl +.if !exists(/usr/bin/bzip2) +LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2 +.endif USE_LIBTOOL= yes -GNU_CONFIGURE= yes CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" INSTALLS_SHLIB= yes -MAN1= comprex-config.1 +MAN1= comprex-config.1 .include diff --git a/archivers/libcomprex/pkg-plist b/archivers/libcomprex/pkg-plist index 68599a5e19a8..0712d98600c4 100644 --- a/archivers/libcomprex/pkg-plist +++ b/archivers/libcomprex/pkg-plist @@ -10,9 +10,10 @@ lib/comprex/file/bzip2.so lib/comprex/file/zlib.so lib/comprex/scheme/curl.a lib/libcomprex.a +lib/libcomprex.so lib/libcomprex.so.0 share/aclocal/comprex.m4 -@dirrm include/libcomprex -@dirrm lib/comprex/file @dirrm lib/comprex/scheme +@dirrm lib/comprex/file @dirrm lib/comprex +@dirrm include/libcomprex