3 files changed, 18 insertions, 54 deletions

diff --git a/graphics/atril-lite/Makefile b/graphics/atril-lite/Makefile
index 06e8da1258c6..41a7c7fb2f53 100644
--- a/graphics/atril-lite/Makefile
+++ b/graphics/atril-lite/Makefile
@@ -1,7 +1,7 @@
 # Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	-lite
 
 COMMENT=	MATE multi-format document viewer
diff --git a/graphics/atril/Makefile b/graphics/atril/Makefile
index 8640c59a3390..0edf4d2f7fdd 100644
--- a/graphics/atril/Makefile
+++ b/graphics/atril/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	atril
 PORTVERSION=	1.8.1
-PORTREVISION?=	5
+PORTREVISION?=	6
 CATEGORIES=	graphics print mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
@@ -23,13 +23,13 @@ SLAVEPORT?=	no
 
 USES=		desktop-file-utils gettext gmake libtool pathfix \
 		pkgconfig tar:xz
-USE_MATE=	desktop icontheme
+USE_MATE=	icontheme
 USE_XORG=	sm
 USE_GNOME=	cairo gtk20 intlhack libxml2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gtk=2.0 \
-		--disable-xps \
+		--disable-introspection \
 		--disable-static
 INSTALLS_ICONS=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -37,12 +37,10 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 .if ${SLAVEPORT} == lite
-CONFIGURE_ARGS+=--disable-introspection \
-		--disable-thumbnailer \
+CONFIGURE_ARGS+=--disable-thumbnailer \
 		--disable-previewer
 .else
-USE_GNOME+=	introspection:build
-CONFIGURE_ARGS+=	--enable-introspection
+USE_MATE+=	desktop
 .endif
 
 GLIB_SCHEMAS=	org.mate.Atril.gschema.xml
@@ -57,6 +55,18 @@ COMICS_DESC=	Comic book archives support
 DJVU_DESC=	DJVU support
 XPS_DESC=	XPS support
 
+OPTIONS_SUB=	yes
+
+CAJA_CONFIGURE_ENABLE=	caja
+CAJA_USE=		MATE=caja
+DJVU_LIB_DEPENDS=	libdjvulibre.so:${PORTSDIR}/graphics/djvulibre
+DJVU_CONFIGURE_ENABLE=	djvu
+COMICS_CONFIGURE_ENABLE=	comics
+KEYRING_CONFIGURE_WITH=	keyring
+KEYRING_LIB_DEPENDS=	libsecret-1.so:${PORTSDIR}/security/libsecret
+XPS_CONFIGURE_ENABLE=	xps
+XPS_LIB_DEPENDS=	libgxps.so:${PORTSDIR}/graphics/libgxps
+
 .include <bsd.port.options.mk>
 
 .if ${SLAVEPORT} == lite
@@ -67,7 +77,6 @@ LIB_DEPENDS+=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 .endif
 
 .if ${PORT_OPTIONS:MDVI} || ${PORT_OPTIONS:MT1LIB}
-
 USE_TEX=	base
 CONFIGURE_ARGS+=--enable-dvi
 PLIST_SUB+=	DVI=""
@@ -84,45 +93,4 @@ CONFIGURE_ARGS+=--disable-dvi
 PLIST_SUB+=	DVI="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MKEYRING}
-LIB_DEPENDS+=	libsecret-1.so:${PORTSDIR}/security/libsecret
-.else
-CONFIGURE_ARGS+=--without-keyring
-.endif
-
-.if ${PORT_OPTIONS:MCAJA}
-USE_MATE+=	caja
-CONFIGURE_ARGS+=--enable-caja
-PLIST_SUB+=	CAJA=""
-.else
-CONFIGURE_ARGS+=--disable-caja
-PLIST_SUB+=	CAJA="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MXPS}
-LIB_DEPENDS+=		libgxps.so:${PORTSDIR}/graphics/libgxps
-CONFIGURE_ARGS+=	--enable-xps
-PLIST_SUB+=		XPS=""
-.else
-CONFIGURE_ARGS+=	--disable-xps
-PLIST_SUB+=		XPS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MDJVU}
-LIB_DEPENDS+=	libdjvulibre.so:${PORTSDIR}/graphics/djvulibre
-CONFIGURE_ARGS+=--enable-djvu
-PLIST_SUB+=	DJVU=""
-.else
-CONFIGURE_ARGS+=--disable-djvu
-PLIST_SUB+=	DJVU="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MCOMICS}
-CONFIGURE_ARGS+=--enable-comics
-PLIST_SUB+=	COMICS=""
-.else
-CONFIGURE_ARGS+=--disable-comics
-PLIST_SUB+=	COMICS="@comment "
-.endif
-
 .include <bsd.port.mk>
diff --git a/graphics/atril/pkg-plist b/graphics/atril/pkg-plist
index 010559b5465b..607799c72193 100644
--- a/graphics/atril/pkg-plist
+++ b/graphics/atril/pkg-plist
@@ -63,8 +63,6 @@ lib/atril/3/backends/psdocument.atril-backend
 lib/atril/3/backends/tiffdocument.atril-backend
 %%XPS%%lib/atril/3/backends/xpsdocument.atril-backend
 %%CAJA%%lib/caja/extensions-2.0/libatril-properties-page.so
-lib/girepository-1.0/AtrilDocument-1.5.0.typelib
-lib/girepository-1.0/AtrilView-1.5.0.typelib
 lib/libatrildocument.so
 lib/libatrildocument.so.3
 lib/libatrildocument.so.%%GTK3_VERSION%%
@@ -124,8 +122,6 @@ share/applications/atril.desktop
 %%DATADIR%%/icons/hicolor/scalable/actions/object-rotate-right.svg
 %%DATADIR%%/icons/hicolor/scalable/mimetypes/x-office-presentation.svg
 share/dbus-1/services/org.mate.atril.Daemon.service
-share/gir-1.0/AtrilDocument-1.5.0.gir
-share/gir-1.0/AtrilView-1.5.0.gir
 share/gtk-doc/html/atril/EggFindBar.html
 share/gtk-doc/html/atril/EvFileMonitor.html
 share/gtk-doc/html/atril/EvHistory.html