[arch-commits] Commit in haskell-network-uri/trunk (2 files)

[Felix Yan]

    Date: Wednesday, May 25, 2016 @ 05:57:02
  Author: fyan
Revision: 176478

upgpkg: haskell-network-uri 2.6.1.0-3

rebuild with ghc-8.0.1, base-prelude-1.0.1.1, cabal-install-1.24.0.0, cairo-0.13.2.0, cmark-0.5.2.1, data-default-0.7.0, data-default-class-0.1.0, extra-1.4.7, generic-trie-0.3.0.2, glib-0.13.3.0, gtk3 0.14.2 -> 0.14.3, haddock-api-2.17.2, haddock-library-1.4.1, js-jquery-1.12.4, memory-0.13, microlens-0.4.4.0, network-multicast-0.1.1, pango-0.13.2.0, simple-sendfile-0.2.24, stack-1.1.2, wai-3.2.1.1

Modified:
  haskell-network-uri/trunk/PKGBUILD
Deleted:
  haskell-network-uri/trunk/haskell-network-uri.install

-----------------------------+
 PKGBUILD                    |   15 +++++++--------
 haskell-network-uri.install |   35 -----------------------------------
 2 files changed, 7 insertions(+), 43 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-25 03:56:25 UTC (rev 176477)
+++ PKGBUILD	2016-05-25 03:57:02 UTC (rev 176478)
@@ -3,15 +3,13 @@
 _hkgname=network-uri
 pkgname=haskell-network-uri
 pkgver=2.6.1.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A library for client-side HTTP"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-options=('staticlibs')
-depends=('ghc=7.10.3' 'sh' 'haskell-parsec')
+depends=('ghc=8.0.1' 'sh' 'haskell-parsec')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install=${pkgname}.install
 md5sums=('c6ed1e8314a9b1674a3d118d9019a229')
 
 build() {
@@ -30,15 +28,16 @@
 
  runhaskell Setup register --gen-script
  runhaskell Setup unregister --gen-script
+ sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
 }
 
 package() {
- cd ${_hkgname}-${pkgver}
+ cd "${srcdir}/${_hkgname}-${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 -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
- install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.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/${_hkgname}
 

Deleted: haskell-network-uri.install
===================================================================
--- haskell-network-uri.install	2016-05-25 03:56:25 UTC (rev 176477)
+++ haskell-network-uri.install	2016-05-25 03:57:02 UTC (rev 176478)
@@ -1,35 +0,0 @@
-pkgname=haskell-network-uri
-
-_register() {
- usr/share/haskell/${pkgname}/register.sh
-}
-
-_unregister() {
- usr/share/haskell/${pkgname}/unregister.sh
-}
-
-_gen_contents() {
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-post_install() {
- _register
- _gen_contents
-}
-
-pre_upgrade() {
- _unregister
-}
-
-post_upgrade() {
- _register
- _gen_contents
-}
-
-pre_remove() {
- _unregister
-}
-
-post_remove() {
- _gen_contents
-}