From f75176b39cb7d35a6a241e5e0a0e934d21742e72 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Mon, 9 Oct 2006 12:52:34 +0000
Subject: Flag a number of packages I use as supporting (user-)destdir. apg is
 a bit special as it has some hardcoded ownership, so mark that as "destdir".

---
 multimedia/xvidcore/Makefile         | 8 +++++---
 multimedia/xvidcore/distinfo         | 5 +++--
 multimedia/xvidcore/patches/patch-aa | 6 +++---
 3 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'multimedia')

diff --git a/multimedia/xvidcore/Makefile b/multimedia/xvidcore/Makefile
index 0df5204fa5d..9ad32cba5cd 100644
--- a/multimedia/xvidcore/Makefile
+++ b/multimedia/xvidcore/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/10/02 14:21:13 tron Exp $
+# $NetBSD: Makefile,v 1.22 2006/10/09 12:52:35 joerg Exp $
 
 DISTNAME=	xvidcore-1.1.0
 PKGREVISION=	3
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.xvid.org/
 COMMENT=	ISO MPEG-4 compliant video codec
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${MACHINE_ARCH} == "i386"
@@ -27,8 +29,8 @@ MAKE_ENV+=	MKDIR=${MKDIR:Q}
 
 .if ${OPSYS} == "Darwin"
 post-install:
-	${RM} -f ${PREFIX}/lib/libxvidcore.so.4
-	${MV} -f ${PREFIX}/lib/libxvidcore.so ${PREFIX}/lib/libxvidcore.dylib
+	${RM} -f ${DESTDIR}${PREFIX}/lib/libxvidcore.so.4
+	${MV} -f ${DESTDIR}${PREFIX}/lib/libxvidcore.so ${DESTDIR}${PREFIX}/lib/libxvidcore.dylib
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/xvidcore/distinfo b/multimedia/xvidcore/distinfo
index 8f929c682ef..73c8998c75d 100644
--- a/multimedia/xvidcore/distinfo
+++ b/multimedia/xvidcore/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.11 2006/01/06 17:12:18 wiz Exp $
+$NetBSD: distinfo,v 1.12 2006/10/09 12:52:35 joerg Exp $
 
 SHA1 (xvidcore-1.1.0.tar.bz2) = f3ffc21529ab7941e423df7365de22c391d2eaeb
 RMD160 (xvidcore-1.1.0.tar.bz2) = 582927437970cf81534b9ed4f02173201e10f47b
 Size (xvidcore-1.1.0.tar.bz2) = 612101 bytes
-SHA1 (patch-aa) = d0e69ecd59578b71f49205fbd102496bdcfd8e24
+SHA1 (patch-aa) = 593ae63ddb5ec646d7f531b99783de64a9d6ceb3
 SHA1 (patch-ab) = 445d528602f67079bca03986c2c172af3291b15d
+SHA1 (patch-ac) = b976c188dae290a87708e5f97b8a16fcddbf608b
diff --git a/multimedia/xvidcore/patches/patch-aa b/multimedia/xvidcore/patches/patch-aa
index 8a7721fb394..40d395fcb51 100644
--- a/multimedia/xvidcore/patches/patch-aa
+++ b/multimedia/xvidcore/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2006/01/06 17:12:18 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2006/10/09 12:52:35 joerg Exp $
 
 --- Makefile.orig	2005-12-30 14:45:30.000000000 +0000
 +++ Makefile
@@ -46,8 +46,8 @@ $NetBSD: patch-aa,v 1.3 2006/01/06 17:12:18 wiz Exp $
  	@echo "  I: $(libdir)/$(SHARED_LIB)"
 -	@$(INSTALL) -m 644 $(BUILD_DIR)/$(SHARED_LIB) $(DESTDIR)$(libdir)/$(SHARED_LIB)
 +	@$(BSD_INSTALL_LIB) $(BUILD_DIR)/$(SHARED_LIB) $(DESTDIR)$(libdir)/$(SHARED_LIB)
-+	@ln -s $(libdir)/$(SHARED_LIB) $(libdir)/libxvidcore.so
-+	@ln -s $(libdir)/$(SHARED_LIB) $(libdir)/libxvidcore.so.$(API_MAJOR)
++	@ln -s $(libdir)/$(SHARED_LIB) $(DESTDIR)$(libdir)/libxvidcore.so
++	@ln -s $(libdir)/$(SHARED_LIB) $(DESTDIR)$(libdir)/libxvidcore.so.$(API_MAJOR)
  	@echo "  I: $(libdir)/$(STATIC_LIB)"
  	@$(INSTALL) -m 644 $(BUILD_DIR)/$(STATIC_LIB) $(DESTDIR)$(libdir)/$(STATIC_LIB)
  	@echo "  D: $(includedir)"
-- 
cgit v1.2.3