From owner-svn-ports-head@FreeBSD.ORG  Fri Oct 26 05:31:59 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id BC6D0514;
 Fri, 26 Oct 2012 05:31:59 +0000 (UTC)
 (envelope-from jhale@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id A3EAF8FC0A;
 Fri, 26 Oct 2012 05:31:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9Q5Vx1O029889;
 Fri, 26 Oct 2012 05:31:59 GMT (envelope-from jhale@svn.freebsd.org)
Received: (from jhale@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9Q5VxD0029886;
 Fri, 26 Oct 2012 05:31:59 GMT (envelope-from jhale@svn.freebsd.org)
Message-Id: <201210260531.q9Q5VxD0029886@svn.freebsd.org>
From: "Jason E. Hale" <jhale@FreeBSD.org>
Date: Fri, 26 Oct 2012 05:31:59 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r306416 - in head/audio/oss: . 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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Oct 2012 05:31:59 -0000

Author: jhale
Date: Fri Oct 26 05:31:59 2012
New Revision: 306416
URL: http://svn.freebsd.org/changeset/ports/306416

Log:
  - Add fix to allow building with clang
  - Trim Makefile header
  
  PR:		ports/172609
  Submitted by:	Jan Beich <jbeich@tormail.org>
  Approved by:	makc, avilla (mentors, implicit)
  Feature safe:	yes

Modified:
  head/audio/oss/Makefile   (contents, props changed)
  head/audio/oss/files/patch-setup-srcconf.c   (contents, props changed)

Modified: head/audio/oss/Makefile
==============================================================================
--- head/audio/oss/Makefile	Fri Oct 26 05:17:21 2012	(r306415)
+++ head/audio/oss/Makefile	Fri Oct 26 05:31:59 2012	(r306416)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	oss
-# Date created:		2007-06-14
-# Whom:			Edward Tomasz Napierala <trasz@FreeBSD.org>
-#
+# Created by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	oss
 DISTVERSION=	4.2-build2007
@@ -54,7 +50,7 @@ PROTO_SBINDIR=	${PROTO_DIR}/usr/sbin
 PROTO_MANDIR=	${PROTO_DIR}/usr/share/man
 PROTO_OSSLIBDIR=${PROTO_DIR}${PREFIX}/lib/oss
 
-CONFIGURE_ENV=	HOSTCC="${CC}"
+CONFIGURE_ENV=	CC="${CC}" HOSTCC="${CC}"
 
 OPTIONS_DEFINE=	VORBIS
 OPTIONS_DEFAULT=VORBIS

Modified: head/audio/oss/files/patch-setup-srcconf.c
==============================================================================
--- head/audio/oss/files/patch-setup-srcconf.c	Fri Oct 26 05:17:21 2012	(r306415)
+++ head/audio/oss/files/patch-setup-srcconf.c	Fri Oct 26 05:31:59 2012	(r306416)
@@ -9,3 +9,12 @@
  	}
  
        if (strcmp (line, "project") == 0)
+@@ -913,7 +913,7 @@
+   if (config_phpmake)
+      fprintf (f, "<?php require getenv(\"PHPMAKE_LIBPATH\") . \"library.php\"; phpmake_makefile_top_rules(); ?>\n");
+ 
+-  fprintf (f, "CC=%s\n", conf.ccomp);
++  fprintf (f, "CC=%s\n", targetcc);
+   // fprintf (f, "LD=ld\n");
+   fprintf (f, "HOSTCC=%s\n", hostcc);
+   fprintf (f, "CPLUSPLUS=%s\n", conf.cplusplus);