diff options
| author | is <is@pkgsrc.org> | 2011-05-24 12:26:00 +0000 |
|---|---|---|
| committer | is <is@pkgsrc.org> | 2011-05-24 12:26:00 +0000 |
| commit | 998b1006d638a2d8f2277b1a4cdc7a5dda49c770 (patch) | |
| tree | d6ec52bb3224b25e826922cc7abd672501296016 /graphics | |
| parent | 8acea83dffb79cc61da8d057b58c3baa5ea6182c (diff) | |
| download | pkgsrc-998b1006d638a2d8f2277b1a4cdc7a5dda49c770.tar.gz | |
DESTDIR support
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/camlimages/Makefile | 4 | ||||
| -rw-r--r-- | graphics/camlimages/distinfo | 4 | ||||
| -rw-r--r-- | graphics/camlimages/patches/patch-ac | 27 | ||||
| -rw-r--r-- | graphics/camlimages/patches/patch-ad | 15 |
4 files changed, 48 insertions, 2 deletions
diff --git a/graphics/camlimages/Makefile b/graphics/camlimages/Makefile index dcf696f3b90..e1a6bb7fb35 100644 --- a/graphics/camlimages/Makefile +++ b/graphics/camlimages/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2011/04/22 13:43:41 obache Exp $ +# $NetBSD: Makefile,v 1.32 2011/05/24 12:26:00 is Exp $ DISTNAME= camlimages-2.2.0 PKGREVISION= 12 @@ -6,6 +6,8 @@ CATEGORIES= graphics MASTER_SITES= ftp://ftp.inria.fr/INRIA/Projects/cristal/caml-light/bazar-ocaml/ EXTRACT_SUFX= .tgz +PKG_DESTDIR_SUPPORT= user-destdir + MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://cristal.inria.fr/camlimages/ COMMENT= Image processing library for Objective Caml diff --git a/graphics/camlimages/distinfo b/graphics/camlimages/distinfo index b649d1a6e5c..cf7e48f6021 100644 --- a/graphics/camlimages/distinfo +++ b/graphics/camlimages/distinfo @@ -1,8 +1,10 @@ -$NetBSD: distinfo,v 1.6 2011/02/19 10:54:37 wiz Exp $ +$NetBSD: distinfo,v 1.7 2011/05/24 12:26:00 is Exp $ SHA1 (camlimages-2.2.0.tgz) = bc0062739be5ca9236f28145f17f840bf3f295ee RMD160 (camlimages-2.2.0.tgz) = 0f108ef3da565aeb0ab10d00e45819399af36d8c Size (camlimages-2.2.0.tgz) = 1385525 bytes SHA1 (patch-aa) = 8f1818e6b1a782066acb2ad6399514aa61e0e1f8 +SHA1 (patch-ac) = 3c2de383d335b03599be81a9ac32382493b726b1 +SHA1 (patch-ad) = 543280151e06269dd82d256bc9e53645a9186b5f SHA1 (patch-png_pngread.c) = b4d696e75c728be9a766424b41afbe5bb9446685 SHA1 (patch-png_pngwrite.c) = 6894fc49bc0e752df550331c77c859362650c626 diff --git a/graphics/camlimages/patches/patch-ac b/graphics/camlimages/patches/patch-ac new file mode 100644 index 00000000000..331eb3de495 --- /dev/null +++ b/graphics/camlimages/patches/patch-ac @@ -0,0 +1,27 @@ +$NetBSD: patch-ac,v 1.1 2011/05/24 12:26:00 is Exp $ + +--- Makefile.orig 2004-10-02 15:49:05.000000000 +0000 ++++ Makefile +@@ -92,15 +92,15 @@ top: + installopt: install + + install: all +- mkdir -p $(LIBDIR) +- if test -w $(CAMLDIR)/ld.conf \ +- && test `grep -s -c '^$(LIBDIR)$$' $(CAMLDIR)/ld.conf` = 0; then \ +- echo $(LIBDIR) >> $(CAMLDIR)/ld.conf; \ ++ mkdir -p $(DESTDIR)$(LIBDIR) ++ if test -w $(DESTDIR)$(CAMLDIR)/ld.conf \ ++ && test `grep -s -c '^$(LIBDIR)$$' $(DESTDIR)$(CAMLDIR)/ld.conf` = 0; then \ ++ echo $(LIBDIR) >> $(DESTDIR)$(CAMLDIR)/ld.conf; \ + fi + for i in $(BUILDDIRS); do (cd $$i; $(MAKE) install) || exit $$?; done +- $(CP) Makefile.config $(LIBDIR) +- $(CP) config.h $(LIBDIR) +- $(RANLIB) $(LIBDIR)/*.a ++ $(CP) Makefile.config $(DESTDIR)$(LIBDIR) ++ $(CP) config.h $(DESTDIR)$(LIBDIR) ++ $(RANLIB) $(DESTDIR)$(LIBDIR)/*.a + + depend: + for i in $(BUILDDIRS); do (cd $$i; $(MAKE) depend) || exit $$?; done diff --git a/graphics/camlimages/patches/patch-ad b/graphics/camlimages/patches/patch-ad new file mode 100644 index 00000000000..3404b91d66e --- /dev/null +++ b/graphics/camlimages/patches/patch-ad @@ -0,0 +1,15 @@ +$NetBSD: patch-ad,v 1.1 2011/05/24 12:26:00 is Exp $ + +--- Makefile.shared.orig 2004-10-02 14:20:09.000000000 +0000 ++++ Makefile.shared +@@ -45,8 +45,8 @@ clean:: + rm -f *.cm[iox] *.o *.cma *.cmxa *.a *.so *~ + + install:: all +- - mkdir -p $(LIBDIR) +- - cp -p *.mli *.cm[iox] *.o *.cma *.cmxa *.a *.so $(LIBDIR) ++ - mkdir -p $(DESTDIR)$(LIBDIR) ++ - cp -p *.mli *.cm[iox] *.o *.cma *.cmxa *.a *.so $(DESTDIR)$(LIBDIR) + + ####### + |