font distfiles changed (directory layout changed, runme scripts deleted)

bump pkgrevision

3 files changed, 40 insertions, 82 deletions

diff --git a/graphics/mplayer-share/Makefile b/graphics/mplayer-share/Makefile
index a897acdd79c..dcfbfef6866 100644
--- a/graphics/mplayer-share/Makefile
+++ b/graphics/mplayer-share/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2003/07/13 13:52:12 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2003/07/20 20:15:02 dillo Exp $
 
 .include "Makefile.common"
 
 PKGNAME=	mplayer-share-${MPLAYER_PKG_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 COMMENT=	Documentation and fonts used by mplayer and gmplayer
 
 NO_BUILD=	YES
@@ -12,11 +12,7 @@ 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_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
+FONT_DIRS=	font-arial-cp1250 font-arial-iso-8859-1 font-arial-iso-8859-2
 
 .for font in ${MP_FONTS}
 SITES_${font}=	http://www2.mplayerhq.hu/MPlayer/releases/fonts/ \
@@ -35,7 +31,10 @@ do-install:
 	${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
-	cd ${WRKDIR}; ${PAX} -rw ${FONT_FILES} ${PREFIX}/share/mplayer/fonts
+	for D in ${FONT_DIRS}; do \
+		(cd ${WRKDIR}/$$D && \
+			${PAX} -rw * ${PREFIX}/share/mplayer/fonts); \
+	done
 	${LN} -s ${PREFIX}/share/mplayer/fonts/font-arial-18-iso-8859-1 \
 		${PREFIX}/share/mplayer/font
 
diff --git a/graphics/mplayer-share/PLIST b/graphics/mplayer-share/PLIST
index 4b4cd78a29d..fc1252e07d6 100644
--- a/graphics/mplayer-share/PLIST
+++ b/graphics/mplayer-share/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2003/04/09 14:57:32 drochner Exp $
+@comment $NetBSD: PLIST,v 1.12 2003/07/20 20:15:02 dillo Exp $
 man/man1/mplayer.1
 share/mplayer/DOCS/Chinese/bugreports.html
 share/mplayer/DOCS/Chinese/cd-dvd.html
@@ -123,123 +123,82 @@ share/mplayer/DOCS/users_against_developers.html
 share/mplayer/DOCS/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/cp1250/README
-share/mplayer/fonts/cp1250/arial-14/cp1250-a.raw
-share/mplayer/fonts/cp1250/arial-14/cp1250-b.raw
-share/mplayer/fonts/cp1250/arial-14/font.desc
-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-14/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/font.desc
-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-16/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/font.desc
-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-18/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/font.desc
-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-20/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/font.desc
-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-22/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/font.desc
-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-24/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/font.desc
-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-26/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/font.desc
-share/mplayer/fonts/cp1250/arial-28/osd-mplayer-a.raw
-share/mplayer/fonts/cp1250/arial-28/osd-mplayer-b.raw
-share/mplayer/fonts/cp1250/arial-28/runme
+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-1/runme
 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-14-iso-8859-2/runme
+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-1/runme
 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-18-iso-8859-2/runme
+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-1/runme
 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-24-iso-8859-2/runme
+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-1/runme
 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/fonts/font-arial-28-iso-8859-2/runme
 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/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/font-arial-14-cp1250
 @dirrm share/mplayer/fonts
 @dirrm share/mplayer/DOCS/tech/realcodecs
 @dirrm share/mplayer/DOCS/tech
diff --git a/graphics/mplayer-share/distinfo b/graphics/mplayer-share/distinfo
index 512bebacc3e..aadef0ffa16 100644
--- a/graphics/mplayer-share/distinfo
+++ b/graphics/mplayer-share/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.24 2003/05/25 07:12:54 dan Exp $
+$NetBSD: distinfo,v 1.25 2003/07/20 20:15:02 dillo Exp $
 
 SHA1 (mplayer/MPlayer-0.90.tar.bz2) = 01be27d68a250be814af5f090e8a217c1f4838a8
 Size (mplayer/MPlayer-0.90.tar.bz2) = 3436463 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 (mplayer/font-arial-iso-8859-1.tar.bz2) = 152c40bf20de34aa8802d7f80d34d673b0b67212
+Size (mplayer/font-arial-iso-8859-1.tar.bz2) = 234242 bytes
+SHA1 (mplayer/font-arial-iso-8859-2.tar.bz2) = 7b99bbe0e9ba89a57eccbea8f93c453c4f268181
+Size (mplayer/font-arial-iso-8859-2.tar.bz2) = 222208 bytes
+SHA1 (mplayer/font-arial-cp1250.tar.bz2) = ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68
+Size (mplayer/font-arial-cp1250.tar.bz2) = 249705 bytes
 SHA1 (patch-aa) = 6938dbdccb9b760dadad304f3bf61245e8b1baa6
 SHA1 (patch-ab) = f2fd9006914a7d1bac364be74ca5d7cb9aab6806
 SHA1 (patch-ac) = 3539a185ff74922f8ce6da3187ca443334fa2d78