From bc54ae50fee7a168406ab2a274bb7687bbf1207c Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 2 Jun 2015 11:26:56 +0200 Subject: [PATCH] apache: move to usr/bin. --- srcpkgs/apache/files/apache.service | 6 +++--- srcpkgs/apache/files/xbps.layout | 2 +- srcpkgs/apache/template | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/apache/files/apache.service b/srcpkgs/apache/files/apache.service index 29515f7fee..82b51217f8 100644 --- a/srcpkgs/apache/files/apache.service +++ b/srcpkgs/apache/files/apache.service @@ -6,10 +6,10 @@ Conflicts=apache-mpm-event.service apache-mpm-worker.service [Service] Type=forking PIDFile=/var/run/httpd/httpd.pid -ExecStart=/usr/sbin/httpd -k start -ExecReload=/usr/sbin/httpd -t +ExecStart=/usr/bin/httpd -k start +ExecReload=/usr/bin/httpd -t ExecReload=/bin/kill -HUP $MAINPID -ExecStop=/usr/sbin/httpd -k stop +ExecStop=/usr/bin/httpd -k stop PrivateTmp=true [Install] diff --git a/srcpkgs/apache/files/xbps.layout b/srcpkgs/apache/files/xbps.layout index 8a14286baa..4b0ce78c9a 100644 --- a/srcpkgs/apache/files/xbps.layout +++ b/srcpkgs/apache/files/xbps.layout @@ -2,7 +2,7 @@ prefix: exec_prefix: /usr bindir: ${exec_prefix}/bin - sbindir: ${exec_prefix}/sbin + sbindir: ${exec_prefix}/bin libdir: ${exec_prefix}/lib libexecdir: ${exec_prefix}/libexec/httpd mandir: ${exec_prefix}/share/man diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template index 7b3e5e2eff..d22984fc93 100644 --- a/srcpkgs/apache/template +++ b/srcpkgs/apache/template @@ -1,10 +1,10 @@ # Template file for 'apache' pkgname=apache version=2.4.12 -revision=3 +revision=4 wrksrc=httpd-${version} build_style=gnu-configure -configure_args="--prefix= --enable-pie --enable-modules=all +configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all --enable-mods-shared=all --enable-authn-dbm --enable-authn-anon --enable-authn-dbd --enable-authn-alias --enable-authz-dbm --enable-authz-owner --enable-authnz-ldap --enable-auth-digest -enable-isapi