summaryrefslogtreecommitdiff
path: root/archivers
diff options
context:
space:
mode:
authorrichard <richard@pkgsrc.org>2016-04-09 05:40:46 +0000
committerrichard <richard@pkgsrc.org>2016-04-09 05:40:46 +0000
commit83760dc36a46bb97662ea3de1bfeaa1563072ff8 (patch)
treeb5627484e38937475ee087e769bf9e146a8b3576 /archivers
parent4ddd8079190e78af0c69109d4ab9b58f12303752 (diff)
downloadpkgsrc-83760dc36a46bb97662ea3de1bfeaa1563072ff8.tar.gz
add nautilus option to put back nautilus actions sub-menu
bump PKGREVISION
Diffstat (limited to 'archivers')
-rw-r--r--archivers/file-roller/Makefile7
-rw-r--r--archivers/file-roller/PLIST3
-rw-r--r--archivers/file-roller/options.mk17
3 files changed, 23 insertions, 4 deletions
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index b14da6a88b1..ee16b859113 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.134 2015/06/12 10:48:21 wiz Exp $
+# $NetBSD: Makefile,v 1.135 2016/04/09 05:40:46 richard Exp $
#
DISTNAME= file-roller-2.32.2
-PKGREVISION= 23
+PKGREVISION= 24
CATEGORIES= archivers gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/file-roller/2.32/}
EXTRACT_SUFX= .tar.bz2
@@ -23,6 +23,8 @@ GCONF_SCHEMAS= file-roller.schemas
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.12.0
BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.10.0
+.include "options.mk"
+
# Force unzip from pkgsrc on NetBSD
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "NetBSD"
@@ -40,7 +42,6 @@ SUBST_SED.unzip= -e 's|@@UNZIP_COMMAND@@|${TOOLS_PATH.unzip}|'
.include "../../devel/glib2/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-#.include "../../sysutils/nautilus/buildlink3.mk"
.include "../../textproc/gnome-doc-utils/buildlink3.mk"
.include "../../mk/omf-scrollkeeper.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/archivers/file-roller/PLIST b/archivers/file-roller/PLIST
index 47a7c217c85..b314b555112 100644
--- a/archivers/file-roller/PLIST
+++ b/archivers/file-roller/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.36 2010/11/28 13:06:16 drochner Exp $
+@comment $NetBSD: PLIST,v 1.37 2016/04/09 05:40:46 richard Exp $
bin/file-roller
libexec/file-roller/isoinfo.sh
libexec/file-roller/rpm2cpio
+${PLIST.nautilus}lib/nautilus/extensions-2.0/libnautilus-fileroller.la
share/applications/file-roller.desktop
share/file-roller/icons/hicolor/16x16/actions/add-files-to-archive.png
share/file-roller/icons/hicolor/16x16/actions/add-folder-to-archive.png
diff --git a/archivers/file-roller/options.mk b/archivers/file-roller/options.mk
new file mode 100644
index 00000000000..533f94642c1
--- /dev/null
+++ b/archivers/file-roller/options.mk
@@ -0,0 +1,17 @@
+# $NetBSD: options.mk,v 1.1 2016/04/09 05:40:46 richard Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.file-roller
+PKG_SUPPORTED_OPTIONS= nautilus
+PKG_SUGGESTED_OPTIONS= nautilus
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+= nautilus
+
+.if !empty(PKG_OPTIONS:Mnautilus)
+PLIST.nautilus= yes
+CONFIGURE_ARGS+= --enable-nautilus-actions
+.include "../../sysutils/nautilus/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-nautilus-actions
+.endif