From 998a192b4009fa2edb956ac4a14169c20913584f Mon Sep 17 00:00:00 2001 From: Oliver Braun Date: Sun, 15 Sep 2002 15:37:33 +0000 Subject: [PATCH] * Fix detection of ghc version. => Fix pkg-plist s/ghcunknown/ghc5/ * Bump PORTREVISION. Submitted by: Manuel M T Chakravarty (developer) --- devel/hs-hpl/Makefile | 1 + devel/hs-hpl/files/patch-configure | 11 +++++++++++ devel/hs-hpl/pkg-plist | 18 +++++++++--------- 3 files changed, 21 insertions(+), 9 deletions(-) create mode 100644 devel/hs-hpl/files/patch-configure diff --git a/devel/hs-hpl/Makefile b/devel/hs-hpl/Makefile index 6bc24eb5478e..617a3018e53b 100644 --- a/devel/hs-hpl/Makefile +++ b/devel/hs-hpl/Makefile @@ -7,6 +7,7 @@ PORTNAME= hpl PORTVERSION= 0.3.3 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://www.cse.unsw.edu.au/~chak/haskell/ports/ DISTNAME= ports-${PORTVERSION} diff --git a/devel/hs-hpl/files/patch-configure b/devel/hs-hpl/files/patch-configure new file mode 100644 index 000000000000..6398fd5998c7 --- /dev/null +++ b/devel/hs-hpl/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig Sun Sep 15 17:27:44 2002 ++++ configure Sun Sep 15 17:28:09 2002 +@@ -1224,7 +1224,7 @@ + else + ${GHC-ghc} --version > conftestghc 2>&1 + cat conftestghc >&5 +- ports_cv_ghc_version=`cat conftestghc | sed -n -e 's/, patchlevel *\([0-9]\)/.\1/;s/.* version \([0-9.]\+\).*/\1/p'` ++ ports_cv_ghc_version=`cat conftestghc | sed -n -e 's/, patchlevel *\([0-9]\)/.\1/;s/.* version \([0-9.][0-9.]*\).*/\1/p'` + rm -fr conftest* + if test "$ports_cv_ghc_version" = "" + then diff --git a/devel/hs-hpl/pkg-plist b/devel/hs-hpl/pkg-plist index 2758f316c498..1fce6cfcaa7a 100644 --- a/devel/hs-hpl/pkg-plist +++ b/devel/hs-hpl/pkg-plist @@ -1,11 +1,11 @@ bin/ports-config -lib/ports-0.3.3/ghcunknown/import/HPL.hi -lib/ports-0.3.3/ghcunknown/import/Ports.hi -lib/ports-0.3.3/ghcunknown/import/PortsConfig.hi -lib/ports-0.3.3/ghcunknown/import/PortsVersion.hi -lib/ports-0.3.3/ghcunknown/import/Processes.hi -lib/ports-0.3.3/ghcunknown/import/SVars.hi -lib/ports-0.3.3/ghcunknown/libportsHS.a -@dirrm lib/ports-0.3.3/ghcunknown/import -@dirrm lib/ports-0.3.3/ghcunknown +lib/ports-0.3.3/ghc5/import/HPL.hi +lib/ports-0.3.3/ghc5/import/Ports.hi +lib/ports-0.3.3/ghc5/import/PortsConfig.hi +lib/ports-0.3.3/ghc5/import/PortsVersion.hi +lib/ports-0.3.3/ghc5/import/Processes.hi +lib/ports-0.3.3/ghc5/import/SVars.hi +lib/ports-0.3.3/ghc5/libportsHS.a +@dirrm lib/ports-0.3.3/ghc5/import +@dirrm lib/ports-0.3.3/ghc5 @dirrm lib/ports-0.3.3