Problem reported by Lewis Thompson: if you run Apache 2, htpasswd

is installed in $LOCALBASE/sbin, not $LOCALBASE/bin.

Since I'm there, remove IS_INTERACTIVE (by default, it will
depends on lang/php4-horde, build with MCAL support).

BUMPED PORTREVISION

PR:		58091
Submitted by:	MAINTAINER
This commit is contained in:
James E. Housley 2003-11-06 11:24:48 +00:00
parent 4204e2c4d1
commit c0f73976fb
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=93233
3 changed files with 27 additions and 9 deletions

View File

@ -7,6 +7,7 @@
PORTNAME= kronolith
PORTVERSION= 1.1
PORTREVISION= 1
CATEGORIES= deskutils www
MASTER_SITES= ftp://ftp.horde.org/pub/kronolith/ \
ftp://ftp.au.horde.org/pub/horde/kronolith/ \
@ -22,10 +23,15 @@ RUN_DEPENDS= ${LOCALBASE}/www/horde/imp/index.php:${PORTSDIR}/mail/imp3
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
IS_INTERACTIVE= 'need to build mod_php4 with MCAL option set.'
NO_BUILD= yes
USE_REINPLACE= yes
.if defined(WITH_APACHE2)
HTPASSWD= ${LOCALBASE}/sbin/htpasswd
.else
HTPASSWD= ${LOCALBASE}/bin/htpasswd
.endif
REINPLACE_ARGS= -i.beforeKronolith
DOCS= COPYING README docs/CHANGES docs/CREDITS docs/INSTALL
CONFFILE= conf.php html.php keywords.php menu.php prefs.php
@ -92,13 +98,13 @@ post-install:
${ECHO_MSG} "===> Creating ${LOCALBASE}/etc/mpasswd" ; \
${ECHO} -n "Please enter a password for www's calendar: " ; \
(read PASSCAL; \
${LOCALBASE}/bin/htpasswd -bc ${LOCALBASE}/etc/mpasswd www $${PASSCAL}; \
${HTPASSWD} -bc ${LOCALBASE}/etc/mpasswd www $${PASSCAL}; \
${REINPLACE_CMD} -e "s:%%PASSCAL%%:$${PASSCAL}:" ${CONFDIR}/conf.php) \
elif ! ${GREP} -q -e "^www" ${LOCALBASE}/etc/mpasswd ; then \
${ECHO_MSG} "===> Adding www into ${LOCALBASE}/etc/mpasswd" ; \
${ECHO} -n "Please enter a password for www's calendar: " ; \
(read PASSCAL; \
${LOCALBASE}/bin/htpasswd -b ${LOCALBASE}/etc/mpasswd www $${PASSCAL} ; \
${HTPASSWD} -b ${LOCALBASE}/etc/mpasswd www $${PASSCAL} ; \
${REINPLACE_CMD} -e "s:%%PASSCAL%%:$${PASSCAL}:" ${CONFDIR}/conf.php) \
else \
${REINPLACE_CMD} -e "s:%%PASSCAL%%:www_cal_password:" ${CONFDIR}/conf.php ; \

View File

@ -7,6 +7,7 @@
PORTNAME= kronolith
PORTVERSION= 1.1
PORTREVISION= 1
CATEGORIES= deskutils www
MASTER_SITES= ftp://ftp.horde.org/pub/kronolith/ \
ftp://ftp.au.horde.org/pub/horde/kronolith/ \
@ -22,10 +23,15 @@ RUN_DEPENDS= ${LOCALBASE}/www/horde/imp/index.php:${PORTSDIR}/mail/imp3
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
IS_INTERACTIVE= 'need to build mod_php4 with MCAL option set.'
NO_BUILD= yes
USE_REINPLACE= yes
.if defined(WITH_APACHE2)
HTPASSWD= ${LOCALBASE}/sbin/htpasswd
.else
HTPASSWD= ${LOCALBASE}/bin/htpasswd
.endif
REINPLACE_ARGS= -i.beforeKronolith
DOCS= COPYING README docs/CHANGES docs/CREDITS docs/INSTALL
CONFFILE= conf.php html.php keywords.php menu.php prefs.php
@ -92,13 +98,13 @@ post-install:
${ECHO_MSG} "===> Creating ${LOCALBASE}/etc/mpasswd" ; \
${ECHO} -n "Please enter a password for www's calendar: " ; \
(read PASSCAL; \
${LOCALBASE}/bin/htpasswd -bc ${LOCALBASE}/etc/mpasswd www $${PASSCAL}; \
${HTPASSWD} -bc ${LOCALBASE}/etc/mpasswd www $${PASSCAL}; \
${REINPLACE_CMD} -e "s:%%PASSCAL%%:$${PASSCAL}:" ${CONFDIR}/conf.php) \
elif ! ${GREP} -q -e "^www" ${LOCALBASE}/etc/mpasswd ; then \
${ECHO_MSG} "===> Adding www into ${LOCALBASE}/etc/mpasswd" ; \
${ECHO} -n "Please enter a password for www's calendar: " ; \
(read PASSCAL; \
${LOCALBASE}/bin/htpasswd -b ${LOCALBASE}/etc/mpasswd www $${PASSCAL} ; \
${HTPASSWD} -b ${LOCALBASE}/etc/mpasswd www $${PASSCAL} ; \
${REINPLACE_CMD} -e "s:%%PASSCAL%%:$${PASSCAL}:" ${CONFDIR}/conf.php) \
else \
${REINPLACE_CMD} -e "s:%%PASSCAL%%:www_cal_password:" ${CONFDIR}/conf.php ; \

View File

@ -7,6 +7,7 @@
PORTNAME= kronolith
PORTVERSION= 1.1
PORTREVISION= 1
CATEGORIES= deskutils www
MASTER_SITES= ftp://ftp.horde.org/pub/kronolith/ \
ftp://ftp.au.horde.org/pub/horde/kronolith/ \
@ -22,10 +23,15 @@ RUN_DEPENDS= ${LOCALBASE}/www/horde/imp/index.php:${PORTSDIR}/mail/imp3
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
IS_INTERACTIVE= 'need to build mod_php4 with MCAL option set.'
NO_BUILD= yes
USE_REINPLACE= yes
.if defined(WITH_APACHE2)
HTPASSWD= ${LOCALBASE}/sbin/htpasswd
.else
HTPASSWD= ${LOCALBASE}/bin/htpasswd
.endif
REINPLACE_ARGS= -i.beforeKronolith
DOCS= COPYING README docs/CHANGES docs/CREDITS docs/INSTALL
CONFFILE= conf.php html.php keywords.php menu.php prefs.php
@ -92,13 +98,13 @@ post-install:
${ECHO_MSG} "===> Creating ${LOCALBASE}/etc/mpasswd" ; \
${ECHO} -n "Please enter a password for www's calendar: " ; \
(read PASSCAL; \
${LOCALBASE}/bin/htpasswd -bc ${LOCALBASE}/etc/mpasswd www $${PASSCAL}; \
${HTPASSWD} -bc ${LOCALBASE}/etc/mpasswd www $${PASSCAL}; \
${REINPLACE_CMD} -e "s:%%PASSCAL%%:$${PASSCAL}:" ${CONFDIR}/conf.php) \
elif ! ${GREP} -q -e "^www" ${LOCALBASE}/etc/mpasswd ; then \
${ECHO_MSG} "===> Adding www into ${LOCALBASE}/etc/mpasswd" ; \
${ECHO} -n "Please enter a password for www's calendar: " ; \
(read PASSCAL; \
${LOCALBASE}/bin/htpasswd -b ${LOCALBASE}/etc/mpasswd www $${PASSCAL} ; \
${HTPASSWD} -b ${LOCALBASE}/etc/mpasswd www $${PASSCAL} ; \
${REINPLACE_CMD} -e "s:%%PASSCAL%%:$${PASSCAL}:" ${CONFDIR}/conf.php) \
else \
${REINPLACE_CMD} -e "s:%%PASSCAL%%:www_cal_password:" ${CONFDIR}/conf.php ; \