xorg-font-msttcorefonts: picked up orphand port

2 files changed, 28 insertions, 25 deletions

diff --git a/xorg-font-msttcorefonts/.md5sum b/xorg-font-msttcorefonts/.md5sum
index ff30dff16..9b5259ba8 100644
--- a/xorg-font-msttcorefonts/.md5sum
+++ b/xorg-font-msttcorefonts/.md5sum
@@ -1,7 +1,6 @@
 cbdc2fdd7d2ed0832795e86a8b9ee19a  andale32.exe
 9637df0e91703179f0723ec095a36cb5  arial32.exe
 c9089ae0c3b3d0d8c4b0a95979bb9ff0  arialb32.exe
-dc421a690648b503265c82ade84e143e  cabextract-1.2.tar.gz
 2b30de40bb5e803a0452c7715fc835d1  comic32.exe
 4e412c772294403ab62fb2d247d85c60  courie32.exe
 4d90016026e2da447593b41a8d8fa8bd  georgi32.exe
@@ -11,3 +10,4 @@ ed39c8ef91b9fb80f76f702568291bd5  times32.exe
 12d2a75f8156e10607be1eaa8e8ef120  verdan32.exe
 efa72d3ed0120a07326ce02f051e9b42  wd97vwr32.exe
 230a1d13a365b22815f502eb24d9149b  webdin32.exe
+230a1d13a365b22815f502eb24d9149b  webdin32.exe
diff --git a/xorg-font-msttcorefonts/Pkgfile b/xorg-font-msttcorefonts/Pkgfile
index 0b657f9cc..9337a5010 100644
--- a/xorg-font-msttcorefonts/Pkgfile
+++ b/xorg-font-msttcorefonts/Pkgfile
@@ -1,34 +1,37 @@
 # URL: http://corefonts.sourceforge.net/
 # Description: Microsoft's Web Fonts (truetype)
-# Maintainer: Lucas Hazel, lucas at die dot net dot au
+# Maintainer: Danny Rawlins, monster dot romster at gmail dot com
 # Packager: Matt Housh, jaeger at morpheus dot net
-# Depends on: xorg-mkfontdir, xorg-mkfontscale
+# Depends on: xorg-mkfontdir xorg-mkfontscale cabextract
 
 name=xorg-font-msttcorefonts
-version=1.3
+version=1.4
 release=1
-source=(http://www.cabextract.org.uk/cabextract-1.2.tar.gz \
-	http://download.sourceforge.net/corefonts/andale32.exe \
-	http://download.sourceforge.net/corefonts/arial32.exe \
-	http://download.sourceforge.net/corefonts/arialb32.exe \
-	http://download.sourceforge.net/corefonts/comic32.exe \
-	http://download.sourceforge.net/corefonts/courie32.exe \
-	http://download.sourceforge.net/corefonts/georgi32.exe \
-	http://download.sourceforge.net/corefonts/impact32.exe \
-	http://download.sourceforge.net/corefonts/times32.exe \
-	http://download.sourceforge.net/corefonts/trebuc32.exe \
-	http://download.sourceforge.net/corefonts/verdan32.exe \
-	http://download.sourceforge.net/corefonts/wd97vwr32.exe \
-	http://download.sourceforge.net/corefonts/webdin32.exe)
+source=(http://downloads.sourceforge.net/project/corefonts/the%20fonts/final/webdin32.exe
+	http://downloads.sourceforge.net/project/corefonts/the%20fonts/final/andale32.exe
+	http://downloads.sourceforge.net/project/corefonts/the%20fonts/final/arial32.exe
+	http://downloads.sourceforge.net/project/corefonts/the%20fonts/final/arialb32.exe
+	http://downloads.sourceforge.net/project/corefonts/the%20fonts/final/comic32.exe
+	http://downloads.sourceforge.net/project/corefonts/the%20fonts/final/courie32.exe
+	http://downloads.sourceforge.net/project/corefonts/the%20fonts/final/georgi32.exe
+	http://downloads.sourceforge.net/project/corefonts/the%20fonts/final/impact32.exe
+	http://downloads.sourceforge.net/project/corefonts/the%20fonts/final/times32.exe
+	http://downloads.sourceforge.net/project/corefonts/the%20fonts/final/trebuc32.exe
+	http://downloads.sourceforge.net/project/corefonts/the%20fonts/final/verdan32.exe
+	http://downloads.sourceforge.net/project/corefonts/the%20fonts/final/wd97vwr32.exe
+	http://downloads.sourceforge.net/project/corefonts/the%20fonts/final/webdin32.exe)
 
 build() {
-	(cd cabextract-1.2 && ./configure && make)
-	for font in *.exe
-	do
-		cabextract-1.2/cabextract --lowercase $font
+	# Despite the files saying 32, this port will work on any arch
+	local font
+
+	for font in *.exe; do
+		cabextract --lowercase $font
 	done
-	cabextract-1.2/cabextract --lowercase viewer1.cab
-	mkdir -p $PKG/usr/lib/X11/fonts/msttcorefonts
-	install -o root -g root -m 0644 *.ttf \
-		$PKG/usr/lib/X11/fonts/msttcorefonts/
+
+	cabextract --lowercase viewer1.cab
+	install -d $PKG/usr/lib/X11/fonts/msttcorefonts
+
+	install -o root -g root -m 0644 \
+		-t $PKG/usr/lib/X11/fonts/msttcorefonts/ *.ttf
 }