summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkhorben <khorben@pkgsrc.org>2021-09-09 01:11:43 +0000
committerkhorben <khorben@pkgsrc.org>2021-09-09 01:11:43 +0000
commit8cd76708904a6ec9900f1957eed3e36a0a9a95dc (patch)
tree02cb828b6f5d603f5789abd8e4747db1e674b5d9
parenta9d19aff92ac48b2ebb78bc14cdafafc64dfbd85 (diff)
downloadpkgsrc-8cd76708904a6ec9900f1957eed3e36a0a9a95dc.tar.gz
roundcube: use PKG_SYSCONFDIR for plug-in configuration files
This moves the configuration files for Roundcube plug-ins to $PKG_SYSCONFDIR, where they should belong instead of $RC_DIR/$PLUGIN_DIR. This works without any further patches, because Roundcube falls back to RCUBE_CONFIG_DIR.'/'.$this->ID . '.inc.php' for plug-ins basically. Bumps PKGREVISION for the plug-ins using ../../mail/roundcube/plugins.mk (enigma, password, and zipdownload). Tested on NetBSD/amd64. OK taca@
-rw-r--r--mail/roundcube-plugin-enigma/Makefile3
-rw-r--r--mail/roundcube-plugin-password/Makefile4
-rw-r--r--mail/roundcube-plugin-zipdownload/Makefile3
-rw-r--r--mail/roundcube/plugins.mk9
4 files changed, 8 insertions, 11 deletions
diff --git a/mail/roundcube-plugin-enigma/Makefile b/mail/roundcube-plugin-enigma/Makefile
index 97d7c13dbf3..540d6338cb2 100644
--- a/mail/roundcube-plugin-enigma/Makefile
+++ b/mail/roundcube-plugin-enigma/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2020/12/28 08:59:53 taca Exp $
+# $NetBSD: Makefile,v 1.11 2021/09/09 01:11:43 khorben Exp $
PLUGIN= enigma
+PKGREVISION= 1
MAINTAINER= taca@NetBSD.org
COMMENT= Enigma Plugin for Roundcube
diff --git a/mail/roundcube-plugin-password/Makefile b/mail/roundcube-plugin-password/Makefile
index 47188ec097c..72d39b1104c 100644
--- a/mail/roundcube-plugin-password/Makefile
+++ b/mail/roundcube-plugin-password/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2021/05/24 19:52:53 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2021/09/09 01:11:43 khorben Exp $
PLUGIN= password
+PKGREVISION= 2
MAINTAINER= taca@NetBSD.org
COMMENT= Password change plugin for roundcube
-PKGREVISION= 1
LICENSE= gnu-gpl-v3
DEPENDS+= tcl-expect>=5.32.1:../../lang/tcl-expect
diff --git a/mail/roundcube-plugin-zipdownload/Makefile b/mail/roundcube-plugin-zipdownload/Makefile
index 0285365d50c..938e5d5fe81 100644
--- a/mail/roundcube-plugin-zipdownload/Makefile
+++ b/mail/roundcube-plugin-zipdownload/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2020/12/28 08:58:10 taca Exp $
+# $NetBSD: Makefile,v 1.8 2021/09/09 01:11:44 khorben Exp $
PLUGIN= zipdownload
+PKGREVISION= 1
MAINTAINER= taca@NetBSD.org
COMMENT= Roundcube Webmail ZipDownload plugin
diff --git a/mail/roundcube/plugins.mk b/mail/roundcube/plugins.mk
index 78262b5b80e..5fb484a0258 100644
--- a/mail/roundcube/plugins.mk
+++ b/mail/roundcube/plugins.mk
@@ -1,4 +1,4 @@
-# $NetBSD: plugins.mk,v 1.3 2020/01/14 14:30:00 taca Exp $
+# $NetBSD: plugins.mk,v 1.4 2021/09/09 01:11:43 khorben Exp $
#
# plugin's PKGNAME
@@ -12,14 +12,9 @@ EXTRACT_ELEMENTS?= ${WRKNAME}/${PLUGIN_DIR}
PLUGIN_DIR?= plugins/${PLUGIN}
CONF_PLUGINS?= ${PLUGIN}
-#
-# plugin directory
-INSTALLATION_DIRS= ${RCDIR}/${PLUGIN_DIR}
-
-
.for f in ${CONF_PLUGINS}
CONF_FILES_PERMS+= ${EGDIR}/plugins/${f}/config.inc.php \
- ${RCDIR}/plugins/${f}/config.inc.php \
+ ${PKG_SYSCONFDIR}/${f}.inc.php \
${WWW_USER} ${WWW_GROUP} 0640
.endfor