View | Details | Raw Unified | Return to bug 157166
Collapse All | Expand All

(-)Makefile (-3 / +3 lines)
Lines 28-34 Link Here
28
28
29
TOMCAT_SUBDIR?=	${DISTNAME:R}
29
TOMCAT_SUBDIR?=	${DISTNAME:R}
30
TOMCAT_HOME=	${PREFIX}/${TOMCAT_SUBDIR}
30
TOMCAT_HOME=	${PREFIX}/${TOMCAT_SUBDIR}
31
CONF_FILES=	catalina.policy catalina.properties context.xml logging.properties server.xml tomcat-users.xml web.xml
31
TOMCAT_CONF_FILES=	catalina.policy catalina.properties context.xml logging.properties server.xml tomcat-users.xml web.xml
32
CONF_EXT=	sample
32
CONF_EXT=	sample
33
PLIST_SUB=	T=${TOMCAT_SUBDIR} CONF_EXT=${CONF_EXT} \
33
PLIST_SUB=	T=${TOMCAT_SUBDIR} CONF_EXT=${CONF_EXT} \
34
		WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
34
		WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
Lines 47-53 Link Here
47
47
48
post-patch:
48
post-patch:
49
	@${FIND} ${WRKSRC} -name '*.bat' -delete
49
	@${FIND} ${WRKSRC} -name '*.bat' -delete
50
.for f in ${CONF_FILES}
50
.for f in ${TOMCAT_CONF_FILES}
51
	@${MV} ${WRKSRC}/conf/${f} ${WRKSRC}/conf/${f}.${CONF_EXT}
51
	@${MV} ${WRKSRC}/conf/${f} ${WRKSRC}/conf/${f}.${CONF_EXT}
52
.endfor
52
.endfor
53
53
Lines 61-67 Link Here
61
	@${CP} -R ${WRKSRC}/* ${TOMCAT_HOME}
61
	@${CP} -R ${WRKSRC}/* ${TOMCAT_HOME}
62
	@${ECHO_MSG} " [ DONE ]"
62
	@${ECHO_MSG} " [ DONE ]"
63
63
64
.for f in ${CONF_FILES}
64
.for f in ${TOMCAT_CONF_FILES}
65
.	if !exists(${TOMCAT_HOME}/conf/${f})
65
.	if !exists(${TOMCAT_HOME}/conf/${f})
66
		@${CP} ${TOMCAT_HOME}/conf/${f}.${CONF_EXT} ${TOMCAT_HOME}/conf/${f}
66
		@${CP} ${TOMCAT_HOME}/conf/${f}.${CONF_EXT} ${TOMCAT_HOME}/conf/${f}
67
.	else
67
.	else

Return to bug 157166