diff options
| author | heinz <heinz@pkgsrc.org> | 2007-07-01 20:23:19 +0000 |
|---|---|---|
| committer | heinz <heinz@pkgsrc.org> | 2007-07-01 20:23:19 +0000 |
| commit | cef5a4fc580a83fd59db9cb34ab3d72aa531f0b8 (patch) | |
| tree | 4be9de7bfa19ae2d5b9e8ab56787bf855cafed45 /multimedia | |
| parent | ea23ae6880914bb82617fbedbea3ec990d11a5d3 (diff) | |
| download | pkgsrc-cef5a4fc580a83fd59db9cb34ab3d72aa531f0b8.tar.gz | |
Added support for installation to DESTDIR. Approved by salo@.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/libmatroska/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/libmatroska/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/libmatroska/patches/patch-ac | 39 |
3 files changed, 40 insertions, 6 deletions
diff --git a/multimedia/libmatroska/Makefile b/multimedia/libmatroska/Makefile index 9fa86a72a59..451192dbc64 100644 --- a/multimedia/libmatroska/Makefile +++ b/multimedia/libmatroska/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2006/02/05 23:10:16 joerg Exp $ +# $NetBSD: Makefile,v 1.21 2007/07/01 20:23:19 heinz Exp $ # DISTNAME= libmatroska-0.8.0 @@ -11,6 +11,7 @@ MAINTAINER= salo@NetBSD.org HOMEPAGE= http://www.matroska.org/ COMMENT= Extensible open standard Audio/Video container format +PKG_DESTDIR_SUPPORT= user-destdir PKG_INSTALLATION_TYPES= overwrite pkgviews USE_TOOLS+= gmake diff --git a/multimedia/libmatroska/distinfo b/multimedia/libmatroska/distinfo index ebc1e572e1e..21b1690bd17 100644 --- a/multimedia/libmatroska/distinfo +++ b/multimedia/libmatroska/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.14 2005/12/11 17:58:49 salo Exp $ +$NetBSD: distinfo,v 1.15 2007/07/01 20:23:19 heinz Exp $ SHA1 (libmatroska-0.8.0.tar.bz2) = 7725d874dbf37ec7c41115804f091fa1554c6338 RMD160 (libmatroska-0.8.0.tar.bz2) = e2fb6dcad7157373a271273a1a3ffc4428da9744 Size (libmatroska-0.8.0.tar.bz2) = 90653 bytes -SHA1 (patch-ac) = 1923a41551dc2217bd155f961f5fcae569c48ace +SHA1 (patch-ac) = cd865ba47b6e1edf5988db2ff12ad9cd2f0dbc1c diff --git a/multimedia/libmatroska/patches/patch-ac b/multimedia/libmatroska/patches/patch-ac index e76a7674206..1e8811f5bf1 100644 --- a/multimedia/libmatroska/patches/patch-ac +++ b/multimedia/libmatroska/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.6 2005/06/06 21:15:02 salo Exp $ +$NetBSD: patch-ac,v 1.7 2007/07/01 20:23:19 heinz Exp $ --- make/linux/Makefile.orig 2005-04-19 09:00:00.000000000 +0200 -+++ make/linux/Makefile 2005-06-06 23:12:23.000000000 +0200 -@@ -16,15 +16,15 @@ ++++ make/linux/Makefile +@@ -16,15 +16,15 @@ prefix=/boot/home/config else prefix=/usr/local endif @@ -24,3 +24,36 @@ $NetBSD: patch-ac,v 1.6 2005/06/06 21:15:02 salo Exp $ INSTALL_OPTS = -m 644 INSTALL_OPTS_LIB = -m 644 INSTALL_DIR_OPTS = -m 755 +@@ -155,23 +155,23 @@ install: install_staticlib install_share + endif + + install_headers: +- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir) ++ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir) + for i in $(INCLUDE_DIR)/*.h; do \ +- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \ ++ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \ + done +- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c ++ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c + for i in $(INCLUDE_DIR)/c/*.h; do \ +- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \ ++ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \ + done + + install_staticlib: $(LIBRARY) +- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir) +- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir) ++ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir) ++ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(DESTDIR)$(libdir) + + install_sharedlib: $(LIBRARY_SO) +- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir) +- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir) +- ln -s $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO) ++ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir) ++ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(DESTDIR)$(libdir) ++ ln -s $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)/$(LIBRARY_SO) + + ifneq ($(wildcard .depend),) + include .depend |