Tue Dec 3 21:18:36 2013 UTC ()
Remove -h from the chown commands in post-install. The chown manpage (on
MirBSD) says: "The -R and -h options are mutually exclusive."


(bsiegert)
diff -r1.144 -r1.145 pkgsrc/www/apache2/Makefile
diff -r1.94 -r1.95 pkgsrc/www/apache22/Makefile
diff -r1.22 -r1.23 pkgsrc/www/apache24/Makefile
cvs diff -r1.144 -r1.145 pkgsrc/www/apache2/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/apache2/Attic/Makefile 2013/12/01 10:18:02 1.144
+++ pkgsrc/www/apache2/Attic/Makefile 2013/12/03 21:18:36 1.145
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.144 2013/12/01 10:18:02 ryoon Exp $ 1# $NetBSD: Makefile,v 1.145 2013/12/03 21:18:36 bsiegert Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
5PKGNAME= apache-${APACHE_VERSION} 5PKGNAME= apache-${APACHE_VERSION}
6PKGREVISION= 1 6PKGREVISION= 1
7CATEGORIES= www 7CATEGORIES= www
8 8
9HOMEPAGE= http://httpd.apache.org/ 9HOMEPAGE= http://httpd.apache.org/
10COMMENT= Apache HTTP (Web) server, version 2 10COMMENT= Apache HTTP (Web) server, version 2
11LICENSE= apache-2.0 11LICENSE= apache-2.0
12 12
13CONFLICTS= apache-*ssl-[0-9]* apache6-[0-9]* 13CONFLICTS= apache-*ssl-[0-9]* apache6-[0-9]*
14 14
@@ -228,26 +228,26 @@ post-install: @@ -228,26 +228,26 @@ post-install:
228 ' < "$${file}" >> $${file}.new; \ 228 ' < "$${file}" >> $${file}.new; \
229 ${MV} -f $${file}.new $${file}; \ 229 ${MV} -f $${file}.new $${file}; \
230 done 230 done
231 231
232 cd ${WRKSRC}/docs/manual && pax -rw . ${DESTDIR}${PREFIX}/share/httpd/manual 232 cd ${WRKSRC}/docs/manual && pax -rw . ${DESTDIR}${PREFIX}/share/httpd/manual
233 233
234 ${INSTALL_SCRIPT} ${WRKDIR}/mkcert ${DESTDIR}${PREFIX}/sbin 234 ${INSTALL_SCRIPT} ${WRKDIR}/mkcert ${DESTDIR}${PREFIX}/sbin
235 235
236 for file in ${FIX_PERMS}; do \ 236 for file in ${FIX_PERMS}; do \
237 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/sbin/$$file && \ 237 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/sbin/$$file && \
238 ${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/sbin/$$file; \ 238 ${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/sbin/$$file; \
239 done 239 done
240 240
241 ${CHOWN} -h -R ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/share/httpd 241 ${CHOWN} -R ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/share/httpd
242 ${CHOWN} -h -R ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/include/httpd 242 ${CHOWN} -R ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/include/httpd
243 ${CHOWN} -h -R ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/lib/httpd 243 ${CHOWN} -R ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/lib/httpd
244 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/libexec/cgi-bin/test-cgi 244 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/libexec/cgi-bin/test-cgi
245 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/libexec/cgi-bin/printenv 245 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/libexec/cgi-bin/printenv
246 246
247 for file in ${FIX_MAN_PERMS}; do \ 247 for file in ${FIX_MAN_PERMS}; do \
248 ${CHOWN} ${MANOWN}:${MANGRP} ${DESTDIR}${PREFIX}/${PKGMANDIR}/$$file; \ 248 ${CHOWN} ${MANOWN}:${MANGRP} ${DESTDIR}${PREFIX}/${PKGMANDIR}/$$file; \
249 done 249 done
250 250
251 ${INSTALL_SCRIPT} ${WRKSRC}/build/mkdir.sh ${DESTDIR}${PREFIX}/share/httpd/build 251 ${INSTALL_SCRIPT} ${WRKSRC}/build/mkdir.sh ${DESTDIR}${PREFIX}/share/httpd/build
252 252
253.include "../../mk/bsd.pkg.mk" 253.include "../../mk/bsd.pkg.mk"
cvs diff -r1.94 -r1.95 pkgsrc/www/apache22/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/apache22/Attic/Makefile 2013/12/01 10:18:02 1.94
+++ pkgsrc/www/apache22/Attic/Makefile 2013/12/03 21:18:36 1.95
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.94 2013/12/01 10:18:02 ryoon Exp $ 1# $NetBSD: Makefile,v 1.95 2013/12/03 21:18:36 bsiegert Exp $
2 2
3DISTNAME= httpd-2.2.25 3DISTNAME= httpd-2.2.25
4PKGNAME= ${DISTNAME:S/httpd/apache/} 4PKGNAME= ${DISTNAME:S/httpd/apache/}
5PKGREVISION= 1 5PKGREVISION= 1
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= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@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
@@ -218,28 +218,28 @@ INSTALL_TARGET= install-conf install @@ -218,28 +218,28 @@ INSTALL_TARGET= install-conf install
218INSTALL_MAKE_FLAGS+= sysconfdir="${EGDIR}" 218INSTALL_MAKE_FLAGS+= sysconfdir="${EGDIR}"
219 219
220post-install: 220post-install:
221 ${LN} -sf ${LOCALBASE}/libexec/apr/libtool ${DESTDIR}${PREFIX}/share/httpd/build 221 ${LN} -sf ${LOCALBASE}/libexec/apr/libtool ${DESTDIR}${PREFIX}/share/httpd/build
222 ${LN} -sf ${SBINDIR}/envvars-std ${DESTDIR}${SBINDIR}/envvars 222 ${LN} -sf ${SBINDIR}/envvars-std ${DESTDIR}${SBINDIR}/envvars
223 223
224 ${INSTALL_SCRIPT} ${WRKDIR}/mkcert ${DESTDIR}${PREFIX}/sbin 224 ${INSTALL_SCRIPT} ${WRKDIR}/mkcert ${DESTDIR}${PREFIX}/sbin
225 225
226 for file in ${FIX_PERMS}; do \ 226 for file in ${FIX_PERMS}; do \
227 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/sbin/$$file && \ 227 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/sbin/$$file && \
228 ${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/sbin/$$file; \ 228 ${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/sbin/$$file; \
229 done 229 done
230 230
231 ${CHOWN} -h -R ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/share/httpd 231 ${CHOWN} -R ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/share/httpd
232 ${CHOWN} -h -R ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/include/httpd 232 ${CHOWN} -R ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/include/httpd
233 ${CHOWN} -h -R ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/lib/httpd 233 ${CHOWN} -R ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/lib/httpd
234 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/libexec/cgi-bin/test-cgi 234 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/libexec/cgi-bin/test-cgi
235 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/libexec/cgi-bin/printenv 235 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/libexec/cgi-bin/printenv
236 236
237 for file in ${FIX_MAN_PERMS}; do \ 237 for file in ${FIX_MAN_PERMS}; do \
238 ${CHOWN} ${MANOWN}:${MANGRP} ${DESTDIR}${PREFIX}/${PKGMANDIR}/$$file; \ 238 ${CHOWN} ${MANOWN}:${MANGRP} ${DESTDIR}${PREFIX}/${PKGMANDIR}/$$file; \
239 done 239 done
240 240
241 ${CHMOD} -x ${DESTDIR}${PREFIX}/sbin/envvars-std 241 ${CHMOD} -x ${DESTDIR}${PREFIX}/sbin/envvars-std
242 ${TEST} ! -f ${DESTDIR}${PREFIX}/sbin/suexec || ${CHMOD} -w ${DESTDIR}${PREFIX}/sbin/suexec 242 ${TEST} ! -f ${DESTDIR}${PREFIX}/sbin/suexec || ${CHMOD} -w ${DESTDIR}${PREFIX}/sbin/suexec
243 243
244.include "../../mk/pthread.buildlink3.mk" 244.include "../../mk/pthread.buildlink3.mk"
245.include "../../mk/bsd.pkg.mk" 245.include "../../mk/bsd.pkg.mk"
cvs diff -r1.22 -r1.23 pkgsrc/www/apache24/Makefile (expand / switch to unified diff)

--- pkgsrc/www/apache24/Makefile 2013/12/01 10:02:34 1.22
+++ pkgsrc/www/apache24/Makefile 2013/12/03 21:18:36 1.23
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.22 2013/12/01 10:02:34 ryoon Exp $ 1# $NetBSD: Makefile,v 1.23 2013/12/03 21:18:36 bsiegert Exp $
2 2
3DISTNAME= httpd-2.4.7 3DISTNAME= httpd-2.4.7
4PKGNAME= ${DISTNAME:S/httpd/apache/} 4PKGNAME= ${DISTNAME:S/httpd/apache/}
5CATEGORIES= www 5CATEGORIES= www
6MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \ 6MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \
7 http://archive.apache.org/dist/httpd/ \ 7 http://archive.apache.org/dist/httpd/ \
8 http://archive.eu.apache.org/dist/httpd/ 8 http://archive.eu.apache.org/dist/httpd/
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= ryoon@NetBSD.org 11MAINTAINER= ryoon@NetBSD.org
12HOMEPAGE= http://httpd.apache.org/ 12HOMEPAGE= http://httpd.apache.org/
13COMMENT= Apache HTTP (Web) server, version 2.4 13COMMENT= Apache HTTP (Web) server, version 2.4
14LICENSE= apache-2.0 14LICENSE= apache-2.0
@@ -166,29 +166,29 @@ post-install: @@ -166,29 +166,29 @@ post-install:
166 166
167 ${INSTALL_SCRIPT} ${WRKDIR}/mkcert ${DESTDIR}${PREFIX}/bin 167 ${INSTALL_SCRIPT} ${WRKDIR}/mkcert ${DESTDIR}${PREFIX}/bin
168 168
169.for file in ${FIX_PERMS_SBIN} 169.for file in ${FIX_PERMS_SBIN}
170 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/sbin/${file} 170 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/sbin/${file}
171 ${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/sbin/${file} 171 ${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/sbin/${file}
172.endfor 172.endfor
173 173
174.for file in ${FIX_PERMS_BIN} 174.for file in ${FIX_PERMS_BIN}
175 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/bin/${file} 175 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/bin/${file}
176 ${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/bin/${file} 176 ${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/bin/${file}
177.endfor 177.endfor
178 178
179 ${CHOWN} -h -R ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/share/httpd 179 ${CHOWN} -R ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/share/httpd
180 ${CHOWN} -h -R ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/include/httpd 180 ${CHOWN} -R ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/include/httpd
181 ${CHOWN} -h -R ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/lib/httpd 181 ${CHOWN} -R ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/lib/httpd
182 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/libexec/cgi-bin/test-cgi 182 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/libexec/cgi-bin/test-cgi
183 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/libexec/cgi-bin/printenv 183 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/libexec/cgi-bin/printenv
184 184
185.for file in ${FIX_MAN_PERMS} 185.for file in ${FIX_MAN_PERMS}
186 ${CHOWN} ${MANOWN}:${MANGRP} ${DESTDIR}${PREFIX}/${PKGMANDIR}/${file} 186 ${CHOWN} ${MANOWN}:${MANGRP} ${DESTDIR}${PREFIX}/${PKGMANDIR}/${file}
187.endfor 187.endfor
188 188
189 ${CHMOD} -x ${DESTDIR}${PREFIX}/sbin/envvars-std 189 ${CHMOD} -x ${DESTDIR}${PREFIX}/sbin/envvars-std
190.if exists(${DESTDIR}${PREFIX}/sbin/suexec) 190.if exists(${DESTDIR}${PREFIX}/sbin/suexec)
191 ${CHMOD} -w ${DESTDIR}${PREFIX}/sbin/suexec 191 ${CHMOD} -w ${DESTDIR}${PREFIX}/sbin/suexec
192.endif 192.endif
193 193
194.include "../../mk/pthread.buildlink3.mk" 194.include "../../mk/pthread.buildlink3.mk"