aboutsummaryrefslogtreecommitdiff
path: root/mail/horde-ingo
diff options
context:
space:
mode:
authorAndrew Pantyukhin <sat@FreeBSD.org>2007-04-07 11:46:27 +0000
committerAndrew Pantyukhin <sat@FreeBSD.org>2007-04-07 11:46:27 +0000
commit1309ed10758eb79ce68171b002b0dfc87e6f37c5 (patch)
tree574c69a94acb30c4606b680ab21447a0bb691a05 /mail/horde-ingo
parent8ed7e7476e3842875ce173b297c8d4638013613c (diff)
downloadports-1309ed10758eb79ce68171b002b0dfc87e6f37c5.tar.gz
ports-1309ed10758eb79ce68171b002b0dfc87e6f37c5.zip
Notes
Diffstat (limited to 'mail/horde-ingo')
-rw-r--r--mail/horde-ingo/Makefile17
-rw-r--r--mail/horde-ingo/files/httpd.conf.ingo31
-rw-r--r--mail/horde-ingo/files/pkg-message.in1
-rw-r--r--mail/horde-ingo/pkg-plist1
4 files changed, 5 insertions, 45 deletions
diff --git a/mail/horde-ingo/Makefile b/mail/horde-ingo/Makefile
index 6c8f42c0c967..eb94e51a0363 100644
--- a/mail/horde-ingo/Makefile
+++ b/mail/horde-ingo/Makefile
@@ -8,6 +8,7 @@
PORTNAME= ingo
PORTVERSION= 1.1.3
DISTVERSIONPREFIX= h3-
+PORTREVISION= 1
CATEGORIES= mail www
MASTER_SITES= HORDE
@@ -26,7 +27,6 @@ RUN_DEPENDS+= ${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde-base
NO_BUILD= yes
USE_PHP= imap
USE_GETTEXT= yes
-USE_APACHE= 1.3+ # needed to test APACHE_VERSION
PLIST_SUB= INGODIR=${LINGODIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||}
PKGMESSAGE= ${WRKDIR}/pkg-message
@@ -52,30 +52,23 @@ CONFDIR= ${INGODIR}/config
RUN_DEPENDS+= ${PEARDIR}/Net/Sieve.php:${PORTSDIR}/net/pear-Net_Sieve
.endif
-.if ${APACHE_VERSION} >= 20
-HORDE_INC= ${LOCALBASE}/etc/apache${APACHE_VERSION:S/20/2/}/Includes
-.else
-HORDE_INC= ${LOCALBASE}/etc/horde
-.endif
-
post-patch:
@${FIND} ${WRKSRC} -name "*.orig" -delete
post-extract:
@${MV} ${WRKSRC}/README ${WRKSRC}/docs/
-pre-configure:
- @${SED} -e "s:/home/httpd/html/horde/ingo:${INGODIR}:g" \
- ${FILESDIR}/httpd.conf.ingo >${WRKDIR}/httpd-ingo.conf
-
do-install:
@${INSTALL} -d ${INGODIR}/
@${CP} -Rp ${SUB_DIRS:S|^|${WRKSRC}/|} ${INGODIR}/
@${CP} -p ${WRKSRC}/*.php ${INGODIR}/
@${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR}/
- @${INSTALL_DATA} ${WRKDIR}/httpd-ingo.conf ${HORDE_INC}/
@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${INGODIR}/
@${CHMOD} -R o-rwx ${CONFDIR}/
+ ${ECHO_CMD} @exec ${CHOWN} -R ${WWWOWN}:${WWWGRP}\
+ %D/${INGODIR:S|^${PREFIX}/||}/ >> ${TMPPLIST}
+ ${ECHO_CMD} @exec ${CHMOD} -R o-rwx\
+ %D/${CONFDIR:S|^${PREFIX}/||}/ >> ${TMPPLIST}
.if !defined(NOPORTDOCS)
@${INSTALL} -d ${DOCSDIR}/
@${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${DOCSDIR}/
diff --git a/mail/horde-ingo/files/httpd.conf.ingo b/mail/horde-ingo/files/httpd.conf.ingo
deleted file mode 100644
index d07046cdd18c..000000000000
--- a/mail/horde-ingo/files/httpd.conf.ingo
+++ /dev/null
@@ -1,31 +0,0 @@
-# This is included in Apache's httpd.conf for Ingo
-#
-# For security, don't serve pages from the Ingo configuration and
-# library directories.
-#
-<Directory "/home/httpd/html/horde/ingo/config">
- order deny,allow
- deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/ingo/lib">
- order deny,allow
- deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/ingo/locale">
- order deny,allow
- deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/ingo/po">
- order deny,allow
- deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/ingo/scripts">
- order deny,allow
- deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/ingo/templates">
- order deny,allow
- deny from all
-</Directory>
-# End of Ingo configuration ================
-
diff --git a/mail/horde-ingo/files/pkg-message.in b/mail/horde-ingo/files/pkg-message.in
index fba684f58b9d..0a1a920d3516 100644
--- a/mail/horde-ingo/files/pkg-message.in
+++ b/mail/horde-ingo/files/pkg-message.in
@@ -7,5 +7,4 @@ Horde must be configured; if not, see `pkg_info -D -x horde'.
Finally, you must login to Horde as a Horde Administrator to finish the
configuration.
-To protect your configuration files, you have to restart Apache.
************************************************************************
diff --git a/mail/horde-ingo/pkg-plist b/mail/horde-ingo/pkg-plist
index 9827aa60883b..e54f8e1a2cf8 100644
--- a/mail/horde-ingo/pkg-plist
+++ b/mail/horde-ingo/pkg-plist
@@ -121,7 +121,6 @@
%%INGODIR%%/themes/screen.css
%%INGODIR%%/vacation.php
%%INGODIR%%/whitelist.php
-%%HORDE_INC%%/httpd-ingo.conf
@dirrm %%INGODIR%%/themes/graphics
@dirrm %%INGODIR%%/themes
@dirrm %%INGODIR%%/templates/whitelist