- Update to 1.1.7

PR:		ports/132064
Submitted by:	maintainer
This commit is contained in:
Renato Botelho
2009-02-25 15:01:39 +00:00
parent 7089b30c68
commit cfe85bf93d
4 changed files with 13 additions and 42 deletions

View File

@@ -6,7 +6,7 @@
#
PORTNAME= ocaml-csv
PORTVERSION= 1.1.6
PORTVERSION= 1.1.7
CATEGORIES= textproc
MASTER_SITES= http://merjis.com/_file/

View File

@@ -1,3 +1,3 @@
MD5 (ocaml-csv-1.1.6.tar.gz) = a91851438f9540b1a445087a4d409507
SHA256 (ocaml-csv-1.1.6.tar.gz) = ff37843ab5e055950e58a20b8a1989a303f09588aa8547a5b98d6dddb5bee799
SIZE (ocaml-csv-1.1.6.tar.gz) = 13944
MD5 (ocaml-csv-1.1.7.tar.gz) = 3d0b5711c10b966686be1e1ee84e4aba
SHA256 (ocaml-csv-1.1.7.tar.gz) = 3b82d4af5544c53dd2d66a6798954673d18c3b891fd7a57e1678905948f04d3c
SIZE (ocaml-csv-1.1.7.tar.gz) = 14522

View File

@@ -1,39 +1,11 @@
--- Makefile.orig 2007-12-17 17:56:16.458954606 -0500
+++ Makefile 2007-12-17 17:54:34.177261751 -0500
@@ -5,11 +5,11 @@
# To enable support for Extlib, also uncomment 'open ExtList' at the top
# of file csv.ml.
--- Makefile.orig 2009-02-24 15:03:43.000000000 +0100
+++ Makefile 2009-02-24 15:04:05.000000000 +0100
@@ -70,7 +70,7 @@
# Build a distribution.
-OCAMLCINCS :=
-#OCAMLCINCS := -package extlib
+#OCAMLCINCS :=
+OCAMLCINCS := -package extlib
OCAMLCFLAGS := -g
-OCAMLCLIBS :=
-#OCAMLCLIBS := -linkpkg
+#OCAMLCLIBS :=
+OCAMLCLIBS := -linkpkg
OCAMLOPTINCS := $(OCAMLCINCS)
OCAMLOPTFLAGS :=
@@ -23,6 +23,20 @@
all: csv.cma csv.cmxa example csvtool
+## The install and META targets were borrowed from Richard W.M. Jones' RPM patch
+install: all META
+ ocamlfind install csv META *.mli $(wildcard *.a) csv.cmi $(wildcard csv.cmx) *.cma $(wildcard *.cmxa)
+# install csvtool ${DESTDIR}${BINDIR}
+
+META:
+ rm -f $@
+ echo 'version="${VERSION}"' >> $@
+ echo 'description="CSV library"' >> $@
+ echo 'archive(byte)="csv.cma"' >> $@
+ echo 'archive(native)="csv.cmxa"' >> $@
+ echo 'requires="extlib"' >> $@
+
+
csv.cma: $(OBJS)
ocamlfind ocamlc $(OCAMLCINCS) $(OCAMLCFLAGS) -a -o $@ $^
install:
- ocamlfind install csv csv.{cmi,a,cmxa,cma,cmx} META
+ ocamlfind install csv csv.cmi csv.a csv.cmxa csv.cma csv.cmx META
dist:
$(MAKE) check-manifest

View File

@@ -3,5 +3,4 @@
%%OCAML_SITELIBDIR%%/csv/csv.cmi
%%OCAML_SITELIBDIR%%/csv/csv.cmx
%%OCAML_SITELIBDIR%%/csv/csv.cmxa
%%OCAML_SITELIBDIR%%/csv/csv.mli
%%OCAML_SITELIBDIR%%/csv/META