inspircd: enable geoip/sqlite modules; misc tweaks (close #3259).

srcpkgs/inspircd/template

@@ -1,10 +1,10 @@
 # Template file for 'inspircd'
 pkgname=inspircd
 version=2.0.20
-revision=1
+revision=2
 build_style=configure
-makedepends="libressl-devel"
 hostmakedepends="perl pkg-config"
+makedepends="libressl-devel sqlite-devel geoip-devel"
 system_accounts="${pkgname}"
 homepage="http://www.inspircd.org/"
 distfiles="https://github.com/inspircd/inspircd/archive/v${version}.tar.gz"
@@ -12,21 +12,14 @@ short_desc="Modular internet relay chat server"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2"
 checksum="5156e2da5da4cfa377705ecd633aee41cdcd785d12627497d55cab5f70dd686f"
-_binpath="/usr/bin"
-_libpath="/usr/lib/${pkgname}"
 
-if [ -n "$CROSS_BUILD" ]; then
-	CXX=${XBPS_CROSS_TRIPLET}-g++;
-fi
-
-_configure_extras="--enable-extras=m_ssl_openssl.cpp,m_regex_posix.cpp"
 configure_args="--prefix=/usr"
-configure_args+=" --with-cc=$CXX"
+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=${_libpath}/modules"
-configure_args+=" --binary-dir=${_binpath}"
+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"
@@ -35,17 +28,8 @@ configure_args+=" --enable-epoll"
 make_dirs="/var/log/inspircd 0755 inspircd inspircd"
 
 pre_configure() {
-	./configure ${_configure_extras}
+	./configure --enable-extras=m_ssl_openssl.cpp,m_regex_posix.cpp,m_sqlite3.cpp,m_geoip.cpp
 }
-
-do_install() {
-	make DESTDIR=${DESTDIR} INSTUID="${pkgname}" \
-		BINPATH="${DESTDIR}/${_binpath}" \
-		BASE="${DESTDIR}/${_libpath}/inspircd.launcher" \
-		MODPATH="${DESTDIR}/${_libpath}/modules/" \
-		CONPATH="${DESTDIR}//etc/${pkgname}" install
-}
-
 post_install() {
 	vsv inspircd
 }