Fri Feb 19 22:22:22 2010 UTC ()
Don't mess with ldconf.


(joerg)
diff -r1.3 -r1.4 pkgsrc/databases/ocaml-mysql/distinfo
diff -r1.1 -r1.2 pkgsrc/databases/ocaml-mysql/patches/patch-ac
cvs diff -r1.3 -r1.4 pkgsrc/databases/ocaml-mysql/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/ocaml-mysql/distinfo 2010/01/30 18:25:11 1.3
+++ pkgsrc/databases/ocaml-mysql/distinfo 2010/02/19 22:22:22 1.4
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.3 2010/01/30 18:25:11 joerg Exp $ 1$NetBSD: distinfo,v 1.4 2010/02/19 22:22:22 joerg Exp $
2 2
3SHA1 (ocaml-mysql-1.0.4.tar.gz) = e8b7c2d84eee9ae798cd5dcd3ba68fc64c321f9b 3SHA1 (ocaml-mysql-1.0.4.tar.gz) = e8b7c2d84eee9ae798cd5dcd3ba68fc64c321f9b
4RMD160 (ocaml-mysql-1.0.4.tar.gz) = 57b316fdbdd26762916859d04ab0ca15c1365203 4RMD160 (ocaml-mysql-1.0.4.tar.gz) = 57b316fdbdd26762916859d04ab0ca15c1365203
5Size (ocaml-mysql-1.0.4.tar.gz) = 119584 bytes 5Size (ocaml-mysql-1.0.4.tar.gz) = 119584 bytes
6SHA1 (patch-aa) = b06f338db5887f5656d8d50b6fcfdd4bf2d920e0 6SHA1 (patch-aa) = b06f338db5887f5656d8d50b6fcfdd4bf2d920e0
7SHA1 (patch-ab) = 4b7768554ec4fe8a01578bc4c63ae52e6fc208d4 7SHA1 (patch-ab) = 4b7768554ec4fe8a01578bc4c63ae52e6fc208d4
8SHA1 (patch-ac) = 6358392234477ee746469fa1cc58b7d838030154 8SHA1 (patch-ac) = d7ba178ed64212361f79ce84b9196124f32108fa
cvs diff -r1.1 -r1.2 pkgsrc/databases/ocaml-mysql/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/databases/ocaml-mysql/patches/Attic/patch-ac 2010/01/30 18:25:11 1.1
+++ pkgsrc/databases/ocaml-mysql/patches/Attic/patch-ac 2010/02/19 22:22:22 1.2
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: patch-ac,v 1.1 2010/01/30 18:25:11 joerg Exp $ 1$NetBSD: patch-ac,v 1.2 2010/02/19 22:22:22 joerg Exp $
2 2
3--- OCamlMakefile.orig 2010-01-30 18:14:57.000000000 +0000 3--- OCamlMakefile.orig 2010-01-30 18:14:57.000000000 +0000
4+++ OCamlMakefile 4+++ OCamlMakefile
5@@ -1102,11 +1102,13 @@ subprojs: $(SUBPROJS:%=subproj_%) 5@@ -1102,11 +1102,13 @@ subprojs: $(SUBPROJS:%=subproj_%)
6  6
7 ########################################################################### 7 ###########################################################################
8 # (UN)INSTALL RULES FOR LIBRARIES 8 # (UN)INSTALL RULES FOR LIBRARIES
9+INSTALLDIR=`$(OCAMLC) -where`/site-lib 9+INSTALLDIR=`$(OCAMLC) -where`/site-lib
10  10
11 .PHONY: libinstall 11 .PHONY: libinstall
12 libinstall: all 12 libinstall: all
13 $(QUIET)printf "\nInstalling library with ocamlfind\n" 13 $(QUIET)printf "\nInstalling library with ocamlfind\n"
14- $(OCAMLFIND) install $(OCAMLFIND_INSTFLAGS) $(RESULT) META $(LIBINSTALL_FILES) 14- $(OCAMLFIND) install $(OCAMLFIND_INSTFLAGS) $(RESULT) META $(LIBINSTALL_FILES)
15+ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}$(INSTALLDIR) 15+ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}$(INSTALLDIR)
16+ $(OCAMLFIND) install -destdir ${DESTDIR}$(INSTALLDIR) $(OCAMLFIND_INSTFLAGS) $(RESULT) META $(LIBINSTALL_FILES) 16+ $(OCAMLFIND) install -ldconf /dev/null -destdir ${DESTDIR}$(INSTALLDIR) $(OCAMLFIND_INSTFLAGS) $(RESULT) META $(LIBINSTALL_FILES)
17 $(QUIET)printf "\nInstallation successful.\n" 17 $(QUIET)printf "\nInstallation successful.\n"
18  18
19 .PHONY: libuninstall 19 .PHONY: libuninstall