[pkgsrc/trunk]: pkgsrc/archivers/ocaml-zip DESTDIR support

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/59825142af02
branches:  trunk
changeset: 570510:59825142af02
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sat Jan 30 17:43:42 2010 +0000

description:
DESTDIR support

diffstat:

 archivers/ocaml-zip/Makefile         |   4 +++-
 archivers/ocaml-zip/distinfo         |   4 ++--
 archivers/ocaml-zip/patches/patch-aa |  20 +++++++++++++++-----
 3 files changed, 20 insertions(+), 8 deletions(-)

diffs (65 lines):

diff -r ab416a4ec174 -r 59825142af02 archivers/ocaml-zip/Makefile
--- a/archivers/ocaml-zip/Makefile      Sat Jan 30 17:28:17 2010 +0000
+++ b/archivers/ocaml-zip/Makefile      Sat Jan 30 17:43:42 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/09/02 11:45:32 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/01/30 17:43:42 joerg Exp $
 #
 
 DISTNAME=      camlzip-${VERSION}
@@ -11,6 +11,8 @@
 HOMEPAGE=      http://cristal.inria.fr/~xleroy/software.html
 COMMENT=       OCaml library to manipulate ZIP/GZIP/JAR archives
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 DEPENDS+=      ocaml-findlib-[0-9]*:../../devel/ocaml-findlib
 
 BUILD_TARGET=  all
diff -r ab416a4ec174 -r 59825142af02 archivers/ocaml-zip/distinfo
--- a/archivers/ocaml-zip/distinfo      Sat Jan 30 17:28:17 2010 +0000
+++ b/archivers/ocaml-zip/distinfo      Sat Jan 30 17:43:42 2010 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/09/02 11:45:32 obache Exp $
+$NetBSD: distinfo,v 1.2 2010/01/30 17:43:42 joerg Exp $
 
 SHA1 (camlzip-1.03.tar.gz) = ecb4cbbdeb673d0aacdc961f38e4a14d5cf1627b
 RMD160 (camlzip-1.03.tar.gz) = fc773c0e351863538817f5c803a1b1d6cf9bc6e5
 Size (camlzip-1.03.tar.gz) = 24562 bytes
-SHA1 (patch-aa) = 1065dd91a8482d283db81e1fa24353f55eb1861f
+SHA1 (patch-aa) = 8acb69bc5dfb3b0b7eaab9f4caab81d8a7a4844b
diff -r ab416a4ec174 -r 59825142af02 archivers/ocaml-zip/patches/patch-aa
--- a/archivers/ocaml-zip/patches/patch-aa      Sat Jan 30 17:28:17 2010 +0000
+++ b/archivers/ocaml-zip/patches/patch-aa      Sat Jan 30 17:43:42 2010 +0000
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/09/02 11:45:32 obache Exp $
+$NetBSD: patch-aa,v 1.2 2010/01/30 17:43:42 joerg Exp $
 
---- Makefile.orig      2002-04-22 17:28:57.000000000 +0200
-+++ Makefile   2008-02-18 14:25:56.000000000 +0100
-@@ -55,18 +55,9 @@
+--- Makefile.orig      2002-04-22 15:28:57.000000000 +0000
++++ Makefile
+@@ -11,7 +11,7 @@ ZLIB_INCLUDE=/usr/local/include
+ 
+ # Where to install the library.  By default: sub-directory 'zip' of
+ # OCaml's standard library directory.
+-INSTALLDIR=`$(OCAMLC) -where`/zip
++INSTALLDIR=`$(OCAMLC) -where`/site-lib
+ 
+ ### End of configuration section
+ 
+@@ -55,18 +55,10 @@ clean:
        rm -f *.o *.a
  
  install:
@@ -18,7 +27,8 @@
 -
 -installopt:
 -      cp zip.cmxa zip.a zip.cmx gzip.cmx $(INSTALLDIR)
-+      ocamlfind install -optional zip META zip.cma zip.cmi gzip.cmi zip.mli \
++      ${BSD_INSTALL_DATA_DIR} ${DESTDIR}$(INSTALLDIR)
++      ocamlfind install -destdir ${DESTDIR}$(INSTALLDIR) -optional zip META zip.cma zip.cmi gzip.cmi zip.mli \
 +      gzip.mli libcamlzip.a dllcamlzip.so zip.cmxa zip.a zip.cmx gzip.cmx \
 +      zlib.mli zlib.cmi zlib.cmx