diff options
author | Andrew Pantyukhin <sat@FreeBSD.org> | 2007-04-07 11:46:27 +0000 |
---|---|---|
committer | Andrew Pantyukhin <sat@FreeBSD.org> | 2007-04-07 11:46:27 +0000 |
commit | 1309ed10758eb79ce68171b002b0dfc87e6f37c5 (patch) | |
tree | 574c69a94acb30c4606b680ab21447a0bb691a05 /deskutils/horde4-nag | |
parent | 8ed7e7476e3842875ce173b297c8d4638013613c (diff) | |
download | ports-1309ed10758eb79ce68171b002b0dfc87e6f37c5.tar.gz ports-1309ed10758eb79ce68171b002b0dfc87e6f37c5.zip |
- Remove apache cruft
- Assorted tweaks and updates
- Bump portrevisions
Submitted by: Beech Rintoul <beech@alaskaparadise.com> (maintainer)
Notes
Notes:
svn path=/head/; revision=189427
Diffstat (limited to 'deskutils/horde4-nag')
-rw-r--r-- | deskutils/horde4-nag/Makefile | 17 | ||||
-rw-r--r-- | deskutils/horde4-nag/files/httpd.conf.nag | 31 | ||||
-rw-r--r-- | deskutils/horde4-nag/files/pkg-message.in | 1 | ||||
-rw-r--r-- | deskutils/horde4-nag/pkg-plist | 1 |
4 files changed, 6 insertions, 44 deletions
diff --git a/deskutils/horde4-nag/Makefile b/deskutils/horde4-nag/Makefile index 79b6d2df37ed..8f0c055af8df 100644 --- a/deskutils/horde4-nag/Makefile +++ b/deskutils/horde4-nag/Makefile @@ -8,6 +8,7 @@ PORTNAME= nag PORTVERSION= 2.1.3 DISTVERSIONPREFIX= h3- +PORTREVISION= 1 CATEGORIES= deskutils www MASTER_SITES= HORDE @@ -17,7 +18,6 @@ COMMENT= Simple multiuser task list manager RUN_DEPENDS= ${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde-base NO_BUILD= yes -USE_APACHE= 1.3+ # needed to test APACHE_VERSION USE_GETTEXT= yes PLIST_SUB= NAGDIR=${LNAGDIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||} @@ -40,12 +40,6 @@ CONFDIR= ${NAGDIR}/config .include <bsd.port.pre.mk> -.if ${APACHE_VERSION} >= 20 -HORDE_INC= ${LOCALBASE}/etc/apache${APACHE_VERSION:S/20/2/}/Includes -.else -HORDE_INC= ${LOCALBASE}/etc/horde -.endif - post-extract: @${MV} ${WRKSRC}/README ${WRKSRC}/docs/ @@ -53,17 +47,18 @@ pre-configure: @(cd ${WRKSRC}/scripts && \ ${FIND} . -name "*.php" -exec \ ${REINPLACE_CMD} -e "s:/usr/local/bin/php: ${LOCALBASE}/bin/php:;s:/usr/bin/php: ${LOCALBASE}/bin/php:" {} \; ) - @${SED} -e "s:/home/httpd/html/horde/nag:${NAGDIR}:g" \ - ${FILESDIR}/httpd.conf.nag > ${WRKDIR}/httpd-nag.conf do-install: @${INSTALL} -d ${NAGDIR}/ @${CP} -Rp ${SUB_DIRS:S|^|${WRKSRC}/|} ${NAGDIR}/ @${CP} -p ${WRKSRC}/*.php ${NAGDIR}/ @${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR}/ - @${INSTALL_DATA} ${WRKDIR}/httpd-nag.conf ${HORDE_INC}/ @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${NAGDIR}/ - @${CHMOD} -R o-rwx ${CONFDIR}/ + @${CHMOD} -R o-rwx ${NAGDIR}/ + ${ECHO_CMD} @exec ${CHOWN} -R ${WWWOWN}:${WWWGRP}\ + %D/${NAGDIR:S|^${PREFIX}/||}/ >> ${TMPPLIST} + ${ECHO_CMD} @exec ${CHMOD} -R o-rwx\ + %D/${NAGDIR:S|^${PREFIX}/||}/ >> ${TMPPLIST} .if !defined(NOPORTDOCS) @${INSTALL} -d ${DOCSDIR}/ @${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${DOCSDIR}/ diff --git a/deskutils/horde4-nag/files/httpd.conf.nag b/deskutils/horde4-nag/files/httpd.conf.nag deleted file mode 100644 index c5279c8245fa..000000000000 --- a/deskutils/horde4-nag/files/httpd.conf.nag +++ /dev/null @@ -1,31 +0,0 @@ -# This is included in Apache's httpd.conf for Nag -# -# For security, don't serve pages from the Nag configuration and -# library directories. -# -<Directory "/home/httpd/html/horde/nag/config"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/nag/lib"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/nag/locale"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/nag/po"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/nag/scripts"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/nag/templates"> - order deny,allow - deny from all -</Directory> -# End of Nag configuration ================ - diff --git a/deskutils/horde4-nag/files/pkg-message.in b/deskutils/horde4-nag/files/pkg-message.in index 4713eea2cb00..98c57ea5118a 100644 --- a/deskutils/horde4-nag/files/pkg-message.in +++ b/deskutils/horde4-nag/files/pkg-message.in @@ -12,5 +12,4 @@ mysql --user=root --password=yourpass horde < nag.sql 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/deskutils/horde4-nag/pkg-plist b/deskutils/horde4-nag/pkg-plist index 1f60eedfab6b..8681dda8b9a9 100644 --- a/deskutils/horde4-nag/pkg-plist +++ b/deskutils/horde4-nag/pkg-plist @@ -136,7 +136,6 @@ %%NAGDIR%%/themes/graphics/za.png %%NAGDIR%%/themes/screen.css %%NAGDIR%%/view.php -%%HORDE_INC%%/httpd-nag.conf @dirrm %%NAGDIR%%/themes/graphics @dirrm %%NAGDIR%%/themes @dirrm %%NAGDIR%%/templates/view |