Bug 176060 - [maintainer update] textproc/ocaml-text to 0.6
Summary: [maintainer update] textproc/ocaml-text to 0.6
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: John Marino
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-02-12 10:20 UTC by jaapb
Modified: 2014-03-26 23:06 UTC (History)
0 users

See Also:


Attachments
file.diff (1.27 KB, patch)
2013-02-12 10:20 UTC, jaapb
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description jaapb 2013-02-12 10:20:00 UTC
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)

Fix: result of svn diff included.

Patch attached with submission follows:
How-To-Repeat: n/a
Comment 1 Martin Wilke freebsd_committer freebsd_triage 2013-02-14 08:16:43 UTC
Responsible Changed
From-To: freebsd-ports-bugs->miwi

I'll take it.
Comment 2 Martin Wilke freebsd_committer freebsd_triage 2013-03-28 06:19:13 UTC
Responsible Changed
From-To: miwi->bf

pass over to bf, he is dealing with the big ocaml update.
Comment 3 John Marino freebsd_committer freebsd_triage 2014-03-26 18:11:46 UTC
Responsible Changed
From-To: bf->marino

I will take a look at this
Comment 4 dfilter service freebsd_committer freebsd_triage 2014-03-26 20:42:02 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"
Comment 5 John Marino freebsd_committer freebsd_triage 2014-03-26 23:06:19 UTC
State Changed
From-To: open->closed

Committed. Thanks!