[ttf-free-comic-font->ttf-open-comic-font]: rebulid

the upstream name is 'open-comic-font'
the FSDG does not require software names to be changed

5 files changed, 41 insertions, 76 deletions

diff --git a/pcr/ttf-free-comic-font/PKGBUILD b/pcr/ttf-free-comic-font/PKGBUILD
deleted file mode 100644
index 8047e7cdd..000000000
--- a/pcr/ttf-free-comic-font/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Márcio Silva <coadde@hyperbola.info>
-
-pkgname=ttf-free-comic-font
-pkgver=0.03.2
-pkgrel=1.1
-url='https://github.com/arthursucks/opencomicfont'
-pkgdesc='Free Comic Font'
-license=('LGPL3' 'BSD-3' 'CCPL:by-3')
-arch=('any')
-depends=('fontconfig' 'xorg-font-utils')
-makedepends=('fontforge')
-provides=('ttf-font')
-source=("$url/raw/master/version_${pkgver}_source.tar.gz" 'makefont.pe')
-sha256sums=('c3356d1755f898df031dc21e48c673bfe94f257f0aa296cc44fa696be0ce9798'
-            '294da954e6628944ec731a99b542ba3c3e2d79eec4c0bc59fa3075d9cfc9b326')
-
-install=install
-
-prepare() {
-	cd "$srcdir"
-	rm OpenComicFont.ttf
-	mv {Open,Free}ComicFont.sfd
-	sed -i 's|Open|Free|
-	       ' FreeComicFont.sfd
-}
-
-build() {
-	cd "$srcdir"
-	./makefont.pe FreeComicFont.sfd
-}
-
-package() {
-	cd "$srcdir"
-
-	install -dm755 "${pkgdir}"/usr/share/fonts/TTF
-	install -m644 *.ttf "${pkgdir}"/usr/share/fonts/TTF
-
-	install -Dm644 README.txt "${pkgdir}"/usr/share/licenses/"${pkgname}"/README
-}
diff --git a/pcr/ttf-free-comic-font/install b/pcr/ttf-free-comic-font/install
deleted file mode 100644
index b945821e7..000000000
--- a/pcr/ttf-free-comic-font/install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	fc-cache -s
-	mkfontscale usr/share/fonts/TTF
-	mkfontdir usr/share/fonts/TTF
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/pcr/ttf-free-comic-font/makefont.pe b/pcr/ttf-free-comic-font/makefont.pe
deleted file mode 100755
index b36b11603..000000000
--- a/pcr/ttf-free-comic-font/makefont.pe
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/fontforge
-
-# Generate font script.
-# Copyright (C) 2015  Márcio Alexandre Silva Delgado <coadde@parabola.nu>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-i=1
-while ( i<$argc )
-  Open($argv[i])
-  Generate($argv[i]:r + ".ttf")
-  i = i+1
-endloop
diff --git a/pcr/ttf-open-comic-font/PKGBUILD b/pcr/ttf-open-comic-font/PKGBUILD
new file mode 100644
index 000000000..6c3162fc4
--- /dev/null
+++ b/pcr/ttf-open-comic-font/PKGBUILD
@@ -0,0 +1,31 @@
+# Contributor: Márcio Silva <coadde@hyperbola.info>
+# Contributor: bill-auger <bill-auger@programmer.net>
+
+
+pkgname=ttf-open-comic-font
+pkgver=0.03.2
+pkgrel=2
+pkgdesc="comic book style font"
+arch=('any')
+url=https://github.com/arthursucks/opencomicfont
+license=('custom:BSD3' 'CCPL' 'LGPL3')
+
+depends=(fontconfig xorg-mkfontdir xorg-mkfontscale)
+provides=('ttf-font')
+install=${pkgname}.install
+source=(https://github.com/arthursucks/opencomicfont/raw/master/version_${pkgver}_source.tar.gz)
+
+sha256sums=('c3356d1755f898df031dc21e48c673bfe94f257f0aa296cc44fa696be0ce9798')
+
+
+package()
+{
+  cd "$srcdir"/
+
+  install -dm755             "${pkgdir}"/usr/share/fonts/TTF
+  install -m644 *.ttf        "${pkgdir}"/usr/share/fonts/TTF/
+
+  install -dm755             "${pkgdir}"/usr/share/licenses/${pkgname}
+  install -m644 lgpl-3.0.txt "${pkgdir}"/usr/share/licenses/${pkgname}/lgpl-3.0.txt
+  install -m644 README.txt   "${pkgdir}"/usr/share/licenses/${pkgname}/COPYING
+}
diff --git a/pcr/ttf-open-comic-font/ttf-open-comic-font.install b/pcr/ttf-open-comic-font/ttf-open-comic-font.install
new file mode 100644
index 000000000..08c4cb60b
--- /dev/null
+++ b/pcr/ttf-open-comic-font/ttf-open-comic-font.install
@@ -0,0 +1,10 @@
+post_install()
+{
+  fc-cache -s &> /dev/null
+  mkfontscale usr/share/fonts/TTF
+  mkfontdir   usr/share/fonts/TTF
+}
+
+post_upgrade() { post_install ; }
+
+pret_remove() { post_install ; }