Attachment #53841 for bug #81459

View | Details | Raw Unified | Return to bug 81459
Collapse All | Expand All





BUILD_DEPENDS=	${NONEXISTANT}:${PORTSDIR}/devel/apr:configure

USE_REINPLACE=	yes
USE_APACHE=	yes
WANT_AUTOCONF_VER=253
WANT_LIBTOOL_VER=13

# Apache locations.
APACHECTL?=	${LOCALBASE}/sbin/apachectl
APR_LIB?=	${LOCALBASE}/lib/
APR_INCLUDE?=	${LOCALBASE}/include/apr-${APR_MAJORVER}/
APACHE_MODULES?=libexec/apache
APR_VER!=	cd ${PORTSDIR}/devel/apr && ${MAKE} -V PORTVERSION
APR_WRKSRC!=	cd ${PORTSDIR}/devel/apr && ${MAKE} -V WRKSRC
APR_MAJORVER=	${APR_VER:C/\..*//g}
APR_SRC=	${APR_WRKSRC}/apr-${APR_VER}
AUTOCONF?=	${LOCALBASE}/bin/autoconf

# If the user's changed the modules directory, pack things correctly.
PLIST_SUB=	APACHE_MODULES=${APACHE_MODULES}

# Build options.
APACHE_VERSION=	1.3.6
WRKSRC=		${WRKDIR}/${DISTNAME}/webapp
HAS_CONFIGURE=	yes
CONFIGURE_ARGS=	--with-apxs=${APXS} \

		--with-apr=${APR_SRC} \
		--without-ant

post-patch:
	${REINPLACE_CMD} -e 's/apr-config/apr-${APR_MAJORVER}-config/g' \
		${WRKSRC}/support/wa_apr.m4

pre-configure:
	cd ${WRKSRC} && ${AUTOCONF}


post-install:
	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.if !defined(NOPORTDOCS)
	${MKDIR} ${DOCSDIR}
	${INSTALL_MAN} ${WRKSRC}/INSTALL.txt ${DOCSDIR}
.endif

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)pkg-plist (-2 / +2 lines)
1	%%APACHE_MODULES%%/mod_webapp.so	1	%%APACHE_MODULES%%/mod_webapp.so
2	%%PORTDOCS%%share/doc/mod_webapp/INSTALL.txt	2	%%PORTDOCS%%%%DOCSDIR%%/INSTALL.txt
3	%%PORTDOCS%%@dirrm share/doc/mod_webapp	3	%%PORTDOCS%%@dirrm %%DOCSDIR%%

Added Link Here

(-)files/patch-lib-pr_warp_network.c (+11 lines)
1	--- lib/pr_warp_network.c.orig Wed May 25 10:37:48 2005
2	+++ lib/pr_warp_network.c Wed May 25 10:38:03 2005
3	@@ -142,7 +142,7 @@
4	apr_status_t ret=APR_SUCCESS;
5	apr_socket_t *sock=NULL;
6
7	- ret=apr_socket_create(&sock,AF_INET,SOCK_STREAM,wa_pool);
8	+ ret=apr_socket_create(&sock,AF_INET,SOCK_STREAM,0,wa_pool);
9	if (ret!=APR_SUCCESS) {
10	sock=NULL;
11	wa_log(WA_MARK,"Cannot create socket for conn. \"%s\"",conn->name);

Return to bug 81459

Lines 19-24 Link Here

(-)Makefile (-6 / +14 lines)
19		19
20	BUILD_DEPENDS= ${NONEXISTANT}:${PORTSDIR}/devel/apr:configure	20	BUILD_DEPENDS= ${NONEXISTANT}:${PORTSDIR}/devel/apr:configure
21		21
		22	USE_REINPLACE= yes
22	USE_APACHE= yes	23	USE_APACHE= yes
23	WANT_AUTOCONF_VER=253	24	WANT_AUTOCONF_VER=253
24	WANT_LIBTOOL_VER=13	25	WANT_LIBTOOL_VER=13
Lines 35-50 Link Here
35	# Apache locations.	36	# Apache locations.
36	APACHECTL?= ${LOCALBASE}/sbin/apachectl	37	APACHECTL?= ${LOCALBASE}/sbin/apachectl
37	APR_LIB?= ${LOCALBASE}/lib/	38	APR_LIB?= ${LOCALBASE}/lib/
38	APR_INCLUDE?= ${LOCALBASE}/include/apr-0/	39	APR_INCLUDE?= ${LOCALBASE}/include/apr-${APR_MAJORVER}/
39	APACHE_MODULES?= libexec/apache/	40	APACHE_MODULES?=libexec/apache
40	APR_SRC?= ${WRKDIRPREFIX}${PORTSDIR}/devel/apr/work/apr-?\.?\.?/	41	APR_VER!= cd ${PORTSDIR}/devel/apr && ${MAKE} -V PORTVERSION
		42	APR_WRKSRC!= cd ${PORTSDIR}/devel/apr && ${MAKE} -V WRKSRC
		43	APR_MAJORVER= ${APR_VER:C/\..*//g}
		44	APR_SRC= ${APR_WRKSRC}/apr-${APR_VER}
41	AUTOCONF?= ${LOCALBASE}/bin/autoconf	45	AUTOCONF?= ${LOCALBASE}/bin/autoconf
42		46
43	# If the user's changed the modules directory, pack things correctly.	47	# If the user's changed the modules directory, pack things correctly.
44	PLIST_SUB= APACHE_MODULES=${APACHE_MODULES}	48	PLIST_SUB= APACHE_MODULES=${APACHE_MODULES}
45		49
46	# Build options.	50	# Build options.
47	APACHE_VERSION= 1.3.6	51	APACHE_VERSION= 1.3.6
48	WRKSRC= ${WRKDIR}/${DISTNAME}/webapp	52	WRKSRC= ${WRKDIR}/${DISTNAME}/webapp
49	HAS_CONFIGURE= yes	53	HAS_CONFIGURE= yes
50	CONFIGURE_ARGS= --with-apxs=${APXS} \	54	CONFIGURE_ARGS= --with-apxs=${APXS} \
Lines 53-58 Link Here
53	--with-apr=${APR_SRC} \	57	--with-apr=${APR_SRC} \
54	--without-ant	58	--without-ant
55		59
		60	post-patch:
		61	${REINPLACE_CMD} -e 's/apr-config/apr-${APR_MAJORVER}-config/g' \
		62	${WRKSRC}/support/wa_apr.m4
		63
56	pre-configure:	64	pre-configure:
57	cd ${WRKSRC} && ${AUTOCONF}	65	cd ${WRKSRC} && ${AUTOCONF}
58		66
Lines 67-74 Link Here
67	post-install:	75	post-install:
68	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL	76	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
69	.if !defined(NOPORTDOCS)	77	.if !defined(NOPORTDOCS)
70	${MKDIR} ${PREFIX}/share/doc/mod_webapp	78	${MKDIR} ${DOCSDIR}
71	${INSTALL_MAN} ${WRKSRC}/INSTALL.txt ${PREFIX}/share/doc/mod_webapp	79	${INSTALL_MAN} ${WRKSRC}/INSTALL.txt ${DOCSDIR}
72	.endif	80	.endif
73		81
74	.include <bsd.port.post.mk>	82	.include <bsd.port.post.mk>