Enforce libarchive from ports

This reduces the patching level on some ports and make it simpler to maintainer
over all supported version of freebsd

4 files changed, 4 insertions, 86 deletions

diff --git a/graphics/libgxps/Makefile b/graphics/libgxps/Makefile
index 754f2edc446e..df71a0bd8555 100644
--- a/graphics/libgxps/Makefile
+++ b/graphics/libgxps/Makefile
@@ -16,12 +16,11 @@ LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libtiff.so:${PORTSDIR}/graphics/tiff \
 		liblcms2.so:${PORTSDIR}/graphics/lcms2
 
-USES=		gettext gmake jpeg libtool pathfix pkgconfig tar:xz
+USES=		gettext gmake jpeg libtool libarchive pathfix pkgconfig tar:xz
 USE_LDCONFIG=	yes
 USE_GNOME=	cairo gnomeprefix glib20 intlhack
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -larchive
+MAKE_ARGS+=	V=1
 CONFIGURE_ARGS+=	--enable-introspection=no
 INSTALL_TARGET=	install-strip
 
diff --git a/graphics/libgxps/files/patch-configure b/graphics/libgxps/files/patch-configure
deleted file mode 100644
index 9cd6434c61f4..000000000000
--- a/graphics/libgxps/files/patch-configure
+++ /dev/null
@@ -1,69 +0,0 @@
---- configure.orig	2014-03-24 09:05:21.575540501 +0000
-+++ configure	2014-03-24 09:05:37.706538416 +0000
-@@ -13236,13 +13236,11 @@
- 		  gobject-2.0 >= \$GLIB_REQUIRED
- 		  gio-2.0 >= \$GLIB_REQUIRED
- 		  cairo >= \$CAIRO_REQUIRED
--		  libarchive >= \$LIBARCHIVE_REQUIRED
- 		  freetype2\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED
- 		  gobject-2.0 >= $GLIB_REQUIRED
- 		  gio-2.0 >= $GLIB_REQUIRED
- 		  cairo >= $CAIRO_REQUIRED
--		  libarchive >= $LIBARCHIVE_REQUIRED
- 		  freetype2") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-@@ -13251,7 +13249,6 @@
- 		  gobject-2.0 >= $GLIB_REQUIRED
- 		  gio-2.0 >= $GLIB_REQUIRED
- 		  cairo >= $CAIRO_REQUIRED
--		  libarchive >= $LIBARCHIVE_REQUIRED
- 		  freetype2" 2>/dev/null`
- 		      test "x$?" != "x0" && pkg_failed=yes
- else
-@@ -13268,13 +13265,11 @@
- 		  gobject-2.0 >= \$GLIB_REQUIRED
- 		  gio-2.0 >= \$GLIB_REQUIRED
- 		  cairo >= \$CAIRO_REQUIRED
--		  libarchive >= \$LIBARCHIVE_REQUIRED
- 		  freetype2\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED
- 		  gobject-2.0 >= $GLIB_REQUIRED
- 		  gio-2.0 >= $GLIB_REQUIRED
- 		  cairo >= $CAIRO_REQUIRED
--		  libarchive >= $LIBARCHIVE_REQUIRED
- 		  freetype2") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-@@ -13283,7 +13278,6 @@
- 		  gobject-2.0 >= $GLIB_REQUIRED
- 		  gio-2.0 >= $GLIB_REQUIRED
- 		  cairo >= $CAIRO_REQUIRED
--		  libarchive >= $LIBARCHIVE_REQUIRED
- 		  freetype2" 2>/dev/null`
- 		      test "x$?" != "x0" && pkg_failed=yes
- else
-@@ -13309,14 +13303,12 @@
- 		  gobject-2.0 >= $GLIB_REQUIRED
- 		  gio-2.0 >= $GLIB_REQUIRED
- 		  cairo >= $CAIRO_REQUIRED
--		  libarchive >= $LIBARCHIVE_REQUIRED
- 		  freetype2" 2>&1`
-         else
- 	        GXPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= $GLIB_REQUIRED
- 		  gobject-2.0 >= $GLIB_REQUIRED
- 		  gio-2.0 >= $GLIB_REQUIRED
- 		  cairo >= $CAIRO_REQUIRED
--		  libarchive >= $LIBARCHIVE_REQUIRED
- 		  freetype2" 2>&1`
-         fi
- 	# Put the nasty error message in config.log where it belongs
-@@ -13326,7 +13318,6 @@
- 		  gobject-2.0 >= $GLIB_REQUIRED
- 		  gio-2.0 >= $GLIB_REQUIRED
- 		  cairo >= $CAIRO_REQUIRED
--		  libarchive >= $LIBARCHIVE_REQUIRED
- 		  freetype2) were not met:
- 
- $GXPS_PKG_ERRORS
diff --git a/graphics/libgxps/files/patch-libgxps.pc.in b/graphics/libgxps/files/patch-libgxps.pc.in
deleted file mode 100644
index 74cd92afff0f..000000000000
--- a/graphics/libgxps/files/patch-libgxps.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgxps.pc.in.orig	2010-09-05 12:21:14.000000000 +0200
-+++ libgxps.pc.in	2014-03-25 17:14:35.000000000 +0100
-@@ -6,6 +6,6 @@
- Name: libgxps
- Description: XPS Documents library
- Version: @VERSION@
--Requires: gio-2.0 >= @GLIB_REQUIRED@ libarchive >= @LIBARCHIVE_REQUIRED@ cairo >= @CAIRO_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@
--Libs: -L${libdir} -lgxps
-+Requires: gio-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@
-+Libs: -L${libdir} -lgxps -larchive
- Cflags: -I${includedir}
diff --git a/graphics/zathura-cb/Makefile b/graphics/zathura-cb/Makefile
index 28d90ca0df27..1fb68aa8f16d 100644
--- a/graphics/zathura-cb/Makefile
+++ b/graphics/zathura-cb/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	zathura-cb
 PORTVERSION=	0.1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://pwmt.org/projects/zathura-cb/download/
 
@@ -14,13 +14,12 @@ LICENSE_NAME=	zlib license
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 
-LIB_DEPENDS=	libarchive.so:${PORTSDIR}/archivers/libarchive
 BUILD_DEPENDS=	zathura:${PORTSDIR}/graphics/zathura
 RUN_DEPENDS=	zathura:${PORTSDIR}/graphics/zathura
 
 PLIST_FILES=	lib/zathura/cb.so share/applications/zathura-cb.desktop
 
-USES=		desktop-file-utils gmake pkgconfig
+USES=		desktop-file-utils gmake pkgconfig libarchive
 USE_GNOME=	glib20 gtk30
 USE_OPENSSL=	yes