From 8a8f284c0d8dfcac6a39c4be5ca659981fa44a4d Mon Sep 17 00:00:00 2001 From: rodrigc Date: Mon, 6 Jun 2005 15:16:42 +0000 Subject: Do not unconditionally use Python in build of apr. PR: 80479 Submitted by: Brian Minard Approved by: demon (ports mentor) --- devel/apr/Makefile | 11 +++++++++-- devel/apr0/Makefile | 11 +++++++++-- devel/apr1/Makefile | 11 +++++++++-- devel/apr2/Makefile | 11 +++++++++-- 4 files changed, 36 insertions(+), 8 deletions(-) diff --git a/devel/apr/Makefile b/devel/apr/Makefile index 7272bb0fcdc..823eaccd67a 100644 --- a/devel/apr/Makefile +++ b/devel/apr/Makefile @@ -13,6 +13,8 @@ # (the database bindings are detected and recorded automatically if these # switches are not set) # APR_UTIL_WITH_LDAP: force dependency on OpenLDAP +# WITH_PYTHON: force dependency on Python and run APR's buildconf. +# Really only needed if built from APR's CVS depot. PORTNAME= apr PORTVERSION= 1.0.1 @@ -25,7 +27,12 @@ DISTFILES= apr-${PORTVERSION}.tar.gz apr-util-${PORTVERSION}.tar.gz MAINTAINER= rodrigc@crodrigues.org COMMENT= The Apache Group's Portability Library +.if defined(WITH_PYTHON) BUILD_DEPENDS= ${PYTHON_CMD}:${PYTHON_PORTSDIR} +USE_PYTHON= yes +PYTHON_NO_DEPENDS= yes +.endif + LIB_DEPENDS+= expat.5:${PORTSDIR}/textproc/expat2 USE_ICONV= yes @@ -35,8 +42,6 @@ WANT_LIBTOOL_VER= 15 USE_REINPLACE= yes USE_PERL5= yes USE_GMAKE= yes -USE_PYTHON= yes -PYTHON_NO_DEPENDS= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes WRKSRC= ${WRKDIR} @@ -141,12 +146,14 @@ pre-configure: .endfor run-autotools: +.if defined(WITH_PYTHON) cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} ${SH} ./buildconf cd ${WRKDIR}/apr-util-${PORTVERSION} ; \ ${RM} -fr xml/expat cd ${WRKDIR}/apr-util-${PORTVERSION} ; \ ${SETENV} ${SCRIPTS_ENV} ${SH} ./buildconf \ --with-apr=../apr-${PORTVERSION} +.endif cd ${WRKDIR}/apr-${PORTVERSION}; \ ${SETENV} ${SCRIPTS_ENV} ${SH} ./configure ${CONFIGURE_ARGS} cd ${WRKDIR}/apr-util-${PORTVERSION}; \ diff --git a/devel/apr0/Makefile b/devel/apr0/Makefile index 7272bb0fcdc..823eaccd67a 100644 --- a/devel/apr0/Makefile +++ b/devel/apr0/Makefile @@ -13,6 +13,8 @@ # (the database bindings are detected and recorded automatically if these # switches are not set) # APR_UTIL_WITH_LDAP: force dependency on OpenLDAP +# WITH_PYTHON: force dependency on Python and run APR's buildconf. +# Really only needed if built from APR's CVS depot. PORTNAME= apr PORTVERSION= 1.0.1 @@ -25,7 +27,12 @@ DISTFILES= apr-${PORTVERSION}.tar.gz apr-util-${PORTVERSION}.tar.gz MAINTAINER= rodrigc@crodrigues.org COMMENT= The Apache Group's Portability Library +.if defined(WITH_PYTHON) BUILD_DEPENDS= ${PYTHON_CMD}:${PYTHON_PORTSDIR} +USE_PYTHON= yes +PYTHON_NO_DEPENDS= yes +.endif + LIB_DEPENDS+= expat.5:${PORTSDIR}/textproc/expat2 USE_ICONV= yes @@ -35,8 +42,6 @@ WANT_LIBTOOL_VER= 15 USE_REINPLACE= yes USE_PERL5= yes USE_GMAKE= yes -USE_PYTHON= yes -PYTHON_NO_DEPENDS= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes WRKSRC= ${WRKDIR} @@ -141,12 +146,14 @@ pre-configure: .endfor run-autotools: +.if defined(WITH_PYTHON) cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} ${SH} ./buildconf cd ${WRKDIR}/apr-util-${PORTVERSION} ; \ ${RM} -fr xml/expat cd ${WRKDIR}/apr-util-${PORTVERSION} ; \ ${SETENV} ${SCRIPTS_ENV} ${SH} ./buildconf \ --with-apr=../apr-${PORTVERSION} +.endif cd ${WRKDIR}/apr-${PORTVERSION}; \ ${SETENV} ${SCRIPTS_ENV} ${SH} ./configure ${CONFIGURE_ARGS} cd ${WRKDIR}/apr-util-${PORTVERSION}; \ diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile index 7272bb0fcdc..823eaccd67a 100644 --- a/devel/apr1/Makefile +++ b/devel/apr1/Makefile @@ -13,6 +13,8 @@ # (the database bindings are detected and recorded automatically if these # switches are not set) # APR_UTIL_WITH_LDAP: force dependency on OpenLDAP +# WITH_PYTHON: force dependency on Python and run APR's buildconf. +# Really only needed if built from APR's CVS depot. PORTNAME= apr PORTVERSION= 1.0.1 @@ -25,7 +27,12 @@ DISTFILES= apr-${PORTVERSION}.tar.gz apr-util-${PORTVERSION}.tar.gz MAINTAINER= rodrigc@crodrigues.org COMMENT= The Apache Group's Portability Library +.if defined(WITH_PYTHON) BUILD_DEPENDS= ${PYTHON_CMD}:${PYTHON_PORTSDIR} +USE_PYTHON= yes +PYTHON_NO_DEPENDS= yes +.endif + LIB_DEPENDS+= expat.5:${PORTSDIR}/textproc/expat2 USE_ICONV= yes @@ -35,8 +42,6 @@ WANT_LIBTOOL_VER= 15 USE_REINPLACE= yes USE_PERL5= yes USE_GMAKE= yes -USE_PYTHON= yes -PYTHON_NO_DEPENDS= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes WRKSRC= ${WRKDIR} @@ -141,12 +146,14 @@ pre-configure: .endfor run-autotools: +.if defined(WITH_PYTHON) cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} ${SH} ./buildconf cd ${WRKDIR}/apr-util-${PORTVERSION} ; \ ${RM} -fr xml/expat cd ${WRKDIR}/apr-util-${PORTVERSION} ; \ ${SETENV} ${SCRIPTS_ENV} ${SH} ./buildconf \ --with-apr=../apr-${PORTVERSION} +.endif cd ${WRKDIR}/apr-${PORTVERSION}; \ ${SETENV} ${SCRIPTS_ENV} ${SH} ./configure ${CONFIGURE_ARGS} cd ${WRKDIR}/apr-util-${PORTVERSION}; \ diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile index 7272bb0fcdc..823eaccd67a 100644 --- a/devel/apr2/Makefile +++ b/devel/apr2/Makefile @@ -13,6 +13,8 @@ # (the database bindings are detected and recorded automatically if these # switches are not set) # APR_UTIL_WITH_LDAP: force dependency on OpenLDAP +# WITH_PYTHON: force dependency on Python and run APR's buildconf. +# Really only needed if built from APR's CVS depot. PORTNAME= apr PORTVERSION= 1.0.1 @@ -25,7 +27,12 @@ DISTFILES= apr-${PORTVERSION}.tar.gz apr-util-${PORTVERSION}.tar.gz MAINTAINER= rodrigc@crodrigues.org COMMENT= The Apache Group's Portability Library +.if defined(WITH_PYTHON) BUILD_DEPENDS= ${PYTHON_CMD}:${PYTHON_PORTSDIR} +USE_PYTHON= yes +PYTHON_NO_DEPENDS= yes +.endif + LIB_DEPENDS+= expat.5:${PORTSDIR}/textproc/expat2 USE_ICONV= yes @@ -35,8 +42,6 @@ WANT_LIBTOOL_VER= 15 USE_REINPLACE= yes USE_PERL5= yes USE_GMAKE= yes -USE_PYTHON= yes -PYTHON_NO_DEPENDS= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes WRKSRC= ${WRKDIR} @@ -141,12 +146,14 @@ pre-configure: .endfor run-autotools: +.if defined(WITH_PYTHON) cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} ${SH} ./buildconf cd ${WRKDIR}/apr-util-${PORTVERSION} ; \ ${RM} -fr xml/expat cd ${WRKDIR}/apr-util-${PORTVERSION} ; \ ${SETENV} ${SCRIPTS_ENV} ${SH} ./buildconf \ --with-apr=../apr-${PORTVERSION} +.endif cd ${WRKDIR}/apr-${PORTVERSION}; \ ${SETENV} ${SCRIPTS_ENV} ${SH} ./configure ${CONFIGURE_ARGS} cd ${WRKDIR}/apr-util-${PORTVERSION}; \ -- cgit