4 files changed, 86 insertions, 40 deletions

diff --git a/multimedia/mplayer-fonts/Makefile b/multimedia/mplayer-fonts/Makefile
index 5b0dc8784394..9ee37891226b 100644
--- a/multimedia/mplayer-fonts/Makefile
+++ b/multimedia/mplayer-fonts/Makefile
@@ -6,27 +6,34 @@
 #
 
 PORTNAME=	mplayer-fonts
-PORTVERSION=	0.18
+PORTVERSION=	0.50
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.stud.uni-karlsruhe.de/~uedc/mplayer/
+MASTER_SITES=	http://www.stud.uni-karlsruhe.de/~uedc/mplayer/ \
+		http://www.rrr.de/~riggs/mplayer/
 
 MAINTAINER=	riggs@rrr.de
 
-ONLY_FOR_ARCHS=	i386
 USE_BZIP2=	yes
 NO_BUILD=	yes
 
+FONTDIRS=	cyrillic koi8r-font iso-8859-1/arial-14 \
+		iso-8859-1/arial-18 iso-8859-1/arial-24 \
+		iso-8859-1/arial-28 iso-8859-2/arial-14 \
+		iso-8859-2/arial-18 iso-8859-2/arial-24 \
+		iso-8859-2/arial-28
+
 do-install:
 	@${MKDIR} ${PREFIX}/share/mplayer/fonts
 	@${CHMOD} 0555 ${PREFIX}/share/mplayer/fonts
-	@${MKDIR} ${PREFIX}/share/mplayer/fonts/iso
-	@${CHMOD} 0555 ${PREFIX}/share/mplayer/fonts/iso
-	@${MKDIR} ${PREFIX}/share/mplayer/fonts/cyrillic
-	@${CHMOD} 0555 ${PREFIX}/share/mplayer/fonts/cyrillic
-	@${MKDIR} ${PREFIX}/share/mplayer/fonts/koi8r
-	@${CHMOD} 0555 ${PREFIX}/share/mplayer/fonts/koi8r
-	@${INSTALL_DATA} ${WRKDIR}/iso/* ${PREFIX}/share/mplayer/fonts/iso
-	@${INSTALL_DATA} ${WRKDIR}/cyrillic/* ${PREFIX}/share/mplayer/fonts/cyrillic
-	@${INSTALL_DATA} ${WRKDIR}/koi8r/* ${PREFIX}/share/mplayer/fonts/koi8r/
+.for dir in iso-8859-1 iso-8859-2
+	@${MKDIR} ${PREFIX}/share/mplayer/fonts/${dir}
+	@${CHMOD} 0555 ${PREFIX}/share/mplayer/fonts/${dir}
+.endfor
+.for dir in ${FONTDIRS}
+	@${MKDIR} ${PREFIX}/share/mplayer/fonts/${dir}
+	@${CHMOD} 0555 ${PREFIX}/share/mplayer/fonts/${dir}
+	@${INSTALL_DATA} ${WRKDIR}/${dir}/* \
+		${PREFIX}/share/mplayer/fonts/${dir}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/multimedia/mplayer-fonts/distinfo b/multimedia/mplayer-fonts/distinfo
index b89218ab770c..de1b08d9bb32 100644
--- a/multimedia/mplayer-fonts/distinfo
+++ b/multimedia/mplayer-fonts/distinfo
@@ -1 +1 @@
-MD5 (mplayer-fonts-0.18.tar.bz2) = 918f2c6255b22b45ff9ed56d397bd20d
+MD5 (mplayer-fonts-0.50.tar.bz2) = 5651a42266ef82de1feace9791d8d5b0
diff --git a/multimedia/mplayer-fonts/pkg-descr b/multimedia/mplayer-fonts/pkg-descr
index 43a7e5d48b2f..feee9477d6b7 100644
--- a/multimedia/mplayer-fonts/pkg-descr
+++ b/multimedia/mplayer-fonts/pkg-descr
@@ -1,14 +1,14 @@
 This is the port which contains the superset of
-the fonts for the mplay on screen display and
+the fonts for the mplayer on-screen display and
 the sub title.
 
 In this stage it supports the following charsets:
 
-ISO for dutch, french, german, hungarian, italian
-    and portugese
+ISO-8859-1 (arial) in 4 sizes
+ISO-8859-2 (arial) in 4 sizes
 
 cyrillic
 
 russian (koi8r)
 
-WWW: http://mplayer.sourceforge.net
+WWW: http://www.mplayerhq.hu/
diff --git a/multimedia/mplayer-fonts/pkg-plist b/multimedia/mplayer-fonts/pkg-plist
index 21261a71ae1e..404ecbb155b0 100644
--- a/multimedia/mplayer-fonts/pkg-plist
+++ b/multimedia/mplayer-fonts/pkg-plist
@@ -1,31 +1,70 @@
-share/mplayer/fonts/iso/README
-share/mplayer/fonts/iso/arial-12-00_a.raw
-share/mplayer/fonts/iso/arial-12-00_b.raw
-share/mplayer/fonts/iso/arial-12.desc
-share/mplayer/fonts/iso/arial-16-00_a.raw
-share/mplayer/fonts/iso/arial-16-00_b.raw
-share/mplayer/fonts/iso/arial-16.desc
-share/mplayer/fonts/iso/arialbd-12-00_a.raw
-share/mplayer/fonts/iso/arialbd-12-00_b.raw
-share/mplayer/fonts/iso/arialbd-12.desc
-share/mplayer/fonts/iso/arialbd-16-00_a.raw
-share/mplayer/fonts/iso/arialbd-16-00_b.raw
-share/mplayer/fonts/iso/arialbd-16.desc
-share/mplayer/fonts/iso/arpi_osd_a.raw
-share/mplayer/fonts/iso/arpi_osd_b.raw
-share/mplayer/fonts/iso/arpi_progress_a.raw
-share/mplayer/fonts/iso/arpi_progress_b.raw
-share/mplayer/fonts/iso/font.desc
 share/mplayer/fonts/cyrillic/bgfont_a.raw
 share/mplayer/fonts/cyrillic/bgfont_b.raw
 share/mplayer/fonts/cyrillic/font.desc
 share/mplayer/fonts/cyrillic/font.desc.koi8-r
 share/mplayer/fonts/cyrillic/test.sub
-share/mplayer/fonts/koi8r/font.desc
-share/mplayer/fonts/koi8r/koi8-r-a.raw
-share/mplayer/fonts/koi8r/koi8-r-b.raw
-@dirrm share/mplayer/fonts/iso
+share/mplayer/fonts/iso-8859-1/arial-14/font.desc
+share/mplayer/fonts/iso-8859-1/arial-14/iso-8859-1-a.raw
+share/mplayer/fonts/iso-8859-1/arial-14/iso-8859-1-b.raw
+share/mplayer/fonts/iso-8859-1/arial-14/osd-mplayer-a.raw
+share/mplayer/fonts/iso-8859-1/arial-14/osd-mplayer-b.raw
+share/mplayer/fonts/iso-8859-1/arial-14/runme
+share/mplayer/fonts/iso-8859-1/arial-18/font.desc
+share/mplayer/fonts/iso-8859-1/arial-18/iso-8859-1-a.raw
+share/mplayer/fonts/iso-8859-1/arial-18/iso-8859-1-b.raw
+share/mplayer/fonts/iso-8859-1/arial-18/osd-mplayer-a.raw
+share/mplayer/fonts/iso-8859-1/arial-18/osd-mplayer-b.raw
+share/mplayer/fonts/iso-8859-1/arial-18/runme
+share/mplayer/fonts/iso-8859-1/arial-24/font.desc
+share/mplayer/fonts/iso-8859-1/arial-24/iso-8859-1-a.raw
+share/mplayer/fonts/iso-8859-1/arial-24/iso-8859-1-b.raw
+share/mplayer/fonts/iso-8859-1/arial-24/osd-mplayer-a.raw
+share/mplayer/fonts/iso-8859-1/arial-24/osd-mplayer-b.raw
+share/mplayer/fonts/iso-8859-1/arial-24/runme
+share/mplayer/fonts/iso-8859-1/arial-28/font.desc
+share/mplayer/fonts/iso-8859-1/arial-28/iso-8859-1-a.raw
+share/mplayer/fonts/iso-8859-1/arial-28/iso-8859-1-b.raw
+share/mplayer/fonts/iso-8859-1/arial-28/osd-mplayer-a.raw
+share/mplayer/fonts/iso-8859-1/arial-28/osd-mplayer-b.raw
+share/mplayer/fonts/iso-8859-1/arial-28/runme
+share/mplayer/fonts/iso-8859-2/arial-14/font.desc
+share/mplayer/fonts/iso-8859-2/arial-14/iso-8859-2-a.raw
+share/mplayer/fonts/iso-8859-2/arial-14/iso-8859-2-b.raw
+share/mplayer/fonts/iso-8859-2/arial-14/osd-mplayer-a.raw
+share/mplayer/fonts/iso-8859-2/arial-14/osd-mplayer-b.raw
+share/mplayer/fonts/iso-8859-2/arial-14/runme
+share/mplayer/fonts/iso-8859-2/arial-18/font.desc
+share/mplayer/fonts/iso-8859-2/arial-18/iso-8859-2-a.raw
+share/mplayer/fonts/iso-8859-2/arial-18/iso-8859-2-b.raw
+share/mplayer/fonts/iso-8859-2/arial-18/osd-mplayer-a.raw
+share/mplayer/fonts/iso-8859-2/arial-18/osd-mplayer-b.raw
+share/mplayer/fonts/iso-8859-2/arial-18/runme
+share/mplayer/fonts/iso-8859-2/arial-24/font.desc
+share/mplayer/fonts/iso-8859-2/arial-24/iso-8859-2-a.raw
+share/mplayer/fonts/iso-8859-2/arial-24/iso-8859-2-b.raw
+share/mplayer/fonts/iso-8859-2/arial-24/osd-mplayer-a.raw
+share/mplayer/fonts/iso-8859-2/arial-24/osd-mplayer-b.raw
+share/mplayer/fonts/iso-8859-2/arial-24/runme
+share/mplayer/fonts/iso-8859-2/arial-28/font.desc
+share/mplayer/fonts/iso-8859-2/arial-28/iso-8859-2-a.raw
+share/mplayer/fonts/iso-8859-2/arial-28/iso-8859-2-b.raw
+share/mplayer/fonts/iso-8859-2/arial-28/osd-mplayer-a.raw
+share/mplayer/fonts/iso-8859-2/arial-28/osd-mplayer-b.raw
+share/mplayer/fonts/iso-8859-2/arial-28/runme
+share/mplayer/fonts/koi8r-font/font.desc
+share/mplayer/fonts/koi8r-font/koi8-r-a.raw
+share/mplayer/fonts/koi8r-font/koi8-r-b.raw
+@dirrm share/mplayer/fonts/koi8r-font
+@dirrm share/mplayer/fonts/iso-8859-2/arial-28
+@dirrm share/mplayer/fonts/iso-8859-2/arial-24
+@dirrm share/mplayer/fonts/iso-8859-2/arial-18
+@dirrm share/mplayer/fonts/iso-8859-2/arial-14
+@dirrm share/mplayer/fonts/iso-8859-2
+@dirrm share/mplayer/fonts/iso-8859-1/arial-28
+@dirrm share/mplayer/fonts/iso-8859-1/arial-24
+@dirrm share/mplayer/fonts/iso-8859-1/arial-18
+@dirrm share/mplayer/fonts/iso-8859-1/arial-14
+@dirrm share/mplayer/fonts/iso-8859-1
 @dirrm share/mplayer/fonts/cyrillic
-@dirrm share/mplayer/fonts/koi8r
 @dirrm share/mplayer/fonts
 @dirrm share/mplayer