From owner-svn-ports-all@FreeBSD.ORG Tue Jun 24 21:58:10 2014 Return-Path: Delivered-To: svn-ports-all@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 03F95861; Tue, 24 Jun 2014 21:58:10 +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 E556A2391; Tue, 24 Jun 2014 21:58:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5OLw9mt072060; Tue, 24 Jun 2014 21:58:09 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5OLw9jY072059; Tue, 24 Jun 2014 21:58:09 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201406242158.s5OLw9jY072059@svn.freebsd.org> From: Baptiste Daroussin Date: Tue, 24 Jun 2014 21:58:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359136 - head/audio/libcanberra-gtk3 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Jun 2014 21:58:10 -0000 Author: bapt Date: Tue Jun 24 21:58:09 2014 New Revision: 359136 URL: http://svnweb.freebsd.org/changeset/ports/359136 QAT: https://qat.redports.org/buildarchive/r359136/ Log: Simplify makefile and get rid of GMAKE call Modified: head/audio/libcanberra-gtk3/Makefile Modified: head/audio/libcanberra-gtk3/Makefile ============================================================================== --- head/audio/libcanberra-gtk3/Makefile Tue Jun 24 21:52:42 2014 (r359135) +++ head/audio/libcanberra-gtk3/Makefile Tue Jun 24 21:58:09 2014 (r359136) @@ -13,10 +13,13 @@ MASTERDIR= ${.CURDIR}/../../audio/libcan SLAVEPORT= gtk3 PLIST= ${.CURDIR}/pkg-plist -do-build: - cd ${WRKSRC} && ${GMAKE} libcanberra-gtk3.pc - cd ${WRKSRC}/src && ${GMAKE} libcanberra-gtk3.la - cd ${WRKSRC}/src && ${GMAKE} libcanberra-gtk3-module.la +BUILD_WRKSRC= ${WRKSRC}/src +ALL_TARGET= libcanberra-gtk3.la libcanberra-gtk3-module.la + +pre-build: + @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} libcanberra-gtk3.pc + +post-build: # fix the .la file so it doesn't point to the build dir anymore. @${REINPLACE_CMD} -e '/^relink_command/ d' \ -e 's|${WRKSRC}/src/libcanberra.la|${LOCALBASE}/lib/libcanberra.la|g' \