Attachment 36169 Details for Bug 58091 – kronolith.diff

[patch] kronolith.diff

kronolith.diff (text/plain), 1.54 KB, created by Thierry Thomas on 2003-10-15 22:20:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Thomas

Created: 2003-10-15 22:20:06 UTC

Size: 1.54 KB

patch

obsolete

>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 ; \

Actions: View | Diff

Attachments on bug 58091: 36169