[pkgsrc/trunk]: pkgsrc/multimedia/mplayer-share Update to 1.0rc7nb2: Adapt fo...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7707792afc9b
branches:  trunk
changeset: 507486:7707792afc9b
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Feb 03 00:39:55 2006 +0000

description:
Update to 1.0rc7nb2: Adapt for new mplayer-fonts package.
Fix a few pkglint warnings while here.

diffstat:

 multimedia/mplayer-share/Makefile        |  35 +-----------
 multimedia/mplayer-share/Makefile.common |   8 +-
 multimedia/mplayer-share/PLIST           |  81 +-------------------------------
 3 files changed, 11 insertions(+), 113 deletions(-)

diffs (184 lines):

diff -r 894b86908b08 -r 7707792afc9b multimedia/mplayer-share/Makefile
--- a/multimedia/mplayer-share/Makefile Fri Feb 03 00:38:28 2006 +0000
+++ b/multimedia/mplayer-share/Makefile Fri Feb 03 00:39:55 2006 +0000
@@ -1,41 +1,22 @@
-# $NetBSD: Makefile,v 1.5 2005/10/02 11:23:08 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2006/02/03 00:39:55 wiz Exp $
 
 .include "Makefile.common"
 
 PKGNAME=       mplayer-share-${MPLAYER_PKG_VERSION}
-PKGREVISION=   1
-COMMENT=       Documentation and fonts used by mplayer and gmplayer
+PKGREVISION=   2
+COMMENT=       Documentation used by mplayer and gmplayer
+
+DEPENDS+=      mplayer-fonts-[0-9]*:../../fonts/mplayer-fonts
 
 NO_BUILD=      YES
 NO_CONFIGURE=  YES
 
-MP_FONTS=      font-arial-iso-8859-1.tar.bz2 \
-               font-arial-iso-8859-2.tar.bz2 \
-               font-arial-cp1250.tar.bz2
-FONT_DIRS=     font-arial-cp1250 font-arial-iso-8859-1 font-arial-iso-8859-2
-
-.for font in ${MP_FONTS}
-SITES_${font}= http://ftp5.mplayerhq.hu/mplayer/releases/fonts/ \
-               http://www4.mplayerhq.hu/MPlayer/releases/fonts/ \
-               ftp://ftp2.mplayerhq.hu/MPlayer/releases/fonts/ \
-               ftp://ftp1.mplayerhq.hu/MPlayer/releases/fonts \
-               ftp://ftp5.mplayerhq.hu/mplayer/releases/fonts/ \
-               http://www1.mplayerhq.hu/MPlayer/releases/fonts/ \
-               http://www2.mplayerhq.hu/MPlayer/releases/fonts/
-.endfor
-
-DISTFILES+=    ${DISTNAME}${EXTRACT_SUFX}
-DISTFILES+=    ${MP_FONTS}
-
-.include "../../mk/bsd.prefs.mk"
-
 INSTALLATION_DIRS=     man/man1
 
 do-install:
        ${INSTALL_MAN} ${WRKSRC}/DOCS/man/en/mplayer.1 ${PREFIX}/man/man1
        ${INSTALL_DATA_DIR} ${PREFIX}/share/mplayer
        ${INSTALL_DATA_DIR} ${PREFIX}/share/mplayer/DOCS
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/mplayer/fonts
        ${INSTALL_DATA} ${WRKSRC}/etc/codecs.conf ${PREFIX}/share/mplayer
        ${INSTALL_DATA} ${WRKSRC}/etc/input.conf ${PREFIX}/share/mplayer
        (cd ${WRKSRC}/DOCS && \
@@ -44,11 +25,5 @@
                ${PKGDIRMODE} \{\} \;
        ${FIND} ${PREFIX}/share/mplayer/DOCS -type f -exec ${CHMOD} \
                ${SHAREMODE} \{\} \;
-       for D in ${FONT_DIRS}; do \
-               (cd ${WRKDIR}/$$D && \
-                       ${PAX} -rwpppm * ${PREFIX}/share/mplayer/fonts); \
-       done
-       ${LN} -s ${PREFIX}/share/mplayer/fonts/font-arial-18-iso-8859-1 \
-               ${PREFIX}/share/mplayer/font
 
 .include "../../mk/bsd.pkg.mk"
diff -r 894b86908b08 -r 7707792afc9b multimedia/mplayer-share/Makefile.common
--- a/multimedia/mplayer-share/Makefile.common  Fri Feb 03 00:38:28 2006 +0000
+++ b/multimedia/mplayer-share/Makefile.common  Fri Feb 03 00:39:55 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.26 2005/12/05 23:55:13 rillig Exp $
+# $NetBSD: Makefile.common,v 1.27 2006/02/03 00:39:55 wiz Exp $
 
 MPLAYER_DIST_VERSION=  1.0pre7
 
@@ -29,9 +29,9 @@
 PATCHDIR=              ${.CURDIR}/../../multimedia/mplayer-share/patches
 DISTINFO_FILE=         ${.CURDIR}/../../multimedia/mplayer-share/distinfo
 
-NO_BIN_ON_CDROM=       "a dependency is restricted"
-NO_BIN_ON_FTP=         "a dependency is restricted"
-NO_SRC_ON_FTP=         "prohibited by USAs DMCA"
+NO_BIN_ON_CDROM=       a dependency is restricted
+NO_BIN_ON_FTP=         a dependency is restricted
+NO_SRC_ON_FTP=         prohibited by USAs DMCA
 
 USE_TOOLS+=            gmake
 HAS_CONFIGURE=         YES
diff -r 894b86908b08 -r 7707792afc9b multimedia/mplayer-share/PLIST
--- a/multimedia/mplayer-share/PLIST    Fri Feb 03 00:38:28 2006 +0000
+++ b/multimedia/mplayer-share/PLIST    Fri Feb 03 00:39:55 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2005/04/18 17:49:41 drochner Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/02/03 00:39:55 wiz Exp $
 man/man1/mplayer.1
 share/mplayer/DOCS/HTML/cs/amiga.html
 share/mplayer/DOCS/HTML/cs/aspect.html
@@ -721,84 +721,7 @@
 share/mplayer/DOCS/zh/users_against_developers.html
 share/mplayer/DOCS/zh/video.html
 share/mplayer/codecs.conf
-share/mplayer/font
-share/mplayer/fonts/README-arial-cp1250
-share/mplayer/fonts/README-arial-iso-8859-1
-share/mplayer/fonts/README-arial-iso-8859-2
-share/mplayer/fonts/font-arial-14-cp1250/cp1250-a.raw
-share/mplayer/fonts/font-arial-14-cp1250/cp1250-b.raw
-share/mplayer/fonts/font-arial-14-cp1250/font.desc
-share/mplayer/fonts/font-arial-14-cp1250/osd-mplayer-a.raw
-share/mplayer/fonts/font-arial-14-cp1250/osd-mplayer-b.raw
-share/mplayer/fonts/font-arial-14-iso-8859-1/font.desc
-share/mplayer/fonts/font-arial-14-iso-8859-1/iso-8859-1-a.raw
-share/mplayer/fonts/font-arial-14-iso-8859-1/iso-8859-1-b.raw
-share/mplayer/fonts/font-arial-14-iso-8859-1/osd-mplayer-a.raw
-share/mplayer/fonts/font-arial-14-iso-8859-1/osd-mplayer-b.raw
-share/mplayer/fonts/font-arial-14-iso-8859-2/font.desc
-share/mplayer/fonts/font-arial-14-iso-8859-2/iso-8859-2-a.raw
-share/mplayer/fonts/font-arial-14-iso-8859-2/iso-8859-2-b.raw
-share/mplayer/fonts/font-arial-14-iso-8859-2/osd-mplayer-a.raw
-share/mplayer/fonts/font-arial-14-iso-8859-2/osd-mplayer-b.raw
-share/mplayer/fonts/font-arial-18-cp1250/cp1250-a.raw
-share/mplayer/fonts/font-arial-18-cp1250/cp1250-b.raw
-share/mplayer/fonts/font-arial-18-cp1250/font.desc
-share/mplayer/fonts/font-arial-18-cp1250/osd-mplayer-a.raw
-share/mplayer/fonts/font-arial-18-cp1250/osd-mplayer-b.raw
-share/mplayer/fonts/font-arial-18-iso-8859-1/font.desc
-share/mplayer/fonts/font-arial-18-iso-8859-1/iso-8859-1-a.raw
-share/mplayer/fonts/font-arial-18-iso-8859-1/iso-8859-1-b.raw
-share/mplayer/fonts/font-arial-18-iso-8859-1/osd-mplayer-a.raw
-share/mplayer/fonts/font-arial-18-iso-8859-1/osd-mplayer-b.raw
-share/mplayer/fonts/font-arial-18-iso-8859-2/font.desc
-share/mplayer/fonts/font-arial-18-iso-8859-2/iso-8859-2-a.raw
-share/mplayer/fonts/font-arial-18-iso-8859-2/iso-8859-2-b.raw
-share/mplayer/fonts/font-arial-18-iso-8859-2/osd-mplayer-a.raw
-share/mplayer/fonts/font-arial-18-iso-8859-2/osd-mplayer-b.raw
-share/mplayer/fonts/font-arial-24-cp1250/cp1250-a.raw
-share/mplayer/fonts/font-arial-24-cp1250/cp1250-b.raw
-share/mplayer/fonts/font-arial-24-cp1250/font.desc
-share/mplayer/fonts/font-arial-24-cp1250/osd-mplayer-a.raw
-share/mplayer/fonts/font-arial-24-cp1250/osd-mplayer-b.raw
-share/mplayer/fonts/font-arial-24-iso-8859-1/font.desc
-share/mplayer/fonts/font-arial-24-iso-8859-1/iso-8859-1-a.raw
-share/mplayer/fonts/font-arial-24-iso-8859-1/iso-8859-1-b.raw
-share/mplayer/fonts/font-arial-24-iso-8859-1/osd-mplayer-a.raw
-share/mplayer/fonts/font-arial-24-iso-8859-1/osd-mplayer-b.raw
-share/mplayer/fonts/font-arial-24-iso-8859-2/font.desc
-share/mplayer/fonts/font-arial-24-iso-8859-2/iso-8859-2-a.raw
-share/mplayer/fonts/font-arial-24-iso-8859-2/iso-8859-2-b.raw
-share/mplayer/fonts/font-arial-24-iso-8859-2/osd-mplayer-a.raw
-share/mplayer/fonts/font-arial-24-iso-8859-2/osd-mplayer-b.raw
-share/mplayer/fonts/font-arial-28-cp1250/cp1250-a.raw
-share/mplayer/fonts/font-arial-28-cp1250/cp1250-b.raw
-share/mplayer/fonts/font-arial-28-cp1250/font.desc
-share/mplayer/fonts/font-arial-28-cp1250/osd-mplayer-a.raw
-share/mplayer/fonts/font-arial-28-cp1250/osd-mplayer-b.raw
-share/mplayer/fonts/font-arial-28-iso-8859-1/font.desc
-share/mplayer/fonts/font-arial-28-iso-8859-1/iso-8859-1-a.raw
-share/mplayer/fonts/font-arial-28-iso-8859-1/iso-8859-1-b.raw
-share/mplayer/fonts/font-arial-28-iso-8859-1/osd-mplayer-a.raw
-share/mplayer/fonts/font-arial-28-iso-8859-1/osd-mplayer-b.raw
-share/mplayer/fonts/font-arial-28-iso-8859-2/font.desc
-share/mplayer/fonts/font-arial-28-iso-8859-2/iso-8859-2-a.raw
-share/mplayer/fonts/font-arial-28-iso-8859-2/iso-8859-2-b.raw
-share/mplayer/fonts/font-arial-28-iso-8859-2/osd-mplayer-a.raw
-share/mplayer/fonts/font-arial-28-iso-8859-2/osd-mplayer-b.raw
 share/mplayer/input.conf
-@dirrm share/mplayer/fonts/font-arial-28-iso-8859-2
-@dirrm share/mplayer/fonts/font-arial-28-iso-8859-1
-@dirrm share/mplayer/fonts/font-arial-28-cp1250
-@dirrm share/mplayer/fonts/font-arial-24-iso-8859-2
-@dirrm share/mplayer/fonts/font-arial-24-iso-8859-1
-@dirrm share/mplayer/fonts/font-arial-24-cp1250
-@dirrm share/mplayer/fonts/font-arial-18-iso-8859-2
-@dirrm share/mplayer/fonts/font-arial-18-iso-8859-1
-@dirrm share/mplayer/fonts/font-arial-18-cp1250
-@dirrm share/mplayer/fonts/font-arial-14-iso-8859-2
-@dirrm share/mplayer/fonts/font-arial-14-iso-8859-1
-@dirrm share/mplayer/fonts/font-arial-14-cp1250
-@dirrm share/mplayer/fonts
 @dirrm share/mplayer/DOCS/zh
 @dirrm share/mplayer/DOCS/xml/xsl
 @dirrm share/mplayer/DOCS/xml/ru
@@ -833,4 +756,4 @@
 @dirrm share/mplayer/DOCS/HTML/cs
 @dirrm share/mplayer/DOCS/HTML
 @dirrm share/mplayer/DOCS
-@dirrm share/mplayer
+@comment in mplayer-fonts: @dirrm share/mplayer