From nobody@FreeBSD.org  Sun Dec  8 23:26:18 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id 9588DCB8
	for <freebsd-gnats-submit@FreeBSD.org>; Sun,  8 Dec 2013 23:26:18 +0000 (UTC)
Received: from oldred.freebsd.org (oldred.freebsd.org [IPv6:2001:1900:2254:206a::50:4])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 81A9A1827
	for <freebsd-gnats-submit@FreeBSD.org>; Sun,  8 Dec 2013 23:26:18 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id rB8NQCqg094016
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 8 Dec 2013 23:26:12 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id rB8NQCIo094015;
	Sun, 8 Dec 2013 23:26:12 GMT
	(envelope-from nobody)
Message-Id: <201312082326.rB8NQCIo094015@oldred.freebsd.org>
Date: Sun, 8 Dec 2013 23:26:12 GMT
From: John Marino <freebsd@marino.st>
To: freebsd-gnats-submit@FreeBSD.org
Subject: graphics/ayam: [PATCH] unbreak on head
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         184612
>Category:       ports
>Synopsis:       graphics/ayam: [PATCH] unbreak on head
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    marino
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 08 23:30:00 UTC 2013
>Closed-Date:    Mon Dec 09 12:42:40 UTC 2013
>Last-Modified:  Mon Dec 09 12:42:40 UTC 2013
>Originator:     John Marino
>Release:        
>Organization:
>Environment:
>Description:
ayam requires gmake, but "make" is hardcoded in the makefile.
Replacing "make" with "$(MAKE)" will cause the targets to execute gmake instead of bmake (the use of bmake is why this port is failing on head, F10)
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

--- Makefile.orig	2013-12-08 23:16:00.785942000 +0000
+++ Makefile
@@ -42,7 +42,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|^MF3DCFLAGS =|MF3DCFLAGS = -fPIC|g' \
 		${WRKSRC}/MF3D/Makefile.mf3d
 	@${REINPLACE_CMD} -e \
-	   's|%%TCL_INCLUDEDIR%%|${TCL_INCLUDEDIR}|g; \
+	   's|%%TCL_INCLUDEDIR%%|${TCL_INCLUDEDIR}|g; s|make|$$(MAKE)|g; \
 	    s|%%TCL_LIBDIR%%|${LOCALBASE}/lib|g; s|%%TCL_SHLIB_VER%%|${TCL_SHLIB_VER}|g; \
 	    s|%%TK_INCLUDEDIR%%|${TK_INCLUDEDIR}|g; \
 	    s|%%TK_LIBDIR%%|${LOCALBASE}/lib|g; s|%%TK_SHLIB_VER%%|${TK_SHLIB_VER}|g' \


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->gahr 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Dec 8 23:30:08 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=184612 
Responsible-Changed-From-To: gahr->marino 
Responsible-Changed-By: gahr 
Responsible-Changed-When: Mon Dec 9 08:12:30 UTC 2013 
Responsible-Changed-Why:  
Please go ahead. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/184612: commit references a PR
Date: Mon,  9 Dec 2013 10:32:40 +0000 (UTC)

 Author: marino
 Date: Mon Dec  9 10:32:33 2013
 New Revision: 335963
 URL: http://svnweb.freebsd.org/changeset/ports/335963
 
 Log:
   graphics/ayam: Unbreak on F10, head
   
   Due to the harcoded "make" command, bmake was being used instead of the
   specified gmake, which caused breakage on F10 and head.
   
   PR:		ports/184612
   Approved by:	maintainer (gahr)
 
 Modified:
   head/graphics/ayam/Makefile
 
 Modified: head/graphics/ayam/Makefile
 ==============================================================================
 --- head/graphics/ayam/Makefile	Mon Dec  9 10:30:04 2013	(r335962)
 +++ head/graphics/ayam/Makefile	Mon Dec  9 10:32:33 2013	(r335963)
 @@ -42,7 +42,7 @@ post-patch:
  	@${REINPLACE_CMD} -e 's|^MF3DCFLAGS =|MF3DCFLAGS = -fPIC|g' \
  		${WRKSRC}/MF3D/Makefile.mf3d
  	@${REINPLACE_CMD} -e \
 -	   's|%%TCL_INCLUDEDIR%%|${TCL_INCLUDEDIR}|g; \
 +	   's|%%TCL_INCLUDEDIR%%|${TCL_INCLUDEDIR}|g; s|make|$$(MAKE)|g; \
  	    s|%%TCL_LIBDIR%%|${LOCALBASE}/lib|g; s|%%TCL_SHLIB_VER%%|${TCL_SHLIB_VER}|g; \
  	    s|%%TK_INCLUDEDIR%%|${TK_INCLUDEDIR}|g; \
  	    s|%%TK_LIBDIR%%|${LOCALBASE}/lib|g; s|%%TK_SHLIB_VER%%|${TK_SHLIB_VER}|g' \
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: marino 
State-Changed-When: Mon Dec 9 12:42:38 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=184612 
>Unformatted:
