Wed Sep 14 17:52:15 2011 UTC ()
Use chown -h to explicitly not dereference any symlinks. Fixes build on SunOS.


(hans)
diff -r1.70 -r1.71 pkgsrc/www/apache22/Makefile
cvs diff -r1.70 -r1.71 pkgsrc/www/apache22/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/apache22/Attic/Makefile 2011/09/14 07:10:21 1.70
+++ pkgsrc/www/apache22/Attic/Makefile 2011/09/14 17:52:15 1.71
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.70 2011/09/14 07:10:21 taca Exp $ 1# $NetBSD: Makefile,v 1.71 2011/09/14 17:52:15 hans Exp $
2 2
3DISTNAME= httpd-2.2.21 3DISTNAME= httpd-2.2.21
4 4
5PKGNAME= ${DISTNAME:S/httpd/apache/} 5PKGNAME= ${DISTNAME:S/httpd/apache/}
6CATEGORIES= www 6CATEGORIES= www
7MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \ 7MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \
8 http://archive.apache.org/dist/httpd/ \ 8 http://archive.apache.org/dist/httpd/ \
9 http://archive.eu.apache.org/dist/httpd/ 9 http://archive.eu.apache.org/dist/httpd/
10EXTRACT_SUFX= .tar.bz2 10EXTRACT_SUFX= .tar.bz2
11 11
12MAINTAINER= tron@NetBSD.org 12MAINTAINER= tron@NetBSD.org
13HOMEPAGE= http://httpd.apache.org/ 13HOMEPAGE= http://httpd.apache.org/
14COMMENT= Apache HTTP (Web) server, version 2.2 14COMMENT= Apache HTTP (Web) server, version 2.2
@@ -220,28 +220,28 @@ INSTALL_TARGET= install-conf install @@ -220,28 +220,28 @@ INSTALL_TARGET= install-conf install
220INSTALL_MAKE_FLAGS+= sysconfdir="${EGDIR}" 220INSTALL_MAKE_FLAGS+= sysconfdir="${EGDIR}"
221 221
222post-install: 222post-install:
223 ${LN} -sf ${LOCALBASE}/libexec/apr/libtool ${DESTDIR}${PREFIX}/share/httpd/build 223 ${LN} -sf ${LOCALBASE}/libexec/apr/libtool ${DESTDIR}${PREFIX}/share/httpd/build
224 ${LN} -sf ${SBINDIR}/envvars-std ${DESTDIR}${SBINDIR}/envvars 224 ${LN} -sf ${SBINDIR}/envvars-std ${DESTDIR}${SBINDIR}/envvars
225 225
226 ${INSTALL_SCRIPT} ${WRKDIR}/mkcert ${DESTDIR}${PREFIX}/sbin 226 ${INSTALL_SCRIPT} ${WRKDIR}/mkcert ${DESTDIR}${PREFIX}/sbin
227 227
228 for file in ${FIX_PERMS}; do \ 228 for file in ${FIX_PERMS}; do \
229 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/sbin/$$file && \ 229 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/sbin/$$file && \
230 ${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/sbin/$$file; \ 230 ${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/sbin/$$file; \
231 done 231 done
232 232
233 ${CHOWN} -R ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/share/httpd 233 ${CHOWN} -h -R ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/share/httpd
234 ${CHOWN} -R ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/include/httpd 234 ${CHOWN} -h -R ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/include/httpd
235 ${CHOWN} -R ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/lib/httpd 235 ${CHOWN} -h -R ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/lib/httpd
236 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/libexec/cgi-bin/test-cgi 236 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/libexec/cgi-bin/test-cgi
237 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/libexec/cgi-bin/printenv 237 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/libexec/cgi-bin/printenv
238 238
239 for file in ${FIX_MAN_PERMS}; do \ 239 for file in ${FIX_MAN_PERMS}; do \
240 ${CHOWN} ${MANOWN}:${MANGRP} ${DESTDIR}${PREFIX}/${PKGMANDIR}/$$file; \ 240 ${CHOWN} ${MANOWN}:${MANGRP} ${DESTDIR}${PREFIX}/${PKGMANDIR}/$$file; \
241 done 241 done
242 242
243 ${CHMOD} -x ${DESTDIR}${PREFIX}/sbin/envvars-std 243 ${CHMOD} -x ${DESTDIR}${PREFIX}/sbin/envvars-std
244 ${TEST} ! -f ${DESTDIR}${PREFIX}/sbin/suexec || ${CHMOD} -w ${DESTDIR}${PREFIX}/sbin/suexec 244 ${TEST} ! -f ${DESTDIR}${PREFIX}/sbin/suexec || ${CHMOD} -w ${DESTDIR}${PREFIX}/sbin/suexec
245 245
246.include "../../mk/pthread.buildlink3.mk" 246.include "../../mk/pthread.buildlink3.mk"
247.include "../../mk/bsd.pkg.mk" 247.include "../../mk/bsd.pkg.mk"