From 8e45140b6d443ee542b3ee640a9d34dc6cd81bb4 Mon Sep 17 00:00:00 2001 From: joerg Date: Sat, 30 Jan 2010 19:36:35 +0000 Subject: DESTDIR support --- net/ocamlnet/Makefile | 4 +++- net/ocamlnet/distinfo | 4 +++- net/ocamlnet/patches/patch-aa | 17 +++++++++++++++++ net/ocamlnet/patches/patch-ab | 15 +++++++++++++++ 4 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 net/ocamlnet/patches/patch-aa create mode 100644 net/ocamlnet/patches/patch-ab (limited to 'net') 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: -- cgit v1.2.3