1 files changed, 23 insertions, 60 deletions

diff --git a/databases/soci/Makefile b/databases/soci/Makefile
index b1a66c94336b..e5949b3994e4 100644
--- a/databases/soci/Makefile
+++ b/databases/soci/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	soci
-PORTVERSION=	3.1.0
-PORTREVISION=	1
+PORTVERSION=	3.2.2
 CATEGORIES=	databases
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
@@ -21,70 +20,34 @@ USE_LDCONFIG=	yes
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-OPTIONS_DEFINE=	MYSQL PGSQL SQLITE ODBC BOOST
+OPTIONS_DEFINE=	MYSQL PGSQL SQLITE ODBC BOOST FIREBIRD
 BOOST_DESC=	Enable support for additional types using Boost
-OPTIONS_SINGLE=	ODBCDRV
-ODBCDRV_DESC=	ODBC driver to use
-OPTIONS_SINGLE_ODBCDRV=	IODBC UODBC
-IODBC_DESC=	use iODBC driver
-UODBC_DESC=	use unixODBC driver
-OPTIONS_DEFAULT=MYSQL PGSQL SQLITE ODBC IODBC BOOST
+OPTIONS_DEFAULT=MYSQL PGSQL SQLITE ODBC BOOST FIREBIRD
+OPTIONS_SUB=	yes
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+MYSQL_USE=	MYSQL=yes
+MYSQL_CMAKE_ON=	-DWITH_MYSQL:BOOL=ON
+MYSQL_CMAKE_OFF=	-DWITH_MYSQL:BOOL=OFF
 
-.if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=	yes
-PLIST_SUB+=	MYSQL=""
-CMAKE_ARGS+=	-DWITH_MYSQL:BOOL=ON
-.else
-PLIST_SUB+=	MYSQL="@comment "
-CMAKE_ARGS+=	-DWITH_MYSQL:BOOL=OFF
-.endif
+PGSQL_USES=	pgsql
+PGSQL_CMAKE_ON=	-DWITH_POSTGRESQL:BOOL=ON
+PGSQL_CMAKE_OFF=	-DWITH_POSTGRESQL:BOOL=OFF
 
-.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL=	yes
-PLIST_SUB+=	PGSQL=""
-CMAKE_ARGS+=	-DWITH_POSTGRESQL:BOOL=ON
-.else
-PLIST_SUB+=	PGSQL="@comment "
-CMAKE_ARGS+=	-DWITH_POSTGRESQL:BOOL=OFF
-.endif
+SQLITE_USE=	SQLITE=yes
+SQLITE_CMAKE_ON=	-DWITH_SQLITE3:BOOL=ON
+SQLITE_CMAKE_OFF=	-DWITH_SQLITE3:BOOL=OFF
 
-.if ${PORT_OPTIONS:MSQLITE}
-USE_SQLITE=	yes
-PLIST_SUB+=	SQLITE=""
-CMAKE_ARGS+=	-DWITH_SQLITE3:BOOL=ON
-.else
-PLIST_SUB+=	SQLITE="@comment "
-CMAKE_ARGS+=	-DWITH_SQLITE3:BOOL=OFF
-.endif
+ODBC_LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC
+ODBC_CMAKE_ON=	-DODBC_LIBRARY:FILE_PATH=${LOCALBASE}/lib/libodbc.so \
+		-DWITH_ODBC:BOOL=ON
+ODBC_CMAKE_OFF=	-DWITH_ODBC:BOOL=OFF
 
-.if ${PORT_OPTIONS:MODBC}
-PLIST_SUB+=	ODBC=""
-CMAKE_ARGS+=	-DWITH_ODBC:BOOL=ON
-.if ${PORT_OPTIONS:MUODBC}
-LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
-CMAKE_ARGS+=	-DODBC_LIBRARY:FILE_PATH=${LOCALBASE}/lib/libodbc.so
-.elif ${PORT_OPTIONS:MIODBC}
-LIB_DEPENDS+=	libiodbc.so:${PORTSDIR}/databases/libiodbc
-CMAKE_ARGS+=	-DODBC_LIBRARY:FILE_PATH=${LOCALBASE}/lib/libiodbc.so
-.endif
-.else
-PLIST_SUB+=	ODBC="@comment "
-CMAKE_ARGS+=	-DWITH_ODBC:BOOL=OFF
-.endif
+BOOST_LIB_DEPENDS=	libboost_date_time.so:${PORTSDIR}/devel/boost-libs
+BOOST_CMAKE_ON=	-DWITH_BOOST:BOOL=ON
+BOOST_CMAKE_OFF=	-DWITH_BOOST:BOOL=OFF
 
-. if ${PORT_OPTIONS:MBOOST}
-LIB_DEPENDS+=	libboost_date_time.so:${PORTSDIR}/devel/boost-libs
-PLIST_SUB+=	BOOST=""
-CMAKE_ARGS+=	-DWITH_BOOST:BOOL=ON
-.else
-PLIST_SUB+=	BOOST="@comment "
-CMAKE_ARGS+=	-DWITH_BOOST:BOOL=OFF
-.endif
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
+FIREBIRD_USE=	FIREBIRD=yes
+FIREBIRD_CMAKE_ARGS_ON=	-DWITH_FIREBIRD:BOOL=ON
+FIREBIRD_CMAKE_ARGS_OFF=	-DWITH_FIREBIRD:BOOL=OFF
 
 .include <bsd.port.mk>