diff --git a/databases/hs-HDBC-mysql/Makefile b/databases/hs-HDBC-mysql/Makefile index 0b46d0eddcd..caa900ab46f 100644 --- a/databases/hs-HDBC-mysql/Makefile +++ b/databases/hs-HDBC-mysql/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.24 2016/08/30 15:01:28 dcoppa Exp $ +# $OpenBSD: Makefile,v 1.25 2016/09/21 09:22:07 dcoppa Exp $ COMMENT= mysql driver for HDBC -DISTNAME= HDBC-mysql-0.6.6.4 +DISTNAME= HDBC-mysql-0.7.0.0 CATEGORIES= databases HOMEPAGE= https://github.com/bos/hdbc-mysql @@ -16,7 +16,7 @@ MODULES= lang/ghc MODGHC_BUILD= cabal hackage haddock register -MODGHC_PACKAGE_KEY = 0SFmcWquuxDEamxRT0O3BM +MODGHC_PACKAGE_KEY = B89nA9IKWpvEHMJpgDMAcx RUN_DEPENDS += databases/hs-HDBC>=2.1.0 \ databases/mariadb \ diff --git a/databases/hs-HDBC-mysql/distinfo b/databases/hs-HDBC-mysql/distinfo index 9eba4ca767f..9f4acc4fc7d 100644 --- a/databases/hs-HDBC-mysql/distinfo +++ b/databases/hs-HDBC-mysql/distinfo @@ -1,2 +1,2 @@ -SHA256 (ghc/HDBC-mysql-0.6.6.4.tar.gz) = Ad+BkguaAFzZ4RRnql4FsQU00oSTP93DSZFADliIBIs= -SIZE (ghc/HDBC-mysql-0.6.6.4.tar.gz) = 23135 +SHA256 (ghc/HDBC-mysql-0.7.0.0.tar.gz) = zEa3rmhAYpmKPrT45xBDbV4s7ZTgnUB3cRbPIKQ98eQ= +SIZE (ghc/HDBC-mysql-0.7.0.0.tar.gz) = 23013 diff --git a/databases/hs-HDBC-mysql/patches/patch-HDBC-mysql_cabal b/databases/hs-HDBC-mysql/patches/patch-HDBC-mysql_cabal new file mode 100644 index 00000000000..23aa7096ecc --- /dev/null +++ b/databases/hs-HDBC-mysql/patches/patch-HDBC-mysql_cabal @@ -0,0 +1,33 @@ +$OpenBSD: patch-HDBC-mysql_cabal,v 1.3 2016/09/21 09:22:07 dcoppa Exp $ +--- HDBC-mysql.cabal.orig Wed Sep 21 11:17:11 2016 ++++ HDBC-mysql.cabal Wed Sep 21 11:18:02 2016 +@@ -12,7 +12,7 @@ homepage: http://github.com/ryantm/hdbc-mysql + bug-reports: http://github.com/ryantm/hdbc-mysql/issues + build-type: Custom + tested-with: GHC +-cabal-version: >= 1.24 ++cabal-version: >= 1.22 + description: + This package provides a MySQL driver for HDBC, implemented via + bindings to the C @mysqlclient@ library. +@@ -20,11 +20,6 @@ extra-source-files: + ChangeLog + README.md + +-custom-setup +- setup-depends: +- base >= 4.9 && < 5, +- Cabal >= 1.24 +- + library + exposed-modules: Database.HDBC.MySQL + other-modules: +@@ -32,7 +27,7 @@ library + Database.HDBC.MySQL.RTS + build-depends: + HDBC >= 2.1.0, +- base >= 4.9 && < 5, ++ base >= 2 && < 4.9, + bytestring, + time, + utf8-string diff --git a/databases/hs-HDBC-mysql/patches/patch-Setup_lhs b/databases/hs-HDBC-mysql/patches/patch-Setup_lhs new file mode 100644 index 00000000000..f49c81728e8 --- /dev/null +++ b/databases/hs-HDBC-mysql/patches/patch-Setup_lhs @@ -0,0 +1,14 @@ +$OpenBSD: patch-Setup_lhs,v 1.3 2016/09/21 09:22:07 dcoppa Exp $ +--- Setup.lhs.orig Wed Sep 21 09:22:29 2016 ++++ Setup.lhs Wed Sep 21 09:22:36 2016 +@@ -28,8 +28,8 @@ main = defaultMainWithHooks simpleUserHooks { + + mysqlConfigProgram = (simpleProgram "mysql_config") { + programFindLocation = \verbosity _ -> do +- mysql_config <- findProgramOnSearchPath verbosity defaultProgramSearchPath "mysql_config" +- mysql_config5 <- findProgramOnSearchPath verbosity defaultProgramSearchPath "mysql_config5" ++ mysql_config <- findProgramLocation verbosity "mysql_config" ++ mysql_config5 <- findProgramLocation verbosity "mysql_config5" + return (mysql_config `mplus` mysql_config5) + } +