Date: Sat, 27 Jul 2002 15:58:20 +0200 (CEST) From: Oliver Braun <obraun@informatik.unibw-muenchen.de> To: FreeBSD-gnats-submit@FreeBSD.org Cc: simonmar@microsoft.com Subject: ports/41051: Update port: lang/ghc - avoid problems with textproc/haxml, fix package Message-ID: <20020727135820.9AE6A204@unsane.de>
next in thread | raw e-mail | index | archive | help
>Number: 41051
>Category: ports
>Synopsis: Update port: lang/ghc - avoid problems with textproc/haxml, fix package
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Jul 27 07:00:04 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Oliver Braun
>Release: FreeBSD 4.6-STABLE i386
>Organization:
>Environment:
System: FreeBSD galore.unsane.de 4.6-STABLE FreeBSD 4.6-STABLE #0: Thu Jul 11 15:55:17 CEST 2002 root@galore.unsane.de:/usr/obj/usr/src/sys/GALORE_OB i386
>Description:
[CCed maintainer]
lang/ghc includes a version of haxml for ghc. Since it installs the same
binaries as textproc/haxml I have added -ghc to them, namely DrIFT-ghc,
DtdToHaskell-ghc, and Xtract-ghc.
If lang/ghc is installed as package, six (empty) directories were not created.
I have added the neccesary statements to pkg-plist.
Bumped PORTREVISION.
Simon, could you please check my patch and approve it, if you are agreed.
Regards,
Olli
>How-To-Repeat:
>Fix:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/lang/ghc/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile 2002/07/23 01:18:29 1.12
+++ Makefile 2002/07/27 13:31:43
@@ -6,7 +6,7 @@
PORTNAME= ghc
PORTVERSION= 5.04
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= lang
MASTER_SITES= http://www.haskell.org/ghc/dist/${PORTVERSION}/
@@ -48,6 +48,15 @@
# to build some of the larger libraries.
TMPDIR = ${WRKSRC}/tmp
MAKE_ENV += TMPDIR=${TMPDIR}
+
+post-patch:
+ @${PERL} -pi -e 's/DrIFT/DrIFT-ghc/g; \
+ s/DtdToHaskell/DtdToHaskell-ghc/g; \
+ s/Xtract/Xtract-ghc/g' \
+ ${WRKSRC}/ghc/mk/config.mk \
+ ${WRKSRC}/hslibs/tools/DrIFT/Makefile \
+ ${WRKSRC}/hslibs/tools/DtdToHaskell/Makefile \
+ ${WRKSRC}/hslibs/tools/Xtract/Makefile
pre-configure:
@(cd ${BOOT_DIR} && ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS})
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/lang/ghc/pkg-plist,v
retrieving revision 1.8
diff -u -r1.8 pkg-plist
--- pkg-plist 2002/07/21 14:10:56 1.8
+++ pkg-plist 2002/07/27 13:31:45
@@ -9,9 +9,9 @@
bin/hp2ps
bin/ghcprof
bin/stat2resid
-bin/DrIFT
-bin/DtdToHaskell
-bin/Xtract
+bin/DrIFT-ghc
+bin/DtdToHaskell-ghc
+bin/Xtract-ghc
lib/ghc-%%GHC_VERSION%%/HSbase.o
lib/ghc-%%GHC_VERSION%%/HSbase_cbits.o
lib/ghc-%%GHC_VERSION%%/HSconcurrent.o
@@ -825,6 +825,12 @@
lib/ghc-%%GHC_VERSION%%/process-gcstats.prl
lib/ghc-%%GHC_VERSION%%/template-hsc.h
lib/ghc-%%GHC_VERSION%%/unlit
+@exec /bin/mkdir -p %D/lib/ghc-%%GHC_VERSION%%/imports/base/Database
+@exec /bin/mkdir -p %D/lib/ghc-%%GHC_VERSION%%/imports/base/FileFormat
+@exec /bin/mkdir -p %D/lib/ghc-%%GHC_VERSION%%/imports/base/Hugs
+@exec /bin/mkdir -p %D/lib/ghc-%%GHC_VERSION%%/imports/base/Language
+@exec /bin/mkdir -p %D/lib/ghc-%%GHC_VERSION%%/imports/base/NHC
+@exec /bin/mkdir -p %D/lib/ghc-%%GHC_VERSION%%/imports/base/Network
@dirrm lib/ghc-%%GHC_VERSION%%/include
@dirrm lib/ghc-%%GHC_VERSION%%/imports/util
@dirrm lib/ghc-%%GHC_VERSION%%/imports/text
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020727135820.9AE6A204>