From 35914c4faa563794d46203dca770bff9aa6e209f Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 12 Feb 2010 00:31:52 +0000 Subject: DESTDIR support --- time/ocaml-calendar/Makefile | 6 +++++- time/ocaml-calendar/distinfo | 3 ++- time/ocaml-calendar/patches/patch-aa | 20 ++++++++++++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 time/ocaml-calendar/patches/patch-aa (limited to 'time') diff --git a/time/ocaml-calendar/Makefile b/time/ocaml-calendar/Makefile index e8638a02ced..5fa7b0489d3 100644 --- a/time/ocaml-calendar/Makefile +++ b/time/ocaml-calendar/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2009/05/30 01:00:11 zafer Exp $ +# $NetBSD: Makefile,v 1.3 2010/02/12 00:31:52 joerg Exp $ # DISTNAME= calendar-2.0.4 @@ -10,6 +10,8 @@ MAINTAINER= jaapb@kerguelen.org HOMEPAGE= http://www.lri.fr/~signoles/prog.en.html/ COMMENT= OCaml library managing dates and times +PKG_DESTDIR_SUPPORT= user-destdir + DEPENDS+= ocaml-findlib-[0-9]*:../../devel/ocaml-findlib GNU_CONFIGURE= yes @@ -25,5 +27,7 @@ PLIST_SRC+= PLIST TEST_TARGET= tests +INSTALLATION_DIRS+= lib/ocaml/site-lib + .include "../../lang/ocaml/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/ocaml-calendar/distinfo b/time/ocaml-calendar/distinfo index ca0321659b8..8ff194690ff 100644 --- a/time/ocaml-calendar/distinfo +++ b/time/ocaml-calendar/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2008/11/01 12:09:44 obache Exp $ +$NetBSD: distinfo,v 1.2 2010/02/12 00:31:52 joerg Exp $ SHA1 (calendar-2.0.4.tar.gz) = 60917d141a79b07b3bf4289ef906e97bd657814a RMD160 (calendar-2.0.4.tar.gz) = 23c2a5a8d030cdf19d4d98b7b7bdf67d87146b59 Size (calendar-2.0.4.tar.gz) = 221843 bytes +SHA1 (patch-aa) = 0a0520e4d63ef4315f8519e953d47d61f76bc6a6 diff --git a/time/ocaml-calendar/patches/patch-aa b/time/ocaml-calendar/patches/patch-aa new file mode 100644 index 00000000000..0060b6fb8e5 --- /dev/null +++ b/time/ocaml-calendar/patches/patch-aa @@ -0,0 +1,20 @@ +$NetBSD: patch-aa,v 1.1 2010/02/12 00:31:52 joerg Exp $ + +--- Makefile.in.orig 2010-02-12 00:29:07.000000000 +0000 ++++ Makefile.in +@@ -190,14 +190,7 @@ headers: + ######### + + install: $(LIBS) $(CLIBS) META +- @if [ "`sed -n -e 's/version = "\([0-9.]*\)"/\1/p' META`" = "$(VERSION)" ]; then \ +- (if test -d $(CAMLLIB)/site-lib/$(NAME); then $(MAKE) uninstall; fi;\ +- $(CAMLFIND) install $(NAME) target/*.cm[iox] $(MLI) $(CMI) $(CLIBS) META\ +- )else \ +- (echo; echo "Not the good version. Please, do :"; \ +- echo " make clean && make"; \ +- echo "next reinstall"; echo) \ +- fi ++ $(CAMLFIND) install -destdir ${DESTDIR}${CAMLLIB}/site-lib -ldconf /dev/null $(NAME) target/*.cm[iox] $(MLI) $(CMI) $(CLIBS) META\ + + uninstall: + $(CAMLFIND) remove $(NAME) -- cgit v1.2.3