From 19604084cb2266f2bd45df5435882812eed567f6 Mon Sep 17 00:00:00 2001 From: "Bruce A. Mah" Date: Fri, 28 Mar 2003 05:46:27 +0000 Subject: Update to 0.9.2-alpha. Mostly updated from the PR, plus a couple of fixes to get version numbers to work correctly and a plist fix-up. PR: 50309 Submitted by: plasmaball@pchome.com.tw, Craig Rodrigues Approved by: Craig Rodrigues (MAINTAINER) --- devel/apr2/Makefile | 26 +++++++++++++++----------- devel/apr2/distinfo | 4 ++-- devel/apr2/files/patch-configure.in | 19 ------------------- devel/apr2/pkg-plist | 3 +++ 4 files changed, 20 insertions(+), 32 deletions(-) delete mode 100644 devel/apr2/files/patch-configure.in (limited to 'devel/apr2') diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile index 204a1964836e..c8f5aec8e6b1 100644 --- a/devel/apr2/Makefile +++ b/devel/apr2/Makefile @@ -6,10 +6,11 @@ # PORTNAME= apr -PORTVERSION= 0.9.1 +PORTVERSION= 0.9.2.a +INTERNALPORTVERSION= 0.9.2 CATEGORIES= devel MASTER_SITES= http://www.apache.org/dist/apr/ -DISTFILES= apr-${PORTVERSION}.tar.gz apr-util-${PORTVERSION}.tar.gz +DISTFILES= apr-${INTERNALPORTVERSION}-alpha.tar.gz apr-util-${INTERNALPORTVERSION}-alpha.tar.gz MAINTAINER= rodrigc@attbi.com COMMENT= The Apache Group's Portability Library @@ -35,28 +36,31 @@ APR_UTIL_CONF_ENV=${CONFIGURE_ENV} \ CPPFLAGS="-I${PREFIX}/include" \ LDFLAGS="-L${PREFIX}/lib" -APR_UTIL_CONF_ARGS= --with-apr=../apr-${PORTVERSION} --with-expat=${PREFIX} +APR_UTIL_CONF_ARGS= --with-apr=../apr-${INTERNALPORTVERSION} \ + --with-expat=${PREFIX} \ + --with-iconv=${PREFIX} pre-fetch: ${SH} pkg-install apr PRE-INSTALL pre-configure: - cd ${WRKDIR}/apr-${PORTVERSION}; ./buildconf - cd ${WRKDIR}/apr-util-${PORTVERSION}; ./buildconf + cd ${WRKDIR}/apr-${INTERNALPORTVERSION}; ./buildconf + cd ${WRKDIR}/apr-util-${INTERNALPORTVERSION}; ./buildconf \ + --with-apr=../apr-${INTERNALPORTVERSION} do-configure: - cd ${WRKDIR}/apr-${PORTVERSION}; \ + cd ${WRKDIR}/apr-${INTERNALPORTVERSION}; \ ${SETENV} ${APR_CONF_ENV} ./configure ${CONFIGURE_ARGS} - cd ${WRKDIR}/apr-util-${PORTVERSION}; \ + cd ${WRKDIR}/apr-util-${INTERNALPORTVERSION}; \ ${SETENV} ${APR_UTIL_CONF_ENV} \ ./configure ${CONFIGURE_ARGS} ${APR_UTIL_CONF_ARGS} do-build: - cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${MAKE_ENV} make - cd ${WRKDIR}/apr-util-${PORTVERSION}; ${SETENV} ${MAKE_ENV} make + cd ${WRKDIR}/apr-${INTERNALPORTVERSION}; ${SETENV} ${MAKE_ENV} make + cd ${WRKDIR}/apr-util-${INTERNALPORTVERSION}; ${SETENV} ${MAKE_ENV} make do-install: - cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${MAKE_ENV} make install - cd ${WRKDIR}/apr-util-${PORTVERSION}; ${SETENV} ${MAKE_ENV} make install + cd ${WRKDIR}/apr-${INTERNALPORTVERSION}; ${SETENV} ${MAKE_ENV} make install + cd ${WRKDIR}/apr-util-${INTERNALPORTVERSION}; ${SETENV} ${MAKE_ENV} make install .include diff --git a/devel/apr2/distinfo b/devel/apr2/distinfo index e4092ddcb79b..2b6be14512a9 100644 --- a/devel/apr2/distinfo +++ b/devel/apr2/distinfo @@ -1,2 +1,2 @@ -MD5 (apr-0.9.1.tar.gz) = 862ab3e00695f065235f6f25ea6cbace -MD5 (apr-util-0.9.1.tar.gz) = fb1a1e360a2b643ab447e993975e3397 +MD5 (apr-0.9.2-alpha.tar.gz) = ff6879715965d453d917938718e9c0c2 +MD5 (apr-util-0.9.2-alpha.tar.gz) = fa8e4cd60961fc267f6f98d9df0af41a diff --git a/devel/apr2/files/patch-configure.in b/devel/apr2/files/patch-configure.in deleted file mode 100644 index 276f1a81362b..000000000000 --- a/devel/apr2/files/patch-configure.in +++ /dev/null @@ -1,19 +0,0 @@ ---- apr-util-0.9.1/configure.in.orig Tue Sep 10 06:10:50 2002 -+++ apr-util-0.9.1/configure.in Thu Dec 19 23:36:48 2002 -@@ -6,13 +6,13 @@ - AC_INIT(export_vars.sh.in) - - AC_CONFIG_HEADER(include/private/apu_config.h) --AC_CONFIG_AUX_DIR(../apr/build) -+AC_CONFIG_AUX_DIR(../apr-0.9.1/build) - - sinclude(build/apu-conf.m4) - sinclude(build/apu-iconv.m4) - sinclude(build/apu-hints.m4) --sinclude(../apr/build/apr_common.m4) --sinclude(../apr/build/find_apr.m4) -+sinclude(../apr-0.9.1/build/apr_common.m4) -+sinclude(../apr-0.9.1/build/find_apr.m4) - - dnl Generate ./config.nice for reproducing runs of configure - dnl diff --git a/devel/apr2/pkg-plist b/devel/apr2/pkg-plist index 4f4f26074bbb..4d3dddda0e39 100644 --- a/devel/apr2/pkg-plist +++ b/devel/apr2/pkg-plist @@ -1,5 +1,6 @@ bin/apr-config bin/apu-config +build/apr_rules.mk build/libtool include/apr-0/apr.h include/apr-0/apr_allocator.h @@ -11,6 +12,7 @@ include/apr-0/apr_compat.h include/apr-0/apr_date.h include/apr-0/apr_dbm.h include/apr-0/apr_dso.h +include/apr-0/apr_env.h include/apr-0/apr_errno.h include/apr-0/apr_file_info.h include/apr-0/apr_file_io.h @@ -22,6 +24,7 @@ include/apr-0/apr_hash.h include/apr-0/apr_hooks.h include/apr-0/apr_inherit.h include/apr-0/apr_ldap.h +include/apr-0/apr_ldap_url.h include/apr-0/apr_lib.h include/apr-0/apr_md4.h include/apr-0/apr_md5.h -- cgit v1.2.3