From jilles@stack.nl  Wed Oct  6 20:20:39 2010
Return-Path: <jilles@stack.nl>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0B337106566B
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  6 Oct 2010 20:20:39 +0000 (UTC)
	(envelope-from jilles@stack.nl)
Received: from mx1.stack.nl (relay02.stack.nl [IPv6:2001:610:1108:5010::104])
	by mx1.freebsd.org (Postfix) with ESMTP id C91608FC16
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  6 Oct 2010 20:20:38 +0000 (UTC)
Received: from turtle.stack.nl (turtle.stack.nl [IPv6:2001:610:1108:5010::132])
	by mx1.stack.nl (Postfix) with ESMTP id E0B9935A825
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  6 Oct 2010 22:20:36 +0200 (CEST)
Received: by turtle.stack.nl (Postfix, from userid 1677)
	id D7ACB17312; Wed,  6 Oct 2010 22:20:36 +0200 (CEST)
Message-Id: <20101006202036.D7ACB17312@turtle.stack.nl>
Date: Wed,  6 Oct 2010 22:20:36 +0200 (CEST)
From: Jilles Tjoelker <jilles@stack.nl>
Reply-To: Jilles Tjoelker <jilles@stack.nl>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] emulators/xsystem35: syntax error in Makefile
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         151266
>Category:       ports
>Synopsis:       [PATCH] emulators/xsystem35: syntax error in Makefile
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 06 20:30:01 UTC 2010
>Closed-Date:    Mon Oct 18 19:20:21 UTC 2010
>Last-Modified:  Mon Oct 18 19:30:05 UTC 2010
>Originator:     Jilles Tjoelker
>Release:        FreeBSD 8.1-STABLE i386
>Organization:
MCGV Stack
>Environment:
any
>Description:
The port Makefile has a stray "done" keyword.

Our sh(1) has sort of allowed this, but this lets clearly wrong scripts
through and has poorly defined and inconsistent behaviour; therefore I
would like to change sh(1) to make such stray keywords an error.
>How-To-Repeat:
Inspect the Makefile and/or build with a stricter sh(1).
>Fix:
Apply this patch to the port Makefile.

--- emulators-xsystem35-syntaxfix.patch begins here ---
--- ports/emulators/xsystem35/Makefile.orig	2010-09-15 20:34:24.000000000 +0200
+++ ports/emulators/xsystem35/Makefile	2010-10-06 22:04:06.000000000 +0200
@@ -72,8 +72,7 @@
 post-patch:
 	${FIND} ${WRKSRC}/src -type f |\
 	${XARGS} ${GREP} -l '<SDL/SDL' /dev/null |\
-	${XARGS} ${REINPLACE_CMD} -e 's,<SDL/,<,'; \
-	done
+	${XARGS} ${REINPLACE_CMD} -e 's,<SDL/,<,'
 
 pre-configure:
 	(cd ${WRKSRC}/libltdl; ${AUTOCONF})
--- emulators-xsystem35-syntaxfix.patch ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: johans 
State-Changed-When: Mon Oct 18 19:19:59 UTC 2010 
State-Changed-Why:  
Committed, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=151266 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/151266: commit references a PR
Date: Mon, 18 Oct 2010 19:19:53 +0000 (UTC)

 johans      2010-10-18 19:19:49 UTC
 
   FreeBSD ports repository
 
   Modified files:
     emulators/xsystem35  Makefile 
   Log:
   Remove stray 'done' keyword from Makefile (breaks build with new sh)
   
   PR:             ports/151266
   Submitted by:   jilles
   
   Revision  Changes    Path
   1.68      +2 -3      ports/emulators/xsystem35/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
