From owner-svn-ports-all@freebsd.org Tue Jan 22 15:03:25 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4FC6414A4B06; Tue, 22 Jan 2019 15:03:25 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BC82D8FF94; Tue, 22 Jan 2019 15:03:24 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AB8F82F3A; Tue, 22 Jan 2019 15:03:24 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0MF3ORr068467; Tue, 22 Jan 2019 15:03:24 GMT (envelope-from jrm@FreeBSD.org) Received: (from jrm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0MF3OVt068466; Tue, 22 Jan 2019 15:03:24 GMT (envelope-from jrm@FreeBSD.org) Message-Id: <201901221503.x0MF3OVt068466@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jrm set sender to jrm@FreeBSD.org using -f From: Joseph Mingrone Date: Tue, 22 Jan 2019 15:03:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r490955 - head/textproc/hs-pandoc X-SVN-Group: ports-head X-SVN-Commit-Author: jrm X-SVN-Commit-Paths: head/textproc/hs-pandoc X-SVN-Commit-Revision: 490955 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: BC82D8FF94 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.97)[-0.972,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Tue, 22 Jan 2019 15:03:25 -0000 Author: jrm Date: Tue Jan 22 15:03:24 2019 New Revision: 490955 URL: https://svnweb.freebsd.org/changeset/ports/490955 Log: textproc/hs-pandoc: Switch to static build and fix option issues - With the default options, there were many large dependencies, including ghc. Most users likely just want the application without the compiler and libraries, so switch to a static build. - The build was failing with a few non-default option combinations (e.g, with HTTPS off). Fix these and/or remove options that are probably not that useful for most users. - The binary is linked to libffi.so, so add LIB_DEPENDS on devel/libffi. - Pacify portlint Reported by: adamw Approved by: maintainer (haskell via arrowd) Differential Revision: https://reviews.freebsd.org/D18899 Modified: head/textproc/hs-pandoc/Makefile (contents, props changed) Modified: head/textproc/hs-pandoc/Makefile ============================================================================== --- head/textproc/hs-pandoc/Makefile Tue Jan 22 14:57:27 2019 (r490954) +++ head/textproc/hs-pandoc/Makefile Tue Jan 22 15:03:24 2019 (r490955) @@ -3,7 +3,7 @@ PORTNAME= pandoc PORTVERSION= 2.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -11,50 +11,41 @@ COMMENT= Conversion between markup formats LICENSE= GPLv2 -USE_CABAL= aeson aeson-pretty base64-bytestring blaze-html \ - blaze-markup cmark cmark-gfm data-default \ - deepseq-generics doctemplates extensible-exceptions \ - filemanip Glob haddock-library \ - hslua hslua-module-text HsYAML HTTP JuicyPixels mtl \ - network network-uri pandoc-types \ - random scientific SHA skylighting syb tagsoup\ - temporary texmath unicode-transforms \ - unordered-containers vector xml \ - yaml zip-archive zlib +LIB_DEPENDS= libffi.so:devel/libffi USE_ALEX= yes +USE_CABAL= aeson aeson-pretty base64-bytestring blaze-html blaze-markup \ + cmark cmark-gfm data-default deepseq-generics doctemplates \ + extensible-exceptions filemanip Glob haddock-library hslua \ + hslua-module-text HsYAML http-client http-client-tls \ + http-types HTTP JuicyPixels mtl network network-uri \ + pandoc-types random scientific SHA skylighting syb tagsoup \ + temporary texmath unicode-transforms unordered-containers \ + vector xml yaml zip-archive zlib USE_HAPPY= yes -EXECUTABLE= pandoc - -MAN1SRC= man -MAN1PAGES= pandoc.1 - +FLAGS_DEFINE= EMBED_DATA TRYPANDOC OPTIONS_DEFINE= PDFGEN OPTIONS_DEFAULT= PDFGEN -PDFGEN_DESC= Include TeX for PDF generation -PDFGEN_USE= TEX=texmf:run - -FLAGS_DEFINE= EMBED_DATA HTTPS TRYPANDOC -FLAGS_DEFAULT= HTTPS - -EMBED_DATA_DESC= Embed data files in binary for relocatable executable +EMBED_DATA_DESC= Embed data files in binary for relocatable executable EMBED_DATA_FLAG_ENABLE= embed_data_files -EMBED_DATA_FLAG_CABAL= hsb2hs>=0.3.1 - -HTTPS_DESC= Enable downloading of resources over HTTPS -HTTPS_FLAG_ENABLE= https -HTTPS_FLAG_CABAL= http-client>=0.3.2 http-client-tls>=0.2 http-types>=0.8 - -TRYPANDOC_DESC= Build trypandoc cgi executable -TRYPANDOC_FLAG_ENABLE= trypandoc -TRYPANDOC_FLAG_CABAL= aeson wai-extra wai>=0.3 \ - http-types +EMBED_DATA_FLAG_CABAL= file-embed>=0.0 +PDFGEN_DESC= Include TeX for PDF generation +PDFGEN_USE= TEX=texmf:run +TRYPANDOC_DESC= Build trypandoc cgi executable +TRYPANDOC_FLAG_ENABLE= trypandoc +TRYPANDOC_FLAG_CABAL= aeson wai-extra wai>=0.3 TRYPANDOC_FLAG_EXECUTABLE= trypandoc -FLAGS_ENABLE= network-uri -FLAGS_DISABLE= make-pandoc-man-pages +EXECUTABLE= pandoc +FLAGS_ENABLE= network-uri +FLAGS_DISABLE= make-pandoc-man-pages +IGNORE_DYNAMIC= yes +IGNORE_PROFILE= yes +MAN1SRC= man +MAN1PAGES= pandoc.1 +STANDALONE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include