From jyyou@cs.nctu.edu.tw  Tue Jul 23 05:53:20 2013
Return-Path: <jyyou@cs.nctu.edu.tw>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id D2036C56
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 23 Jul 2013 05:53:20 +0000 (UTC)
	(envelope-from jyyou@cs.nctu.edu.tw)
Received: from csmailer.cs.nctu.edu.tw (csmailer.cs.nctu.edu.tw [140.113.235.130])
	by mx1.freebsd.org (Postfix) with ESMTP id 6CAEE283D
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 23 Jul 2013 05:53:19 +0000 (UTC)
Received: from csmailer.cs.nctu.edu.tw (localhost [127.0.0.1])
	by csmailer.cs.nctu.edu.tw (Postfix) with ESMTP id 69FBD6B3;
	Tue, 23 Jul 2013 13:44:57 +0800 (CST)
Received: from alumni.cs.nctu.edu.tw (alumni.cs.nctu.edu.tw [140.113.235.116])
	by csmailer.cs.nctu.edu.tw (Postfix) with ESMTP id 46DD06B2;
	Tue, 23 Jul 2013 13:44:57 +0800 (CST)
Received: (from jyyou@localhost)
	by alumni.cs.nctu.edu.tw (8.14.5/8.14.5/Submit) id r6N5iv6P098227;
	Tue, 23 Jul 2013 13:44:57 +0800 (CST)
	(envelope-from jyyou)
Message-Id: <201307230544.r6N5iv6P098227@alumni.cs.nctu.edu.tw>
Date: Tue, 23 Jul 2013 13:44:57 +0800 (CST)
From: Jyun-Yan You <jyyou@cs.nctu.edu.tw>
To: FreeBSD-gnats-submit@freebsd.org
Cc: joris.gio@gmail.com
Subject: [PATCH] devel/ocaml-opam: fix build error of util.ml
X-Send-Pr-Version: 3.113
X-GNATS-Notify: joris.gio@gmail.com

>Number:         180753
>Category:       ports
>Synopsis:       [PATCH] devel/ocaml-opam: fix build error of util.ml
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    marino
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 23 06:00:00 UTC 2013
>Closed-Date:    Mon Jan 20 14:51:01 UTC 2014
>Last-Modified:  Mon Jan 20 14:51:01 UTC 2014
>Originator:     Jyun-Yan You
>Release:        FreeBSD 9.1-RELEASE-p4 amd64
>Organization:
>Environment:
System: FreeBSD alumni.cs.nctu.edu.tw 9.1-RELEASE-p4 FreeBSD 9.1-RELEASE-p4 #0: Mon Jun 17 11:42:37 UTC 2013
>Description:
This patch fixes the build error of util.ml when we use system-optimized ocaml binaries by default.

Port maintainer (joris.gio@gmail.com) is cc'd.

Generated with FreeBSD Port Tools 0.99_8 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:

--- ocaml-opam-1.0.0.patch begins here ---
diff -ruN /usr/ports/devel/ocaml-opam/Makefile ./Makefile
--- /usr/ports/devel/ocaml-opam/Makefile	2013-07-02 04:07:20.000000000 +0800
+++ ./Makefile	2013-07-23 13:41:12.961006000 +0800
@@ -41,4 +41,13 @@
 	opam.1 \
 	opam-reinstall.1
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/bin/camlp4o.byte)
+post-patch:
+	${REINPLACE_CMD} \
+	    -e 's/camlp4o/camlp4o.byte/' \
+	    ${WRKSRC}/src_ext/depends.ocp.boot
+.endif
+
+.include <bsd.port.post.mk>
--- ocaml-opam-1.0.0.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Tue Jul 23 06:00:09 UTC 2013 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=180753 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: joris.gio@gmail.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/180753: [PATCH] devel/ocaml-opam: fix build error of util.ml
Date: Tue, 23 Jul 2013 06:00:08 UT

 Maintainer of devel/ocaml-opam,
 
 Please note that PR ports/180753 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/180753
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: freebsd-ports-bugs->marino 
Responsible-Changed-By: marino 
Responsible-Changed-When: Sun Jan 19 14:46:18 UTC 2014 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=180753 

From: Joris Giovannangeli <joris@giovannangeli.fr>
To: bug-followup@FreeBSD.org, jyyou@cs.nctu.edu.tw
Cc:  
Subject: Re: ports/180753: [PATCH] devel/ocaml-opam: fix build error of util.ml
Date: Mon, 20 Jan 2014 15:02:36 +0100

 This is a multi-part message in MIME format.
 --------------050202080703060801060504
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 Hi,
 
 I see why the issue could happen here, but this sounds like a hack. I've
 not been able to reproduce the issue, but i've updated the ports to the
 new major version. Since the new version also has a new build system, it
 might be fixed by configure/build system magic.
 
 --------------050202080703060801060504
 Content-Type: text/x-patch;
  name="opam.patch"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="opam.patch"
 
 diff -uNr b/devel/ocaml-opam/Makefile a/devel/ocaml-opam/Makefile
 --- b/devel/ocaml-opam/Makefile	2014-01-20 14:44:33.516073000 +0100
 +++ a/devel/ocaml-opam/Makefile	2014-01-20 14:44:42.456086000 +0100
 @@ -2,7 +2,7 @@
  # $FreeBSD: devel/ocaml-opam/Makefile 335086 2013-11-28 11:03:59Z marino $
  
  PORTNAME=	opam
 -PORTVERSION=	1.0.0
 +PORTVERSION=	1.1.0
  CATEGORIES=	devel
  MASTER_SITES=	http://www.ocamlpro.com/pub/
  PKGNAMEPREFIX=	ocaml-
 @@ -19,27 +19,4 @@
  USE_OCAML=	yes
  GNU_CONFIGURE=	yes
  
 -PLIST_FILES=	bin/opam bin/opam-mk-repo
 -
 -MAN1=	opam-check.1 \
 -	opam-remote.1 \
 -	opam-config.1 \
 -	opam-remove.1 \
 -	opam-help.1 \
 -	opam-repository.1 \
 -	opam-info.1 \
 -	opam-search.1 \
 -	opam-init.1 \
 -	opam-switch.1 \
 -	opam-install.1 \
 -	opam-update.1 \
 -	opam-list.1 \
 -	opam-upgrade.1 \
 -	opam-mk-repo.1 \
 -	opam-upload.1 \
 -	opam-pin.1 \
 -	opam.1 \
 -	opam-reinstall.1
 -
 -NO_STAGE=	yes
  .include <bsd.port.mk>
 diff -uNr b/devel/ocaml-opam/distinfo a/devel/ocaml-opam/distinfo
 --- b/devel/ocaml-opam/distinfo	2014-01-20 14:44:33.516073000 +0100
 +++ a/devel/ocaml-opam/distinfo	2014-01-20 14:44:42.456086000 +0100
 @@ -1,2 +1,2 @@
 -SHA256 (opam-full-1.0.0.tar.gz) = e2504c044fb730451f2d728e2b24810798b1f1b0153917b21524ad807fbf8709
 -SIZE (opam-full-1.0.0.tar.gz) = 2304000
 +SHA256 (opam-full-1.1.0.tar.gz) = c0ab5e85b6cd26e533a40686e08aea173387d15bead817026f5b08f264642583
 +SIZE (opam-full-1.1.0.tar.gz) = 2271477
 diff -uNr b/devel/ocaml-opam/pkg-plist a/devel/ocaml-opam/pkg-plist
 --- b/devel/ocaml-opam/pkg-plist	1970-01-01 01:00:00.000000000 +0100
 +++ a/devel/ocaml-opam/pkg-plist	2014-01-20 14:44:42.456086000 +0100
 @@ -0,0 +1,22 @@
 +bin/opam
 +bin/opam-admin
 +man/man1/opam-admin-check.1.gz
 +man/man1/opam-admin-make.1.gz
 +man/man1/opam-admin.1.gz
 +man/man1/opam-check.1.gz
 +man/man1/opam-config.1.gz
 +man/man1/opam-help.1.gz
 +man/man1/opam-info.1.gz
 +man/man1/opam-init.1.gz
 +man/man1/opam-install.1.gz
 +man/man1/opam-list.1.gz
 +man/man1/opam-pin.1.gz
 +man/man1/opam-reinstall.1.gz
 +man/man1/opam-remote.1.gz
 +man/man1/opam-remove.1.gz
 +man/man1/opam-repository.1.gz
 +man/man1/opam-search.1.gz
 +man/man1/opam-switch.1.gz
 +man/man1/opam-update.1.gz
 +man/man1/opam-upgrade.1.gz
 +man/man1/opam.1.gz
 
 --------------050202080703060801060504--

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/180753: commit references a PR
Date: Mon, 20 Jan 2014 14:48:14 +0000 (UTC)

 Author: marino
 Date: Mon Jan 20 14:48:06 2014
 New Revision: 340403
 URL: http://svnweb.freebsd.org/changeset/ports/340403
 QAT: https://qat.redports.org/buildarchive/r340403/
 
 Log:
   devel/ocaml-opam: Update to versions from 1.0 to 1.1
   
   This also has benefit of fixing the problem where a .conf file was
   created in ${HOME} which is illegal and the reason ocaml-opam never
   made it into dports.  The original complaint of the PR could not be
   reproduced, however.
   
   PR:		ports/180753
   Fixed by:	maintainer (Joris G.)
 
 Added:
   head/devel/ocaml-opam/pkg-plist   (contents, props changed)
 Modified:
   head/devel/ocaml-opam/Makefile
   head/devel/ocaml-opam/distinfo
 
 Modified: head/devel/ocaml-opam/Makefile
 ==============================================================================
 --- head/devel/ocaml-opam/Makefile	Mon Jan 20 14:35:09 2014	(r340402)
 +++ head/devel/ocaml-opam/Makefile	Mon Jan 20 14:48:06 2014	(r340403)
 @@ -2,7 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	opam
 -PORTVERSION=	1.0.0
 +PORTVERSION=	1.1.0
  CATEGORIES=	devel
  MASTER_SITES=	http://www.ocamlpro.com/pub/
  PKGNAMEPREFIX=	ocaml-
 @@ -15,31 +15,8 @@ LICENSE=	GPLv3
  
  BUILD_DEPENDS=	curl:${PORTSDIR}/ftp/curl
  
 -USE_GMAKE=	yes
 +USES=		gmake
  USE_OCAML=	yes
  GNU_CONFIGURE=	yes
  
 -PLIST_FILES=	bin/opam bin/opam-mk-repo
 -
 -MAN1=	opam-check.1 \
 -	opam-remote.1 \
 -	opam-config.1 \
 -	opam-remove.1 \
 -	opam-help.1 \
 -	opam-repository.1 \
 -	opam-info.1 \
 -	opam-search.1 \
 -	opam-init.1 \
 -	opam-switch.1 \
 -	opam-install.1 \
 -	opam-update.1 \
 -	opam-list.1 \
 -	opam-upgrade.1 \
 -	opam-mk-repo.1 \
 -	opam-upload.1 \
 -	opam-pin.1 \
 -	opam.1 \
 -	opam-reinstall.1
 -
 -NO_STAGE=	yes
  .include <bsd.port.mk>
 
 Modified: head/devel/ocaml-opam/distinfo
 ==============================================================================
 --- head/devel/ocaml-opam/distinfo	Mon Jan 20 14:35:09 2014	(r340402)
 +++ head/devel/ocaml-opam/distinfo	Mon Jan 20 14:48:06 2014	(r340403)
 @@ -1,2 +1,2 @@
 -SHA256 (opam-full-1.0.0.tar.gz) = e2504c044fb730451f2d728e2b24810798b1f1b0153917b21524ad807fbf8709
 -SIZE (opam-full-1.0.0.tar.gz) = 2304000
 +SHA256 (opam-full-1.1.0.tar.gz) = c0ab5e85b6cd26e533a40686e08aea173387d15bead817026f5b08f264642583
 +SIZE (opam-full-1.1.0.tar.gz) = 2271477
 
 Added: head/devel/ocaml-opam/pkg-plist
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/devel/ocaml-opam/pkg-plist	Mon Jan 20 14:48:06 2014	(r340403)
 @@ -0,0 +1,22 @@
 +bin/opam
 +bin/opam-admin
 +man/man1/opam-admin-check.1.gz
 +man/man1/opam-admin-make.1.gz
 +man/man1/opam-admin.1.gz
 +man/man1/opam-check.1.gz
 +man/man1/opam-config.1.gz
 +man/man1/opam-help.1.gz
 +man/man1/opam-info.1.gz
 +man/man1/opam-init.1.gz
 +man/man1/opam-install.1.gz
 +man/man1/opam-list.1.gz
 +man/man1/opam-pin.1.gz
 +man/man1/opam-reinstall.1.gz
 +man/man1/opam-remote.1.gz
 +man/man1/opam-remove.1.gz
 +man/man1/opam-repository.1.gz
 +man/man1/opam-search.1.gz
 +man/man1/opam-switch.1.gz
 +man/man1/opam-update.1.gz
 +man/man1/opam-upgrade.1.gz
 +man/man1/opam.1.gz
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: feedback->closed 
State-Changed-By: marino 
State-Changed-When: Mon Jan 20 14:51:00 UTC 2014 
State-Changed-Why:  
Updated to version 1.1 instead 

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