head	1.4;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.2
	OPENPKG_E1_MP:1.2
	OPENPKG_E1_MP_2_STABLE:1.2.2.2
	OPENPKG_E1_FP:1.2.2.2
	OPENPKG_2_STABLE_MP:1.2
	OPENPKG_2_STABLE_20061018:1.2.2.2
	OPENPKG_2_STABLE:1.2.0.2
	OPENPKG_CW_FP:1.1;
locks; strict;
comment	@# @;


1.4
date	2009.05.03.09.43.10;	author rse;	state Exp;
branches;
next	1.3;
commitid	TANcX5Ul9t84qpMt;

1.3
date	2008.08.14.18.10.46;	author rse;	state Exp;
branches;
next	1.2;
commitid	q71NDPi1QMhlEMet;

1.2
date	2006.10.11.17.08.31;	author rse;	state Exp;
branches
	1.2.2.1;
next	1.1;
commitid	v6lzKYyaNl1dWhQr;

1.1
date	2005.03.06.12.45.05;	author rse;	state Exp;
branches;
next	;

1.2.2.1
date	2006.10.11.17.08.31;	author rse;	state dead;
branches;
next	1.2.2.2;
commitid	iZxwRSmmWscPXUQr;

1.2.2.2
date	2006.10.16.14.50.22;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.4
log
@upgrading package: ghc 6.6.1 -> 6.10.2
@
text
@Index: mk/config.mk.in
--- mk/config.mk.in.orig	2009-03-30 19:13:16 +0200
+++ mk/config.mk.in	2009-05-03 10:07:45 +0200
@@@@ -625,7 +625,7 @@@@
 # where package.conf is, so we just set it globally).
 #
 datarootdir := $(datadir0)
-libdir      := $(libdir0)/ghc-$(ProjectVersion)
+libdir      := $(libdir0)/ghc
 datadir     := $(libdir)
 
 # New autoconf (>= 2.60?) make a configure with --docdir=DIR etc flags.
@


1.3
log
@fix Perl checking
@
text
@d2 4
a5 5
--- mk/config.mk.in.orig	2006-10-10 21:03:51 +0200
+++ mk/config.mk.in	2006-10-11 17:58:33 +0200
@@@@ -512,8 +512,8 @@@@
 # Unix: override libdir and datadir to put ghc-specific stuff in
 # a subdirectory with the version number included.
d7 4
a10 4
-libdir     = $(libdir0)/ghc-$(ProjectVersion)
-datadir    = $(datadir0)/ghc-$(ProjectVersion)
+libdir     = $(libdir0)/ghc
+datadir    = $(datadir0)/ghc
d12 1
a12 14
 endif # Windows
 
Index: configure
--- configure.orig	2007-04-24 02:27:26 +0200
+++ configure	2008-06-08 00:07:41 +0200
@@@@ -2590,7 +2590,7 @@@@
       exit 1
    else
    $PerlCmd -v >conftest.out 2>&1
-   if grep "v5.6" conftest.out >/dev/null 2>&1; then
+   if grep "v5.10" conftest.out >/dev/null 2>&1; then
       :
    else
       if grep "v5.8" conftest.out >/dev/null 2>&1; then
@


1.2
log
@upgrading package: ghc 6.4.2 -> 6.6
@
text
@d15 12
@


1.2.2.1
log
@file ghc.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:50:22 +0000
@
text
@d1 14
@


1.2.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 14
Index: mk/config.mk.in
--- mk/config.mk.in.orig	2006-10-10 21:03:51 +0200
+++ mk/config.mk.in	2006-10-11 17:58:33 +0200
@@@@ -512,8 +512,8 @@@@
 # Unix: override libdir and datadir to put ghc-specific stuff in
 # a subdirectory with the version number included.
 #
-libdir     = $(libdir0)/ghc-$(ProjectVersion)
-datadir    = $(datadir0)/ghc-$(ProjectVersion)
+libdir     = $(libdir0)/ghc
+datadir    = $(datadir0)/ghc
 
 endif # Windows
 
@


1.1
log
@new package: ghc 6.4.20050304 (Glasgow Haskell Compiler)
@
text
@d2 4
a5 4
--- mk/config.mk.in.orig	2005-03-01 20:19:08 +0100
+++ mk/config.mk.in	2005-03-06 09:10:47 +0100
@@@@ -535,8 +535,8 @@@@
 # Unix: override libdir and datadir to put project-specific stuff in
d8 4
a11 4
-libdir     = $(if $(ProjectNameShort),$(libdir0)/$(ProjectNameShort)-$(ProjectVersion),$(libdir0))
-datadir    = $(if $(ProjectNameShort),$(datadir0)/$(ProjectNameShort)-$(ProjectVersion),$(datadir0))
+libdir     = $(if $(ProjectNameShort),$(libdir0)/$(ProjectNameShort),$(libdir0))
+datadir    = $(if $(ProjectNameShort),$(datadir0)/$(ProjectNameShort),$(datadir0))
@