diff options
| author | Philip M. Gollucci <pgollucci@FreeBSD.org> | 2009-06-10 05:53:27 +0000 |
|---|---|---|
| committer | Philip M. Gollucci <pgollucci@FreeBSD.org> | 2009-06-10 05:53:27 +0000 |
| commit | d906134aee33d170d487f20edeeb3bf06082b260 (patch) | |
| tree | 8c066dd4466af9e5a60aef7b76acadc9ebd1ef20 /devel/apr2/Makefile | |
| parent | 0fb954b294873f22bf2c28028c6af645aa435d68 (diff) | |
Notes
Diffstat (limited to 'devel/apr2/Makefile')
| -rw-r--r-- | devel/apr2/Makefile | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile index 8886fdb26ae8..536d8aae3dd6 100644 --- a/devel/apr2/Makefile +++ b/devel/apr2/Makefile @@ -6,6 +6,7 @@ PORTNAME= apr PORTVERSION= ${APR_VERSION}.${APU_VERSION} +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_APACHE} MASTER_SITE_SUBDIR= apr @@ -37,6 +38,8 @@ USE_PYTHON_BUILD= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes +CONFIGURE_ENV= CC="${CC}" CFLAGS="${CFLAGS}" + NO_WRKSUBDIR= yes APR_WRKDIR= ${WRKDIR}/apr-${APR_VERSION} APU_WRKDIR= ${WRKDIR}/apr-util-${APU_VERSION} @@ -49,7 +52,7 @@ APU_CONF_ARGS= --with-apr=${APR_WRKDIR} \ --with-expat=${LOCALBASE} \ --with-iconv=${LOCALBASE} -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> ########## APR Options .if defined(WITHOUT_THREADS) @@ -177,8 +180,11 @@ PLIST_SUB+= APU_EXTRAS="@comment " post-patch: ${REINPLACE_CMD} -e 's/OSVERSION/'${OSVERSION}'/g' \ ${APR_WRKDIR}/build/apr_hints.m4 - ${FIND} ${WRKDIR} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \ + ${FIND} ${APR_WRKDIR} ${APU_WRKDIR} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \ 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' + ${REINPLACE_CMD} -e 's,-lpthreads,${PTHREAD_LIBS},g' \ + ${APR_WRKDIR}/build/apr_threads.m4 ${APR_WRKDIR}/build/apr_hints.m4 \ + ${APU_WRKDIR}/build/apu-conf.m4 run-autotools:: cd ${APR_WRKDIR} ; \ @@ -220,4 +226,4 @@ debug_autoconf: @${ECHO} "${SETENV} ${CONFIGURE_ENV} ${SH} ./configure ${CONFIGURE_ARGS} ${APR_CONF_ARGS}" @${ECHO} "${SETENV} ${CONFIGURE_ENV} ${SH} ./configure ${CONFIGURE_ARGS} ${APR_UTIL_CONF_ARGS}" -.include <bsd.port.post.mk> +.include <bsd.port.mk> |