Change fonts handling: install all fonts, and let user link one of them

to ~/.mplayer/font (mentioned in MESSAGE, and in documentation for mplayer).
Simplify PLIST and DEPENDency handling.
Bump PKGREVISION.
Closes PR 19283.

5 files changed, 161 insertions, 27 deletions

diff --git a/graphics/mplayer-share/MESSAGE b/graphics/mplayer-share/MESSAGE
new file mode 100644
index 00000000000..025a2232214
--- /dev/null
+++ b/graphics/mplayer-share/MESSAGE
@@ -0,0 +1,7 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2002/12/06 14:21:46 wiz Exp $
+
+To view subtitles, you must copy/link one of the supplied fonts from
+${PREFIX}/share/mplayer/fonts to ~/.mplayer/font.
+
+===========================================================================
diff --git a/graphics/mplayer-share/Makefile b/graphics/mplayer-share/Makefile
index 7ddae080c15..67974ed9a75 100644
--- a/graphics/mplayer-share/Makefile
+++ b/graphics/mplayer-share/Makefile
@@ -1,40 +1,42 @@
-# $NetBSD: Makefile,v 1.2 2002/08/07 12:53:06 veego Exp $
+# $NetBSD: Makefile,v 1.3 2002/12/06 14:21:46 wiz Exp $
 
 .include "Makefile.common"
 
 PKGNAME=	mplayer-share-${MPLAYER_PKG_VERSION}
 COMMENT=	Documentation and fonts used by mplayer and gmplayer
-
-MASTER_SITES+=	http://www2.mplayerhq.hu/MPlayer/contrib/fonts/ \
-		ftp://ftp2.mplayerhq.hu/MPlayer/contrib/fonts/
+# XXX: Remove following line during next update!
+PKGREVISION=	1
 
 NO_BUILD=	YES
 NO_CONFIGURE=	YES
 NO_PATCH=	YES
 
-MP_FONTS=	mp-arial-iso-8859-1.zip \
-		mp-arial-iso-8859-2.zip \
-		koi8r-font.tar.bz2
+MP_FONTS=	font-arial-iso-8859-1.tar.bz2 \
+		font-arial-iso-8859-2.tar.bz2 \
+		font-arial-cp1250.tar.bz2
+FONT_FILES=	README-arial-iso-8859-1 README-arial-iso-8859-2 cp1250 \
+		font-arial-14-iso-8859-1 font-arial-14-iso-8859-2 \
+		font-arial-18-iso-8859-1 font-arial-18-iso-8859-2 \
+		font-arial-24-iso-8859-1 font-arial-24-iso-8859-2 \
+		font-arial-28-iso-8859-1 font-arial-28-iso-8859-2
+
+.for font in ${MP_FONTS}
+SITES_${font}=	http://www2.mplayerhq.hu/MPlayer/releases/fonts/ \
+		ftp://ftp.mplayerhq.hu/MPlayer/releases/fonts/
+.endfor
 
 DISTFILES+=	${DISTNAME}${EXTRACT_SUFX}
 DISTFILES+=	${MP_FONTS}
 
-PLIST_SRC=	${WRKDIR}/.PLIST_SRC
-
 .include "../../mk/bsd.prefs.mk"
 
 do-install:
-	${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
 	${INSTALL_MAN} ${WRKSRC}/DOCS/mplayer.1 ${PREFIX}/man/man1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/mplayer
-	${INSTALL_DATA_DIR} ${PREFIX}/share/mplayer/font
+	${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
 	${CP} -R ${WRKSRC}/DOCS ${PREFIX}/share/mplayer
-	@${ECHO_MSG} "Installing font ${MPLAYER_FONT}..."
-	(cd ${WRKDIR}/${MPLAYER_FONT}; ${PAX} -rwpp . ${PREFIX}/share/mplayer/font)
-	(cd ${PREFIX}; ${FIND} share/mplayer/font -type f -print >>${PLIST_SRC})
-	(cd ${PREFIX}; ${FIND} -d share/mplayer -type d -print | \
-		${SED} -e "s/^/@dirrm /" | ${SORT} -r >>${PLIST_SRC})
+	cd ${WRKDIR}; ${PAX} -rw ${FONT_FILES} ${PREFIX}/share/mplayer/fonts
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/mplayer-share/Makefile.depends b/graphics/mplayer-share/Makefile.depends
index 0200ed9b14f..233d37956e6 100644
--- a/graphics/mplayer-share/Makefile.depends
+++ b/graphics/mplayer-share/Makefile.depends
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.depends,v 1.8 2002/11/13 15:25:34 wiz Exp $
+# $NetBSD: Makefile.depends,v 1.9 2002/12/06 14:21:46 wiz Exp $
 
-DEPENDS+=	mplayer-share-${MPLAYER_PKG_VERSION}${PKGREVISION:Dnb${PKGREVISION}}:../../graphics/mplayer-share
+DEPENDS+=	mplayer-share>=${MPLAYER_PKG_VERSION}:../../graphics/mplayer-share
 
 .if (${OPSYS} == "NetBSD")
 .  include "../../devel/binutils/buildlink2.mk"
diff --git a/graphics/mplayer-share/PLIST b/graphics/mplayer-share/PLIST
index 60418e9b09c..b597e7b8eca 100644
--- a/graphics/mplayer-share/PLIST
+++ b/graphics/mplayer-share/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/10/25 18:20:48 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2002/12/06 14:21:46 wiz Exp $
 man/man1/mplayer.1
 share/mplayer/DOCS/Chinese/bugreports.html
 share/mplayer/DOCS/Chinese/cd-dvd.html
@@ -109,5 +109,130 @@ share/mplayer/DOCS/tech/vop.txt
 share/mplayer/DOCS/users_against_developers.html
 share/mplayer/DOCS/video.html
 share/mplayer/codecs.conf
+share/mplayer/fonts/README-arial-iso-8859-1
+share/mplayer/fonts/README-arial-iso-8859-2
+share/mplayer/fonts/cp1250/README
+share/mplayer/fonts/cp1250/arial-14/font.desc
+share/mplayer/fonts/cp1250/arial-14/runme
+share/mplayer/fonts/cp1250/arial-14/cp1250-a.raw
+share/mplayer/fonts/cp1250/arial-14/cp1250-b.raw
+share/mplayer/fonts/cp1250/arial-14/osd-mplayer-a.raw
+share/mplayer/fonts/cp1250/arial-14/osd-mplayer-b.raw
+share/mplayer/fonts/cp1250/arial-16/font.desc
+share/mplayer/fonts/cp1250/arial-16/runme
+share/mplayer/fonts/cp1250/arial-16/cp1250-a.raw
+share/mplayer/fonts/cp1250/arial-16/cp1250-b.raw
+share/mplayer/fonts/cp1250/arial-16/osd-mplayer-a.raw
+share/mplayer/fonts/cp1250/arial-16/osd-mplayer-b.raw
+share/mplayer/fonts/cp1250/arial-18/font.desc
+share/mplayer/fonts/cp1250/arial-18/runme
+share/mplayer/fonts/cp1250/arial-18/cp1250-a.raw
+share/mplayer/fonts/cp1250/arial-18/cp1250-b.raw
+share/mplayer/fonts/cp1250/arial-18/osd-mplayer-a.raw
+share/mplayer/fonts/cp1250/arial-18/osd-mplayer-b.raw
+share/mplayer/fonts/cp1250/arial-20/font.desc
+share/mplayer/fonts/cp1250/arial-20/runme
+share/mplayer/fonts/cp1250/arial-20/cp1250-a.raw
+share/mplayer/fonts/cp1250/arial-20/cp1250-b.raw
+share/mplayer/fonts/cp1250/arial-20/osd-mplayer-a.raw
+share/mplayer/fonts/cp1250/arial-20/osd-mplayer-b.raw
+share/mplayer/fonts/cp1250/arial-22/font.desc
+share/mplayer/fonts/cp1250/arial-22/runme
+share/mplayer/fonts/cp1250/arial-22/cp1250-a.raw
+share/mplayer/fonts/cp1250/arial-22/cp1250-b.raw
+share/mplayer/fonts/cp1250/arial-22/osd-mplayer-a.raw
+share/mplayer/fonts/cp1250/arial-22/osd-mplayer-b.raw
+share/mplayer/fonts/cp1250/arial-24/font.desc
+share/mplayer/fonts/cp1250/arial-24/runme
+share/mplayer/fonts/cp1250/arial-24/cp1250-a.raw
+share/mplayer/fonts/cp1250/arial-24/cp1250-b.raw
+share/mplayer/fonts/cp1250/arial-24/osd-mplayer-a.raw
+share/mplayer/fonts/cp1250/arial-24/osd-mplayer-b.raw
+share/mplayer/fonts/cp1250/arial-26/font.desc
+share/mplayer/fonts/cp1250/arial-26/runme
+share/mplayer/fonts/cp1250/arial-26/cp1250-a.raw
+share/mplayer/fonts/cp1250/arial-26/cp1250-b.raw
+share/mplayer/fonts/cp1250/arial-26/osd-mplayer-a.raw
+share/mplayer/fonts/cp1250/arial-26/osd-mplayer-b.raw
+share/mplayer/fonts/cp1250/arial-28/font.desc
+share/mplayer/fonts/cp1250/arial-28/runme
+share/mplayer/fonts/cp1250/arial-28/cp1250-a.raw
+share/mplayer/fonts/cp1250/arial-28/cp1250-b.raw
+share/mplayer/fonts/cp1250/arial-28/osd-mplayer-a.raw
+share/mplayer/fonts/cp1250/arial-28/osd-mplayer-b.raw
+share/mplayer/fonts/font-arial-14-iso-8859-1/font.desc
+share/mplayer/fonts/font-arial-14-iso-8859-1/runme
+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-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-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/font.desc
+share/mplayer/fonts/font-arial-14-iso-8859-2/runme
+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-iso-8859-1/font.desc
+share/mplayer/fonts/font-arial-18-iso-8859-1/runme
+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-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-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/font.desc
+share/mplayer/fonts/font-arial-18-iso-8859-2/runme
+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-iso-8859-1/font.desc
+share/mplayer/fonts/font-arial-24-iso-8859-1/runme
+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-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-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/font.desc
+share/mplayer/fonts/font-arial-24-iso-8859-2/runme
+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-iso-8859-1/font.desc
+share/mplayer/fonts/font-arial-28-iso-8859-1/runme
+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-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-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/font.desc
+share/mplayer/fonts/font-arial-28-iso-8859-2/runme
+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
-@comment dirrm's are created automatically from the Makefile
+@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-24-iso-8859-2
+@dirrm share/mplayer/fonts/font-arial-24-iso-8859-1
+@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-14-iso-8859-2
+@dirrm share/mplayer/fonts/font-arial-14-iso-8859-1
+@dirrm share/mplayer/fonts/cp1250/arial-28
+@dirrm share/mplayer/fonts/cp1250/arial-26
+@dirrm share/mplayer/fonts/cp1250/arial-24
+@dirrm share/mplayer/fonts/cp1250/arial-22
+@dirrm share/mplayer/fonts/cp1250/arial-20
+@dirrm share/mplayer/fonts/cp1250/arial-18
+@dirrm share/mplayer/fonts/cp1250/arial-16
+@dirrm share/mplayer/fonts/cp1250/arial-14
+@dirrm share/mplayer/fonts/cp1250
+@dirrm share/mplayer/fonts
+@dirrm share/mplayer/DOCS/tech/realcodecs
+@dirrm share/mplayer/DOCS/tech
+@dirrm share/mplayer/DOCS/Polish
+@dirrm share/mplayer/DOCS/Italian
+@dirrm share/mplayer/DOCS/Hungarian
+@dirrm share/mplayer/DOCS/German
+@dirrm share/mplayer/DOCS/Chinese
+@dirrm share/mplayer/DOCS
+@dirrm share/mplayer
diff --git a/graphics/mplayer-share/distinfo b/graphics/mplayer-share/distinfo
index b72986885e0..f248c6c1773 100644
--- a/graphics/mplayer-share/distinfo
+++ b/graphics/mplayer-share/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.13 2002/11/13 15:25:34 wiz Exp $
+$NetBSD: distinfo,v 1.14 2002/12/06 14:21:46 wiz Exp $
 
 SHA1 (mplayer/MPlayer-0.90pre10.tar.bz2) = 4b53eef9c2b2ad461ae6648dc76651b21a2079e7
 Size (mplayer/MPlayer-0.90pre10.tar.bz2) = 2855776 bytes
-SHA1 (mplayer/mp-arial-iso-8859-1.zip) = 535809c2745d5dfa79d1243cbe225ee030e626ac
-Size (mplayer/mp-arial-iso-8859-1.zip) = 272659 bytes
-SHA1 (mplayer/mp-arial-iso-8859-2.zip) = a1ef7ea4f4349cd4451052351f7c300597a1b5d3
-Size (mplayer/mp-arial-iso-8859-2.zip) = 255907 bytes
-SHA1 (mplayer/koi8r-font.tar.bz2) = d8f44c101aaae32b5674c16da3549f5e520c077e
-Size (mplayer/koi8r-font.tar.bz2) = 68817 bytes
+SHA1 (mplayer/font-arial-iso-8859-1.tar.bz2) = cec0cad6145382dd15c801f9c6e9cda1ab71b1ed
+Size (mplayer/font-arial-iso-8859-1.tar.bz2) = 234810 bytes
+SHA1 (mplayer/font-arial-iso-8859-2.tar.bz2) = 12c05c32f64818378a32699bea0f5d3aa1551afa
+Size (mplayer/font-arial-iso-8859-2.tar.bz2) = 222677 bytes
+SHA1 (mplayer/font-arial-cp1250.tar.bz2) = 7b11d721e348a53abf9656f3ade61d0b99e2e7db
+Size (mplayer/font-arial-cp1250.tar.bz2) = 490101 bytes
 SHA1 (patch-aa) = 9b4e0940ce1b091dad068a5b87e0b7857914fa45
 SHA1 (patch-ab) = e36a37c5d011319e0b02f30487ecf489f067f13d
 SHA1 (patch-ad) = 2ed6583fb2b7825d6207722815da514bbbe83a12