aboutsummaryrefslogtreecommitdiff
path: root/sysutils/dtc
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/dtc')
-rw-r--r--sysutils/dtc/Makefile14
-rw-r--r--sysutils/dtc/files/dtc-deinstall.in4
-rw-r--r--sysutils/dtc/files/dtc-install.in4
3 files changed, 11 insertions, 11 deletions
diff --git a/sysutils/dtc/Makefile b/sysutils/dtc/Makefile
index 8a910b4adcdc..a6e2bff203e3 100644
--- a/sysutils/dtc/Makefile
+++ b/sysutils/dtc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dtc
PORTVERSION= 0.12.0.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.gplhost.com/pub/dtc/bsd/
@@ -15,13 +15,11 @@ MAINTAINER= thomas@goirand.fr
COMMENT= A hosting web GUI for admin and accounting apache/named/proftpd/qmail
RUN_DEPENDS= ${LOCALBASE}/share/pear/Crypt/CBC.php:${PORTSDIR}/security/pear-Crypt_CBC \
- ${LOCALBASE}/libexec/proftpd:${PORTSDIR}/ftp/proftpd-mysql \
- ${LOCALBASE}/libexec/apache2/mod_log_sql.so:${PORTSDIR}/www/mod_log_sql2 \
+ ${LOCALBASE}/sbin/proftpd:${PORTSDIR}/ftp/proftpd-mysql \
+ ${LOCALBASE}/libexec/apache/mod_log_sql.so:${PORTSDIR}/www/mod_log_sql2 \
${LOCALBASE}/bin/webalizer:${PORTSDIR}/www/webalizer \
- ${QMAIL_DIR}/bin/qmail-start:${PORTSDIR}/mail/qmail
USE_PHP= session mysql sockets gd
-QMAIL_DIR?= /var/qmail
DTCROOT?= www/dtc
DTCDIR= ${PREFIX}/${DTCROOT}
@@ -34,14 +32,16 @@ IGNORE= Untested
NO_BUILD= yes
USE_MYSQL= yes
+USE_QMAIL_RUN= yes
+
do-configure:
@${SED} -e 's,%%PREFIX%%,${PREFIX},;\
s,%%LOCALBASE%%,${LOCALBASE},;\
- s,%%QMAIL_DIR%%,${QMAIL_DIR},' \
+ s,%%QMAIL_PREFIX%%,${QMAIL_PREFIX},' \
${FILESDIR}/dtc-install.in > ${WRKDIR}/dtc-install
@${SED} -e 's,%%PREFIX%%,${PREFIX},;\
s,%%LOCALBASE%%,${LOCALBASE},;\
- s,%%QMAIL_DIR%%,${QMAIL_DIR},' \
+ s,%%QMAIL_PREFIX%%,${QMAIL_PREFIX},' \
${FILESDIR}/dtc-deinstall.in > ${WRKDIR}/dtc-deinstall
do-install:
diff --git a/sysutils/dtc/files/dtc-deinstall.in b/sysutils/dtc/files/dtc-deinstall.in
index 024ffceced82..6929330f665c 100644
--- a/sysutils/dtc/files/dtc-deinstall.in
+++ b/sysutils/dtc/files/dtc-deinstall.in
@@ -8,13 +8,13 @@ UNIX_TYPE=freebsd
PREFIX=%%PREFIX%%
LOCALBASE=%%LOCALBASE%%
-QMAIL_DIR=%%QMAIL_DIR%%
+QMAIL_PREFIX=%%QMAIL_PREFIX%%
echo "### DEAMON PATH CONFIGURATION ###"
PATH_HTTPD_CONF="${LOCALBASE}/etc/apache/httpd.conf"
PATH_NAMED_CONF="/etc/namedb/named.conf"
PATH_PROFTPD_CONF="${LOCALBASE}/etc/proftpd.conf"
-PATH_QMAIL_CTRL="${QMAIL_DIR}/control"
+PATH_QMAIL_CTRL="${QMAIL_PREFIX}/control"
# Multi OS (Unix system) uninstall sh script for DTC
# Written by Thomas GOIRAND <thomas@goirand.fr>
diff --git a/sysutils/dtc/files/dtc-install.in b/sysutils/dtc/files/dtc-install.in
index 196d3b0d1580..d6d60ce6e109 100644
--- a/sysutils/dtc/files/dtc-install.in
+++ b/sysutils/dtc/files/dtc-install.in
@@ -7,7 +7,7 @@
PREFIX=%%PREFIX%%
LOCALBASE=%%LOCALBASE%%
-QMAIL_DIR=%%QMAIL_DIR%%
+QMAIL_PREFIX=%%QMAIL_PREFIX%%
UNIX_TYPE=freebsd
@@ -128,7 +128,7 @@ then
cp ${LOCALBASE}/etc/proftpd.conf.default ${LOCALBASE}/etc/proftpd.conf
fi
PATH_PROFTPD_CONF="${LOCALBASE}/etc/proftpd.conf"
-PATH_QMAIL_CTRL="${QMAIL_DIR}/control"
+PATH_QMAIL_CTRL="${QMAIL_PREFIX}/control"
PATH_PHP_CGI="${LOCALBASE}/bin/php"
PATH_DTC_SHARED="${PREFIX}/www/dtc"