From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Nov 1 23:20:11 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A634A1065697 for ; Mon, 1 Nov 2010 23:20:11 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 6E4128FC1C for ; Mon, 1 Nov 2010 23:20:11 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id oA1NKBlX080594 for ; Mon, 1 Nov 2010 23:20:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id oA1NKBaY080593; Mon, 1 Nov 2010 23:20:11 GMT (envelope-from gnats) Resent-Date: Mon, 1 Nov 2010 23:20:11 GMT Resent-Message-Id: <201011012320.oA1NKBaY080593@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Olli Hauer Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D7313106566C; Mon, 1 Nov 2010 23:13:50 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from u18-124.dslaccess.de (unknown [194.231.39.124]) by mx1.freebsd.org (Postfix) with ESMTP id 8D02C8FC21; Mon, 1 Nov 2010 23:13:50 +0000 (UTC) Received: by u18-124.dslaccess.de (Postfix, from userid 1100) id B0B902048D; Tue, 2 Nov 2010 00:13:49 +0100 (CET) Message-Id: <20101101231349.B0B902048D@u18-124.dslaccess.de> Date: Tue, 2 Nov 2010 00:13:49 +0100 (CET) From: Olli Hauer To: X-Send-Pr-Version: 3.113 Cc: ohauer@gmx.de Subject: ports/151880: [patch] port www/tomcat6 replace ugly find construct X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Nov 2010 23:20:11 -0000 >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 >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: