svn commit: r416402 - in head/databases: . sqliteodbc sqliteodbc-sqlite2
Guido Falsi
madpilot at FreeBSD.org
Sun Jun 5 16:55:52 UTC 2016
Author: madpilot
Date: Sun Jun 5 16:55:50 2016
New Revision: 416402
URL: https://svnweb.freebsd.org/changeset/ports/416402
Log:
- Update sqliteodbc port to 0.9994
- Remove options, leaving only sqlite 3 support, split sqlite2
support in a separate slave port [1]
- Convert to USES=sqlite (depends on [1])
Suggested by: mandree (thanks) [1]
Added:
head/databases/sqliteodbc-sqlite2/
head/databases/sqliteodbc-sqlite2/Makefile (contents, props changed)
Modified:
head/databases/Makefile
head/databases/sqliteodbc/Makefile
head/databases/sqliteodbc/distinfo
head/databases/sqliteodbc/pkg-plist
Modified: head/databases/Makefile
==============================================================================
--- head/databases/Makefile Sun Jun 5 16:47:09 2016 (r416401)
+++ head/databases/Makefile Sun Jun 5 16:55:50 2016 (r416402)
@@ -952,6 +952,7 @@
SUBDIR += sqliteman
SUBDIR += sqlitemanager
SUBDIR += sqliteodbc
+ SUBDIR += sqliteodbc-sqlite2
SUBDIR += sqlitestudio
SUBDIR += sqlrelay
SUBDIR += sqsh
Added: head/databases/sqliteodbc-sqlite2/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/sqliteodbc-sqlite2/Makefile Sun Jun 5 16:55:50 2016 (r416402)
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+PORTNAME= sqliteodbc
+CATEGORIES= databases
+PKGNAMESUFFIX= -sqlite2
+
+MAINTAINER= madpilot at FreeBSD.org
+COMMENT= ODBC driver for SQLite 2
+
+MASTERDIR= ${.CURDIR}/../sqliteodbc
+
+.include "${MASTERDIR}/Makefile"
Modified: head/databases/sqliteodbc/Makefile
==============================================================================
--- head/databases/sqliteodbc/Makefile Sun Jun 5 16:47:09 2016 (r416401)
+++ head/databases/sqliteodbc/Makefile Sun Jun 5 16:55:50 2016 (r416402)
@@ -1,12 +1,13 @@
# $FreeBSD$
PORTNAME= sqliteodbc
-PORTVERSION= 0.9993
+PORTVERSION= 0.9994
+PORTREVISION?= 0
CATEGORIES= databases
MASTER_SITES= http://www.ch-werner.de/sqliteodbc/
-MAINTAINER= madpilot at FreeBSD.org
-COMMENT= ODBC driver for SQLite 2 and 3
+MAINTAINER?= madpilot at FreeBSD.org
+COMMENT?= ODBC driver for SQLite 3
LICENSE= SQLITEODBC
LICENSE_NAME= sqliteodbc own licensing terms (BSD style)
@@ -22,18 +23,18 @@ USES= libtool
PLIST_SUB+= VER="${PORTVERSION}"
-OPTIONS_MULTI= SQLITEVER
-OPTIONS_MULTI_SQLITEVER= SQLITE SQLITE3
-OPTIONS_DEFAULT= SQLITE3
-
-OPTIONS_SUB= yes
-SQLITE_LIB_DEPENDS= libsqlite.so:databases/sqlite2
-SQLITE_CONFIGURE_ON= --with-sqlite=${LOCALBASE}
-SQLITE_CONFIGURE_OFF= --with-sqlite=/tmp
-SQLITE3_LIB_DEPENDS= libsqlite3.so:databases/sqlite3 \
- libxml2.so:textproc/libxml2
-SQLITE3_CONFIGURE_ON= --with-sqlite3=${LOCALBASE}
-SQLITE3_CONFIGURE_OFF= --with-sqlite3=/tmp
+.if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX} == "-sqlite2"
+PLIST_SUB+= SQLITE2="" SQLITE3="@comment "
+USES+= sqlite:2
+CONFIGURE_ARGS+= --with-sqlite=${LOCALBASE} \
+ --with-sqlite3=/tmp
+.else
+PLIST_SUB+= SQLITE2="@comment " SQLITE3=""
+USES+= sqlite:3
+CONFIGURE_ARGS+= --with-sqlite3=${LOCALBASE} \
+ --with-sqlite=/tmp
+LIB_DEPENDS+= libxml2.so:textproc/libxml2
+.endif
post-build:
@${STRIP_CMD} ${WRKSRC}/.libs/libsqlite*${PORTVERSION}.so
Modified: head/databases/sqliteodbc/distinfo
==============================================================================
--- head/databases/sqliteodbc/distinfo Sun Jun 5 16:47:09 2016 (r416401)
+++ head/databases/sqliteodbc/distinfo Sun Jun 5 16:55:50 2016 (r416402)
@@ -1,2 +1,3 @@
-SHA256 (sqliteodbc-0.9993.tar.gz) = 1a9a1abbd4387440a56b888113cebea6b39a832a16b456f355c71da69190fa35
-SIZE (sqliteodbc-0.9993.tar.gz) = 815462
+TIMESTAMP = 1465131453
+SHA256 (sqliteodbc-0.9994.tar.gz) = ecf9b5ac57491fe04d994e8de21e6b823ab04307dd521d839a089211419ace99
+SIZE (sqliteodbc-0.9994.tar.gz) = 996068
Modified: head/databases/sqliteodbc/pkg-plist
==============================================================================
--- head/databases/sqliteodbc/pkg-plist Sun Jun 5 16:47:09 2016 (r416401)
+++ head/databases/sqliteodbc/pkg-plist Sun Jun 5 16:55:50 2016 (r416402)
@@ -16,6 +16,6 @@
%%SQLITE3%%lib/libsqlite3odbc-%%VER%%.so
%%SQLITE3%%lib/libsqlite3odbc.a
%%SQLITE3%%lib/libsqlite3odbc.so
-%%SQLITE%%lib/libsqliteodbc-%%VER%%.so
-%%SQLITE%%lib/libsqliteodbc.a
-%%SQLITE%%lib/libsqliteodbc.so
+%%SQLITE2%%lib/libsqliteodbc-%%VER%%.so
+%%SQLITE2%%lib/libsqliteodbc.a
+%%SQLITE2%%lib/libsqliteodbc.so
More information about the svn-ports-head
mailing list