DESTDIR support.

3 files changed, 28 insertions, 20 deletions

diff --git a/audio/cdparanoia/Makefile b/audio/cdparanoia/Makefile
index c3a5612f130..0c627c319b8 100644
--- a/audio/cdparanoia/Makefile
+++ b/audio/cdparanoia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/09/03 17:13:30 ben Exp $
+# $NetBSD: Makefile,v 1.24 2006/11/03 12:45:21 joerg Exp $
 #
 
 DISTNAME=	cdparanoia-III-alpha9.8
@@ -15,6 +15,7 @@ COMMENT=	CDDA reading utility with extra data verification features
 ONLY_FOR_PLATFORM=	FreeBSD-*-* NetBSD-*-* Linux-*-* DragonFly-*-* Darwin-*-*
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_TOOLS+=	gmake
 USE_LIBTOOL=	YES
diff --git a/audio/cdparanoia/distinfo b/audio/cdparanoia/distinfo
index 290524b7ece..bd687346138 100644
--- a/audio/cdparanoia/distinfo
+++ b/audio/cdparanoia/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.16 2006/09/04 12:54:54 ben Exp $
+$NetBSD: distinfo,v 1.17 2006/11/03 12:45:21 joerg Exp $
 
 SHA1 (cdparanoia-III-alpha9.8.src.tgz) = 04cc33a7d22d6255f6239e3e74195506b3bdde06
 RMD160 (cdparanoia-III-alpha9.8.src.tgz) = d9225165f83b5386c58db263d6918a7006df1481
 Size (cdparanoia-III-alpha9.8.src.tgz) = 116591 bytes
 SHA1 (patch-aa) = 29fd5767b37360fe804013bb171fc7e5f4d8311f
-SHA1 (patch-ab) = d4dad2ef444cd82bbe6201f7cbdcc42d1f28cc6e
+SHA1 (patch-ab) = 7b3d4b325c4095c08425cc28033297f1ffc3ce95
 SHA1 (patch-ac) = 3d2221af8d9280c77ad0f08836cbc6f2b311d61f
 SHA1 (patch-ad) = 9a1ea1b98b5f3810e1ccae57beb8c68b5e189716
 SHA1 (patch-ae) = 6ba166c2ac73b9c03a1944989c6ffbe655d80c71
diff --git a/audio/cdparanoia/patches/patch-ab b/audio/cdparanoia/patches/patch-ab
index 66f3a1e590f..4ea6e45bacf 100644
--- a/audio/cdparanoia/patches/patch-ab
+++ b/audio/cdparanoia/patches/patch-ab
@@ -1,8 +1,6 @@
-$NetBSD: patch-ab,v 1.6 2006/09/03 17:13:30 ben Exp $
+$NetBSD: patch-ab,v 1.7 2006/11/03 12:45:21 joerg Exp $
 
-Note that VERSION is *not* used for the libtool versioning.
-
---- Makefile.in.orig	2001-03-27 14:46:58.000000000 -0800
+--- Makefile.in.orig	2001-03-27 22:46:58.000000000 +0000
 +++ Makefile.in
 @@ -3,12 +3,12 @@
  # DO NOT EDIT BELOW! ##########################################################
@@ -63,26 +61,24 @@ Note that VERSION is *not* used for the libtool versioning.
  
  test:	
  	cd interface && $(MAKE) all
-@@ -65,31 +65,20 @@ slib:
+@@ -64,32 +64,20 @@ slib:
+ 	cd paranoia && $(MAKE) slib
  
  install:
- 	$(INSTALL) -d -m 0755 $(BINDIR)
+-	$(INSTALL) -d -m 0755 $(BINDIR)
 -	$(INSTALL) -m 0755 $(srcdir)/cdparanoia $(BINDIR)
-+	$(LIBTOOL) --mode=install $(INSTALL) -m 0755 $(srcdir)/cdparanoia $(BINDIR)
- 	$(INSTALL) -d -m 0755 $(MANDIR)
- 	$(INSTALL) -d -m 0755 $(MANDIR)/man1
- 	$(INSTALL) -m 0644 $(srcdir)/cdparanoia.1 $(MANDIR)/man1
- 	$(INSTALL) -d -m 0755 $(INCLUDEDIR)
- 	$(INSTALL) -m 0644 $(srcdir)/paranoia/cdda_paranoia.h $(INCLUDEDIR)
- 	$(INSTALL) -d -m 0755 $(LIBDIR)
+-	$(INSTALL) -d -m 0755 $(MANDIR)
+-	$(INSTALL) -d -m 0755 $(MANDIR)/man1
+-	$(INSTALL) -m 0644 $(srcdir)/cdparanoia.1 $(MANDIR)/man1
+-	$(INSTALL) -d -m 0755 $(INCLUDEDIR)
+-	$(INSTALL) -m 0644 $(srcdir)/paranoia/cdda_paranoia.h $(INCLUDEDIR)
+-	$(INSTALL) -d -m 0755 $(LIBDIR)
 -	$(INSTALL) -m 0644 $(srcdir)/paranoia/libcdda_paranoia.so.0.$(VERSION) $(LIBDIR)
 -	$(INSTALL) -m 0644 $(srcdir)/paranoia/libcdda_paranoia.a $(LIBDIR)
-+	$(LIBTOOL) --mode=install $(INSTALL) -m 0644 $(srcdir)/paranoia/libcdda_paranoia.la $(LIBDIR)
- 	$(INSTALL) -m 0644 $(srcdir)/interface/cdda_interface.h $(INCLUDEDIR)
+-	$(INSTALL) -m 0644 $(srcdir)/interface/cdda_interface.h $(INCLUDEDIR)
 -	$(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.so.0.$(VERSION) $(LIBDIR)
 -	$(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.a $(LIBDIR)
-+	$(LIBTOOL) --mode=install $(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.la $(LIBDIR)
- 	$(INSTALL) -m 0644 $(srcdir)/utils.h $(INCLUDEDIR)
+-	$(INSTALL) -m 0644 $(srcdir)/utils.h $(INCLUDEDIR)
 -	ln -fs libcdda_interface.so.0.$(VERSION) \
 -		$(LIBDIR)/libcdda_interface.so.0
 -	ln -fs libcdda_interface.so.0.$(VERSION) \
@@ -91,6 +87,17 @@ Note that VERSION is *not* used for the libtool versioning.
 -		$(LIBDIR)/libcdda_paranoia.so.0
 -	ln -fs libcdda_paranoia.so.0.$(VERSION) \
 -		$(LIBDIR)/libcdda_paranoia.so
++	${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}$(BINDIR)
++	$(LIBTOOL) --mode=install ${BSD_INSTALL_PROGRAM} $(srcdir)/cdparanoia ${DESTDIR}$(BINDIR)
++	${BSD_INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
++	${BSD_INSTALL_MAN} $(srcdir)/cdparanoia.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}$(INCLUDEDIR)
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}$(LIBDIR)
++	${BSD_INSTALL_DATA} $(srcdir)/interface/cdda_interface.h ${DESTDIR}$(INCLUDEDIR)
++	${BSD_INSTALL_DATA} $(srcdir)/paranoia/cdda_paranoia.h ${DESTDIR}$(INCLUDEDIR)
++	${BSD_INSTALL_DATA} $(srcdir)/utils.h ${DESTDIR}$(INCLUDEDIR)
++	$(LIBTOOL) --mode=install ${BSD_INSTALL_LIB} $(srcdir)/paranoia/libcdda_paranoia.la ${DESTDIR}$(LIBDIR)
++	$(LIBTOOL) --mode=install ${BSD_INSTALL_LIB} $(srcdir)/interface/libcdda_interface.la ${DESTDIR}$(LIBDIR)
  
  cdparanoia:	$(OFILES) $(LIBDEP)
 -		$(LD) $(CFLAGS) $(LDFLAGS) $(OFILES) \