From owner-svn-ports-all@freebsd.org  Tue Oct  4 21:51:16 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id EDDB4AF536D;
 Tue,  4 Oct 2016 21:51:16 +0000 (UTC) (envelope-from lme@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 BF238FA3;
 Tue,  4 Oct 2016 21:51:16 +0000 (UTC) (envelope-from lme@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u94LpF18073479;
 Tue, 4 Oct 2016 21:51:15 GMT (envelope-from lme@FreeBSD.org)
Received: (from lme@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u94LpFMV073478;
 Tue, 4 Oct 2016 21:51:15 GMT (envelope-from lme@FreeBSD.org)
Message-Id: <201610042151.u94LpFMV073478@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: lme set sender to lme@FreeBSD.org
 using -f
From: Lars Engels <lme@FreeBSD.org>
Date: Tue, 4 Oct 2016 21:51:15 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r423305 - head/devel/astyle
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.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Oct 2016 21:51:17 -0000

Author: lme
Date: Tue Oct  4 21:51:15 2016
New Revision: 423305
URL: https://svnweb.freebsd.org/changeset/ports/423305

Log:
  devel/astyle:
  
  - Remove doubled CLFAGS
  - Use astyle/build/${COMPILER_TYPE} as WRCSRC instead of hard-coding gcc
  - Remove blank MAGE_ARGS
  - Drop no longer needed pre-patch target
  - Stripping the binary is now done by the linker itself
  
  PR:		    213042
  Submitted by:	bsam

Modified:
  head/devel/astyle/Makefile

Modified: head/devel/astyle/Makefile
==============================================================================
--- head/devel/astyle/Makefile	Tue Oct  4 21:39:52 2016	(r423304)
+++ head/devel/astyle/Makefile	Tue Oct  4 21:51:15 2016	(r423305)
@@ -13,22 +13,18 @@ COMMENT=	Source code indenter and format
 LICENSE=	LGPL3
 
 ALL_TARGET=	astyle
-CFLAGS+=	-W -Wall -fno-rtti -fno-exceptions
 LDFLAGS+=	-s
-MAKE_ARGS+=	CFLAGS="${CFLAGS}"
 USES=		compiler gmake iconv
 
-WRKSRC=		${WRKDIR}/astyle/build/gcc
+WRKSRC=		${WRKDIR}/astyle/build/${COMPILER_TYPE}
 
 OPTIONS_DEFINE=	DOCS
 
 pre-patch:
-	@${REINPLACE_CMD} -e 's,^CFLAGS,#CFLAGS,; s,g++,${CXX},; \
-		s,\(CFLAGSr.*=.*\),\1 -I${LOCALBASE}/include,' \
+	@${REINPLACE_CMD} -e 's,\(CFLAGSr.*=.*\),\1 -I${LOCALBASE}/include,' \
 		${WRKSRC}/Makefile
 
 do-install:
-	${STRIP_CMD} ${WRKSRC}/bin/astyle
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/astyle ${STAGEDIR}${PREFIX}/bin
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/astyle/doc/* ${STAGEDIR}${DOCSDIR}