diff options
author | kuriyama <kuriyama@FreeBSD.org> | 2004-03-15 22:07:47 +0800 |
---|---|---|
committer | kuriyama <kuriyama@FreeBSD.org> | 2004-03-15 22:07:47 +0800 |
commit | a9ce63f040bdd63c7c26e9031c25b7262d7230b0 (patch) | |
tree | 4ad3955a979181143b1e8aeded9c2482080940ff /devel/apr | |
parent | 668d10eedf7213bfcf61872c385317312ce33ada (diff) | |
download | freebsd-ports-gnome-a9ce63f040bdd63c7c26e9031c25b7262d7230b0.tar.gz freebsd-ports-gnome-a9ce63f040bdd63c7c26e9031c25b7262d7230b0.tar.zst freebsd-ports-gnome-a9ce63f040bdd63c7c26e9031c25b7262d7230b0.zip |
Unbreak on 4.x.
Submitted by: maintainer
Diffstat (limited to 'devel/apr')
-rw-r--r-- | devel/apr/Makefile | 23 |
1 files changed, 8 insertions, 15 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} |