cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix shebang in zarafa-cachestat.py and use SUBST_CMD for /usr/local

Browse Source 
as well
This commit is contained in:
robert 2016-09-04 14:52:38 +00:00
parent ff67e242a9
commit b2c7f521a7
4 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mail/zarafa/zarafa/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.199 2016/08/12 08:09:05 robert Exp $
# $OpenBSD: Makefile,v 1.200 2016/09/04 14:52:38 robert Exp $
COMMENT-main= MS Exchange groupware suite replacement
COMMENT-mapi= zarafa MAPI extensions for PHP
@ -6,6 +6,7 @@ COMMENT-mapi= zarafa MAPI extensions for PHP
PKGNAME= zarafa-${V}
PKGNAME-main= zarafa-${V}
PKGNAME-mapi= zarafa-mapi-${V}
REVISION-main= 0
CATEGORIES= mail www productivity
@ -154,7 +155,8 @@ pre-configure:
for i in ${SUB_SCRIPTS}; do \
${SUBST_CMD} ${WRKSRC}/installer/userscripts/$$i; done
${SUBST_CMD} ${WRKSRC}/php-ext/Makefile.in \
${WRKSRC}/spooler/{DAgent,Spooler}.cpp
${WRKSRC}/spooler/{DAgent,Spooler}.cpp \
${WRKSRC}/tools/python-scripts/zarafa-cachestat.py
perl -pi -e 's,/usr/share/zarafa,${PREFIX}/share/examples/zarafa,g;' \
-e 's,/etc/zarafa,${SYSCONFDIR}/zarafa,g;' \
-e 's,/usr/bin,${PREFIX}/bin,g;' \

12
mail/zarafa/zarafa/patches/patch-spooler_DAgent_cpp
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-spooler_DAgent_cpp,v 1.30 2016/08/12 08:09:05 robert Exp $
$OpenBSD: patch-spooler_DAgent_cpp,v 1.31 2016/09/04 14:52:38 robert Exp $
--- spooler/DAgent.cpp.orig Mon Jul 18 23:19:27 2016
+++ spooler/DAgent.cpp Mon Aug 8 09:18:50 2016
@@ -69,6 +69,11 @@
@ -37,7 +37,7 @@ $OpenBSD: patch-spooler_DAgent_cpp,v 1.30 2016/08/12 08:09:05 robert Exp $
DeliveryArgs sDeliveryArgs;
sDeliveryArgs.strPath = "";
- sDeliveryArgs.strAutorespond = "/usr/sbin/zarafa-autorespond";
+ sDeliveryArgs.strAutorespond = "/usr/local/sbin/zarafa-autorespond";
+ sDeliveryArgs.strAutorespond = "${PREFIX}/sbin/zarafa-autorespond";
sDeliveryArgs.bCreateFolder = false;
sDeliveryArgs.strDeliveryFolder.clear();
sDeliveryArgs.szPathSeperator = '\\';
@ -58,13 +58,13 @@ $OpenBSD: patch-spooler_DAgent_cpp,v 1.30 2016/08/12 08:09:05 robert Exp $
{ "archive_on_delivery", "no", CONFIGSETTING_RELOADABLE },
- { "mr_autoaccepter", "/usr/sbin/zarafa-mr-accept", CONFIGSETTING_RELOADABLE },
- { "mr_autoprocessor", "/usr/sbin/zarafa-mr-process", CONFIGSETTING_RELOADABLE },
+ { "mr_autoaccepter", "/usr/local/sbin/zarafa-mr-accept", CONFIGSETTING_RELOADABLE },
+ { "mr_autoprocessor", "/usr/local/sbin/zarafa-mr-process", CONFIGSETTING_RELOADABLE },
+ { "mr_autoaccepter", "${PREFIX}/sbin/zarafa-mr-accept", CONFIGSETTING_RELOADABLE },
+ { "mr_autoprocessor", "${PREFIX}/sbin/zarafa-mr-process", CONFIGSETTING_RELOADABLE },
{ "plugin_enabled", "yes" },
- { "plugin_path", "/var/lib/zarafa/dagent/plugins" },
- { "plugin_manager_path", "/usr/share/zarafa-dagent/python" },
+ { "plugin_path", "/var/db/zarafa/dagent/plugins" },
+ { "plugin_manager_path", "/usr/local/share/zarafa-dagent/python" },
+ { "plugin_path", "${LOCALSTATEDIR}/db/zarafa/dagent/plugins" },
+ { "plugin_manager_path", "${PREFIX}/share/zarafa-dagent/python" },
{ "default_charset", "iso-8859-15" },
{ "set_rule_headers", "yes", CONFIGSETTING_RELOADABLE },
{ "no_double_forward", "no", CONFIGSETTING_RELOADABLE },

8
mail/zarafa/zarafa/patches/patch-spooler_Spooler_cpp
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-spooler_Spooler_cpp,v 1.21 2016/04/20 18:38:41 robert Exp $
$OpenBSD: patch-spooler_Spooler_cpp,v 1.22 2016/09/04 14:52:38 robert Exp $
--- spooler/Spooler.cpp.orig Wed Apr 20 13:13:54 2016
+++ spooler/Spooler.cpp Wed Apr 20 19:54:13 2016
@@ -1151,10 +1151,10 @@ int main(int argc, char *argv[]) {
@ -11,7 +11,7 @@ $OpenBSD: patch-spooler_Spooler_cpp,v 1.21 2016/04/20 18:38:41 robert Exp $
+ { "run_as_group", "_zarafa" },
{ "pid_file", "/var/run/zarafad/spooler.pid" },
- { "running_path", "/var/lib/zarafa" },
+ { "running_path", "/var/empty" },
+ { "running_path", "${LOCALSTATEDIR}/empty" },
{ "coredump_enabled", "no" },
#endif
{ "log_method","file" },
@ -21,8 +21,8 @@ $OpenBSD: patch-spooler_Spooler_cpp,v 1.21 2016/04/20 18:38:41 robert Exp $
{ "plugin_enabled", "yes" },
- { "plugin_path", "/var/lib/zarafa/spooler/plugins" },
- { "plugin_manager_path", "/usr/share/zarafa-spooler/python" },
+ { "plugin_path", "/var/db/zarafa/spooler/plugins" },
+ { "plugin_manager_path", "/usr/local/share/zarafa-spooler/python" },
+ { "plugin_path", "${LOCALSTATEDIR}/db/zarafa/spooler/plugins" },
+ { "plugin_manager_path", "${PREFIX}/share/zarafa-spooler/python" },
{ "z_statsd_stats", "/var/run/zarafad/statsd.sock" },
{ "tmp_path", "/tmp" },
{ "tmp_path", "/tmp" },

9
mail/zarafa/zarafa/patches/patch-tools_python-scripts_zarafa-cachestat_py Normal file
View File

@ -0,0 +1,9 @@
$OpenBSD: patch-tools_python-scripts_zarafa-cachestat_py,v 1.1 2016/09/04 14:52:38 robert Exp $
--- tools/python-scripts/zarafa-cachestat.py.orig Sun Sep 4 16:44:16 2016
+++ tools/python-scripts/zarafa-cachestat.py Sun Sep 4 16:44:24 2016
@@ -1,4 +1,4 @@
-#!/usr/bin/python -u
+#!${MODPY_BIN} -u
import sys
import datetime