Update upstream locations, add new fonts from upstream

2 files changed, 91 insertions, 70 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e702f6e9154f..73b8bf06d869 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,55 +1,64 @@
 pkgbase = proggyfonts
 	pkgdesc = A set of fixed-width fonts designed for code listings.
-	pkgver = 0.2
-	pkgrel = 2
-	url = http://upperbounds.net
+	pkgver = 0.3
+	pkgrel = 0
+	url = https://github.com/bluescan/proggyfonts/
 	install = proggyfonts.install
 	arch = any
-	license = custom
+	license = MIT
 	depends = xorg-mkfontdir
 	depends = xorg-mkfontscale
 	depends = fontconfig
 	noextract = Opti.pcf.gz
+	noextract = ProggyClean.ttf
 	noextract = OptiSmall.pcf.gz
 	noextract = WebbyCaps.pcf.gz
+	noextract = WebbySmall.pcf.gz
 	source = proggyfonts.install
-	source = CodingFontTobi.zip::http://upperbounds.net/download/download_bridge.php?get=CodingFontTobi.zip
-	source = Crisp.ttf.zip::http://upperbounds.net/download/download_bridge.php?get=Crisp.ttf.zip
-	source = PixelCarnageMono.ttf.zip::http://upperbounds.net/download/download_bridge.php?get=PixelCarnageMono.ttf.zip
-	source = ProggyClean.ttf.zip::http://upperbounds.net/download/download_bridge.php?get=ProggyClean.ttf.zip
-	source = ProggyCleanCP.pcf.zip::http://upperbounds.net/download/download_bridge.php?get=ProggyCleanCP.pcf.zip
-	source = ProggyCleanSZ.ttf.zip::http://upperbounds.net/download/download_bridge.php?get=ProggyCleanSZ.ttf.zip
-	source = ProggyCleanSZBP.ttf.zip::http://upperbounds.net/download/download_bridge.php?get=ProggyCleanSZBP.ttf.zip
-	source = ProggySmall.ttf.zip::http://upperbounds.net/download/download_bridge.php?get=ProggySmall.ttf.zip
-	source = ProggySquare.ttf.zip::http://upperbounds.net/download/download_bridge.php?get=ProggySquare.ttf.zip
-	source = ProggySquareSZ.ttf.zip::http://upperbounds.net/download/download_bridge.php?get=ProggySquareSZ.ttf.zip
-	source = ProggyTiny.ttf.zip::http://upperbounds.net/download/download_bridge.php?get=ProggyTiny.ttf.zip
-	source = ProggyTinySZ.ttf.zip::http://upperbounds.net/download/download_bridge.php?get=ProggyTinySZ.ttf.zip
-	source = Progsole.bdf.zip::http://upperbounds.net/download/download_bridge.php?get=Progsole.bdf.zip
-	source = SpeedyPCF.zip::http://upperbounds.net/download/download_bridge.php?get=SpeedyPCF.zip
-	source = Opti.pcf.gz::http://upperbounds.net/download/download_bridge.php?get=Opti.pcf.gz
-	source = OptiSmall.pcf.gz::http://upperbounds.net/download/download_bridge.php?get=OptiSmall.pcf.gz
-	source = WebbyCaps.pcf.zip::http://upperbounds.net/download/download_bridge.php?get=WebbyCaps.pcf.zip
-	source = WebbySmall.pcf.zip::http://upperbounds.net/download/download_bridge.php?get=WebbySmall.pcf.zip
+	source = LICENSE::https://github.com/bluescan/proggyfonts/raw/master/LICENSE
+	source = CodingFontTobi.zip::https://github.com/bluescan/proggyfonts/raw/master/Contributed/CodingFontTobi.zip
+	source = Crisp.ttf.zip::https://github.com/bluescan/proggyfonts/raw/master/Contributed/Crisp.ttf.zip
+	source = PixelCarnageMono.ttf.zip::https://github.com/bluescan/proggyfonts/raw/master/Contributed/PixelCarnageMono.ttf.zip
+	source = ProggyClean.ttf::https://github.com/bluescan/proggyfonts/raw/master/ProggyOriginal/ProggyClean.ttf
+	source = ProggyCleanCP.pcf.zip::https://github.com/bluescan/proggyfonts/raw/master/ProggyOriginal/ProggyCleanCP.pcf.gz
+	source = ProggyCleanSZ.ttf::https://github.com/bluescan/proggyfonts/raw/master/ProggyOriginal/ProggyCleanSZ.ttf
+	source = ProggyCleanSZBP.ttf::https://github.com/bluescan/proggyfonts/raw/master/ProggyOriginal/ProggyCleanSZBP.ttf
+	source = ProggySmall.ttf::https://github.com/bluescan/proggyfonts/raw/master/ProggyOriginal/ProggySmall.ttf
+	source = ProggySquare.ttf::https://github.com/bluescan/proggyfonts/raw/master/ProggyOriginal/ProggySquare.ttf
+	source = ProggySquareSZ.ttf::https://github.com/bluescan/proggyfonts/raw/master/ProggyOriginal/ProggySquareSZ.ttf
+	source = ProggyTiny.ttf::https://github.com/bluescan/proggyfonts/raw/master/ProggyOriginal/ProggyTiny.ttf
+	source = ProggyTinySZ.ttf::https://github.com/bluescan/proggyfonts/raw/master/ProggyOriginal/ProggyTinySZ.ttf
+	source = Progsole.bdf.zip::https://github.com/bluescan/proggyfonts/raw/master/Contributed/Progsole.bdf.zip
+	source = SpeedyPCF.zip::https://github.com/bluescan/proggyfonts/raw/master/Contributed/SpeedyPCF.zip
+	source = Opti.pcf.gz::https://github.com/bluescan/proggyfonts/raw/master/Contributed/Opti.pcf.gz
+	source = OptiSmall.pcf.gz::https://github.com/bluescan/proggyfonts/raw/master/Contributed/OptiSmall.pcf.gz
+	source = WebbyCaps.pcf.gz::https://github.com/bluescan/proggyfonts/raw/master/ProggyOriginal/WebbyCaps.pcf.gz
+	source = WebbySmall.pcf.gz::https://github.com/bluescan/proggyfonts/raw/master/ProggyOriginal/WebbySmall.pcf.gz
+	source = ProggyVector Regular.ttf::https://github.com/bluescan/proggyfonts/raw/master/ProggyVector/ProggyVector%20Regular.ttf
+	source = ProggyCrossed Regular.ttf::https://github.com/bluescan/proggyfonts/raw/master/ProggyCrossed/ProggyCrossed%20Regular.ttf
+	source = ProggyDotted Regular.ttf::https://github.com/bluescan/proggyfonts/raw/master/ProggyDotted/ProggyDotted%20Regular.ttf
 	sha256sums = d6642190eb289e690c0685a0d186e87234e268c29a8d176825b9e1df1316b5f0
+	sha256sums = fe61d069df303c697e04200f5f8232c2cb09dd3572f4357b323469f7d592d142
 	sha256sums = dc4a7dee5901205a62fdd2882aef5a151a4573df8046ccdd5487331522ac6030
 	sha256sums = bb078c28383b33ba45d9d804b5e14129cd9898ba2492213d1550aa584167a5c8
 	sha256sums = 6977862535adfba326dc7d78daab749e97c2fabfc7c68d2f9210f209541e7b40
-	sha256sums = 0009f3cd9622966c0bc81d61b14ada0a54f71b1ec7629e5b0f97cf2a44ff33c7
-	sha256sums = 2ada907b8422a98c75ecaf1678ba73b31922434f32fab9b1996607e3abaf1d1c
-	sha256sums = 063400d14c91adfa1e885fb1aeee1dac9a839ce4dd39b5f676bd7466b7af7e4b
-	sha256sums = 3c6d71e0fcf1e7ab7d9fde576750159dc3c93fca8147367fe00417d9766652a3
-	sha256sums = 9b0009d2aeb50cbbaff9e7a5b06f2632bf12265c1ce315edf76847bc3638cc23
-	sha256sums = 422160f2631ea1ec0ffb58b40a488b0ed4654f55509aedda60567639ab238200
-	sha256sums = 8d48ae4d413e851bb4bf7ae1b7ec5328dcabdfc2c48d79de4e48bd4b54be09f4
-	sha256sums = 9c9877f0b91fa63091da4188778fe9e45a6ed679e6f6d45db23281bb26a9ea55
-	sha256sums = 71c1cafbf4912524d4e304652c22f7cf2825fe1b5f877f94a551d6e15b2eb4e8
+	sha256sums = 527d2a443ce051f93f7e77b855609722b8cb220a9f104b4aa037be5c90b71324
+	sha256sums = 8bc6b1e74b766e16a169a5c4b372f2615f3d22423e7410cd5f97c6146b041472
+	sha256sums = 685d0b160f1e8b1a31e1c0765e7307da4b10c36458a4111d71cf2e9ce56df57a
+	sha256sums = 35638c90ab8d355346d477305a026d829ddb63e5defe7a07ea44c4093cdef9f3
+	sha256sums = 1e05337a3a5a9b79a07d120c16a37e689304914344282af302400b56fee42c61
+	sha256sums = fb225bb94459bae14eeff4a953f549e0312bb0d396d1794cacd9d1483db12cef
+	sha256sums = dd06ddb2e2effb00a8df643c165743d0867ea5a1546c9b20dfd8d7bcce6240f8
+	sha256sums = 79bf8d3896ba83ae2f9c4fa214dce8fc689eae47950474947a4cc5c6e14a9bfc
+	sha256sums = 6ce838555836f1193c41af29c1d5ee7c9da3c3d3369cd3ae339848c9255ef607
 	sha256sums = c6f2c19bcb8554a7a0135aa1ba29341c9c58519aa26a933b9463cef2fd6be294
 	sha256sums = c76f4febe5bce846d3eabd0bc2932edf10b677078960148a4eb35cf5d9f98c57
 	sha256sums = 3ff812820cf61253a75e5fd990ef66f6069cce1b92ec536c51d40d8bc057108f
 	sha256sums = 88926010ab36cbc52ab66af56843b69cebb1ba475ffc2372d6e4d03559a130ee
-	sha256sums = c0dc6c6785d71beac53b87fe8ff4f620d990bd3316943756bca988587a7c003a
-	sha256sums = e06a85c2100f40c47cf58e4d82dfaffe5917baaace3962e3495fa8de021002d0
+	sha256sums = dccad12fbfca45fdccac745dc842919c29d880ca3fb260fb56b797bc76729012
+	sha256sums = af782e04e31c75098ca5e97f4cfdae247d966278573b50fa575b6f8a73110e6a
+	sha256sums = ca2856c75827f19cc52cad1e58835a4b854728005d81d4a2abf6e8ac9d3755ea
+	sha256sums = d5fc9bb440a454db73a1f232b0f803a8ebefdd09713243505a75ecfec6a5ff44
+	sha256sums = 2ab1197f7ce92ec744dfdb492c179b95fc746cb562307286f88d6be364a7011e
 
 pkgname = proggyfonts
-
diff --git a/PKGBUILD b/PKGBUILD
index a2d14d66ac96..b2fb5765adca 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,6 @@
-# Maintainer: Tyler Langlois <ty |at| tjll |dot| net>
+# Maintainer: Mike Javorski (javmorin) <mike.javorski@gmail.com>
+# Maintainer: Akita Noek <akitanoek@gmail.com>
+# Contributor: Tyler Langlois <ty |at| tjll |dot| net>
 # Contributor: David Arroyo <david.a.arroyo@gmail.com
 # Contributor: William Giokas <1007380@gmail.com>
 
@@ -7,55 +9,65 @@
 # Windows-compatible only and are excluded from this package.
 
 pkgname=proggyfonts
-pkgver=0.2
-pkgrel=2
+pkgver=0.3
+pkgrel=0
 arch=('any')
 pkgdesc='A set of fixed-width fonts designed for code listings.'
-url='http://upperbounds.net'
-license=('custom')
+url='https://github.com/bluescan/proggyfonts/'
+license=('MIT')
 depends=('xorg-mkfontdir' 'xorg-mkfontscale' 'fontconfig')
 install="$pkgname.install"
 source=("$pkgname.install"
-        "CodingFontTobi.zip::http://upperbounds.net/download/download_bridge.php?get=CodingFontTobi.zip"
-        "Crisp.ttf.zip::http://upperbounds.net/download/download_bridge.php?get=Crisp.ttf.zip"
-        "PixelCarnageMono.ttf.zip::http://upperbounds.net/download/download_bridge.php?get=PixelCarnageMono.ttf.zip"
-        "ProggyClean.ttf.zip::http://upperbounds.net/download/download_bridge.php?get=ProggyClean.ttf.zip"
-        "ProggyCleanCP.pcf.zip::http://upperbounds.net/download/download_bridge.php?get=ProggyCleanCP.pcf.zip"
-        "ProggyCleanSZ.ttf.zip::http://upperbounds.net/download/download_bridge.php?get=ProggyCleanSZ.ttf.zip"
-        "ProggyCleanSZBP.ttf.zip::http://upperbounds.net/download/download_bridge.php?get=ProggyCleanSZBP.ttf.zip"
-        "ProggySmall.ttf.zip::http://upperbounds.net/download/download_bridge.php?get=ProggySmall.ttf.zip"
-        "ProggySquare.ttf.zip::http://upperbounds.net/download/download_bridge.php?get=ProggySquare.ttf.zip"
-        "ProggySquareSZ.ttf.zip::http://upperbounds.net/download/download_bridge.php?get=ProggySquareSZ.ttf.zip"
-        "ProggyTiny.ttf.zip::http://upperbounds.net/download/download_bridge.php?get=ProggyTiny.ttf.zip"
-        "ProggyTinySZ.ttf.zip::http://upperbounds.net/download/download_bridge.php?get=ProggyTinySZ.ttf.zip"
-        "Progsole.bdf.zip::http://upperbounds.net/download/download_bridge.php?get=Progsole.bdf.zip"
-        "SpeedyPCF.zip::http://upperbounds.net/download/download_bridge.php?get=SpeedyPCF.zip"
-        "Opti.pcf.gz::http://upperbounds.net/download/download_bridge.php?get=Opti.pcf.gz"
-        "OptiSmall.pcf.gz::http://upperbounds.net/download/download_bridge.php?get=OptiSmall.pcf.gz"
-        "WebbyCaps.pcf.zip::http://upperbounds.net/download/download_bridge.php?get=WebbyCaps.pcf.zip"
-        "WebbySmall.pcf.zip::http://upperbounds.net/download/download_bridge.php?get=WebbySmall.pcf.zip")
+        "LICENSE::https://github.com/bluescan/proggyfonts/raw/master/LICENSE"
+        "CodingFontTobi.zip::https://github.com/bluescan/proggyfonts/raw/master/Contributed/CodingFontTobi.zip"
+        "Crisp.ttf.zip::https://github.com/bluescan/proggyfonts/raw/master/Contributed/Crisp.ttf.zip"
+        "PixelCarnageMono.ttf.zip::https://github.com/bluescan/proggyfonts/raw/master/Contributed/PixelCarnageMono.ttf.zip"
+        "ProggyClean.ttf::https://github.com/bluescan/proggyfonts/raw/master/ProggyOriginal/ProggyClean.ttf"
+        "ProggyCleanCP.pcf.zip::https://github.com/bluescan/proggyfonts/raw/master/ProggyOriginal/ProggyCleanCP.pcf.gz"
+        "ProggyCleanSZ.ttf::https://github.com/bluescan/proggyfonts/raw/master/ProggyOriginal/ProggyCleanSZ.ttf"
+        "ProggyCleanSZBP.ttf::https://github.com/bluescan/proggyfonts/raw/master/ProggyOriginal/ProggyCleanSZBP.ttf"
+        "ProggySmall.ttf::https://github.com/bluescan/proggyfonts/raw/master/ProggyOriginal/ProggySmall.ttf"
+        "ProggySquare.ttf::https://github.com/bluescan/proggyfonts/raw/master/ProggyOriginal/ProggySquare.ttf"
+        "ProggySquareSZ.ttf::https://github.com/bluescan/proggyfonts/raw/master/ProggyOriginal/ProggySquareSZ.ttf"
+        "ProggyTiny.ttf::https://github.com/bluescan/proggyfonts/raw/master/ProggyOriginal/ProggyTiny.ttf"
+        "ProggyTinySZ.ttf::https://github.com/bluescan/proggyfonts/raw/master/ProggyOriginal/ProggyTinySZ.ttf"
+        "Progsole.bdf.zip::https://github.com/bluescan/proggyfonts/raw/master/Contributed/Progsole.bdf.zip"
+        "SpeedyPCF.zip::https://github.com/bluescan/proggyfonts/raw/master/Contributed/SpeedyPCF.zip"
+        "Opti.pcf.gz::https://github.com/bluescan/proggyfonts/raw/master/Contributed/Opti.pcf.gz"
+        "OptiSmall.pcf.gz::https://github.com/bluescan/proggyfonts/raw/master/Contributed/OptiSmall.pcf.gz"
+        "WebbyCaps.pcf.gz::https://github.com/bluescan/proggyfonts/raw/master/ProggyOriginal/WebbyCaps.pcf.gz"
+        "WebbySmall.pcf.gz::https://github.com/bluescan/proggyfonts/raw/master/ProggyOriginal/WebbySmall.pcf.gz"
+        "ProggyVector Regular.ttf::https://github.com/bluescan/proggyfonts/raw/master/ProggyVector/ProggyVector%20Regular.ttf"
+        "ProggyCrossed Regular.ttf::https://github.com/bluescan/proggyfonts/raw/master/ProggyCrossed/ProggyCrossed%20Regular.ttf"
+        "ProggyDotted Regular.ttf::https://github.com/bluescan/proggyfonts/raw/master/ProggyDotted/ProggyDotted%20Regular.ttf")
 noextract=('Opti.pcf.gz'
+           'ProggyClean.ttf'
            'OptiSmall.pcf.gz'
-           'WebbyCaps.pcf.gz')
+           'WebbyCaps.pcf.gz'
+           'WebbySmall.pcf.gz')
 sha256sums=('d6642190eb289e690c0685a0d186e87234e268c29a8d176825b9e1df1316b5f0'
+            'fe61d069df303c697e04200f5f8232c2cb09dd3572f4357b323469f7d592d142'
             'dc4a7dee5901205a62fdd2882aef5a151a4573df8046ccdd5487331522ac6030'
             'bb078c28383b33ba45d9d804b5e14129cd9898ba2492213d1550aa584167a5c8'
             '6977862535adfba326dc7d78daab749e97c2fabfc7c68d2f9210f209541e7b40'
-            '0009f3cd9622966c0bc81d61b14ada0a54f71b1ec7629e5b0f97cf2a44ff33c7'
-            '2ada907b8422a98c75ecaf1678ba73b31922434f32fab9b1996607e3abaf1d1c'
-            '063400d14c91adfa1e885fb1aeee1dac9a839ce4dd39b5f676bd7466b7af7e4b'
-            '3c6d71e0fcf1e7ab7d9fde576750159dc3c93fca8147367fe00417d9766652a3'
-            '9b0009d2aeb50cbbaff9e7a5b06f2632bf12265c1ce315edf76847bc3638cc23'
-            '422160f2631ea1ec0ffb58b40a488b0ed4654f55509aedda60567639ab238200'
-            '8d48ae4d413e851bb4bf7ae1b7ec5328dcabdfc2c48d79de4e48bd4b54be09f4'
-            '9c9877f0b91fa63091da4188778fe9e45a6ed679e6f6d45db23281bb26a9ea55'
-            '71c1cafbf4912524d4e304652c22f7cf2825fe1b5f877f94a551d6e15b2eb4e8'
+            '527d2a443ce051f93f7e77b855609722b8cb220a9f104b4aa037be5c90b71324'
+            '8bc6b1e74b766e16a169a5c4b372f2615f3d22423e7410cd5f97c6146b041472'
+            '685d0b160f1e8b1a31e1c0765e7307da4b10c36458a4111d71cf2e9ce56df57a'
+            '35638c90ab8d355346d477305a026d829ddb63e5defe7a07ea44c4093cdef9f3'
+            '1e05337a3a5a9b79a07d120c16a37e689304914344282af302400b56fee42c61'
+            'fb225bb94459bae14eeff4a953f549e0312bb0d396d1794cacd9d1483db12cef'
+            'dd06ddb2e2effb00a8df643c165743d0867ea5a1546c9b20dfd8d7bcce6240f8'
+            '79bf8d3896ba83ae2f9c4fa214dce8fc689eae47950474947a4cc5c6e14a9bfc'
+            '6ce838555836f1193c41af29c1d5ee7c9da3c3d3369cd3ae339848c9255ef607'
             'c6f2c19bcb8554a7a0135aa1ba29341c9c58519aa26a933b9463cef2fd6be294'
             'c76f4febe5bce846d3eabd0bc2932edf10b677078960148a4eb35cf5d9f98c57'
             '3ff812820cf61253a75e5fd990ef66f6069cce1b92ec536c51d40d8bc057108f'
             '88926010ab36cbc52ab66af56843b69cebb1ba475ffc2372d6e4d03559a130ee'
-            'c0dc6c6785d71beac53b87fe8ff4f620d990bd3316943756bca988587a7c003a'
-            'e06a85c2100f40c47cf58e4d82dfaffe5917baaace3962e3495fa8de021002d0')
+            'dccad12fbfca45fdccac745dc842919c29d880ca3fb260fb56b797bc76729012'
+            'af782e04e31c75098ca5e97f4cfdae247d966278573b50fa575b6f8a73110e6a'
+            'ca2856c75827f19cc52cad1e58835a4b854728005d81d4a2abf6e8ac9d3755ea'
+            'd5fc9bb440a454db73a1f232b0f803a8ebefdd09713243505a75ecfec6a5ff44'
+            '2ab1197f7ce92ec744dfdb492c179b95fc746cb562307286f88d6be364a7011e')
 
 package() {
   mkdir -p "$pkgdir/usr/share/fonts/"{misc,TTF}
@@ -64,6 +76,6 @@ package() {
   install -m644 *.bdf    "$pkgdir/usr/share/fonts/misc"
   install -m644 *.ttf    "$pkgdir/usr/share/fonts/TTF"
 
-  install -D -m644  Licence.txt \
+  install -D -m644  LICENSE \
                     "$pkgdir/usr/share/licenses/proggyfonts/LICENSE"
 }