Attachment #27328 for bug #46390

View | Details | Raw Unified | Return to bug 46390
Collapse All | Expand All




#

PORTNAME=	apr
PORTVERSION=	0.9.1
PORTREVISION=	1
CATEGORIES=	devel
MASTER_SITES=	http://www.apache.org/dist/apr/
DISTFILES=	apr-${PORTVERSION}.tar.gz apr-util-${PORTVERSION}.tar.gz

MAINTAINER=	rooneg@electricjellyfish.net


	@${SH} pkg-install apr PRE-INSTALL

pre-configure:
	@(cd ${WRKDIR}/apr-${PORTVERSION}/ && ./buildconf)
	@(cd ${WRKDIR}/apr-util-${PORTVERSION}/ && ./buildconf)

do-configure:
	@(cd ${WRKDIR}/apr-${PORTVERSION}/ && ./configure --prefix=${PREFIX})
	@(cd ${WRKDIR}/apr-util-${PORTVERSION}/ && ${ENV} CPPFLAGS=-I${PREFIX}/include LDFLAGS=-L${PREFIX}/lib ./configure --prefix=${PREFIX} --with-apr=../apr-${PORTVERSION}/ --with-expat=${PREFIX})

do-build:
	@(cd ${WRKDIR}/apr-${PORTVERSION}/ && make)
	@(cd ${WRKDIR}/apr-util-${PORTVERSION}/ && make)

do-install:
	@(cd ${WRKDIR}/apr-${PORTVERSION}/ && make install)
	(cd ${WRKDIR}/apr-util-${PORTVERSION}/ && make install)

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)apr/distinfo (-2 / +2 lines)
1	MD5 (apr_20020725223645.tar.gz) = e95ba59919ae9d6d36abc2b42575f743	1	MD5 (apr-0.9.1.tar.gz) = 862ab3e00695f065235f6f25ea6cbace
2	MD5 (apr-util_20020725223700.tar.gz) = 9098f2d1b6c502166cd83bff8f8b22cb	2	MD5 (apr-util-0.9.1.tar.gz) = fb1a1e360a2b643ab447e993975e3397

Lines 1-11 Link Here

(-)apr/files/patch-apr-Makefile.in (-11 lines)
1	--- apr/Makefile.in.orig Mon Mar 18 20:14:35 2002
2	+++ apr/Makefile.in Mon Mar 18 20:11:05 2002
3	@@ -42,7 +42,7 @@
4	includedir=@includedir@
5	srcdir=@srcdir@
6	top_srcdir=@top_srcdir@
7	-top_blddir=@top_builddir@
8	+top_blddir=@apr_builddir@
9
10	EXPORT_FILES = $(top_srcdir)/include/*.h
11

Lines 1-15 Link Here

(-)apr/files/patch-apr-misc-unix-getopt.c (-15 lines)
1	--- apr/misc/unix/getopt.c.orig Thu Nov 29 06:19:51 2001
2	+++ apr/misc/unix/getopt.c Sun Aug 11 11:29:01 2002
3	@@ -237,10 +237,12 @@
4	for (i = 0; ; i++) {
5	if (opts[i].optch == 0) /* No match */
6	return serr(os, "invalid option", p - 2, APR_BADCH);
7	+ if (opts[i].name) {
8	len = strlen(opts[i].name);
9	if (strncmp(p, opts[i].name, len) == 0
10	&& (p[len] == '\0' \|\| p[len] == '='))
11	break;
12	+ }
13	}
14	*optch = opts[i].optch;
15




--- 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 




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
build/libtool
bin/apr-config
bin/apu-config
lib/libapr.so.0
lib/libaprutil.a
lib/libaprutil.la
lib/libaprutil.so
lib/libaprutil.so.0

Return to bug 46390

Lines 6-16 Link Here

(-)apr/Makefile (-12 / +11 lines)
6	#	6	#
7		7
8	PORTNAME= apr	8	PORTNAME= apr
9	PORTVERSION= 20020725223645	9	PORTVERSION= 0.9.1
10	PORTREVISION= 1
11	CATEGORIES= devel	10	CATEGORIES= devel
12	MASTER_SITES= http://www.apache.org/dist/apr/not-released/	11	MASTER_SITES= http://www.apache.org/dist/apr/
13	DISTFILES= apr_${PORTVERSION}.tar.gz apr-util_20020725223700.tar.gz	12	DISTFILES= apr-${PORTVERSION}.tar.gz apr-util-${PORTVERSION}.tar.gz
14		13
15	MAINTAINER= rooneg@electricjellyfish.net	14	MAINTAINER= rooneg@electricjellyfish.net
16		15
Lines 28-46 Link Here
28	@${SH} pkg-install apr PRE-INSTALL	27	@${SH} pkg-install apr PRE-INSTALL
29		28
30	pre-configure:	29	pre-configure:
31	@(cd ${WRKDIR}/apr/ && ./buildconf)	30	@(cd ${WRKDIR}/apr-${PORTVERSION}/ && ./buildconf)
32	@(cd ${WRKDIR}/apr-util/ && ./buildconf)	31	@(cd ${WRKDIR}/apr-util-${PORTVERSION}/ && ./buildconf)
33		32
34	do-configure:	33	do-configure:
35	@(cd ${WRKDIR}/apr/ && ./configure --prefix=${PREFIX})	34	@(cd ${WRKDIR}/apr-${PORTVERSION}/ && ./configure --prefix=${PREFIX})
36	@(cd ${WRKDIR}/apr-util/ && ${ENV} CPPFLAGS=-I${PREFIX}/include LDFLAGS=-L${PREFIX}/lib ./configure --prefix=${PREFIX} --with-apr=../apr/ --with-expat=${PREFIX})	35	@(cd ${WRKDIR}/apr-util-${PORTVERSION}/ && ${ENV} CPPFLAGS=-I${PREFIX}/include LDFLAGS=-L${PREFIX}/lib ./configure --prefix=${PREFIX} --with-apr=../apr-${PORTVERSION}/ --with-expat=${PREFIX})
37		36
38	do-build:	37	do-build:
39	@(cd ${WRKDIR}/apr/ && make)	38	@(cd ${WRKDIR}/apr-${PORTVERSION}/ && make)
40	@(cd ${WRKDIR}/apr-util/ && make)	39	@(cd ${WRKDIR}/apr-util-${PORTVERSION}/ && make)
41		40
42	do-install:	41	do-install:
43	@(cd ${WRKDIR}/apr/ && make install)	42	@(cd ${WRKDIR}/apr-${PORTVERSION}/ && make install)
44	(cd ${WRKDIR}/apr-util/ && make install)	43	(cd ${WRKDIR}/apr-util-${PORTVERSION}/ && make install)
45		44
46	.include <bsd.port.mk>	45	.include <bsd.port.mk>

Line 0 Link Here

(-)apr/files/patch-apr-util-configure.in (+19 lines)
	1	--- apr-util-0.9.1/configure.in.orig Tue Sep 10 06:10:50 2002
	2	+++ apr-util-0.9.1/configure.in Thu Dec 19 23:36:48 2002
	3	@@ -6,13 +6,13 @@
	4	AC_INIT(export_vars.sh.in)
	5
	6	AC_CONFIG_HEADER(include/private/apu_config.h)
	7	-AC_CONFIG_AUX_DIR(../apr/build)
	8	+AC_CONFIG_AUX_DIR(../apr-0.9.1/build)
	9
	10	sinclude(build/apu-conf.m4)
	11	sinclude(build/apu-iconv.m4)
	12	sinclude(build/apu-hints.m4)
	13	-sinclude(../apr/build/apr_common.m4)
	14	-sinclude(../apr/build/find_apr.m4)
	15	+sinclude(../apr-0.9.1/build/apr_common.m4)
	16	+sinclude(../apr-0.9.1/build/find_apr.m4)
	17
	18	dnl Generate ./config.nice for reproducing runs of configure
	19	dnl

Lines 1-69 Link Here

(-)apr/pkg-plist (-67 / +68 lines)
1	bin/apr-config	1	include/apr-0/apr.h
2	bin/apu-config	2	include/apr-0/apr_version.h
3	include/apr.h	3	include/apr-0/apr_user.h
4	include/apr_allocator.h	4	include/apr-0/apr_time.h
5	include/apr_anylock.h	5	include/apr-0/apr_thread_rwlock.h
6	include/apr_atomic.h	6	include/apr-0/apr_thread_proc.h
7	include/apr_base64.h	7	include/apr-0/apr_thread_mutex.h
8	include/apr_buckets.h	8	include/apr-0/apr_thread_cond.h
9	include/apr_compat.h	9	include/apr-0/apr_tables.h
10	include/apr_date.h	10	include/apr-0/apr_support.h
11	include/apr_dbm.h	11	include/apr-0/apr_strings.h
12	include/apr_dso.h	12	include/apr-0/apr_signal.h
13	include/apr_errno.h	13	include/apr-0/apr_shm.h
14	include/apr_file_info.h	14	include/apr-0/apr_ring.h
15	include/apr_file_io.h	15	include/apr-0/apr_proc_mutex.h
16	include/apr_fnmatch.h	16	include/apr-0/apr_portable.h
17	include/apr_general.h	17	include/apr-0/apr_pools.h
18	include/apr_getopt.h	18	include/apr-0/apr_poll.h
19	include/apr_global_mutex.h	19	include/apr-0/apr_network_io.h
20	include/apr_hash.h	20	include/apr-0/apr_mmap.h
21	include/apr_hooks.h	21	include/apr-0/apr_lib.h
22	include/apr_inherit.h	22	include/apr-0/apr_inherit.h
23	include/apr_ldap.h	23	include/apr-0/apr_hash.h
24	include/apr_lib.h	24	include/apr-0/apr_global_mutex.h
25	include/apr_md4.h	25	include/apr-0/apr_getopt.h
26	include/apr_md5.h	26	include/apr-0/apr_general.h
27	include/apr_mmap.h	27	include/apr-0/apr_fnmatch.h
28	include/apr_network_io.h	28	include/apr-0/apr_file_io.h
29	include/apr_optional.h	29	include/apr-0/apr_file_info.h
30	include/apr_optional_hooks.h	30	include/apr-0/apr_errno.h
31	include/apr_pools.h	31	include/apr-0/apr_dso.h
32	include/apr_poll.h	32	include/apr-0/apr_compat.h
33	include/apr_portable.h	33	include/apr-0/apr_atomic.h
34	include/apr_proc_mutex.h	34	include/apr-0/apr_allocator.h
35	include/apr_ring.h	35	include/apr-0/apr_want.h
36	include/apr_rmm.h	36	include/apr-0/apr_anylock.h
37	include/apr_sdbm.h	37	include/apr-0/apu_compat.h
38	include/apr_sha1.h	38	include/apr-0/apu.h
39	include/apr_shm.h	39	include/apr-0/apr_xml.h
40	include/apr_signal.h	40	include/apr-0/apr_xlate.h
41	include/apr_strings.h	41	include/apr-0/apr_uuid.h
42	include/apr_strmatch.h	42	include/apr-0/apr_uri.h
43	include/apr_support.h	43	include/apr-0/apr_strmatch.h
44	include/apr_tables.h	44	include/apr-0/apr_sha1.h
45	include/apr_thread_cond.h	45	include/apr-0/apr_sdbm.h
46	include/apr_thread_mutex.h	46	include/apr-0/apr_rmm.h
47	include/apr_thread_proc.h	47	include/apr-0/apr_reslist.h
48	include/apr_thread_rwlock.h	48	include/apr-0/apr_queue.h
49	include/apr_time.h	49	include/apr-0/apr_optional_hooks.h
50	include/apr_uri.h	50	include/apr-0/apr_optional.h
51	include/apr_user.h	51	include/apr-0/apr_md5.h
52	include/apr_uuid.h	52	include/apr-0/apr_md4.h
53	include/apr_version.h	53	include/apr-0/apr_ldap.h
54	include/apr_want.h	54	include/apr-0/apr_hooks.h
55	include/apr_xlate.h	55	include/apr-0/apr_dbm.h
56	include/apr_xml.h	56	include/apr-0/apr_date.h
57	include/apu.h	57	include/apr-0/apr_buckets.h
58	include/apu_compat.h	58	include/apr-0/apr_base64.h
59	lib/APRVARS	59	include/apr-0/apu_version.h
		60	lib/libapr-0.so.9
		61	lib/libapr-0.la
		62	lib/libapr-0.a
60	lib/apr.exp	63	lib/apr.exp
		64	lib/libaprutil-0.so.9
		65	lib/libaprutil-0.la
		66	lib/libaprutil-0.a
61	lib/aprutil.exp	67	lib/aprutil.exp
62	lib/libapr.a	68	build/libtool
63	lib/libapr.la	69	bin/apr-config
64	lib/libapr.so	70	bin/apu-config
65	lib/libapr.so.0
66	lib/libaprutil.a
67	lib/libaprutil.la
68	lib/libaprutil.so
69	lib/libaprutil.so.0