From 37ec5e1cbb093d99e59a945f48a65a9bd8754900 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 10 Jul 2012 09:33:48 +0200 Subject: [PATCH] apache: switch to /usr. --- srcpkgs/apache/template | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template index 7b8136e5f4..c5ca9e6994 100644 --- a/srcpkgs/apache/template +++ b/srcpkgs/apache/template @@ -1,7 +1,7 @@ # Template file for 'apache' pkgname=apache version=2.4.2 -revision=1 +revision=2 wrksrc=httpd-${version} distfiles="http://www.apache.org/dist/httpd/httpd-${version}.tar.bz2" build_style=gnu-configure @@ -20,7 +20,6 @@ configure_args="--prefix= --enable-pie --enable-modules=all --enable-dav --enable-info --enable-cgi --enable-cgid --enable-dav-fs --enable-dav-lock --enable-vhost-alias --enable-imagemap --enable-so --enable-rewrite --with-pcre=/usr --enable-layout=XBPS --sysconfdir=/etc/httpd" -depends="libdb gdbm expat" makedepends="pkg-config perl>=0 zlib-devel libuuid-devel pcre-devel>=8.30 openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-devel apr-util-devel" short_desc="The Number One HTTP Server On The Internet" @@ -59,8 +58,6 @@ system_accounts="httpd" httpd_descr="Apache HTTP server" httpd_homedir="/srv/httpd" - - pre_configure() { # set default user sed -e 's#User daemon#User httpd#' \ @@ -97,7 +94,7 @@ post_install() { # systemd and logrotate files. vinstall ${FILESDIR}/apache.logrotate 644 etc/logrotate.d apache - vinstall ${FILESDIR}/apache.service 644 lib/systemd/system + vinstall ${FILESDIR}/apache.service 644 usr/lib/systemd/system vinstall ${FILESDIR}/apache.tmpfiles 644 usr/lib/tmpfiles.d apache.conf rm -rf ${DESTDIR}/etc/httpd/original