svn commit: r392508 - in head: archivers/ark archivers/file-roller archivers/p5-Archive-Extract-Libarchive archivers/pixz archivers/rpm4 archivers/rubygem-libarchive net-mgmt/seafile
Baptiste Daroussin
bapt at FreeBSD.org
Sun Jul 19 14:37:23 UTC 2015
Author: bapt
Date: Sun Jul 19 14:37:20 2015
New Revision: 392508
URL: https://svnweb.freebsd.org/changeset/ports/392508
Log:
Enforce libarchive from ports
Modified:
head/archivers/ark/Makefile
head/archivers/file-roller/Makefile
head/archivers/p5-Archive-Extract-Libarchive/Makefile
head/archivers/pixz/Makefile
head/archivers/rpm4/Makefile
head/archivers/rubygem-libarchive/Makefile
head/net-mgmt/seafile/Makefile
Modified: head/archivers/ark/Makefile
==============================================================================
--- head/archivers/ark/Makefile Sun Jul 19 14:36:00 2015 (r392507)
+++ head/archivers/ark/Makefile Sun Jul 19 14:37:20 2015 (r392508)
@@ -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
Modified: head/archivers/file-roller/Makefile
==============================================================================
--- head/archivers/file-roller/Makefile Sun Jul 19 14:36:00 2015 (r392507)
+++ head/archivers/file-roller/Makefile Sun Jul 19 14:37:20 2015 (r392508)
@@ -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}/textp
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
Modified: head/archivers/p5-Archive-Extract-Libarchive/Makefile
==============================================================================
--- head/archivers/p5-Archive-Extract-Libarchive/Makefile Sun Jul 19 14:36:00 2015 (r392507)
+++ head/archivers/p5-Archive-Extract-Libarchive/Makefile Sun Jul 19 14:37:20 2015 (r392508)
@@ -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:${PORTSDI
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
Modified: head/archivers/pixz/Makefile
==============================================================================
--- head/archivers/pixz/Makefile Sun Jul 19 14:36:00 2015 (r392507)
+++ head/archivers/pixz/Makefile Sun Jul 19 14:37:20 2015 (r392508)
@@ -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}
Modified: head/archivers/rpm4/Makefile
==============================================================================
--- head/archivers/rpm4/Makefile Sun Jul 19 14:36:00 2015 (r392507)
+++ head/archivers/rpm4/Makefile Sun Jul 19 14:37:20 2015 (r392508)
@@ -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_INCDI
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>
Modified: head/archivers/rubygem-libarchive/Makefile
==============================================================================
--- head/archivers/rubygem-libarchive/Makefile Sun Jul 19 14:36:00 2015 (r392507)
+++ head/archivers/rubygem-libarchive/Makefile Sun Jul 19 14:37:20 2015 (r392508)
@@ -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
Modified: head/net-mgmt/seafile/Makefile
==============================================================================
--- head/net-mgmt/seafile/Makefile Sun Jul 19 14:36:00 2015 (r392507)
+++ head/net-mgmt/seafile/Makefile Sun Jul 19 14:37:20 2015 (r392508)
@@ -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}eggt
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
More information about the svn-ports-all
mailing list