Attachment 115396 Details for Bug 157166 – file.diff

[patch] file.diff

file.diff (text/plain), 1.16 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.16 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /exports/cvsroot-freebsd/ports/www/tomcat7/Makefile,v
>retrieving revision 1.65
>diff -u -r1.65 Makefile
>--- Makefile	4 May 2011 07:47:56 -0000	1.65
>+++ Makefile	18 May 2011 18:40:43 -0000
>@@ -28,7 +28,7 @@
> 
> TOMCAT_SUBDIR?=	${DISTNAME:R}
> TOMCAT_HOME=	${PREFIX}/${TOMCAT_SUBDIR}
>-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=${TOMCAT_SUBDIR} CONF_EXT=${CONF_EXT} \
> 		WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
>@@ -47,7 +47,7 @@
> 
> post-patch:
> 	@${FIND} ${WRKSRC} -name '*.bat' -delete
>-.for f in ${CONF_FILES}
>+.for f in ${TOMCAT_CONF_FILES}
> 	@${MV} ${WRKSRC}/conf/${f} ${WRKSRC}/conf/${f}.${CONF_EXT}
> .endfor
> 
>@@ -61,7 +61,7 @@
> 	@${CP} -R ${WRKSRC}/* ${TOMCAT_HOME}
> 	@${ECHO_MSG} " [ DONE ]"
> 
>-.for f in ${CONF_FILES}
>+.for f in ${TOMCAT_CONF_FILES}
> .	if !exists(${TOMCAT_HOME}/conf/${f})
> 		@${CP} ${TOMCAT_HOME}/conf/${f}.${CONF_EXT} ${TOMCAT_HOME}/conf/${f}
> .	else

Actions: View | Diff

Attachments on bug 157166: 115396