aboutsummaryrefslogtreecommitdiff
path: root/devel/hs-cabal-install
diff options
context:
space:
mode:
authorGabor Pali <pgj@FreeBSD.org>2014-08-10 22:34:50 +0000
committerGabor Pali <pgj@FreeBSD.org>2014-08-10 22:34:50 +0000
commitcc555442337c7591ab5c3fd19ad8e3e185a256b0 (patch)
treea6a0dfa4f440949889fc7b609c83f74555f6894e /devel/hs-cabal-install
parent5e492199d1e024a681c6d21087c8d948cb3b7bc3 (diff)
Notes
Diffstat (limited to 'devel/hs-cabal-install')
-rw-r--r--devel/hs-cabal-install/Makefile17
-rw-r--r--devel/hs-cabal-install/distinfo4
-rw-r--r--devel/hs-cabal-install/files/cabal.in11
-rw-r--r--devel/hs-cabal-install/files/patch-Main.hs24
-rw-r--r--devel/hs-cabal-install/pkg-plist1
5 files changed, 6 insertions, 51 deletions
diff --git a/devel/hs-cabal-install/Makefile b/devel/hs-cabal-install/Makefile
index db06dda49162..d2d5bac5a5e8 100644
--- a/devel/hs-cabal-install/Makefile
+++ b/devel/hs-cabal-install/Makefile
@@ -1,27 +1,18 @@
# $FreeBSD$
PORTNAME= cabal-install
-PORTVERSION= 1.16.0.2
-PORTREVISION= 4
+PORTVERSION= 1.18.0.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Command-line interface for Cabal and Hackage
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= network>=1 random>=1 HTTP>=4000.0.2 zlib>=0.4
+USE_CABAL= network>=1 random>=1 HTTP>=4000.0.8 stm>=2.0 zlib>=0.5.3
STANDALONE= yes
-EXECUTABLE= cabal-install
-
-# Some magic to make `cabal` work with a custom toolchain
-SUB_FILES= cabal
-SUB_LIST= AR=${AR} CC=${CC} CPP=${CPP} LD=${LD} RANLIB=${RANLIB}
-
-post-install::
- @${MV} ${STAGEDIR}${PREFIX}/bin/cabal ${STAGEDIR}${PREFIX}/bin/cabal-install
- ${INSTALL_SCRIPT} ${WRKDIR}/cabal ${STAGEDIR}${PREFIX}/bin
+EXECUTABLE= cabal
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-cabal-install/distinfo b/devel/hs-cabal-install/distinfo
index c5771bcd1a59..00ea6a095c5c 100644
--- a/devel/hs-cabal-install/distinfo
+++ b/devel/hs-cabal-install/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cabal-install-1.16.0.2.tar.gz) = 66dfacc9f33e668e56904072cadb8a36bd9d6522ba5464c6a36a5de7e65c5698
-SIZE (cabal/cabal-install-1.16.0.2.tar.gz) = 201232
+SHA256 (cabal/cabal-install-1.18.0.5.tar.gz) = 477df8ef73916e8bc23c727280a1700939131a3e2809a057668c883b0b521782
+SIZE (cabal/cabal-install-1.18.0.5.tar.gz) = 256777
diff --git a/devel/hs-cabal-install/files/cabal.in b/devel/hs-cabal-install/files/cabal.in
deleted file mode 100644
index 206cf42c79de..000000000000
--- a/devel/hs-cabal-install/files/cabal.in
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-export CC=%%CC%%
-export CPP=%%CPP%%
-export LD=%%LD%%
-export AR=%%AR%%
-export RANLIB=%%RANLIB%%
-
-%%PREFIX%%/bin/cabal-install $*
diff --git a/devel/hs-cabal-install/files/patch-Main.hs b/devel/hs-cabal-install/files/patch-Main.hs
deleted file mode 100644
index fa1da85aaf3e..000000000000
--- a/devel/hs-cabal-install/files/patch-Main.hs
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./Main.hs.orig 2012-04-17 17:17:31.000000000 +0200
-+++ ./Main.hs 2012-11-23 20:47:29.000000000 +0100
-@@ -75,7 +75,7 @@
- ( Verbosity, normal, intToVerbosity, lessVerbose )
- import qualified Paths_cabal_install (version)
-
--import System.Environment (getArgs, getProgName)
-+import System.Environment (getArgs)
- import System.Exit (exitFailure)
- import System.FilePath (splitExtension, takeExtension)
- import System.Directory (doesFileExist)
-@@ -107,10 +107,10 @@
-
- where
- printCommandHelp help = do
-- pname <- getProgName
-+ let pname = "cabal"
- putStr (help pname)
- printGlobalHelp help = do
-- pname <- getProgName
-+ let pname = "cabal"
- configFile <- defaultConfigFile
- putStr (help pname)
- putStr $ "\nYou can edit the cabal configuration file to set defaults:\n"
diff --git a/devel/hs-cabal-install/pkg-plist b/devel/hs-cabal-install/pkg-plist
deleted file mode 100644
index bc479db4f810..000000000000
--- a/devel/hs-cabal-install/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/cabal