[pkgsrc/trunk]: pkgsrc/mail roundcube: use PKG_SYSCONFDIR for plug-in configu...

[khorben <khorben%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cd70a446e6fb
branches:  trunk
changeset: 458085:cd70a446e6fb
user:      khorben <khorben%pkgsrc.org@localhost>
date:      Thu Sep 09 01:11:43 2021 +0000

description:
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@

diffstat:

 mail/roundcube-plugin-enigma/Makefile      |  3 ++-
 mail/roundcube-plugin-password/Makefile    |  4 ++--
 mail/roundcube-plugin-zipdownload/Makefile |  3 ++-
 mail/roundcube/plugins.mk                  |  9 ++-------
 4 files changed, 8 insertions(+), 11 deletions(-)

diffs (65 lines):

diff -r 4d74225a4286 -r cd70a446e6fb mail/roundcube-plugin-enigma/Makefile
--- a/mail/roundcube-plugin-enigma/Makefile     Thu Sep 09 00:42:29 2021 +0000
+++ b/mail/roundcube-plugin-enigma/Makefile     Thu Sep 09 01:11:43 2021 +0000
@@ -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@localhost
 COMMENT=       Enigma Plugin for Roundcube
diff -r 4d74225a4286 -r cd70a446e6fb mail/roundcube-plugin-password/Makefile
--- a/mail/roundcube-plugin-password/Makefile   Thu Sep 09 00:42:29 2021 +0000
+++ b/mail/roundcube-plugin-password/Makefile   Thu Sep 09 01:11:43 2021 +0000
@@ -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@localhost
 COMMENT=       Password change plugin for roundcube
-PKGREVISION=   1
 LICENSE=       gnu-gpl-v3
 
 DEPENDS+=      tcl-expect>=5.32.1:../../lang/tcl-expect
diff -r 4d74225a4286 -r cd70a446e6fb mail/roundcube-plugin-zipdownload/Makefile
--- a/mail/roundcube-plugin-zipdownload/Makefile        Thu Sep 09 00:42:29 2021 +0000
+++ b/mail/roundcube-plugin-zipdownload/Makefile        Thu Sep 09 01:11:43 2021 +0000
@@ -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@localhost
 COMMENT=       Roundcube Webmail ZipDownload plugin
diff -r 4d74225a4286 -r cd70a446e6fb mail/roundcube/plugins.mk
--- a/mail/roundcube/plugins.mk Thu Sep 09 00:42:29 2021 +0000
+++ b/mail/roundcube/plugins.mk Thu Sep 09 01:11:43 2021 +0000
@@ -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 @@
 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