apache: needs perl to build, use vinstall().

This commit is contained in:
Juan RP 2011-07-05 10:34:31 +02:00
parent b63c85a159
commit 3e90bdf5b1

View file

@ -69,6 +69,7 @@ Add_dependency run libssl
Add_dependency run apr Add_dependency run apr
Add_dependency run apr-util Add_dependency run apr-util
Add_dependency build perl ">=0"
Add_dependency build zlib-devel Add_dependency build zlib-devel
Add_dependency build libuuid-devel Add_dependency build libuuid-devel
Add_dependency build pcre-devel Add_dependency build pcre-devel
@ -85,7 +86,7 @@ pre_configure()
# set default user # set default user
sed -e 's#User daemon#User httpd#' \ sed -e 's#User daemon#User httpd#' \
-e 's#Group daemon#Group httpd#' \ -e 's#Group daemon#Group httpd#' \
-i ${wrksrc}/docs/conf/httpd.conf.in || return 1 -i ${wrksrc}/docs/conf/httpd.conf.in
cat ${FILESDIR}/xbps.layout >> ${wrksrc}/config.layout cat ${FILESDIR}/xbps.layout >> ${wrksrc}/config.layout
} }
@ -103,7 +104,7 @@ post_install()
-e 's|ServerRoot \"\"|ServerRoot \"/etc/httpd\"|' \ -e 's|ServerRoot \"\"|ServerRoot \"/etc/httpd\"|' \
-e 's|#\(ServerName\).*|\1 127.0.0.1:80|' \ -e 's|#\(ServerName\).*|\1 127.0.0.1:80|' \
-e 's|\(LoadModule unique_id_module.*\)|#\1|' \ -e 's|\(LoadModule unique_id_module.*\)|#\1|' \
-i ${DESTDIR}/etc/httpd/httpd.conf || return 1 -i ${DESTDIR}/etc/httpd/httpd.conf
# symlinks for /etc/httpd # symlinks for /etc/httpd
ln -fs /var/log/httpd ${DESTDIR}/etc/httpd/logs ln -fs /var/log/httpd ${DESTDIR}/etc/httpd/logs
@ -116,12 +117,9 @@ post_install()
rm -f ${DESTDIR}/srv/httpd/cgi-bin/printenv rm -f ${DESTDIR}/srv/httpd/cgi-bin/printenv
rm -f ${DESTDIR}/srv/httpd/index.html rm -f ${DESTDIR}/srv/httpd/index.html
install -D -m644 ${FILESDIR}/apache.logrotate \ vinstall ${FILESDIR}/apache.logrotate 644 etc/logrotate.d apache
${DESTDIR}/etc/logrotate.d/apache || return 1 vinstall ${FILESDIR}/apache.rc 755 etc/init.d apache
install -D -m755 ${FILESDIR}/apache.rc \ vinstall ${FILESDIR}/apache.confd 644 etc/conf.d apache
${DESTDIR}/etc/init.d/apache || return 1
install -D -m644 ${FILESDIR}/apache.confd \
${DESTDIR}/etc/conf.d/apache || return 1
rm -rf ${DESTDIR}/etc/httpd/original rm -rf ${DESTDIR}/etc/httpd/original
} }