DESTDIR support

8 files changed, 63 insertions, 6 deletions

diff --git a/lang/ocamlduce/Makefile b/lang/ocamlduce/Makefile
index ac6deba5e48..f0a6efed505 100644
--- a/lang/ocamlduce/Makefile
+++ b/lang/ocamlduce/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/09/07 21:53:30 tonio Exp $
+# $NetBSD: Makefile,v 1.6 2010/01/30 19:36:35 joerg Exp $
 #
 
 DISTNAME=       ocamlduce-3.11.1.0
@@ -15,6 +15,8 @@ MAINTAINER=     jaapb@kerguelen.org
 HOMEPAGE=       http://ocamlduce.ocamlcore.org/
 COMMENT=        Library to integrate XML features into OCaml
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=       ocaml-findlib-[0-9]*:../../devel/ocaml-findlib
 
 USE_TOOLS+=     gmake
@@ -22,7 +24,9 @@ BUILD_TARGET=   all
 INSTALL_TARGET=	installbyte
 MAKE_JOBS_SAFE=	no
 
-MAKE_ENV=	BINDIR=${PREFIX}/bin LIBDIR=${PREFIX}/lib/ocaml/site-lib
+MAKE_ENV+=		BINDIR=${PREFIX}/bin LIBDIR=${PREFIX}/lib/ocaml/site-lib
+INSTALL_MAKE_FLAGS+=	BINDIR=${DESTDIR}${PREFIX}/bin \
+			LIBDIR=${DESTDIR}${PREFIX}/lib/ocaml/site-lib
 PLIST_SRC=	PLIST
 
 .if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
diff --git a/net/ocamlnet/Makefile b/net/ocamlnet/Makefile
index cab4be6fb86..16f453ceed4 100644
--- a/net/ocamlnet/Makefile
+++ b/net/ocamlnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/10/18 19:50:06 zafer Exp $
+# $NetBSD: Makefile,v 1.4 2010/01/30 19:43:18 joerg Exp $
 #
 
 DISTNAME=		ocamlnet-1.1.2
@@ -9,6 +9,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://projects.camlcity.org/projects/ocamlnet.html
 COMMENT=		Library focusing on application-level network protocols (OCaml)
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 MAKE_JOBS_SAFE=		no
 
 DEPENDS+=		pcre-ocaml-[0-9]*:../../devel/pcre-ocaml
diff --git a/net/ocamlnet/distinfo b/net/ocamlnet/distinfo
index 9921fa9c5c1..c60cf84ad5d 100644
--- a/net/ocamlnet/distinfo
+++ b/net/ocamlnet/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/08/11 15:43:36 wiz Exp $
+$NetBSD: distinfo,v 1.2 2010/01/30 19:43:18 joerg Exp $
 
 SHA1 (ocamlnet-1.1.2.tar.gz) = 09683bd8d2116449deaf96873424cebf569d65e7
 RMD160 (ocamlnet-1.1.2.tar.gz) = 2c554571f53b99e7cd23dcf043bebc3c3f779435
 Size (ocamlnet-1.1.2.tar.gz) = 817450 bytes
+SHA1 (patch-aa) = 17926b7a3096615f773fa3241030fb514b4a5f5d
+SHA1 (patch-ab) = d5815fae4ccb258c134d860b823a8c82aeff275a
diff --git a/net/ocamlnet/patches/patch-aa b/net/ocamlnet/patches/patch-aa
new file mode 100644
index 00000000000..95ecfd24fa5
--- /dev/null
+++ b/net/ocamlnet/patches/patch-aa
@@ -0,0 +1,17 @@
+$NetBSD: patch-aa,v 1.1 2010/01/30 19:43:18 joerg Exp $
+
+--- src/netstring/Makefile.orig	2010-01-30 19:35:56.000000000 +0000
++++ src/netstring/Makefile
+@@ -172,9 +172,9 @@ netdb-packlist: mk_netdb
+ 
+ .PHONY: install-netdb
+ install-netdb:
+-	mkdir -p $(NET_DB_DIR)
+-	cp netdb/*.netdb $(NET_DB_DIR)
+-	@echo "Installed .netdb files into $(NET_DB_DIR)"
++	mkdir -p ${DESTDIR}$(NET_DB_DIR)
++	cp netdb/*.netdb ${DESTDIR}$(NET_DB_DIR)
++	@echo "Installed .netdb files into ${DESTDIR}$(NET_DB_DIR)"
+ 	if [ "$(INSTMETHOD)" != "findlib" ]; then                     \
+ 		cat netdb-packlist >>$(LIBDIR)/packlist-$(PKGNAME);   \
+ 	fi
diff --git a/net/ocamlnet/patches/patch-ab b/net/ocamlnet/patches/patch-ab
new file mode 100644
index 00000000000..8d0584562a6
--- /dev/null
+++ b/net/ocamlnet/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2010/01/30 19:43:18 joerg Exp $
+
+--- src/Makefile.rules.orig	2006-03-06 16:59:47.000000000 +0000
++++ src/Makefile.rules
+@@ -92,8 +92,9 @@ uninstall: $(UNINSTOTHER) uninstall-$(IN
+ 
+ .PHONY: install-findlib
+ install-findlib:
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}`$(OCAMLC) -where`/site-lib
+ 	files=`$(COLLECT_FILES) *.mli *.cmi *.cma *.cmxa *.a META $(INSTALL_EXTRA)` && \
+-	$(OCAMLFIND) install $(PKGNAME) $$files
++	$(OCAMLFIND) install -destdir ${DESTDIR}`$(OCAMLC) -where`/site-lib $(PKGNAME) $$files
+ 
+ .PHONY: uninstall-findlib
+ uninstall-findlib:
diff --git a/security/ocaml-ssl/Makefile b/security/ocaml-ssl/Makefile
index 314ac0c97d2..d7118e95218 100644
--- a/security/ocaml-ssl/Makefile
+++ b/security/ocaml-ssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/01/17 12:02:42 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/01/30 19:44:50 joerg Exp $
 #
 
 DISTNAME=	ocaml-ssl-0.4.2
@@ -10,6 +10,8 @@ MAINTAINER=	jaapb@kerguelen.org
 HOMEPAGE=	http://savonet.sourceforge.net/wiki/OCamlLibs
 COMMENT=	SSL library for OCaml
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	ocaml-findlib-[0-9]*:../../devel/ocaml-findlib
 
 HAS_CONFIGURE=	yes
diff --git a/security/ocaml-ssl/distinfo b/security/ocaml-ssl/distinfo
index 9fa1cf56372..97a34f95e31 100644
--- a/security/ocaml-ssl/distinfo
+++ b/security/ocaml-ssl/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2008/03/03 18:14:19 tonio Exp $
+$NetBSD: distinfo,v 1.4 2010/01/30 19:44:50 joerg Exp $
 
 SHA1 (ocaml-ssl-0.4.2.tar.gz) = ec6362b681aa5498143ec0c4ddd77fbbe745a2aa
 RMD160 (ocaml-ssl-0.4.2.tar.gz) = ba5b4106d19e0b3d50e9a19d705ef18a5b20948c
 Size (ocaml-ssl-0.4.2.tar.gz) = 109090 bytes
+SHA1 (patch-aa) = e13b4c2f9ee38cb45f3eeb74f36a9887b194daf1
diff --git a/security/ocaml-ssl/patches/patch-aa b/security/ocaml-ssl/patches/patch-aa
new file mode 100644
index 00000000000..92232028abf
--- /dev/null
+++ b/security/ocaml-ssl/patches/patch-aa
@@ -0,0 +1,14 @@
+$NetBSD: patch-aa,v 1.1 2010/01/30 19:44:51 joerg Exp $
+
+--- src/Makefile.in.orig	2010-01-30 19:40:05.000000000 +0000
++++ src/Makefile.in
+@@ -50,7 +50,8 @@ byte: byte-code-library
+ opt: native-code-library
+ 
+ install:
+-	$(OCAMLFIND) install $(OCAMLFIND_INSTFLAGS) $(RESULT) META $(LIBINSTALL_FILES)
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}`ocamlc -where`/site-lib
++	$(OCAMLFIND) install -destdir ${DESTDIR}`ocamlc -where`/site-lib $(OCAMLFIND_INSTFLAGS) $(RESULT) META $(LIBINSTALL_FILES)
+ 
+ uninstall:
+ 	$(OCAMLFIND) remove $(OCAMLFIND_INSTFLAGS) $(RESULT)