From owner-svn-ports-all@FreeBSD.ORG Wed Jan 15 23:38:23 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 544CFD5F; Wed, 15 Jan 2014 23:38:23 +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 3F5C01301; Wed, 15 Jan 2014 23:38:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0FNcNZZ085443; Wed, 15 Jan 2014 23:38:23 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0FNcN62085442; Wed, 15 Jan 2014 23:38:23 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401152338.s0FNcN62085442@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 15 Jan 2014 23:38:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339863 - head/databases/libzdb 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: Wed, 15 Jan 2014 23:38:23 -0000 Author: bapt Date: Wed Jan 15 23:38:22 2014 New Revision: 339863 URL: http://svnweb.freebsd.org/changeset/ports/339863 QAT: https://qat.redports.org/buildarchive/r339863/ Log: Reduce bsd.port.mk inclusions by using options helpers replace USE_GMAKE -> USES=gmake Modified: head/databases/libzdb/Makefile Modified: head/databases/libzdb/Makefile ============================================================================== --- head/databases/libzdb/Makefile Wed Jan 15 23:34:24 2014 (r339862) +++ head/databases/libzdb/Makefile Wed Jan 15 23:38:22 2014 (r339863) @@ -19,37 +19,22 @@ OPTIONS_DEFINE= MYSQL \ OPTIONS_DEFAULT=MYSQL SQLITE PGSQL NO_STAGE= yes -.include -USES= pathfix -USE_GMAKE= yes +USES= gmake pathfix USE_AUTOTOOLS= libtool USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -.include +MYSQL_USE= mysql=yes +MYSQL_CONFIGURE_ON= --with-mysql=${LOCALBASE}/bin/mysql_config +MYSQL_CONFIGURE_OFF= --without-mysql +SQLITE_USE= sqlite=3 +SQLITE_CONFIGURE_ON= --with-sqlite=${LOCALBASE} +SQLITE_CONFIGURE_OFF= --without-sqlite +PGSQL_USE= pgsql=yes +PGSQL_CONFIGURE_ON= --with-postgresql=${LOCALBASE}/bin/pg_config +PGSQL_CONFIGURE_OFF= --without-postgresql -.if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes -CONFIGURE_ARGS+= --with-mysql=${LOCALBASE}/bin/mysql_config -.else -CONFIGURE_ARGS+= --without-mysql -.endif - -.if ${PORT_OPTIONS:MSQLITE} -USE_SQLITE= 3 -CONFIGURE_ARGS+= --with-sqlite=${LOCALBASE} -.else -CONFIGURE_ARGS+= --without-sqlite -.endif - -.if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= yes -CONFIGURE_ARGS+= --with-postgresql=${LOCALBASE}/bin/pg_config -.else -CONFIGURE_ARGS+= --without-postgresql -.endif - -.include +.include