Attachment 115395 Details for Bug 157165 – file.diff

[patch] file.diff

file.diff (text/plain), 1.37 KB, created by Chris Rees on 2011-05-18 20:50:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Rees

Created: 2011-05-18 20:50:13 UTC

Size: 1.37 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /exports/cvsroot-freebsd/ports/www/tomcat6/Makefile,v
>retrieving revision 1.62
>diff -u -r1.62 Makefile
>--- Makefile	4 May 2011 07:41:56 -0000	1.62
>+++ Makefile	18 May 2011 18:46:41 -0000
>@@ -37,7 +37,8 @@
> STDOUT_LOG=	${LOG_DIR}/stdout.log
> STDERR_LOG=	${LOG_DIR}/stderr.log
> JAR_FILE=	bin/bootstrap.jar
>-CONF_FILES=	catalina.policy catalina.properties context.xml logging.properties server.xml tomcat-users.xml web.xml
>+TOMCAT_CONF_FILES=	catalina.policy catalina.properties context.xml \
>+			logging.properties server.xml tomcat-users.xml web.xml
> CONF_EXT=	sample
> PLIST_SUB=	T=${APP_HOME:S/^${PREFIX}\///} CONF_EXT=${CONF_EXT} \
> 		WWWOWN=${TOMCAT_USER} WWWGRP=${TOMCAT_GROUP}
>@@ -73,7 +74,7 @@
> post-patch:
> 	@${REINPLACE_CMD} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${WRKSRC}/conf/server.xml
> 	@${FIND} ${WRKSRC} -type f $ -name '*.bak' -or -name '*.bat' -or -name '*.dll' -or -name '*.exe' -or -name '*.orig' $ -delete
>-.for f in ${CONF_FILES}
>+.for f in ${TOMCAT_CONF_FILES}
> 	@${MV} ${WRKSRC}/conf/${f} ${WRKSRC}/conf/${f}.${CONF_EXT}
> .endfor
> 
>@@ -91,7 +92,7 @@
> 	@${CP} -R ${WRKSRC}/* ${APP_HOME}
> 	@${ECHO_MSG} " [ DONE ]"
> 
>-.for f in ${CONF_FILES}
>+.for f in ${TOMCAT_CONF_FILES}
> .	if !exists(${APP_HOME}/conf/${f})
> 		@${CP} ${APP_HOME}/conf/${f}.${CONF_EXT} ${APP_HOME}/conf/${f}
> .	else

Actions: View | Diff

Attachments on bug 157165: 115395