[pkgsrc/trunk]: pkgsrc/multimedia DESTDIR support and convert to mdular build...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2f3c0df555f7
branches:  trunk
changeset: 521202:2f3c0df555f7
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Nov 06 14:06:17 2006 +0000

description:
DESTDIR support and convert to mdular buildlinks.

diffstat:

 multimedia/mplayer-share/Makefile         |  20 +++++++++-----------
 multimedia/mplayer-share/Makefile.common  |   4 +++-
 multimedia/mplayer-share/Makefile.depends |   4 ++--
 multimedia/mplayer/Makefile               |   7 +++++--
 4 files changed, 19 insertions(+), 16 deletions(-)

diffs (93 lines):

diff -r 8bac3a41c1d1 -r 2f3c0df555f7 multimedia/mplayer-share/Makefile
--- a/multimedia/mplayer-share/Makefile Mon Nov 06 14:04:51 2006 +0000
+++ b/multimedia/mplayer-share/Makefile Mon Nov 06 14:06:17 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/10/25 21:00:46 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2006/11/06 14:06:17 joerg Exp $
 
 .include "Makefile.common"
 
@@ -10,19 +10,17 @@
 NO_BUILD=      YES
 NO_CONFIGURE=  YES
 
-INSTALLATION_DIRS=     ${PKGMANDIR}/man1
+INSTALLATION_DIRS=     ${PKGMANDIR}/man1 share/mplayer/DOCS
 
 do-install:
-       ${INSTALL_MAN} ${WRKSRC}/DOCS/man/en/mplayer.1 ${PREFIX}/${PKGMANDIR}/man1
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/mplayer
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/mplayer/DOCS
-       ${INSTALL_DATA} ${WRKSRC}/etc/codecs.conf ${PREFIX}/share/mplayer
-       ${INSTALL_DATA} ${WRKSRC}/etc/input.conf ${PREFIX}/share/mplayer
+       ${INSTALL_MAN} ${WRKSRC}/DOCS/man/en/mplayer.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+       ${INSTALL_DATA} ${WRKSRC}/etc/codecs.conf ${DESTDIR}${PREFIX}/share/mplayer
+       ${INSTALL_DATA} ${WRKSRC}/etc/input.conf ${DESTDIR}${PREFIX}/share/mplayer
        (cd ${WRKSRC}/DOCS && \
-               ${PAX} -rwpppm * ${PREFIX}/share/mplayer/DOCS); \
-       ${FIND} ${PREFIX}/share/mplayer/DOCS -type d -exec ${CHMOD} \
-               ${PKGDIRMODE} \{\} \;
-       ${FIND} ${PREFIX}/share/mplayer/DOCS -type f -exec ${CHMOD} \
+               ${PAX} -rwpppm * ${DESTDIR}${PREFIX}/share/mplayer/DOCS); \
+       ${FIND} ${DESTDIR}${PREFIX}/share/mplayer/DOCS -type d -exec ${CHMOD} \
+               ${PKGDIRMODE} \{\} \;
+       ${FIND} ${DESTDIR}${PREFIX}/share/mplayer/DOCS -type f -exec ${CHMOD} \
                ${SHAREMODE} \{\} \;
 
 .include "../../mk/bsd.pkg.mk"
diff -r 8bac3a41c1d1 -r 2f3c0df555f7 multimedia/mplayer-share/Makefile.common
--- a/multimedia/mplayer-share/Makefile.common  Mon Nov 06 14:04:51 2006 +0000
+++ b/multimedia/mplayer-share/Makefile.common  Mon Nov 06 14:06:17 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.33 2006/10/31 22:33:28 wiz Exp $
+# $NetBSD: Makefile.common,v 1.34 2006/11/06 14:06:17 joerg Exp $
 
 MPLAYER_DIST_VERSION=  1.0rc1
 
@@ -18,6 +18,8 @@
 MAINTAINER?=           pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE?=             http://www.mplayerhq.hu/
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 #
 # NOTE: gmplayer has its own distinfo file. if you are also updating
 # gmplayer, you must ensure that *both* distinfo files contain the
diff -r 8bac3a41c1d1 -r 2f3c0df555f7 multimedia/mplayer-share/Makefile.depends
--- a/multimedia/mplayer-share/Makefile.depends Mon Nov 06 14:04:51 2006 +0000
+++ b/multimedia/mplayer-share/Makefile.depends Mon Nov 06 14:06:17 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.depends,v 1.15 2006/10/31 22:33:28 wiz Exp $
+# $NetBSD: Makefile.depends,v 1.16 2006/11/06 14:06:17 joerg Exp $
 #
 
 DEPENDS+=      mplayer-share>=${MPLAYER_PKG_VERSION}:../../multimedia/mplayer-share
@@ -10,4 +10,4 @@
 .endif
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
diff -r 8bac3a41c1d1 -r 2f3c0df555f7 multimedia/mplayer/Makefile
--- a/multimedia/mplayer/Makefile       Mon Nov 06 14:04:51 2006 +0000
+++ b/multimedia/mplayer/Makefile       Mon Nov 06 14:06:17 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/10/31 22:33:28 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2006/11/06 14:06:17 joerg Exp $
 
 PKGNAME=       mplayer-${MPLAYER_PKG_VERSION}
 
@@ -20,9 +20,12 @@
 
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+.include "../../x11/libXinerama/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/libXv/buildlink3.mk"
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/mplayer ${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/mplayer ${DESTDIR}${PREFIX}/bin
 
 .include "../../multimedia/mplayer-share/Makefile.depends"