From lizard@unsane.de  Sat Jul 27 06:58:29 2002
Return-Path: <lizard@unsane.de>
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id BAE0537B400
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 27 Jul 2002 06:58:29 -0700 (PDT)
Received: from unsane.de (pD950FE7C.dip.t-dialin.net [217.80.254.124])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1330B43E31
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 27 Jul 2002 06:58:29 -0700 (PDT)
	(envelope-from lizard@unsane.de)
Received: from localhost (localhost.unsane.de [127.0.0.1])
	by unsane.de (Postfix) with ESMTP
	id 4976C9B1; Sat, 27 Jul 2002 15:58:23 +0200 (CEST)
Received: by unsane.de (Postfix, from userid 1001)
	id 9AE6A204; Sat, 27 Jul 2002 15:58:20 +0200 (CEST)
Message-Id: <20020727135820.9AE6A204@unsane.de>
Date: Sat, 27 Jul 2002 15:58:20 +0200 (CEST)
From: Oliver Braun <obraun@informatik.unibw-muenchen.de>
Reply-To:
To: FreeBSD-gnats-submit@freebsd.org
Cc: simonmar@microsoft.com
Subject: Update port: lang/ghc - avoid problems with textproc/haxml, fix package
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         41051
>Category:       ports
>Synopsis:       Update port: lang/ghc - avoid problems with textproc/haxml, fix package
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    obraun
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jul 27 07:00:04 PDT 2002
>Closed-Date:    Thu Aug 22 05:54:36 PDT 2002
>Last-Modified:  Thu Aug 22 05:54:36 PDT 2002
>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:

From: Oliver Braun <obraun@informatik.unibw-muenchen.de>
To: freebsd-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/41051: Update port: lang/ghc - avoid problems with textproc/haxml, fix package
Date: Sat, 27 Jul 2002 16:53:51 +0200

 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

From: Oliver Braun <obraun@informatik.unibw-muenchen.de>
To: freebsd-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/41051: Update port: lang/ghc - avoid problems with textproc/haxml, fix package
Date: Mon, 29 Jul 2002 13:13:07 +0200

 ----- 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/ ___________________

From: Oliver Braun <obraun@informatik.unibw-muenchen.de>
To: freebsd-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/41051: Update port: lang/ghc - avoid problems with textproc/haxml, fix package
Date: Thu, 1 Aug 2002 19:47:27 +0200

 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/ ___________________

From: Giorgos Keramidas <keramida@FreeBSD.org>
To: Oliver Braun <obraun@informatik.unibw-muenchen.de>
Cc: bug-followup@FreeBSD.org, simonmar@microsoft.com
Subject: Re: ports/41051: Update port: lang/ghc - avoid problems with textproc/haxml, fix package
Date: Tue, 20 Aug 2002 23:39:16 +0300

 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 
Responsible-Changed-By: obraun 
Responsible-Changed-When: Wed Aug 21 05:20:20 PDT 2002 
Responsible-Changed-Why:  
I am submitter and want to handle this. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=41051 
State-Changed-From-To: open->closed 
State-Changed-By: obraun 
State-Changed-When: Thu Aug 22 05:54:14 PDT 2002 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=41051 
>Unformatted:
