From 71daab72600b4870ea0f6628c5f095aa493b1ba9 Mon Sep 17 00:00:00 2001
From: kili <kili@openbsd.org>
Date: Sat, 23 Apr 2011 20:16:38 +0000
Subject: [PATCH] Move almost all Haskell distfiles fetched from
 hackage.haskell.org into a common subdirectory `ghc', and also move the ghc
 distfiles there (from ghc-${MODGHC_VER}).

This will avoid potential conflicts of hs-* ports distfiles coming
from hackage.haskell.org with distfiles used by other ports.

Based on an idea from dcoppa@ for databases/hs-redis.

ok dcoppa@

If you want to save some bandwdith and disk space, see my mail to
ports@, which contains a shell script that can move distfiles around
under your DISTDIR.
---
 lang/ghc/Makefile    | 4 ++--
 lang/ghc/ghc.port.mk | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 6c8501050dc..9549daa905f 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.53 2011/04/23 12:52:36 kili Exp $
+# $OpenBSD: Makefile,v 1.54 2011/04/23 20:16:38 kili Exp $
 
 COMMENT-main =		compiler for the functional language Haskell
 COMMENT-doc =		documentation for GHC
@@ -44,7 +44,7 @@ MASTER_SITES =		${HOMEPAGE}dist/${MODGHC_VER}/ \
 			${HOMEPAGE}dist/stable/dist/
 MASTER_SITES0 =		http://openbsd.dead-parrot.de/distfiles/
 
-DIST_SUBDIR =		ghc-${MODGHC_VER}
+DIST_SUBDIR =		ghc
 
 VMEM_WARNING =		Yes
 
diff --git a/lang/ghc/ghc.port.mk b/lang/ghc/ghc.port.mk
index 8c1f446d578..d9ead1cf3b6 100644
--- a/lang/ghc/ghc.port.mk
+++ b/lang/ghc/ghc.port.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: ghc.port.mk,v 1.21 2011/04/20 18:17:27 jeremy Exp $
+# $OpenBSD: ghc.port.mk,v 1.22 2011/04/23 20:16:38 kili Exp $
 # Module for Glasgow Haskell Compiler
 
 # Not yet ported to other architectures
@@ -42,6 +42,7 @@ MODGHC_HACKAGE_VERSION =	${DISTNAME:C,.*-([0-9.]*)$,\1,}
 HOMEPAGE ?=			http://hackage.haskell.org/package/${MODGHC_HACKAGE_NAME}
 MASTER_SITES =			http://hackage.haskell.org/packages/archive/${MODGHC_HACKAGE_NAME}/${MODGHC_HACKAGE_VERSION}/
 SUBST_VARS +=			DISTNAME MODGHC_HACKAGE_VERSION
+DIST_SUBDIR ?=			ghc
 . endif
 
 . if ${MODGHC_BUILD:L:Mcabal}