From a28c4d1ff19c9570afd505546f623be1d842b9cf Mon Sep 17 00:00:00 2001 From: Murray Stokely Date: Wed, 5 Oct 2005 04:55:34 +0000 Subject: [PATCH] Fix events creation by properly generating curdate.xml file which the XSLT script needs to reason about which events are in the future and which have already occurred. It's not clear to me how Emily broke this in the first place, but this fixes it at least. --- en/events/Makefile | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/en/events/Makefile b/en/events/Makefile index 0a244cce55..fdc7be0737 100644 --- a/en/events/Makefile +++ b/en/events/Makefile @@ -1,4 +1,4 @@ -# $FreeBSD: www/en/events/Makefile,v 1.9 2005/09/18 04:33:45 hrs Exp $ +# $FreeBSD: www/en/events/Makefile,v 1.10 2005/10/04 18:28:28 hrs Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -9,6 +9,8 @@ SUBDIR= 2002 SUBDIR+= 2003 +DATE?= /bin/date +TR?= /usr/bin/tr DATA= events.css @@ -17,11 +19,30 @@ CLEANFILES+= curdate.xml XMLLINT?= /usr/local/bin/xmllint # Part of textproc/libxml2. XMLDOCS+= events -DEPENDSET.events= events +DEPENDSET.events= events curdate.xml +SRCS.events= ../includes.xsl curdate.xml XMLDOCS+= events_ics:${WEB_PREFIX}/share/sgml/events2ics.xsl:events.xml:events.ics lint: ${XMLLINT} ${XMLLINTOPTS} --valid -o /dev/null ${.CURDIR}/events.xml +.if !make(install) +.PHONY: curdate.xml +.endif +curdate.xml: + @${ECHO} "Generating ${.TARGET}" + @${ECHO_CMD} '' > ${.TARGET} + @${ECHO_CMD} '' >> ${.TARGET} + @${ECHO_CMD} -n ' ' >> ${.TARGET} + @${DATE} +%Y | ${TR} -d "\n" >> ${.TARGET} + @${ECHO_CMD} '' >> ${.TARGET} + @${ECHO_CMD} -n ' ' >> ${.TARGET} + @${DATE} +%m | ${TR} -d "\n" >> ${.TARGET} + @${ECHO_CMD} '' >> ${.TARGET} + @${ECHO_CMD} -n ' ' >> ${.TARGET} + @${DATE} +%d | ${TR} -d "\n" >> ${.TARGET} + @${ECHO_CMD} '' >> ${.TARGET} + @${ECHO_CMD} '' >> ${.TARGET} + .include "${WEB_PREFIX}/share/mk/web.site.mk"