From nobody@FreeBSD.org  Thu Feb 23 11:02:48 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 278A1106564A
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 23 Feb 2012 11:02:48 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 094A08FC0C
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 23 Feb 2012 11:02:48 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q1NB2l6n084371
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 23 Feb 2012 11:02:47 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id q1NB2lUA084370;
	Thu, 23 Feb 2012 11:02:47 GMT
	(envelope-from nobody)
Message-Id: <201202231102.q1NB2lUA084370@red.freebsd.org>
Date: Thu, 23 Feb 2012 11:02:47 GMT
From: bf <bf@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH]lang/ocaml-doc: update to 3.12.1
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         165416
>Category:       ports
>Synopsis:       [PATCH]lang/ocaml-doc: update to 3.12.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    johans
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Feb 23 11:10:07 UTC 2012
>Closed-Date:    Mon Dec 31 14:17:27 UTC 2012
>Last-Modified:  Mon Dec 31 14:17:27 UTC 2012
>Originator:     bf
>Release:        
>Organization:
-
>Environment:
>Description:
The lang/ocaml maintainer asked that ocaml-doc be updated, and suggested bumping the PORTVERSION to 3.12 and adjusting the distinfo accordingly, but it appears that html documents for the latest version are available, so instead I propose that we update to 3.12.1, remove the pdf and ps documents that are redundant and unavailable for 3.12.1, remove the stale mirrors, and simplify the installation by installing the entire manual with COPYTREE_SHARE.  It might be a good idea to either re-integrate this port with lang/ocaml, or at least have the same maintainer for these two ports and lang/ocaml-examples, in order to simplify maintenance and keep them synchronized.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/lang/ocaml-doc/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile	23 Feb 2010 18:05:58 -0000	1.11
+++ Makefile	23 Feb 2012 10:43:06 -0000
@@ -6,19 +6,14 @@
 #
 
 PORTNAME=	ocaml
-PORTVERSION=	3.11
+PORTVERSION=	3.12.1
 CATEGORIES=	lang
-MASTER_SITES=	http://caml.inria.fr/distrib/${DISTNAME}/ \
-		ftp://ftp.inria.fr/INRIA/caml-light/${DISTNAME}/ \
-		ftp://ftp.kurims.kyoto-u.ac.jp/pub/lang/caml-light/${DISTNAME}/
+MASTER_SITES=	http://caml.inria.fr/distrib/${DISTNAME:R}/
 PKGNAMESUFFIX=	-doc
-DISTFILES=	${DISTNAME}-refman.html.tar.gz \
-		${DISTNAME}-refman.ps.gz \
-		${DISTNAME}-refman.pdf
-EXTRACT_ONLY=	${DISTNAME}-refman.html.tar.gz
+DISTFILES=	${DISTNAME}-refman-html.tar.gz
 
 MAINTAINER=	johans@FreeBSD.org
-COMMENT=	Documentation (HTML, PS) for the Objective Caml
+COMMENT=	Documentation for the Objective Caml system
 
 NO_BUILD=	yes
 
@@ -29,10 +24,7 @@
 .endif
 
 do-install:
-	@${MKDIR} ${DOCSDIR}/html/libref
-	cd ${WRKDIR}/htmlman/libref && ${INSTALL_DATA} * ${DOCSDIR}/html/libref
-	cd ${WRKDIR}/htmlman && ${INSTALL_DATA} [a-km-z]* libg* ${DOCSDIR}/html
-	${INSTALL_DATA} ${DISTDIR}/${DISTNAME}-refman.ps.gz ${DOCSDIR}
-	${INSTALL_DATA} ${DISTDIR}/${DISTNAME}-refman.pdf ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
+	@cd ${WRKDIR}/htmlman && ${COPYTREE_SHARE} \* ${DOCSDIR}
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/lang/ocaml-doc/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo	3 Jul 2011 13:45:21 -0000	1.6
+++ distinfo	23 Feb 2012 10:35:24 -0000
@@ -1,6 +1,2 @@
-SHA256 (ocaml-3.11-refman.html.tar.gz) = 1c65b334ccb155aefa1e5e930a91f816d843d37e26b27d3a0351c57149005a5c
-SIZE (ocaml-3.11-refman.html.tar.gz) = 536530
-SHA256 (ocaml-3.11-refman.ps.gz) = cfc16d35d4060c75d2e8121430caaebd1b9d9bef9fb323a9c4034b7db70684a3
-SIZE (ocaml-3.11-refman.ps.gz) = 808412
-SHA256 (ocaml-3.11-refman.pdf) = 35f5adfeb92817f7e3ef66dec6b4ca910f48a3a2cf0bfa34bd155fe6866de405
-SIZE (ocaml-3.11-refman.pdf) = 1946372
+SHA256 (ocaml-3.12.1-refman-html.tar.gz) = 84b9d793de25c75d4a3b7cd207bc17ddcf010c8a74296ced74c55814f6d038a1
+SIZE (ocaml-3.12.1-refman-html.tar.gz) = 526923


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->johans 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Feb 23 11:10:24 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

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

From: =?ISO-8859-15?Q?Michael_Gr=FCnewald?=
 <michael.grunewald@laposte.net>
To: bug-followup@FreeBSD.org, bf@FreeBSD.org
Cc:  
Subject: Re: ports/165416: [PATCH]lang/ocaml-doc: update to 3.12.1
Date: Wed, 29 Feb 2012 20:27:09 +0100

 As the (new) maintainer of lang/ocaml I am volunteering to merge 
 ocaml-doc and ocaml-examples with ocaml.
 
 Instead of being provided by separate ports, the installation of 
 documentation and examples should be controlled by the DOCS and EXAMPLES 
 knobs, respectively.
 
 I will try to come up with a patch within the next days.

From: Johan van Selst <johans@FreeBSD.org>
To: Michael =?iso-8859-1?Q?Gr=FCnewald?= <michael.grunewald@laposte.net>
Cc: bug-followup@FreeBSD.org, bf@FreeBSD.org
Subject: Re: ports/165416: [PATCH]lang/ocaml-doc: update to 3.12.1
Date: Wed, 29 Feb 2012 20:41:26 +0100

 --pf9I7BMVVzbSWLtt
 Content-Type: text/plain; charset=iso-8859-1
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 Michael Gr=FCnewald wrote:
 >  As the (new) maintainer of lang/ocaml I am volunteering to merge=20
 >  ocaml-doc and ocaml-examples with ocaml.
 
 That would be great, thank you for volunteering. I was only
 'maintaining' this port as it was unmaintained at the time and
 the then-maintainer of ocaml wasn't very interested. Merging these
 ports is the best way to keep them in sync.
 
 I'll be happy to commit your patch when it arrives and remove
 the lang/ocaml-doc port.
 
 
 Regards,
 Johan
 
 --pf9I7BMVVzbSWLtt
 Content-Type: application/pgp-signature
 
 -----BEGIN PGP SIGNATURE-----
 
 iF4EAREIAAYFAk9Of2UACgkQAEpMHW8nCPQFpwD/VP50wJrQLJRZZSZxBGZQWa/g
 8x8UPMlbdBVpXUoizFkBAJ9xbb+8ypas8+yQvYLNL1LdQoqbcNDkz8OcaPLnRk6C
 =XMhW
 -----END PGP SIGNATURE-----
 
 --pf9I7BMVVzbSWLtt--
State-Changed-From-To: open->closed 
State-Changed-By: johans 
State-Changed-When: Mon Dec 31 13:43:42 UTC 2012 
State-Changed-Why:  
Documentation has been updated to 3.12.1. 
Port will be incorporated in lang/ocaml later (next release?) 

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