From owner-svn-ports-head@FreeBSD.ORG  Wed May 22 21:33:25 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id B883A1EB;
 Wed, 22 May 2013 21:33:25 +0000 (UTC)
 (envelope-from mandree@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 9125B90E;
 Wed, 22 May 2013 21:33:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4MLXOJu076784;
 Wed, 22 May 2013 21:33:24 GMT (envelope-from mandree@svn.freebsd.org)
Received: (from mandree@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4MLXOEm076783;
 Wed, 22 May 2013 21:33:24 GMT (envelope-from mandree@svn.freebsd.org)
Message-Id: <201305222133.r4MLXOEm076783@svn.freebsd.org>
From: Matthias Andree <mandree@FreeBSD.org>
Date: Wed, 22 May 2013 21:33:24 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r318796 - head/sysutils/replicant
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: Wed, 22 May 2013 21:33:25 -0000

Author: mandree
Date: Wed May 22 21:33:24 2013
New Revision: 318796
URL: http://svnweb.freebsd.org/changeset/ports/318796

Log:
  - Change USE_GCC=4.6 (explicit version) to USE_GCC=yes, [1].
  
  - In order to get that working, beat compilation environment into shape
    for GCC 4.7/4.8 with two defines and one -include on CPPFLAGS.
  
  - Clean up CPPFLAGS/LDFLAGS handling, getting rid of CONFIGURE_ARGS hacks.
  
  - Correct two bugs in
  
        .if ${OSVERSION} < 90014 || !exists(clang++)
  
    to  .if ${OSVERSION} < 900014 || !exists(/usr/bin/clang++)
  
    (where the OSVERSION lacked a 0 digit, and exists lacked the path,
    resulting in GCC being used even where clang++ was in base)
  
  Requested by:	gerald [1]

Modified:
  head/sysutils/replicant/Makefile

Modified: head/sysutils/replicant/Makefile
==============================================================================
--- head/sysutils/replicant/Makefile	Wed May 22 20:40:23 2013	(r318795)
+++ head/sysutils/replicant/Makefile	Wed May 22 21:33:24 2013	(r318796)
@@ -19,16 +19,20 @@ LIB_DEPENDS=	busybee:${PORTSDIR}/devel/b
 ONLY_FOR_ARCHS=	amd64
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+# The -D-efines and -include beat the code into shape on GCC 4.7/4.8
+# GCC 4.6 from ports and 9.1's base clang are fine,
+# upstream bug report at <https://github.com/rescrv/po6/issues/5>
+# This hack causes harmless "warning: '__STDC_LIMIT_MACROS' macro redefined"
+CPPFLAGS+=	-D__STDC_LIMIT_MACROS -Du_int32_t=uint32_t \
+		-include stdint.h -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USES=		pathfix pkgconfig
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 90014 || !exists(clang++)
-# newer GCC versions than 4.6 do not work; clang 3.1 seems fine;
-# bug report to upstream at: <https://github.com/rescrv/po6/issues/5>
-USE_GCC=	4.6
+.if ${OSVERSION} < 900014 || !exists(/usr/bin/clang++)
+# No clang++ installed, use GCC from ports:
+USE_GCC=	yes
 .else
 CC=		clang
 CXX=		clang++