Cosmetic changes; package mostly unchanged

1 files changed, 24 insertions, 16 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 2df4edb8635a..75b384a2e863 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,32 +3,40 @@
 # Generated by aur-fd-scripts - https://git.respiranto.de/aur-fd-scripts.git/
 
 _lang=fra-eng
-_pkgname=dict-freedict-${_lang}
-pkgname=${_pkgname}-svn
-pkgver=r1870
-pkgrel=1
-pkgdesc="French -> English dictionary for dictd et al. from Freedict.org"
+_pkgname="dict-freedict-${_lang}"
+pkgname="${_pkgname}-svn"
+_pkgver=r1905
+pkgver="${_pkgver//-/_}"
+pkgrel=2
+pkgdesc="French -> English dictionary for dictd et al. from FreeDict.org"
 arch=('any')
 url="https://freedict.org/"
 license=('GPL')
 optdepends=('dictd: dict client and server')
 makedepends=('subversion' 'freedict-tools')
-provides=(${_pkgname})
-conflicts=(${_pkgname})
-install=${pkgname}.install
-source=("svn+https://github.com/freedict/fd-dictionaries/trunk/${_lang}")
-md5sums=('SKIP')
+provides=("$_pkgname")
+conflicts=("$_pkgname")
+install="${pkgname}.install"
+source=("${pkgname}::svn+https://github.com/freedict/fd-dictionaries/trunk/${_lang}")
+sha512sums=('SKIP')
+
+prepare()
+{
+	# The Makefile expects the TEI XML file to reside in a directory named
+	# ${_lang}.
+	mv "$pkgname" "$_lang"
+}
 
 pkgver()
 {
-	cd $_lang
+	cd "$_lang"
 	local _ver="$(svnversion)"
 	printf "r%s" "${_ver//[[:alpha:]]}"
 }
 
 build()
 {
-	cd $_lang
+	cd "$_lang"
 	make FREEDICT_TOOLS=/usr/lib/freedict-tools build-dictd
 }
 
@@ -36,13 +44,13 @@ package()
 {
 	install -m 755 -d "${pkgdir}/usr/share/dictd"
 	install -m 644 -t "${pkgdir}/usr/share/dictd/" \
-		${_lang}/build/dictd/${_lang}.{dict.dz,index}
+		"${_lang}/build/dictd/${_lang}".{dict.dz,index}
 
-	for file in ${_lang}/{AUTHORS,README,NEWS,ChangeLog}
+	for file in "$_lang"/{AUTHORS,README,NEWS,ChangeLog}
 	do
-		if test -f ${file}
+		if test -f "$file"
 		then
-			install -m 644 -Dt "${pkgdir}/usr/share/doc/freedict/${_lang}/" ${file}
+			install -m 644 -Dt "${pkgdir}/usr/share/doc/freedict/${_lang}/" "$file"
 		fi
 	done
 }