From 62ceb9126266ce5690887435ee17dec1acae0cab Mon Sep 17 00:00:00 2001
From: Leonardo Arena <rnalrd@alpinelinux.org>
Date: Mon, 10 Feb 2014 13:45:26 +0000
Subject: main/rt4: fix RT_VARPATH

---
 main/rt4/APKBUILD         | 21 +++++++++++++--------
 main/rt4/rt-varpath.patch | 20 ++++++++++++++++++++
 2 files changed, 33 insertions(+), 8 deletions(-)
 create mode 100644 main/rt4/rt-varpath.patch

diff --git a/main/rt4/APKBUILD b/main/rt4/APKBUILD
index a0b88bac3..bb8fd70dc 100644
--- a/main/rt4/APKBUILD
+++ b/main/rt4/APKBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=rt4
 pkgver=4.2.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Request Tracker - issue and bug tracker"
 pkgusers="rt4"
 pkggroups="rt4"
@@ -90,14 +90,17 @@ depends="perl
 	perl-crypt-x509
 	perl-file-which
 	perl-string-shellquote
+	perl-lwp-protocol-https
 	ttf-droid
 	"
 
-makedepends="$depends"
+makedepends="$depends autoconf"
 install="$pkgname.pre-install $pkgname.pre-upgrade"
 subpackages=""
 source="http://www.bestpractical.com/pub/rt/release/rt-$pkgver.tar.gz
-	0001-email-allow-envelope-from-overriding-from-templates.patch"
+	0001-email-allow-envelope-from-overriding-from-templates.patch
+	rt-varpath.patch
+	"
 
 _builddir="$srcdir"/rt-$pkgver
 prepare() {
@@ -145,7 +148,7 @@ EOF
 
 build() {
 	cd "$_builddir"
-	./configure \
+	autoconf && ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--enable-layout=Alpine \
@@ -164,12 +167,14 @@ package() {
 	# delete the droid fonts as we get them from ttf-droid
 	rm -rf "$pkgdir"/usr/share/rt4/fonts/ \
 		"$pkgdir"/usr/local
-
 }
 
 md5sums="d84db797512dd72fd6cdee4d230328b4  rt-4.2.2.tar.gz
-0f00f58ea2feb15ba0c56f4455feaae1  0001-email-allow-envelope-from-overriding-from-templates.patch"
+0f00f58ea2feb15ba0c56f4455feaae1  0001-email-allow-envelope-from-overriding-from-templates.patch
+9c1cd44a5e177a73cf92f6790fe5cd78  rt-varpath.patch"
 sha256sums="0606ef17fe78ce6381fcf99e191ea15654fdc0db6363887d45d61ab77993f54b  rt-4.2.2.tar.gz
-c751d831ec9ad54ae7afd0276cbb36ef57bac291ce4b215000b7364dca20a74d  0001-email-allow-envelope-from-overriding-from-templates.patch"
+c751d831ec9ad54ae7afd0276cbb36ef57bac291ce4b215000b7364dca20a74d  0001-email-allow-envelope-from-overriding-from-templates.patch
+0d1905e29346d1a2a8e8bd5de7931721de872bccfdbb26421f3b6c00e39ca895  rt-varpath.patch"
 sha512sums="1f12fcf06b3c0b4eb546662ccc8aabfba26198e0f406cf0b967f5a8fef0e9e1efbac0c52a69bc913724210fac84e85744bdab844c9c6d11c988528956d050708  rt-4.2.2.tar.gz
-a61cc81d025edf92598023f37517b06145a28edfdc31dfbc94ae2a1f8f13505d5512ad4e332376d46c1e4dd2fdb97569f127503eae3d4af6ce14f63e4e3c3f48  0001-email-allow-envelope-from-overriding-from-templates.patch"
+a61cc81d025edf92598023f37517b06145a28edfdc31dfbc94ae2a1f8f13505d5512ad4e332376d46c1e4dd2fdb97569f127503eae3d4af6ce14f63e4e3c3f48  0001-email-allow-envelope-from-overriding-from-templates.patch
+8a96b5482d649e373600e0b0e04abe382f61b0ed3ec463625163182fd71569c61c236e2cf48abd496f0d747b11b604acd1f958d8d891a2333bfde7450fb995d3  rt-varpath.patch"
diff --git a/main/rt4/rt-varpath.patch b/main/rt4/rt-varpath.patch
new file mode 100644
index 000000000..50ce55156
--- /dev/null
+++ b/main/rt4/rt-varpath.patch
@@ -0,0 +1,20 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -357,7 +357,7 @@
+ AC_SUBST([CONFIG_FILE_PATH],		${exp_sysconfdir})
+ AC_SUBST([RT_BIN_PATH],			${exp_bindir})
+ AC_SUBST([RT_SBIN_PATH],		${exp_sbindir})
+-AC_SUBST([RT_VAR_PATH],			${exp_localstatedir})
++AC_SUBST([RT_VAR_PATH],			${exp_datadir})
+ AC_SUBST([RT_MAN_PATH],			${exp_mandir})
+ AC_SUBST([RT_FONT_PATH],			${exp_fontdir})
+ AC_SUBST([RT_PLUGIN_PATH],			${exp_plugindir})
+@@ -409,7 +409,7 @@
+ AC_SUBST([CONFIG_FILE_PATH_R],		${exp_sysconfdir})
+ AC_SUBST([RT_BIN_PATH_R],			${exp_bindir})
+ AC_SUBST([RT_SBIN_PATH_R],		${exp_sbindir})
+-AC_SUBST([RT_VAR_PATH_R],			${exp_localstatedir})
++AC_SUBST([RT_VAR_PATH_R],			${exp_datadir})
+ AC_SUBST([RT_MAN_PATH_R],			${exp_mandir})
+ AC_SUBST([RT_FONT_PATH_R],			${exp_fontdir})
+ AC_SUBST([MASON_DATA_PATH_R],		${exp_masonstatedir})
-- 
cgit v1.2.3