new PKGBUILD and .SRCINFO files for pkgrel 2.0

3 files changed, 108 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 19fa3adc0118..3ea06f79c20f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,11 @@
 pkgbase = ttf-tannenberg
-	pkgdesc = Old WW2 era font used for creating historical documents and artwork
-	pkgver = 1.0.0
-	pkgrel = 1
-	url = http://www.1001fonts.com/tannenberg-font.html
-	install = ttf-tannenberg.install
+	pkgdesc = Tannenberg is a Fraktur-family blackletter typeface, developed in Germany between 1933 and 1935 digitized by Dieter Steffmann.
+	pkgver = 1.002
+	pkgrel = 2.0
+	url = https://github.com/speters33w/tannenberg-font
 	arch = any
-	license = SIL Open Font License v1.1
-	depends = fontconfig
-	depends = xorg-fonts-encodings
-	depends = xorg-mkfontdir
-	depends = xorg-mkfontscale
-	source = https://github.com/Blackbyte-Inc/ttf-tannenberg/raw/master/tannenberg.bold.ttf
-	source = https://github.com/Blackbyte-Inc/ttf-tannenberg/raw/master/tannenberg.contour.ttf
-	source = https://github.com/Blackbyte-Inc/ttf-tannenberg/raw/master/tannenberg.shadow.ttf
-	sha256sums = c4b1a086515ef1b94453523c6133eedeabbd809113dbdddd5e72aae8b99b36cc
-	sha256sums = 020118f0a1f5965a76c7fd5939652b4dd436d495392a59734a58edabe8d2907f
-	sha256sums = ace761c42abe229bf8e0f8234cf17bedbe6f317ec499bcdfd9fd217e0bf78227
+	license = custom:1001Fonts Free For Commercial Use License (FFC)
+	source = https://github.com/speters33w/tannenberg-font/raw/main/tannenberg-font.tar.gz
+	sha256sums = e5261b8ccac3aa18a1f8715f329708164a45816913e86c0da8f8e69aa1fe8a5d
 
 pkgname = ttf-tannenberg
diff --git a/PKGBUILD b/PKGBUILD
index 7e4546534bee..041d9a53a19e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,103 @@
-# Maintainer: Riedler <dev@riedler.wien>
+# Author: Dieter Steffmann (Mediengestaltung) <https://www.1001fonts.com/users/steffmann/>
+# Maintainer: Stephan Peters <speters33w аt gmail dоt cоm>
+# Contributor: Riedler <dev@riedler.wien>
 # Contributor: xNN <xNNism@gmail.com>
 
-pkgname=ttf-tannenberg
-pkgver=1.0.0
-pkgrel=1
-pkgdesc="Old WW2 era font used for creating historical documents and artwork"
-arch=('any')
-url="http://www.1001fonts.com/tannenberg-font.html"
-license=('SIL Open Font License v1.1')
-depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-mkfontdir' 'xorg-mkfontscale')
-install=ttf-tannenberg.install
-source=("https://github.com/Blackbyte-Inc/ttf-tannenberg/raw/master/tannenberg.bold.ttf"
-	"https://github.com/Blackbyte-Inc/ttf-tannenberg/raw/master/tannenberg.contour.ttf"
-	"https://github.com/Blackbyte-Inc/ttf-tannenberg/raw/master/tannenberg.shadow.ttf")
-sha256sums=('c4b1a086515ef1b94453523c6133eedeabbd809113dbdddd5e72aae8b99b36cc'
-	    '020118f0a1f5965a76c7fd5939652b4dd436d495392a59734a58edabe8d2907f'
-	    'ace761c42abe229bf8e0f8234cf17bedbe6f317ec499bcdfd9fd217e0bf78227')
-
-package() {
-  install -dm 755 "${pkgdir}"/usr/share/fonts/TTF
-  install -m 644 *.ttf "${pkgdir}"/usr/share/fonts/TTF/
-}
\ No newline at end of file
+fontname=tannenberg
+
+_include_webfonts=false
+# true to include webfonts with ttf or type1 installation.
+# explicitly installing the webfonts-$fontname package overrides this value to true.
+
+_webfontdir=$HOME/www/fonts
+# Directory for woff and woff2 files.
+# Change to install webfonts in an alternate location, example: "/www/webfonts/.
+
+_pfmdir=/usr/share/fonts/type1/
+# Directory for postscript type 1 .pfm and .pfb files.
+# Change to install in an alternate location, example: "/psfonts/$fontname/"
+
+_afmdir=/usr/share/fonts/type1/
+# Directory for postscript type 1 .afm files.
+# Change to install in an alternate location, example: "/psfonts/$fontname/afm"
+
+# Postscript Type 1 fonts are only installed if explicitly installing the type1-$fontname package.
+# This is a largely obsolete format, and would only be needeed for specialized applications.
+# Only the original files from TypeOasis are installed, this package does not include TeX .tfm files.
+# TeX .tfm files can be generated from the included Type 1 files with a utility.
+
+#pkgname=("ttf-$fontname" "type1-$fontname" "webfonts-$fontname")
+pkgname=("ttf-$fontname")  # use to install a single package locally.
+licensefile="ffc.html"
+pkgver=1.002
+pkgrel=2.0
+# name=""
+pkgdesc="Tannenberg is a Fraktur-family blackletter typeface, developed in Germany between 1933 and 1935 digitized by Dieter Steffmann."
+arch=(any)
+url="https://github.com/speters33w/tannenberg-font"
+license=("custom:1001Fonts Free For Commercial Use License (FFC)") 
+  # This is the current license for Dieter Steffmann's fonts. 
+  # See http://www.steffmann.de/wordpress/test-2/typoasis/ , https://www.1001fonts.com/users/steffmann/ , and https://www.1001fonts.com/tannenberg-font.html .
+depends=()
+makedepends=()
+optdepends=()
+conflicts=()
+source=("https://github.com/speters33w/tannenberg-font/raw/main/tannenberg-font.tar.gz")
+sha256sums=("e5261b8ccac3aa18a1f8715f329708164a45816913e86c0da8f8e69aa1fe8a5d")
+  # Compiled from source files at https://www.1001fonts.com/tannenberg-font.html , http://moorstation.org/typoasis/designers/steffmann/samples/t/tannenbg.htm 
+  # and generated webfonts using https://www.fontsquirrel.com/tools/webfont-generator .
+
+prepare(){
+  bsdtar xvf "$fontname-font.tar.gz"
+}
+
+install_license(){
+  if [ ! -f "/usr/share/licenses/$fontname-font/$licensefile" ] ; then
+    install -Dm644 -t "$pkgdir"/"usr/share/licenses"/"$fontname-font" "$srcdir"/"usr/share/licenses"/"$fontname-font"/*.*
+  fi
+}
+
+install_fonts(){
+  #install -Dm644 -t "$pkgdir"/usr/share/fonts/"$fontname" "$srcdir"/usr/share/fonts/"${1^^}"/*."$1"
+  install -Dm644 -t "$pkgdir"/usr/share/fonts/"${1^^}" "$srcdir"/usr/share/fonts/"${1^^}"/*."$1"
+}
+
+install_postscript(){
+  install -Dm644 -t "$pkgdir"/"$_pfmdir" "$srcdir"/usr/share/fonts/type1/*.pf? 
+  install -Dm644 -t "$pkgdir"/"$_afmdir" "$srcdir"/usr/share/fonts/type1/*.afm 
+}
+
+install_webfonts(){
+  if [ "$_include_webfonts" = true ] ; then
+    mkdir -p "$pkgdir"/"$_webfontdir"
+    if [ ! -f "$_webfontdir"/"$fontname.bold.woff" ] ; then 
+      install -Dm644 -t "$pkgdir"/"$_webfontdir" "$srcdir"/www/fonts/*.woff
+    fi
+    if [ ! -f "$_webfontdir/$fontname.bold.woff2" ] ; then
+      install -Dm644 -t "$pkgdir"/"$_webfontdir" "$srcdir"/www/fonts/*.woff2
+      echo -e "\e[32mWebfonts will be installed in ${_webfontdir}.\e[0m"
+    fi
+    if [ ! -f "$_webfontdir/$fontname-stylesheet.css" ] ; then
+      install -Dm644 -t "$pkgdir"/"$_webfontdir" "$srcdir"/www/fonts/"$fontname-stylesheet.css"
+    fi 
+  fi	
+}
+
+package_ttf-tannenberg() {
+  #conflicts+=("otf-$fontname")
+  install_license
+  install_fonts ttf
+  install_webfonts
+}
+
+package_type1-tannenberg() {
+  install_license
+  install_postscript
+  install_webfonts
+}
+
+package_webfonts-tannenberg() {
+  _include_webfonts=true
+  install_license
+  install_webfonts
+}
diff --git a/tannenberg-font.tar.gz b/tannenberg-font.tar.gz
new file mode 100644
index 000000000000..0344383b704e
--- /dev/null
+++ b/tannenberg-font.tar.gz