+PKG_DESTDIR_SUPPORT

3 files changed, 26 insertions, 5 deletions

diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
index fb9785e6072..6be7cdacb1e 100644
--- a/audio/mpg123/Makefile
+++ b/audio/mpg123/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2006/05/26 12:16:13 drochner Exp $
+# $NetBSD: Makefile,v 1.43 2009/05/19 22:16:08 abs Exp $
 
 PKGNAME=	mpg123-${MPG123_VERSION}
 PKGREVISION=	9
@@ -6,6 +6,8 @@ COMMENT=	Command-line player for mpeg layer 1, 2 and 3 audio
 
 CONFLICTS+=	mpg123-nas-[0-9]*
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 PKG_OPTIONS_VAR=PKG_OPTIONS.mpg123
 .include "Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/mpg123/distinfo b/audio/mpg123/distinfo
index 905c45bb5ac..df683dec9b1 100644
--- a/audio/mpg123/distinfo
+++ b/audio/mpg123/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2008/08/20 22:17:30 martin Exp $
+$NetBSD: distinfo,v 1.30 2009/05/19 22:16:08 abs Exp $
 
 SHA1 (mpg123/mpg123-0.59r.tar.gz) = c32fe242f4506d218bd19a51a4034da9fdc79493
 RMD160 (mpg123/mpg123-0.59r.tar.gz) = 17d47ca04fdcac5e2d71f95ccbd23b61b5ed8b3c
@@ -6,7 +6,7 @@ Size (mpg123/mpg123-0.59r.tar.gz) = 159028 bytes
 SHA1 (mpg123/mpg123-059r-v6-20000713b.diff.gz) = fab11489b6a1ab79d6c29787161f1c05e492dc0b
 RMD160 (mpg123/mpg123-059r-v6-20000713b.diff.gz) = c1942566dcbaf9bd605a1544b5c390e27dc150ca
 Size (mpg123/mpg123-059r-v6-20000713b.diff.gz) = 5600 bytes
-SHA1 (patch-aa) = bbed4c6c2f68e65c8256ffb307ca4d94aefe1422
+SHA1 (patch-aa) = aef8fed351b2184db901d2832fa23554a9cc062b
 SHA1 (patch-ab) = ffc387d93f0f2832e49796c80be26e908defa3a7
 SHA1 (patch-ac) = 06a5037e27ddd4cc34e5348c09e702f9740173c5
 SHA1 (patch-ad) = e9b2b874a95a67139c7d48e74492eb64dfa815f0
diff --git a/audio/mpg123/patches/patch-aa b/audio/mpg123/patches/patch-aa
index 0dba8085f05..1b9c7825db1 100644
--- a/audio/mpg123/patches/patch-aa
+++ b/audio/mpg123/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.27 2008/05/20 18:36:47 tnn Exp $
+$NetBSD: patch-aa,v 1.28 2009/05/19 22:16:08 abs Exp $
 
---- Makefile.orig	2008-05-20 20:33:45.000000000 +0200
+--- Makefile.orig	2009-05-19 23:13:41.000000000 +0100
 +++ Makefile
 @@ -6,7 +6,7 @@
  
@@ -295,3 +295,22 @@ $NetBSD: patch-aa,v 1.27 2008/05/20 18:36:47 tnn Exp $
  ###########################################################################
  ###########################################################################
  ###########################################################################
+@@ -644,12 +847,12 @@ system: mpg123.h system.c
+ install:	prepared-for-install
+ 	strip mpg123
+ 	if [ -x /usr/ccs/bin/mcs ]; then /usr/ccs/bin/mcs -d mpg123; fi
+-	mkdir -p $(BINDIR)
+-	mkdir -p $(MANDIR)/man$(SECTION)
+-	cp -f mpg123 $(BINDIR)
+-	chmod 755 $(BINDIR)/mpg123
+-	cp -f mpg123.1 $(MANDIR)/man$(SECTION)
+-	chmod 644 $(MANDIR)/man$(SECTION)/mpg123.1
++	mkdir -p $(DESTDIR)$(BINDIR)
++	mkdir -p $(DESTDIR)$(MANDIR)/man$(SECTION)
++	cp -f mpg123 $(DESTDIR)$(BINDIR)
++	chmod 755 $(DESTDIR)$(BINDIR)/mpg123
++	cp -f mpg123.1 $(DESTDIR)$(MANDIR)/man$(SECTION)
++	chmod 644 $(DESTDIR)$(MANDIR)/man$(SECTION)/mpg123.1
+ 
+ dist:	clean
+ 	DISTNAME="`basename \`pwd\``" ; \