diff options
author | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2003-01-02 08:29:24 +0000 |
---|---|---|
committer | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2003-01-02 08:29:24 +0000 |
commit | 4d96268805b755692a5da5ab6f5bdf87572e7bcd (patch) | |
tree | 65cca3d9af68bd2bd20e6d13cab9561d2c58b35d /devel/apr1 | |
parent | upgrade to 1.2 (diff) |
upgrade to 0.9.1
PR: 46390
Submitted by: Craig Rodrigues <rodrigc@attbi.com> (new maintainer)
Approved by: old maintainer
Notes
Notes:
svn path=/head/; revision=72176
Diffstat (limited to 'devel/apr1')
-rw-r--r-- | devel/apr1/Makefile | 27 | ||||
-rw-r--r-- | devel/apr1/distinfo | 4 | ||||
-rw-r--r-- | devel/apr1/files/patch-apr-Makefile.in | 11 | ||||
-rw-r--r-- | devel/apr1/files/patch-apr-misc-unix-getopt.c | 15 | ||||
-rw-r--r-- | devel/apr1/pkg-plist | 135 |
5 files changed, 83 insertions, 109 deletions
diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile index e8ac4b176f6a..afb10f911822 100644 --- a/devel/apr1/Makefile +++ b/devel/apr1/Makefile @@ -6,13 +6,12 @@ # PORTNAME= apr -PORTVERSION= 20020725223645 -PORTREVISION= 1 +PORTVERSION= 0.9.1 CATEGORIES= devel -MASTER_SITES= http://www.apache.org/dist/apr/not-released/ -DISTFILES= apr_${PORTVERSION}.tar.gz apr-util_20020725223700.tar.gz +MASTER_SITES= http://www.apache.org/dist/apr/ +DISTFILES= apr-${PORTVERSION}.tar.gz apr-util-${PORTVERSION}.tar.gz -MAINTAINER= rooneg@electricjellyfish.net +MAINTAINER= rodrigc@attbi.com BUILD_DEPENDS+= libtool:${PORTSDIR}/devel/libtool LIB_DEPENDS+= expat.4:${PORTSDIR}/textproc/expat2 \ @@ -34,28 +33,28 @@ APR_UTIL_CONF_ENV=${CONFIGURE_ENV} \ CPPFLAGS="-I${PREFIX}/include" \ LDFLAGS="-L${PREFIX}/lib" -APR_UTIL_CONF_ARGS= --with-apr=../apr/ --with-expat=${PREFIX} +APR_UTIL_CONF_ARGS= --with-apr=../apr-${PORTVERSION} --with-expat=${PREFIX} pre-fetch: ${SH} pkg-install apr PRE-INSTALL pre-configure: - cd ${WRKDIR}/apr; ./buildconf - cd ${WRKDIR}/apr-util; ./buildconf + cd ${WRKDIR}/apr-${PORTVERSION}; ./buildconf + cd ${WRKDIR}/apr-util-${PORTVERSION}; ./buildconf do-configure: - cd ${WRKDIR}/apr; \ + cd ${WRKDIR}/apr-${PORTVERSION}; \ ${SETENV} ${APR_CONF_ENV} ./configure ${CONFIGURE_ARGS} - cd ${WRKDIR}/apr-util; \ + cd ${WRKDIR}/apr-util-${PORTVERSION}; \ ${SETENV} ${APR_UTIL_CONF_ENV} \ ./configure ${CONFIGURE_ARGS} ${APR_UTIL_CONF_ARGS} do-build: - cd ${WRKDIR}/apr; ${SETENV} ${MAKE_ENV} make - cd ${WRKDIR}/apr-util; ${SETENV} ${MAKE_ENV} make + cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${MAKE_ENV} make + cd ${WRKDIR}/apr-util-${PORTVERSION}; ${SETENV} ${MAKE_ENV} make do-install: - cd ${WRKDIR}/apr; ${SETENV} ${MAKE_ENV} make install - cd ${WRKDIR}/apr-util; ${SETENV} ${MAKE_ENV} make install + cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${MAKE_ENV} make install + cd ${WRKDIR}/apr-util-${PORTVERSION}; ${SETENV} ${MAKE_ENV} make install .include <bsd.port.mk> diff --git a/devel/apr1/distinfo b/devel/apr1/distinfo index 4a51902da4a6..e4092ddcb79b 100644 --- a/devel/apr1/distinfo +++ b/devel/apr1/distinfo @@ -1,2 +1,2 @@ -MD5 (apr_20020725223645.tar.gz) = e95ba59919ae9d6d36abc2b42575f743 -MD5 (apr-util_20020725223700.tar.gz) = 9098f2d1b6c502166cd83bff8f8b22cb +MD5 (apr-0.9.1.tar.gz) = 862ab3e00695f065235f6f25ea6cbace +MD5 (apr-util-0.9.1.tar.gz) = fb1a1e360a2b643ab447e993975e3397 diff --git a/devel/apr1/files/patch-apr-Makefile.in b/devel/apr1/files/patch-apr-Makefile.in deleted file mode 100644 index d56603894624..000000000000 --- a/devel/apr1/files/patch-apr-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- apr/Makefile.in.orig Mon Mar 18 20:14:35 2002 -+++ apr/Makefile.in Mon Mar 18 20:11:05 2002 -@@ -42,7 +42,7 @@ - includedir=@includedir@ - srcdir=@srcdir@ - top_srcdir=@top_srcdir@ --top_blddir=@top_builddir@ -+top_blddir=@apr_builddir@ - - EXPORT_FILES = $(top_srcdir)/include/*.h - diff --git a/devel/apr1/files/patch-apr-misc-unix-getopt.c b/devel/apr1/files/patch-apr-misc-unix-getopt.c deleted file mode 100644 index 2634000a14cd..000000000000 --- a/devel/apr1/files/patch-apr-misc-unix-getopt.c +++ /dev/null @@ -1,15 +0,0 @@ ---- apr/misc/unix/getopt.c.orig Thu Nov 29 06:19:51 2001 -+++ apr/misc/unix/getopt.c Sun Aug 11 11:29:01 2002 -@@ -237,10 +237,12 @@ - for (i = 0; ; i++) { - if (opts[i].optch == 0) /* No match */ - return serr(os, "invalid option", p - 2, APR_BADCH); -+ if (opts[i].name) { - len = strlen(opts[i].name); - if (strncmp(p, opts[i].name, len) == 0 - && (p[len] == '\0' || p[len] == '=')) - break; -+ } - } - *optch = opts[i].optch; - diff --git a/devel/apr1/pkg-plist b/devel/apr1/pkg-plist index 9bd99684be72..5f6cc366f0a1 100644 --- a/devel/apr1/pkg-plist +++ b/devel/apr1/pkg-plist @@ -1,69 +1,70 @@ -bin/apr-config -bin/apu-config -include/apr.h -include/apr_allocator.h -include/apr_anylock.h -include/apr_atomic.h -include/apr_base64.h -include/apr_buckets.h -include/apr_compat.h -include/apr_date.h -include/apr_dbm.h -include/apr_dso.h -include/apr_errno.h -include/apr_file_info.h -include/apr_file_io.h -include/apr_fnmatch.h -include/apr_general.h -include/apr_getopt.h -include/apr_global_mutex.h -include/apr_hash.h -include/apr_hooks.h -include/apr_inherit.h -include/apr_ldap.h -include/apr_lib.h -include/apr_md4.h -include/apr_md5.h -include/apr_mmap.h -include/apr_network_io.h -include/apr_optional.h -include/apr_optional_hooks.h -include/apr_pools.h -include/apr_poll.h -include/apr_portable.h -include/apr_proc_mutex.h -include/apr_ring.h -include/apr_rmm.h -include/apr_sdbm.h -include/apr_sha1.h -include/apr_shm.h -include/apr_signal.h -include/apr_strings.h -include/apr_strmatch.h -include/apr_support.h -include/apr_tables.h -include/apr_thread_cond.h -include/apr_thread_mutex.h -include/apr_thread_proc.h -include/apr_thread_rwlock.h -include/apr_time.h -include/apr_uri.h -include/apr_user.h -include/apr_uuid.h -include/apr_version.h -include/apr_want.h -include/apr_xlate.h -include/apr_xml.h -include/apu.h -include/apu_compat.h -lib/APRVARS +include/apr-0/apr.h +include/apr-0/apr_version.h +include/apr-0/apr_user.h +include/apr-0/apr_time.h +include/apr-0/apr_thread_rwlock.h +include/apr-0/apr_thread_proc.h +include/apr-0/apr_thread_mutex.h +include/apr-0/apr_thread_cond.h +include/apr-0/apr_tables.h +include/apr-0/apr_support.h +include/apr-0/apr_strings.h +include/apr-0/apr_signal.h +include/apr-0/apr_shm.h +include/apr-0/apr_ring.h +include/apr-0/apr_proc_mutex.h +include/apr-0/apr_portable.h +include/apr-0/apr_pools.h +include/apr-0/apr_poll.h +include/apr-0/apr_network_io.h +include/apr-0/apr_mmap.h +include/apr-0/apr_lib.h +include/apr-0/apr_inherit.h +include/apr-0/apr_hash.h +include/apr-0/apr_global_mutex.h +include/apr-0/apr_getopt.h +include/apr-0/apr_general.h +include/apr-0/apr_fnmatch.h +include/apr-0/apr_file_io.h +include/apr-0/apr_file_info.h +include/apr-0/apr_errno.h +include/apr-0/apr_dso.h +include/apr-0/apr_compat.h +include/apr-0/apr_atomic.h +include/apr-0/apr_allocator.h +include/apr-0/apr_want.h +include/apr-0/apr_anylock.h +include/apr-0/apu_compat.h +include/apr-0/apu.h +include/apr-0/apr_xml.h +include/apr-0/apr_xlate.h +include/apr-0/apr_uuid.h +include/apr-0/apr_uri.h +include/apr-0/apr_strmatch.h +include/apr-0/apr_sha1.h +include/apr-0/apr_sdbm.h +include/apr-0/apr_rmm.h +include/apr-0/apr_reslist.h +include/apr-0/apr_queue.h +include/apr-0/apr_optional_hooks.h +include/apr-0/apr_optional.h +include/apr-0/apr_md5.h +include/apr-0/apr_md4.h +include/apr-0/apr_ldap.h +include/apr-0/apr_hooks.h +include/apr-0/apr_dbm.h +include/apr-0/apr_date.h +include/apr-0/apr_buckets.h +include/apr-0/apr_base64.h +include/apr-0/apu_version.h +lib/libapr-0.so.9 +lib/libapr-0.la +lib/libapr-0.a lib/apr.exp +lib/libaprutil-0.so.9 +lib/libaprutil-0.la +lib/libaprutil-0.a lib/aprutil.exp -lib/libapr.a -lib/libapr.la -lib/libapr.so -lib/libapr.so.0 -lib/libaprutil.a -lib/libaprutil.la -lib/libaprutil.so -lib/libaprutil.so.0 +build/libtool +bin/apr-config +bin/apu-config |