- Fix plist

- Add MYDDAS option to enable MySQL
- Use options helpers

2 files changed, 42 insertions, 39 deletions

diff --git a/lang/yap-devel/Makefile b/lang/yap-devel/Makefile
index 947194d61b7d..c825dca3f5d8 100644
--- a/lang/yap-devel/Makefile
+++ b/lang/yap-devel/Makefile
@@ -15,22 +15,23 @@ LICENSE_COMB=	dual
 
 CONFLICTS=	yap-6.2.*
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS MYDDAS
+MYDDAS_DESC=	Enable MySQL support
 
-.include <bsd.port.options.mk>
+OPTIONS_SUB=	yes
 
-.if ${PORT_OPTIONS:MDOCS}
-USE_TEX=	base texmf latex
-BUILD_DEPENDS+=	${LOCALBASE}/bin/texi2html:${PORTSDIR}/textproc/texi2html
-BUILD_DEPENDS+=	${LOCALBASE}/bin/texi2pdf:${PORTSDIR}/print/texinfo
-.endif
+DOCS_USE=		TEX=base,texmf,latex
+DOCS_BUILD_DEPENDS=	${LOCALBASE}/bin/texi2html:${PORTSDIR}/textproc/texi2html \
+			${LOCALBASE}/bin/texi2pdf:${PORTSDIR}/print/texinfo
+
+MYDDAS_LIB_DEPENDS=		libiodbc.so:${PORTSDIR}/databases/libiodbc
+MYDDAS_CONFIGURE_ENABLE=	myddas myddas-top-level
 
 STRIP=	#none
 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--enable-max-performance \
-			--disable-clpbn-bp
+CONFIGURE_ARGS+=	--enable-max-performance --disable-clpbn-bp
 USES=	gmake
 USE_GCC=	any
 
@@ -41,6 +42,8 @@ EXTRACT_AFTER_ARGS=	| ${SETENV} LC_ALL=en_US.UTF-8 ${TAR} -xf -
 DOCSDIR=	${PREFIX}/share/doc/Yap
 DATADIR=	${PREFIX}/share/Yap
 
+.include <bsd.port.options.mk>
+
 post-build:
 .if empty(PORT_OPTIONS:MDOCS)
 	# prevent the installation of docs files
diff --git a/lang/yap-devel/pkg-plist b/lang/yap-devel/pkg-plist
index dbf8605cbca6..72c6c860f0f6 100644
--- a/lang/yap-devel/pkg-plist
+++ b/lang/yap-devel/pkg-plist
@@ -116,7 +116,6 @@ lib/Yap/json.so
 lib/Yap/matrix.so
 lib/Yap/memfile.so
 lib/Yap/mime.so
-lib/Yap/odbc4pl.so
 lib/Yap/pl-minisat.so
 lib/Yap/prism.so
 lib/Yap/process.so
@@ -342,14 +341,6 @@ lib/libYap.a
 %%DATADIR%%/menu.pl
 %%DATADIR%%/mime.pl
 %%DATADIR%%/minisat.pl
-%%DATADIR%%/myddas.yap
-%%DATADIR%%/myddas_assert_predicates.yap
-%%DATADIR%%/myddas_errors.yap
-%%DATADIR%%/myddas_mysql.yap
-%%DATADIR%%/myddas_prolog2sql.yap
-%%DATADIR%%/myddas_prolog2sql_optimizer.yap
-%%DATADIR%%/myddas_top_level.yap
-%%DATADIR%%/myddas_util_predicates.yap
 %%DATADIR%%/nb.yap
 %%DATADIR%%/nb_set.pl
 %%DATADIR%%/occurs.yap
@@ -592,6 +583,15 @@ lib/libYap.a
 %%DATADIR%%/xsdp_types.pl
 %%DATADIR%%/ypp.yap
 %%DATADIR%%/zlib.pl
+%%MYDDAS%%lib/Yap/odbc4pl.so
+%%MYDDAS%%%%DATADIR%%/myddas.yap
+%%MYDDAS%%%%DATADIR%%/myddas_assert_predicates.yap
+%%MYDDAS%%%%DATADIR%%/myddas_errors.yap
+%%MYDDAS%%%%DATADIR%%/myddas_mysql.yap
+%%MYDDAS%%%%DATADIR%%/myddas_prolog2sql.yap
+%%MYDDAS%%%%DATADIR%%/myddas_prolog2sql_optimizer.yap
+%%MYDDAS%%%%DATADIR%%/myddas_top_level.yap
+%%MYDDAS%%%%DATADIR%%/myddas_util_predicates.yap
 %%PORTDOCS%%%%DOCSDIR%%/Artistic
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/README
@@ -725,27 +725,27 @@ lib/libYap.a
 %%PORTDOCS%%%%DOCSDIR%%/packages/problog/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/yap.html
 %%PORTDOCS%%%%DOCSDIR%%/yap.pdf
-@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/packages/problog
-@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/packages/examples/xml
-@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/packages/examples/problog
-@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/packages/examples/prism/noisy_or
-@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/packages/examples/prism/jtree
-@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/packages/examples/prism
-@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/packages/examples/plunit
-@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/packages/examples/pldoc
-@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/packages/examples/minisat
-@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/packages/examples/meld
-@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/packages/examples/http/pwp
-@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/packages/examples/http
-@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/packages/examples/chr
-@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/packages/examples/R
-@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/packages/examples/CLPBN/learning
-@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/packages/examples/CLPBN/School
-@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/packages/examples/CLPBN/HMMer
-@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/packages/examples/CLPBN
-@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/packages/examples
-@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/packages
-@dirrmtry %%PORTDOCS%%%%DOCSDIR%%
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/packages/problog
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/packages/examples/xml
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/packages/examples/problog
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/packages/examples/prism/noisy_or
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/packages/examples/prism/jtree
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/packages/examples/prism
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/packages/examples/plunit
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/packages/examples/pldoc
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/packages/examples/minisat
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/packages/examples/meld
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/packages/examples/http/pwp
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/packages/examples/http
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/packages/examples/chr
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/packages/examples/R
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/packages/examples/CLPBN/learning
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/packages/examples/CLPBN/School
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/packages/examples/CLPBN/HMMer
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/packages/examples/CLPBN
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/packages/examples
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/packages
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
 @dirrmtry %%DATADIR%%/xml
 @dirrmtry %%DATADIR%%/semweb
 @dirrmtry %%DATADIR%%/problog