summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorYing-Chieh Liao <ijliao@FreeBSD.org>2001-12-12 20:09:16 +0000
committerYing-Chieh Liao <ijliao@FreeBSD.org>2001-12-12 20:09:16 +0000
commit42d7a469cd1821881332c59ae08a0d2402e8d50e (patch)
treea2158ed665cf2f5ca661a4ce427af42bc52f90ff /mail
parentupgrade to 1.9002 (diff)
upgrade to RC3
PR: 32516 Submitted by: maintainer
Notes
Notes: svn path=/head/; revision=51415
Diffstat (limited to 'mail')
-rw-r--r--mail/horde-turba/Makefile42
-rw-r--r--mail/horde-turba/distinfo2
-rw-r--r--mail/horde-turba/files/httpd.conf.turba3
-rw-r--r--mail/horde-turba/pkg-message3
-rw-r--r--mail/horde-turba/pkg-plist1
-rw-r--r--mail/horde4-turba/Makefile42
-rw-r--r--mail/horde4-turba/distinfo2
-rw-r--r--mail/horde4-turba/files/httpd.conf.turba3
-rw-r--r--mail/horde4-turba/pkg-message3
-rw-r--r--mail/horde4-turba/pkg-plist1
-rw-r--r--mail/turba/Makefile42
-rw-r--r--mail/turba/distinfo2
-rw-r--r--mail/turba/files/httpd.conf.turba3
-rw-r--r--mail/turba/pkg-message3
-rw-r--r--mail/turba/pkg-plist1
15 files changed, 63 insertions, 90 deletions
diff --git a/mail/horde-turba/Makefile b/mail/horde-turba/Makefile
index 58bfc5427dcd..89bfe7ccb8bf 100644
--- a/mail/horde-turba/Makefile
+++ b/mail/horde-turba/Makefile
@@ -9,7 +9,7 @@ PORTNAME= turba
PORTVERSION= 1.0
CATEGORIES= mail www
MASTER_SITES= ftp://ftp.horde.org/pub/turba/tarballs/
-DISTNAME= ${PORTNAME}-${PORTVERSION}-RC2
+DISTNAME= ${PORTNAME}-${PORTVERSION}-RC3
MAINTAINER= thierry@thomas.as
@@ -52,8 +52,7 @@ HORDEDIR= ${PREFIX}/${LHORDEDIR}
TURBADIR= ${PREFIX}/${LTURBADIR}
CONFDIR= ${TURBADIR}/config
-APACHE_CNFDIR?= ${LOCALBASE}/etc/apache
-APACHE_CONF= ${APACHE_CNFDIR}/httpd.conf
+HORDE_INC= ${LOCALBASE}/etc/horde
pre-install:
# N.B.: database dependencies are binded with mod_php#, neither by Horde nor Turba.
@@ -95,39 +94,32 @@ pre-install:
.endif
do-install:
- ${MKDIR} ${TURBADIR}
- ${CP} -Rp ${WRKSRC}/config ${WRKSRC}/graphics ${WRKSRC}/lib ${TURBADIR}
- ${CP} -Rp ${WRKSRC}/locale ${WRKSRC}/scripts ${WRKSRC}/templates ${TURBADIR}
- ${CP} -Rp ${WRKSRC}/po ${TURBADIR}
- ${CP} -p ${WRKSRC}/*.php ${TURBADIR}
+ @${MKDIR} ${TURBADIR}
+ @${CP} -Rp ${WRKSRC}/config ${WRKSRC}/graphics ${WRKSRC}/lib ${TURBADIR}
+ @${CP} -Rp ${WRKSRC}/locale ${WRKSRC}/scripts ${WRKSRC}/templates ${TURBADIR}
+ @${CP} -Rp ${WRKSRC}/po ${TURBADIR}
+ @${CP} -p ${WRKSRC}/*.php ${TURBADIR}
.for FILE in ${CONFFILE}
@if [ ! -f ${CONFDIR}/${FILE} ]; then \
${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \
fi
.endfor
- ${CHOWN} -R www:www ${TURBADIR}
- ${CHMOD} -R o-rwx ${CONFDIR}
- @(if [ -f ${APACHE_CONF} ] ; then \
- (if [ ! -f ${APACHE_CONF}.beforeTurba ] ; then \
- ${ECHO} "===> Updating ${APACHE_CONF}..." ; \
- ${CP} -p ${FILESDIR}/httpd.conf.turba ${WRKDIR}/httpd.conf.turba ; \
- ${PERL} -pi -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" ${WRKDIR}/httpd.conf.turba ; \
- ${CP} -p ${APACHE_CONF} ${APACHE_CONF}.beforeTurba ; \
- ${GREP} -qw 'Added for Turba' ${APACHE_CONF} || ${CAT} ${WRKDIR}/httpd.conf.turba >> ${APACHE_CONF} ; \
- fi) ; \
- fi)
+ @${CHOWN} -R www:www ${TURBADIR}
+ @${CHMOD} -R o-rwx ${CONFDIR}
+ @${CP} -p ${FILESDIR}/httpd.conf.turba ${HORDE_INC}
+ @${PERL} -pi -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" ${HORDE_INC}/httpd.conf.turba
.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}
+ @${MKDIR} ${DOCSDIR}
.for FILE in ${DOCS}
- ${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
+ @${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
.endfor
- @${ECHO} "Documentation installed in ${DOCSDIR}."
+ @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
.endif
post-install:
- @${ECHO}
+ @${ECHO_MSG}
@${CAT} ${PKGMESSAGE} | \
- ${SED} -e "s:%%TURBADIR%%:${TURBADIR}:g;s:%%PORTSDIR%%:${PORTSDIR}:g;s:%%CONFDIR%%:${CONFDIR}:g;s:%%APACHE_CONF%%:${APACHE_CONF}:g"
- @${ECHO}
+ ${SED} -e "s:%%TURBADIR%%:${TURBADIR}:g;s:%%PORTSDIR%%:${PORTSDIR}:g;s:%%CONFDIR%%:${CONFDIR}:g"
+ @${ECHO_MSG}
.include <bsd.port.mk>
diff --git a/mail/horde-turba/distinfo b/mail/horde-turba/distinfo
index 5bdabef90faa..95ed0497fa57 100644
--- a/mail/horde-turba/distinfo
+++ b/mail/horde-turba/distinfo
@@ -1 +1 @@
-MD5 (turba-1.0-RC2.tar.gz) = df5a7b63a9a5d6ad598d537bc57560e6
+MD5 (turba-1.0-RC3.tar.gz) = 9fc7d02714f25221e54352c1c4a360fa
diff --git a/mail/horde-turba/files/httpd.conf.turba b/mail/horde-turba/files/httpd.conf.turba
index 95683ab9cd5c..f6674cbb9700 100644
--- a/mail/horde-turba/files/httpd.conf.turba
+++ b/mail/horde-turba/files/httpd.conf.turba
@@ -1,5 +1,4 @@
-
-# Added for Turba
+# This is included in Apache's httpd.conf for Turba
#
# For security, don't serve pages from the Turba configuration and
# library directories.
diff --git a/mail/horde-turba/pkg-message b/mail/horde-turba/pkg-message
index 50c95efe8be8..7297d45a2967 100644
--- a/mail/horde-turba/pkg-message
+++ b/mail/horde-turba/pkg-message
@@ -12,6 +12,5 @@ sources.php.
You have to create a table in your database; please see
%%TURBADIR%%/scripts/drivers.
-If %%APACHE_CONF%% has been updated,
-you have to restart Apache.
+To protect your configuration files, you have to restart Apache.
************************************************************************
diff --git a/mail/horde-turba/pkg-plist b/mail/horde-turba/pkg-plist
index a0c8d2752f6c..ca31e90a6f06 100644
--- a/mail/horde-turba/pkg-plist
+++ b/mail/horde-turba/pkg-plist
@@ -119,6 +119,7 @@
%%TURBADIR%%/templates/wml/search/foot.inc
%%TURBADIR%%/templates/wml/search/head.inc
%%TURBADIR%%/templates/wml/search/row.inc
+etc/horde/httpd.conf.turba
%%PORTDOCS%%@dirrm share/doc/turba
@dirrm %%TURBADIR%%/config
@dirrm %%TURBADIR%%/graphics
diff --git a/mail/horde4-turba/Makefile b/mail/horde4-turba/Makefile
index 58bfc5427dcd..89bfe7ccb8bf 100644
--- a/mail/horde4-turba/Makefile
+++ b/mail/horde4-turba/Makefile
@@ -9,7 +9,7 @@ PORTNAME= turba
PORTVERSION= 1.0
CATEGORIES= mail www
MASTER_SITES= ftp://ftp.horde.org/pub/turba/tarballs/
-DISTNAME= ${PORTNAME}-${PORTVERSION}-RC2
+DISTNAME= ${PORTNAME}-${PORTVERSION}-RC3
MAINTAINER= thierry@thomas.as
@@ -52,8 +52,7 @@ HORDEDIR= ${PREFIX}/${LHORDEDIR}
TURBADIR= ${PREFIX}/${LTURBADIR}
CONFDIR= ${TURBADIR}/config
-APACHE_CNFDIR?= ${LOCALBASE}/etc/apache
-APACHE_CONF= ${APACHE_CNFDIR}/httpd.conf
+HORDE_INC= ${LOCALBASE}/etc/horde
pre-install:
# N.B.: database dependencies are binded with mod_php#, neither by Horde nor Turba.
@@ -95,39 +94,32 @@ pre-install:
.endif
do-install:
- ${MKDIR} ${TURBADIR}
- ${CP} -Rp ${WRKSRC}/config ${WRKSRC}/graphics ${WRKSRC}/lib ${TURBADIR}
- ${CP} -Rp ${WRKSRC}/locale ${WRKSRC}/scripts ${WRKSRC}/templates ${TURBADIR}
- ${CP} -Rp ${WRKSRC}/po ${TURBADIR}
- ${CP} -p ${WRKSRC}/*.php ${TURBADIR}
+ @${MKDIR} ${TURBADIR}
+ @${CP} -Rp ${WRKSRC}/config ${WRKSRC}/graphics ${WRKSRC}/lib ${TURBADIR}
+ @${CP} -Rp ${WRKSRC}/locale ${WRKSRC}/scripts ${WRKSRC}/templates ${TURBADIR}
+ @${CP} -Rp ${WRKSRC}/po ${TURBADIR}
+ @${CP} -p ${WRKSRC}/*.php ${TURBADIR}
.for FILE in ${CONFFILE}
@if [ ! -f ${CONFDIR}/${FILE} ]; then \
${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \
fi
.endfor
- ${CHOWN} -R www:www ${TURBADIR}
- ${CHMOD} -R o-rwx ${CONFDIR}
- @(if [ -f ${APACHE_CONF} ] ; then \
- (if [ ! -f ${APACHE_CONF}.beforeTurba ] ; then \
- ${ECHO} "===> Updating ${APACHE_CONF}..." ; \
- ${CP} -p ${FILESDIR}/httpd.conf.turba ${WRKDIR}/httpd.conf.turba ; \
- ${PERL} -pi -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" ${WRKDIR}/httpd.conf.turba ; \
- ${CP} -p ${APACHE_CONF} ${APACHE_CONF}.beforeTurba ; \
- ${GREP} -qw 'Added for Turba' ${APACHE_CONF} || ${CAT} ${WRKDIR}/httpd.conf.turba >> ${APACHE_CONF} ; \
- fi) ; \
- fi)
+ @${CHOWN} -R www:www ${TURBADIR}
+ @${CHMOD} -R o-rwx ${CONFDIR}
+ @${CP} -p ${FILESDIR}/httpd.conf.turba ${HORDE_INC}
+ @${PERL} -pi -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" ${HORDE_INC}/httpd.conf.turba
.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}
+ @${MKDIR} ${DOCSDIR}
.for FILE in ${DOCS}
- ${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
+ @${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
.endfor
- @${ECHO} "Documentation installed in ${DOCSDIR}."
+ @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
.endif
post-install:
- @${ECHO}
+ @${ECHO_MSG}
@${CAT} ${PKGMESSAGE} | \
- ${SED} -e "s:%%TURBADIR%%:${TURBADIR}:g;s:%%PORTSDIR%%:${PORTSDIR}:g;s:%%CONFDIR%%:${CONFDIR}:g;s:%%APACHE_CONF%%:${APACHE_CONF}:g"
- @${ECHO}
+ ${SED} -e "s:%%TURBADIR%%:${TURBADIR}:g;s:%%PORTSDIR%%:${PORTSDIR}:g;s:%%CONFDIR%%:${CONFDIR}:g"
+ @${ECHO_MSG}
.include <bsd.port.mk>
diff --git a/mail/horde4-turba/distinfo b/mail/horde4-turba/distinfo
index 5bdabef90faa..95ed0497fa57 100644
--- a/mail/horde4-turba/distinfo
+++ b/mail/horde4-turba/distinfo
@@ -1 +1 @@
-MD5 (turba-1.0-RC2.tar.gz) = df5a7b63a9a5d6ad598d537bc57560e6
+MD5 (turba-1.0-RC3.tar.gz) = 9fc7d02714f25221e54352c1c4a360fa
diff --git a/mail/horde4-turba/files/httpd.conf.turba b/mail/horde4-turba/files/httpd.conf.turba
index 95683ab9cd5c..f6674cbb9700 100644
--- a/mail/horde4-turba/files/httpd.conf.turba
+++ b/mail/horde4-turba/files/httpd.conf.turba
@@ -1,5 +1,4 @@
-
-# Added for Turba
+# This is included in Apache's httpd.conf for Turba
#
# For security, don't serve pages from the Turba configuration and
# library directories.
diff --git a/mail/horde4-turba/pkg-message b/mail/horde4-turba/pkg-message
index 50c95efe8be8..7297d45a2967 100644
--- a/mail/horde4-turba/pkg-message
+++ b/mail/horde4-turba/pkg-message
@@ -12,6 +12,5 @@ sources.php.
You have to create a table in your database; please see
%%TURBADIR%%/scripts/drivers.
-If %%APACHE_CONF%% has been updated,
-you have to restart Apache.
+To protect your configuration files, you have to restart Apache.
************************************************************************
diff --git a/mail/horde4-turba/pkg-plist b/mail/horde4-turba/pkg-plist
index a0c8d2752f6c..ca31e90a6f06 100644
--- a/mail/horde4-turba/pkg-plist
+++ b/mail/horde4-turba/pkg-plist
@@ -119,6 +119,7 @@
%%TURBADIR%%/templates/wml/search/foot.inc
%%TURBADIR%%/templates/wml/search/head.inc
%%TURBADIR%%/templates/wml/search/row.inc
+etc/horde/httpd.conf.turba
%%PORTDOCS%%@dirrm share/doc/turba
@dirrm %%TURBADIR%%/config
@dirrm %%TURBADIR%%/graphics
diff --git a/mail/turba/Makefile b/mail/turba/Makefile
index 58bfc5427dcd..89bfe7ccb8bf 100644
--- a/mail/turba/Makefile
+++ b/mail/turba/Makefile
@@ -9,7 +9,7 @@ PORTNAME= turba
PORTVERSION= 1.0
CATEGORIES= mail www
MASTER_SITES= ftp://ftp.horde.org/pub/turba/tarballs/
-DISTNAME= ${PORTNAME}-${PORTVERSION}-RC2
+DISTNAME= ${PORTNAME}-${PORTVERSION}-RC3
MAINTAINER= thierry@thomas.as
@@ -52,8 +52,7 @@ HORDEDIR= ${PREFIX}/${LHORDEDIR}
TURBADIR= ${PREFIX}/${LTURBADIR}
CONFDIR= ${TURBADIR}/config
-APACHE_CNFDIR?= ${LOCALBASE}/etc/apache
-APACHE_CONF= ${APACHE_CNFDIR}/httpd.conf
+HORDE_INC= ${LOCALBASE}/etc/horde
pre-install:
# N.B.: database dependencies are binded with mod_php#, neither by Horde nor Turba.
@@ -95,39 +94,32 @@ pre-install:
.endif
do-install:
- ${MKDIR} ${TURBADIR}
- ${CP} -Rp ${WRKSRC}/config ${WRKSRC}/graphics ${WRKSRC}/lib ${TURBADIR}
- ${CP} -Rp ${WRKSRC}/locale ${WRKSRC}/scripts ${WRKSRC}/templates ${TURBADIR}
- ${CP} -Rp ${WRKSRC}/po ${TURBADIR}
- ${CP} -p ${WRKSRC}/*.php ${TURBADIR}
+ @${MKDIR} ${TURBADIR}
+ @${CP} -Rp ${WRKSRC}/config ${WRKSRC}/graphics ${WRKSRC}/lib ${TURBADIR}
+ @${CP} -Rp ${WRKSRC}/locale ${WRKSRC}/scripts ${WRKSRC}/templates ${TURBADIR}
+ @${CP} -Rp ${WRKSRC}/po ${TURBADIR}
+ @${CP} -p ${WRKSRC}/*.php ${TURBADIR}
.for FILE in ${CONFFILE}
@if [ ! -f ${CONFDIR}/${FILE} ]; then \
${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \
fi
.endfor
- ${CHOWN} -R www:www ${TURBADIR}
- ${CHMOD} -R o-rwx ${CONFDIR}
- @(if [ -f ${APACHE_CONF} ] ; then \
- (if [ ! -f ${APACHE_CONF}.beforeTurba ] ; then \
- ${ECHO} "===> Updating ${APACHE_CONF}..." ; \
- ${CP} -p ${FILESDIR}/httpd.conf.turba ${WRKDIR}/httpd.conf.turba ; \
- ${PERL} -pi -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" ${WRKDIR}/httpd.conf.turba ; \
- ${CP} -p ${APACHE_CONF} ${APACHE_CONF}.beforeTurba ; \
- ${GREP} -qw 'Added for Turba' ${APACHE_CONF} || ${CAT} ${WRKDIR}/httpd.conf.turba >> ${APACHE_CONF} ; \
- fi) ; \
- fi)
+ @${CHOWN} -R www:www ${TURBADIR}
+ @${CHMOD} -R o-rwx ${CONFDIR}
+ @${CP} -p ${FILESDIR}/httpd.conf.turba ${HORDE_INC}
+ @${PERL} -pi -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" ${HORDE_INC}/httpd.conf.turba
.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}
+ @${MKDIR} ${DOCSDIR}
.for FILE in ${DOCS}
- ${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
+ @${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
.endfor
- @${ECHO} "Documentation installed in ${DOCSDIR}."
+ @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
.endif
post-install:
- @${ECHO}
+ @${ECHO_MSG}
@${CAT} ${PKGMESSAGE} | \
- ${SED} -e "s:%%TURBADIR%%:${TURBADIR}:g;s:%%PORTSDIR%%:${PORTSDIR}:g;s:%%CONFDIR%%:${CONFDIR}:g;s:%%APACHE_CONF%%:${APACHE_CONF}:g"
- @${ECHO}
+ ${SED} -e "s:%%TURBADIR%%:${TURBADIR}:g;s:%%PORTSDIR%%:${PORTSDIR}:g;s:%%CONFDIR%%:${CONFDIR}:g"
+ @${ECHO_MSG}
.include <bsd.port.mk>
diff --git a/mail/turba/distinfo b/mail/turba/distinfo
index 5bdabef90faa..95ed0497fa57 100644
--- a/mail/turba/distinfo
+++ b/mail/turba/distinfo
@@ -1 +1 @@
-MD5 (turba-1.0-RC2.tar.gz) = df5a7b63a9a5d6ad598d537bc57560e6
+MD5 (turba-1.0-RC3.tar.gz) = 9fc7d02714f25221e54352c1c4a360fa
diff --git a/mail/turba/files/httpd.conf.turba b/mail/turba/files/httpd.conf.turba
index 95683ab9cd5c..f6674cbb9700 100644
--- a/mail/turba/files/httpd.conf.turba
+++ b/mail/turba/files/httpd.conf.turba
@@ -1,5 +1,4 @@
-
-# Added for Turba
+# This is included in Apache's httpd.conf for Turba
#
# For security, don't serve pages from the Turba configuration and
# library directories.
diff --git a/mail/turba/pkg-message b/mail/turba/pkg-message
index 50c95efe8be8..7297d45a2967 100644
--- a/mail/turba/pkg-message
+++ b/mail/turba/pkg-message
@@ -12,6 +12,5 @@ sources.php.
You have to create a table in your database; please see
%%TURBADIR%%/scripts/drivers.
-If %%APACHE_CONF%% has been updated,
-you have to restart Apache.
+To protect your configuration files, you have to restart Apache.
************************************************************************
diff --git a/mail/turba/pkg-plist b/mail/turba/pkg-plist
index a0c8d2752f6c..ca31e90a6f06 100644
--- a/mail/turba/pkg-plist
+++ b/mail/turba/pkg-plist
@@ -119,6 +119,7 @@
%%TURBADIR%%/templates/wml/search/foot.inc
%%TURBADIR%%/templates/wml/search/head.inc
%%TURBADIR%%/templates/wml/search/row.inc
+etc/horde/httpd.conf.turba
%%PORTDOCS%%@dirrm share/doc/turba
@dirrm %%TURBADIR%%/config
@dirrm %%TURBADIR%%/graphics
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 04:35:02 +0000