Unbreak on 4.x.

Submitted by:	maintainer

4 files changed, 32 insertions, 60 deletions

diff --git a/devel/apr/Makefile b/devel/apr/Makefile
index c18e32ab7f9d..67173ae54e5d 100644
--- a/devel/apr/Makefile
+++ b/devel/apr/Makefile
@@ -44,10 +44,6 @@ APR_UTIL_CONF_ARGS=	--with-apr=../apr-${PORTVERSION} \
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-BROKEN=		"Configure fails on 4.x"
-.endif
-
 .if defined(APR_UTIL_WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--disable-threads
 APR_UTIL_CONF_ARGS+=	--disable-threads
@@ -122,25 +118,22 @@ post-extract:
 
 pre-configure:
 	cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} ./buildconf
-	cd ${WRKDIR}/apr-util-${PORTVERSION}; \
-		${SETENV} ${SCRIPTS_ENV} ./buildconf \
+	cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
+	${RM} -fr xml/expat
+	cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
+		${SH} ./buildconf \
 		--with-apr=../apr-${PORTVERSION}
 
-do-configure:
-	@CONFIG_GUESS_DIRS=$$(${FIND} ${WRKDIR} -name config.guess -o -name config.sub \
-		| ${XARGS} -n 1 ${DIRNAME}); \
-	for _D in $${CONFIG_GUESS_DIRS}; do \
-		${CP} -f ${TEMPLATES}/config.guess $${_D}/config.guess; \
-		${CHMOD} a+rx $${_D}/config.guess; \
-	    ${CP} -f ${TEMPLATES}/config.sub $${_D}/config.sub; \
-		${CHMOD} a+rx $${_D}/config.sub; \
-	done
+run-autotools:
 	cd ${WRKDIR}/apr-${PORTVERSION}; \
 		${SETENV} ${SCRIPTS_ENV} ${SH} ./configure ${CONFIGURE_ARGS}
 	cd ${WRKDIR}/apr-util-${PORTVERSION}; \
 		${SETENV} ${SCRIPTS_ENV} ${SH} \
 		./configure ${CONFIGURE_ARGS} ${APR_UTIL_CONF_ARGS}
 
+do-configure:
+	${DO_NADA}
+
 do-build:
 	cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${MAKE_ENV} ${GMAKE}
 	cd ${WRKDIR}/apr-util-${PORTVERSION}; ${SETENV} ${MAKE_ENV} ${GMAKE}
diff --git a/devel/apr0/Makefile b/devel/apr0/Makefile
index c18e32ab7f9d..67173ae54e5d 100644
--- a/devel/apr0/Makefile
+++ b/devel/apr0/Makefile
@@ -44,10 +44,6 @@ APR_UTIL_CONF_ARGS=	--with-apr=../apr-${PORTVERSION} \
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-BROKEN=		"Configure fails on 4.x"
-.endif
-
 .if defined(APR_UTIL_WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--disable-threads
 APR_UTIL_CONF_ARGS+=	--disable-threads
@@ -122,25 +118,22 @@ post-extract:
 
 pre-configure:
 	cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} ./buildconf
-	cd ${WRKDIR}/apr-util-${PORTVERSION}; \
-		${SETENV} ${SCRIPTS_ENV} ./buildconf \
+	cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
+	${RM} -fr xml/expat
+	cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
+		${SH} ./buildconf \
 		--with-apr=../apr-${PORTVERSION}
 
-do-configure:
-	@CONFIG_GUESS_DIRS=$$(${FIND} ${WRKDIR} -name config.guess -o -name config.sub \
-		| ${XARGS} -n 1 ${DIRNAME}); \
-	for _D in $${CONFIG_GUESS_DIRS}; do \
-		${CP} -f ${TEMPLATES}/config.guess $${_D}/config.guess; \
-		${CHMOD} a+rx $${_D}/config.guess; \
-	    ${CP} -f ${TEMPLATES}/config.sub $${_D}/config.sub; \
-		${CHMOD} a+rx $${_D}/config.sub; \
-	done
+run-autotools:
 	cd ${WRKDIR}/apr-${PORTVERSION}; \
 		${SETENV} ${SCRIPTS_ENV} ${SH} ./configure ${CONFIGURE_ARGS}
 	cd ${WRKDIR}/apr-util-${PORTVERSION}; \
 		${SETENV} ${SCRIPTS_ENV} ${SH} \
 		./configure ${CONFIGURE_ARGS} ${APR_UTIL_CONF_ARGS}
 
+do-configure:
+	${DO_NADA}
+
 do-build:
 	cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${MAKE_ENV} ${GMAKE}
 	cd ${WRKDIR}/apr-util-${PORTVERSION}; ${SETENV} ${MAKE_ENV} ${GMAKE}
diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile
index c18e32ab7f9d..67173ae54e5d 100644
--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@@ -44,10 +44,6 @@ APR_UTIL_CONF_ARGS=	--with-apr=../apr-${PORTVERSION} \
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-BROKEN=		"Configure fails on 4.x"
-.endif
-
 .if defined(APR_UTIL_WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--disable-threads
 APR_UTIL_CONF_ARGS+=	--disable-threads
@@ -122,25 +118,22 @@ post-extract:
 
 pre-configure:
 	cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} ./buildconf
-	cd ${WRKDIR}/apr-util-${PORTVERSION}; \
-		${SETENV} ${SCRIPTS_ENV} ./buildconf \
+	cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
+	${RM} -fr xml/expat
+	cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
+		${SH} ./buildconf \
 		--with-apr=../apr-${PORTVERSION}
 
-do-configure:
-	@CONFIG_GUESS_DIRS=$$(${FIND} ${WRKDIR} -name config.guess -o -name config.sub \
-		| ${XARGS} -n 1 ${DIRNAME}); \
-	for _D in $${CONFIG_GUESS_DIRS}; do \
-		${CP} -f ${TEMPLATES}/config.guess $${_D}/config.guess; \
-		${CHMOD} a+rx $${_D}/config.guess; \
-	    ${CP} -f ${TEMPLATES}/config.sub $${_D}/config.sub; \
-		${CHMOD} a+rx $${_D}/config.sub; \
-	done
+run-autotools:
 	cd ${WRKDIR}/apr-${PORTVERSION}; \
 		${SETENV} ${SCRIPTS_ENV} ${SH} ./configure ${CONFIGURE_ARGS}
 	cd ${WRKDIR}/apr-util-${PORTVERSION}; \
 		${SETENV} ${SCRIPTS_ENV} ${SH} \
 		./configure ${CONFIGURE_ARGS} ${APR_UTIL_CONF_ARGS}
 
+do-configure:
+	${DO_NADA}
+
 do-build:
 	cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${MAKE_ENV} ${GMAKE}
 	cd ${WRKDIR}/apr-util-${PORTVERSION}; ${SETENV} ${MAKE_ENV} ${GMAKE}
diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile
index c18e32ab7f9d..67173ae54e5d 100644
--- a/devel/apr2/Makefile
+++ b/devel/apr2/Makefile
@@ -44,10 +44,6 @@ APR_UTIL_CONF_ARGS=	--with-apr=../apr-${PORTVERSION} \
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-BROKEN=		"Configure fails on 4.x"
-.endif
-
 .if defined(APR_UTIL_WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--disable-threads
 APR_UTIL_CONF_ARGS+=	--disable-threads
@@ -122,25 +118,22 @@ post-extract:
 
 pre-configure:
 	cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} ./buildconf
-	cd ${WRKDIR}/apr-util-${PORTVERSION}; \
-		${SETENV} ${SCRIPTS_ENV} ./buildconf \
+	cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
+	${RM} -fr xml/expat
+	cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
+		${SH} ./buildconf \
 		--with-apr=../apr-${PORTVERSION}
 
-do-configure:
-	@CONFIG_GUESS_DIRS=$$(${FIND} ${WRKDIR} -name config.guess -o -name config.sub \
-		| ${XARGS} -n 1 ${DIRNAME}); \
-	for _D in $${CONFIG_GUESS_DIRS}; do \
-		${CP} -f ${TEMPLATES}/config.guess $${_D}/config.guess; \
-		${CHMOD} a+rx $${_D}/config.guess; \
-	    ${CP} -f ${TEMPLATES}/config.sub $${_D}/config.sub; \
-		${CHMOD} a+rx $${_D}/config.sub; \
-	done
+run-autotools:
 	cd ${WRKDIR}/apr-${PORTVERSION}; \
 		${SETENV} ${SCRIPTS_ENV} ${SH} ./configure ${CONFIGURE_ARGS}
 	cd ${WRKDIR}/apr-util-${PORTVERSION}; \
 		${SETENV} ${SCRIPTS_ENV} ${SH} \
 		./configure ${CONFIGURE_ARGS} ${APR_UTIL_CONF_ARGS}
 
+do-configure:
+	${DO_NADA}
+
 do-build:
 	cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${MAKE_ENV} ${GMAKE}
 	cd ${WRKDIR}/apr-util-${PORTVERSION}; ${SETENV} ${MAKE_ENV} ${GMAKE}