DESTDIR support

5 files changed, 36 insertions, 5 deletions

diff --git a/devel/equeue/Makefile b/devel/equeue/Makefile
index 52a2ce233ac..6e2fc82593a 100644
--- a/devel/equeue/Makefile
+++ b/devel/equeue/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/05/28 21:06:08 zafer Exp $
+# $NetBSD: Makefile,v 1.4 2010/02/14 20:51:23 joerg Exp $
 #
 
 DISTNAME=		equeue-2.1.3
@@ -9,6 +9,7 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.camlcity.org/
 COMMENT=		Queues for file events (OCaml)
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 MAKE_JOBS_SAFE=		no
 
 DEPENDS+=		ocaml-findlib-[0-9]*:../../devel/ocaml-findlib
@@ -19,5 +20,7 @@ USE_TOOLS+=		gmake
 BUILD_TARGET=		all opt
 PLIST_SRC=		PLIST.opt PLIST
 
+INSTALLATION_DIRS+=	lib/ocaml/site-lib
+
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/equeue/distinfo b/devel/equeue/distinfo
index a315d23ba14..32b921baabd 100644
--- a/devel/equeue/distinfo
+++ b/devel/equeue/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/08/11 15:42:30 wiz Exp $
+$NetBSD: distinfo,v 1.2 2010/02/14 20:51:23 joerg Exp $
 
 SHA1 (equeue-2.1.3.tar.gz) = e573ecc94b58eadf0baad07bf35b0e34fddd77fb
 RMD160 (equeue-2.1.3.tar.gz) = 61845789c2eec88325f0a2bbfa222576754c858d
 Size (equeue-2.1.3.tar.gz) = 249374 bytes
+SHA1 (patch-aa) = 4e56fecc11ffd3345cae8081568e2aa002d29d64
+SHA1 (patch-ab) = 0aad36338ffe78d1444debeeee85456aae720e9f
diff --git a/devel/equeue/patches/patch-aa b/devel/equeue/patches/patch-aa
new file mode 100644
index 00000000000..f421e446414
--- /dev/null
+++ b/devel/equeue/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2010/02/14 20:51:23 joerg Exp $
+
+--- src/shell/Makefile.orig	2010-02-14 20:44:34.000000000 +0000
++++ src/shell/Makefile
+@@ -22,7 +22,7 @@ distclean: clean
+ 
+ install:
+ 	files=`$(COLLECT_FILES) *.mli *.cmi *.cma *.cmxa *.a dll* META` && \
+-	$(OCAMLFIND) install shell $$files
++	$(OCAMLFIND) install -ldconf /dev/null -destdir ${DESTDIR}`ocamlc -where`/site-lib shell $$files
+ 
+ uninstall:
+ 	$(OCAMLFIND) remove shell
diff --git a/devel/equeue/patches/patch-ab b/devel/equeue/patches/patch-ab
new file mode 100644
index 00000000000..853e270da22
--- /dev/null
+++ b/devel/equeue/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2010/02/14 20:51:23 joerg Exp $
+
+--- src/equeue/Makefile.orig	2010-02-14 20:45:27.000000000 +0000
++++ src/equeue/Makefile
+@@ -39,7 +39,7 @@ distclean: clean
+ .PHONY: install
+ install:
+ 	files=`$(COLLECT_FILES) *.mli *.cmi *.cma *.cmxa *.a unixqueue_mt.cmo unixqueue_mt.cmx unixqueue_mt.o META` && \
+-	$(OCAMLFIND) install equeue $$files
++	$(OCAMLFIND) install -ldconf /dev/null -destdir ${DESTDIR}`ocamlc -where`/site-lib equeue $$files
+ 
+ .PHONY: uninstall
+ uninstall:
diff --git a/devel/pedisassem/Makefile b/devel/pedisassem/Makefile
index e5f07f27660..b8a6f91dff9 100644
--- a/devel/pedisassem/Makefile
+++ b/devel/pedisassem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2010/01/07 07:36:54 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2010/02/14 20:53:37 joerg Exp $
 
 DISTNAME=	dsasmsrc
 PKGNAME=	pedisassem-0.23
@@ -11,6 +11,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.geocities.com/SiliconValley/Foothills/4078/
 COMMENT=	Disassembler for Win32 code
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=		${WRKDIR}
@@ -18,8 +19,7 @@ WRKSRC=		${WRKDIR}
 # LP64 problems
 NOT_FOR_PLATFORM=	${LP64PLATFORMS}
 
-MAKE_ENV+=	BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q}
-
+USE_BSD_MAKEFILE=	yes
 INSTALLATION_DIRS=	bin
 
 post-extract: