ports/148006: Update of devel/ocaml-camomile to 0.7.3

Tue Dec 6 10:10:12 UTC 2011

The following reply was made to PR ports/148006; it has been noted by GNATS.

From: =?ISO-8859-15?Q?Michael_Gr=FCnewald?=
 <michael.grunewald at laposte.net>
To: bug-followup at FreeBSD.org, michael.le_barbier at laposte.net
Cc:  
Subject: Re: ports/148006: Update of devel/ocaml-camomile to 0.7.3
Date: Tue, 06 Dec 2011 11:04:12 +0100

 This is a multi-part message in MIME format.
 --------------050806000609090302050607
 Content-Type: text/plain; charset=ISO-8859-15; format=flowed
 Content-Transfer-Encoding: 7bit

 Sorry, I thought my copy was clean.  Meanwhile, there is an even newer 
 version of camomile (0.8.3).  I hope it will work now!

 --------------050806000609090302050607
 Content-Type: text/plain;
  name="ocaml-camomile.patch"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="ocaml-camomile.patch"

 diff --git a/Makefile b/Makefile
 index 0cd4608..8ce543e 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -7,13 +7,12 @@
  #

  PORTNAME=	camomile
 -PORTVERSION=	0.7.2
 -PORTREVISION=	1
 +PORTVERSION=	0.8.3
  CATEGORIES=	devel
  MASTER_SITES=	SF
  PKGNAMEPREFIX=	ocaml-

 -MAINTAINER=	ports at FreeBSD.org
 +MAINTAINER=	michael.grunewald at laposte.net
  COMMENT=	A comprehensive Unicode library for objective caml language

  USE_BZIP2=	yes
 @@ -28,14 +27,6 @@ MAKE_JOBS_UNSAFE=	yes
  DOCSDIR=	${PREFIX}/share/doc/ocaml/${PORTNAME}
  EXAMPLESDIR=	${PREFIX}/share/examples/ocaml/${PORTNAME}

 -PLIST_FILES=	bin/camomilecharmap \
 -		bin/camomilelocaledef
 -
 -post-patch:
 -	@${REINPLACE_CMD} -E -e \
 -		"s,([[:space:]]*)cp[[:space:]]*-f,\1\$${BSD_INSTALL_DATA}," \
 -		${WRKSRC}/Makefile.in
 -
  post-install:
  	@${FIND} ${DATADIR} ! -type d | \
  		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
 diff --git a/distinfo b/distinfo
 index 171d2e0..2c424e9 100644
 --- a/distinfo
 +++ b/distinfo
 @@ -1,2 +1,2 @@
 -SHA256 (camomile-0.7.2.tar.bz2) = 8abf269714404146bf030099c12df65de58ccaf6c3ac66438c75e1bb9941e62c
 -SIZE (camomile-0.7.2.tar.bz2) = 2130968
 +SHA256 (camomile-0.8.3.tar.bz2) = 94c8d65d417c90301f6b3b21e4b00e151c434a3e2d406c3d5b3363859034f27b
 +SIZE (camomile-0.8.3.tar.bz2) = 2646968
 diff --git a/files/patch-Makefile.in b/files/patch-Makefile.in
 index 8ae789b..5e7c8cd 100644
 --- a/files/patch-Makefile.in
 +++ b/files/patch-Makefile.in
 @@ -1,28 +1,51 @@
 ---- Makefile.in.orig	2006-08-14 04:35:01.000000000 -0700
 -+++ Makefile.in	2010-10-18 18:51:25.000000000 -0700
 -@@ -113,10 +113,10 @@
 - 	$(OCAMLOPT) -c $(OFLAGS) -impl $<
 +--- Makefile.in.orig	2011-05-25 11:07:28.000000000 +0200
 ++++ Makefile.in	2011-11-12 16:01:22.000000000 +0100
 +@@ -389,18 +389,18 @@
 + install: $(INSTALL) install-data

 - public/main.ml : public/main.mlp public/main.cmi
 --	$(CPP) -P -I $(SUBDIR) -o public/main.ml -x c public/main.mlp 
 -+	$(CPP) -P $(SUBDIR) public/main.ml public/main.mlp 
 + install-without-ocamlfind:
 +-	mkdir -p $(OCAMLLIB)
 +-	cp -f camomileLibrary.cmi '$(OCAMLLIB)'
 +-	cp -f camomileLibraryDefault.cmi '$(OCAMLLIB)'	
 +-	cp -f camomileLibraryDyn.cmi '$(OCAMLLIB)'	
 +-	if [ -f camomileLibrary.cmx ]; then cp -f camomileLibrary.cmx '$(OCAMLLIB)'; fi
 +-	if [ -f camomileLibrary.cma ]; then cp -f camomileLibrary.cma '$(OCAMLLIB)'; fi
 +-	if [ -f camomileLibrary.cmxa ]; then cp -f camomileLibrary.cmxa '$(OCAMLLIB)'; fi
 +-	if [ -f camomileLibraryDefault.cmx ]; then cp -f camomileLibraryDefault.cmx '$(OCAMLLIB)'; fi
 +-	if [ -f camomileLibraryDyn.cmx ]; then cp -f camomileLibraryDyn.cmx '$(OCAMLLIB)'; fi
 +-	if [ -f camomile.cma ]; then cp -f camomile.cma '$(OCAMLLIB)'; fi
 +-	if [ -f camomile.cmxa ]; then cp -f camomile.cmxa '$(OCAMLLIB)'; fi
 +-	if [ -f camomile.a ]; then cp -f camomile.a '$(OCAMLLIB)'; fi
 ++	${BSD_INSTALL_DIR} $(OCAMLLIB)
 ++	${BSD_INSTALL_LIB} camomileLibrary.cmi '$(OCAMLLIB)'
 ++	${BSD_INSTALL_LIB} camomileLibraryDefault.cmi '$(OCAMLLIB)'	
 ++	${BSD_INSTALL_LIB} camomileLibraryDyn.cmi '$(OCAMLLIB)'	
 ++	if [ -f camomileLibrary.cmx ]; then ${BSD_INSTALL_DATA} camomileLibrary.cmx '$(OCAMLLIB)'; fi
 ++	if [ -f camomileLibrary.cma ]; then ${BSD_INSTALL_DATA} camomileLibrary.cma '$(OCAMLLIB)'; fi
 ++	if [ -f camomileLibrary.cmxa ]; then ${BSD_INSTALL_DATA} camomileLibrary.cmxa '$(OCAMLLIB)'; fi
 ++	if [ -f camomileLibraryDefault.cmx ]; then ${BSD_INSTALL_DATA} camomileLibraryDefault.cmx '$(OCAMLLIB)'; fi
 ++	if [ -f camomileLibraryDyn.cmx ]; then ${BSD_INSTALL_DATA} camomileLibraryDyn.cmx '$(OCAMLLIB)'; fi
 ++	if [ -f camomile.cma ]; then ${BSD_INSTALL_DATA} camomile.cma '$(OCAMLLIB)'; fi
 ++	if [ -f camomile.cmxa ]; then ${BSD_INSTALL_DATA} camomile.cmxa '$(OCAMLLIB)'; fi
 ++	if [ -f camomile.a ]; then ${BSD_INSTALL_DATA} camomile.a '$(OCAMLLIB)'; fi

 - public/main.mli : public/main.mlip
 --	$(CPP) -P -I $(SUBDIR) -o public/main.mli -x c public/main.mlip 
 -+	$(CPP) -P $(SUBDIR) public/main.mli public/main.mlip 
 + install-with-ocamlfind:
 + 	files= &&\
 +@@ -418,13 +418,13 @@
 + 	mkdir -p '$(DATADIR)'
 + 	mkdir -p '$(DATADIR)'/camomile
 + 	mkdir -p '$(DATADIR)'/camomile/database
 +-	cp -f database/*.mar '$(DATADIR)'/camomile/database || true
 ++	${BSD_INSTALL_DATA} database/*.mar '$(DATADIR)'/camomile/database || true
 + 	mkdir -p '$(DATADIR)'/camomile/charmaps
 +-	cp -f charmaps/*.mar '$(DATADIR)'/camomile/charmaps || true
 ++	${BSD_INSTALL_DATA} charmaps/*.mar '$(DATADIR)'/camomile/charmaps || true
 + 	mkdir -p '$(DATADIR)'/camomile/mappings
 +-	cp -f mappings/*.mar '$(DATADIR)'/camomile/mappings || true
 ++	${BSD_INSTALL_DATA} mappings/*.mar '$(DATADIR)'/camomile/mappings || true
 + 	mkdir -p '$(DATADIR)'/camomile/locales
 +-	cp -f locales/*.mar '$(DATADIR)'/camomile/locales || true
 ++	${BSD_INSTALL_DATA} locales/*.mar '$(DATADIR)'/camomile/locales || true

 - camomileDefaultConfig.ml : Makefile
 - 	(echo "(* This file is automatically generated *)" && \
 -@@ -375,8 +375,10 @@
 - 	ocamlfind install camomile $$files META $(MLI) camomileLibrary.cmi
 + uninstall: $(UNINSTALL)

 - install-bin:
 --	cp -f tools/camomilecharmap.$(OCAMLBEST) $(BINDIR)
 --	cp -f tools/camomilelocaledef.$(OCAMLBEST) $(BINDIR)
 -+	${BSD_INSTALL_PROGRAM} tools/camomilecharmap.$(OCAMLBEST) \
 -+		$(BINDIR)/camomilecharmap
 -+	${BSD_INSTALL_PROGRAM} tools/camomilelocaledef.$(OCAMLBEST) \
 -+		$(BINDIR)/camomilelocaledef
 - 
 - install-data:
 - 	mkdir -p $(DATADIR)

 --------------050806000609090302050607--