From nobody@FreeBSD.org  Tue Feb 12 10:10:37 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id 4E05B749
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 12 Feb 2013 10:10:37 +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 25AAD21E
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 12 Feb 2013 10:10:37 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id r1CAAbNa038946
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 12 Feb 2013 10:10:37 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id r1CAAbXD038945;
	Tue, 12 Feb 2013 10:10:37 GMT
	(envelope-from nobody)
Message-Id: <201302121010.r1CAAbXD038945@red.freebsd.org>
Date: Tue, 12 Feb 2013 10:10:37 GMT
From: Jaap Boender <jaapb@kerguelen.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [maintainer update] textproc/ocaml-text to 0.6
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         176060
>Category:       ports
>Synopsis:       [maintainer update] textproc/ocaml-text to 0.6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    marino
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 12 10:20:00 UTC 2013
>Closed-Date:    Wed Mar 26 23:06:19 UTC 2014
>Last-Modified:  Wed Mar 26 23:06:19 UTC 2014
>Originator:     Jaap Boender
>Release:        9.1-RELEASE
>Organization:
>Environment:
FreeBSD purcell.mdx.ac.uk 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243825: Tue Dec  4 09:23:10 UTC 2012     root@farrell.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  amd64

>Description:
This is an update of textproc/ocaml-text to its latest version, 0.6. There are no changes to the software, only an update of the build system. (This is significant, though, as 0.5 doesn't seem to build on my system, whereas 0.6 does)


>How-To-Repeat:
n/a
>Fix:
result of svn diff included.

Patch attached with submission follows:

Index: Makefile
===================================================================
--- Makefile	(revision 311755)
+++ Makefile	(working copy)
@@ -5,16 +5,16 @@
 # $FreeBSD$
 
 PORTNAME=	text
-PORTVERSION=	0.5
+PORTVERSION=	0.6
 CATEGORIES=	textproc
-MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/641/
+MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/937/
 PKGNAMEPREFIX=	ocaml-
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	jaapb@kerguelen.org
 COMMENT=	OCaml library for dealing with text
 
-DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
+DOCSDIR=	${PREFIX}/share/doc/ocaml/${PORTNAME}
 
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS=		--docdir ${DOCSDIR} --prefix ${PREFIX} --mandir ${PREFIX}/man
@@ -48,4 +48,6 @@
 	${TOUCH} ${OCAMLFIND_LDCONF}
 .endif
 
+pre-install:
+	${MKDIR} ${DOCSDIR}
 .include <bsd.port.post.mk>
Index: distinfo
===================================================================
--- distinfo	(revision 311755)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (ocaml-text-0.5.tar.gz) = d7fc2ae616130a61f822686a6c366a5a4653d3fd8785c14d57038c9f5643dfc3
-SIZE (ocaml-text-0.5.tar.gz) = 248862
+SHA256 (ocaml-text-0.6.tar.gz) = cfd4d224ec0b776ce462c5ba5cb6e4eae8cf397ede6d3b91add44a05a6520f49
+SIZE (ocaml-text-0.6.tar.gz) = 253162


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Thu Feb 14 08:16:43 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=176060 
Responsible-Changed-From-To: miwi->bf 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Thu Mar 28 06:19:13 UTC 2013 
Responsible-Changed-Why:  
pass over to bf, he is dealing with the big ocaml update. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=176060 
Responsible-Changed-From-To: bf->marino 
Responsible-Changed-By: marino 
Responsible-Changed-When: Wed Mar 26 18:11:46 UTC 2014 
Responsible-Changed-Why:  
I will take a look at this 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/176060: commit references a PR
Date: Wed, 26 Mar 2014 20:42:02 +0000 (UTC)

 Author: marino
 Date: Wed Mar 26 20:41:58 2014
 New Revision: 349291
 URL: http://svnweb.freebsd.org/changeset/ports/349291
 QAT: https://qat.redports.org/buildarchive/r349291/
 
 Log:
   textproc/ocaml-text: Update version 0.5 -> 0.6 and stage
   
   Since the maintainer also maintains the pkgsrc version of ocaml-text,
   I used their methods for implementing stage.  I am perplexed about the
   change in the pkg-plist because no documents were generated and there
   were no documents on pkgsrc plist either.  As with other recent ocaml
   changes, ldconf changes were inhibited.  ldconf probably needs a new
   global policy (e.g. apply in a post-install script)
   
   PR:		ports/176060
   Submitted by:	maintainer (Jaap Boender)
   Stage support:	Taken from pkgsrc
 
 Modified:
   head/textproc/ocaml-text/Makefile
   head/textproc/ocaml-text/distinfo
   head/textproc/ocaml-text/pkg-plist
 
 Modified: head/textproc/ocaml-text/Makefile
 ==============================================================================
 --- head/textproc/ocaml-text/Makefile	Wed Mar 26 20:40:26 2014	(r349290)
 +++ head/textproc/ocaml-text/Makefile	Wed Mar 26 20:41:58 2014	(r349291)
 @@ -2,45 +2,45 @@
  # $FreeBSD$
  
  PORTNAME=	text
 -PORTVERSION=	0.5
 +PORTVERSION=	0.6
  CATEGORIES=	textproc
 -MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/641/
 +MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/937/
  PKGNAMEPREFIX=	ocaml-
  DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
  
  MAINTAINER=	jaapb@kerguelen.org
  COMMENT=	OCaml library for dealing with text
  
 -HAS_CONFIGURE=	yes
 -CONFIGURE_ARGS=	--docdir ${DOCSDIR} --prefix ${PREFIX} --mandir ${PREFIX}/man
  USES=		gmake
 +HAS_CONFIGURE=	yes
 +CONFIGURE_ARGS=	--prefix ${PREFIX} \
 +		--destdir ${STAGEDIR}
  
  USE_OCAML=		yes
  USE_OCAML_FINDLIB=	yes
 -USE_OCAML_LDCONFIG=	yes
 -USE_OCAMLFIND_PLIST=	yes
  
  SA_DIR=		${LOCALBASE}/${OCAML_SITELIBDIR}
  DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
  
 -OPTIONS_DEFINE=	PCRE
 +OPTIONS_DEFINE=		PCRE
  OPTIONS_DEFAULT=	PCRE
  
  PCRE_CONFIGURE_ENABLE=	pcre
  PCRE_BUILD_DEPENDS=	${SA_DIR}/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre
  PCRE_RUN_DEPENDS=	${SA_DIR}/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre
  
 -NO_STAGE=	yes
 -post-extract:
 -# For non-standard prefixes
 -.if !exists(${OCAMLFIND_DESTDIR})
 -	${MKDIR} ${OCAMLFIND_DESTDIR}
 -.endif
 -.if !exists(${OCAMLFIND_LDCONF})
 -	${TOUCH} ${OCAMLFIND_LDCONF}
 -.endif
 -
  post-patch:
 -	@${REINPLACE_CMD} -e 's,"make","${GMAKE}",' ${WRKSRC}/setup.ml
 +	@${REINPLACE_CMD} -e 's,"install" :: findlib_name,"install" :: "-destdir ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib" :: "-ldconf /dev/null" :: findlib_name,' \
 +		${WRKSRC}/setup.ml
 +
 +do-configure:
 +	(cd ${WRKSRC}; ocaml setup.ml -configure ${CONFIGURE_ARGS})
 +
 +do-build:
 +	(cd ${WRKSRC}; ocaml setup.ml -build)
 +
 +do-install:
 +	${MKDIR} ${STAGEDIR}${OCAMLFIND_DESTDIR}
 +	(cd ${WRKSRC}; ocaml setup.ml -install)
  
  .include <bsd.port.mk>
 
 Modified: head/textproc/ocaml-text/distinfo
 ==============================================================================
 --- head/textproc/ocaml-text/distinfo	Wed Mar 26 20:40:26 2014	(r349290)
 +++ head/textproc/ocaml-text/distinfo	Wed Mar 26 20:41:58 2014	(r349291)
 @@ -1,2 +1,2 @@
 -SHA256 (ocaml-text-0.5.tar.gz) = d7fc2ae616130a61f822686a6c366a5a4653d3fd8785c14d57038c9f5643dfc3
 -SIZE (ocaml-text-0.5.tar.gz) = 248862
 +SHA256 (ocaml-text-0.6.tar.gz) = cfd4d224ec0b776ce462c5ba5cb6e4eae8cf397ede6d3b91add44a05a6520f49
 +SIZE (ocaml-text-0.6.tar.gz) = 253162
 
 Modified: head/textproc/ocaml-text/pkg-plist
 ==============================================================================
 --- head/textproc/ocaml-text/pkg-plist	Wed Mar 26 20:40:26 2014	(r349290)
 +++ head/textproc/ocaml-text/pkg-plist	Wed Mar 26 20:41:58 2014	(r349291)
 @@ -1,18 +1,42 @@
 -%%DOCSDIR%%/api/Encoding.html
 -%%DOCSDIR%%/api/Text.html
 -%%DOCSDIR%%/api/index.html
 -%%DOCSDIR%%/api/index_attributes.html
 -%%DOCSDIR%%/api/index_class_types.html
 -%%DOCSDIR%%/api/index_classes.html
 -%%DOCSDIR%%/api/index_exceptions.html
 -%%DOCSDIR%%/api/index_methods.html
 -%%DOCSDIR%%/api/index_module_types.html
 -%%DOCSDIR%%/api/index_modules.html
 -%%DOCSDIR%%/api/index_types.html
 -%%DOCSDIR%%/api/index_values.html
 -%%DOCSDIR%%/api/style.css
 -%%DOCSDIR%%/api/type_Encoding.html
 -%%DOCSDIR%%/api/type_Text.html
 -@dirrm %%DOCSDIR%%/api
 -%%DOCSDIR%%/manual.pdf
 -@dirrm %%DOCSDIR%%
 +%%OCAML_SITELIBDIR%%/text/META
 +%%OCAML_SITELIBDIR%%/text/dlltext-bigarray_stubs.so
 +%%OCAML_SITELIBDIR%%/text/dlltext_stubs.so
 +%%OCAML_SITELIBDIR%%/text/encoding.cmi
 +%%OCAML_SITELIBDIR%%/text/encoding.cmx
 +%%OCAML_SITELIBDIR%%/text/encoding.mli
 +%%OCAML_SITELIBDIR%%/text/encoding_bigarray.cmi
 +%%OCAML_SITELIBDIR%%/text/encoding_bigarray.cmx
 +%%OCAML_SITELIBDIR%%/text/encoding_bigarray.mli
 +%%OCAML_SITELIBDIR%%/text/libtext-bigarray_stubs.a
 +%%OCAML_SITELIBDIR%%/text/libtext_stubs.a
 +%%OCAML_SITELIBDIR%%/text/pa_text_env.cmx
 +%%OCAML_SITELIBDIR%%/text/pa_text_main.cmx
 +%%OCAML_SITELIBDIR%%/text/pa_text_parse.cmx
 +%%OCAML_SITELIBDIR%%/text/pa_text_regexp.cmx
 +%%OCAML_SITELIBDIR%%/text/pa_text_types.cmx
 +%%OCAML_SITELIBDIR%%/text/pa_text_util.cmx
 +%%OCAML_SITELIBDIR%%/text/text-bigarray.a
 +%%OCAML_SITELIBDIR%%/text/text-bigarray.cma
 +%%OCAML_SITELIBDIR%%/text/text-bigarray.cmxa
 +%%OCAML_SITELIBDIR%%/text/text-bigarray.cmxs
 +%%OCAML_SITELIBDIR%%/text/text-pcre-syntax.a
 +%%OCAML_SITELIBDIR%%/text/text-pcre-syntax.cma
 +%%OCAML_SITELIBDIR%%/text/text-pcre-syntax.cmxa
 +%%OCAML_SITELIBDIR%%/text/text-pcre-syntax.cmxs
 +%%OCAML_SITELIBDIR%%/text/text-pcre.a
 +%%OCAML_SITELIBDIR%%/text/text-pcre.cma
 +%%OCAML_SITELIBDIR%%/text/text-pcre.cmxa
 +%%OCAML_SITELIBDIR%%/text/text-pcre.cmxs
 +%%OCAML_SITELIBDIR%%/text/text.a
 +%%OCAML_SITELIBDIR%%/text/text.cma
 +%%OCAML_SITELIBDIR%%/text/text.cmi
 +%%OCAML_SITELIBDIR%%/text/text.cmx
 +%%OCAML_SITELIBDIR%%/text/text.cmxa
 +%%OCAML_SITELIBDIR%%/text/text.cmxs
 +%%OCAML_SITELIBDIR%%/text/text.mli
 +%%OCAML_SITELIBDIR%%/text/text_pcre.cmi
 +%%OCAML_SITELIBDIR%%/text/text_pcre.cmx
 +%%OCAML_SITELIBDIR%%/text/text_pcre.mli
 +@dirrm %%OCAML_SITELIBDIR%%/text
 +@dirrmtry %%OCAML_SITELIBDIR%%
 +@dirrmtry lib/ocaml
 _______________________________________________
 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: open->closed 
State-Changed-By: marino 
State-Changed-When: Wed Mar 26 23:06:19 UTC 2014 
State-Changed-Why:  
Committed. Thanks! 

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