From owner-svn-ports-all@FreeBSD.ORG  Thu May 22 03:27:05 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id F2356D4E;
 Thu, 22 May 2014 03:27:04 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id AA1702DB9;
 Thu, 22 May 2014 03:27:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4M3R4Oc078764;
 Thu, 22 May 2014 03:27:04 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4M3R4m7078761;
 Thu, 22 May 2014 03:27:04 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201405220327.s4M3R4m7078761@svn.freebsd.org>
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Thu, 22 May 2014 03:27:04 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r354765 - in head/cad/klayout: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 May 2014 03:27:05 -0000

Author: hrs
Date: Thu May 22 03:27:03 2014
New Revision: 354765
URL: http://svnweb.freebsd.org/changeset/ports/354765
QAT: https://qat.redports.org/buildarchive/r354765/

Log:
  Fix build on a box where gcc does not exist.

Modified:
  head/cad/klayout/Makefile
  head/cad/klayout/files/patch-build.sh

Modified: head/cad/klayout/Makefile
==============================================================================
--- head/cad/klayout/Makefile	Thu May 22 03:23:50 2014	(r354764)
+++ head/cad/klayout/Makefile	Thu May 22 03:27:03 2014	(r354765)
@@ -29,7 +29,8 @@ PLATFORMKEYWORD=freebsd-32-gcc-release
 
 do-build:
 	cd ${WRKSRC} && \
-	    ${SH} build.sh -platform ${PLATFORMKEYWORD} \
+	    ${SETENV} CC=${CC} CXX=${CXX} \
+		${SH} build.sh -platform ${PLATFORMKEYWORD} \
 		-qtbin ${QT_PREFIX}/bin \
 		-qtinc ${QT_INCDIR} \
 		-qtlib ${QT_LIBDIR}

Modified: head/cad/klayout/files/patch-build.sh
==============================================================================
--- head/cad/klayout/files/patch-build.sh	Thu May 22 03:23:50 2014	(r354764)
+++ head/cad/klayout/files/patch-build.sh	Thu May 22 03:27:03 2014	(r354765)
@@ -1,5 +1,5 @@
 --- build.sh.orig	2014-02-24 05:44:13.000000000 +0900
-+++ build.sh	2014-03-14 21:49:48.000000000 +0900
++++ build.sh	2014-05-22 11:58:57.000000000 +0900
 @@ -1,7 +1,7 @@
  #!/bin/sh 
  
@@ -19,6 +19,15 @@
  *)
    # Assume Linux for the remaining variants
    case `arch` in
+@@ -261,7 +264,7 @@
+   echo "    64 bit coordinates enabled"
+ fi
+ 
+-gcc_path=`type gcc 2>/dev/null`
++gcc_path=`type $CC 2>/dev/null`
+ if [ "$gcc_path" = "" ]; then
+   echo "*** ERROR: unable to locate gcc in path"
+   exit 1
 @@ -284,11 +287,11 @@
    ;;
  esac