diff options
86 files changed, 508 insertions, 275 deletions
diff --git a/deskutils/horde-kronolith/Makefile b/deskutils/horde-kronolith/Makefile index fe2d86b2bf40..32bae023c962 100644 --- a/deskutils/horde-kronolith/Makefile +++ b/deskutils/horde-kronolith/Makefile @@ -25,14 +25,14 @@ COMMENT= Kronolith is the Horde calendar application #---------------------------------------------------------------------------- # You may define this option: # -# - WITHOUT_MCAL: you won't use the MCAL driver but a database backend -# (only for PHP4). +# - WITH_MCAL: you want to use the MCAL driver (deprecated, and only for PHP4). # #---------------------------------------------------------------------------- RUN_DEPENDS+= ${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde NO_BUILD= yes +USE_APACHE= 1.3+ # needed to test APACHE_VERSION USE_PHP= yes # modules set by Horde, but needed to get PHP_VER USE_REINPLACE= yes @@ -46,18 +46,23 @@ LHORDEDIR?= www/horde LKRONOLITHDIR?= ${LHORDEDIR}/kronolith PKGMESSAGE= ${WRKDIR}/pkg-message -SUB_FILES= pkg-message +PKGDEINSTALL= ${WRKDIR}/pkg-deinstall +SUB_FILES= pkg-message pkg-deinstall SUB_LIST= KRONOLITHDIR=${KRONOLITHDIR} -PLIST_SUB= KRONOLITHDIR=${LKRONOLITHDIR} +PLIST_SUB= KRONOLITHDIR=${LKRONOLITHDIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||} KRONOLITHDIR= ${PREFIX}/${LKRONOLITHDIR} CONFDIR= ${KRONOLITHDIR}/config VAR_CAL= /var/calendar -HORDE_INC= ${LOCALBASE}/etc/horde - .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 + .if exists(${LOCALBASE}/sbin/htpasswd) HTPASSWD= ${LOCALBASE}/sbin/htpasswd .else @@ -67,7 +72,7 @@ HTPASSWD= ${LOCALBASE}/bin/htpasswd pre-configure: @${RM} ${WRKSRC}/config/conf.xml.orig @${SED} -e "s:/home/httpd/html/horde/kronolith:${KRONOLITHDIR}:" \ - ${FILESDIR}/httpd.conf.kronolith > ${WRKDIR}/httpd.conf.kronolith + ${FILESDIR}/httpd.conf.kronolith > ${WRKDIR}/httpd-kronolith.conf do-install: @${MKDIR} ${KRONOLITHDIR} @@ -82,7 +87,7 @@ do-install: .endfor @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${KRONOLITHDIR} @${CHMOD} -R o-rwx ${CONFDIR} - @${INSTALL_DATA} ${WRKDIR}/httpd.conf.kronolith ${HORDE_INC} + @${INSTALL_DATA} ${WRKDIR}/httpd-kronolith.conf ${HORDE_INC} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for FILE in ${DOCS} @@ -92,13 +97,13 @@ do-install: .endif post-install: -.if !defined(WITHOUT_MCAL) && (${PHP_VER} == 4) +.if defined(WITH_MCAL) && (${PHP_VER} == 4) @if [ ! -d ${VAR_CAL} ]; then \ ${ECHO_MSG} "===> Creating ${VAR_CAL}" ; \ ${MKDIR} ${VAR_CAL} ; \ ${CHMOD} 1777 ${VAR_CAL} ; \ fi -.if !defined(BATCH) +. if !defined(BATCH) @if [ ! -f ${LOCALBASE}/etc/mpasswd ] ; then \ ${ECHO_MSG} "===> Creating ${LOCALBASE}/etc/mpasswd" ; \ ${ECHO} -n "Please enter a password for www's calendar: " ; \ diff --git a/deskutils/horde-kronolith/pkg-deinstall b/deskutils/horde-kronolith/files/pkg-deinstall.in index 4578da3f26fe..896c740dd4da 100644 --- a/deskutils/horde-kronolith/pkg-deinstall +++ b/deskutils/horde-kronolith/files/pkg-deinstall.in @@ -9,7 +9,7 @@ if [ x$2 != xDEINSTALL ]; then fi if [ -z "${PACKAGE_BUILDING}" ]; then - for cf in `ls ${PKG_PREFIX}/www/horde/kronolith/config/*php`; do + for cf in `ls %%KRONOLITHDIR%%/config/*php`; do diff -bBqw $cf $cf.dist >/dev/null 2>&1 case $? in 0) # original config file, will be deleted by pkg-plist diff --git a/deskutils/horde-kronolith/files/pkg-message.in b/deskutils/horde-kronolith/files/pkg-message.in index e7f0e3401e17..54946bd7d451 100644 --- a/deskutils/horde-kronolith/files/pkg-message.in +++ b/deskutils/horde-kronolith/files/pkg-message.in @@ -5,7 +5,7 @@ blank configuration files. Horde must be configured; if not, see `pkg_info -D -x horde'. With PHP4: -If you choose the mcal backend, libmcal must be configured with the driver +If you choosed the mcal backend, libmcal must be configured with the driver mstore for the user www: - mkdir /var/calendar @@ -21,6 +21,9 @@ SQL scripts in %%KRONOLITHDIR%%/scripts/sql. WARNING! if you are upgrading from Kronolith v. 1.1.x, you have to alter ******** your schemas. Please read the doc %%DOCSDIR%%/UPGRADING. + Please note that the MCAL back-end is deprecated! + To migrate from MCAL to SQL, you can use the provided script + %%KRONOLITHDIR%%/scripts/migrate_to_sql_driver.php Finally, you must login to Horde as a Horde Administrator to finish the configuration. diff --git a/deskutils/horde-kronolith/pkg-plist b/deskutils/horde-kronolith/pkg-plist index 46df1c3d2b06..bfee675d8a50 100644 --- a/deskutils/horde-kronolith/pkg-plist +++ b/deskutils/horde-kronolith/pkg-plist @@ -195,7 +195,7 @@ %%KRONOLITHDIR%%/viewevent.php %%KRONOLITHDIR%%/week.php %%KRONOLITHDIR%%/workweek.php -etc/horde/httpd.conf.kronolith +%%HORDE_INC%%/httpd-kronolith.conf %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%KRONOLITHDIR%%/themes/simplex @dirrm %%KRONOLITHDIR%%/themes/print diff --git a/deskutils/horde-mnemo/Makefile b/deskutils/horde-mnemo/Makefile index 61dc04ee2164..e5e46cdc2342 100644 --- a/deskutils/horde-mnemo/Makefile +++ b/deskutils/horde-mnemo/Makefile @@ -24,10 +24,13 @@ COMMENT= Mnemo is the Horde notes and memos application RUN_DEPENDS= ${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde NO_BUILD= yes -USE_REINPLACE= yes +USE_APACHE= 1.3+ # needed to test APACHE_VERSION -PLIST_SUB= MNEMODIR=${LMNEMODIR} +PLIST_SUB= MNEMODIR=${LMNEMODIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||} PKGMESSAGE= ${WRKDIR}/pkg-message +PKGDEINSTALL= ${WRKDIR}/pkg-deinstall +SUB_FILES= pkg-message pkg-deinstall +SUB_LIST= MNEMODIR=${MNEMODIR} DOCS= LICENSE README docs/CHANGES docs/CREDITS docs/INSTALL \ docs/RELEASE_NOTES docs/TODO docs/UPGRADING @@ -40,11 +43,17 @@ LMNEMODIR?= ${LHORDEDIR}/mnemo MNEMODIR= ${PREFIX}/${LMNEMODIR} CONFDIR= ${MNEMODIR}/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 pre-configure: @${SED} -e "s:/home/httpd/html/horde/mnemo:${MNEMODIR}:g" \ - ${FILESDIR}/httpd.conf.mnemo > ${WRKDIR}/httpd.conf.mnemo + ${FILESDIR}/httpd.conf.mnemo > ${WRKDIR}/httpd-mnemo.conf do-install: @${MKDIR} ${MNEMODIR} @@ -59,7 +68,7 @@ do-install: .endfor @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${MNEMODIR} @${CHMOD} -R o-rwx ${CONFDIR} - @${INSTALL_DATA} ${WRKDIR}/httpd.conf.mnemo ${HORDE_INC} + @${INSTALL_DATA} ${WRKDIR}/httpd-mnemo.conf ${HORDE_INC} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for FILE in ${DOCS} @@ -69,10 +78,8 @@ do-install: .endif post-install: - @${SED} -e "s:%%MNEMODIR%%:${MNEMODIR}:g;s:%%DOCSDIR%%:${DOCSDIR}:g" \ - < ${FILESDIR}/pkg-message.in > ${PKGMESSAGE} @${ECHO_MSG} @${CAT} ${PKGMESSAGE} @${ECHO_MSG} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/deskutils/horde4-mnemo/pkg-deinstall b/deskutils/horde-mnemo/files/pkg-deinstall.in index b329889878d6..0a40a68d052b 100644 --- a/deskutils/horde4-mnemo/pkg-deinstall +++ b/deskutils/horde-mnemo/files/pkg-deinstall.in @@ -9,7 +9,7 @@ if [ x$2 != xDEINSTALL ]; then fi if [ -z "${PACKAGE_BUILDING}" ]; then - for cf in `ls ${PKG_PREFIX}/www/horde/mnemo/config/*php`; do + for cf in `ls %%MNEMODIR%%/config/*php`; do diff -bBqw $cf $cf.dist >/dev/null 2>&1 case $? in 0) # original config file, will be deleted by pkg-plist diff --git a/deskutils/horde-mnemo/pkg-plist b/deskutils/horde-mnemo/pkg-plist index cc60dcbc30d1..816549d83396 100644 --- a/deskutils/horde-mnemo/pkg-plist +++ b/deskutils/horde-mnemo/pkg-plist @@ -1,4 +1,4 @@ -etc/horde/httpd.conf.mnemo +%%HORDE_INC%%/httpd-mnemo.conf %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES diff --git a/deskutils/horde-nag/Makefile b/deskutils/horde-nag/Makefile index 5928f9390e49..378160e55120 100644 --- a/deskutils/horde-nag/Makefile +++ b/deskutils/horde-nag/Makefile @@ -25,11 +25,12 @@ COMMENT= Nag is a simple, multiuser task list manager RUN_DEPENDS= ${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde NO_BUILD= yes -USE_REINPLACE= yes +USE_APACHE= 1.3+ # needed to test APACHE_VERSION -PLIST_SUB= NAGDIR=${LNAGDIR} +PLIST_SUB= NAGDIR=${LNAGDIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||} PKGMESSAGE= ${WRKDIR}/pkg-message -SUB_FILES= pkg-message +PKGDEINSTALL= ${WRKDIR}/pkg-deinstall +SUB_FILES= pkg-message pkg-deinstall SUB_LIST= NAGDIR=${NAGDIR} DOCS= COPYING README docs/CHANGES docs/CREDITS docs/INSTALL \ @@ -43,11 +44,17 @@ LNAGDIR?= ${LHORDEDIR}/nag NAGDIR= ${PREFIX}/${LNAGDIR} 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 pre-configure: @${SED} -e "s:/home/httpd/html/horde/nag:${NAGDIR}:g" \ - ${FILESDIR}/httpd.conf.nag > ${WRKDIR}/httpd.conf.nag + ${FILESDIR}/httpd.conf.nag > ${WRKDIR}/httpd-nag.conf do-install: @${MKDIR} ${NAGDIR} @@ -62,7 +69,7 @@ do-install: .endfor @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${NAGDIR} @${CHMOD} -R o-rwx ${CONFDIR} - @${INSTALL_DATA} ${WRKDIR}/httpd.conf.nag ${HORDE_INC} + @${INSTALL_DATA} ${WRKDIR}/httpd-nag.conf ${HORDE_INC} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for FILE in ${DOCS} @@ -76,4 +83,4 @@ post-install: @${CAT} ${PKGMESSAGE} @${ECHO_MSG} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/deskutils/nag/pkg-deinstall b/deskutils/horde-nag/files/pkg-deinstall.in index 266600fc1a29..8f85e546f5d4 100644 --- a/deskutils/nag/pkg-deinstall +++ b/deskutils/horde-nag/files/pkg-deinstall.in @@ -9,7 +9,7 @@ if [ x$2 != xDEINSTALL ]; then fi if [ -z "${PACKAGE_BUILDING}" ]; then - for cf in `ls ${PKG_PREFIX}/www/horde/nag/config/*php`; do + for cf in `ls %%NAGDIR%%/config/*php`; do diff -bBqw $cf $cf.dist >/dev/null 2>&1 case $? in 0) # original config file, will be deleted by pkg-plist diff --git a/deskutils/horde-nag/pkg-plist b/deskutils/horde-nag/pkg-plist index 14695a512690..f8516bc705b9 100644 --- a/deskutils/horde-nag/pkg-plist +++ b/deskutils/horde-nag/pkg-plist @@ -1,4 +1,4 @@ -etc/horde/httpd.conf.nag +%%HORDE_INC%%/httpd-nag.conf %%PORTDOCS%%%%DOCSDIR%%/CHANGES %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/CREDITS diff --git a/deskutils/horde4-kronolith/Makefile b/deskutils/horde4-kronolith/Makefile index fe2d86b2bf40..32bae023c962 100644 --- a/deskutils/horde4-kronolith/Makefile +++ b/deskutils/horde4-kronolith/Makefile @@ -25,14 +25,14 @@ COMMENT= Kronolith is the Horde calendar application #---------------------------------------------------------------------------- # You may define this option: # -# - WITHOUT_MCAL: you won't use the MCAL driver but a database backend -# (only for PHP4). +# - WITH_MCAL: you want to use the MCAL driver (deprecated, and only for PHP4). # #---------------------------------------------------------------------------- RUN_DEPENDS+= ${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde NO_BUILD= yes +USE_APACHE= 1.3+ # needed to test APACHE_VERSION USE_PHP= yes # modules set by Horde, but needed to get PHP_VER USE_REINPLACE= yes @@ -46,18 +46,23 @@ LHORDEDIR?= www/horde LKRONOLITHDIR?= ${LHORDEDIR}/kronolith PKGMESSAGE= ${WRKDIR}/pkg-message -SUB_FILES= pkg-message +PKGDEINSTALL= ${WRKDIR}/pkg-deinstall +SUB_FILES= pkg-message pkg-deinstall SUB_LIST= KRONOLITHDIR=${KRONOLITHDIR} -PLIST_SUB= KRONOLITHDIR=${LKRONOLITHDIR} +PLIST_SUB= KRONOLITHDIR=${LKRONOLITHDIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||} KRONOLITHDIR= ${PREFIX}/${LKRONOLITHDIR} CONFDIR= ${KRONOLITHDIR}/config VAR_CAL= /var/calendar -HORDE_INC= ${LOCALBASE}/etc/horde - .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 + .if exists(${LOCALBASE}/sbin/htpasswd) HTPASSWD= ${LOCALBASE}/sbin/htpasswd .else @@ -67,7 +72,7 @@ HTPASSWD= ${LOCALBASE}/bin/htpasswd pre-configure: @${RM} ${WRKSRC}/config/conf.xml.orig @${SED} -e "s:/home/httpd/html/horde/kronolith:${KRONOLITHDIR}:" \ - ${FILESDIR}/httpd.conf.kronolith > ${WRKDIR}/httpd.conf.kronolith + ${FILESDIR}/httpd.conf.kronolith > ${WRKDIR}/httpd-kronolith.conf do-install: @${MKDIR} ${KRONOLITHDIR} @@ -82,7 +87,7 @@ do-install: .endfor @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${KRONOLITHDIR} @${CHMOD} -R o-rwx ${CONFDIR} - @${INSTALL_DATA} ${WRKDIR}/httpd.conf.kronolith ${HORDE_INC} + @${INSTALL_DATA} ${WRKDIR}/httpd-kronolith.conf ${HORDE_INC} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for FILE in ${DOCS} @@ -92,13 +97,13 @@ do-install: .endif post-install: -.if !defined(WITHOUT_MCAL) && (${PHP_VER} == 4) +.if defined(WITH_MCAL) && (${PHP_VER} == 4) @if [ ! -d ${VAR_CAL} ]; then \ ${ECHO_MSG} "===> Creating ${VAR_CAL}" ; \ ${MKDIR} ${VAR_CAL} ; \ ${CHMOD} 1777 ${VAR_CAL} ; \ fi -.if !defined(BATCH) +. if !defined(BATCH) @if [ ! -f ${LOCALBASE}/etc/mpasswd ] ; then \ ${ECHO_MSG} "===> Creating ${LOCALBASE}/etc/mpasswd" ; \ ${ECHO} -n "Please enter a password for www's calendar: " ; \ diff --git a/deskutils/kronolith/pkg-deinstall b/deskutils/horde4-kronolith/files/pkg-deinstall.in index 4578da3f26fe..896c740dd4da 100644 --- a/deskutils/kronolith/pkg-deinstall +++ b/deskutils/horde4-kronolith/files/pkg-deinstall.in @@ -9,7 +9,7 @@ if [ x$2 != xDEINSTALL ]; then fi if [ -z "${PACKAGE_BUILDING}" ]; then - for cf in `ls ${PKG_PREFIX}/www/horde/kronolith/config/*php`; do + for cf in `ls %%KRONOLITHDIR%%/config/*php`; do diff -bBqw $cf $cf.dist >/dev/null 2>&1 case $? in 0) # original config file, will be deleted by pkg-plist diff --git a/deskutils/horde4-kronolith/files/pkg-message.in b/deskutils/horde4-kronolith/files/pkg-message.in index e7f0e3401e17..54946bd7d451 100644 --- a/deskutils/horde4-kronolith/files/pkg-message.in +++ b/deskutils/horde4-kronolith/files/pkg-message.in @@ -5,7 +5,7 @@ blank configuration files. Horde must be configured; if not, see `pkg_info -D -x horde'. With PHP4: -If you choose the mcal backend, libmcal must be configured with the driver +If you choosed the mcal backend, libmcal must be configured with the driver mstore for the user www: - mkdir /var/calendar @@ -21,6 +21,9 @@ SQL scripts in %%KRONOLITHDIR%%/scripts/sql. WARNING! if you are upgrading from Kronolith v. 1.1.x, you have to alter ******** your schemas. Please read the doc %%DOCSDIR%%/UPGRADING. + Please note that the MCAL back-end is deprecated! + To migrate from MCAL to SQL, you can use the provided script + %%KRONOLITHDIR%%/scripts/migrate_to_sql_driver.php Finally, you must login to Horde as a Horde Administrator to finish the configuration. diff --git a/deskutils/horde4-kronolith/pkg-plist b/deskutils/horde4-kronolith/pkg-plist index 46df1c3d2b06..bfee675d8a50 100644 --- a/deskutils/horde4-kronolith/pkg-plist +++ b/deskutils/horde4-kronolith/pkg-plist @@ -195,7 +195,7 @@ %%KRONOLITHDIR%%/viewevent.php %%KRONOLITHDIR%%/week.php %%KRONOLITHDIR%%/workweek.php -etc/horde/httpd.conf.kronolith +%%HORDE_INC%%/httpd-kronolith.conf %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%KRONOLITHDIR%%/themes/simplex @dirrm %%KRONOLITHDIR%%/themes/print diff --git a/deskutils/horde4-mnemo/Makefile b/deskutils/horde4-mnemo/Makefile index 61dc04ee2164..e5e46cdc2342 100644 --- a/deskutils/horde4-mnemo/Makefile +++ b/deskutils/horde4-mnemo/Makefile @@ -24,10 +24,13 @@ COMMENT= Mnemo is the Horde notes and memos application RUN_DEPENDS= ${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde NO_BUILD= yes -USE_REINPLACE= yes +USE_APACHE= 1.3+ # needed to test APACHE_VERSION -PLIST_SUB= MNEMODIR=${LMNEMODIR} +PLIST_SUB= MNEMODIR=${LMNEMODIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||} PKGMESSAGE= ${WRKDIR}/pkg-message +PKGDEINSTALL= ${WRKDIR}/pkg-deinstall +SUB_FILES= pkg-message pkg-deinstall +SUB_LIST= MNEMODIR=${MNEMODIR} DOCS= LICENSE README docs/CHANGES docs/CREDITS docs/INSTALL \ docs/RELEASE_NOTES docs/TODO docs/UPGRADING @@ -40,11 +43,17 @@ LMNEMODIR?= ${LHORDEDIR}/mnemo MNEMODIR= ${PREFIX}/${LMNEMODIR} CONFDIR= ${MNEMODIR}/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 pre-configure: @${SED} -e "s:/home/httpd/html/horde/mnemo:${MNEMODIR}:g" \ - ${FILESDIR}/httpd.conf.mnemo > ${WRKDIR}/httpd.conf.mnemo + ${FILESDIR}/httpd.conf.mnemo > ${WRKDIR}/httpd-mnemo.conf do-install: @${MKDIR} ${MNEMODIR} @@ -59,7 +68,7 @@ do-install: .endfor @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${MNEMODIR} @${CHMOD} -R o-rwx ${CONFDIR} - @${INSTALL_DATA} ${WRKDIR}/httpd.conf.mnemo ${HORDE_INC} + @${INSTALL_DATA} ${WRKDIR}/httpd-mnemo.conf ${HORDE_INC} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for FILE in ${DOCS} @@ -69,10 +78,8 @@ do-install: .endif post-install: - @${SED} -e "s:%%MNEMODIR%%:${MNEMODIR}:g;s:%%DOCSDIR%%:${DOCSDIR}:g" \ - < ${FILESDIR}/pkg-message.in > ${PKGMESSAGE} @${ECHO_MSG} @${CAT} ${PKGMESSAGE} @${ECHO_MSG} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/deskutils/horde-mnemo/pkg-deinstall b/deskutils/horde4-mnemo/files/pkg-deinstall.in index b329889878d6..0a40a68d052b 100644 --- a/deskutils/horde-mnemo/pkg-deinstall +++ b/deskutils/horde4-mnemo/files/pkg-deinstall.in @@ -9,7 +9,7 @@ if [ x$2 != xDEINSTALL ]; then fi if [ -z "${PACKAGE_BUILDING}" ]; then - for cf in `ls ${PKG_PREFIX}/www/horde/mnemo/config/*php`; do + for cf in `ls %%MNEMODIR%%/config/*php`; do diff -bBqw $cf $cf.dist >/dev/null 2>&1 case $? in 0) # original config file, will be deleted by pkg-plist diff --git a/deskutils/horde4-mnemo/pkg-plist b/deskutils/horde4-mnemo/pkg-plist index cc60dcbc30d1..816549d83396 100644 --- a/deskutils/horde4-mnemo/pkg-plist +++ b/deskutils/horde4-mnemo/pkg-plist @@ -1,4 +1,4 @@ -etc/horde/httpd.conf.mnemo +%%HORDE_INC%%/httpd-mnemo.conf %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES diff --git a/deskutils/horde4-nag/Makefile b/deskutils/horde4-nag/Makefile index 5928f9390e49..378160e55120 100644 --- a/deskutils/horde4-nag/Makefile +++ b/deskutils/horde4-nag/Makefile @@ -25,11 +25,12 @@ COMMENT= Nag is a simple, multiuser task list manager RUN_DEPENDS= ${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde NO_BUILD= yes -USE_REINPLACE= yes +USE_APACHE= 1.3+ # needed to test APACHE_VERSION -PLIST_SUB= NAGDIR=${LNAGDIR} +PLIST_SUB= NAGDIR=${LNAGDIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||} PKGMESSAGE= ${WRKDIR}/pkg-message -SUB_FILES= pkg-message +PKGDEINSTALL= ${WRKDIR}/pkg-deinstall +SUB_FILES= pkg-message pkg-deinstall SUB_LIST= NAGDIR=${NAGDIR} DOCS= COPYING README docs/CHANGES docs/CREDITS docs/INSTALL \ @@ -43,11 +44,17 @@ LNAGDIR?= ${LHORDEDIR}/nag NAGDIR= ${PREFIX}/${LNAGDIR} 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 pre-configure: @${SED} -e "s:/home/httpd/html/horde/nag:${NAGDIR}:g" \ - ${FILESDIR}/httpd.conf.nag > ${WRKDIR}/httpd.conf.nag + ${FILESDIR}/httpd.conf.nag > ${WRKDIR}/httpd-nag.conf do-install: @${MKDIR} ${NAGDIR} @@ -62,7 +69,7 @@ do-install: .endfor @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${NAGDIR} @${CHMOD} -R o-rwx ${CONFDIR} - @${INSTALL_DATA} ${WRKDIR}/httpd.conf.nag ${HORDE_INC} + @${INSTALL_DATA} ${WRKDIR}/httpd-nag.conf ${HORDE_INC} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for FILE in ${DOCS} @@ -76,4 +83,4 @@ post-install: @${CAT} ${PKGMESSAGE} @${ECHO_MSG} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/deskutils/horde-nag/pkg-deinstall b/deskutils/horde4-nag/files/pkg-deinstall.in index 266600fc1a29..8f85e546f5d4 100644 --- a/deskutils/horde-nag/pkg-deinstall +++ b/deskutils/horde4-nag/files/pkg-deinstall.in @@ -9,7 +9,7 @@ if [ x$2 != xDEINSTALL ]; then fi if [ -z "${PACKAGE_BUILDING}" ]; then - for cf in `ls ${PKG_PREFIX}/www/horde/nag/config/*php`; do + for cf in `ls %%NAGDIR%%/config/*php`; do diff -bBqw $cf $cf.dist >/dev/null 2>&1 case $? in 0) # original config file, will be deleted by pkg-plist diff --git a/deskutils/horde4-nag/pkg-plist b/deskutils/horde4-nag/pkg-plist index 14695a512690..f8516bc705b9 100644 --- a/deskutils/horde4-nag/pkg-plist +++ b/deskutils/horde4-nag/pkg-plist @@ -1,4 +1,4 @@ -etc/horde/httpd.conf.nag +%%HORDE_INC%%/httpd-nag.conf %%PORTDOCS%%%%DOCSDIR%%/CHANGES %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/CREDITS diff --git a/deskutils/kronolith/Makefile b/deskutils/kronolith/Makefile index fe2d86b2bf40..32bae023c962 100644 --- a/deskutils/kronolith/Makefile +++ b/deskutils/kronolith/Makefile @@ -25,14 +25,14 @@ COMMENT= Kronolith is the Horde calendar application #---------------------------------------------------------------------------- # You may define this option: # -# - WITHOUT_MCAL: you won't use the MCAL driver but a database backend -# (only for PHP4). +# - WITH_MCAL: you want to use the MCAL driver (deprecated, and only for PHP4). # #---------------------------------------------------------------------------- RUN_DEPENDS+= ${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde NO_BUILD= yes +USE_APACHE= 1.3+ # needed to test APACHE_VERSION USE_PHP= yes # modules set by Horde, but needed to get PHP_VER USE_REINPLACE= yes @@ -46,18 +46,23 @@ LHORDEDIR?= www/horde LKRONOLITHDIR?= ${LHORDEDIR}/kronolith PKGMESSAGE= ${WRKDIR}/pkg-message -SUB_FILES= pkg-message +PKGDEINSTALL= ${WRKDIR}/pkg-deinstall +SUB_FILES= pkg-message pkg-deinstall SUB_LIST= KRONOLITHDIR=${KRONOLITHDIR} -PLIST_SUB= KRONOLITHDIR=${LKRONOLITHDIR} +PLIST_SUB= KRONOLITHDIR=${LKRONOLITHDIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||} KRONOLITHDIR= ${PREFIX}/${LKRONOLITHDIR} CONFDIR= ${KRONOLITHDIR}/config VAR_CAL= /var/calendar -HORDE_INC= ${LOCALBASE}/etc/horde - .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 + .if exists(${LOCALBASE}/sbin/htpasswd) HTPASSWD= ${LOCALBASE}/sbin/htpasswd .else @@ -67,7 +72,7 @@ HTPASSWD= ${LOCALBASE}/bin/htpasswd pre-configure: @${RM} ${WRKSRC}/config/conf.xml.orig @${SED} -e "s:/home/httpd/html/horde/kronolith:${KRONOLITHDIR}:" \ - ${FILESDIR}/httpd.conf.kronolith > ${WRKDIR}/httpd.conf.kronolith + ${FILESDIR}/httpd.conf.kronolith > ${WRKDIR}/httpd-kronolith.conf do-install: @${MKDIR} ${KRONOLITHDIR} @@ -82,7 +87,7 @@ do-install: .endfor @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${KRONOLITHDIR} @${CHMOD} -R o-rwx ${CONFDIR} - @${INSTALL_DATA} ${WRKDIR}/httpd.conf.kronolith ${HORDE_INC} + @${INSTALL_DATA} ${WRKDIR}/httpd-kronolith.conf ${HORDE_INC} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for FILE in ${DOCS} @@ -92,13 +97,13 @@ do-install: .endif post-install: -.if !defined(WITHOUT_MCAL) && (${PHP_VER} == 4) +.if defined(WITH_MCAL) && (${PHP_VER} == 4) @if [ ! -d ${VAR_CAL} ]; then \ ${ECHO_MSG} "===> Creating ${VAR_CAL}" ; \ ${MKDIR} ${VAR_CAL} ; \ ${CHMOD} 1777 ${VAR_CAL} ; \ fi -.if !defined(BATCH) +. if !defined(BATCH) @if [ ! -f ${LOCALBASE}/etc/mpasswd ] ; then \ ${ECHO_MSG} "===> Creating ${LOCALBASE}/etc/mpasswd" ; \ ${ECHO} -n "Please enter a password for www's calendar: " ; \ diff --git a/deskutils/horde4-kronolith/pkg-deinstall b/deskutils/kronolith/files/pkg-deinstall.in index 4578da3f26fe..896c740dd4da 100644 --- a/deskutils/horde4-kronolith/pkg-deinstall +++ b/deskutils/kronolith/files/pkg-deinstall.in @@ -9,7 +9,7 @@ if [ x$2 != xDEINSTALL ]; then fi if [ -z "${PACKAGE_BUILDING}" ]; then - for cf in `ls ${PKG_PREFIX}/www/horde/kronolith/config/*php`; do + for cf in `ls %%KRONOLITHDIR%%/config/*php`; do diff -bBqw $cf $cf.dist >/dev/null 2>&1 case $? in 0) # original config file, will be deleted by pkg-plist diff --git a/deskutils/kronolith/files/pkg-message.in b/deskutils/kronolith/files/pkg-message.in index e7f0e3401e17..54946bd7d451 100644 --- a/deskutils/kronolith/files/pkg-message.in +++ b/deskutils/kronolith/files/pkg-message.in @@ -5,7 +5,7 @@ blank configuration files. Horde must be configured; if not, see `pkg_info -D -x horde'. With PHP4: -If you choose the mcal backend, libmcal must be configured with the driver +If you choosed the mcal backend, libmcal must be configured with the driver mstore for the user www: - mkdir /var/calendar @@ -21,6 +21,9 @@ SQL scripts in %%KRONOLITHDIR%%/scripts/sql. WARNING! if you are upgrading from Kronolith v. 1.1.x, you have to alter ******** your schemas. Please read the doc %%DOCSDIR%%/UPGRADING. + Please note that the MCAL back-end is deprecated! + To migrate from MCAL to SQL, you can use the provided script + %%KRONOLITHDIR%%/scripts/migrate_to_sql_driver.php Finally, you must login to Horde as a Horde Administrator to finish the configuration. diff --git a/deskutils/kronolith/pkg-plist b/deskutils/kronolith/pkg-plist index 46df1c3d2b06..bfee675d8a50 100644 --- a/deskutils/kronolith/pkg-plist +++ b/deskutils/kronolith/pkg-plist @@ -195,7 +195,7 @@ %%KRONOLITHDIR%%/viewevent.php %%KRONOLITHDIR%%/week.php %%KRONOLITHDIR%%/workweek.php -etc/horde/httpd.conf.kronolith +%%HORDE_INC%%/httpd-kronolith.conf %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%KRONOLITHDIR%%/themes/simplex @dirrm %%KRONOLITHDIR%%/themes/print diff --git a/deskutils/mnemo/Makefile b/deskutils/mnemo/Makefile index 61dc04ee2164..e5e46cdc2342 100644 --- a/deskutils/mnemo/Makefile +++ b/deskutils/mnemo/Makefile @@ -24,10 +24,13 @@ COMMENT= Mnemo is the Horde notes and memos application RUN_DEPENDS= ${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde NO_BUILD= yes -USE_REINPLACE= yes +USE_APACHE= 1.3+ # needed to test APACHE_VERSION -PLIST_SUB= MNEMODIR=${LMNEMODIR} +PLIST_SUB= MNEMODIR=${LMNEMODIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||} PKGMESSAGE= ${WRKDIR}/pkg-message +PKGDEINSTALL= ${WRKDIR}/pkg-deinstall +SUB_FILES= pkg-message pkg-deinstall +SUB_LIST= MNEMODIR=${MNEMODIR} DOCS= LICENSE README docs/CHANGES docs/CREDITS docs/INSTALL \ docs/RELEASE_NOTES docs/TODO docs/UPGRADING @@ -40,11 +43,17 @@ LMNEMODIR?= ${LHORDEDIR}/mnemo MNEMODIR= ${PREFIX}/${LMNEMODIR} CONFDIR= ${MNEMODIR}/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 pre-configure: @${SED} -e "s:/home/httpd/html/horde/mnemo:${MNEMODIR}:g" \ - ${FILESDIR}/httpd.conf.mnemo > ${WRKDIR}/httpd.conf.mnemo + ${FILESDIR}/httpd.conf.mnemo > ${WRKDIR}/httpd-mnemo.conf do-install: @${MKDIR} ${MNEMODIR} @@ -59,7 +68,7 @@ do-install: .endfor @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${MNEMODIR} @${CHMOD} -R o-rwx ${CONFDIR} - @${INSTALL_DATA} ${WRKDIR}/httpd.conf.mnemo ${HORDE_INC} + @${INSTALL_DATA} ${WRKDIR}/httpd-mnemo.conf ${HORDE_INC} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for FILE in ${DOCS} @@ -69,10 +78,8 @@ do-install: .endif post-install: - @${SED} -e "s:%%MNEMODIR%%:${MNEMODIR}:g;s:%%DOCSDIR%%:${DOCSDIR}:g" \ - < ${FILESDIR}/pkg-message.in > ${PKGMESSAGE} @${ECHO_MSG} @${CAT} ${PKGMESSAGE} @${ECHO_MSG} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/deskutils/mnemo/pkg-deinstall b/deskutils/mnemo/files/pkg-deinstall.in index b329889878d6..0a40a68d052b 100644 --- a/deskutils/mnemo/pkg-deinstall +++ b/deskutils/mnemo/files/pkg-deinstall.in @@ -9,7 +9,7 @@ if [ x$2 != xDEINSTALL ]; then fi if [ -z "${PACKAGE_BUILDING}" ]; then - for cf in `ls ${PKG_PREFIX}/www/horde/mnemo/config/*php`; do + for cf in `ls %%MNEMODIR%%/config/*php`; do diff -bBqw $cf $cf.dist >/dev/null 2>&1 case $? in 0) # original config file, will be deleted by pkg-plist diff --git a/deskutils/mnemo/pkg-plist b/deskutils/mnemo/pkg-plist index cc60dcbc30d1..816549d83396 100644 --- a/deskutils/mnemo/pkg-plist +++ b/deskutils/mnemo/pkg-plist @@ -1,4 +1,4 @@ -etc/horde/httpd.conf.mnemo +%%HORDE_INC%%/httpd-mnemo.conf %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES diff --git a/deskutils/nag/Makefile b/deskutils/nag/Makefile index 5928f9390e49..378160e55120 100644 --- a/deskutils/nag/Makefile +++ b/deskutils/nag/Makefile @@ -25,11 +25,12 @@ COMMENT= Nag is a simple, multiuser task list manager RUN_DEPENDS= ${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde NO_BUILD= yes -USE_REINPLACE= yes +USE_APACHE= 1.3+ # needed to test APACHE_VERSION -PLIST_SUB= NAGDIR=${LNAGDIR} +PLIST_SUB= NAGDIR=${LNAGDIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||} PKGMESSAGE= ${WRKDIR}/pkg-message -SUB_FILES= pkg-message +PKGDEINSTALL= ${WRKDIR}/pkg-deinstall +SUB_FILES= pkg-message pkg-deinstall SUB_LIST= NAGDIR=${NAGDIR} DOCS= COPYING README docs/CHANGES docs/CREDITS docs/INSTALL \ @@ -43,11 +44,17 @@ LNAGDIR?= ${LHORDEDIR}/nag NAGDIR= ${PREFIX}/${LNAGDIR} 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 pre-configure: @${SED} -e "s:/home/httpd/html/horde/nag:${NAGDIR}:g" \ - ${FILESDIR}/httpd.conf.nag > ${WRKDIR}/httpd.conf.nag + ${FILESDIR}/httpd.conf.nag > ${WRKDIR}/httpd-nag.conf do-install: @${MKDIR} ${NAGDIR} @@ -62,7 +69,7 @@ do-install: .endfor @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${NAGDIR} @${CHMOD} -R o-rwx ${CONFDIR} - @${INSTALL_DATA} ${WRKDIR}/httpd.conf.nag ${HORDE_INC} + @${INSTALL_DATA} ${WRKDIR}/httpd-nag.conf ${HORDE_INC} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for FILE in ${DOCS} @@ -76,4 +83,4 @@ post-install: @${CAT} ${PKGMESSAGE} @${ECHO_MSG} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/deskutils/horde4-nag/pkg-deinstall b/deskutils/nag/files/pkg-deinstall.in index 266600fc1a29..8f85e546f5d4 100644 --- a/deskutils/horde4-nag/pkg-deinstall +++ b/deskutils/nag/files/pkg-deinstall.in @@ -9,7 +9,7 @@ if [ x$2 != xDEINSTALL ]; then fi if [ -z "${PACKAGE_BUILDING}" ]; then - for cf in `ls ${PKG_PREFIX}/www/horde/nag/config/*php`; do + for cf in `ls %%NAGDIR%%/config/*php`; do diff -bBqw $cf $cf.dist >/dev/null 2>&1 case $? in 0) # original config file, will be deleted by pkg-plist diff --git a/deskutils/nag/pkg-plist b/deskutils/nag/pkg-plist index 14695a512690..f8516bc705b9 100644 --- a/deskutils/nag/pkg-plist +++ b/deskutils/nag/pkg-plist @@ -1,4 +1,4 @@ -etc/horde/httpd.conf.nag +%%HORDE_INC%%/httpd-nag.conf %%PORTDOCS%%%%DOCSDIR%%/CHANGES %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/CREDITS diff --git a/devel/chora/Makefile b/devel/chora/Makefile index 58a574981fee..b093bdd53d25 100644 --- a/devel/chora/Makefile +++ b/devel/chora/Makefile @@ -49,6 +49,7 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/cvsgraph:${PORTSDIR}/devel/cvsgraph .endif NO_BUILD= yes +USE_APACHE= 1.3+ # needed to test APACHE_VERSION USE_REINPLACE= yes # Specify where your repository belongs. @@ -62,23 +63,32 @@ DOCS= COPYING README docs/BUGS docs/CHANGES docs/CREDITS \ CONFFILE= cvsgraph.conf longIntro.txt mime_drivers.php prefs.php \ sourceroots.php SUB_DIRS= config lib locale po templates themes -PKGMESSAGE= ${WRKDIR}/pkg-message LHORDEDIR?= www/horde LCHORADIR= ${LHORDEDIR}/chora -PLIST_SUB= CHORADIR=${LCHORADIR} +PLIST_SUB= CHORADIR=${LCHORADIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||} +PKGMESSAGE= ${WRKDIR}/pkg-message +PKGDEINSTALL= ${WRKDIR}/pkg-deinstall +SUB_FILES= pkg-message pkg-deinstall +SUB_LIST= CHORADIR=${CHORADIR} CONFDIR=${CONFDIR} CHORADIR= ${PREFIX}/${LCHORADIR} CONFDIR= ${CHORADIR}/config -HORDE_INC= ${LOCALBASE}/etc/horde - PATCH2RM= sourceroots.php.dist.orig sourceroots.php.dist.bak conf.xml.bak +.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 + pre-configure: @${SED} -e "s:/home/httpd/html/horde/chora:${CHORADIR}:" \ - ${FILESDIR}/httpd.conf.chora > ${WRKDIR}/httpd.conf.chora + ${FILESDIR}/httpd.conf.chora > ${WRKDIR}/httpd-chora.conf @${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|" \ -e "s|/usr/bin/cvsgraph|${LOCALBASE}/bin/cvsgraph|" \ -e "s|/usr/bin/svn|${LOCALBASE}/bin/svn|" \ @@ -111,7 +121,7 @@ do-install: .endfor @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${CHORADIR} @${CHMOD} -R o-rwx ${CONFDIR} - @${INSTALL_DATA} ${WRKDIR}/httpd.conf.chora ${HORDE_INC} + @${INSTALL_DATA} ${WRKDIR}/httpd-chora.conf ${HORDE_INC} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for FILE in ${DOCS} @@ -121,10 +131,8 @@ do-install: .endif post-install: - @${SED} -e "s:%%CHORADIR%%:${CHORADIR}:;s:%%CONFDIR%%:${CONFDIR}:" \ - < ${FILESDIR}/pkg-message.in > ${PKGMESSAGE} @${ECHO_MSG} @${CAT} ${PKGMESSAGE} @${ECHO_MSG} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/devel/chora/distinfo b/devel/chora/distinfo index 825cac622628..480790e21cd1 100644 --- a/devel/chora/distinfo +++ b/devel/chora/distinfo @@ -1,2 +1,3 @@ MD5 (chora-h3-2.0.1.tar.gz) = 8f3f3e81c839e6f13b797ab911b53652 +SHA256 (chora-h3-2.0.1.tar.gz) = 166b125f08aae7ebda5af7a58bf30c87d7bb4af7a5d3eff8f2429e10d2bd0325 SIZE (chora-h3-2.0.1.tar.gz) = 722536 diff --git a/devel/chora/pkg-deinstall b/devel/chora/files/pkg-deinstall.in index 02a46f12daa8..0ef032fe5654 100644 --- a/devel/chora/pkg-deinstall +++ b/devel/chora/files/pkg-deinstall.in @@ -9,7 +9,7 @@ if [ x$2 != xDEINSTALL ]; then fi if [ -z "${PACKAGE_BUILDING}" ]; then - for cf in `ls ${PKG_PREFIX}/www/horde/chora/config/*php ${PKG_PREFIX}/www/horde/chora/config/*txt`; do + for cf in `ls %%CHORADIR%%/config/*php %%CHORADIR%%/config/*txt`; do diff -bBqw $cf $cf.dist >/dev/null 2>&1 case $? in 0) # original config file, will be deleted by pkg-plist diff --git a/devel/chora/pkg-plist b/devel/chora/pkg-plist index b6347ab520dc..5498173e4f45 100644 --- a/devel/chora/pkg-plist +++ b/devel/chora/pkg-plist @@ -1,4 +1,4 @@ -etc/horde/httpd.conf.chora +%%HORDE_INC%%/httpd-chora.conf %%PORTDOCS%%%%DOCSDIR%%/BUGS %%PORTDOCS%%%%DOCSDIR%%/CHANGES %%PORTDOCS%%%%DOCSDIR%%/COPYING diff --git a/devel/horde-chora/Makefile b/devel/horde-chora/Makefile index 58a574981fee..b093bdd53d25 100644 --- a/devel/horde-chora/Makefile +++ b/devel/horde-chora/Makefile @@ -49,6 +49,7 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/cvsgraph:${PORTSDIR}/devel/cvsgraph .endif NO_BUILD= yes +USE_APACHE= 1.3+ # needed to test APACHE_VERSION USE_REINPLACE= yes # Specify where your repository belongs. @@ -62,23 +63,32 @@ DOCS= COPYING README docs/BUGS docs/CHANGES docs/CREDITS \ CONFFILE= cvsgraph.conf longIntro.txt mime_drivers.php prefs.php \ sourceroots.php SUB_DIRS= config lib locale po templates themes -PKGMESSAGE= ${WRKDIR}/pkg-message LHORDEDIR?= www/horde LCHORADIR= ${LHORDEDIR}/chora -PLIST_SUB= CHORADIR=${LCHORADIR} +PLIST_SUB= CHORADIR=${LCHORADIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||} +PKGMESSAGE= ${WRKDIR}/pkg-message +PKGDEINSTALL= ${WRKDIR}/pkg-deinstall +SUB_FILES= pkg-message pkg-deinstall +SUB_LIST= CHORADIR=${CHORADIR} CONFDIR=${CONFDIR} CHORADIR= ${PREFIX}/${LCHORADIR} CONFDIR= ${CHORADIR}/config -HORDE_INC= ${LOCALBASE}/etc/horde - PATCH2RM= sourceroots.php.dist.orig sourceroots.php.dist.bak conf.xml.bak +.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 + pre-configure: @${SED} -e "s:/home/httpd/html/horde/chora:${CHORADIR}:" \ - ${FILESDIR}/httpd.conf.chora > ${WRKDIR}/httpd.conf.chora + ${FILESDIR}/httpd.conf.chora > ${WRKDIR}/httpd-chora.conf @${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|" \ -e "s|/usr/bin/cvsgraph|${LOCALBASE}/bin/cvsgraph|" \ -e "s|/usr/bin/svn|${LOCALBASE}/bin/svn|" \ @@ -111,7 +121,7 @@ do-install: .endfor @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${CHORADIR} @${CHMOD} -R o-rwx ${CONFDIR} - @${INSTALL_DATA} ${WRKDIR}/httpd.conf.chora ${HORDE_INC} + @${INSTALL_DATA} ${WRKDIR}/httpd-chora.conf ${HORDE_INC} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for FILE in ${DOCS} @@ -121,10 +131,8 @@ do-install: .endif post-install: - @${SED} -e "s:%%CHORADIR%%:${CHORADIR}:;s:%%CONFDIR%%:${CONFDIR}:" \ - < ${FILESDIR}/pkg-message.in > ${PKGMESSAGE} @${ECHO_MSG} @${CAT} ${PKGMESSAGE} @${ECHO_MSG} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/devel/horde-chora/distinfo b/devel/horde-chora/distinfo index 825cac622628..480790e21cd1 100644 --- a/devel/horde-chora/distinfo +++ b/devel/horde-chora/distinfo @@ -1,2 +1,3 @@ MD5 (chora-h3-2.0.1.tar.gz) = 8f3f3e81c839e6f13b797ab911b53652 +SHA256 (chora-h3-2.0.1.tar.gz) = 166b125f08aae7ebda5af7a58bf30c87d7bb4af7a5d3eff8f2429e10d2bd0325 SIZE (chora-h3-2.0.1.tar.gz) = 722536 diff --git a/devel/horde-chora/pkg-deinstall b/devel/horde-chora/files/pkg-deinstall.in index 02a46f12daa8..0ef032fe5654 100644 --- a/devel/horde-chora/pkg-deinstall +++ b/devel/horde-chora/files/pkg-deinstall.in @@ -9,7 +9,7 @@ if [ x$2 != xDEINSTALL ]; then fi if [ -z "${PACKAGE_BUILDING}" ]; then - for cf in `ls ${PKG_PREFIX}/www/horde/chora/config/*php ${PKG_PREFIX}/www/horde/chora/config/*txt`; do + for cf in `ls %%CHORADIR%%/config/*php %%CHORADIR%%/config/*txt`; do diff -bBqw $cf $cf.dist >/dev/null 2>&1 case $? in 0) # original config file, will be deleted by pkg-plist diff --git a/devel/horde-chora/pkg-plist b/devel/horde-chora/pkg-plist index b6347ab520dc..5498173e4f45 100644 --- a/devel/horde-chora/pkg-plist +++ b/devel/horde-chora/pkg-plist @@ -1,4 +1,4 @@ -etc/horde/httpd.conf.chora +%%HORDE_INC%%/httpd-chora.conf %%PORTDOCS%%%%DOCSDIR%%/BUGS %%PORTDOCS%%%%DOCSDIR%%/CHANGES %%PORTDOCS%%%%DOCSDIR%%/COPYING diff --git a/ftp/gollem/Makefile b/ftp/gollem/Makefile index 9d68649310d3..017d1c74ccec 100644 --- a/ftp/gollem/Makefile +++ b/ftp/gollem/Makefile @@ -24,11 +24,12 @@ COMMENT= Gollem is the Horde web-based File Manager RUN_DEPENDS= ${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde NO_BUILD= yes -USE_REINPLACE= yes +USE_APACHE= 1.3+ # needed to test APACHE_VERSION -PLIST_SUB= GOLLEMDIR=${LGOLLEMDIR} +PLIST_SUB= GOLLEMDIR=${LGOLLEMDIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||} PKGMESSAGE= ${WRKDIR}/pkg-message -SUB_FILES= pkg-message +PKGDEINSTALL= ${WRKDIR}/pkg-deinstall +SUB_FILES= pkg-message pkg-deinstall SUB_LIST= GOLLEMDIR=${GOLLEMDIR} DOCS= README docs/CHANGES docs/CREDITS docs/INSTALL \ @@ -43,11 +44,17 @@ LGOLLEMDIR?= ${LHORDEDIR}/gollem GOLLEMDIR= ${PREFIX}/${LGOLLEMDIR} CONFDIR= ${GOLLEMDIR}/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 pre-configure: @${SED} -e "s:/home/httpd/html/horde/gollem:${GOLLEMDIR}:g" \ - ${FILESDIR}/httpd.conf.gollem > ${WRKDIR}/httpd.conf.gollem + ${FILESDIR}/httpd.conf.gollem > ${WRKDIR}/httpd-gollem.conf do-install: @${MKDIR} ${GOLLEMDIR} @@ -60,7 +67,7 @@ do-install: .endfor @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${GOLLEMDIR} @${CHMOD} -R o-rwx ${CONFDIR} - @${INSTALL_DATA} ${WRKDIR}/httpd.conf.gollem ${HORDE_INC} + @${INSTALL_DATA} ${WRKDIR}/httpd-gollem.conf ${HORDE_INC} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} @${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${DOCSDIR} @@ -72,4 +79,4 @@ post-install: @${CAT} ${PKGMESSAGE} @${ECHO_MSG} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/ftp/horde-gollem/pkg-deinstall b/ftp/gollem/files/pkg-deinstall.in index c371d1852937..5c399f4c3632 100644 --- a/ftp/horde-gollem/pkg-deinstall +++ b/ftp/gollem/files/pkg-deinstall.in @@ -9,7 +9,7 @@ if [ x$2 != xDEINSTALL ]; then fi if [ -z "${PACKAGE_BUILDING}" ]; then - for cf in `ls ${PKG_PREFIX}/www/horde/gollem/config/*php`; do + for cf in `ls %%GOLLEMDIR%%/config/*php`; do diff -bBqw $cf $cf.dist >/dev/null 2>&1 case $? in 0) # original config file, will be deleted by pkg-plist diff --git a/ftp/gollem/pkg-plist b/ftp/gollem/pkg-plist index 90aaceaa683d..33866e40f888 100644 --- a/ftp/gollem/pkg-plist +++ b/ftp/gollem/pkg-plist @@ -1,4 +1,4 @@ -etc/horde/httpd.conf.gollem +%%HORDE_INC%%/httpd-gollem.conf %%GOLLEMDIR%%/clipboard.php %%GOLLEMDIR%%/config/backends.php %%GOLLEMDIR%%/config/backends.php.dist diff --git a/ftp/horde-gollem/Makefile b/ftp/horde-gollem/Makefile index 9d68649310d3..017d1c74ccec 100644 --- a/ftp/horde-gollem/Makefile +++ b/ftp/horde-gollem/Makefile @@ -24,11 +24,12 @@ COMMENT= Gollem is the Horde web-based File Manager RUN_DEPENDS= ${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde NO_BUILD= yes -USE_REINPLACE= yes +USE_APACHE= 1.3+ # needed to test APACHE_VERSION -PLIST_SUB= GOLLEMDIR=${LGOLLEMDIR} +PLIST_SUB= GOLLEMDIR=${LGOLLEMDIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||} PKGMESSAGE= ${WRKDIR}/pkg-message -SUB_FILES= pkg-message +PKGDEINSTALL= ${WRKDIR}/pkg-deinstall +SUB_FILES= pkg-message pkg-deinstall SUB_LIST= GOLLEMDIR=${GOLLEMDIR} DOCS= README docs/CHANGES docs/CREDITS docs/INSTALL \ @@ -43,11 +44,17 @@ LGOLLEMDIR?= ${LHORDEDIR}/gollem GOLLEMDIR= ${PREFIX}/${LGOLLEMDIR} CONFDIR= ${GOLLEMDIR}/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 pre-configure: @${SED} -e "s:/home/httpd/html/horde/gollem:${GOLLEMDIR}:g" \ - ${FILESDIR}/httpd.conf.gollem > ${WRKDIR}/httpd.conf.gollem + ${FILESDIR}/httpd.conf.gollem > ${WRKDIR}/httpd-gollem.conf do-install: @${MKDIR} ${GOLLEMDIR} @@ -60,7 +67,7 @@ do-install: .endfor @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${GOLLEMDIR} @${CHMOD} -R o-rwx ${CONFDIR} - @${INSTALL_DATA} ${WRKDIR}/httpd.conf.gollem ${HORDE_INC} + @${INSTALL_DATA} ${WRKDIR}/httpd-gollem.conf ${HORDE_INC} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} @${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${DOCSDIR} @@ -72,4 +79,4 @@ post-install: @${CAT} ${PKGMESSAGE} @${ECHO_MSG} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/ftp/gollem/pkg-deinstall b/ftp/horde-gollem/files/pkg-deinstall.in index c371d1852937..5c399f4c3632 100644 --- a/ftp/gollem/pkg-deinstall +++ b/ftp/horde-gollem/files/pkg-deinstall.in @@ -9,7 +9,7 @@ if [ x$2 != xDEINSTALL ]; then fi if [ -z "${PACKAGE_BUILDING}" ]; then - for cf in `ls ${PKG_PREFIX}/www/horde/gollem/config/*php`; do + for cf in `ls %%GOLLEMDIR%%/config/*php`; do diff -bBqw $cf $cf.dist >/dev/null 2>&1 case $? in 0) # original config file, will be deleted by pkg-plist diff --git a/ftp/horde-gollem/pkg-plist b/ftp/horde-gollem/pkg-plist index 90aaceaa683d..33866e40f888 100644 --- a/ftp/horde-gollem/pkg-plist +++ b/ftp/horde-gollem/pkg-plist @@ -1,4 +1,4 @@ -etc/horde/httpd.conf.gollem +%%HORDE_INC%%/httpd-gollem.conf %%GOLLEMDIR%%/clipboard.php %%GOLLEMDIR%%/config/backends.php %%GOLLEMDIR%%/config/backends.php.dist diff --git a/mail/horde-imp/Makefile b/mail/horde-imp/Makefile index 3e5ccc623cf5..54440c11568a 100644 --- a/mail/horde-imp/Makefile +++ b/mail/horde-imp/Makefile @@ -104,6 +104,7 @@ RUN_DEPENDS+= ${PEARDIR}/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request .endif NO_BUILD= yes +USE_APACHE= 1.3+ # needed to test APACHE_VERSION USE_REINPLACE= yes REINPLACE_ARGS= -i.beforeIMP @@ -117,17 +118,15 @@ LHORDEDIR?= www/horde LIMPDIR= ${LHORDEDIR}/imp PEARDIR?= ${LOCALBASE}/share/pear -PLIST_SUB= IMPDIR=${LIMPDIR} -SUB_LIST= IMPDIR=${IMPDIR} PORTSDIR=${PORTSDIR} CONFDIR=${CONFDIR} - +PLIST_SUB= IMPDIR=${LIMPDIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||} PKGMESSAGE= ${WRKDIR}/pkg-message -SUB_FILES= pkg-message +PKGDEINSTALL= ${WRKDIR}/pkg-deinstall +SUB_FILES= pkg-message pkg-deinstall +SUB_LIST= IMPDIR=${IMPDIR} PORTSDIR=${PORTSDIR} CONFDIR=${CONFDIR} IMPDIR= ${PREFIX}/${LIMPDIR} CONFDIR= ${IMPDIR}/config -HORDE_INC= ${LOCALBASE}/etc/horde - HOSTNAME?= `/bin/hostname` SERVOS?= ${OPSYS}-${OSREL} @@ -158,6 +157,12 @@ RUN_DEPENDS+= ${LOCALBASE}/libexec/imapd:${PORTSDIR}/mail/imap-uw . endif .endif +.if ${APACHE_VERSION} >= 20 +HORDE_INC= ${LOCALBASE}/etc/apache${APACHE_VERSION:S/20/2/}/Includes +.else +HORDE_INC= ${LOCALBASE}/etc/horde +.endif + pre-everything:: .if !defined(WITHOUT_IMAPSERVER) @${ECHO_MSG} "" @@ -200,7 +205,7 @@ pre-configure: . endif .endif @${SED} -e "s:/home/httpd/html/horde/imp:${IMPDIR}:" \ - ${FILESDIR}/httpd.conf.imp > ${WRKDIR}/httpd.conf.imp + ${FILESDIR}/httpd.conf.imp > ${WRKDIR}/httpd-imp.conf .for fc in ${PATCH2RM} @${RM} ${WRKSRC}/config/${fc} .endfor @@ -228,7 +233,7 @@ do-install: fi .endfor @${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR} - @${INSTALL_DATA} ${WRKDIR}/httpd.conf.imp ${HORDE_INC} + @${INSTALL_DATA} ${WRKDIR}/httpd-imp.conf ${HORDE_INC} @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${IMPDIR} @${CHMOD} -R o-rwx ${CONFDIR} .if !defined(NOPORTDOCS) diff --git a/mail/horde-imp/distinfo b/mail/horde-imp/distinfo index 06a2bb31b08b..22d57099697c 100644 --- a/mail/horde-imp/distinfo +++ b/mail/horde-imp/distinfo @@ -1,2 +1,3 @@ MD5 (imp-h3-4.0.4.tar.gz) = 437767b420c6280e680a42c8e34182d1 +SHA256 (imp-h3-4.0.4.tar.gz) = aa814f8f2bee0912a50df6220c77a60b43d83a52b0bc49dffbd30b63845c08d1 SIZE (imp-h3-4.0.4.tar.gz) = 3349908 diff --git a/mail/horde-imp/pkg-deinstall b/mail/horde-imp/files/pkg-deinstall.in index cd0aa1e6c6c5..13bb805c47d5 100644 --- a/mail/horde-imp/pkg-deinstall +++ b/mail/horde-imp/files/pkg-deinstall.in @@ -9,7 +9,7 @@ if [ x$2 != xDEINSTALL ]; then fi if [ -z "${PACKAGE_BUILDING}" ]; then - for cf in `ls ${PKG_PREFIX}/www/horde/imp/config/*php ${PKG_PREFIX}/www/horde/imp/config/*txt`; do + for cf in `ls %%IMPDIR%%/config/*php %%IMPDIR%%/config/*txt`; do diff -bBqw $cf $cf.dist >/dev/null 2>&1 case $? in 0) # original config file, will be deleted by pkg-plist diff --git a/mail/horde-imp/pkg-plist b/mail/horde-imp/pkg-plist index cc4300f87ce6..4aed11a161f8 100644 --- a/mail/horde-imp/pkg-plist +++ b/mail/horde-imp/pkg-plist @@ -361,7 +361,7 @@ %%IMPDIR%%/thread.php %%IMPDIR%%/view.php %%PORTDOCS%%@dirrm %%DOCSDIR%% -etc/horde/httpd.conf.imp +%%HORDE_INC%%/httpd-imp.conf @dirrm %%IMPDIR%%/themes/sun @dirrm %%IMPDIR%%/themes/simplex @dirrm %%IMPDIR%%/themes/postnuke diff --git a/mail/horde-ingo/Makefile b/mail/horde-ingo/Makefile index df75e4b751e7..da02cc019ff6 100644 --- a/mail/horde-ingo/Makefile +++ b/mail/horde-ingo/Makefile @@ -33,10 +33,13 @@ RUN_DEPENDS+= ${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde NO_BUILD= yes USE_PHP= imap -USE_REINPLACE= yes +USE_APACHE= 1.3+ # needed to test APACHE_VERSION -PLIST_SUB= INGODIR=${LINGODIR} +PLIST_SUB= INGODIR=${LINGODIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||} PKGMESSAGE= ${WRKDIR}/pkg-message +PKGDEINSTALL= ${WRKDIR}/pkg-deinstall +SUB_FILES= pkg-message pkg-deinstall +SUB_LIST= INGODIR=${INGODIR} DOCS= LICENSE README docs/CHANGES docs/CREDITS docs/INSTALL \ docs/RELEASE_NOTES docs/TODO @@ -50,17 +53,21 @@ PEARDIR?= ${LOCALBASE}/share/pear INGODIR= ${PREFIX}/${LINGODIR} CONFDIR= ${INGODIR}/config -HORDE_INC= ${LOCALBASE}/etc/horde - .include <bsd.port.pre.mk> .if defined(WITH_SIEVE) || exists(${LOCALBASE}/cyrus/bin/timsieved) 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 + pre-configure: @${SED} -e "s:/home/httpd/html/horde/ingo:${INGODIR}:g" \ - ${FILESDIR}/httpd.conf.ingo >${WRKDIR}/httpd.conf.ingo + ${FILESDIR}/httpd.conf.ingo >${WRKDIR}/httpd-ingo.conf do-install: @${MKDIR} ${INGODIR} @@ -75,7 +82,7 @@ do-install: .endfor @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${INGODIR} @${CHMOD} -R o-rwx ${CONFDIR} - @${INSTALL_DATA} ${WRKDIR}/httpd.conf.ingo ${HORDE_INC} + @${INSTALL_DATA} ${WRKDIR}/httpd-ingo.conf ${HORDE_INC} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for FILE in ${DOCS} @@ -85,8 +92,6 @@ do-install: .endif post-install: - @${SED} -e "s:%%INGODIR%%:${INGODIR}:g;s:%%DOCSDIR%%:${DOCSDIR}:g" \ - < ${FILESDIR}/pkg-message.in > ${PKGMESSAGE} @${ECHO_MSG} @${CAT} ${PKGMESSAGE} @${ECHO_MSG} diff --git a/mail/horde-ingo/distinfo b/mail/horde-ingo/distinfo index 00afb90f937c..1957b3b5ced9 100644 --- a/mail/horde-ingo/distinfo +++ b/mail/horde-ingo/distinfo @@ -1,2 +1,3 @@ MD5 (ingo-h3-1.0.2.tar.gz) = 6bc7addfdd3bc18e4d6af5c1d57b7b89 +SHA256 (ingo-h3-1.0.2.tar.gz) = 6bd8d05f986c5b3d58065f7409b9df0912ace8968ed427798497bfd376bb1d29 SIZE (ingo-h3-1.0.2.tar.gz) = 853202 diff --git a/mail/horde4-ingo/pkg-deinstall b/mail/horde-ingo/files/pkg-deinstall.in index a3a597d448a6..2289e8963491 100644 --- a/mail/horde4-ingo/pkg-deinstall +++ b/mail/horde-ingo/files/pkg-deinstall.in @@ -9,7 +9,7 @@ if [ x$2 != xDEINSTALL ]; then fi if [ -z "${PACKAGE_BUILDING}" ]; then - for cf in `ls ${PKG_PREFIX}/www/horde/ingo/config/*php`; do + for cf in `ls %%INGODIR%%/config/*php`; do diff -bBqw $cf $cf.dist >/dev/null 2>&1 case $? in 0) # original config file, will be deleted by pkg-plist diff --git a/mail/horde-ingo/pkg-plist b/mail/horde-ingo/pkg-plist index b288edddd002..697fac19d784 100644 --- a/mail/horde-ingo/pkg-plist +++ b/mail/horde-ingo/pkg-plist @@ -1,4 +1,4 @@ -etc/horde/httpd.conf.ingo +%%HORDE_INC%%/httpd-ingo.conf %%PORTDOCS%%%%DOCSDIR%%/CHANGES %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/CREDITS diff --git a/mail/horde-turba/Makefile b/mail/horde-turba/Makefile index 0b2ca270102e..81bfb5cbe144 100644 --- a/mail/horde-turba/Makefile +++ b/mail/horde-turba/Makefile @@ -38,6 +38,7 @@ USE_PHP= ldap .endif NO_BUILD= yes +USE_APACHE= 1.3+ # needed to test APACHE_VERSION USE_REINPLACE= yes REINPLACE_ARGS= -i "" @@ -49,15 +50,16 @@ SUB_DIRS= config lib locale po scripts templates themes LHORDEDIR?= www/horde LTURBADIR?= ${LHORDEDIR}/turba -PLIST_SUB= TURBADIR=${LTURBADIR} +PLIST_SUB= TURBADIR=${LTURBADIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||} PKGMESSAGE= ${WRKDIR}/pkg-message -SUB_FILES= pkg-message +PKGDEINSTALL= ${WRKDIR}/pkg-deinstall +SUB_FILES= pkg-message pkg-deinstall SUB_LIST= TURBADIR=${TURBADIR} CONFDIR=${CONFDIR} TURBADIR= ${PREFIX}/${LTURBADIR} CONFDIR= ${TURBADIR}/config -HORDE_INC= ${LOCALBASE}/etc/horde +.include <bsd.port.pre.mk> .if exists(${LOCALBASE}/sbin/imspd) WITH_IMSP= yes @@ -66,10 +68,16 @@ WITH_IMSP= yes 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 + 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.conf.turba + ${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) @@ -89,7 +97,7 @@ do-install: .endfor @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${TURBADIR} @${CHMOD} -R o-rwx ${CONFDIR} - @${INSTALL_DATA} ${WRKDIR}/httpd.conf.turba ${HORDE_INC} + @${INSTALL_DATA} ${WRKDIR}/httpd-turba.conf ${HORDE_INC} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for FILE in ${DOCS} @@ -103,4 +111,4 @@ post-install: @${CAT} ${PKGMESSAGE} @${ECHO_MSG} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/mail/horde4-turba/pkg-deinstall b/mail/horde-turba/files/pkg-deinstall.in index b0a141eef091..afe8f9215da2 100644 --- a/mail/horde4-turba/pkg-deinstall +++ b/mail/horde-turba/files/pkg-deinstall.in @@ -9,7 +9,7 @@ if [ x$2 != xDEINSTALL ]; then fi if [ -z "${PACKAGE_BUILDING}" ]; then - for cf in `ls ${PKG_PREFIX}/www/horde/turba/config/*php`; do + for cf in `ls %%TURBADIR%%/config/*php`; do diff -bBqw $cf $cf.dist >/dev/null 2>&1 case $? in 0) # original config file, will be deleted by pkg-plist diff --git a/mail/horde-turba/pkg-plist b/mail/horde-turba/pkg-plist index 48455454ad34..fdb89c479187 100644 --- a/mail/horde-turba/pkg-plist +++ b/mail/horde-turba/pkg-plist @@ -167,7 +167,7 @@ %%TURBADIR%%/themes/graphics/turba.png %%TURBADIR%%/themes/screen.css %%TURBADIR%%/vcard.php -etc/horde/httpd.conf.turba +%%HORDE_INC%%/httpd-turba.conf %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%TURBADIR%%/lib/Block @dirrm %%TURBADIR%%/lib/Driver diff --git a/mail/horde4-imp/Makefile b/mail/horde4-imp/Makefile index 3e5ccc623cf5..54440c11568a 100644 --- a/mail/horde4-imp/Makefile +++ b/mail/horde4-imp/Makefile @@ -104,6 +104,7 @@ RUN_DEPENDS+= ${PEARDIR}/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request .endif NO_BUILD= yes +USE_APACHE= 1.3+ # needed to test APACHE_VERSION USE_REINPLACE= yes REINPLACE_ARGS= -i.beforeIMP @@ -117,17 +118,15 @@ LHORDEDIR?= www/horde LIMPDIR= ${LHORDEDIR}/imp PEARDIR?= ${LOCALBASE}/share/pear -PLIST_SUB= IMPDIR=${LIMPDIR} -SUB_LIST= IMPDIR=${IMPDIR} PORTSDIR=${PORTSDIR} CONFDIR=${CONFDIR} - +PLIST_SUB= IMPDIR=${LIMPDIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||} PKGMESSAGE= ${WRKDIR}/pkg-message -SUB_FILES= pkg-message +PKGDEINSTALL= ${WRKDIR}/pkg-deinstall +SUB_FILES= pkg-message pkg-deinstall +SUB_LIST= IMPDIR=${IMPDIR} PORTSDIR=${PORTSDIR} CONFDIR=${CONFDIR} IMPDIR= ${PREFIX}/${LIMPDIR} CONFDIR= ${IMPDIR}/config -HORDE_INC= ${LOCALBASE}/etc/horde - HOSTNAME?= `/bin/hostname` SERVOS?= ${OPSYS}-${OSREL} @@ -158,6 +157,12 @@ RUN_DEPENDS+= ${LOCALBASE}/libexec/imapd:${PORTSDIR}/mail/imap-uw . endif .endif +.if ${APACHE_VERSION} >= 20 +HORDE_INC= ${LOCALBASE}/etc/apache${APACHE_VERSION:S/20/2/}/Includes +.else +HORDE_INC= ${LOCALBASE}/etc/horde +.endif + pre-everything:: .if !defined(WITHOUT_IMAPSERVER) @${ECHO_MSG} "" @@ -200,7 +205,7 @@ pre-configure: . endif .endif @${SED} -e "s:/home/httpd/html/horde/imp:${IMPDIR}:" \ - ${FILESDIR}/httpd.conf.imp > ${WRKDIR}/httpd.conf.imp + ${FILESDIR}/httpd.conf.imp > ${WRKDIR}/httpd-imp.conf .for fc in ${PATCH2RM} @${RM} ${WRKSRC}/config/${fc} .endfor @@ -228,7 +233,7 @@ do-install: fi .endfor @${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR} - @${INSTALL_DATA} ${WRKDIR}/httpd.conf.imp ${HORDE_INC} + @${INSTALL_DATA} ${WRKDIR}/httpd-imp.conf ${HORDE_INC} @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${IMPDIR} @${CHMOD} -R o-rwx ${CONFDIR} .if !defined(NOPORTDOCS) diff --git a/mail/horde4-imp/distinfo b/mail/horde4-imp/distinfo index 06a2bb31b08b..22d57099697c 100644 --- a/mail/horde4-imp/distinfo +++ b/mail/horde4-imp/distinfo @@ -1,2 +1,3 @@ MD5 (imp-h3-4.0.4.tar.gz) = 437767b420c6280e680a42c8e34182d1 +SHA256 (imp-h3-4.0.4.tar.gz) = aa814f8f2bee0912a50df6220c77a60b43d83a52b0bc49dffbd30b63845c08d1 SIZE (imp-h3-4.0.4.tar.gz) = 3349908 diff --git a/mail/horde4-imp/pkg-deinstall b/mail/horde4-imp/files/pkg-deinstall.in index cd0aa1e6c6c5..13bb805c47d5 100644 --- a/mail/horde4-imp/pkg-deinstall +++ b/mail/horde4-imp/files/pkg-deinstall.in @@ -9,7 +9,7 @@ if [ x$2 != xDEINSTALL ]; then fi if [ -z "${PACKAGE_BUILDING}" ]; then - for cf in `ls ${PKG_PREFIX}/www/horde/imp/config/*php ${PKG_PREFIX}/www/horde/imp/config/*txt`; do + for cf in `ls %%IMPDIR%%/config/*php %%IMPDIR%%/config/*txt`; do diff -bBqw $cf $cf.dist >/dev/null 2>&1 case $? in 0) # original config file, will be deleted by pkg-plist diff --git a/mail/horde4-imp/pkg-plist b/mail/horde4-imp/pkg-plist index cc4300f87ce6..4aed11a161f8 100644 --- a/mail/horde4-imp/pkg-plist +++ b/mail/horde4-imp/pkg-plist @@ -361,7 +361,7 @@ %%IMPDIR%%/thread.php %%IMPDIR%%/view.php %%PORTDOCS%%@dirrm %%DOCSDIR%% -etc/horde/httpd.conf.imp +%%HORDE_INC%%/httpd-imp.conf @dirrm %%IMPDIR%%/themes/sun @dirrm %%IMPDIR%%/themes/simplex @dirrm %%IMPDIR%%/themes/postnuke diff --git a/mail/horde4-ingo/Makefile b/mail/horde4-ingo/Makefile index df75e4b751e7..da02cc019ff6 100644 --- a/mail/horde4-ingo/Makefile +++ b/mail/horde4-ingo/Makefile @@ -33,10 +33,13 @@ RUN_DEPENDS+= ${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde NO_BUILD= yes USE_PHP= imap -USE_REINPLACE= yes +USE_APACHE= 1.3+ # needed to test APACHE_VERSION -PLIST_SUB= INGODIR=${LINGODIR} +PLIST_SUB= INGODIR=${LINGODIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||} PKGMESSAGE= ${WRKDIR}/pkg-message +PKGDEINSTALL= ${WRKDIR}/pkg-deinstall +SUB_FILES= pkg-message pkg-deinstall +SUB_LIST= INGODIR=${INGODIR} DOCS= LICENSE README docs/CHANGES docs/CREDITS docs/INSTALL \ docs/RELEASE_NOTES docs/TODO @@ -50,17 +53,21 @@ PEARDIR?= ${LOCALBASE}/share/pear INGODIR= ${PREFIX}/${LINGODIR} CONFDIR= ${INGODIR}/config -HORDE_INC= ${LOCALBASE}/etc/horde - .include <bsd.port.pre.mk> .if defined(WITH_SIEVE) || exists(${LOCALBASE}/cyrus/bin/timsieved) 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 + pre-configure: @${SED} -e "s:/home/httpd/html/horde/ingo:${INGODIR}:g" \ - ${FILESDIR}/httpd.conf.ingo >${WRKDIR}/httpd.conf.ingo + ${FILESDIR}/httpd.conf.ingo >${WRKDIR}/httpd-ingo.conf do-install: @${MKDIR} ${INGODIR} @@ -75,7 +82,7 @@ do-install: .endfor @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${INGODIR} @${CHMOD} -R o-rwx ${CONFDIR} - @${INSTALL_DATA} ${WRKDIR}/httpd.conf.ingo ${HORDE_INC} + @${INSTALL_DATA} ${WRKDIR}/httpd-ingo.conf ${HORDE_INC} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for FILE in ${DOCS} @@ -85,8 +92,6 @@ do-install: .endif post-install: - @${SED} -e "s:%%INGODIR%%:${INGODIR}:g;s:%%DOCSDIR%%:${DOCSDIR}:g" \ - < ${FILESDIR}/pkg-message.in > ${PKGMESSAGE} @${ECHO_MSG} @${CAT} ${PKGMESSAGE} @${ECHO_MSG} diff --git a/mail/horde4-ingo/distinfo b/mail/horde4-ingo/distinfo index 00afb90f937c..1957b3b5ced9 100644 --- a/mail/horde4-ingo/distinfo +++ b/mail/horde4-ingo/distinfo @@ -1,2 +1,3 @@ MD5 (ingo-h3-1.0.2.tar.gz) = 6bc7addfdd3bc18e4d6af5c1d57b7b89 +SHA256 (ingo-h3-1.0.2.tar.gz) = 6bd8d05f986c5b3d58065f7409b9df0912ace8968ed427798497bfd376bb1d29 SIZE (ingo-h3-1.0.2.tar.gz) = 853202 diff --git a/mail/horde-ingo/pkg-deinstall b/mail/horde4-ingo/files/pkg-deinstall.in index a3a597d448a6..2289e8963491 100644 --- a/mail/horde-ingo/pkg-deinstall +++ b/mail/horde4-ingo/files/pkg-deinstall.in @@ -9,7 +9,7 @@ if [ x$2 != xDEINSTALL ]; then fi if [ -z "${PACKAGE_BUILDING}" ]; then - for cf in `ls ${PKG_PREFIX}/www/horde/ingo/config/*php`; do + for cf in `ls %%INGODIR%%/config/*php`; do diff -bBqw $cf $cf.dist >/dev/null 2>&1 case $? in 0) # original config file, will be deleted by pkg-plist diff --git a/mail/horde4-ingo/pkg-plist b/mail/horde4-ingo/pkg-plist index b288edddd002..697fac19d784 100644 --- a/mail/horde4-ingo/pkg-plist +++ b/mail/horde4-ingo/pkg-plist @@ -1,4 +1,4 @@ -etc/horde/httpd.conf.ingo +%%HORDE_INC%%/httpd-ingo.conf %%PORTDOCS%%%%DOCSDIR%%/CHANGES %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/CREDITS diff --git a/mail/horde4-turba/Makefile b/mail/horde4-turba/Makefile index 0b2ca270102e..81bfb5cbe144 100644 --- a/mail/horde4-turba/Makefile +++ b/mail/horde4-turba/Makefile @@ -38,6 +38,7 @@ USE_PHP= ldap .endif NO_BUILD= yes +USE_APACHE= 1.3+ # needed to test APACHE_VERSION USE_REINPLACE= yes REINPLACE_ARGS= -i "" @@ -49,15 +50,16 @@ SUB_DIRS= config lib locale po scripts templates themes LHORDEDIR?= www/horde LTURBADIR?= ${LHORDEDIR}/turba -PLIST_SUB= TURBADIR=${LTURBADIR} +PLIST_SUB= TURBADIR=${LTURBADIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||} PKGMESSAGE= ${WRKDIR}/pkg-message -SUB_FILES= pkg-message +PKGDEINSTALL= ${WRKDIR}/pkg-deinstall +SUB_FILES= pkg-message pkg-deinstall SUB_LIST= TURBADIR=${TURBADIR} CONFDIR=${CONFDIR} TURBADIR= ${PREFIX}/${LTURBADIR} CONFDIR= ${TURBADIR}/config -HORDE_INC= ${LOCALBASE}/etc/horde +.include <bsd.port.pre.mk> .if exists(${LOCALBASE}/sbin/imspd) WITH_IMSP= yes @@ -66,10 +68,16 @@ WITH_IMSP= yes 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 + 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.conf.turba + ${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) @@ -89,7 +97,7 @@ do-install: .endfor @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${TURBADIR} @${CHMOD} -R o-rwx ${CONFDIR} - @${INSTALL_DATA} ${WRKDIR}/httpd.conf.turba ${HORDE_INC} + @${INSTALL_DATA} ${WRKDIR}/httpd-turba.conf ${HORDE_INC} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for FILE in ${DOCS} @@ -103,4 +111,4 @@ post-install: @${CAT} ${PKGMESSAGE} @${ECHO_MSG} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/mail/horde-turba/pkg-deinstall b/mail/horde4-turba/files/pkg-deinstall.in index b0a141eef091..afe8f9215da2 100644 --- a/mail/horde-turba/pkg-deinstall +++ b/mail/horde4-turba/files/pkg-deinstall.in @@ -9,7 +9,7 @@ if [ x$2 != xDEINSTALL ]; then fi if [ -z "${PACKAGE_BUILDING}" ]; then - for cf in `ls ${PKG_PREFIX}/www/horde/turba/config/*php`; do + for cf in `ls %%TURBADIR%%/config/*php`; do diff -bBqw $cf $cf.dist >/dev/null 2>&1 case $? in 0) # original config file, will be deleted by pkg-plist diff --git a/mail/horde4-turba/pkg-plist b/mail/horde4-turba/pkg-plist index 48455454ad34..fdb89c479187 100644 --- a/mail/horde4-turba/pkg-plist +++ b/mail/horde4-turba/pkg-plist @@ -167,7 +167,7 @@ %%TURBADIR%%/themes/graphics/turba.png %%TURBADIR%%/themes/screen.css %%TURBADIR%%/vcard.php -etc/horde/httpd.conf.turba +%%HORDE_INC%%/httpd-turba.conf %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%TURBADIR%%/lib/Block @dirrm %%TURBADIR%%/lib/Driver diff --git a/mail/imp/Makefile b/mail/imp/Makefile index 3e5ccc623cf5..54440c11568a 100644 --- a/mail/imp/Makefile +++ b/mail/imp/Makefile @@ -104,6 +104,7 @@ RUN_DEPENDS+= ${PEARDIR}/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request .endif NO_BUILD= yes +USE_APACHE= 1.3+ # needed to test APACHE_VERSION USE_REINPLACE= yes REINPLACE_ARGS= -i.beforeIMP @@ -117,17 +118,15 @@ LHORDEDIR?= www/horde LIMPDIR= ${LHORDEDIR}/imp PEARDIR?= ${LOCALBASE}/share/pear -PLIST_SUB= IMPDIR=${LIMPDIR} -SUB_LIST= IMPDIR=${IMPDIR} PORTSDIR=${PORTSDIR} CONFDIR=${CONFDIR} - +PLIST_SUB= IMPDIR=${LIMPDIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||} PKGMESSAGE= ${WRKDIR}/pkg-message -SUB_FILES= pkg-message +PKGDEINSTALL= ${WRKDIR}/pkg-deinstall +SUB_FILES= pkg-message pkg-deinstall +SUB_LIST= IMPDIR=${IMPDIR} PORTSDIR=${PORTSDIR} CONFDIR=${CONFDIR} IMPDIR= ${PREFIX}/${LIMPDIR} CONFDIR= ${IMPDIR}/config -HORDE_INC= ${LOCALBASE}/etc/horde - HOSTNAME?= `/bin/hostname` SERVOS?= ${OPSYS}-${OSREL} @@ -158,6 +157,12 @@ RUN_DEPENDS+= ${LOCALBASE}/libexec/imapd:${PORTSDIR}/mail/imap-uw . endif .endif +.if ${APACHE_VERSION} >= 20 +HORDE_INC= ${LOCALBASE}/etc/apache${APACHE_VERSION:S/20/2/}/Includes +.else +HORDE_INC= ${LOCALBASE}/etc/horde +.endif + pre-everything:: .if !defined(WITHOUT_IMAPSERVER) @${ECHO_MSG} "" @@ -200,7 +205,7 @@ pre-configure: . endif .endif @${SED} -e "s:/home/httpd/html/horde/imp:${IMPDIR}:" \ - ${FILESDIR}/httpd.conf.imp > ${WRKDIR}/httpd.conf.imp + ${FILESDIR}/httpd.conf.imp > ${WRKDIR}/httpd-imp.conf .for fc in ${PATCH2RM} @${RM} ${WRKSRC}/config/${fc} .endfor @@ -228,7 +233,7 @@ do-install: fi .endfor @${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR} - @${INSTALL_DATA} ${WRKDIR}/httpd.conf.imp ${HORDE_INC} + @${INSTALL_DATA} ${WRKDIR}/httpd-imp.conf ${HORDE_INC} @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${IMPDIR} @${CHMOD} -R o-rwx ${CONFDIR} .if !defined(NOPORTDOCS) diff --git a/mail/imp/distinfo b/mail/imp/distinfo index 06a2bb31b08b..22d57099697c 100644 --- a/mail/imp/distinfo +++ b/mail/imp/distinfo @@ -1,2 +1,3 @@ MD5 (imp-h3-4.0.4.tar.gz) = 437767b420c6280e680a42c8e34182d1 +SHA256 (imp-h3-4.0.4.tar.gz) = aa814f8f2bee0912a50df6220c77a60b43d83a52b0bc49dffbd30b63845c08d1 SIZE (imp-h3-4.0.4.tar.gz) = 3349908 diff --git a/mail/imp/pkg-deinstall b/mail/imp/files/pkg-deinstall.in index cd0aa1e6c6c5..13bb805c47d5 100644 --- a/mail/imp/pkg-deinstall +++ b/mail/imp/files/pkg-deinstall.in @@ -9,7 +9,7 @@ if [ x$2 != xDEINSTALL ]; then fi if [ -z "${PACKAGE_BUILDING}" ]; then - for cf in `ls ${PKG_PREFIX}/www/horde/imp/config/*php ${PKG_PREFIX}/www/horde/imp/config/*txt`; do + for cf in `ls %%IMPDIR%%/config/*php %%IMPDIR%%/config/*txt`; do diff -bBqw $cf $cf.dist >/dev/null 2>&1 case $? in 0) # original config file, will be deleted by pkg-plist diff --git a/mail/imp/pkg-plist b/mail/imp/pkg-plist index cc4300f87ce6..4aed11a161f8 100644 --- a/mail/imp/pkg-plist +++ b/mail/imp/pkg-plist @@ -361,7 +361,7 @@ %%IMPDIR%%/thread.php %%IMPDIR%%/view.php %%PORTDOCS%%@dirrm %%DOCSDIR%% -etc/horde/httpd.conf.imp +%%HORDE_INC%%/httpd-imp.conf @dirrm %%IMPDIR%%/themes/sun @dirrm %%IMPDIR%%/themes/simplex @dirrm %%IMPDIR%%/themes/postnuke diff --git a/mail/ingo/Makefile b/mail/ingo/Makefile index df75e4b751e7..da02cc019ff6 100644 --- a/mail/ingo/Makefile +++ b/mail/ingo/Makefile @@ -33,10 +33,13 @@ RUN_DEPENDS+= ${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde NO_BUILD= yes USE_PHP= imap -USE_REINPLACE= yes +USE_APACHE= 1.3+ # needed to test APACHE_VERSION -PLIST_SUB= INGODIR=${LINGODIR} +PLIST_SUB= INGODIR=${LINGODIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||} PKGMESSAGE= ${WRKDIR}/pkg-message +PKGDEINSTALL= ${WRKDIR}/pkg-deinstall +SUB_FILES= pkg-message pkg-deinstall +SUB_LIST= INGODIR=${INGODIR} DOCS= LICENSE README docs/CHANGES docs/CREDITS docs/INSTALL \ docs/RELEASE_NOTES docs/TODO @@ -50,17 +53,21 @@ PEARDIR?= ${LOCALBASE}/share/pear INGODIR= ${PREFIX}/${LINGODIR} CONFDIR= ${INGODIR}/config -HORDE_INC= ${LOCALBASE}/etc/horde - .include <bsd.port.pre.mk> .if defined(WITH_SIEVE) || exists(${LOCALBASE}/cyrus/bin/timsieved) 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 + pre-configure: @${SED} -e "s:/home/httpd/html/horde/ingo:${INGODIR}:g" \ - ${FILESDIR}/httpd.conf.ingo >${WRKDIR}/httpd.conf.ingo + ${FILESDIR}/httpd.conf.ingo >${WRKDIR}/httpd-ingo.conf do-install: @${MKDIR} ${INGODIR} @@ -75,7 +82,7 @@ do-install: .endfor @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${INGODIR} @${CHMOD} -R o-rwx ${CONFDIR} - @${INSTALL_DATA} ${WRKDIR}/httpd.conf.ingo ${HORDE_INC} + @${INSTALL_DATA} ${WRKDIR}/httpd-ingo.conf ${HORDE_INC} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for FILE in ${DOCS} @@ -85,8 +92,6 @@ do-install: .endif post-install: - @${SED} -e "s:%%INGODIR%%:${INGODIR}:g;s:%%DOCSDIR%%:${DOCSDIR}:g" \ - < ${FILESDIR}/pkg-message.in > ${PKGMESSAGE} @${ECHO_MSG} @${CAT} ${PKGMESSAGE} @${ECHO_MSG} diff --git a/mail/ingo/distinfo b/mail/ingo/distinfo index 00afb90f937c..1957b3b5ced9 100644 --- a/mail/ingo/distinfo +++ b/mail/ingo/distinfo @@ -1,2 +1,3 @@ MD5 (ingo-h3-1.0.2.tar.gz) = 6bc7addfdd3bc18e4d6af5c1d57b7b89 +SHA256 (ingo-h3-1.0.2.tar.gz) = 6bd8d05f986c5b3d58065f7409b9df0912ace8968ed427798497bfd376bb1d29 SIZE (ingo-h3-1.0.2.tar.gz) = 853202 diff --git a/mail/ingo/pkg-deinstall b/mail/ingo/files/pkg-deinstall.in index a3a597d448a6..2289e8963491 100644 --- a/mail/ingo/pkg-deinstall +++ b/mail/ingo/files/pkg-deinstall.in @@ -9,7 +9,7 @@ if [ x$2 != xDEINSTALL ]; then fi if [ -z "${PACKAGE_BUILDING}" ]; then - for cf in `ls ${PKG_PREFIX}/www/horde/ingo/config/*php`; do + for cf in `ls %%INGODIR%%/config/*php`; do diff -bBqw $cf $cf.dist >/dev/null 2>&1 case $? in 0) # original config file, will be deleted by pkg-plist diff --git a/mail/ingo/pkg-plist b/mail/ingo/pkg-plist index b288edddd002..697fac19d784 100644 --- a/mail/ingo/pkg-plist +++ b/mail/ingo/pkg-plist @@ -1,4 +1,4 @@ -etc/horde/httpd.conf.ingo +%%HORDE_INC%%/httpd-ingo.conf %%PORTDOCS%%%%DOCSDIR%%/CHANGES %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/CREDITS diff --git a/mail/turba/Makefile b/mail/turba/Makefile index 0b2ca270102e..81bfb5cbe144 100644 --- a/mail/turba/Makefile +++ b/mail/turba/Makefile @@ -38,6 +38,7 @@ USE_PHP= ldap .endif NO_BUILD= yes +USE_APACHE= 1.3+ # needed to test APACHE_VERSION USE_REINPLACE= yes REINPLACE_ARGS= -i "" @@ -49,15 +50,16 @@ SUB_DIRS= config lib locale po scripts templates themes LHORDEDIR?= www/horde LTURBADIR?= ${LHORDEDIR}/turba -PLIST_SUB= TURBADIR=${LTURBADIR} +PLIST_SUB= TURBADIR=${LTURBADIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||} PKGMESSAGE= ${WRKDIR}/pkg-message -SUB_FILES= pkg-message +PKGDEINSTALL= ${WRKDIR}/pkg-deinstall +SUB_FILES= pkg-message pkg-deinstall SUB_LIST= TURBADIR=${TURBADIR} CONFDIR=${CONFDIR} TURBADIR= ${PREFIX}/${LTURBADIR} CONFDIR= ${TURBADIR}/config -HORDE_INC= ${LOCALBASE}/etc/horde +.include <bsd.port.pre.mk> .if exists(${LOCALBASE}/sbin/imspd) WITH_IMSP= yes @@ -66,10 +68,16 @@ WITH_IMSP= yes 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 + 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.conf.turba + ${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) @@ -89,7 +97,7 @@ do-install: .endfor @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${TURBADIR} @${CHMOD} -R o-rwx ${CONFDIR} - @${INSTALL_DATA} ${WRKDIR}/httpd.conf.turba ${HORDE_INC} + @${INSTALL_DATA} ${WRKDIR}/httpd-turba.conf ${HORDE_INC} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for FILE in ${DOCS} @@ -103,4 +111,4 @@ post-install: @${CAT} ${PKGMESSAGE} @${ECHO_MSG} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/mail/turba/pkg-deinstall b/mail/turba/files/pkg-deinstall.in index b0a141eef091..afe8f9215da2 100644 --- a/mail/turba/pkg-deinstall +++ b/mail/turba/files/pkg-deinstall.in @@ -9,7 +9,7 @@ if [ x$2 != xDEINSTALL ]; then fi if [ -z "${PACKAGE_BUILDING}" ]; then - for cf in `ls ${PKG_PREFIX}/www/horde/turba/config/*php`; do + for cf in `ls %%TURBADIR%%/config/*php`; do diff -bBqw $cf $cf.dist >/dev/null 2>&1 case $? in 0) # original config file, will be deleted by pkg-plist diff --git a/mail/turba/pkg-plist b/mail/turba/pkg-plist index 48455454ad34..fdb89c479187 100644 --- a/mail/turba/pkg-plist +++ b/mail/turba/pkg-plist @@ -167,7 +167,7 @@ %%TURBADIR%%/themes/graphics/turba.png %%TURBADIR%%/themes/screen.css %%TURBADIR%%/vcard.php -etc/horde/httpd.conf.turba +%%HORDE_INC%%/httpd-turba.conf %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%TURBADIR%%/lib/Block @dirrm %%TURBADIR%%/lib/Driver diff --git a/www/horde-base/Makefile b/www/horde-base/Makefile index ca13575a1c1f..8752ff7bb456 100644 --- a/www/horde-base/Makefile +++ b/www/horde-base/Makefile @@ -27,8 +27,6 @@ COMMENT= A common code-base used by Horde applications, written in PHP #---------------------------------------------------------------------------- # You may define these options: # -# - WITH_APACHE2: if you run Apache2. -# # - WITH_PHP5: if you run PHP5 (you could use www/horde-php5). # # - WITHOUT_SUPPORTED_DB: if you run a database not in the ports tree. @@ -45,7 +43,7 @@ COMMENT= A common code-base used by Horde applications, written in PHP # # - WITHOUT_FTP: if you do not need the VFS FTP driver. # -# - WITHOUT_MCAL: if you don't plan to install Kronolith. +# - WITH_MCAL: if you plan to install Kronolith with mcal (deprecated). # # - WITH_IMSP: use IMSP as a preferences backend. # @@ -94,6 +92,7 @@ RUN_DEPENDS+= ${PEARDIR}/Date.php:${PORTSDIR}/devel/pear-Date \ CONFLICTS= horde-2.* NO_BUILD= yes +USE_APACHE= 1.3+ USE_PHP= ctype gettext session USE_REINPLACE= yes SUB_FILES= pkg-message pkg-deinstall pkg-install @@ -221,9 +220,10 @@ SUB_DIRS= admin config js lib locale po scripts services templates themes util LHORDEDIR?= www/horde LHORDESBIN?= sbin -PLIST_SUB= HORDEDIR=${LHORDEDIR} HORDESBIN=${LHORDESBIN} -SUB_LIST+= HORDEDIR=${HORDEDIR} APACHE_CONF=${APACHE_CONF} HORDESBIN=${HORDESBIN} \ - HORDEADMUSR=${HORDEADMUSR} HORDEGRP=${WWWGRP} +PLIST_SUB= HORDEDIR=${LHORDEDIR} HORDESBIN=${LHORDESBIN} \ + HORDE_INC=${LHORDE_INC} +SUB_LIST+= HORDEDIR=${HORDEDIR} APACHE_CONF=${APACHE_CONF} \ + HORDESBIN=${HORDESBIN} HORDEADMUSR=${HORDEADMUSR} HORDEGRP=${WWWGRP} HORDEDIR= ${PREFIX}/${LHORDEDIR} HORDESBIN= ${PREFIX}/${LHORDESBIN} @@ -231,19 +231,13 @@ CONFDIR= ${HORDEDIR}/config APACHE_CONF= ${APACHE_CNFDIR}/httpd.conf PEARDIR?= ${LOCALBASE}/share/pear -.if defined(WITH_APACHE2) -APACHE_CNFDIR= ${LOCALBASE}/etc/apache2 -.else -APACHE_CNFDIR= ${LOCALBASE}/etc/apache -.endif -HORDE_INC= ${PREFIX}/etc/horde LOG_FILE?= /var/log/horde.log .if defined(WITH_PHP5) USE_PHP+= dom .else USE_PHP+= domxml -. if !defined(WITHOUT_MCAL) +. if defined(WITH_MCAL) USE_PHP+= mcal . endif .endif @@ -253,16 +247,28 @@ PATCHES2RM= po/translation.php config/conf.xml scripts/sql/README \ SEDIN2RM= lib/Horde/Auth/mcal.php config/conf.xml docs/INSTALL \ config/mime_drivers.php.dist -.include <bsd.port.pre.mk> # Required to test PHP_VER +.include <bsd.port.pre.mk> + +.if ${APACHE_VERSION} >= 20 +APACHE_CNFDIR= ${LOCALBASE}/etc/apache${APACHE_VERSION:S/20/2/} +HORDE_INC= ${APACHE_CNFDIR}/Includes +LHORDE_INC= ${HORDE_INC:S|^${LOCALBASE}/||} +PLIST_SUB+= RMDIRINC="@comment " +.else +APACHE_CNFDIR= ${LOCALBASE}/etc/apache +HORDE_INC= ${PREFIX}/etc/horde +LHORDE_INC= ${HORDE_INC:S|^${PREFIX}/||} +PLIST_SUB+= RMDIRINC="" +.endif pre-configure: @${RM} ${PATCHES2RM:S|^|${WRKSRC}/|:S|$|.orig|} @${SED} -e "s:/home/httpd/html/horde:${HORDEDIR}:" \ -e "s:php_value auto_prepend_file:# php_value auto_prepend_file:" \ -e "s:/home/httpd/phplib:${PEARDIR}:" \ - ${FILESDIR}/httpd.conf.horde > ${WRKDIR}/httpd.conf.horde + ${FILESDIR}/httpd.conf.horde > ${WRKDIR}/httpd-horde.conf .if ${PHP_VER} == 5 - @${REINPLACE_CMD} -e "s:mod_php4.c:mod_php5.c:" ${WRKDIR}/httpd.conf.horde + @${REINPLACE_CMD} -e "s:mod_php4.c:mod_php5.c:" ${WRKDIR}/httpd-horde.conf .endif @${REINPLACE_CMD} -e "s:%%LOCALBASE%%:${LOCALBASE}:" ${WRKSRC}/config/mime_drivers.php.dist .if !defined(WITHOUT_X11) @@ -336,13 +342,20 @@ do-install: .endfor @${CP} ${WRKSRC}/scripts/set_perms.sh ${HORDESBIN}/horde_set_perms.sh @${CHMOD} u+x ${HORDESBIN}/horde_set_perms.sh +.if ${APACHE_VERSION} >= 20 + ${INSTALL_DATA} ${WRKDIR}/httpd-horde.conf ${HORDE_INC} +.else @${MKDIR} ${HORDE_INC} - @${INSTALL_DATA} ${WRKDIR}/httpd.conf.horde ${HORDE_INC} + @${INSTALL_DATA} ${WRKDIR}/httpd-horde.conf ${HORDE_INC} +. if !defined(PACKAGE_BUILDING) @(if [ -f ${APACHE_CONF} ] ; then \ ${ECHO_MSG} "===> Updating ${APACHE_CONF}..." ; \ + ${CP} -p ${APACHE_CONF} ${APACHE_CONF}.beforeHorde ; \ ${ECHO_CMD} "# Horde's include directory" >> ${APACHE_CONF} ; \ ${ECHO_CMD} "Include ${HORDE_INC}" >> ${APACHE_CONF} ; \ fi) +. endif +.endif @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${HORDEDIR} @${CHMOD} -R o-rwx ${CONFDIR} @${TOUCH} ${LOG_FILE} diff --git a/www/horde-base/pkg-plist b/www/horde-base/pkg-plist index d765679270d4..ee9c61e2095a 100644 --- a/www/horde-base/pkg-plist +++ b/www/horde-base/pkg-plist @@ -1,4 +1,4 @@ -etc/horde/httpd.conf.horde +%%HORDE_INC%%/httpd-horde.conf %%HORDESBIN%%/horde_set_perms.sh %%PORTDOCS%%%%DOCSDIR%%/CHANGES %%PORTDOCS%%%%DOCSDIR%%/CODING_STANDARDS @@ -1590,4 +1590,4 @@ etc/horde/httpd.conf.horde @dirrm %%HORDEDIR%%/admin @unexec rmdir %D/%%HORDEDIR%% 2>/dev/null || true %%PORTDOCS%%@dirrm %%DOCSDIR%% -@unexec rmdir %D/etc/horde 2>/dev/null || true +%%RMDIRINC%%@unexec rmdir %D/%%HORDE_INC%% 2>/dev/null || true diff --git a/www/horde-passwd/Makefile b/www/horde-passwd/Makefile index 874f9c154bc7..610720ca8fef 100644 --- a/www/horde-passwd/Makefile +++ b/www/horde-passwd/Makefile @@ -26,10 +26,13 @@ COMMENT= A password changing module for Horde RUN_DEPENDS= ${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde NO_BUILD= yes +USE_APACHE= 1.3+ # needed to test APACHE_VERSION -PLIST_SUB= LPWDDIR=${LPWDDIR} PWDDIR=${PWDDIR} +PLIST_SUB= LPWDDIR=${LPWDDIR} PWDDIR=${PWDDIR} \ + HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||} PKGMESSAGE= ${WRKDIR}/pkg-message -SUB_FILES= pkg-message +PKGDEINSTALL= ${WRKDIR}/pkg-deinstall +SUB_FILES= pkg-message pkg-deinstall SUB_LIST= PWDDIR=${PWDDIR} CONFDIR=${CONFDIR} HORDEDIR=${HORDEDIR} DOCS= LICENSE README docs/CHANGES docs/CREDITS docs/INSTALL \ @@ -44,11 +47,17 @@ HORDEDIR= ${PREFIX}/${LHORDEDIR} PWDDIR= ${PREFIX}/${LPWDDIR} CONFDIR= ${PWDDIR}/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 pre-configure: @${SED} -e "s:/home/httpd/html/horde/passwd:${PWDDIR}:g" \ - ${FILESDIR}/httpd.conf.pwd > ${WRKDIR}/httpd.conf.pwd + ${FILESDIR}/httpd.conf.pwd > ${WRKDIR}/httpd-pwd.conf do-install: @${MKDIR} ${PWDDIR} @@ -63,7 +72,7 @@ do-install: .endfor @${CHOWN} -R www:www ${PWDDIR} @${CHMOD} -R o-rwx ${CONFDIR} - @${CP} -p ${FILESDIR}/httpd.conf.pwd ${HORDE_INC}/httpd.conf.pwd + @${INSTALL_DATA} ${WRKDIR}/httpd-pwd.conf ${HORDE_INC} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for FILE in ${DOCS} @@ -77,4 +86,4 @@ post-install: @${CAT} ${PKGMESSAGE} @${ECHO_MSG} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/www/horde-passwd/files/pkg-deinstall.in b/www/horde-passwd/files/pkg-deinstall.in new file mode 100644 index 000000000000..7f79726e85c1 --- /dev/null +++ b/www/horde-passwd/files/pkg-deinstall.in @@ -0,0 +1,27 @@ +#!/bin/sh +# +# $FreeBSD$ +# +# Backup horde-passwd config files, if needed. + +if [ x$2 != xDEINSTALL ]; then + exit +fi + +if [ -z "${PACKAGE_BUILDING}" ]; then + for cf in `ls %%PWDDIR%%/config/*php`; do + diff -bBqw $cf $cf.dist >/dev/null 2>&1 + case $? in + 0) # original config file, will be deleted by pkg-plist + ;; + 1) # config file has been updated, must be backuped + cp -p $cf $cf.previous + echo "===> Backing-up..." + echo "---> $cf has been saved ***" + echo "---> as $cf.previous ***" + ;; + *) # not found? + ;; + esac + done +fi diff --git a/www/horde-passwd/pkg-plist b/www/horde-passwd/pkg-plist index cfc3e65733b2..f774ee530482 100644 --- a/www/horde-passwd/pkg-plist +++ b/www/horde-passwd/pkg-plist @@ -102,7 +102,7 @@ %%LPWDDIR%%/test.php %%LPWDDIR%%/themes/graphics/favicon.ico %%LPWDDIR%%/themes/graphics/passwd.png -etc/horde/httpd.conf.pwd +%%HORDE_INC%%/httpd-pwd.conf %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%LPWDDIR%%/themes/graphics @dirrm %%LPWDDIR%%/themes diff --git a/www/horde/Makefile b/www/horde/Makefile index ca13575a1c1f..8752ff7bb456 100644 --- a/www/horde/Makefile +++ b/www/horde/Makefile @@ -27,8 +27,6 @@ COMMENT= A common code-base used by Horde applications, written in PHP #---------------------------------------------------------------------------- # You may define these options: # -# - WITH_APACHE2: if you run Apache2. -# # - WITH_PHP5: if you run PHP5 (you could use www/horde-php5). # # - WITHOUT_SUPPORTED_DB: if you run a database not in the ports tree. @@ -45,7 +43,7 @@ COMMENT= A common code-base used by Horde applications, written in PHP # # - WITHOUT_FTP: if you do not need the VFS FTP driver. # -# - WITHOUT_MCAL: if you don't plan to install Kronolith. +# - WITH_MCAL: if you plan to install Kronolith with mcal (deprecated). # # - WITH_IMSP: use IMSP as a preferences backend. # @@ -94,6 +92,7 @@ RUN_DEPENDS+= ${PEARDIR}/Date.php:${PORTSDIR}/devel/pear-Date \ CONFLICTS= horde-2.* NO_BUILD= yes +USE_APACHE= 1.3+ USE_PHP= ctype gettext session USE_REINPLACE= yes SUB_FILES= pkg-message pkg-deinstall pkg-install @@ -221,9 +220,10 @@ SUB_DIRS= admin config js lib locale po scripts services templates themes util LHORDEDIR?= www/horde LHORDESBIN?= sbin -PLIST_SUB= HORDEDIR=${LHORDEDIR} HORDESBIN=${LHORDESBIN} -SUB_LIST+= HORDEDIR=${HORDEDIR} APACHE_CONF=${APACHE_CONF} HORDESBIN=${HORDESBIN} \ - HORDEADMUSR=${HORDEADMUSR} HORDEGRP=${WWWGRP} +PLIST_SUB= HORDEDIR=${LHORDEDIR} HORDESBIN=${LHORDESBIN} \ + HORDE_INC=${LHORDE_INC} +SUB_LIST+= HORDEDIR=${HORDEDIR} APACHE_CONF=${APACHE_CONF} \ + HORDESBIN=${HORDESBIN} HORDEADMUSR=${HORDEADMUSR} HORDEGRP=${WWWGRP} HORDEDIR= ${PREFIX}/${LHORDEDIR} HORDESBIN= ${PREFIX}/${LHORDESBIN} @@ -231,19 +231,13 @@ CONFDIR= ${HORDEDIR}/config APACHE_CONF= ${APACHE_CNFDIR}/httpd.conf PEARDIR?= ${LOCALBASE}/share/pear -.if defined(WITH_APACHE2) -APACHE_CNFDIR= ${LOCALBASE}/etc/apache2 -.else -APACHE_CNFDIR= ${LOCALBASE}/etc/apache -.endif -HORDE_INC= ${PREFIX}/etc/horde LOG_FILE?= /var/log/horde.log .if defined(WITH_PHP5) USE_PHP+= dom .else USE_PHP+= domxml -. if !defined(WITHOUT_MCAL) +. if defined(WITH_MCAL) USE_PHP+= mcal . endif .endif @@ -253,16 +247,28 @@ PATCHES2RM= po/translation.php config/conf.xml scripts/sql/README \ SEDIN2RM= lib/Horde/Auth/mcal.php config/conf.xml docs/INSTALL \ config/mime_drivers.php.dist -.include <bsd.port.pre.mk> # Required to test PHP_VER +.include <bsd.port.pre.mk> + +.if ${APACHE_VERSION} >= 20 +APACHE_CNFDIR= ${LOCALBASE}/etc/apache${APACHE_VERSION:S/20/2/} +HORDE_INC= ${APACHE_CNFDIR}/Includes +LHORDE_INC= ${HORDE_INC:S|^${LOCALBASE}/||} +PLIST_SUB+= RMDIRINC="@comment " +.else +APACHE_CNFDIR= ${LOCALBASE}/etc/apache +HORDE_INC= ${PREFIX}/etc/horde +LHORDE_INC= ${HORDE_INC:S|^${PREFIX}/||} +PLIST_SUB+= RMDIRINC="" +.endif pre-configure: @${RM} ${PATCHES2RM:S|^|${WRKSRC}/|:S|$|.orig|} @${SED} -e "s:/home/httpd/html/horde:${HORDEDIR}:" \ -e "s:php_value auto_prepend_file:# php_value auto_prepend_file:" \ -e "s:/home/httpd/phplib:${PEARDIR}:" \ - ${FILESDIR}/httpd.conf.horde > ${WRKDIR}/httpd.conf.horde + ${FILESDIR}/httpd.conf.horde > ${WRKDIR}/httpd-horde.conf .if ${PHP_VER} == 5 - @${REINPLACE_CMD} -e "s:mod_php4.c:mod_php5.c:" ${WRKDIR}/httpd.conf.horde + @${REINPLACE_CMD} -e "s:mod_php4.c:mod_php5.c:" ${WRKDIR}/httpd-horde.conf .endif @${REINPLACE_CMD} -e "s:%%LOCALBASE%%:${LOCALBASE}:" ${WRKSRC}/config/mime_drivers.php.dist .if !defined(WITHOUT_X11) @@ -336,13 +342,20 @@ do-install: .endfor @${CP} ${WRKSRC}/scripts/set_perms.sh ${HORDESBIN}/horde_set_perms.sh @${CHMOD} u+x ${HORDESBIN}/horde_set_perms.sh +.if ${APACHE_VERSION} >= 20 + ${INSTALL_DATA} ${WRKDIR}/httpd-horde.conf ${HORDE_INC} +.else @${MKDIR} ${HORDE_INC} - @${INSTALL_DATA} ${WRKDIR}/httpd.conf.horde ${HORDE_INC} + @${INSTALL_DATA} ${WRKDIR}/httpd-horde.conf ${HORDE_INC} +. if !defined(PACKAGE_BUILDING) @(if [ -f ${APACHE_CONF} ] ; then \ ${ECHO_MSG} "===> Updating ${APACHE_CONF}..." ; \ + ${CP} -p ${APACHE_CONF} ${APACHE_CONF}.beforeHorde ; \ ${ECHO_CMD} "# Horde's include directory" >> ${APACHE_CONF} ; \ ${ECHO_CMD} "Include ${HORDE_INC}" >> ${APACHE_CONF} ; \ fi) +. endif +.endif @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${HORDEDIR} @${CHMOD} -R o-rwx ${CONFDIR} @${TOUCH} ${LOG_FILE} diff --git a/www/horde/pkg-plist b/www/horde/pkg-plist index d765679270d4..ee9c61e2095a 100644 --- a/www/horde/pkg-plist +++ b/www/horde/pkg-plist @@ -1,4 +1,4 @@ -etc/horde/httpd.conf.horde +%%HORDE_INC%%/httpd-horde.conf %%HORDESBIN%%/horde_set_perms.sh %%PORTDOCS%%%%DOCSDIR%%/CHANGES %%PORTDOCS%%%%DOCSDIR%%/CODING_STANDARDS @@ -1590,4 +1590,4 @@ etc/horde/httpd.conf.horde @dirrm %%HORDEDIR%%/admin @unexec rmdir %D/%%HORDEDIR%% 2>/dev/null || true %%PORTDOCS%%@dirrm %%DOCSDIR%% -@unexec rmdir %D/etc/horde 2>/dev/null || true +%%RMDIRINC%%@unexec rmdir %D/%%HORDE_INC%% 2>/dev/null || true diff --git a/www/horde4-base/Makefile b/www/horde4-base/Makefile index ca13575a1c1f..8752ff7bb456 100644 --- a/www/horde4-base/Makefile +++ b/www/horde4-base/Makefile @@ -27,8 +27,6 @@ COMMENT= A common code-base used by Horde applications, written in PHP #---------------------------------------------------------------------------- # You may define these options: # -# - WITH_APACHE2: if you run Apache2. -# # - WITH_PHP5: if you run PHP5 (you could use www/horde-php5). # # - WITHOUT_SUPPORTED_DB: if you run a database not in the ports tree. @@ -45,7 +43,7 @@ COMMENT= A common code-base used by Horde applications, written in PHP # # - WITHOUT_FTP: if you do not need the VFS FTP driver. # -# - WITHOUT_MCAL: if you don't plan to install Kronolith. +# - WITH_MCAL: if you plan to install Kronolith with mcal (deprecated). # # - WITH_IMSP: use IMSP as a preferences backend. # @@ -94,6 +92,7 @@ RUN_DEPENDS+= ${PEARDIR}/Date.php:${PORTSDIR}/devel/pear-Date \ CONFLICTS= horde-2.* NO_BUILD= yes +USE_APACHE= 1.3+ USE_PHP= ctype gettext session USE_REINPLACE= yes SUB_FILES= pkg-message pkg-deinstall pkg-install @@ -221,9 +220,10 @@ SUB_DIRS= admin config js lib locale po scripts services templates themes util LHORDEDIR?= www/horde LHORDESBIN?= sbin -PLIST_SUB= HORDEDIR=${LHORDEDIR} HORDESBIN=${LHORDESBIN} -SUB_LIST+= HORDEDIR=${HORDEDIR} APACHE_CONF=${APACHE_CONF} HORDESBIN=${HORDESBIN} \ - HORDEADMUSR=${HORDEADMUSR} HORDEGRP=${WWWGRP} +PLIST_SUB= HORDEDIR=${LHORDEDIR} HORDESBIN=${LHORDESBIN} \ + HORDE_INC=${LHORDE_INC} +SUB_LIST+= HORDEDIR=${HORDEDIR} APACHE_CONF=${APACHE_CONF} \ + HORDESBIN=${HORDESBIN} HORDEADMUSR=${HORDEADMUSR} HORDEGRP=${WWWGRP} HORDEDIR= ${PREFIX}/${LHORDEDIR} HORDESBIN= ${PREFIX}/${LHORDESBIN} @@ -231,19 +231,13 @@ CONFDIR= ${HORDEDIR}/config APACHE_CONF= ${APACHE_CNFDIR}/httpd.conf PEARDIR?= ${LOCALBASE}/share/pear -.if defined(WITH_APACHE2) -APACHE_CNFDIR= ${LOCALBASE}/etc/apache2 -.else -APACHE_CNFDIR= ${LOCALBASE}/etc/apache -.endif -HORDE_INC= ${PREFIX}/etc/horde LOG_FILE?= /var/log/horde.log .if defined(WITH_PHP5) USE_PHP+= dom .else USE_PHP+= domxml -. if !defined(WITHOUT_MCAL) +. if defined(WITH_MCAL) USE_PHP+= mcal . endif .endif @@ -253,16 +247,28 @@ PATCHES2RM= po/translation.php config/conf.xml scripts/sql/README \ SEDIN2RM= lib/Horde/Auth/mcal.php config/conf.xml docs/INSTALL \ config/mime_drivers.php.dist -.include <bsd.port.pre.mk> # Required to test PHP_VER +.include <bsd.port.pre.mk> + +.if ${APACHE_VERSION} >= 20 +APACHE_CNFDIR= ${LOCALBASE}/etc/apache${APACHE_VERSION:S/20/2/} +HORDE_INC= ${APACHE_CNFDIR}/Includes +LHORDE_INC= ${HORDE_INC:S|^${LOCALBASE}/||} +PLIST_SUB+= RMDIRINC="@comment " +.else +APACHE_CNFDIR= ${LOCALBASE}/etc/apache +HORDE_INC= ${PREFIX}/etc/horde +LHORDE_INC= ${HORDE_INC:S|^${PREFIX}/||} +PLIST_SUB+= RMDIRINC="" +.endif pre-configure: @${RM} ${PATCHES2RM:S|^|${WRKSRC}/|:S|$|.orig|} @${SED} -e "s:/home/httpd/html/horde:${HORDEDIR}:" \ -e "s:php_value auto_prepend_file:# php_value auto_prepend_file:" \ -e "s:/home/httpd/phplib:${PEARDIR}:" \ - ${FILESDIR}/httpd.conf.horde > ${WRKDIR}/httpd.conf.horde + ${FILESDIR}/httpd.conf.horde > ${WRKDIR}/httpd-horde.conf .if ${PHP_VER} == 5 - @${REINPLACE_CMD} -e "s:mod_php4.c:mod_php5.c:" ${WRKDIR}/httpd.conf.horde + @${REINPLACE_CMD} -e "s:mod_php4.c:mod_php5.c:" ${WRKDIR}/httpd-horde.conf .endif @${REINPLACE_CMD} -e "s:%%LOCALBASE%%:${LOCALBASE}:" ${WRKSRC}/config/mime_drivers.php.dist .if !defined(WITHOUT_X11) @@ -336,13 +342,20 @@ do-install: .endfor @${CP} ${WRKSRC}/scripts/set_perms.sh ${HORDESBIN}/horde_set_perms.sh @${CHMOD} u+x ${HORDESBIN}/horde_set_perms.sh +.if ${APACHE_VERSION} >= 20 + ${INSTALL_DATA} ${WRKDIR}/httpd-horde.conf ${HORDE_INC} +.else @${MKDIR} ${HORDE_INC} - @${INSTALL_DATA} ${WRKDIR}/httpd.conf.horde ${HORDE_INC} + @${INSTALL_DATA} ${WRKDIR}/httpd-horde.conf ${HORDE_INC} +. if !defined(PACKAGE_BUILDING) @(if [ -f ${APACHE_CONF} ] ; then \ ${ECHO_MSG} "===> Updating ${APACHE_CONF}..." ; \ + ${CP} -p ${APACHE_CONF} ${APACHE_CONF}.beforeHorde ; \ ${ECHO_CMD} "# Horde's include directory" >> ${APACHE_CONF} ; \ ${ECHO_CMD} "Include ${HORDE_INC}" >> ${APACHE_CONF} ; \ fi) +. endif +.endif @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${HORDEDIR} @${CHMOD} -R o-rwx ${CONFDIR} @${TOUCH} ${LOG_FILE} diff --git a/www/horde4-base/pkg-plist b/www/horde4-base/pkg-plist index d765679270d4..ee9c61e2095a 100644 --- a/www/horde4-base/pkg-plist +++ b/www/horde4-base/pkg-plist @@ -1,4 +1,4 @@ -etc/horde/httpd.conf.horde +%%HORDE_INC%%/httpd-horde.conf %%HORDESBIN%%/horde_set_perms.sh %%PORTDOCS%%%%DOCSDIR%%/CHANGES %%PORTDOCS%%%%DOCSDIR%%/CODING_STANDARDS @@ -1590,4 +1590,4 @@ etc/horde/httpd.conf.horde @dirrm %%HORDEDIR%%/admin @unexec rmdir %D/%%HORDEDIR%% 2>/dev/null || true %%PORTDOCS%%@dirrm %%DOCSDIR%% -@unexec rmdir %D/etc/horde 2>/dev/null || true +%%RMDIRINC%%@unexec rmdir %D/%%HORDE_INC%% 2>/dev/null || true |