View | Details | Raw Unified | Return to bug 191471 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-4 / +10 lines)
Lines 24-33 Link Here
24
24
25
.include <bsd.port.pre.mk>
25
.include <bsd.port.pre.mk>
26
26
27
.if ${APACHE_VERSION} > 22
28
BROKEN=	Does not build with apache24
29
.endif
30
31
# Using apxs in this way is problematic if apache2 is installed under a
27
# Using apxs in this way is problematic if apache2 is installed under a
32
# different PREFIX than mod_perl2, because the mod_perl2 installation will
28
# different PREFIX than mod_perl2, because the mod_perl2 installation will
33
# use paths returned by apxs to install some components. Fixes welcome.
29
# use paths returned by apxs to install some components. Fixes welcome.
Lines 58-63 Link Here
58
	${REINPLACE_CMD} -e "s|/usr/local/apache/bin/apxs|${APXS}|" \
54
	${REINPLACE_CMD} -e "s|/usr/local/apache/bin/apxs|${APXS}|" \
59
			-e "s|'bin', 'apxs'|'sbin', 'apxs'|" \
55
			-e "s|'bin', 'apxs'|'sbin', 'apxs'|" \
60
			${WRKSRC}/lib/Apache2/Build.pm
56
			${WRKSRC}/lib/Apache2/Build.pm
57
.if ${APACHE_VERSION} > 22
58
	${REINPLACE_CMD} -e "s,remote_addr,client_addr,g" \
59
		-e "s,remote_ip,client_ip,g" \
60
		-e "s/'loglevel'/'log.level'/g" \
61
		${WRKSRC}/xs/maps/apache2_structures.map
62
	${REINPLACE_CMD} -e "s,remote_addr,client_addr,g" \
63
		-e "s,remote_ip,client_ip,g" \
64
		-e "s/'loglevel'/'log.level'/g" \
65
		${WRKSRC}/xs/tables/current/Apache2/StructureTable.pm
66
.endif
61
67
62
pre-configure:
68
pre-configure:
63
	@${FIND} ${WRKSRC} -type f \( -name \*.bak -o -name \*.orig \) -delete
69
	@${FIND} ${WRKSRC} -type f \( -name \*.bak -o -name \*.orig \) -delete

Return to bug 191471