Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 29 Oct 2012 08:19:57 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r306594 - head/databases/tora
Message-ID:  <201210290819.q9T8JvZH018502@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Mon Oct 29 08:19:57 2012
New Revision: 306594
URL: http://svn.freebsd.org/changeset/ports/306594

Log:
  Convert to new options framework
  Make ORACLE a real i386 only option
  Remove pre FreeBSD 7.x bits
  
  Feature safe:	yes

Modified:
  head/databases/tora/Makefile

Modified: head/databases/tora/Makefile
==============================================================================
--- head/databases/tora/Makefile	Mon Oct 29 08:04:39 2012	(r306593)
+++ head/databases/tora/Makefile	Mon Oct 29 08:19:57 2012	(r306594)
@@ -15,9 +15,9 @@ BUILD_DEPENDS=	cppunit-config:${PORTSDIR
 LIB_DEPENDS=	qscintilla2:${PORTSDIR}/devel/qscintilla2 \
 		pcre.1:${PORTSDIR}/devel/pcre
 
-OPTIONS=	ORACLE "Build with Oracle support (i386 only)" off \
-		PGSQL  "Build with PostgreSQL support" on \
-		MYSQL  "Build with MySQL support" on
+OPTIONS_DEFINE=	PGSQL MYSQL DOCS
+OPTIONS_DEFINE_i386=	ORACLE
+OPTIONS_DEFAULT=	PGSQL MYSQL
 
 USE_AUTOTOOLS=	aclocal automake autoconf autoheader libtool
 USE_QT4=	gui corelib sql xml network linguist moc_build uic_build rcc_build
@@ -26,21 +26,21 @@ GNU_CONFIGURE=	yes
 
 PREFIX2FIX=	doc/help/preferences.texi doc/help/preferences.html
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 INFO=		tora
 .endif
 
-.if !defined(WITHOUT_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 RUN_DEPENDS+=	${QT_PLUGINDIR}/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt4-mysql-plugin
 .endif
 
-.if !defined(WITHOUT_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 RUN_DEPENDS+=	${QT_PLUGINDIR}/sqldrivers/libqsqlpsql.so:${PORTSDIR}/databases/qt4-pgsql-plugin
 .endif
 
-.if !defined(WITHOUT_ORACLE)
+.if ${PORT_OPTIONS:MORACLE}
 BUILD_DEPENDS+=	${ORACLE_HOME}/lib/libclntsh.a:${PORTSDIR}/databases/oracle8-client
 RUN_DEPENDS+=	${ORACLE_HOME}/network/admin/tnsnames.ora:${PORTSDIR}/databases/oracle8-client
 
@@ -52,17 +52,12 @@ CONFIGURE_ARGS+=	--with-oracle=${ORACLE_
 run-autotools:
 	(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ./autogen.sh)
 
-post-patch:
-.if ${OSVERSION} < 700000
-	${REINPLACE_CMD} -e 's|LIBS="|LIBS="-lpthread |' ${WRKSRC}/config/m4/qtkde.m4
-.endif
-
 pre-configure:
-.if defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${REINPLACE_CMD} -e 's|test doc|test|' ${WRKSRC}/Makefile.am
 .else
 	@${REINPLACE_CMD} -e 's|/etc/torarc|${PREFIX}/etc/torarc|'	\
 		${PREFIX2FIX:S|^|${WRKSRC}/|}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>



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