Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 9 Oct 2013 23:53:43 +0000 (UTC)
From:      Guido Falsi <madpilot@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r329942 - head/databases/libdbi-drivers
Message-ID:  <201310092353.r99NrhxD015173@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: madpilot
Date: Wed Oct  9 23:53:43 2013
New Revision: 329942
URL: http://svnweb.freebsd.org/changeset/ports/329942

Log:
  - Convert to staging
  - Use option helpers
  - Convert LIB_DEPENDS to new format and remove ABI version number

Modified:
  head/databases/libdbi-drivers/Makefile   (contents, props changed)

Modified: head/databases/libdbi-drivers/Makefile
==============================================================================
--- head/databases/libdbi-drivers/Makefile	Wed Oct  9 23:52:21 2013	(r329941)
+++ head/databases/libdbi-drivers/Makefile	Wed Oct  9 23:53:43 2013	(r329942)
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Drivers for libdbi
 
-LIB_DEPENDS=	dbi.1:${PORTSDIR}/databases/libdbi
+LIB_DEPENDS=	libdbi.so:${PORTSDIR}/databases/libdbi
 
 USE_GNOME=	lthack
 USE_AUTOTOOLS=	libtool
@@ -24,72 +24,29 @@ OPTIONS_MULTI_DRIVER=	MYSQL MSQL PGSQL S
 OPTIONS_DEFAULT=	MYSQL PGSQL SQLITE3
 SQLITE2_DESC=	SQLite 2 Database
 
-.if defined(.PARSEDIR)
-USE_GMAKE=	yes
-.endif
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=	yes
-CONFIGURE_ARGS+=	--with-mysql
-PLIST_SUB+=	MYSQL=""
-.else
-PLIST_SUB+=	MYSQL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MMSQL}
-LIB_DEPENDS+=	msql.1:${PORTSDIR}/databases/msql
-CONFIGURE_ARGS+=	--with-msql
-PLIST_SUB+=	MSQL=""
-.else
-PLIST_SUB+=	MSQL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL=	yes
-CONFIGURE_ARGS+=	--with-pgsql
-PLIST_SUB+=	PGSQL=""
-.else
-PLIST_SUB+=	PGSQL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSQLITE2}
-LIB_DEPENDS+=	sqlite.2:${PORTSDIR}/databases/sqlite2
-CONFIGURE_ARGS+=	--with-sqlite
-PLIST_SUB+=	SQLITE2=""
-.else
-PLIST_SUB+=	SQLITE2="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSQLITE3}
-LIB_DEPENDS+=	sqlite3.8:${PORTSDIR}/databases/sqlite3
-CONFIGURE_ARGS+=	--with-sqlite3
-PLIST_SUB+=	SQLITE3=""
-.else
-PLIST_SUB+=	SQLITE3="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MFIREBIRD}
-LIB_DEPENDS+=	gds.2:${PORTSDIR}/databases/firebird20-client
-CONFIGURE_ARGS+=	--with-firebird
-PLIST_SUB+=	FIREBIRD=""
-.else
-PLIST_SUB+=	FIREBIRD="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MFREETDS}
-LIB_DEPENDS+=	tds.5:${PORTSDIR}/databases/freetds
-CONFIGURE_ARGS+=	--with-freetds
-PLIST_SUB+=	FREETDS=""
-.else
-PLIST_SUB+=	FREETDS="@comment "
-.endif
+OPTIONS_SUB=	yes
+MYSQL_USE=	MYSQL=yes
+MYSQL_CONFIGURE_WITH=	mysql
+MSQL_USE=	MSQL=yes
+MSQL_CONFIGURE_WITH=	msql
+PGSQL_USE=	PGSQL=yes
+PGSQL_CONFIGURE_WITH=	pgsql
+SQLITE2_LIB_DEPENDS=	libsqlite.so:${PORTSDIR}/databases/sqlite2
+SQLITE2_CONFIGURE_WITH=	sqlite
+SQLITE3_LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+SQLITE3_CONFIGURE_WITH=	sqlite3
+FIREBIRD_LIB_DEPENDS=	libgds.so:${PORTSDIR}/databases/firebird20-client
+FIREBIRD_CONFIGURE_WITH=firebird
+FREETDS_LIB_DEPENDS=	libtds.so:${PORTSDIR}/databases/freetds
+FREETDS_CONFIGURE_WITH=	freetds
 
 PLIST_SUB+=	INGRES="@comment "
 PLIST_SUB+=	ORACLE="@comment "
 
+.if defined(.PARSEDIR)
+USES+=		gmake
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O20|${CFLAGS}|g' \
 		-e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/configure



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310092353.r99NrhxD015173>