From owner-svn-ports-all@FreeBSD.ORG Sat Jan 11 09:31:41 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6DF744AD; Sat, 11 Jan 2014 09:31:41 +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 596CF114E; Sat, 11 Jan 2014 09:31:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0B9VfP1076887; Sat, 11 Jan 2014 09:31:41 GMT (envelope-from johans@svn.freebsd.org) Received: (from johans@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0B9VeKT076884; Sat, 11 Jan 2014 09:31:40 GMT (envelope-from johans@svn.freebsd.org) Message-Id: <201401110931.s0B9VeKT076884@svn.freebsd.org> From: Johan van Selst Date: Sat, 11 Jan 2014 09:31:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339411 - head/math/coq 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.17 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: Sat, 11 Jan 2014 09:31:41 -0000 Author: johans Date: Sat Jan 11 09:31:40 2014 New Revision: 339411 URL: http://svnweb.freebsd.org/changeset/ports/339411 Log: - Update coq to 8.4.3 - Enable stage support - Simplify options handling Modified: head/math/coq/Makefile head/math/coq/distinfo head/math/coq/pkg-plist Modified: head/math/coq/Makefile ============================================================================== --- head/math/coq/Makefile Sat Jan 11 09:22:35 2014 (r339410) +++ head/math/coq/Makefile Sat Jan 11 09:31:40 2014 (r339411) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= coq -PORTVERSION= 8.4.2 +PORTVERSION= 8.4.3 PORTEPOCH= 1 CATEGORIES= math MASTER_SITES= http://coq.inria.fr/distrib/V${COQVERSION}/files/ \ @@ -16,44 +16,29 @@ BUILD_DEPENDS= camlp5:${PORTSDIR}/devel/ ocamlfind:${PORTSDIR}/devel/ocaml-findlib COQVERSION= ${PORTVERSION:R}pl${PORTVERSION:E} +USES= gmake USE_OCAML= yes -USE_GMAKE= yes ALL_TARGET= world HAS_CONFIGURE= yes -CONFIGURE_ARGS= --prefix ${PREFIX} -CONFIGURE_ARGS+=--mandir ${PREFIX}/man -CONFIGURE_ARGS+=--emacslib ${PREFIX}/share/emacs/site-lisp -CONFIGURE_ARGS+=--opt - -OPTIONS_DEFINE= IDE -OPTIONS_DEFAULT=IDE -IDE_DESC= Include desktop environment (coqide) - -MAN1= coq-tex.1 coq_makefile.1 coqc.1 coqchk.1 coqdep.1 coqdoc.1 \ - coqmktop.1 coqtop.1 coqtop.byte.1 coqtop.opt.1 coqwc.1 gallina.1 - -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MDOCS} -USE_TEX= latex:build dvipsk:build -BUILD_DEPENDS+= hevea:${PORTSDIR}/textproc/hevea \ - ${LOCALBASE}/share/texmf/tex/latex/ucs/utf8x.def:${PORTSDIR}/print/latex-ucs -PORTDOCS= * -.else -CONFIGURE_ARGS+=--with-doc none -.endif - -.if ${PORT_OPTIONS:MIDE} -BUILD_DEPENDS+= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 -RUN_DEPENDS+= ${BUILD_DEPENDS} -PLIST_SUB+= IDE="" -MAN1+= coqide.1 -.else -PLIST_SUB+= IDE="@comment " -CONFIGURE_ARGS+=--coqide no -.endif +CONFIGURE_ARGS= --prefix ${PREFIX} \ + --mandir ${PREFIX}/man \ + --emacslib ${PREFIX}/share/emacs/site-lisp \ + --opt +MAKE_ENV= COQINSTALLPREFIX=${DESTDIR} + +OPTIONS_DEFINE= DOCS IDE +OPTIONS_DEFAULT= DOCS IDE +OPTIONS_SUB= yes +IDE_DESC= Include desktop environment (coqide) +IDE_BUILD_DEPENDS= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 +IDE_RUN_DEPENDS= ${IDE_BUILD_DEPENDS +IDE_CONFIGURE_OFF= --coqide no +DOCS_USE= TEX=latex:build,dvipsk:build +DOCS_BUILD_DEPENDS= hevea:${PORTSDIR}/textproc/hevea \ + ${LOCALBASE}/share/texmf/tex/latex/ucs/utf8x.def:${PORTSDIR}/print/latex-ucs +DOCS_CONFIGURE_OFF= --with-doc none +PORTDOCS= * .include @@ -67,6 +52,8 @@ post-patch: -e '/^MAKE=/d' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's:/bin/bash:/bin/sh:' \ ${WRKSRC}/Makefile* ${WRKSRC}/install.sh + @${REINPLACE_CMD} -e '/^#COQINSTALLPREFIX/{s/^#//;s|$$|$${DESTDIR}|;}' \ + ${WRKSRC}/Makefile.build @${REINPLACE_CMD} -e '/show_latex_mes/s/)$$/; true)/' ${WRKSRC}/Makefile.doc .include Modified: head/math/coq/distinfo ============================================================================== --- head/math/coq/distinfo Sat Jan 11 09:22:35 2014 (r339410) +++ head/math/coq/distinfo Sat Jan 11 09:31:40 2014 (r339411) @@ -1,2 +1,2 @@ -SHA256 (coq-8.4pl2.tar.gz) = fb719a38f613b01861e3b251e745a5c8ef395a26ce7029668e85ac75fcbca2d8 -SIZE (coq-8.4pl2.tar.gz) = 4145112 +SHA256 (coq-8.4pl3.tar.gz) = 97583d637f981c5554007f4e99ce6420ebc737186b1d021bd71766fd891cfb38 +SIZE (coq-8.4pl3.tar.gz) = 4064579 Modified: head/math/coq/pkg-plist ============================================================================== --- head/math/coq/pkg-plist Sat Jan 11 09:22:35 2014 (r339410) +++ head/math/coq/pkg-plist Sat Jan 11 09:31:40 2014 (r339411) @@ -823,7 +823,7 @@ lib/coq/proofs/proofview.cmi lib/coq/proofs/redexpr.cmi lib/coq/proofs/refiner.cmi lib/coq/proofs/tacexpr.cmi -lib/coq/proofs/tac%%PERL_ARCH%%.cmi +lib/coq/proofs/tacmach.cmi lib/coq/proofs/tactic_debug.cmi lib/coq/proofs/proofs.cmxa lib/coq/proofs/proofs.a @@ -950,6 +950,19 @@ lib/coq/libcoqrun.a %%IDE%%lib/coq/ide/command_windows.cmi %%IDE%%lib/coq/ide/coqide_ui.cmi %%IDE%%lib/coq/ide/coqide.cmi +man/man1/coq-tex.1.gz +man/man1/coq_makefile.1.gz +man/man1/coqc.1.gz +man/man1/coqchk.1.gz +man/man1/coqdep.1.gz +man/man1/coqdoc.1.gz +man/man1/coqide.1.gz +man/man1/coqmktop.1.gz +man/man1/coqtop.1.gz +man/man1/coqtop.byte.1.gz +man/man1/coqtop.opt.1.gz +man/man1/coqwc.1.gz +man/man1/gallina.1.gz share/emacs/site-lisp/coq-db.el share/emacs/site-lisp/coq-font-lock.el share/emacs/site-lisp/coq-syntax.el @@ -1041,3 +1054,4 @@ share/emacs/site-lisp/coqdoc.sty @dirrm lib/coq/tools @dirrm lib/coq @dirrm etc/xdg/coq +@dirrmtry etc/xdg