From 7e72ce93bec24f139fc4a84bab5f0ec3262c417b Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Sat, 17 Oct 2015 11:38:49 +0200
Subject: [PATCH] znc: simplify and remove unnecessary tweaks.

---
 srcpkgs/znc/template | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index 3abe1468621..069dbf6b017 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,18 +1,9 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.6.1
-revision=3
+revision=5
 build_style=gnu-configure
-configure_args="
- --enable-python
- --enable-perl
- --enable-tcl
- --enable-cyrus
- --sysconfdir=/etc
- --localstatedir=/var"
-system_accounts="znc"
-znc_homedir="/var/lib/znc"
-make_dirs="/var/lib/znc 0750 znc znc"
+configure_args="--enable-python --enable-perl --enable-tcl --enable-cyrus"
 hostmakedepends="pkg-config perl"
 makedepends="libressl-devel python3.4-devel tcl-devel libsasl-devel icu55-devel zlib-devel perl"
 short_desc="An advanced IRC Bouncer"
@@ -22,11 +13,14 @@ homepage="http://znc.in/"
 distfiles="http://znc.in/releases/$pkgname-$version.tar.gz"
 checksum=ba49397364f48d6d32ae5242bc1166f21d972f85dd390d6bbe68a63ecbb6c140
 
+system_accounts="znc"
+znc_homedir="/var/lib/znc"
+make_dirs="/var/lib/znc 0750 znc znc"
+
 do_configure() {
-	export TCL_FLAGS="-I${XBPS_CROSS_BASE}/usr/include -L${XBPS_CROSS_BASE}/usr/lib -ltcl8.6"
+	export TCL_FLAGS="$CFLAGS $LDFLAGS -ltcl8.6"
 	${configure_script} ${configure_args}
 }
-
 post_install() {
 	vsv znc
 }
@@ -39,7 +33,6 @@ znc-python3.4_package() {
 		vmove usr/lib/znc/modpython.so
 	}
 }
-
 znc-perl_package() {
 	depends="znc>=${version}_${revision}"
 	short_desc+=" - perl plugin"
@@ -49,7 +42,6 @@ znc-perl_package() {
 		vmove usr/lib/znc/perleval.pm
 	}
 }
-
 znc-tcl_package() {
 	depends="znc>=${version}_${revision}"
 	short_desc+=" - tcl plugin"
@@ -58,7 +50,6 @@ znc-tcl_package() {
 		vmove usr/lib/znc/modtcl.so
 	}
 }
-
 znc-devel_package() {
 	depends="znc>=${version}_${revision}"
 	short_desc+=" - development files"