pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/multimedia Mechanical changes to add DESTDIR support t...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5beafa2f09da
branches:  trunk
changeset: 539408:5beafa2f09da
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Mar 04 19:32:30 2008 +0000

description:
Mechanical changes to add DESTDIR support to packages that install
their files via a custom do-install target.

diffstat:

 multimedia/divxplayer/Makefile                    |  14 ++++++++------
 multimedia/dvdbackup/Makefile                     |   9 ++++++---
 multimedia/ggrab/Makefile                         |  14 +++++++-------
 multimedia/gmplayer/Makefile                      |  22 ++++++++++++----------
 multimedia/gtranscode/Makefile                    |   6 ++++--
 multimedia/libflashsupport/Makefile               |   8 +++++---
 multimedia/libmpeg3/Makefile                      |  22 ++++++++++++----------
 multimedia/mmg/Makefile                           |  15 +++++++++------
 multimedia/mpeg_encode/Makefile                   |  21 +++++++++++++--------
 multimedia/mplayer-plugin-firefox/Makefile.common |  18 +++++++++---------
 multimedia/ns-flash/Makefile                      |   8 +++++---
 multimedia/regionset/Makefile                     |   5 +++--
 12 files changed, 93 insertions(+), 69 deletions(-)

diffs (truncated from 428 to 300 lines):

diff -r 1ebd4a90393f -r 5beafa2f09da multimedia/divxplayer/Makefile
--- a/multimedia/divxplayer/Makefile    Tue Mar 04 19:21:10 2008 +0000
+++ b/multimedia/divxplayer/Makefile    Tue Mar 04 19:32:30 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/07/29 05:19:45 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2008/03/04 19:32:30 jlam Exp $
 
 DISTNAME=      divx-player-installer
 PKGNAME=       divxplayer-0.2.0
@@ -15,6 +15,8 @@
 EMUL_PLATFORMS=                linux-i386
 EMUL_MODULES.linux=    x11
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 WRKSRC=                ${WRKDIR}/divx-player-installer
 BUILD_DIRS=    # empty
 
@@ -28,11 +30,11 @@
                > ${WRKDIR}/frontend.sh
 
 do-install:
-       ${MKDIR} ${DATADIR}
-       ${MKDIR} ${DATADIR}/Skins
-       ${INSTALL_DATA} ${WRKSRC}/Skins/* ${DATADIR}/Skins
-       ${INSTALL_PROGRAM} ${WRKSRC}/${BINARY} ${PREFIX}/bin
+       ${MKDIR} ${DESTDIR}${DATADIR}
+       ${MKDIR} ${DESTDIR}${DATADIR}/Skins
+       ${INSTALL_DATA} ${WRKSRC}/Skins/* ${DESTDIR}${DATADIR}/Skins
+       ${INSTALL_PROGRAM} ${WRKSRC}/${BINARY} ${DESTDIR}${PREFIX}/bin
        ${INSTALL_SCRIPT} ${WRKDIR}/frontend.sh \
-               ${PREFIX}/bin/${BINARY:S/.bin$//}
+               ${DESTDIR}${PREFIX}/bin/${BINARY:S/.bin$//}
 
 .include "../../mk/bsd.pkg.mk"
diff -r 1ebd4a90393f -r 5beafa2f09da multimedia/dvdbackup/Makefile
--- a/multimedia/dvdbackup/Makefile     Tue Mar 04 19:21:10 2008 +0000
+++ b/multimedia/dvdbackup/Makefile     Tue Mar 04 19:32:30 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/10/18 01:16:53 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2008/03/04 19:32:30 jlam Exp $
 
 DISTNAME=      dvdbackup-0.1.1
 PKGREVISION=   4
@@ -9,6 +9,8 @@
 HOMEPAGE=      http://dvd-create.sourceforge.net/
 COMMENT=       DVD backup utility
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 WRKSRC=                ${WRKDIR}/dvdbackup/src
 
 INSTALLATION_DIRS=     bin
@@ -19,8 +21,9 @@
 
 do-install:
        cd ${WRKSRC}; \
-       ${INSTALL_PROGRAM} dvdbackup ${PREFIX}/bin;
-       ${INSTALL_MAN} ${FILESDIR}/dvdbackup.1 ${PREFIX}/${PKGMANDIR}/man1
+       ${INSTALL_PROGRAM} dvdbackup ${DESTDIR}${PREFIX}/bin;
+       ${INSTALL_MAN} ${FILESDIR}/dvdbackup.1 \
+               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../multimedia/libdvdread/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 1ebd4a90393f -r 5beafa2f09da multimedia/ggrab/Makefile
--- a/multimedia/ggrab/Makefile Tue Mar 04 19:21:10 2008 +0000
+++ b/multimedia/ggrab/Makefile Tue Mar 04 19:32:30 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/04/09 19:35:10 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/03/04 19:32:30 jlam Exp $
 #
 
 DISTNAME=              ${PKGNAME}-linux
@@ -11,19 +11,19 @@
 HOMEPAGE=              http://www.menzebach.de/ggrab/
 COMMENT=               Server for recording video streams from dream dvb-receivers
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_LANGUAGES= c++
 WRKSRC=                        ${WRKDIR}/ggrab-0.22a
 
 RCD_SCRIPTS=           sserver
-EGDIR=                 ${PREFIX}/share/examples/${PKGBASE}
 DOCDIR=                        ${PREFIX}/share/doc/${PKGBASE}
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/ggrab ${PREFIX}/bin
-       ${INSTALL_PROGRAM} ${WRKSRC}/sserver ${PREFIX}/bin
-       ${INSTALL_DATA_DIR} ${DOCDIR}
-       ${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}/
-       ${INSTALL_DATA_DIR} ${EGDIR}
+       ${INSTALL_PROGRAM} ${WRKSRC}/ggrab ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/sserver ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR}/
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 1ebd4a90393f -r 5beafa2f09da multimedia/gmplayer/Makefile
--- a/multimedia/gmplayer/Makefile      Tue Mar 04 19:21:10 2008 +0000
+++ b/multimedia/gmplayer/Makefile      Tue Mar 04 19:32:30 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2008/02/05 17:00:37 drochner Exp $
+# $NetBSD: Makefile,v 1.68 2008/03/04 19:32:30 jlam Exp $
 
 #
 # NOTE: if you are updating both mplayer and gmplayer, you must ensure
@@ -22,6 +22,8 @@
                ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/mplayer/ \
                ${MASTER_SITE_LOCAL:=mplayer/}
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 .include "../../multimedia/mplayer-share/Makefile.common"
 
 COMMENT=       Software only MPEG-1/2/4 video decoder with a GTK+ interface
@@ -65,19 +67,19 @@
 INSTALLATION_DIRS=     bin
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/mplayer ${PREFIX}/bin/gmplayer
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/mplayer/Skin
+       ${INSTALL_PROGRAM} ${WRKSRC}/mplayer ${DESTDIR}${PREFIX}/bin/gmplayer
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/mplayer/Skin
 .for skin in ${SKINS}
        @${ECHO_MSG} "Installing skin ${skin}..."
        ${BZCAT} ${DISTDIR}/${DIST_SUBDIR}/${skin} |    \
-         ${GTAR} xCmf ${PREFIX}/share/mplayer/Skin -
+         ${GTAR} xCmf ${DESTDIR}${PREFIX}/share/mplayer/Skin -
 .endfor
-       ${CHMOD} -R a+r ${PREFIX}/share/mplayer/Skin
-       ${CHMOD} a+rx ${PREFIX}/share/mplayer/Skin/*
-       ${RM} -f ${PREFIX}/share/mplayer/Skin/default
-       ${LN} -s Blue ${PREFIX}/share/mplayer/Skin/default
-       ${RM} -rf ${PREFIX}/share/mplayer/Skin/Blue/.svn
-       ${RM} -rf ${PREFIX}/share/mplayer/Skin/Blue/icons/.svn
+       ${CHMOD} -R a+r ${DESTDIR}${PREFIX}/share/mplayer/Skin
+       ${CHMOD} a+rx ${DESTDIR}${PREFIX}/share/mplayer/Skin/*
+       ${RM} -f ${DESTDIR}${PREFIX}/share/mplayer/Skin/default
+       ${LN} -s Blue ${DESTDIR}${PREFIX}/share/mplayer/Skin/default
+       ${RM} -rf ${DESTDIR}${PREFIX}/share/mplayer/Skin/Blue/.svn
+       ${RM} -rf ${DESTDIR}${PREFIX}/share/mplayer/Skin/Blue/icons/.svn
 
 .include "../../multimedia/libdvdnav/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff -r 1ebd4a90393f -r 5beafa2f09da multimedia/gtranscode/Makefile
--- a/multimedia/gtranscode/Makefile    Tue Mar 04 19:21:10 2008 +0000
+++ b/multimedia/gtranscode/Makefile    Tue Mar 04 19:32:30 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/10/04 21:50:08 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2008/03/04 19:32:30 jlam Exp $
 #
 
 DISTNAME=      gtranscode-v0.3
@@ -13,12 +13,14 @@
 
 DEPENDS+=      transcode-[0-9]*:../../multimedia/transcode
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 WRKSRC=                ${WRKDIR}/gtranscode
 
 INSTALLATION_DIRS=     bin
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/gtranscode ${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/gtranscode ${DESTDIR}${PREFIX}/bin
 
 .include "../../x11/gtk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 1ebd4a90393f -r 5beafa2f09da multimedia/libflashsupport/Makefile
--- a/multimedia/libflashsupport/Makefile       Tue Mar 04 19:21:10 2008 +0000
+++ b/multimedia/libflashsupport/Makefile       Tue Mar 04 19:32:30 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/08/23 18:20:33 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2008/03/04 19:32:30 jlam Exp $
 
 PKGNAME=       libflashsupport-1.0.2098
 DISTNAME=      libflashsupport-1-0-2098-i586
@@ -19,6 +19,8 @@
 RPM2PKG_STRIP=         3
 RPM2PKG_PLIST=         # empty
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 WRKSRC=                        ${WRKDIR}
 BUILD_DIRS=            # empty
 
@@ -26,8 +28,8 @@
 
 do-install:
        ${INSTALL_LIB} ${WRKDIR}/libflashsupport.so \
-               ${PREFIX}/${EMULSUBDIR}/usr/lib
+               ${DESTDIR}${PREFIX}/${EMULSUBDIR}/usr/lib
        ${INSTALL_DATA} ${WRKDIR}/doc/libflashsupport-1.0/README \
-               ${PREFIX}/share/doc/libflashsupport.README
+               ${DESTDIR}${PREFIX}/share/doc/libflashsupport.README
 
 .include "../../mk/bsd.pkg.mk"
diff -r 1ebd4a90393f -r 5beafa2f09da multimedia/libmpeg3/Makefile
--- a/multimedia/libmpeg3/Makefile      Tue Mar 04 19:21:10 2008 +0000
+++ b/multimedia/libmpeg3/Makefile      Tue Mar 04 19:32:30 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2008/02/20 09:56:44 xtraeme Exp $
+# $NetBSD: Makefile,v 1.10 2008/03/04 19:32:30 jlam Exp $
 #
 
 DISTNAME=      libmpeg3-1.7-src
@@ -12,6 +12,8 @@
 HOMEPAGE=      http://heroines.sourceforge.net/libmpeg3.php3
 COMMENT=       MPEG decoding library
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 .include "../../mk/bsd.prefs.mk"
 
 .if (${MACHINE_ARCH} == "i386")
@@ -49,26 +51,26 @@
 
 do-install:
        for f in ${INSTBINS}; do \
-               ${INSTALL_PROGRAM} ${WRKSRC}/work/$$f ${PREFIX}/bin; \
+               ${INSTALL_PROGRAM} ${WRKSRC}/work/$$f ${DESTDIR}${PREFIX}/bin; \
        done
        ${INSTALL_DATA_DIR} ${PREFIX}/include/mpeg3
        for f in ${INSTHDRS}; do \
-               ${INSTALL_DATA} ${WRKSRC}/$$f ${PREFIX}/include/mpeg3; \
+               ${INSTALL_DATA} ${WRKSRC}/$$f ${DESTDIR}${PREFIX}/include/mpeg3; \
        done
-       ${INSTALL_DATA_DIR} ${PREFIX}/include/mpeg3/audio
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/mpeg3/audio
        for f in ${AINSTHDRS}; do \
                ${INSTALL_DATA} ${WRKSRC}/audio/$$f \
-                       ${PREFIX}/include/mpeg3/audio; \
+                       ${DESTDIR}${PREFIX}/include/mpeg3/audio; \
        done
-       ${INSTALL_DATA_DIR} ${PREFIX}/include/mpeg3/video
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/mpeg3/video
        for f in ${VINSTHDRS}; do \
                ${INSTALL_DATA} ${WRKSRC}/video/$$f \
-                       ${PREFIX}/include/mpeg3/video; \
+                       ${DESTDIR}${PREFIX}/include/mpeg3/video; \
        done
-       ${INSTALL_LIB} ${WRKSRC}/work/libmpeg3.a ${PREFIX}/lib
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/libmpeg3
+       ${INSTALL_LIB} ${WRKSRC}/work/libmpeg3.a ${DESTDIR}${PREFIX}/lib
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/html/libmpeg3
        ${INSTALL_DATA} ${WRKSRC}/docs/index.html \
-               ${PREFIX}/share/doc/html/libmpeg3
+               ${DESTDIR}${PREFIX}/share/doc/html/libmpeg3
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 1ebd4a90393f -r 5beafa2f09da multimedia/mmg/Makefile
--- a/multimedia/mmg/Makefile   Tue Mar 04 19:21:10 2008 +0000
+++ b/multimedia/mmg/Makefile   Tue Mar 04 19:32:30 2008 +0000
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2007/02/22 19:26:51 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2008/03/04 19:32:30 jlam Exp $
 #
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 .include "../../multimedia/mkvtoolnix/Makefile.dist"
 PKGNAME=       ${DISTNAME:S/mkvtoolnix/mmg/}
 
@@ -27,13 +29,14 @@
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/src/mmg/mmg ${PREFIX}/bin/
-       ${INSTALL_MAN} ${WRKSRC}/doc/mmg.1 ${PREFIX}/${PKGMANDIR}/man1/
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mmg/images/
+       ${INSTALL_PROGRAM} ${WRKSRC}/src/mmg/mmg ${DESTDIR}${PREFIX}/bin/
+       ${INSTALL_MAN} ${WRKSRC}/doc/mmg.1 \
+               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/mmg/images/
        ${INSTALL_DATA} ${WRKSRC}/doc/images/*.gif \
-               ${PREFIX}/share/doc/mmg/images/
+               ${DESTDIR}${PREFIX}/share/doc/mmg/images/
        ${INSTALL_DATA} ${WRKSRC}/doc/mkvmerge-gui.* \
-               ${PREFIX}/share/doc/mmg/
+               ${DESTDIR}${PREFIX}/share/doc/mmg/
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/libebml/buildlink3.mk"
diff -r 1ebd4a90393f -r 5beafa2f09da multimedia/mpeg_encode/Makefile
--- a/multimedia/mpeg_encode/Makefile   Tue Mar 04 19:21:10 2008 +0000
+++ b/multimedia/mpeg_encode/Makefile   Tue Mar 04 19:32:30 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/01/07 09:14:01 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2008/03/04 19:32:30 jlam Exp $
 #
 
 DISTNAME=      mpeg_encode-1.5b-src
@@ -11,6 +11,8 @@
 HOMEPAGE=      http://bmrc.berkeley.edu/frame/research/mpeg/mpeg_encode.html
 COMMENT=       The Parallel Berkeley MPEG Encoder



Home | Main Index | Thread Index | Old Index