[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
forgot to add a pkg-message (Committer: pkg-message is a new file!). New patch supersedes the former one. Simon, please take a look at pkg-message, since for users it looks like you have written these words. Regards, Olli diff -ruN /usr/ports/lang/ghc/Makefile ghc/Makefile --- /usr/ports/lang/ghc/Makefile Tue Jul 23 07:48:19 2002 +++ ghc/Makefile Sat Jul 27 16:44:31 2002 @@ -6,7 +6,7 @@ PORTNAME= ghc PORTVERSION= 5.04 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang MASTER_SITES= http://www.haskell.org/ghc/dist/${PORTVERSION}/ @@ -49,11 +49,23 @@ 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}) @(cd ${BOOT_DIR} && ${MAKE} in-place) pre-build: @${MKDIR} ${TMPDIR} + +post-install: + @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff -ruN /usr/ports/lang/ghc/pkg-message ghc/pkg-message --- /usr/ports/lang/ghc/pkg-message Thu Jan 1 01:00:00 1970 +++ ghc/pkg-message Sat Jul 27 16:41:03 2002 @@ -0,0 +1,9 @@ +******************************************************** +In order to avoid problems with the textproc/haxml port, + + DrIFT, DtdToHaskell, and Xtract + +were installed as + + DrIFT-ghc, DtdToHaskell-ghc, and Xtract-ghc +******************************************************** diff -ruN /usr/ports/lang/ghc/pkg-plist ghc/pkg-plist --- /usr/ports/lang/ghc/pkg-plist Sun Jul 21 17:15:33 2002 +++ ghc/pkg-plist Sat Jul 27 15:27:44 2002 @@ -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
----- Forwarded message from Simon Marlow <simonmar@microsoft.com> ----- From: "Simon Marlow" <simonmar@microsoft.com> To: "Oliver Braun" <obraun@informatik.unibw-muenchen.de>, > Simon, could you please check my patch and approve it, if you=20 > are agreed. Approved, thanks Olli. Those empty directories should really not be there, I'll fix it for the next release. For the post-install message, I would make one small change: "In order to avoid problems with the textproc/haxml port" change to "In order to avoid a conflict with the textproc/haxml port" (because "a problem" is a bit vague). Cheers, Simon ----- End forwarded message ----- --=20 IST & IIS _ INF _ UniBwM _____ http://ist.unibw-muenchen.de/People/obraun/ Tele-Consulting GmbH _________ http://www.tele-consulting.com/ ___ obraun@ FreeBSD: The Power To Serve __ http://www.freebsd.org/ ___________________
I have filed a follow-up to PR ports/41231 including everything in this PR. So, Committer, please commit PR ports/41231 and close this, too. Regards, Olli -- IST & IIS _ INF _ UniBwM _____ http://ist.unibw-muenchen.de/People/obraun/ Tele-Consulting GmbH _________ http://www.tele-consulting.com/ ___ obraun@ FreeBSD: The Power To Serve __ http://www.freebsd.org/ ___________________
Adding to audit trail: : : Message-Id: <9584A4A864BD8548932F2F88EB30D1C609D06BA6@TVP-MSG-01.europe.corp.microsoft.com> : Date: Mon, 29 Jul 2002 11:15:13 +0100 : From: "Simon Marlow" <simonmar@microsoft.com> : Subject: RE: Update port: lang/ghc - avoid problems with textproc/haxml, fix package : : > Simon, could you please check my patch and approve it, if you : > are agreed. : : Approved, thanks Olli. : : Those empty directories should really not be there, I'll fix it for the : next release. : : For the post-install message, I would make one small change: "In order : to avoid problems with the textproc/haxml port" change to "In order to : avoid a conflict with the textproc/haxml port" (because "a problem" is a : bit vague).
Responsible Changed From-To: freebsd-ports->obraun I am submitter and want to handle this.
State Changed From-To: open->closed Committed, thanks!