diff options
| author | sat <sat@FreeBSD.org> | 2007-04-07 19:46:27 +0800 |
|---|---|---|
| committer | sat <sat@FreeBSD.org> | 2007-04-07 19:46:27 +0800 |
| commit | 1c02a5df7c3ae569cecd1184171bdabd55c5b757 (patch) | |
| tree | ee689729ddc3232ad11924d2ab040d5b15cb278d /mail | |
| parent | f713b0bd3fc4b89f54ad14577eade21e4a720fab (diff) | |
| download | freebsd-ports-gnome-1c02a5df7c3ae569cecd1184171bdabd55c5b757.tar.gz freebsd-ports-gnome-1c02a5df7c3ae569cecd1184171bdabd55c5b757.tar.zst freebsd-ports-gnome-1c02a5df7c3ae569cecd1184171bdabd55c5b757.zip | |
- Remove apache cruft
- Assorted tweaks and updates
- Bump portrevisions
Submitted by: Beech Rintoul <beech@alaskaparadise.com> (maintainer)
Diffstat (limited to 'mail')
24 files changed, 36 insertions, 336 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 diff --git a/mail/horde-turba/Makefile b/mail/horde-turba/Makefile index 88d50b10a023..6cddc5222df0 100644 --- a/mail/horde-turba/Makefile +++ b/mail/horde-turba/Makefile @@ -8,29 +8,17 @@ PORTNAME= turba PORTVERSION= 2.1.4 DISTVERSIONPREFIX= h3- +PORTREVISION= 1 CATEGORIES= mail www MASTER_SITES= HORDE MAINTAINER= beech@alaskaparadise.com COMMENT= The Horde contact management application -#----------------------------------------------------------------------- -# You may define this option: -# -# - WITHOUT_LDAP : if you do not need OpenLDAP; -# -# - WITH_IMSP : run IMSP cyrus-imspd. -# -#----------------------------------------------------------------------- - RUN_DEPENDS+= ${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde-base -.if !defined(WITHOUT_LDAP) USE_PHP= ldap -.endif - NO_BUILD= yes -USE_APACHE= 1.3+ # needed to test APACHE_VERSION USE_GETTEXT= yes REINPLACE_ARGS= -i "" @@ -42,7 +30,7 @@ SUB_DIRS= config lib locale po scripts templates themes LHORDEDIR?= www/horde LTURBADIR?= ${LHORDEDIR}/turba -PLIST_SUB= TURBADIR=${LTURBADIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||} +PLIST_SUB= TURBADIR=${LTURBADIR} PKGMESSAGE= ${WRKDIR}/pkg-message PKGDEINSTALL= ${WRKDIR}/pkg-deinstall SUB_FILES= pkg-message pkg-install pkg-deinstall @@ -53,40 +41,25 @@ CONFDIR= ${TURBADIR}/config .include <bsd.port.pre.mk> -.if exists(${LOCALBASE}/sbin/imspd) -WITH_IMSP= yes -.endif -.if defined(WITH_IMSP) -RUN_DEPENDS+= imspd:${PORTSDIR}/databases/cyrus-imspd -.endif - -.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/ pre-configure: @${RM} ${WRKSRC}/config/sources.php.dist.orig - @${SED} -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" \ - ${FILESDIR}/httpd.conf.turba > ${WRKDIR}/httpd-turba.conf @${REINPLACE_CMD} -e "s:/usr/bin/ldapadd:${LOCALBASE}/bin/ldapadd:" \ ${WRKSRC}/scripts/ldap/addou.pl -.if defined(WITH_IMSP) - @${REINPLACE_CMD} -e "s://UNCOMMENTIFIMSP ::" ${WRKSRC}/config/sources.php.dist -.endif do-install: @${INSTALL} -d ${TURBADIR}/ @${CP} -Rp ${SUB_DIRS:S|^|${WRKSRC}/|} ${TURBADIR}/ @${CP} -p ${WRKSRC}/*.php ${TURBADIR}/ @${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR}/ - @${INSTALL_DATA} ${WRKDIR}/httpd-turba.conf ${HORDE_INC}/ @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${TURBADIR}/ - @${CHMOD} -R o-rwx ${CONFDIR}/ + @${CHMOD} -R o-rwx ${TURBADIR}/ + ${ECHO_CMD} @exec ${CHOWN} -R ${WWWOWN}:${WWWGRP}\ + %D/${TURBADIR:S|^${PREFIX}/||}/ >> ${TMPPLIST} + ${ECHO_CMD} @exec ${CHMOD} -R o-rwx\ + %D/${TURBADIR:S|^${PREFIX}/||}/ >> ${TMPPLIST} .if !defined(NOPORTDOCS) @${INSTALL} -d ${DOCSDIR}/ @${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${DOCSDIR}/ diff --git a/mail/horde-turba/files/httpd.conf.turba b/mail/horde-turba/files/httpd.conf.turba deleted file mode 100644 index f6674cbb9700..000000000000 --- a/mail/horde-turba/files/httpd.conf.turba +++ /dev/null @@ -1,31 +0,0 @@ -# This is included in Apache's httpd.conf for Turba -# -# For security, don't serve pages from the Turba configuration and -# library directories. -# -<Directory "/home/httpd/html/horde/turba/config"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/turba/lib"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/turba/locale"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/turba/po"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/turba/scripts"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/turba/templates"> - order deny,allow - deny from all -</Directory> -# End of Turba configuration ================ - diff --git a/mail/horde-turba/files/pkg-message.in b/mail/horde-turba/files/pkg-message.in index 6243e33a282d..c59f450b8cf5 100644 --- a/mail/horde-turba/files/pkg-message.in +++ b/mail/horde-turba/files/pkg-message.in @@ -18,5 +18,4 @@ You have to create a table in your database; please see %%TURBADIR%%/scripts/. You might create a LDAP schema: please see the doc LDAP. -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 325d862232a5..fe2bc9fa07da 100644 --- a/mail/horde-turba/pkg-plist +++ b/mail/horde-turba/pkg-plist @@ -177,7 +177,6 @@ %%TURBADIR%%/themes/screen.css %%TURBADIR%%/vcard.php %%TURBADIR%%/view.php -%%HORDE_INC%%/httpd-turba.conf @dirrm %%TURBADIR%%/themes/ideas @dirrm %%TURBADIR%%/themes/graphics/menu @dirrm %%TURBADIR%%/themes/graphics diff --git a/mail/horde4-ingo/Makefile b/mail/horde4-ingo/Makefile index 6c8f42c0c967..eb94e51a0363 100644 --- a/mail/horde4-ingo/Makefile +++ b/mail/horde4-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/horde4-ingo/files/httpd.conf.ingo b/mail/horde4-ingo/files/httpd.conf.ingo deleted file mode 100644 index d07046cdd18c..000000000000 --- a/mail/horde4-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/horde4-ingo/files/pkg-message.in b/mail/horde4-ingo/files/pkg-message.in index fba684f58b9d..0a1a920d3516 100644 --- a/mail/horde4-ingo/files/pkg-message.in +++ b/mail/horde4-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/horde4-ingo/pkg-plist b/mail/horde4-ingo/pkg-plist index 9827aa60883b..e54f8e1a2cf8 100644 --- a/mail/horde4-ingo/pkg-plist +++ b/mail/horde4-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 diff --git a/mail/horde4-turba/Makefile b/mail/horde4-turba/Makefile index 88d50b10a023..6cddc5222df0 100644 --- a/mail/horde4-turba/Makefile +++ b/mail/horde4-turba/Makefile @@ -8,29 +8,17 @@ PORTNAME= turba PORTVERSION= 2.1.4 DISTVERSIONPREFIX= h3- +PORTREVISION= 1 CATEGORIES= mail www MASTER_SITES= HORDE MAINTAINER= beech@alaskaparadise.com COMMENT= The Horde contact management application -#----------------------------------------------------------------------- -# You may define this option: -# -# - WITHOUT_LDAP : if you do not need OpenLDAP; -# -# - WITH_IMSP : run IMSP cyrus-imspd. -# -#----------------------------------------------------------------------- - RUN_DEPENDS+= ${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde-base -.if !defined(WITHOUT_LDAP) USE_PHP= ldap -.endif - NO_BUILD= yes -USE_APACHE= 1.3+ # needed to test APACHE_VERSION USE_GETTEXT= yes REINPLACE_ARGS= -i "" @@ -42,7 +30,7 @@ SUB_DIRS= config lib locale po scripts templates themes LHORDEDIR?= www/horde LTURBADIR?= ${LHORDEDIR}/turba -PLIST_SUB= TURBADIR=${LTURBADIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||} +PLIST_SUB= TURBADIR=${LTURBADIR} PKGMESSAGE= ${WRKDIR}/pkg-message PKGDEINSTALL= ${WRKDIR}/pkg-deinstall SUB_FILES= pkg-message pkg-install pkg-deinstall @@ -53,40 +41,25 @@ CONFDIR= ${TURBADIR}/config .include <bsd.port.pre.mk> -.if exists(${LOCALBASE}/sbin/imspd) -WITH_IMSP= yes -.endif -.if defined(WITH_IMSP) -RUN_DEPENDS+= imspd:${PORTSDIR}/databases/cyrus-imspd -.endif - -.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/ pre-configure: @${RM} ${WRKSRC}/config/sources.php.dist.orig - @${SED} -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" \ - ${FILESDIR}/httpd.conf.turba > ${WRKDIR}/httpd-turba.conf @${REINPLACE_CMD} -e "s:/usr/bin/ldapadd:${LOCALBASE}/bin/ldapadd:" \ ${WRKSRC}/scripts/ldap/addou.pl -.if defined(WITH_IMSP) - @${REINPLACE_CMD} -e "s://UNCOMMENTIFIMSP ::" ${WRKSRC}/config/sources.php.dist -.endif do-install: @${INSTALL} -d ${TURBADIR}/ @${CP} -Rp ${SUB_DIRS:S|^|${WRKSRC}/|} ${TURBADIR}/ @${CP} -p ${WRKSRC}/*.php ${TURBADIR}/ @${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR}/ - @${INSTALL_DATA} ${WRKDIR}/httpd-turba.conf ${HORDE_INC}/ @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${TURBADIR}/ - @${CHMOD} -R o-rwx ${CONFDIR}/ + @${CHMOD} -R o-rwx ${TURBADIR}/ + ${ECHO_CMD} @exec ${CHOWN} -R ${WWWOWN}:${WWWGRP}\ + %D/${TURBADIR:S|^${PREFIX}/||}/ >> ${TMPPLIST} + ${ECHO_CMD} @exec ${CHMOD} -R o-rwx\ + %D/${TURBADIR:S|^${PREFIX}/||}/ >> ${TMPPLIST} .if !defined(NOPORTDOCS) @${INSTALL} -d ${DOCSDIR}/ @${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${DOCSDIR}/ diff --git a/mail/horde4-turba/files/httpd.conf.turba b/mail/horde4-turba/files/httpd.conf.turba deleted file mode 100644 index f6674cbb9700..000000000000 --- a/mail/horde4-turba/files/httpd.conf.turba +++ /dev/null @@ -1,31 +0,0 @@ -# This is included in Apache's httpd.conf for Turba -# -# For security, don't serve pages from the Turba configuration and -# library directories. -# -<Directory "/home/httpd/html/horde/turba/config"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/turba/lib"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/turba/locale"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/turba/po"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/turba/scripts"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/turba/templates"> - order deny,allow - deny from all -</Directory> -# End of Turba configuration ================ - diff --git a/mail/horde4-turba/files/pkg-message.in b/mail/horde4-turba/files/pkg-message.in index 6243e33a282d..c59f450b8cf5 100644 --- a/mail/horde4-turba/files/pkg-message.in +++ b/mail/horde4-turba/files/pkg-message.in @@ -18,5 +18,4 @@ You have to create a table in your database; please see %%TURBADIR%%/scripts/. You might create a LDAP schema: please see the doc LDAP. -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 325d862232a5..fe2bc9fa07da 100644 --- a/mail/horde4-turba/pkg-plist +++ b/mail/horde4-turba/pkg-plist @@ -177,7 +177,6 @@ %%TURBADIR%%/themes/screen.css %%TURBADIR%%/vcard.php %%TURBADIR%%/view.php -%%HORDE_INC%%/httpd-turba.conf @dirrm %%TURBADIR%%/themes/ideas @dirrm %%TURBADIR%%/themes/graphics/menu @dirrm %%TURBADIR%%/themes/graphics diff --git a/mail/ingo/Makefile b/mail/ingo/Makefile index 6c8f42c0c967..eb94e51a0363 100644 --- a/mail/ingo/Makefile +++ b/mail/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/ingo/files/httpd.conf.ingo b/mail/ingo/files/httpd.conf.ingo deleted file mode 100644 index d07046cdd18c..000000000000 --- a/mail/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/ingo/files/pkg-message.in b/mail/ingo/files/pkg-message.in index fba684f58b9d..0a1a920d3516 100644 --- a/mail/ingo/files/pkg-message.in +++ b/mail/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/ingo/pkg-plist b/mail/ingo/pkg-plist index 9827aa60883b..e54f8e1a2cf8 100644 --- a/mail/ingo/pkg-plist +++ b/mail/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 diff --git a/mail/turba/Makefile b/mail/turba/Makefile index 88d50b10a023..6cddc5222df0 100644 --- a/mail/turba/Makefile +++ b/mail/turba/Makefile @@ -8,29 +8,17 @@ PORTNAME= turba PORTVERSION= 2.1.4 DISTVERSIONPREFIX= h3- +PORTREVISION= 1 CATEGORIES= mail www MASTER_SITES= HORDE MAINTAINER= beech@alaskaparadise.com COMMENT= The Horde contact management application -#----------------------------------------------------------------------- -# You may define this option: -# -# - WITHOUT_LDAP : if you do not need OpenLDAP; -# -# - WITH_IMSP : run IMSP cyrus-imspd. -# -#----------------------------------------------------------------------- - RUN_DEPENDS+= ${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde-base -.if !defined(WITHOUT_LDAP) USE_PHP= ldap -.endif - NO_BUILD= yes -USE_APACHE= 1.3+ # needed to test APACHE_VERSION USE_GETTEXT= yes REINPLACE_ARGS= -i "" @@ -42,7 +30,7 @@ SUB_DIRS= config lib locale po scripts templates themes LHORDEDIR?= www/horde LTURBADIR?= ${LHORDEDIR}/turba -PLIST_SUB= TURBADIR=${LTURBADIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||} +PLIST_SUB= TURBADIR=${LTURBADIR} PKGMESSAGE= ${WRKDIR}/pkg-message PKGDEINSTALL= ${WRKDIR}/pkg-deinstall SUB_FILES= pkg-message pkg-install pkg-deinstall @@ -53,40 +41,25 @@ CONFDIR= ${TURBADIR}/config .include <bsd.port.pre.mk> -.if exists(${LOCALBASE}/sbin/imspd) -WITH_IMSP= yes -.endif -.if defined(WITH_IMSP) -RUN_DEPENDS+= imspd:${PORTSDIR}/databases/cyrus-imspd -.endif - -.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/ pre-configure: @${RM} ${WRKSRC}/config/sources.php.dist.orig - @${SED} -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" \ - ${FILESDIR}/httpd.conf.turba > ${WRKDIR}/httpd-turba.conf @${REINPLACE_CMD} -e "s:/usr/bin/ldapadd:${LOCALBASE}/bin/ldapadd:" \ ${WRKSRC}/scripts/ldap/addou.pl -.if defined(WITH_IMSP) - @${REINPLACE_CMD} -e "s://UNCOMMENTIFIMSP ::" ${WRKSRC}/config/sources.php.dist -.endif do-install: @${INSTALL} -d ${TURBADIR}/ @${CP} -Rp ${SUB_DIRS:S|^|${WRKSRC}/|} ${TURBADIR}/ @${CP} -p ${WRKSRC}/*.php ${TURBADIR}/ @${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR}/ - @${INSTALL_DATA} ${WRKDIR}/httpd-turba.conf ${HORDE_INC}/ @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${TURBADIR}/ - @${CHMOD} -R o-rwx ${CONFDIR}/ + @${CHMOD} -R o-rwx ${TURBADIR}/ + ${ECHO_CMD} @exec ${CHOWN} -R ${WWWOWN}:${WWWGRP}\ + %D/${TURBADIR:S|^${PREFIX}/||}/ >> ${TMPPLIST} + ${ECHO_CMD} @exec ${CHMOD} -R o-rwx\ + %D/${TURBADIR:S|^${PREFIX}/||}/ >> ${TMPPLIST} .if !defined(NOPORTDOCS) @${INSTALL} -d ${DOCSDIR}/ @${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${DOCSDIR}/ diff --git a/mail/turba/files/httpd.conf.turba b/mail/turba/files/httpd.conf.turba deleted file mode 100644 index f6674cbb9700..000000000000 --- a/mail/turba/files/httpd.conf.turba +++ /dev/null @@ -1,31 +0,0 @@ -# This is included in Apache's httpd.conf for Turba -# -# For security, don't serve pages from the Turba configuration and -# library directories. -# -<Directory "/home/httpd/html/horde/turba/config"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/turba/lib"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/turba/locale"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/turba/po"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/turba/scripts"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/turba/templates"> - order deny,allow - deny from all -</Directory> -# End of Turba configuration ================ - diff --git a/mail/turba/files/pkg-message.in b/mail/turba/files/pkg-message.in index 6243e33a282d..c59f450b8cf5 100644 --- a/mail/turba/files/pkg-message.in +++ b/mail/turba/files/pkg-message.in @@ -18,5 +18,4 @@ You have to create a table in your database; please see %%TURBADIR%%/scripts/. You might create a LDAP schema: please see the doc LDAP. -To protect your configuration files, you have to restart Apache. ************************************************************************ diff --git a/mail/turba/pkg-plist b/mail/turba/pkg-plist index 325d862232a5..fe2bc9fa07da 100644 --- a/mail/turba/pkg-plist +++ b/mail/turba/pkg-plist @@ -177,7 +177,6 @@ %%TURBADIR%%/themes/screen.css %%TURBADIR%%/vcard.php %%TURBADIR%%/view.php -%%HORDE_INC%%/httpd-turba.conf @dirrm %%TURBADIR%%/themes/ideas @dirrm %%TURBADIR%%/themes/graphics/menu @dirrm %%TURBADIR%%/themes/graphics |