ports/58091: deskutils/kronolith: location of htpasswd depends on Apache's version.

[Thierry Thomas]

>Number:         58091
>Category:       ports
>Synopsis:       deskutils/kronolith: location of htpasswd depends on Apache's version.
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 15 14:20:06 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Thierry Thomas
>Release:        FreeBSD 4.9-RC i386
>Organization:
Kabbale Eros
>Environment:
System: FreeBSD graf.pompo.net 4.9-RC FreeBSD 4.9-RC #0: Mon Oct 6 21:15:52 CEST 2003 thierry at graf.pompo.net:/usr/obj/mntsrc/src/sys/GRAF020727 i386


	
>Description:
	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).

>How-To-Repeat:
	Install Apache 2, then Kronolith.

>Fix:
	Please apply the following patch:

--- kronolith.diff begins here ---
diff -urN deskutils/kronolith.orig/Makefile deskutils/kronolith/Makefile
--- deskutils/kronolith.orig/Makefile	Wed May 14 19:19:39 2003
+++ deskutils/kronolith/Makefile	Wed Oct 15 22:30:09 2003
@@ -22,10 +22,15 @@
 
 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 +97,13 @@
 	  ${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 ; \
--- kronolith.diff ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: