[arch-commits] Commit in pandoc/trunk (PKGBUILD)

[Felix Yan]

    Date: Friday, June 16, 2017 @ 07:41:31
  Author: felixonmars
Revision: 237521

upgpkg: pandoc 1.19.2.1-73

rebuild with ghc,8.0.2

Modified:
  pandoc/trunk/PKGBUILD

----------+
 PKGBUILD |   53 ++++++++++++++++++++---------------------------------
 1 file changed, 20 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-06-16 07:26:31 UTC (rev 237520)
+++ PKGBUILD	2017-06-16 07:41:31 UTC (rev 237521)
@@ -2,24 +2,26 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell at haskell.org>
 
-pkgbase=pandoc
-pkgname=(pandoc haskell-pandoc)
+pkgname=pandoc
 pkgver=1.19.2.1
-pkgrel=72
+pkgrel=73
 pkgdesc="Conversion between markup formats"
 url="http://pandoc.org"
 license=("GPL")
 arch=('i686' 'x86_64')
-makedepends=("ghc=8.0.1" "haskell-http" "haskell-juicypixels" "haskell-sha" "haskell-aeson"
-             "haskell-base64-bytestring" "haskell-blaze-html" "haskell-blaze-markup"
-             "haskell-cmark" "haskell-data-default" "haskell-doctemplates" "haskell-mtl"
-             "haskell-extensible-exceptions" "haskell-filemanip" "haskell-haddock-library"
-             "haskell-skylighting" "haskell-hslua" "haskell-http-client" "haskell-syb"
-             "haskell-http-client-tls" "haskell-http-types"  "haskell-text" "haskell-texmath"
-             "haskell-network" "haskell-old-time" "haskell-pandoc-types" "haskell-parsec"
-             "haskell-random" "haskell-scientific" "haskell-tagsoup" "haskell-temporary"
-             "haskell-network-uri" "haskell-unordered-containers" "haskell-zip-archive"
-             "haskell-vector" "haskell-xml" "haskell-yaml" "haskell-zlib")
+depends=("ghc" "haskell-http" "haskell-juicypixels" "haskell-sha" "haskell-aeson"
+         "haskell-base64-bytestring" "haskell-blaze-html" "haskell-blaze-markup" "haskell-cmark"
+         "haskell-data-default" "haskell-doctemplates" "haskell-mtl" "haskell-extensible-exceptions"
+         "haskell-filemanip" "haskell-haddock-library" "haskell-skylighting" "haskell-hslua"
+         "haskell-http-client" "haskell-syb" "haskell-http-client-tls" "haskell-http-types"
+         "haskell-text" "haskell-texmath" "haskell-network" "haskell-old-time"
+         "haskell-pandoc-types" "haskell-parsec" "haskell-random" "haskell-scientific"
+         "haskell-tagsoup" "haskell-temporary" "haskell-network-uri" "haskell-unordered-containers"
+         "haskell-zip-archive" "haskell-vector" "haskell-xml" "haskell-yaml" "haskell-zlib")
+optdepends=('pandoc-citeproc: for citation rendering with pandoc-citeproc filter'
+            'texlive-core: for pdf output')
+conflicts=('haskell-pandoc')
+replaces=('haskell-pandoc')
 source=("https://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
 sha256sums=('08692f3d77bf95bb9ba3407f7af26de7c23134e7efcdafad0bdaf9050e2c7801')
 
@@ -26,14 +28,12 @@
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
     
-    runhaskell Setup configure -O --enable-library-profiling --enable-shared \
+    runhaskell Setup configure -O --enable-shared --enable-executable-dynamic \
         --prefix=/usr --docdir="/usr/share/doc/${pkgbase}" --datasubdir="$pkgname" \
         --libsubdir=\$compiler/site-local/\$pkgid \
             -f-old-locale -fnetwork-uri -fhttps -f-trypandoc -f-embed_data_files -f-weigh-pandoc
     runhaskell Setup build
-
     runhaskell Setup haddock --hoogle --html
-
     runhaskell Setup register --gen-script
     runhaskell Setup unregister --gen-script
     sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
@@ -40,28 +40,15 @@
     sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
 }
 
-package_pandoc() {
-    depends=('gmp' 'libffi' 'zlib' 'pcre' 'cmark')
-    optdepends=('pandoc-citeproc: for citation rendering with pandoc-citeproc filter'
-                'texlive-core: for pdf output')
-    replaces=('pandoc-static')
-    conflicts=('pandoc-static')
-
+package() {
     cd "${srcdir}/${pkgbase}-${pkgver}"
-    runhaskell Setup copy --destdir="${pkgdir}"
-    rm -r "$pkgdir"/usr/{lib,share/doc}
-}
-
-package_haskell-pandoc() {
-    pkgdesc="Conversion between markup formats (docs and libraries)"
-    depends=("${makedepends[@]}" 'pandoc')
-
-    cd "${srcdir}/${pkgbase}-${pkgver}"    
     install -D -m744 register.sh   "${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
     install -D -m744 unregister.sh "${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
     install -d -m755 "${pkgdir}/usr/share/doc/ghc/html/libraries"
     ln -s "/usr/share/doc/${pkgname}/html" "${pkgdir}/usr/share/doc/ghc/html/libraries/${pkgname}"
     runhaskell Setup copy --destdir="${pkgdir}"
-    rm -r "$pkgdir"/usr/share/{pandoc,man} "$pkgdir"/usr/bin
     rm -f "${pkgdir}/usr/share/doc/${pkgname}/COPYING.md"
+
+    # Remove static libs
+    find "$pkgdir"/usr/lib -name "*.a" -delete
 }