head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.32 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.30 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.28 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.26 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.24 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.22 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.20 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.18 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.16 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.14 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.12 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.10 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.8 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.6 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.4 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.2 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.2.0.46 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.44 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.42 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.40 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.38 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.36 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.34 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.30 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.10 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.32 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.28 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.26 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.24 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.22 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.20 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.18 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.16 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.14 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.12 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.8 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.6 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.4 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.2 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.1.0.30 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.28 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.26 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.24 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.22 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.20 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.18 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.16 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.14 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.12 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.10 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.8 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.6 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.4 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.2 pkgsrc-2012Q4-base:1.1; locks; strict; comment @# @; 1.3 date 2022.05.04.08.56.02; author jaapb; state Exp; branches; next 1.2; commitid 9Jl6PZXtoRxFuICD; 1.2 date 2016.07.03.10.44.49; author jaapb; state Exp; branches; next 1.1; commitid 1eYps9p3oqrzBRcz; 1.1 date 2012.12.15.10.25.52; author jaapb; state Exp; branches; next ; desc @@ 1.3 log @Update databases/ocaml-dbm to version 1.3. This migrates the distribution to github and makes other minor changes. @ text @$NetBSD$ Make native code compilation optional and use INSTALL_* macros --- Makefile.orig 2021-10-09 14:48:02.000000000 +0000 +++ Makefile @@@@ -11,7 +11,7 @@@@ # # ######################################################################### -include Makefile.config +-include Makefile.config OCAMLC=ocamlc OCAMLOPT=ocamlopt @@@@ -21,11 +21,18 @@@@ OCAMLRUN=ocamlrun O=o A=a SO=so -LIBDIR=`ocamlc -where` -STUBLIBDIR=$(LIBDIR)/stublibs +HAS_OCAMLOPT?= $(shell if which ocamlopt >/dev/null; then echo yes; else echo no; fi) -all: libcamldbm.$(A) dbm.cma dbm.cmxa dbm.cmxs +TARGETS := libcamldbm.$(A) dbm.cma +FILES := META dllcamldbm.$(SO) libcamldbm.$(A) dbm.cma dbm.cmi dbm.mli + +ifeq ($(HAS_OCAMLOPT),yes) + TARGETS += dbm.cmxa dbm.cmxs + FILES += dbm.cmxa dbm.cmxs dbm.cmx dbm.$(A) +endif + +all: $(TARGETS) dbm.cma: dbm.cmo $(OCAMLMKLIB) -o dbm -oc camldbm -linkall dbm.cmo $(DBM_LINK) @@@@ -57,13 +64,13 @@@@ depend: $(OCAMLDEP) *.ml *.mli > .depend install:: - if test -f dllcamldbm.$(SO); then mkdir $(STUBLIBDIR) || echo Ok; cp dllcamldbm.$(SO) $(STUBLIBDIR)/; fi - cp libcamldbm.$(A) $(LIBDIR)/ + if test -f dllcamldbm.$(SO); then $(BSD_INSTALL_LIB_DIR) $(STUBLIBDIR) || echo Ok; $(BSD_INSTALL_LIB) dllcamldbm.$(SO) $(STUBLIBDIR)/; fi + $(BSD_INSTALL_LIB) libcamldbm.$(A) $(LIBDIR)/ cd $(LIBDIR) && ranlib libcamldbm.$(A) - cp dbm.cmx dbm.cma dbm.cmxa dbm.cmi dbm.mli $(LIBDIR)/ - cp dbm.$(A) $(LIBDIR)/ + $(BSD_INSTALL_DATA) dbm.cmx dbm.cma dbm.cmxa dbm.cmi dbm.mli $(LIBDIR)/ + $(BSD_INSTALL_DATA) dbm.$(A) $(LIBDIR)/ cd $(LIBDIR) && ranlib dbm.$(A) - if test -f dbm.cmxs; then cp dbm.cmxs $(LIBDIR)/; fi + if test -f dbm.cmxs; then $(BSD_INSTALL_DATA) dbm.cmxs $(LIBDIR)/; fi clean:: rm -f *.cm* *.$(O) *.$(A) *.$(SO) @@@@ -77,12 +84,16 @@@@ testdbm.opt: dbm.cmxa testdbm.ml clean:: rm -f testdbm.byte testdbm.opt testdatabase.* -test: testdbm.byte testdbm.opt +test:: testdbm.byte rm -f testdatabase.* ocamlrun -I . ./testdbm.byte rm -f testdatabase.* + +ifeq ($(HAS_OCAMLOPT),yes) +test:: testdbm.opt + rm -f testdatabase.* ./testdbm.opt rm -f testdatabase.* - +endif include .depend @ 1.2 log @Updated the Makefile patch to conform with Debian's, which has been submitted upstream. Also removed the patch to META as this Makefile actually does install the files in the site-lib directory. No upstream changes. @ text @d3 3 a5 2 Make native code compilation optional and integrate with findlib --- Makefile.orig 2011-11-22 15:56:49.000000000 +0000 d38 1 a38 1 @@@@ -57,13 +64,7 @@@@ depend: d42 1 a42 1 - if test -f dllcamldbm.$(SO); then cp dllcamldbm.$(SO) $(STUBLIBDIR)/; fi d44 4 a47 2 - cd $(LIBDIR) && ranlib libcamldbm.$(A) - cp dbm.cma dbm.cmxa dbm.cmi dbm.mli $(LIBDIR)/ d49 3 a51 1 - cd $(LIBDIR) && ranlib dbm.$(A) d53 1 a53 1 + ocamlfind install dbm $(FILES) d57 1 a57 1 @@@@ -77,12 +78,16 @@@@ testdbm.opt: dbm.cmxa testdbm.ml @ 1.1 log @Added databases/ocaml-dbm version 1.0 to pkgsrc. This is an OCaml binding for the gdbm/ndbm database libraries. @ text @d3 1 a3 1 Install into DESTDIR d6 32 a37 1 @@@@ -57,13 +57,14 @@@@ depend: d48 1 a48 8 + if test -f dllcamldbm.$(SO); then cp dllcamldbm.$(SO) \ + $(DESTDIR)/$(STUBLIBDIR)/; fi + cp libcamldbm.$(A) $(DESTDIR)/$(LIBDIR)/ + cd $(DESTDIR)/$(LIBDIR) && ranlib libcamldbm.$(A) + cp dbm.cma dbm.cmxa dbm.cmi dbm.mli $(DESTDIR)/$(LIBDIR)/ + cp dbm.$(A) $(DESTDIR)/$(LIBDIR)/ + cd $(DESTDIR)/$(LIBDIR) && ranlib dbm.$(A) + if test -f dbm.cmxs; then cp dbm.cmxs $(DESTDIR)/$(LIBDIR)/; fi d52 19 @