From owner-svn-ports-head@FreeBSD.ORG Mon Jun 8 01:22:07 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CF7CAC9B; Mon, 8 Jun 2015 01:22:07 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) 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 BDA301F74; Mon, 8 Jun 2015 01:22:07 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t581M7JQ037770; Mon, 8 Jun 2015 01:22:07 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t581M7ZW037769; Mon, 8 Jun 2015 01:22:07 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201506080122.t581M7ZW037769@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 8 Jun 2015 01:22:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r388819 - head/databases/dbconnect 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.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Jun 2015 01:22:07 -0000 Author: amdmi3 Date: Mon Jun 8 01:22:07 2015 New Revision: 388819 URL: https://svnweb.freebsd.org/changeset/ports/388819 Log: - Switch to USES=autoreconf - Use OPTIONS helpers Modified: head/databases/dbconnect/Makefile Modified: head/databases/dbconnect/Makefile ============================================================================== --- head/databases/dbconnect/Makefile Mon Jun 8 01:21:58 2015 (r388818) +++ head/databases/dbconnect/Makefile Mon Jun 8 01:22:07 2015 (r388819) @@ -10,41 +10,27 @@ MASTER_SITES= SF/${PORTNAME}/DBConnect%2 MAINTAINER= ports@FreeBSD.org COMMENT= Use C++ object API to allow applications to connect to databases -USES= gmake dos2unix - +USES= autoreconf gmake dos2unix GNU_CONFIGURE= yes -USE_AUTOTOOLS= autoconf USE_LDCONFIG= yes CXXFLAGS+= -fPIC -DFREEBSD LDFLAG+= -lpthread +PLIST_SUB= PORTVERSION=${PORTVERSION} + OPTIONS_DEFINE= MYSQL PGSQL OPTIONS_DEFAULT= MYSQL +OPTIONS_SUB= yes -.include - -PLIST_SUB+= PORTVERSION=${PORTVERSION} - -.if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= YES -CONFIGURE_ARGS+= --enable-mysql=yes \ +MYSQL_USE= MYSQL=yes +MYSQL_CONFIGURE_ON= --enable-mysql=yes \ --with-mysql_include=${LOCALBASE}/include/mysql \ --with-mysql_lib=${LOCALBASE}/lib/mysql -PLIST_SUB+= MYSQL="" -.else -PLIST_SUB+= MYSQL="@comment " -.endif - -.if ${PORT_OPTIONS:MPGSQL} -USES+= pgsql -CONFIGURE_ARGS+= --enable-pgsql=yes \ +PGSQL_USES= pgsql +PGSQL_CONFIGURE_ON= --enable-pgsql=yes \ --with-pgsql_include=${LOCALBASE}/include \ --with-pgsql_lib=${LOCALBASE}/lib -PLIST_SUB+= PGSQL="" -.else -PLIST_SUB+= PGSQL="@comment " -.endif post-patch: @${RM} -f ${WRKSRC}/include/dbconn/README