Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 8 Jun 2015 01:22:07 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r388819 - head/databases/dbconnect
Message-ID:  <201506080122.t581M7ZW037769@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Mon Jun  8 01:22:07 2015
New Revision: 388819
URL: https://svnweb.freebsd.org/changeset/ports/388819

Log:
  - Switch to USES=autoreconf
  - Use OPTIONS helpers

Modified:
  head/databases/dbconnect/Makefile

Modified: head/databases/dbconnect/Makefile
==============================================================================
--- head/databases/dbconnect/Makefile	Mon Jun  8 01:21:58 2015	(r388818)
+++ head/databases/dbconnect/Makefile	Mon Jun  8 01:22:07 2015	(r388819)
@@ -10,41 +10,27 @@ MASTER_SITES=	SF/${PORTNAME}/DBConnect%2
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Use C++ object API to allow applications to connect to databases
 
-USES=		gmake dos2unix
-
+USES=		autoreconf gmake dos2unix
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf
 USE_LDCONFIG=	yes
 
 CXXFLAGS+=	-fPIC -DFREEBSD
 LDFLAG+=	-lpthread
 
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
+
 OPTIONS_DEFINE=	MYSQL PGSQL
 OPTIONS_DEFAULT=	MYSQL
+OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
-
-PLIST_SUB+=	PORTVERSION=${PORTVERSION}
-
-.if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=		YES
-CONFIGURE_ARGS+=	--enable-mysql=yes \
+MYSQL_USE=		MYSQL=yes
+MYSQL_CONFIGURE_ON=	--enable-mysql=yes \
 			--with-mysql_include=${LOCALBASE}/include/mysql \
 			--with-mysql_lib=${LOCALBASE}/lib/mysql
-PLIST_SUB+=	MYSQL=""
-.else
-PLIST_SUB+=	MYSQL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPGSQL}
-USES+=		pgsql
-CONFIGURE_ARGS+=	--enable-pgsql=yes \
+PGSQL_USES=		pgsql
+PGSQL_CONFIGURE_ON=	--enable-pgsql=yes \
 			--with-pgsql_include=${LOCALBASE}/include \
 			--with-pgsql_lib=${LOCALBASE}/lib
-PLIST_SUB+=	PGSQL=""
-.else
-PLIST_SUB+=	PGSQL="@comment "
-.endif
 
 post-patch:
 	@${RM} -f ${WRKSRC}/include/dbconn/README



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