Index: MOVED
===================================================================
--- MOVED
+++ MOVED
@@ -15086,3 +15086,4 @@
 mail/claws-mail-attach_warner|mail/claws-mail-attachwarner|2020-06-11|Renamed to align port name to plugin name
 mail/claws-mail-spamreport|mail/claws-mail-spam_report|2020-06-11|Renamed to align port name to plugin name
 mail/claws-mail-tnef|mail/claws-mail-tnef_parse|2020-06-11|Renamed to align port name to plugin name
+databases/sqliteodbc-sqlite2|databases/sqliteodbc@sqlite2|2020-06-14|Moved to a flavored, generic, version
Index: databases/Makefile
===================================================================
--- databases/Makefile
+++ databases/Makefile
@@ -997,7 +997,6 @@
     SUBDIR += sqliteconvert
     SUBDIR += sqlitemanager
     SUBDIR += sqliteodbc
-    SUBDIR += sqliteodbc-sqlite2
     SUBDIR += sqlitestudio
     SUBDIR += sqlrelay
     SUBDIR += sqsh
Index: databases/sqliteodbc-sqlite2/Makefile
===================================================================
--- databases/sqliteodbc-sqlite2/Makefile
+++ databases/sqliteodbc-sqlite2/Makefile
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	sqliteodbc
-CATEGORIES=	databases
-PKGNAMESUFFIX=	-sqlite2
-
-MAINTAINER=	madpilot@FreeBSD.org
-COMMENT=	ODBC driver for SQLite 2
-
-MASTERDIR=	${.CURDIR}/../sqliteodbc
-
-BROKEN_aarch64=	fails to compile: error: passing char * to parameter of incompatible type va_list
-BROKEN_armv6=	fails to compile: error: passing char * to parameter of incompatible type va_list
-BROKEN_armv7=		fails to compile: error: passing char * to parameter of incompatible type va_list
-
-.include "${MASTERDIR}/Makefile"
Index: databases/sqliteodbc/Makefile
===================================================================
--- databases/sqliteodbc/Makefile
+++ databases/sqliteodbc/Makefile
@@ -1,19 +1,24 @@
 # $FreeBSD$
 
 PORTNAME=	sqliteodbc
-PORTVERSION=	0.9996
-PORTREVISION?=	0
+PORTVERSION=	0.9997
 CATEGORIES=	databases
 MASTER_SITES=	http://www.ch-werner.de/sqliteodbc/
 
-MAINTAINER?=	madpilot@FreeBSD.org
-COMMENT?=	ODBC driver for SQLite 3
+MAINTAINER=	madpilot@FreeBSD.org
+COMMENT=	ODBC driver for SQLite
 
 LICENSE=	SQLITEODBC
 LICENSE_NAME=	sqliteodbc own licensing terms (BSD style)
 LICENSE_FILE=	${WRKSRC}/license.terms
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
+FLAVORS=	sqlite3 sqlite2
+FLAVOR?=	${FLAVORS:[1]}
+
+sqlite3_LIB_DEPENDS=	libxml2.so:textproc/libxml2
+sqlite2_PKGNAMESUFFIX=	-sqlite2
+
 LIB_DEPENDS=	libodbc.so:databases/unixODBC
 
 GNU_CONFIGURE=	yes
@@ -23,17 +28,19 @@
 
 PLIST_SUB+=	VER="${PORTVERSION}"
 
-.if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX} == "-sqlite2"
+.if ${FLAVOR:U} == sqlite2
 PLIST_SUB+=	SQLITE2="" SQLITE3="@comment "
 USES+=		sqlite:2
 CONFIGURE_ARGS+=	--with-sqlite=${LOCALBASE} \
 			--with-sqlite3=/tmp
+BROKEN_aarch64=	fails to compile: error: passing char * to parameter of incompatible type va_list
+BROKEN_armv6=	fails to compile: error: passing char * to parameter of incompatible type va_list
+BROKEN_armv7=	fails to compile: error: passing char * to parameter of incompatible type va_list
 .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:
Index: databases/sqliteodbc/distinfo
===================================================================
--- databases/sqliteodbc/distinfo
+++ databases/sqliteodbc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1519571551
-SHA256 (sqliteodbc-0.9996.tar.gz) = 8afbc9e0826d4ff07257d7881108206ce31b5f719762cbdb4f68201b60b0cb4e
-SIZE (sqliteodbc-0.9996.tar.gz) = 997425
+TIMESTAMP = 1592128472
+SHA256 (sqliteodbc-0.9997.tar.gz) = a50cc328a7def2b3389eebeee43c598322ed338506cbd13d8e9d1892db5e0cfe
+SIZE (sqliteodbc-0.9997.tar.gz) = 1000817