From owner-svn-ports-all@freebsd.org Sun Jan 10 16:15:31 2016 Return-Path: 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 117B8A69BC7; Sun, 10 Jan 2016 16:15:31 +0000 (UTC) (envelope-from bapt@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 E318C1BEB; Sun, 10 Jan 2016 16:15:30 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0AGFUDE066879; Sun, 10 Jan 2016 16:15:30 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0AGFT8o066875; Sun, 10 Jan 2016 16:15:29 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201601101615.u0AGFT8o066875@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sun, 10 Jan 2016 16:15:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r405716 - in head: . Mk Mk/Uses 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.20 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: Sun, 10 Jan 2016 16:15:31 -0000 Author: bapt Date: Sun Jan 10 16:15:29 2016 New Revision: 405716 URL: https://svnweb.freebsd.org/changeset/ports/405716 Log: Introduce 2 new USES: sqlite and firebird sqlite and firebird handling code has been extracted from bsd.databases.mk add an entry in bsd.sanity.mk to mark USE_SQLITE and USE_FIREBIRD as deprecated Added: head/Mk/Uses/firebird.mk (contents, props changed) head/Mk/Uses/sqlite.mk (contents, props changed) Modified: head/CHANGES head/Mk/bsd.sanity.mk Modified: head/CHANGES ============================================================================== --- head/CHANGES Sun Jan 10 16:05:20 2016 (r405715) +++ head/CHANGES Sun Jan 10 16:15:29 2016 (r405716) @@ -10,6 +10,12 @@ in the release notes and/or placed into All ports committers are allowed to commit to this file. +20150110: +AUTHOR: bapt@FreeBSD.org + + USE_FIREBIRD and USE_SQLITE has been replaced by USES=firebird and + USES=sqlite + 20151105: AUTHOR: mat@FreeBSD.org Added: head/Mk/Uses/firebird.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/Mk/Uses/firebird.mk Sun Jan 10 16:15:29 2016 (r405716) @@ -0,0 +1,23 @@ +# $FreeBSD$ +# +# Provide support for SQLite +# Feature: sqlite +# Usage: USES= sqlite[:version] +# MAINTAINER: ports@FreeBSD.org + +.if !defined(_INCLUDE_USES_FIREBIRD_MK) +_INCLUDE_USES_FIREBIRD_MK= yes +.include "${PORTSDIR}/Mk/bsd.default-versions.mk" + +.if !empty(firebird_ARGS) +FIREBIRD_VER= ${firebird_ARGS} +.endif + +FIREBIRD_VER?= ${FIREBIRD_DEFAULT:S/.//} + +.if ${FIREBIRD_VER} == 25 +LIB_DEPENDS+= libfbclient.so:${PORTSDIR}/databases/firebird25-client +.else +IGNORE= cannot install: unknown Firebird version: ${FIREBIRD_VER} +.endif +.endif Added: head/Mk/Uses/sqlite.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/Mk/Uses/sqlite.mk Sun Jan 10 16:15:29 2016 (r405716) @@ -0,0 +1,24 @@ +# $FreeBSD$ +# +# Provide support for SQLite +# Feature: sqlite +# Usage: USES= sqlite[:version] +# MAINTAINER: ports@FreeBSD.org + +.if !defined(_INCLUDE_USES_SQLITE_MK) +_INCLUDE_USES_SQLITE_MK= yes + +.if !empty(sqlite_ARGS) +SQLITE_VER= ${sqlite_ARGS} +.endif +SQLITE_VER?= 3 + +.if ${SQLITE_VER} == 3 +LIB_DEPENDS+= libsqlite3.so:${PORTSDIR}/databases/sqlite${SQLITE_VER} +.elif ${SQLITE_VER} == 2 +LIB_DEPENDS+= libsqlite.so:${PORTSDIR}/databases/sqlite${SQLITE_VER} +.else +IGNORE= cannot install: unknown SQLite version: ${SQLITE_VER} +.endif + +.endif Modified: head/Mk/bsd.sanity.mk ============================================================================== --- head/Mk/bsd.sanity.mk Sun Jan 10 16:05:20 2016 (r405715) +++ head/Mk/bsd.sanity.mk Sun Jan 10 16:15:29 2016 (r405716) @@ -165,7 +165,8 @@ SANITY_UNSUPPORTED= USE_OPENAL USE_FAM U PYDISTUTILS_AUTOPLIST PYTHON_PY3K_PLIST_HACK PYDISTUTILS_NOEGGINFO \ USE_PYTHON_PREFIX USE_BZIP2 USE_XZ USE_PGSQL NEED_ROOT \ UNIQUENAME LATEST_LINK -SANITY_DEPRECATED= PYTHON_PKGNAMESUFFIX USE_AUTOTOOLS PLIST_DIRSTRY +SANITY_DEPRECATED= PYTHON_PKGNAMESUFFIX USE_AUTOTOOLS PLIST_DIRSTRY USE_SQLITE \ + USE_FIREBIRD SANITY_NOTNEEDED= WX_UNICODE USE_AUTOTOOLS_ALT= USES=autoreconf and GNU_CONFIGURE=yes @@ -204,6 +205,8 @@ UNIQUENAME_ALT= PKGBASE LATEST_LINK_ALT= PKGBASE WX_UNICODE_REASON= Now no-op as only unicode is supported now PLIST_DIRSTRY_ALT= PLIST_DIRS +USE_SQLITE_ALT= USES=sqlite +USE_FIREBIRD_ALT= USES=firebird .for a in ${SANITY_DEPRECATED} .if defined(${a})