From 1309ed10758eb79ce68171b002b0dfc87e6f37c5 Mon Sep 17 00:00:00 2001 From: Andrew Pantyukhin Date: Sat, 7 Apr 2007 11:46:27 +0000 Subject: - Remove apache cruft - Assorted tweaks and updates - Bump portrevisions Submitted by: Beech Rintoul (maintainer) --- deskutils/horde-kronolith/Makefile | 46 ++++++++++------------ .../horde-kronolith/files/httpd.conf.kronolith | 31 --------------- deskutils/horde-kronolith/files/pkg-message.in | 1 - deskutils/horde-kronolith/pkg-plist | 9 ----- deskutils/horde-mnemo/Makefile | 42 +++++++++----------- deskutils/horde-mnemo/files/httpd.conf.mnemo | 31 --------------- deskutils/horde-mnemo/files/pkg-message.in | 1 - deskutils/horde-mnemo/pkg-plist | 10 ----- deskutils/horde-nag/Makefile | 17 +++----- deskutils/horde-nag/files/httpd.conf.nag | 31 --------------- deskutils/horde-nag/files/pkg-message.in | 1 - deskutils/horde-nag/pkg-plist | 1 - deskutils/horde4-kronolith/Makefile | 46 ++++++++++------------ .../horde4-kronolith/files/httpd.conf.kronolith | 31 --------------- deskutils/horde4-kronolith/files/pkg-message.in | 1 - deskutils/horde4-kronolith/pkg-plist | 9 ----- deskutils/horde4-mnemo/Makefile | 42 +++++++++----------- deskutils/horde4-mnemo/files/httpd.conf.mnemo | 31 --------------- deskutils/horde4-mnemo/files/pkg-message.in | 1 - deskutils/horde4-mnemo/pkg-plist | 10 ----- deskutils/horde4-nag/Makefile | 17 +++----- deskutils/horde4-nag/files/httpd.conf.nag | 31 --------------- deskutils/horde4-nag/files/pkg-message.in | 1 - deskutils/horde4-nag/pkg-plist | 1 - deskutils/kronolith/Makefile | 46 ++++++++++------------ deskutils/kronolith/files/httpd.conf.kronolith | 31 --------------- deskutils/kronolith/files/pkg-message.in | 1 - deskutils/kronolith/pkg-plist | 9 ----- deskutils/mnemo/Makefile | 42 +++++++++----------- deskutils/mnemo/files/httpd.conf.mnemo | 31 --------------- deskutils/mnemo/files/pkg-message.in | 1 - deskutils/mnemo/pkg-plist | 10 ----- deskutils/nag/Makefile | 17 +++----- deskutils/nag/files/httpd.conf.nag | 31 --------------- deskutils/nag/files/pkg-message.in | 1 - deskutils/nag/pkg-plist | 1 - mail/horde-ingo/Makefile | 17 +++----- mail/horde-ingo/files/httpd.conf.ingo | 31 --------------- mail/horde-ingo/files/pkg-message.in | 1 - mail/horde-ingo/pkg-plist | 1 - mail/horde-turba/Makefile | 41 ++++--------------- mail/horde-turba/files/httpd.conf.turba | 31 --------------- mail/horde-turba/files/pkg-message.in | 1 - mail/horde-turba/pkg-plist | 1 - mail/horde4-ingo/Makefile | 17 +++----- mail/horde4-ingo/files/httpd.conf.ingo | 31 --------------- mail/horde4-ingo/files/pkg-message.in | 1 - mail/horde4-ingo/pkg-plist | 1 - mail/horde4-turba/Makefile | 41 ++++--------------- mail/horde4-turba/files/httpd.conf.turba | 31 --------------- mail/horde4-turba/files/pkg-message.in | 1 - mail/horde4-turba/pkg-plist | 1 - mail/ingo/Makefile | 17 +++----- mail/ingo/files/httpd.conf.ingo | 31 --------------- mail/ingo/files/pkg-message.in | 1 - mail/ingo/pkg-plist | 1 - mail/turba/Makefile | 41 ++++--------------- mail/turba/files/httpd.conf.turba | 31 --------------- mail/turba/files/pkg-message.in | 1 - mail/turba/pkg-plist | 1 - 60 files changed, 168 insertions(+), 867 deletions(-) delete mode 100644 deskutils/horde-kronolith/files/httpd.conf.kronolith delete mode 100644 deskutils/horde-mnemo/files/httpd.conf.mnemo delete mode 100644 deskutils/horde-nag/files/httpd.conf.nag delete mode 100644 deskutils/horde4-kronolith/files/httpd.conf.kronolith delete mode 100644 deskutils/horde4-mnemo/files/httpd.conf.mnemo delete mode 100644 deskutils/horde4-nag/files/httpd.conf.nag delete mode 100644 deskutils/kronolith/files/httpd.conf.kronolith delete mode 100644 deskutils/mnemo/files/httpd.conf.mnemo delete mode 100644 deskutils/nag/files/httpd.conf.nag delete mode 100644 mail/horde-ingo/files/httpd.conf.ingo delete mode 100644 mail/horde-turba/files/httpd.conf.turba delete mode 100644 mail/horde4-ingo/files/httpd.conf.ingo delete mode 100644 mail/horde4-turba/files/httpd.conf.turba delete mode 100644 mail/ingo/files/httpd.conf.ingo delete mode 100644 mail/turba/files/httpd.conf.turba diff --git a/deskutils/horde-kronolith/Makefile b/deskutils/horde-kronolith/Makefile index f2ffc1826ba1..d23e7549c9f1 100644 --- a/deskutils/horde-kronolith/Makefile +++ b/deskutils/horde-kronolith/Makefile @@ -7,23 +7,23 @@ PORTNAME= kronolith PORTVERSION= 2.1.4 +DISTVERSIONPREFIX= h3- +PORTREVISION= 1 CATEGORIES= deskutils www MASTER_SITES= HORDE -DISTNAME= ${PORTNAME}-h3-${PORTVERSION} MAINTAINER= beech@alaskaparadise.com COMMENT= Kronolith is the Horde calendar application -RUN_DEPENDS+= ${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde-base +RUN_DEPENDS= ${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde-base 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_GETTEXT= yes REINPLACE_ARGS= -i "" -DOCS= README docs/CHANGES docs/CREDITS docs/INSTALL \ - docs/RELEASE_NOTES docs/TODO docs/UPGRADING +PORTDOCS= README CHANGES CREDITS INSTALL \ + RELEASE_NOTES TODO UPGRADING CONFFILE= keywords.php menu.php prefs.php SUB_DIRS= config js lib locale po scripts templates themes @@ -34,41 +34,35 @@ PKGMESSAGE= ${WRKDIR}/pkg-message PKGDEINSTALL= ${WRKDIR}/pkg-deinstall SUB_FILES= pkg-message pkg-install pkg-deinstall SUB_LIST= KRONOLITHDIR=${KRONOLITHDIR} -PLIST_SUB= KRONOLITHDIR=${LKRONOLITHDIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||} +PLIST_SUB= KRONOLITHDIR=${LKRONOLITHDIR} KRONOLITHDIR= ${PREFIX}/${LKRONOLITHDIR} CONFDIR= ${KRONOLITHDIR}/config .include -.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: @(cd ${WRKSRC}/scripts && \ ${FIND} . -name "*.php" -exec \ ${REINPLACE_CMD} -e "s:/usr/local/bin/php: ${LOCALBASE}/bin/php:;s:/usr/bin/php: ${LOCALBASE}/bin/php:" {} \; ) - @${SED} -e "s:/home/httpd/html/horde/kronolith:${KRONOLITHDIR}:" \ - ${FILESDIR}/httpd.conf.kronolith > ${WRKDIR}/httpd-kronolith.conf do-install: - @${MKDIR} ${KRONOLITHDIR} -.for REP in ${SUB_DIRS} - @${CP} -Rp ${WRKSRC}/${REP} ${KRONOLITHDIR} -.endfor - @${CP} -p ${WRKSRC}/*.php ${KRONOLITHDIR} - - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${KRONOLITHDIR} - @${CHMOD} -R o-rwx ${CONFDIR} - @${INSTALL_DATA} ${WRKDIR}/httpd-kronolith.conf ${HORDE_INC} + @${INSTALL} -d ${KRONOLITHDIR}/ + @${CP} -Rp ${SUB_DIRS:S|^|${WRKSRC}/|} ${KRONOLITHDIR}/ + @${CP} -p ${WRKSRC}/*.php ${KRONOLITHDIR}/ + @${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR}/ + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${KRONOLITHDIR}/ + @${CHMOD} -R o-rwx ${KRONOLITHDIR}/ + ${ECHO_CMD} @exec ${CHOWN} -R ${WWWOWN}:${WWWGRP}\ + %D/${KRONOLITHDIR:S|^${PREFIX}/||}/ >> ${TMPPLIST} + ${ECHO_CMD} @exec ${CHMOD} -R o-rwx\ + %D/${KRONOLITHDIR:S|^${PREFIX}/||}/ >> ${TMPPLIST} .if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for FILE in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} -.endfor + @${INSTALL} -d ${DOCSDIR}/ + @${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${DOCSDIR}/ @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." .endif diff --git a/deskutils/horde-kronolith/files/httpd.conf.kronolith b/deskutils/horde-kronolith/files/httpd.conf.kronolith deleted file mode 100644 index a3748ea4e996..000000000000 --- a/deskutils/horde-kronolith/files/httpd.conf.kronolith +++ /dev/null @@ -1,31 +0,0 @@ -# This is included in Apache's httpd.conf for Kronolith -# -# For security, don't serve pages from the Kronolith configuration and -# library directories. -# - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - -# End of Kronolith configuration ================ - diff --git a/deskutils/horde-kronolith/files/pkg-message.in b/deskutils/horde-kronolith/files/pkg-message.in index 540684cc4d22..8d1569fe4107 100644 --- a/deskutils/horde-kronolith/files/pkg-message.in +++ b/deskutils/horde-kronolith/files/pkg-message.in @@ -15,5 +15,4 @@ WARNING! Please note that the MCAL back-end has been deprecated! Finally, you must login to Horde as a Horde Administrator to finish the configuration. -To protect your configuration files, you have to restart Apache. ************************************************************************** diff --git a/deskutils/horde-kronolith/pkg-plist b/deskutils/horde-kronolith/pkg-plist index 2b25570f1873..3ee56c7dd0b1 100644 --- a/deskutils/horde-kronolith/pkg-plist +++ b/deskutils/horde-kronolith/pkg-plist @@ -1,10 +1,3 @@ -%%PORTDOCS%%%%DOCSDIR%%/CHANGES -%%PORTDOCS%%%%DOCSDIR%%/CREDITS -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%%%DOCSDIR%%/UPGRADING %%KRONOLITHDIR%%/addevent.php %%KRONOLITHDIR%%/addeventaction.php %%KRONOLITHDIR%%/attend.php @@ -215,8 +208,6 @@ %%KRONOLITHDIR%%/week.php %%KRONOLITHDIR%%/workweek.php %%KRONOLITHDIR%%/year.php -%%HORDE_INC%%/httpd-kronolith.conf -%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%KRONOLITHDIR%%/themes/simplex @dirrm %%KRONOLITHDIR%%/themes/print @dirrm %%KRONOLITHDIR%%/themes/mozilla diff --git a/deskutils/horde-mnemo/Makefile b/deskutils/horde-mnemo/Makefile index ff7db16930ab..ba9327b1d2e5 100644 --- a/deskutils/horde-mnemo/Makefile +++ b/deskutils/horde-mnemo/Makefile @@ -7,6 +7,7 @@ PORTNAME= mnemo PORTVERSION= 2.1.1 +DISTVERSIONPREFIX= h3- PORTREVISION= 1 CATEGORIES= deskutils www MASTER_SITES= HORDE @@ -18,18 +19,17 @@ COMMENT= Mnemo is the Horde notes and memos application RUN_DEPENDS= ${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde-base NO_BUILD= yes -USE_APACHE= 1.3+ # needed to test APACHE_VERSION USE_GETTEXT= yes -PLIST_SUB= MNEMODIR=${LMNEMODIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||} +PLIST_SUB= MNEMODIR=${LMNEMODIR} PKGMESSAGE= ${WRKDIR}/pkg-message PKGDEINSTALL= ${WRKDIR}/pkg-deinstall SUB_FILES= pkg-message pkg-install pkg-deinstall SUB_LIST= MNEMODIR=${MNEMODIR} REINPLACE_ARGS= -i "" -DOCS= LICENSE README docs/CHANGES docs/CREDITS docs/INSTALL \ - docs/RELEASE_NOTES docs/TODO docs/UPGRADING +PORTDOCS= README CHANGES CREDITS INSTALL \ + RELEASE_NOTES TODO UPGRADING CONFFILE= prefs.php SUB_DIRS= config js lib locale po scripts templates themes @@ -41,34 +41,28 @@ CONFDIR= ${MNEMODIR}/config .include -.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: @(cd ${WRKSRC}/scripts && \ ${FIND} . -name "*.php" -exec \ ${REINPLACE_CMD} -e "s:/usr/local/bin/php: ${LOCALBASE}/bin/php:;s:/usr/bin/php: ${LOCALBASE}/bin/php:" {} \; ) - @${SED} -e "s:/home/httpd/html/horde/mnemo:${MNEMODIR}:g" \ - ${FILESDIR}/httpd.conf.mnemo > ${WRKDIR}/httpd-mnemo.conf do-install: - @${MKDIR} ${MNEMODIR} -.for REP in ${SUB_DIRS} - @${CP} -Rp ${WRKSRC}/${REP} ${MNEMODIR} -.endfor - @${CP} -p ${WRKSRC}/*.php ${MNEMODIR} - - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${MNEMODIR} - @${CHMOD} -R o-rwx ${CONFDIR} - @${INSTALL_DATA} ${WRKDIR}/httpd-mnemo.conf ${HORDE_INC} + @${INSTALL} -d ${MNEMODIR}/ + @${CP} -Rp ${SUB_DIRS:S|^|${WRKSRC}/|} ${MNEMODIR}/ + @${CP} -p ${WRKSRC}/*.php ${MNEMODIR}/ + @${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR}/ + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${MNEMODIR}/ + @${CHMOD} -R o-rwx ${MNEMODIR}/ + ${ECHO_CMD} @exec ${CHOWN} -R ${WWWOWN}:${WWWGRP}\ + %D/${MNEMODIR:S|^${PREFIX}/||}/ >> ${TMPPLIST} + ${ECHO_CMD} @exec ${CHMOD} -R o-rwx\ + %D/${MNEMODIR:S|^${PREFIX}/||}/ >> ${TMPPLIST} .if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for FILE in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} -.endfor + @${INSTALL} -d ${DOCSDIR}/ + @${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${DOCSDIR}/ @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." .endif diff --git a/deskutils/horde-mnemo/files/httpd.conf.mnemo b/deskutils/horde-mnemo/files/httpd.conf.mnemo deleted file mode 100644 index c87a3b7ef1c1..000000000000 --- a/deskutils/horde-mnemo/files/httpd.conf.mnemo +++ /dev/null @@ -1,31 +0,0 @@ -# This is included in Apache's httpd.conf for Mnemo -# -# For security, don't serve pages from the Mnemo configuration and -# library directories. -# - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - -# End of Mnemo configuration ================ - diff --git a/deskutils/horde-mnemo/files/pkg-message.in b/deskutils/horde-mnemo/files/pkg-message.in index db86ecf84943..bbd8d585a94d 100644 --- a/deskutils/horde-mnemo/files/pkg-message.in +++ b/deskutils/horde-mnemo/files/pkg-message.in @@ -12,5 +12,4 @@ mysql --user=root --password=yourpass horde < mnemo.sql Finally, you must login to Horde as a Horde Administrator to finish the configuration. -To protect your configuration files, you have to restart Apache. ************************************************************************ diff --git a/deskutils/horde-mnemo/pkg-plist b/deskutils/horde-mnemo/pkg-plist index 8d1f006ae5d8..1812bb6810af 100644 --- a/deskutils/horde-mnemo/pkg-plist +++ b/deskutils/horde-mnemo/pkg-plist @@ -1,12 +1,3 @@ -%%HORDE_INC%%/httpd-mnemo.conf -%%PORTDOCS%%%%DOCSDIR%%/LICENSE -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES -%%PORTDOCS%%%%DOCSDIR%%/CHANGES -%%PORTDOCS%%%%DOCSDIR%%/CREDITS -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%%%DOCSDIR%%/UPGRADING %%MNEMODIR%%/config/.htaccess %%MNEMODIR%%/config/conf.xml %%MNEMODIR%%/config/prefs.php.dist @@ -122,7 +113,6 @@ %%MNEMODIR%%/themes/graphics/za.png %%MNEMODIR%%/themes/screen.css %%MNEMODIR%%/view.php -%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%MNEMODIR%%/themes/graphics @dirrm %%MNEMODIR%%/themes @dirrm %%MNEMODIR%%/templates/view diff --git a/deskutils/horde-nag/Makefile b/deskutils/horde-nag/Makefile index 79b6d2df37ed..8f0c055af8df 100644 --- a/deskutils/horde-nag/Makefile +++ b/deskutils/horde-nag/Makefile @@ -8,6 +8,7 @@ PORTNAME= nag PORTVERSION= 2.1.3 DISTVERSIONPREFIX= h3- +PORTREVISION= 1 CATEGORIES= deskutils www MASTER_SITES= HORDE @@ -17,7 +18,6 @@ COMMENT= Simple multiuser task list manager RUN_DEPENDS= ${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde-base NO_BUILD= yes -USE_APACHE= 1.3+ # needed to test APACHE_VERSION USE_GETTEXT= yes PLIST_SUB= NAGDIR=${LNAGDIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||} @@ -40,12 +40,6 @@ CONFDIR= ${NAGDIR}/config .include -.if ${APACHE_VERSION} >= 20 -HORDE_INC= ${LOCALBASE}/etc/apache${APACHE_VERSION:S/20/2/}/Includes -.else -HORDE_INC= ${LOCALBASE}/etc/horde -.endif - post-extract: @${MV} ${WRKSRC}/README ${WRKSRC}/docs/ @@ -53,17 +47,18 @@ pre-configure: @(cd ${WRKSRC}/scripts && \ ${FIND} . -name "*.php" -exec \ ${REINPLACE_CMD} -e "s:/usr/local/bin/php: ${LOCALBASE}/bin/php:;s:/usr/bin/php: ${LOCALBASE}/bin/php:" {} \; ) - @${SED} -e "s:/home/httpd/html/horde/nag:${NAGDIR}:g" \ - ${FILESDIR}/httpd.conf.nag > ${WRKDIR}/httpd-nag.conf do-install: @${INSTALL} -d ${NAGDIR}/ @${CP} -Rp ${SUB_DIRS:S|^|${WRKSRC}/|} ${NAGDIR}/ @${CP} -p ${WRKSRC}/*.php ${NAGDIR}/ @${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR}/ - @${INSTALL_DATA} ${WRKDIR}/httpd-nag.conf ${HORDE_INC}/ @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${NAGDIR}/ - @${CHMOD} -R o-rwx ${CONFDIR}/ + @${CHMOD} -R o-rwx ${NAGDIR}/ + ${ECHO_CMD} @exec ${CHOWN} -R ${WWWOWN}:${WWWGRP}\ + %D/${NAGDIR:S|^${PREFIX}/||}/ >> ${TMPPLIST} + ${ECHO_CMD} @exec ${CHMOD} -R o-rwx\ + %D/${NAGDIR:S|^${PREFIX}/||}/ >> ${TMPPLIST} .if !defined(NOPORTDOCS) @${INSTALL} -d ${DOCSDIR}/ @${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${DOCSDIR}/ diff --git a/deskutils/horde-nag/files/httpd.conf.nag b/deskutils/horde-nag/files/httpd.conf.nag deleted file mode 100644 index c5279c8245fa..000000000000 --- a/deskutils/horde-nag/files/httpd.conf.nag +++ /dev/null @@ -1,31 +0,0 @@ -# This is included in Apache's httpd.conf for Nag -# -# For security, don't serve pages from the Nag configuration and -# library directories. -# - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - -# End of Nag configuration ================ - diff --git a/deskutils/horde-nag/files/pkg-message.in b/deskutils/horde-nag/files/pkg-message.in index 4713eea2cb00..98c57ea5118a 100644 --- a/deskutils/horde-nag/files/pkg-message.in +++ b/deskutils/horde-nag/files/pkg-message.in @@ -12,5 +12,4 @@ mysql --user=root --password=yourpass horde < nag.sql Finally, you must login to Horde as a Horde Administrator to finish the configuration. -To protect your configuration files, you have to restart Apache. ************************************************************************ diff --git a/deskutils/horde-nag/pkg-plist b/deskutils/horde-nag/pkg-plist index 1f60eedfab6b..8681dda8b9a9 100644 --- a/deskutils/horde-nag/pkg-plist +++ b/deskutils/horde-nag/pkg-plist @@ -136,7 +136,6 @@ %%NAGDIR%%/themes/graphics/za.png %%NAGDIR%%/themes/screen.css %%NAGDIR%%/view.php -%%HORDE_INC%%/httpd-nag.conf @dirrm %%NAGDIR%%/themes/graphics @dirrm %%NAGDIR%%/themes @dirrm %%NAGDIR%%/templates/view diff --git a/deskutils/horde4-kronolith/Makefile b/deskutils/horde4-kronolith/Makefile index f2ffc1826ba1..d23e7549c9f1 100644 --- a/deskutils/horde4-kronolith/Makefile +++ b/deskutils/horde4-kronolith/Makefile @@ -7,23 +7,23 @@ PORTNAME= kronolith PORTVERSION= 2.1.4 +DISTVERSIONPREFIX= h3- +PORTREVISION= 1 CATEGORIES= deskutils www MASTER_SITES= HORDE -DISTNAME= ${PORTNAME}-h3-${PORTVERSION} MAINTAINER= beech@alaskaparadise.com COMMENT= Kronolith is the Horde calendar application -RUN_DEPENDS+= ${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde-base +RUN_DEPENDS= ${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde-base 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_GETTEXT= yes REINPLACE_ARGS= -i "" -DOCS= README docs/CHANGES docs/CREDITS docs/INSTALL \ - docs/RELEASE_NOTES docs/TODO docs/UPGRADING +PORTDOCS= README CHANGES CREDITS INSTALL \ + RELEASE_NOTES TODO UPGRADING CONFFILE= keywords.php menu.php prefs.php SUB_DIRS= config js lib locale po scripts templates themes @@ -34,41 +34,35 @@ PKGMESSAGE= ${WRKDIR}/pkg-message PKGDEINSTALL= ${WRKDIR}/pkg-deinstall SUB_FILES= pkg-message pkg-install pkg-deinstall SUB_LIST= KRONOLITHDIR=${KRONOLITHDIR} -PLIST_SUB= KRONOLITHDIR=${LKRONOLITHDIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||} +PLIST_SUB= KRONOLITHDIR=${LKRONOLITHDIR} KRONOLITHDIR= ${PREFIX}/${LKRONOLITHDIR} CONFDIR= ${KRONOLITHDIR}/config .include -.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: @(cd ${WRKSRC}/scripts && \ ${FIND} . -name "*.php" -exec \ ${REINPLACE_CMD} -e "s:/usr/local/bin/php: ${LOCALBASE}/bin/php:;s:/usr/bin/php: ${LOCALBASE}/bin/php:" {} \; ) - @${SED} -e "s:/home/httpd/html/horde/kronolith:${KRONOLITHDIR}:" \ - ${FILESDIR}/httpd.conf.kronolith > ${WRKDIR}/httpd-kronolith.conf do-install: - @${MKDIR} ${KRONOLITHDIR} -.for REP in ${SUB_DIRS} - @${CP} -Rp ${WRKSRC}/${REP} ${KRONOLITHDIR} -.endfor - @${CP} -p ${WRKSRC}/*.php ${KRONOLITHDIR} - - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${KRONOLITHDIR} - @${CHMOD} -R o-rwx ${CONFDIR} - @${INSTALL_DATA} ${WRKDIR}/httpd-kronolith.conf ${HORDE_INC} + @${INSTALL} -d ${KRONOLITHDIR}/ + @${CP} -Rp ${SUB_DIRS:S|^|${WRKSRC}/|} ${KRONOLITHDIR}/ + @${CP} -p ${WRKSRC}/*.php ${KRONOLITHDIR}/ + @${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR}/ + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${KRONOLITHDIR}/ + @${CHMOD} -R o-rwx ${KRONOLITHDIR}/ + ${ECHO_CMD} @exec ${CHOWN} -R ${WWWOWN}:${WWWGRP}\ + %D/${KRONOLITHDIR:S|^${PREFIX}/||}/ >> ${TMPPLIST} + ${ECHO_CMD} @exec ${CHMOD} -R o-rwx\ + %D/${KRONOLITHDIR:S|^${PREFIX}/||}/ >> ${TMPPLIST} .if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for FILE in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} -.endfor + @${INSTALL} -d ${DOCSDIR}/ + @${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${DOCSDIR}/ @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." .endif diff --git a/deskutils/horde4-kronolith/files/httpd.conf.kronolith b/deskutils/horde4-kronolith/files/httpd.conf.kronolith deleted file mode 100644 index a3748ea4e996..000000000000 --- a/deskutils/horde4-kronolith/files/httpd.conf.kronolith +++ /dev/null @@ -1,31 +0,0 @@ -# This is included in Apache's httpd.conf for Kronolith -# -# For security, don't serve pages from the Kronolith configuration and -# library directories. -# - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - -# End of Kronolith configuration ================ - diff --git a/deskutils/horde4-kronolith/files/pkg-message.in b/deskutils/horde4-kronolith/files/pkg-message.in index 540684cc4d22..8d1569fe4107 100644 --- a/deskutils/horde4-kronolith/files/pkg-message.in +++ b/deskutils/horde4-kronolith/files/pkg-message.in @@ -15,5 +15,4 @@ WARNING! Please note that the MCAL back-end has been deprecated! Finally, you must login to Horde as a Horde Administrator to finish the configuration. -To protect your configuration files, you have to restart Apache. ************************************************************************** diff --git a/deskutils/horde4-kronolith/pkg-plist b/deskutils/horde4-kronolith/pkg-plist index 2b25570f1873..3ee56c7dd0b1 100644 --- a/deskutils/horde4-kronolith/pkg-plist +++ b/deskutils/horde4-kronolith/pkg-plist @@ -1,10 +1,3 @@ -%%PORTDOCS%%%%DOCSDIR%%/CHANGES -%%PORTDOCS%%%%DOCSDIR%%/CREDITS -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%%%DOCSDIR%%/UPGRADING %%KRONOLITHDIR%%/addevent.php %%KRONOLITHDIR%%/addeventaction.php %%KRONOLITHDIR%%/attend.php @@ -215,8 +208,6 @@ %%KRONOLITHDIR%%/week.php %%KRONOLITHDIR%%/workweek.php %%KRONOLITHDIR%%/year.php -%%HORDE_INC%%/httpd-kronolith.conf -%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%KRONOLITHDIR%%/themes/simplex @dirrm %%KRONOLITHDIR%%/themes/print @dirrm %%KRONOLITHDIR%%/themes/mozilla diff --git a/deskutils/horde4-mnemo/Makefile b/deskutils/horde4-mnemo/Makefile index ff7db16930ab..ba9327b1d2e5 100644 --- a/deskutils/horde4-mnemo/Makefile +++ b/deskutils/horde4-mnemo/Makefile @@ -7,6 +7,7 @@ PORTNAME= mnemo PORTVERSION= 2.1.1 +DISTVERSIONPREFIX= h3- PORTREVISION= 1 CATEGORIES= deskutils www MASTER_SITES= HORDE @@ -18,18 +19,17 @@ COMMENT= Mnemo is the Horde notes and memos application RUN_DEPENDS= ${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde-base NO_BUILD= yes -USE_APACHE= 1.3+ # needed to test APACHE_VERSION USE_GETTEXT= yes -PLIST_SUB= MNEMODIR=${LMNEMODIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||} +PLIST_SUB= MNEMODIR=${LMNEMODIR} PKGMESSAGE= ${WRKDIR}/pkg-message PKGDEINSTALL= ${WRKDIR}/pkg-deinstall SUB_FILES= pkg-message pkg-install pkg-deinstall SUB_LIST= MNEMODIR=${MNEMODIR} REINPLACE_ARGS= -i "" -DOCS= LICENSE README docs/CHANGES docs/CREDITS docs/INSTALL \ - docs/RELEASE_NOTES docs/TODO docs/UPGRADING +PORTDOCS= README CHANGES CREDITS INSTALL \ + RELEASE_NOTES TODO UPGRADING CONFFILE= prefs.php SUB_DIRS= config js lib locale po scripts templates themes @@ -41,34 +41,28 @@ CONFDIR= ${MNEMODIR}/config .include -.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: @(cd ${WRKSRC}/scripts && \ ${FIND} . -name "*.php" -exec \ ${REINPLACE_CMD} -e "s:/usr/local/bin/php: ${LOCALBASE}/bin/php:;s:/usr/bin/php: ${LOCALBASE}/bin/php:" {} \; ) - @${SED} -e "s:/home/httpd/html/horde/mnemo:${MNEMODIR}:g" \ - ${FILESDIR}/httpd.conf.mnemo > ${WRKDIR}/httpd-mnemo.conf do-install: - @${MKDIR} ${MNEMODIR} -.for REP in ${SUB_DIRS} - @${CP} -Rp ${WRKSRC}/${REP} ${MNEMODIR} -.endfor - @${CP} -p ${WRKSRC}/*.php ${MNEMODIR} - - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${MNEMODIR} - @${CHMOD} -R o-rwx ${CONFDIR} - @${INSTALL_DATA} ${WRKDIR}/httpd-mnemo.conf ${HORDE_INC} + @${INSTALL} -d ${MNEMODIR}/ + @${CP} -Rp ${SUB_DIRS:S|^|${WRKSRC}/|} ${MNEMODIR}/ + @${CP} -p ${WRKSRC}/*.php ${MNEMODIR}/ + @${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR}/ + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${MNEMODIR}/ + @${CHMOD} -R o-rwx ${MNEMODIR}/ + ${ECHO_CMD} @exec ${CHOWN} -R ${WWWOWN}:${WWWGRP}\ + %D/${MNEMODIR:S|^${PREFIX}/||}/ >> ${TMPPLIST} + ${ECHO_CMD} @exec ${CHMOD} -R o-rwx\ + %D/${MNEMODIR:S|^${PREFIX}/||}/ >> ${TMPPLIST} .if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for FILE in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} -.endfor + @${INSTALL} -d ${DOCSDIR}/ + @${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${DOCSDIR}/ @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." .endif diff --git a/deskutils/horde4-mnemo/files/httpd.conf.mnemo b/deskutils/horde4-mnemo/files/httpd.conf.mnemo deleted file mode 100644 index c87a3b7ef1c1..000000000000 --- a/deskutils/horde4-mnemo/files/httpd.conf.mnemo +++ /dev/null @@ -1,31 +0,0 @@ -# This is included in Apache's httpd.conf for Mnemo -# -# For security, don't serve pages from the Mnemo configuration and -# library directories. -# - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - -# End of Mnemo configuration ================ - diff --git a/deskutils/horde4-mnemo/files/pkg-message.in b/deskutils/horde4-mnemo/files/pkg-message.in index db86ecf84943..bbd8d585a94d 100644 --- a/deskutils/horde4-mnemo/files/pkg-message.in +++ b/deskutils/horde4-mnemo/files/pkg-message.in @@ -12,5 +12,4 @@ mysql --user=root --password=yourpass horde < mnemo.sql Finally, you must login to Horde as a Horde Administrator to finish the configuration. -To protect your configuration files, you have to restart Apache. ************************************************************************ diff --git a/deskutils/horde4-mnemo/pkg-plist b/deskutils/horde4-mnemo/pkg-plist index 8d1f006ae5d8..1812bb6810af 100644 --- a/deskutils/horde4-mnemo/pkg-plist +++ b/deskutils/horde4-mnemo/pkg-plist @@ -1,12 +1,3 @@ -%%HORDE_INC%%/httpd-mnemo.conf -%%PORTDOCS%%%%DOCSDIR%%/LICENSE -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES -%%PORTDOCS%%%%DOCSDIR%%/CHANGES -%%PORTDOCS%%%%DOCSDIR%%/CREDITS -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%%%DOCSDIR%%/UPGRADING %%MNEMODIR%%/config/.htaccess %%MNEMODIR%%/config/conf.xml %%MNEMODIR%%/config/prefs.php.dist @@ -122,7 +113,6 @@ %%MNEMODIR%%/themes/graphics/za.png %%MNEMODIR%%/themes/screen.css %%MNEMODIR%%/view.php -%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%MNEMODIR%%/themes/graphics @dirrm %%MNEMODIR%%/themes @dirrm %%MNEMODIR%%/templates/view diff --git a/deskutils/horde4-nag/Makefile b/deskutils/horde4-nag/Makefile index 79b6d2df37ed..8f0c055af8df 100644 --- a/deskutils/horde4-nag/Makefile +++ b/deskutils/horde4-nag/Makefile @@ -8,6 +8,7 @@ PORTNAME= nag PORTVERSION= 2.1.3 DISTVERSIONPREFIX= h3- +PORTREVISION= 1 CATEGORIES= deskutils www MASTER_SITES= HORDE @@ -17,7 +18,6 @@ COMMENT= Simple multiuser task list manager RUN_DEPENDS= ${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde-base NO_BUILD= yes -USE_APACHE= 1.3+ # needed to test APACHE_VERSION USE_GETTEXT= yes PLIST_SUB= NAGDIR=${LNAGDIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||} @@ -40,12 +40,6 @@ CONFDIR= ${NAGDIR}/config .include -.if ${APACHE_VERSION} >= 20 -HORDE_INC= ${LOCALBASE}/etc/apache${APACHE_VERSION:S/20/2/}/Includes -.else -HORDE_INC= ${LOCALBASE}/etc/horde -.endif - post-extract: @${MV} ${WRKSRC}/README ${WRKSRC}/docs/ @@ -53,17 +47,18 @@ pre-configure: @(cd ${WRKSRC}/scripts && \ ${FIND} . -name "*.php" -exec \ ${REINPLACE_CMD} -e "s:/usr/local/bin/php: ${LOCALBASE}/bin/php:;s:/usr/bin/php: ${LOCALBASE}/bin/php:" {} \; ) - @${SED} -e "s:/home/httpd/html/horde/nag:${NAGDIR}:g" \ - ${FILESDIR}/httpd.conf.nag > ${WRKDIR}/httpd-nag.conf do-install: @${INSTALL} -d ${NAGDIR}/ @${CP} -Rp ${SUB_DIRS:S|^|${WRKSRC}/|} ${NAGDIR}/ @${CP} -p ${WRKSRC}/*.php ${NAGDIR}/ @${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR}/ - @${INSTALL_DATA} ${WRKDIR}/httpd-nag.conf ${HORDE_INC}/ @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${NAGDIR}/ - @${CHMOD} -R o-rwx ${CONFDIR}/ + @${CHMOD} -R o-rwx ${NAGDIR}/ + ${ECHO_CMD} @exec ${CHOWN} -R ${WWWOWN}:${WWWGRP}\ + %D/${NAGDIR:S|^${PREFIX}/||}/ >> ${TMPPLIST} + ${ECHO_CMD} @exec ${CHMOD} -R o-rwx\ + %D/${NAGDIR:S|^${PREFIX}/||}/ >> ${TMPPLIST} .if !defined(NOPORTDOCS) @${INSTALL} -d ${DOCSDIR}/ @${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${DOCSDIR}/ diff --git a/deskutils/horde4-nag/files/httpd.conf.nag b/deskutils/horde4-nag/files/httpd.conf.nag deleted file mode 100644 index c5279c8245fa..000000000000 --- a/deskutils/horde4-nag/files/httpd.conf.nag +++ /dev/null @@ -1,31 +0,0 @@ -# This is included in Apache's httpd.conf for Nag -# -# For security, don't serve pages from the Nag configuration and -# library directories. -# - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - -# End of Nag configuration ================ - diff --git a/deskutils/horde4-nag/files/pkg-message.in b/deskutils/horde4-nag/files/pkg-message.in index 4713eea2cb00..98c57ea5118a 100644 --- a/deskutils/horde4-nag/files/pkg-message.in +++ b/deskutils/horde4-nag/files/pkg-message.in @@ -12,5 +12,4 @@ mysql --user=root --password=yourpass horde < nag.sql Finally, you must login to Horde as a Horde Administrator to finish the configuration. -To protect your configuration files, you have to restart Apache. ************************************************************************ diff --git a/deskutils/horde4-nag/pkg-plist b/deskutils/horde4-nag/pkg-plist index 1f60eedfab6b..8681dda8b9a9 100644 --- a/deskutils/horde4-nag/pkg-plist +++ b/deskutils/horde4-nag/pkg-plist @@ -136,7 +136,6 @@ %%NAGDIR%%/themes/graphics/za.png %%NAGDIR%%/themes/screen.css %%NAGDIR%%/view.php -%%HORDE_INC%%/httpd-nag.conf @dirrm %%NAGDIR%%/themes/graphics @dirrm %%NAGDIR%%/themes @dirrm %%NAGDIR%%/templates/view diff --git a/deskutils/kronolith/Makefile b/deskutils/kronolith/Makefile index f2ffc1826ba1..d23e7549c9f1 100644 --- a/deskutils/kronolith/Makefile +++ b/deskutils/kronolith/Makefile @@ -7,23 +7,23 @@ PORTNAME= kronolith PORTVERSION= 2.1.4 +DISTVERSIONPREFIX= h3- +PORTREVISION= 1 CATEGORIES= deskutils www MASTER_SITES= HORDE -DISTNAME= ${PORTNAME}-h3-${PORTVERSION} MAINTAINER= beech@alaskaparadise.com COMMENT= Kronolith is the Horde calendar application -RUN_DEPENDS+= ${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde-base +RUN_DEPENDS= ${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde-base 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_GETTEXT= yes REINPLACE_ARGS= -i "" -DOCS= README docs/CHANGES docs/CREDITS docs/INSTALL \ - docs/RELEASE_NOTES docs/TODO docs/UPGRADING +PORTDOCS= README CHANGES CREDITS INSTALL \ + RELEASE_NOTES TODO UPGRADING CONFFILE= keywords.php menu.php prefs.php SUB_DIRS= config js lib locale po scripts templates themes @@ -34,41 +34,35 @@ PKGMESSAGE= ${WRKDIR}/pkg-message PKGDEINSTALL= ${WRKDIR}/pkg-deinstall SUB_FILES= pkg-message pkg-install pkg-deinstall SUB_LIST= KRONOLITHDIR=${KRONOLITHDIR} -PLIST_SUB= KRONOLITHDIR=${LKRONOLITHDIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||} +PLIST_SUB= KRONOLITHDIR=${LKRONOLITHDIR} KRONOLITHDIR= ${PREFIX}/${LKRONOLITHDIR} CONFDIR= ${KRONOLITHDIR}/config .include -.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: @(cd ${WRKSRC}/scripts && \ ${FIND} . -name "*.php" -exec \ ${REINPLACE_CMD} -e "s:/usr/local/bin/php: ${LOCALBASE}/bin/php:;s:/usr/bin/php: ${LOCALBASE}/bin/php:" {} \; ) - @${SED} -e "s:/home/httpd/html/horde/kronolith:${KRONOLITHDIR}:" \ - ${FILESDIR}/httpd.conf.kronolith > ${WRKDIR}/httpd-kronolith.conf do-install: - @${MKDIR} ${KRONOLITHDIR} -.for REP in ${SUB_DIRS} - @${CP} -Rp ${WRKSRC}/${REP} ${KRONOLITHDIR} -.endfor - @${CP} -p ${WRKSRC}/*.php ${KRONOLITHDIR} - - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${KRONOLITHDIR} - @${CHMOD} -R o-rwx ${CONFDIR} - @${INSTALL_DATA} ${WRKDIR}/httpd-kronolith.conf ${HORDE_INC} + @${INSTALL} -d ${KRONOLITHDIR}/ + @${CP} -Rp ${SUB_DIRS:S|^|${WRKSRC}/|} ${KRONOLITHDIR}/ + @${CP} -p ${WRKSRC}/*.php ${KRONOLITHDIR}/ + @${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR}/ + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${KRONOLITHDIR}/ + @${CHMOD} -R o-rwx ${KRONOLITHDIR}/ + ${ECHO_CMD} @exec ${CHOWN} -R ${WWWOWN}:${WWWGRP}\ + %D/${KRONOLITHDIR:S|^${PREFIX}/||}/ >> ${TMPPLIST} + ${ECHO_CMD} @exec ${CHMOD} -R o-rwx\ + %D/${KRONOLITHDIR:S|^${PREFIX}/||}/ >> ${TMPPLIST} .if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for FILE in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} -.endfor + @${INSTALL} -d ${DOCSDIR}/ + @${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${DOCSDIR}/ @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." .endif diff --git a/deskutils/kronolith/files/httpd.conf.kronolith b/deskutils/kronolith/files/httpd.conf.kronolith deleted file mode 100644 index a3748ea4e996..000000000000 --- a/deskutils/kronolith/files/httpd.conf.kronolith +++ /dev/null @@ -1,31 +0,0 @@ -# This is included in Apache's httpd.conf for Kronolith -# -# For security, don't serve pages from the Kronolith configuration and -# library directories. -# - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - -# End of Kronolith configuration ================ - diff --git a/deskutils/kronolith/files/pkg-message.in b/deskutils/kronolith/files/pkg-message.in index 540684cc4d22..8d1569fe4107 100644 --- a/deskutils/kronolith/files/pkg-message.in +++ b/deskutils/kronolith/files/pkg-message.in @@ -15,5 +15,4 @@ WARNING! Please note that the MCAL back-end has been deprecated! Finally, you must login to Horde as a Horde Administrator to finish the configuration. -To protect your configuration files, you have to restart Apache. ************************************************************************** diff --git a/deskutils/kronolith/pkg-plist b/deskutils/kronolith/pkg-plist index 2b25570f1873..3ee56c7dd0b1 100644 --- a/deskutils/kronolith/pkg-plist +++ b/deskutils/kronolith/pkg-plist @@ -1,10 +1,3 @@ -%%PORTDOCS%%%%DOCSDIR%%/CHANGES -%%PORTDOCS%%%%DOCSDIR%%/CREDITS -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%%%DOCSDIR%%/UPGRADING %%KRONOLITHDIR%%/addevent.php %%KRONOLITHDIR%%/addeventaction.php %%KRONOLITHDIR%%/attend.php @@ -215,8 +208,6 @@ %%KRONOLITHDIR%%/week.php %%KRONOLITHDIR%%/workweek.php %%KRONOLITHDIR%%/year.php -%%HORDE_INC%%/httpd-kronolith.conf -%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%KRONOLITHDIR%%/themes/simplex @dirrm %%KRONOLITHDIR%%/themes/print @dirrm %%KRONOLITHDIR%%/themes/mozilla diff --git a/deskutils/mnemo/Makefile b/deskutils/mnemo/Makefile index ff7db16930ab..ba9327b1d2e5 100644 --- a/deskutils/mnemo/Makefile +++ b/deskutils/mnemo/Makefile @@ -7,6 +7,7 @@ PORTNAME= mnemo PORTVERSION= 2.1.1 +DISTVERSIONPREFIX= h3- PORTREVISION= 1 CATEGORIES= deskutils www MASTER_SITES= HORDE @@ -18,18 +19,17 @@ COMMENT= Mnemo is the Horde notes and memos application RUN_DEPENDS= ${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde-base NO_BUILD= yes -USE_APACHE= 1.3+ # needed to test APACHE_VERSION USE_GETTEXT= yes -PLIST_SUB= MNEMODIR=${LMNEMODIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||} +PLIST_SUB= MNEMODIR=${LMNEMODIR} PKGMESSAGE= ${WRKDIR}/pkg-message PKGDEINSTALL= ${WRKDIR}/pkg-deinstall SUB_FILES= pkg-message pkg-install pkg-deinstall SUB_LIST= MNEMODIR=${MNEMODIR} REINPLACE_ARGS= -i "" -DOCS= LICENSE README docs/CHANGES docs/CREDITS docs/INSTALL \ - docs/RELEASE_NOTES docs/TODO docs/UPGRADING +PORTDOCS= README CHANGES CREDITS INSTALL \ + RELEASE_NOTES TODO UPGRADING CONFFILE= prefs.php SUB_DIRS= config js lib locale po scripts templates themes @@ -41,34 +41,28 @@ CONFDIR= ${MNEMODIR}/config .include -.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: @(cd ${WRKSRC}/scripts && \ ${FIND} . -name "*.php" -exec \ ${REINPLACE_CMD} -e "s:/usr/local/bin/php: ${LOCALBASE}/bin/php:;s:/usr/bin/php: ${LOCALBASE}/bin/php:" {} \; ) - @${SED} -e "s:/home/httpd/html/horde/mnemo:${MNEMODIR}:g" \ - ${FILESDIR}/httpd.conf.mnemo > ${WRKDIR}/httpd-mnemo.conf do-install: - @${MKDIR} ${MNEMODIR} -.for REP in ${SUB_DIRS} - @${CP} -Rp ${WRKSRC}/${REP} ${MNEMODIR} -.endfor - @${CP} -p ${WRKSRC}/*.php ${MNEMODIR} - - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${MNEMODIR} - @${CHMOD} -R o-rwx ${CONFDIR} - @${INSTALL_DATA} ${WRKDIR}/httpd-mnemo.conf ${HORDE_INC} + @${INSTALL} -d ${MNEMODIR}/ + @${CP} -Rp ${SUB_DIRS:S|^|${WRKSRC}/|} ${MNEMODIR}/ + @${CP} -p ${WRKSRC}/*.php ${MNEMODIR}/ + @${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR}/ + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${MNEMODIR}/ + @${CHMOD} -R o-rwx ${MNEMODIR}/ + ${ECHO_CMD} @exec ${CHOWN} -R ${WWWOWN}:${WWWGRP}\ + %D/${MNEMODIR:S|^${PREFIX}/||}/ >> ${TMPPLIST} + ${ECHO_CMD} @exec ${CHMOD} -R o-rwx\ + %D/${MNEMODIR:S|^${PREFIX}/||}/ >> ${TMPPLIST} .if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for FILE in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} -.endfor + @${INSTALL} -d ${DOCSDIR}/ + @${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${DOCSDIR}/ @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." .endif diff --git a/deskutils/mnemo/files/httpd.conf.mnemo b/deskutils/mnemo/files/httpd.conf.mnemo deleted file mode 100644 index c87a3b7ef1c1..000000000000 --- a/deskutils/mnemo/files/httpd.conf.mnemo +++ /dev/null @@ -1,31 +0,0 @@ -# This is included in Apache's httpd.conf for Mnemo -# -# For security, don't serve pages from the Mnemo configuration and -# library directories. -# - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - -# End of Mnemo configuration ================ - diff --git a/deskutils/mnemo/files/pkg-message.in b/deskutils/mnemo/files/pkg-message.in index db86ecf84943..bbd8d585a94d 100644 --- a/deskutils/mnemo/files/pkg-message.in +++ b/deskutils/mnemo/files/pkg-message.in @@ -12,5 +12,4 @@ mysql --user=root --password=yourpass horde < mnemo.sql Finally, you must login to Horde as a Horde Administrator to finish the configuration. -To protect your configuration files, you have to restart Apache. ************************************************************************ diff --git a/deskutils/mnemo/pkg-plist b/deskutils/mnemo/pkg-plist index 8d1f006ae5d8..1812bb6810af 100644 --- a/deskutils/mnemo/pkg-plist +++ b/deskutils/mnemo/pkg-plist @@ -1,12 +1,3 @@ -%%HORDE_INC%%/httpd-mnemo.conf -%%PORTDOCS%%%%DOCSDIR%%/LICENSE -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES -%%PORTDOCS%%%%DOCSDIR%%/CHANGES -%%PORTDOCS%%%%DOCSDIR%%/CREDITS -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%%%DOCSDIR%%/UPGRADING %%MNEMODIR%%/config/.htaccess %%MNEMODIR%%/config/conf.xml %%MNEMODIR%%/config/prefs.php.dist @@ -122,7 +113,6 @@ %%MNEMODIR%%/themes/graphics/za.png %%MNEMODIR%%/themes/screen.css %%MNEMODIR%%/view.php -%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%MNEMODIR%%/themes/graphics @dirrm %%MNEMODIR%%/themes @dirrm %%MNEMODIR%%/templates/view diff --git a/deskutils/nag/Makefile b/deskutils/nag/Makefile index 79b6d2df37ed..8f0c055af8df 100644 --- a/deskutils/nag/Makefile +++ b/deskutils/nag/Makefile @@ -8,6 +8,7 @@ PORTNAME= nag PORTVERSION= 2.1.3 DISTVERSIONPREFIX= h3- +PORTREVISION= 1 CATEGORIES= deskutils www MASTER_SITES= HORDE @@ -17,7 +18,6 @@ COMMENT= Simple multiuser task list manager RUN_DEPENDS= ${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde-base NO_BUILD= yes -USE_APACHE= 1.3+ # needed to test APACHE_VERSION USE_GETTEXT= yes PLIST_SUB= NAGDIR=${LNAGDIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||} @@ -40,12 +40,6 @@ CONFDIR= ${NAGDIR}/config .include -.if ${APACHE_VERSION} >= 20 -HORDE_INC= ${LOCALBASE}/etc/apache${APACHE_VERSION:S/20/2/}/Includes -.else -HORDE_INC= ${LOCALBASE}/etc/horde -.endif - post-extract: @${MV} ${WRKSRC}/README ${WRKSRC}/docs/ @@ -53,17 +47,18 @@ pre-configure: @(cd ${WRKSRC}/scripts && \ ${FIND} . -name "*.php" -exec \ ${REINPLACE_CMD} -e "s:/usr/local/bin/php: ${LOCALBASE}/bin/php:;s:/usr/bin/php: ${LOCALBASE}/bin/php:" {} \; ) - @${SED} -e "s:/home/httpd/html/horde/nag:${NAGDIR}:g" \ - ${FILESDIR}/httpd.conf.nag > ${WRKDIR}/httpd-nag.conf do-install: @${INSTALL} -d ${NAGDIR}/ @${CP} -Rp ${SUB_DIRS:S|^|${WRKSRC}/|} ${NAGDIR}/ @${CP} -p ${WRKSRC}/*.php ${NAGDIR}/ @${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR}/ - @${INSTALL_DATA} ${WRKDIR}/httpd-nag.conf ${HORDE_INC}/ @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${NAGDIR}/ - @${CHMOD} -R o-rwx ${CONFDIR}/ + @${CHMOD} -R o-rwx ${NAGDIR}/ + ${ECHO_CMD} @exec ${CHOWN} -R ${WWWOWN}:${WWWGRP}\ + %D/${NAGDIR:S|^${PREFIX}/||}/ >> ${TMPPLIST} + ${ECHO_CMD} @exec ${CHMOD} -R o-rwx\ + %D/${NAGDIR:S|^${PREFIX}/||}/ >> ${TMPPLIST} .if !defined(NOPORTDOCS) @${INSTALL} -d ${DOCSDIR}/ @${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${DOCSDIR}/ diff --git a/deskutils/nag/files/httpd.conf.nag b/deskutils/nag/files/httpd.conf.nag deleted file mode 100644 index c5279c8245fa..000000000000 --- a/deskutils/nag/files/httpd.conf.nag +++ /dev/null @@ -1,31 +0,0 @@ -# This is included in Apache's httpd.conf for Nag -# -# For security, don't serve pages from the Nag configuration and -# library directories. -# - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - -# End of Nag configuration ================ - diff --git a/deskutils/nag/files/pkg-message.in b/deskutils/nag/files/pkg-message.in index 4713eea2cb00..98c57ea5118a 100644 --- a/deskutils/nag/files/pkg-message.in +++ b/deskutils/nag/files/pkg-message.in @@ -12,5 +12,4 @@ mysql --user=root --password=yourpass horde < nag.sql Finally, you must login to Horde as a Horde Administrator to finish the configuration. -To protect your configuration files, you have to restart Apache. ************************************************************************ diff --git a/deskutils/nag/pkg-plist b/deskutils/nag/pkg-plist index 1f60eedfab6b..8681dda8b9a9 100644 --- a/deskutils/nag/pkg-plist +++ b/deskutils/nag/pkg-plist @@ -136,7 +136,6 @@ %%NAGDIR%%/themes/graphics/za.png %%NAGDIR%%/themes/screen.css %%NAGDIR%%/view.php -%%HORDE_INC%%/httpd-nag.conf @dirrm %%NAGDIR%%/themes/graphics @dirrm %%NAGDIR%%/themes @dirrm %%NAGDIR%%/templates/view 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. -# - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - -# 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 -.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. -# - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - -# 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. -# - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - -# 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 -.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. -# - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - -# 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. -# - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - -# 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 -.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. -# - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - - - order deny,allow - deny from all - -# 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 -- cgit v1.2.3