ports/151880: [patch] port www/tomcat6 replace ugly find construct

[Olli Hauer]

>Number:         151880
>Category:       ports
>Synopsis:       [patch] port www/tomcat6 replace ugly find construct
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 01 23:20:11 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Olli Hauer <ohauer at FreeBSD.org>
>Release:        FreeBSD 7.3-RELEASE-p3 i386
>Organization:
>Environment:


>Description:
Replace a ugly find construct in post-patch phase


>How-To-Repeat:
>Fix:


--- patch_tomcat6.txt begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/www/tomcat6/Makefile,v
retrieving revision 1.58
diff -u -r1.58 Makefile
--- Makefile	26 Jul 2010 11:13:32 -0000	1.58
+++ Makefile	1 Nov 2010 22:05:23 -0000
@@ -69,8 +69,7 @@
 
 post-patch:
 	@${REINPLACE_CMD} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${WRKSRC}/conf/server.xml
-	@${RM} -f `${FIND} ${WRKSRC} -name '*.bat'` `${FIND} ${WRKSRC} -name '*.exe'` \
-		`${FIND} ${WRKSRC} -name '*.orig'` `${FIND} ${WRKSRC} -name '*.bak'`
+	@${FIND} ${WRKSRC} -type f \( -name '*.bak' -or -name '*.bat' -or -name '*.dll' -or -name '*.exe' -or -name '*.orig' \) -delete
 .for f in ${CONF_FILES}
 	@${MV} ${WRKSRC}/conf/${f} ${WRKSRC}/conf/${f}.${CONF_EXT}
 .endfor
--- patch_tomcat6.txt ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: