aboutsummaryrefslogtreecommitdiff
path: root/devel/apr
diff options
context:
space:
mode:
authorCraig Rodrigues <rodrigc@FreeBSD.org>2005-06-12 17:51:34 +0000
committerCraig Rodrigues <rodrigc@FreeBSD.org>2005-06-12 17:51:34 +0000
commit5b95e58dfa585242a4f76909e3bfb4479ea1769c (patch)
tree6d37b5040c10d4944c746cb8316e9ad83b325c6c /devel/apr
parent6147af0d19c281116aac5612f428311fbee239f4 (diff)
downloadports-5b95e58dfa585242a4f76909e3bfb4479ea1769c.tar.gz
ports-5b95e58dfa585242a4f76909e3bfb4479ea1769c.zip
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)
Notes
Notes: svn path=/head/; revision=137332
Diffstat (limited to 'devel/apr')
-rw-r--r--devel/apr/Makefile11
1 files changed, 1 insertions, 10 deletions
diff --git a/devel/apr/Makefile b/devel/apr/Makefile
index 823eaccd67aa..a846a64db23c 100644
--- a/devel/apr/Makefile
+++ b/devel/apr/Makefile
@@ -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}; \