Wed Feb 17 15:14:05 2010 UTC ()
DESTDIR support


(joerg)
diff -r1.131 -r1.132 pkgsrc/www/apache2/Makefile
cvs diff -r1.131 -r1.132 pkgsrc/www/apache2/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/apache2/Attic/Makefile 2010/01/17 12:02:48 1.131
+++ pkgsrc/www/apache2/Attic/Makefile 2010/02/17 15:14:05 1.132
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1# $NetBSD: Makefile,v 1.131 2010/01/17 12:02:48 wiz Exp $ 1# $NetBSD: Makefile,v 1.132 2010/02/17 15:14:05 joerg Exp $
 2
 3PKG_DESTDIR_SUPPORT= user-destdir
2 4
3.include "Makefile.common" 5.include "Makefile.common"
4 6
5PKGNAME= apache-${APACHE_VERSION} 7PKGNAME= apache-${APACHE_VERSION}
6PKGREVISION= 6 8PKGREVISION= 6
7CATEGORIES= www 9CATEGORIES= www
8 10
9HOMEPAGE= http://httpd.apache.org/ 11HOMEPAGE= http://httpd.apache.org/
10COMMENT= Apache HTTP (Web) server, version 2 12COMMENT= Apache HTTP (Web) server, version 2
11 13
12CONFLICTS= apache-*ssl-[0-9]* apache6-[0-9]* 14CONFLICTS= apache-*ssl-[0-9]* apache6-[0-9]*
13 15
14BUILD_DEFS+= IPV6_READY 16BUILD_DEFS+= IPV6_READY
@@ -189,62 +191,64 @@ DEPENDS+= ${ap_depend} @@ -189,62 +191,64 @@ DEPENDS+= ${ap_depend}
189. endif 191. endif
190. if defined(AP_CFG_ARGS.${ap_mod}) && !empty(AP_CFG_ARGS.${ap_mod}) 192. if defined(AP_CFG_ARGS.${ap_mod}) && !empty(AP_CFG_ARGS.${ap_mod})
191CONFIGURE_ARGS+= ${AP_CFG_ARGS.${ap_mod}} 193CONFIGURE_ARGS+= ${AP_CFG_ARGS.${ap_mod}}
192. endif 194. endif
193.endfor 195.endfor
194 196
195post-extract: 197post-extract:
196 ${TOUCH} ${WRKSRC}/build/libtool 198 ${TOUCH} ${WRKSRC}/build/libtool
197 199
198post-build: 200post-build:
199 ${SED} "s#@PKG_SYSCONFDIR@#${PKG_SYSCONFDIR}#g" \ 201 ${SED} "s#@PKG_SYSCONFDIR@#${PKG_SYSCONFDIR}#g" \
200 < ${FILESDIR}/mkcert.sh > ${WRKDIR}/mkcert 202 < ${FILESDIR}/mkcert.sh > ${WRKDIR}/mkcert
201 203
 204INSTALLATION_DIRS+= share/httpd/manual
 205
202pre-install: 206pre-install:
203 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ 207 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
204 ${MAKE_PROGRAM} install-conf sysconfdir="${EGDIR}" 208 ${MAKE_PROGRAM} install-conf sysconfdir="${EGDIR}" \
 209 DESTDIR=${DESTDIR}
205 210
206post-install: 211post-install:
207 ${LN} -sf ${LOCALBASE}/libexec/apr/libtool ${PREFIX}/share/httpd/build 212 ${LN} -sf ../../../libexec/apr/libtool ${DESTDIR}${PREFIX}/share/httpd/build
208 cd ${EGDIR} && \ 213 cd ${DESTDIR}${EGDIR} && \
209 for file in \ 214 for file in \
210 highperformance-std.conf \ 215 highperformance-std.conf \
211 httpd-std.conf \ 216 httpd-std.conf \
212 ssl-std.conf; \ 217 ssl-std.conf; \
213 do \ 218 do \
214 ${AWK} ' \ 219 ${AWK} ' \
215 /^Listen[ ]*80/ { \ 220 /^Listen[ ]*80/ { \
216 printf "%s", "Listen 0.0.0.0:80\n"; \ 221 printf "%s", "Listen 0.0.0.0:80\n"; \
217 next; \ 222 next; \
218 } \ 223 } \
219 /^Listen[ ]*443/ { \ 224 /^Listen[ ]*443/ { \
220 printf "%s", "Listen 0.0.0.0:443\n"; \ 225 printf "%s", "Listen 0.0.0.0:443\n"; \
221 next; \ 226 next; \
222 } \ 227 } \
223 { print; } \ 228 { print; } \
224 ' < "$${file}" >> $${file}.new; \ 229 ' < "$${file}" >> $${file}.new; \
225 ${MV} -f $${file}.new $${file}; \ 230 ${MV} -f $${file}.new $${file}; \
226 done 231 done
227 232
228 ${INSTALL_DATA_DIR} ${PREFIX}/share/httpd/manual 233 cd ${WRKSRC}/docs/manual && pax -rw . ${DESTDIR}${PREFIX}/share/httpd/manual
229 cd ${WRKSRC}/docs/manual && pax -rw . ${PREFIX}/share/httpd/manual 
230 234
231 ${INSTALL_SCRIPT} ${WRKDIR}/mkcert ${PREFIX}/sbin 235 ${INSTALL_SCRIPT} ${WRKDIR}/mkcert ${DESTDIR}${PREFIX}/sbin
232 236
233 for file in ${FIX_PERMS}; do \ 237 for file in ${FIX_PERMS}; do \
234 ${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/sbin/$$file && \ 238 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/sbin/$$file && \
235 ${CHMOD} ${BINMODE} ${PREFIX}/sbin/$$file; \ 239 ${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/sbin/$$file; \
236 done 240 done
237 241
238 ${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/share/httpd 242 ${CHOWN} -R ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/share/httpd
239 ${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/include/httpd 243 ${CHOWN} -R ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/include/httpd
240 ${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/lib/httpd 244 ${CHOWN} -R ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/lib/httpd
241 ${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/libexec/cgi-bin/test-cgi 245 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/libexec/cgi-bin/test-cgi
242 ${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/libexec/cgi-bin/printenv 246 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/libexec/cgi-bin/printenv
243 247
244 for file in ${FIX_MAN_PERMS}; do \ 248 for file in ${FIX_MAN_PERMS}; do \
245 ${CHOWN} ${MANOWN}:${MANGRP} ${PREFIX}/${PKGMANDIR}/$$file; \ 249 ${CHOWN} ${MANOWN}:${MANGRP} ${DESTDIR}${PREFIX}/${PKGMANDIR}/$$file; \
246 done 250 done
247 251
248 ${INSTALL_SCRIPT} ${WRKSRC}/build/mkdir.sh ${PREFIX}/share/httpd/build 252 ${INSTALL_SCRIPT} ${WRKSRC}/build/mkdir.sh ${DESTDIR}${PREFIX}/share/httpd/build
249 253
250.include "../../mk/bsd.pkg.mk" 254.include "../../mk/bsd.pkg.mk"