CVS commit: pkgsrc/mail

["Pierre Pronchery" <khorben%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   khorben
Date:           Thu Sep  9 01:11:44 UTC 2021

Modified Files:
        pkgsrc/mail/roundcube: plugins.mk
        pkgsrc/mail/roundcube-plugin-enigma: Makefile
        pkgsrc/mail/roundcube-plugin-password: Makefile
        pkgsrc/mail/roundcube-plugin-zipdownload: Makefile

Log Message:
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@


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/mail/roundcube/plugins.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/mail/roundcube-plugin-enigma/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/mail/roundcube-plugin-password/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/mail/roundcube-plugin-zipdownload/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/roundcube/plugins.mk
diff -u pkgsrc/mail/roundcube/plugins.mk:1.3 pkgsrc/mail/roundcube/plugins.mk:1.4
--- pkgsrc/mail/roundcube/plugins.mk:1.3        Tue Jan 14 14:30:00 2020
+++ pkgsrc/mail/roundcube/plugins.mk    Thu Sep  9 01:11:43 2021
@@ -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_D
 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
 

Index: pkgsrc/mail/roundcube-plugin-enigma/Makefile
diff -u pkgsrc/mail/roundcube-plugin-enigma/Makefile:1.10 pkgsrc/mail/roundcube-plugin-enigma/Makefile:1.11
--- pkgsrc/mail/roundcube-plugin-enigma/Makefile:1.10   Mon Dec 28 08:59:53 2020
+++ pkgsrc/mail/roundcube-plugin-enigma/Makefile        Thu Sep  9 01:11:43 2021
@@ -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

Index: pkgsrc/mail/roundcube-plugin-password/Makefile
diff -u pkgsrc/mail/roundcube-plugin-password/Makefile:1.14 pkgsrc/mail/roundcube-plugin-password/Makefile:1.15
--- pkgsrc/mail/roundcube-plugin-password/Makefile:1.14 Mon May 24 19:52:53 2021
+++ pkgsrc/mail/roundcube-plugin-password/Makefile      Thu Sep  9 01:11:43 2021
@@ -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

Index: pkgsrc/mail/roundcube-plugin-zipdownload/Makefile
diff -u pkgsrc/mail/roundcube-plugin-zipdownload/Makefile:1.7 pkgsrc/mail/roundcube-plugin-zipdownload/Makefile:1.8
--- pkgsrc/mail/roundcube-plugin-zipdownload/Makefile:1.7       Mon Dec 28 08:58:10 2020
+++ pkgsrc/mail/roundcube-plugin-zipdownload/Makefile   Thu Sep  9 01:11:44 2021
@@ -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