From owner-svn-ports-all@FreeBSD.ORG Fri Jan 17 14:58:13 2014 Return-Path: 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 8D1D7F4A; Fri, 17 Jan 2014 14:58:13 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5F2F71A96; Fri, 17 Jan 2014 14:58:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0HEwDpn026101; Fri, 17 Jan 2014 14:58:13 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0HEwDcO026099; Fri, 17 Jan 2014 14:58:13 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401171458.s0HEwDcO026099@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 17 Jan 2014 14:58:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340051 - head/devel/pinba_engine 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.17 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: Fri, 17 Jan 2014 14:58:13 -0000 Author: bapt Date: Fri Jan 17 14:58:12 2014 New Revision: 340051 URL: http://svnweb.freebsd.org/changeset/ports/340051 QAT: https://qat.redports.org/buildarchive/r340051/ Log: Supprot stage Remove NOPORTDATA support Use new LIB_DEPENDS format Convert USE_GMAKE -> USES=gmake Modified: head/devel/pinba_engine/Makefile head/devel/pinba_engine/pkg-plist Modified: head/devel/pinba_engine/Makefile ============================================================================== --- head/devel/pinba_engine/Makefile Fri Jan 17 14:51:06 2014 (r340050) +++ head/devel/pinba_engine/Makefile Fri Jan 17 14:58:12 2014 (r340051) @@ -18,7 +18,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/goog ${NONEXISTENT}:${PORTSDIR}/${_MYSQL_SERVER}:configure \ bison:${PORTSDIR}/devel/bison \ cmake:${PORTSDIR}/devel/cmake -LIB_DEPENDS= protobuf:${PORTSDIR}/devel/protobuf +LIB_DEPENDS= libprotobuf.so:${PORTSDIR}/devel/protobuf GITVERSION= 3a0cb51 @@ -28,7 +28,7 @@ IGNORE_WITH_MYSQL= 50 MYSQL_WRKSRC= $$(cd ${PORTSDIR}/${_MYSQL_SERVER} && ${MAKE} -V WRKSRC) -USE_GMAKE= yes +USES= gmake GNU_CONFIGURE= yes USE_AUTOTOOLS= aclocal autoheader automake autoconf libtoolize USE_LDCONFIG= ${PREFIX}/lib/mysql/plugin @@ -43,20 +43,12 @@ CONFIGURE_ARGS+= \ CFLAGS+= -I${LOCALBASE}/include/mysql SUB_FILES= pkg-message -.if !defined(NOPORTDOCS) PORTDOCS= NEWS TODO README -.endif -NO_STAGE= yes post-install: -.if !defined(NOPORTDATA) - @${MKDIR} ${DATADIR} - @${INSTALL} ${WRKSRC}/default_tables.sql ${DATADIR} -.endif -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDOCS}" ${DOCSDIR} -.endif - @${CAT} ${WRKDIR}/pkg-message + @${MKDIR} ${STAGEDIR}${DATADIR} + @${INSTALL} ${WRKSRC}/default_tables.sql ${STAGEDIR}${DATADIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR} .include Modified: head/devel/pinba_engine/pkg-plist ============================================================================== --- head/devel/pinba_engine/pkg-plist Fri Jan 17 14:51:06 2014 (r340050) +++ head/devel/pinba_engine/pkg-plist Fri Jan 17 14:58:12 2014 (r340051) @@ -2,5 +2,5 @@ lib/mysql/plugin/libpinba_engine.so lib/mysql/plugin/libpinba_engine.so.0 lib/mysql/plugin/libpinba_engine.la lib/mysql/plugin/libpinba_engine.a -%%PORTDATA%%%%DATADIR%%/default_tables.sql -%%PORTDATA%%@dirrm %%DATADIR%% +%%DATADIR%%/default_tables.sql +@dirrm %%DATADIR%%