From owner-svn-ports-all@FreeBSD.ORG Thu Nov 28 14:56:09 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 32B926EA; Thu, 28 Nov 2013 14:56:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 135B4127B; Thu, 28 Nov 2013 14:56:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rASEu87Y077814; Thu, 28 Nov 2013 14:56:08 GMT (envelope-from danilo@svn.freebsd.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rASEu89P077812; Thu, 28 Nov 2013 14:56:08 GMT (envelope-from danilo@svn.freebsd.org) Message-Id: <201311281456.rASEu89P077812@svn.freebsd.org> From: Danilo Egea Gondolfo Date: Thu, 28 Nov 2013 14:56:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335097 - head/lang/yap-devel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Nov 2013 14:56:09 -0000 Author: danilo Date: Thu Nov 28 14:56:08 2013 New Revision: 335097 URL: http://svnweb.freebsd.org/changeset/ports/335097 Log: - Fix plist - Add MYDDAS option to enable MySQL - Use options helpers Modified: head/lang/yap-devel/Makefile head/lang/yap-devel/pkg-plist Modified: head/lang/yap-devel/Makefile ============================================================================== --- head/lang/yap-devel/Makefile Thu Nov 28 14:53:00 2013 (r335096) +++ head/lang/yap-devel/Makefile Thu Nov 28 14:56:08 2013 (r335097) @@ -15,22 +15,23 @@ LICENSE_COMB= dual CONFLICTS= yap-6.2.* -OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE= DOCS MYDDAS +MYDDAS_DESC= Enable MySQL support -.include +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=e DOCSDIR= ${PREFIX}/share/doc/Yap DATADIR= ${PREFIX}/share/Yap +.include + post-build: .if empty(PORT_OPTIONS:MDOCS) # prevent the installation of docs files Modified: head/lang/yap-devel/pkg-plist ============================================================================== --- head/lang/yap-devel/pkg-plist Thu Nov 28 14:53:00 2013 (r335096) +++ head/lang/yap-devel/pkg-plist Thu Nov 28 14:56:08 2013 (r335097) @@ -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