Merge pull request #1737 from thypon/varnish

varnish: move to usr/bin.

srcpkgs/varnish/files/varnish.service

@@ -1,10 +0,0 @@
-[Unit]
-Description=Web Application Accelerator
-After=network.target
-
-[Service]
-ExecStart=/usr/sbin/varnishd -a 0.0.0.0:80 -f /etc/varnish/default.vcl -T localhost:6082 -s malloc,64M -u nobody -g nogroup -F
-ExecReload=/usr/bin/varnish-vcl-reload
-
-[Install]
-WantedBy=multi-user.target

srcpkgs/varnish/template

@@ -1,12 +1,11 @@
 # Template file for 'varnish'
 pkgname=varnish
 version=3.0.7
-revision=1
+revision=3
 lib32disabled=yes
 build_pie=yes
-build_options="systemd"
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--disable-static --sbindir=/usr/bin"
 hostmakedepends="pkg-config python"
 makedepends="pcre-devel readline-devel jemalloc-devel"
 conf_files="/etc/varnish/default.vcl"
@@ -19,12 +18,6 @@ distfiles="http://repo.varnish-cache.org/source/${pkgname}-${version}.tar.gz"
 checksum=a27e9f11391617fab27cc6edc31d3c8681b8d6975f8c2cd07f6e081bc54c24ce
 
 post_install() {
-	# systemd service
-	if [ "$build_option_systemd" ]; then
-		vinstall ${FILESDIR}/varnish.service 644 usr/lib/systemd/system
-		# systemd reload helper
-		vinstall ${FILESDIR}/varnish-vcl-reload 755 usr/sbin
-	fi
 	vsv varnishd
 }