Enforce libarchive from ports

7 files changed, 16 insertions, 19 deletions

diff --git a/archivers/ark/Makefile b/archivers/ark/Makefile
index 4e48150..61d0b30 100644
--- a/archivers/ark/Makefile
+++ b/archivers/ark/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ark
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	archivers kde
 MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
@@ -13,7 +14,7 @@ COMMENT=	Archiving tool for KDE
 LIB_DEPENDS=	libqjson.so:${PORTSDIR}/devel/qjson
 
 USE_KDE4=	kdeprefix automoc4 kdelibs libkonq
-USES=		cmake:outsource cpe tar:xz
+USES=		cmake:outsource libarchive cpe tar:xz
 CPE_VENDOR=	kde
 USE_QT4=	qtestlib qmake_build moc_build rcc_build uic_build
 USE_LDCONFIG=	yes
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 39107ff..0ff2903 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -5,6 +5,7 @@
 PORTNAME=	file-roller
 PORTVERSION=	3.14.2
 PORTEPOCH=	1
+PORTREVISION=	1
 CATEGORIES=	archivers gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -16,7 +17,7 @@ BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
 RUN_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar \
     		unzip:${PORTSDIR}/archivers/unzip
 
-USES=		desktop-file-utils gettext gmake libtool \
+USES=		desktop-file-utils gettext gmake libtool libarchive \
 		pathfix pkgconfig tar:xz
 USE_GNOME=	gnomeprefix gtk30 intlhack introspection:build
 USE_XORG=	sm
diff --git a/archivers/p5-Archive-Extract-Libarchive/Makefile b/archivers/p5-Archive-Extract-Libarchive/Makefile
index 308abd8..7c95c7a 100644
--- a/archivers/p5-Archive-Extract-Libarchive/Makefile
+++ b/archivers/p5-Archive-Extract-Libarchive/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Archive-Extract-Libarchive
 PORTVERSION=	0.38
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -21,7 +21,7 @@ TEST_DEPENDS=	p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
 		p5-Test-Pod>=1.04:${PORTSDIR}/devel/p5-Test-Pod
 
 USE_PERL5=	modbuild
-USES=		perl5
+USES=		perl5 libarchive
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Archive/Extract/Libarchive/Libarchive.so
diff --git a/archivers/pixz/Makefile b/archivers/pixz/Makefile
index b2c0d8d..17e2e58 100644
--- a/archivers/pixz/Makefile
+++ b/archivers/pixz/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 SUB_FILES=	Makefile
 PLIST_FILES=	bin/${PORTNAME} man/man1/pixz.1.gz
-USES=		uidfix
+USES=		uidfix libarchive
 
 post-extract: apply-slist
 	${INSTALL_DATA} ${WRKDIR}/Makefile ${WRKSRC}
diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile
index f20e124..88bcf72 100644
--- a/archivers/rpm4/Makefile
+++ b/archivers/rpm4/Makefile
@@ -27,8 +27,8 @@ NLS_USES=	gettext
 NLS_LIBS=	-lintl
 PORTDOCS=	*
 
-USES=		alias gmake libtool lua:51 pathfix pkgconfig shebangfix \
-		tar:bzip2
+USES=		alias gmake libarchive libtool lua:51 pathfix pkgconfig \
+		shebangfix tar:bzip2
 USE_BDB=	46+
 INVALID_BDB_VER=51
 GNU_CONFIGURE=	yes
@@ -59,12 +59,6 @@ CONFIGURE_ENV+=	LUA_CFLAGS=-I${LUA_INCDIR} \
 		LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER} -lm"
 PLIST_SUB+=	VERSION=${PORTVERSION}
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 1000000
-LIB_DEPENDS+=	libarchive.so.13:${PORTSDIR}/archivers/libarchive
-.endif
-
 post-patch:
 	${REINPLACE_CMD} -e 's:\.\./\.\./bin/::' ${WRKSRC}/Makefile.in
 	${REINPLACE_CMD} -e 's/(hpux)/& || defined(__FreeBSD__)/' \
@@ -77,4 +71,4 @@ post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} librpm/html ${STAGEDIR}${DOCSDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/archivers/rubygem-libarchive/Makefile b/archivers/rubygem-libarchive/Makefile
index a56ae53..2fa6741 100644
--- a/archivers/rubygem-libarchive/Makefile
+++ b/archivers/rubygem-libarchive/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libarchive
 PORTVERSION=	0.1.2
+PORTREVISION=	1
 CATEGORIES=	archivers rubygems
 MASTER_SITES=	RG
 
@@ -11,7 +12,7 @@ COMMENT=	Ruby bindings for libarchive
 
 LICENSE=	BSD3CLAUSE
 
-USES=		dos2unix
+USES=		dos2unix libarchive
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=	yes
diff --git a/net-mgmt/seafile/Makefile b/net-mgmt/seafile/Makefile
index 43ef920..e664c51 100644
--- a/net-mgmt/seafile/Makefile
+++ b/net-mgmt/seafile/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	seafile
 PORTVERSION=	4.0.6
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 DISTVERSIONSUFFIX=	-server
 CATEGORIES=	net-mgmt devel
@@ -27,13 +27,13 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:${PORTSDIR}/devel/py-eggtestin
 USE_GITHUB=	yes
 GH_ACCOUNT=	haiwen
 
-USES=		autoreconf iconv libtool pathfix pkgconfig python:2 shebangfix
+USES=		autoreconf iconv libarchive libtool pathfix pkgconfig python:2 \
+		shebangfix
 SHEBANG_FILES=	scripts/*.sh scripts/upgrade/*.sh
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	SSL_CFLAGS="${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" \
-		LIBARCHIVE_CFLAGS="-I/usr/include" LIBARCHIVE_LIBS="-larchive"
+CONFIGURE_ENV=	SSL_CFLAGS="${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"
 
 PATHFIX_MAKEFILEIN=	Makefile.am