From 22993195fba12519aafa7705421c79cd2dec02b2 Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Mon, 2 May 2016 23:23:37 +0200
Subject: main/rt4: fix source URL and do some minor improvements

---
 main/rt4/APKBUILD | 86 ++++++++++++++++++++++++++-----------------------------
 1 file changed, 40 insertions(+), 46 deletions(-)

(limited to 'main')

diff --git a/main/rt4/APKBUILD b/main/rt4/APKBUILD
index f247642f1e..ccef1df24d 100644
--- a/main/rt4/APKBUILD
+++ b/main/rt4/APKBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=rt4
 pkgver=4.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Request Tracker - issue and bug tracker"
 pkgusers="rt4"
 pkggroups="rt4"
@@ -102,61 +102,54 @@ depends="perl
 	ttf-droid
 	"
 
-makedepends="$depends autoconf"
+makedepends="autoconf"
 install="$pkgname.pre-install $pkgname.pre-upgrade"
-subpackages=""
-source="http://www.bestpractical.com/pub/rt/release/rt-$pkgver.tar.gz
+source="https://download.bestpractical.com/pub/rt/release/rt-$pkgver.tar.gz
 	0001-email-allow-envelope-from-overriding-from-templates.patch
 	rt-varpath.patch
 	rt-autoconf-version.patch
 	"
+builddir="$srcdir"/rt-$pkgver
 
-_builddir="$srcdir"/rt-$pkgver
 prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+	default_prepare || return 1  # apply patches
 
 	sed -i -e 's_$RT::BasePath/share/fonts/_/usr/share/fonts/TTF/_g' \
-		"$_builddir"/etc/RT_Config.pm*
+		"$builddir"/etc/RT_Config.pm* || return 1
 
-	cat <<'EOF' >> config.layout
-# Alpine directory layout.
-<Layout Alpine>
-  prefix:		/usr
-  exec_prefix:		${prefix}
-  bindir:		${exec_prefix}/bin
-  sbindir:		${exec_prefix}/sbin
-  sysconfdir:		/etc/rt4
-  mandir:		${prefix}/share/man
-  plugindir:		${prefix}/lib/rt4/plugins
-  libdir:		${prefix}/lib/rt4/
-  datadir:		${prefix}/share/rt4
-  htmldir:		${datadir}/html
-  fontdir:		${datadir}/fonts
-  lexdir:		${datadir}/po
-  staticdir:		${datadir}/static
-  manualdir:		${datadir}/doc
-  localstatedir:	/var
-  logfiledir:		${localstatedir}/log
-  masonstatedir:	${localstatedir}/cache/mason_data
-  sessionstatedir:	${localstatedir}/cache/session_data
-  customdir:		${prefix}/local
-  custometcdir:		${customdir}/etc
-  customhtmldir:	${customdir}/html
-  customlexdir:		${customdir}/po
-  customlibdir:		${customdir}/lib
-  customplugindir:	${customdir}/plugins
-</Layout>
-EOF
+	cat <<-'EOF' >> config.layout
+	# Alpine directory layout.
+	<Layout Alpine>
+	  prefix:		/usr
+	  exec_prefix:		${prefix}
+	  bindir:		${exec_prefix}/bin
+	  sbindir:		${exec_prefix}/sbin
+	  sysconfdir:		/etc/rt4
+	  mandir:		${prefix}/share/man
+	  plugindir:		${prefix}/lib/rt4/plugins
+	  libdir:		${prefix}/lib/rt4/
+	  datadir:		${prefix}/share/rt4
+	  htmldir:		${datadir}/html
+	  fontdir:		${datadir}/fonts
+	  lexdir:		${datadir}/po
+	  staticdir:		${datadir}/static
+	  manualdir:		${datadir}/doc
+	  localstatedir:	/var
+	  logfiledir:		${localstatedir}/log
+	  masonstatedir:	${localstatedir}/cache/mason_data
+	  sessionstatedir:	${localstatedir}/cache/session_data
+	  customdir:		${prefix}/local
+	  custometcdir:		${customdir}/etc
+	  customhtmldir:	${customdir}/html
+	  customlexdir:		${customdir}/po
+	  customlibdir:		${customdir}/lib
+	  customplugindir:	${customdir}/plugins
+	</Layout>
+	EOF
 }
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	autoconf && ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -171,9 +164,10 @@ build() {
 }
 
 package() {
-	cd "$_builddir"
-	make -j1 DESTDIR="$pkgdir" \
-	 install || return 1
+	cd "$builddir"
+
+	make -j1 DESTDIR="$pkgdir" install || return 1
+
 	# delete the droid fonts as we get them from ttf-droid
 	rm -rf "$pkgdir"/usr/share/rt4/fonts/ \
 		"$pkgdir"/usr/local
-- 
cgit v1.2.3