inspircd: fix PIE, cleanup.

srcpkgs/inspircd/template

@@ -1,37 +1,36 @@
 # Template file for 'inspircd'
 pkgname=inspircd
 version=2.0.21
-revision=2
-build_style=configure
+revision=3
+build_style=gnu-makefile
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel sqlite-devel geoip-devel"
+makedepends="geoip-devel libressl-devel sqlite-devel"
 system_accounts="${pkgname}"
+make_dirs="/var/log/inspircd 0755 ${pkgname} ${pkgname}"
 homepage="http://www.inspircd.org/"
-distfiles="https://github.com/inspircd/inspircd/archive/v${version}.tar.gz"
-short_desc="Modular internet relay chat server"
+short_desc="Modular Internet Relay Chat server"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2"
+distfiles="https://github.com/inspircd/inspircd/archive/v${version}.tar.gz"
 checksum=bc2f861d754754a108797699319186130ef7d909204eb56ab2c3b1ae80c9d6c5
 
-configure_args="--prefix=/usr"
-configure_args+=" --with-cc=${XBPS_CROSS_TRIPLET:+${XBPS_CROSS_TRIPLET}-}g++"
-configure_args+=" --config-dir=/etc/inspircd"
-configure_args+=" --log-dir=/var/log/inspircd"
-configure_args+=" --data-dir=/var/lib/inspircd"
-configure_args+=" --module-dir=/usr/lib/$pkgname/modules"
-configure_args+=" --binary-dir=/usr/bin"
-configure_args+=" --uid inspircd"
-configure_args+=" --disable-interactive"
-configure_args+=" --enable-openssl"
-configure_args+=" --enable-epoll"
-
-make_dirs="/var/log/inspircd 0755 inspircd inspircd"
-
-pre_configure() {
+do_configure() {
 	./configure --enable-extras=m_ssl_openssl.cpp,m_regex_posix.cpp,m_sqlite3.cpp,m_geoip.cpp
+	./configure \
+		--prefix=/usr \
+		--config-dir=/etc/inspircd \
+		--log-dir=/var/log/inspircd \
+		--data-dir=/var/lib/inspircd \
+		--module-dir=/usr/lib/${pkgname}/modules \
+		--binary-dir=/usr/bin \
+		--uid inspircd \
+		--disable-interactive \
+		--enable-openssl \
+		--enable-epoll
+	sed -i 's/-ldl/& -lm/' GNUmakefile
 }
 post_install() {
 	vsv inspircd
-	rm ${DESTDIR}/usr/$pkgname
+	rm ${DESTDIR}/usr/${pkgname}
 	rm ${DESTDIR}/usr/.gdbargs
 }