Undo previous commit, which for some reason caused .la files to

be installed only if Python was not used in the build.

Approved by:	demon (ports mentor)
This commit is contained in:
Craig Rodrigues 2005-06-12 17:51:34 +00:00
parent 6147af0d19
commit 5b95e58dfa
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=137332
4 changed files with 4 additions and 40 deletions

View file

@ -13,8 +13,6 @@
# (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
@ -27,12 +25,6 @@ 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
@ -42,6 +34,7 @@ WANT_LIBTOOL_VER= 15
USE_REINPLACE= yes
USE_PERL5= yes
USE_GMAKE= yes
USE_PYTHON_BUILD= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}
@ -146,14 +139,12 @@ 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}; \

View file

@ -13,8 +13,6 @@
# (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
@ -27,12 +25,6 @@ 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
@ -42,6 +34,7 @@ WANT_LIBTOOL_VER= 15
USE_REINPLACE= yes
USE_PERL5= yes
USE_GMAKE= yes
USE_PYTHON_BUILD= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}
@ -146,14 +139,12 @@ 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}; \

View file

@ -13,8 +13,6 @@
# (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
@ -27,12 +25,6 @@ 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
@ -42,6 +34,7 @@ WANT_LIBTOOL_VER= 15
USE_REINPLACE= yes
USE_PERL5= yes
USE_GMAKE= yes
USE_PYTHON_BUILD= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}
@ -146,14 +139,12 @@ 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}; \

View file

@ -13,8 +13,6 @@
# (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
@ -27,12 +25,6 @@ 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
@ -42,6 +34,7 @@ WANT_LIBTOOL_VER= 15
USE_REINPLACE= yes
USE_PERL5= yes
USE_GMAKE= yes
USE_PYTHON_BUILD= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}
@ -146,14 +139,12 @@ 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}; \