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

(-)Makefile (-3 / +4 lines)
Lines 37-43 Link Here
37 
STDOUT_LOG=	${LOG_DIR}/stdout.log
 37 
STDOUT_LOG=	${LOG_DIR}/stdout.log
38 
STDERR_LOG=	${LOG_DIR}/stderr.log
 38 
STDERR_LOG=	${LOG_DIR}/stderr.log
39 
JAR_FILE=	bin/bootstrap.jar
 39 
JAR_FILE=	bin/bootstrap.jar
40 
CONF_FILES=	catalina.policy catalina.properties context.xml logging.properties server.xml tomcat-users.xml web.xml
 40 
TOMCAT_CONF_FILES=	catalina.policy catalina.properties context.xml \
41 
			logging.properties server.xml tomcat-users.xml web.xml
41 
CONF_EXT=	sample
 42 
CONF_EXT=	sample
42 
PLIST_SUB=	T=${APP_HOME:S/^${PREFIX}\///} CONF_EXT=${CONF_EXT} \
 43 
PLIST_SUB=	T=${APP_HOME:S/^${PREFIX}\///} CONF_EXT=${CONF_EXT} \
43 
		WWWOWN=${TOMCAT_USER} WWWGRP=${TOMCAT_GROUP}
 44 
		WWWOWN=${TOMCAT_USER} WWWGRP=${TOMCAT_GROUP}
Lines 73-79 Link Here
73 
post-patch:
 74 
post-patch:
74 
	@${REINPLACE_CMD} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${WRKSRC}/conf/server.xml
 75 
	@${REINPLACE_CMD} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${WRKSRC}/conf/server.xml
75 
	@${FIND} ${WRKSRC} -type f \( -name '*.bak' -or -name '*.bat' -or -name '*.dll' -or -name '*.exe' -or -name '*.orig' \) -delete
 76 
	@${FIND} ${WRKSRC} -type f \( -name '*.bak' -or -name '*.bat' -or -name '*.dll' -or -name '*.exe' -or -name '*.orig' \) -delete
76 
.for f in ${CONF_FILES}
 77 
.for f in ${TOMCAT_CONF_FILES}
77 
	@${MV} ${WRKSRC}/conf/${f} ${WRKSRC}/conf/${f}.${CONF_EXT}
 78 
	@${MV} ${WRKSRC}/conf/${f} ${WRKSRC}/conf/${f}.${CONF_EXT}
78 
.endfor
 79 
.endfor
79 

          80
          

        

  

    
      
            Lines 91-97
          
      
      
        Link Here
      
    
  

        

          91
          
	@${CP} -R ${WRKSRC}/* ${APP_HOME}

          92
          
	@${CP} -R ${WRKSRC}/* ${APP_HOME}

        

        

          92
          
	@${ECHO_MSG} " [ DONE ]"

          93
          
	@${ECHO_MSG} " [ DONE ]"

        

        

          93
          

          94
          

        

          
            

              94
              
.for f in ${CONF_FILES}


              95
              
.for f in ${TOMCAT_CONF_FILES}

            

        

          95
          
.	if !exists(${APP_HOME}/conf/${f})

          96
          
.	if !exists(${APP_HOME}/conf/${f})

        

        

          96
          
		@${CP} ${APP_HOME}/conf/${f}.${CONF_EXT} ${APP_HOME}/conf/${f}

          97
          
		@${CP} ${APP_HOME}/conf/${f}.${CONF_EXT} ${APP_HOME}/conf/${f}

        

        

          97
          
.	else

          98
          
.	else

        






  

  Return to bug 157165