2.0.1

2 files changed, 36 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bd61f7c01caf..377f03dec652 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,23 @@
 pkgbase = adblock2privoxy
 	pkgdesc = Convert adblock config files to privoxy format
-	pkgver = 1.4.2
+	pkgver = 2.0.1
 	pkgrel = 1
-	url = https://projects.zubr.me/wiki/adblock2privoxy
-	arch = i686
+	url = https://github.com/essandess/adblock2privoxy
 	arch = x86_64
 	license = GPL
-	makedepends = stack
-	depends = zlib
-	depends = gmp
-	source = http://hackage.haskell.org/package/adblock2privoxy-1.4.2/adblock2privoxy-1.4.2.tar.gz
-	md5sums = eb04789e8fc785607f70658870c1b53d
+	makedepends = ghc
+	depends = ghc-libs
+	depends = haskell-case-insensitive
+	depends = haskell-http-conduit
+	depends = haskell-missingh
+	depends = haskell-network
+	depends = haskell-network-uri
+	depends = haskell-parsec-permutation
+	depends = haskell-old-locale
+	depends = haskell-strict
+	options = !emptydirs
+	source = https://hackage.haskell.org/package/adblock2privoxy-2.0.1/adblock2privoxy-2.0.1.tar.gz
+	sha256sums = 064f501995eef83146ed49ccf83856faee8ab7e6e1fd70013d8bb1e12a3a1411
 
 pkgname = adblock2privoxy
 
diff --git a/PKGBUILD b/PKGBUILD
index f0c337e577d0..149d9de98081 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,30 @@
-# Maintainer: Ivan Wu <2967948168@qq.com>
-pkgname=adblock2privoxy
-pkgver=1.4.2
+# Maintainer: Andrew Sun <adsun701 at gmail dot com>
+# Contributor: Ivan Wu <2967948168 at qq dot com>
+
+_hkgname=adblock2privoxy
+pkgname=$_hkgname
+pkgver=2.0.1
 pkgrel=1
 pkgdesc="Convert adblock config files to privoxy format"
-arch=('i686' 'x86_64')
-url="https://projects.zubr.me/wiki/adblock2privoxy"
+arch=('x86_64')
+url="https://github.com/essandess/adblock2privoxy"
 license=('GPL')
-depends=('zlib' 'gmp')
-makedepends=('stack')
-source=("http://hackage.haskell.org/package/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz")
-md5sums=('eb04789e8fc785607f70658870c1b53d') #generate with 'makepkg -g'
-
-prepare() {
-  cd "$srcdir"/$pkgname-$pkgver
-  stack setup
-  stack install cabal-install
-}
+depends=('ghc-libs' 'haskell-case-insensitive' 'haskell-http-conduit' 'haskell-missingh' 'haskell-network' 'haskell-network-uri' 'haskell-parsec-permutation' 'haskell-old-locale' 'haskell-strict')
+makedepends=('ghc')
+options=('!emptydirs')
+source=("https://hackage.haskell.org/package/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz")
+sha256sums=('064f501995eef83146ed49ccf83856faee8ab7e6e1fd70013d8bb1e12a3a1411')
 
 build() {
-  cd "$srcdir"/$pkgname-$pkgver
-  stack build --only-dependencies
-  stack exec --no-ghc-package-path runhaskell -- Setup.hs configure --user --prefix=/usr --package-db=clear --package-db=global --package-db="$(stack path --snapshot-pkg-db)" --package-db="$(stack path --local-pkg-db)" --docdir=/usr/share/doc/$pkgname --datasubdir=""
-  stack exec --no-ghc-package-path runhaskell -- Setup.hs build
+    cd $srcdir/$_hkgname-$pkgver
+    runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \
+        --prefix=/usr --docdir=/usr/share/doc/$pkgname \
+        --dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
+    runhaskell Setup build
 }
 
 package() {
-  cd "$srcdir"/$pkgname-$pkgver
-  stack exec --no-ghc-package-path runhaskell -- Setup.hs copy --destdir=$pkgdir
+    cd $srcdir/$_hkgname-$pkgver
+    runhaskell Setup copy --destdir="$pkgdir"
+    rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
 }
-
-# vim:set ts=2 sw=2 et: