Attachment #122045 for bug #165143

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




		SQLITE  "Enable SQLite3 support in apr-util"		off \
		DEVRANDOM "Use /dev/random or compatible in apr"	on

APR_VERSION=	1.4.6
APU_VERSION=	1.4.1

USE_ICONV=		yes
USE_AUTOTOOLS=	automake autoconf libtool:env


PLIST_SUB=	SHLIB_APR_MAJOR="${SHLIB_APR_MAJOR}" SHLIB_APU_MAJOR="${SHLIB_APU_MAJOR}"
SHLIB_APR_MAJOR=	4
SHLIB_APU_MAJOR=	4

APR_CONF_ARGS=	--with-installbuilddir=${DATADIR}/build-1
APU_CONF_ARGS=	--with-apr=${APR_WRKDIR} \

########## APR Options
.if defined(WITHOUT_THREADS)
APR_CONF_ARGS+=	--disable-threads
.if defined(PKGNAMESUFFIX)
PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-nothr
.else
PKGNAMESUFFIX=	-nothr
.endif
.else
APR_CONF_ARGS+=	--enable-threads
.endif

APR_CONF_ARGS+=	--disable-ipv6
.else
APR_CONF_ARGS+=	--enable-ipv6
.if defined(PKGNAMESUFFIX)
PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-ipv6
.else
PKGNAMESUFFIX=	-ipv6
.endif
.endif

.if defined(WITHOUT_DEVRANDOM)
APR_CONF_ARGS+=	--without-devrandom
.else
APR_CONF_ARGS+=	--with-devrandom
.if defined(PKGNAMESUFFIX)
PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-devrandom
.else
PKGNAMESUFFIX=	-devrandom
.endif
.endif

######### APR-Util Options

APU_EXTRAS=	yes
LIB_DEPENDS+=	gdbm.4:${PORTSDIR}/databases/gdbm
APU_CONF_ARGS+=	--with-gdbm=${LOCALBASE}
.if defined(PKGNAMESUFFIX)
PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-gdbm
.else
PKGNAMESUFFIX=	-gdbm
.endif
.endif

.if defined(WITHOUT_BDB)

PLIST_SUB+=	BDB=""
USE_BDB=	42+
APU_CONF_ARGS+=	--with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR}
.if defined(PKGNAMESUFFIX)
PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,}
.else
PKGNAMESUFFIX=	-${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,}
.endif
.endif

.if defined(WITH_NDBM)
APU_EXTRAS=	yes
PLIST_SUB+=	NDBM=""
APU_CONF_ARGS+=	--with-ndbm=/usr
.if defined(PKGNAMESUFFIX)
PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-ndbm
.else
PKGNAMESUFFIX=	-ndbm
.endif
.else
PLIST_SUB+=	NDBM="@comment "
APU_CONF_ARGS+=	--without-ndbm

USE_OPENLDAP=	yes
APU_CONF_ARGS+=	--with-ldap-include=${LOCALBASE}/include \
	--with-ldap-lib=${LOCALBASE}/lib --with-ldap=ldap
.if defined(PKGNAMESUFFIX)
PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-ldap${OPENLDAP_VER}
.else
PKGNAMESUFFIX=	-ldap
.endif
.else
PLIST_SUB+=	LDAP="@comment "
APU_CONF_ARGS+=	--without-ldap

CONFIGURE_ENV+=	LIBS="${LIBS}"
CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H
LDFLAGS+=	-L${LOCALBASE}/lib/mysql
.if defined(PKGNAMESUFFIX)
PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-mysql${MYSQL_VER}
.else
PKGNAMESUFFIX=	-mysql
.endif
.else
PLIST_SUB+=	MYSQL="@comment "
APU_CONF_ARGS+=	--without-mysql

USE_PGSQL=	YES
APU_CONF_ARGS+=	--with-pgsql=${LOCALBASE}
CONFIGURE_ENV+=	ac_cv_path_PGSQL_CONFIG=""
.if defined(PKGNAMESUFFIX)
PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-pgsql${PGSQL_VER}
.else
PKGNAMESUFFIX=	-pgsql
.endif
.else
PLIST_SUB+=	PGSQL="@comment "
APU_CONF_ARGS+=	--without-pgsql

PLIST_SUB+=	SQLITE3=""
USE_SQLITE=	YES
APU_CONF_ARGS+=	--with-sqlite3=${LOCALBASE}
.if defined(PKGNAMESUFFIX)
PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-sqlite3
.else
PKGNAMESUFFIX=	-sqlite3
.endif
.else
APU_CONF_ARGS+=	--without-sqlite3
PLIST_SUB+=	SQLITE3="@comment "

Lines 1-4 Link Here

(-)distinfo (-4 / +4 lines)
1	SHA256 (apr-1.4.5.tar.gz) = 7323d5f72d6bddf7d1ecb63e4326df82a66210018bb2f1e8f6d97357e68302df	1	SHA256 (apr-1.4.6.tar.gz) = 538d593d805c36985fc6d200d31bf6c1b5f90df2a50b917902743a13bbc10e05
2	SIZE (apr-1.4.5.tar.gz) = 994320	2	SIZE (apr-1.4.6.tar.gz) = 982243
3	SHA256 (apr-util-1.3.12.tar.gz) = 815b6fc82950f61050a5e711a7f3c20fd9b6ffcc7a4cacfe9f291fb241210cd8	3	SHA256 (apr-util-1.4.1.tar.gz) = d636d9ef95c6e50e47fc338d532aa375edd11e5d7a3c30dee48beb38ddf4ab4c
4	SIZE (apr-util-1.3.12.tar.gz) = 769076	4	SIZE (apr-util-1.4.1.tar.gz) = 774770

Lines 11-16 Link Here

(-)pkg-plist (+2 lines)
11	include/apr-1/apr_atomic.h	11	include/apr-1/apr_atomic.h
12	include/apr-1/apr_base64.h	12	include/apr-1/apr_base64.h
13	include/apr-1/apr_buckets.h	13	include/apr-1/apr_buckets.h
		14	include/apr-1/apr_crypto.h
14	include/apr-1/apr_date.h	15	include/apr-1/apr_date.h
15	include/apr-1/apr_dbd.h	16	include/apr-1/apr_dbd.h
16	include/apr-1/apr_dbm.h	17	include/apr-1/apr_dbm.h
Lines 70-75 Link Here
70	include/apr-1/apr_xlate.h	71	include/apr-1/apr_xlate.h
71	include/apr-1/apr_xml.h	72	include/apr-1/apr_xml.h
72	include/apr-1/apu.h	73	include/apr-1/apu.h
		74	include/apr-1/apu_errno.h
73	include/apr-1/apu_version.h	75	include/apr-1/apu_version.h
74	include/apr-1/apu_want.h	76	include/apr-1/apu_want.h
75	libdata/pkgconfig/apr-1.pc	77	libdata/pkgconfig/apr-1.pc

Lines 1-5 Link Here

(-)files/patch-apr_hints.m4 (-2 / +2 lines)
1	--- apr-1.4.5/build/apr_hints.m4.orig Wed Oct 27 11:12:28 2004	1	--- apr-1.4.6/build/apr_hints.m4.orig Wed Oct 27 11:12:28 2004
2	+++ apr-1.4.5/build/apr_hints.m4 Wed Oct 27 11:25:32 2004	2	+++ apr-1.4.6/build/apr_hints.m4 Wed Oct 27 11:25:32 2004
3	@@ -159,11 +159,7 @@	3	@@ -159,11 +159,7 @@
4	;;	4	;;
5	-freebsd)	5	-freebsd)




--- apr-util-1.3.12/ldap/apr_ldap_rebind.c.orig	2011-06-18 14:42:15.000000000 +0000
+++ apr-util-1.3.12/ldap/apr_ldap_rebind.c	2011-06-18 14:42:28.000000000 +0000
@@ -81,11 +81,11 @@
     get_apd
 #endif
 
+#if APR_HAS_THREADS
     /* run after apr_thread_mutex_create cleanup */
     apr_pool_cleanup_register(pool, &apr_ldap_xref_lock, apr_ldap_pool_cleanup_set_null,
                               apr_pool_cleanup_null);
 
-#if APR_HAS_THREADS
     if (apr_ldap_xref_lock == NULL) {
         retcode = apr_thread_mutex_create(&apr_ldap_xref_lock, APR_THREAD_MUTEX_DEFAULT, pool);
     }

Return to bug 165143

Lines 30-37 Link Here

(-)Makefile (-53 / +3 lines)
30	SQLITE "Enable SQLite3 support in apr-util" off \	30	SQLITE "Enable SQLite3 support in apr-util" off \
31	DEVRANDOM "Use /dev/random or compatible in apr" on	31	DEVRANDOM "Use /dev/random or compatible in apr" on
32		32
33	APR_VERSION= 1.4.5	33	APR_VERSION= 1.4.6
34	APU_VERSION= 1.3.12	34	APU_VERSION= 1.4.1
35		35
36	USE_ICONV= yes	36	USE_ICONV= yes
37	USE_AUTOTOOLS= automake autoconf libtool:env	37	USE_AUTOTOOLS= automake autoconf libtool:env
Lines 48-54 Link Here
48		48
49	PLIST_SUB= SHLIB_APR_MAJOR="${SHLIB_APR_MAJOR}" SHLIB_APU_MAJOR="${SHLIB_APU_MAJOR}"	49	PLIST_SUB= SHLIB_APR_MAJOR="${SHLIB_APR_MAJOR}" SHLIB_APU_MAJOR="${SHLIB_APU_MAJOR}"
50	SHLIB_APR_MAJOR= 4	50	SHLIB_APR_MAJOR= 4
51	SHLIB_APU_MAJOR= 3	51	SHLIB_APU_MAJOR= 4
52		52
53	APR_CONF_ARGS= --with-installbuilddir=${DATADIR}/build-1	53	APR_CONF_ARGS= --with-installbuilddir=${DATADIR}/build-1
54	APU_CONF_ARGS= --with-apr=${APR_WRKDIR} \	54	APU_CONF_ARGS= --with-apr=${APR_WRKDIR} \
Lines 60-70 Link Here
60	########## APR Options	60	########## APR Options
61	.if defined(WITHOUT_THREADS)	61	.if defined(WITHOUT_THREADS)
62	APR_CONF_ARGS+= --disable-threads	62	APR_CONF_ARGS+= --disable-threads
63	.if defined(PKGNAMESUFFIX)
64	PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-nothr
65	.else
66	PKGNAMESUFFIX= -nothr
67	.endif
68	.else	63	.else
69	APR_CONF_ARGS+= --enable-threads	64	APR_CONF_ARGS+= --enable-threads
70	.endif	65	.endif
Lines 73-94 Link Here
73	APR_CONF_ARGS+= --disable-ipv6	68	APR_CONF_ARGS+= --disable-ipv6
74	.else	69	.else
75	APR_CONF_ARGS+= --enable-ipv6	70	APR_CONF_ARGS+= --enable-ipv6
76	.if defined(PKGNAMESUFFIX)
77	PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ipv6
78	.else
79	PKGNAMESUFFIX= -ipv6
80	.endif
81	.endif	71	.endif
82		72
83	.if defined(WITHOUT_DEVRANDOM)	73	.if defined(WITHOUT_DEVRANDOM)
84	APR_CONF_ARGS+= --without-devrandom	74	APR_CONF_ARGS+= --without-devrandom
85	.else	75	.else
86	APR_CONF_ARGS+= --with-devrandom	76	APR_CONF_ARGS+= --with-devrandom
87	.if defined(PKGNAMESUFFIX)
88	PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-devrandom
89	.else
90	PKGNAMESUFFIX= -devrandom
91	.endif
92	.endif	77	.endif
93		78
94	######### APR-Util Options	79	######### APR-Util Options
Lines 100-110 Link Here
100	APU_EXTRAS= yes	85	APU_EXTRAS= yes
101	LIB_DEPENDS+= gdbm.4:${PORTSDIR}/databases/gdbm	86	LIB_DEPENDS+= gdbm.4:${PORTSDIR}/databases/gdbm
102	APU_CONF_ARGS+= --with-gdbm=${LOCALBASE}	87	APU_CONF_ARGS+= --with-gdbm=${LOCALBASE}
103	.if defined(PKGNAMESUFFIX)
104	PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-gdbm
105	.else
106	PKGNAMESUFFIX= -gdbm
107	.endif
108	.endif	88	.endif
109		89
110	.if defined(WITHOUT_BDB)	90	.if defined(WITHOUT_BDB)
Lines 115-136 Link Here
115	PLIST_SUB+= BDB=""	95	PLIST_SUB+= BDB=""
116	USE_BDB= 42+	96	USE_BDB= 42+
117	APU_CONF_ARGS+= --with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR}	97	APU_CONF_ARGS+= --with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR}
118	.if defined(PKGNAMESUFFIX)
119	PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,}
120	.else
121	PKGNAMESUFFIX= -${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,}
122	.endif
123	.endif	98	.endif
124		99
125	.if defined(WITH_NDBM)	100	.if defined(WITH_NDBM)
126	APU_EXTRAS= yes	101	APU_EXTRAS= yes
127	PLIST_SUB+= NDBM=""	102	PLIST_SUB+= NDBM=""
128	APU_CONF_ARGS+= --with-ndbm=/usr	103	APU_CONF_ARGS+= --with-ndbm=/usr
129	.if defined(PKGNAMESUFFIX)
130	PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ndbm
131	.else
132	PKGNAMESUFFIX= -ndbm
133	.endif
134	.else	104	.else
135	PLIST_SUB+= NDBM="@comment "	105	PLIST_SUB+= NDBM="@comment "
136	APU_CONF_ARGS+= --without-ndbm	106	APU_CONF_ARGS+= --without-ndbm
Lines 142-152 Link Here
142	USE_OPENLDAP= yes	112	USE_OPENLDAP= yes
143	APU_CONF_ARGS+= --with-ldap-include=${LOCALBASE}/include \	113	APU_CONF_ARGS+= --with-ldap-include=${LOCALBASE}/include \
144	--with-ldap-lib=${LOCALBASE}/lib --with-ldap=ldap	114	--with-ldap-lib=${LOCALBASE}/lib --with-ldap=ldap
145	.if defined(PKGNAMESUFFIX)
146	PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ldap${OPENLDAP_VER}
147	.else
148	PKGNAMESUFFIX= -ldap
149	.endif
150	.else	115	.else
151	PLIST_SUB+= LDAP="@comment "	116	PLIST_SUB+= LDAP="@comment "
152	APU_CONF_ARGS+= --without-ldap	117	APU_CONF_ARGS+= --without-ldap
Lines 160-170 Link Here
160	CONFIGURE_ENV+= LIBS="${LIBS}"	125	CONFIGURE_ENV+= LIBS="${LIBS}"
161	CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H	126	CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H
162	LDFLAGS+= -L${LOCALBASE}/lib/mysql	127	LDFLAGS+= -L${LOCALBASE}/lib/mysql
163	.if defined(PKGNAMESUFFIX)
164	PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-mysql${MYSQL_VER}
165	.else
166	PKGNAMESUFFIX= -mysql
167	.endif
168	.else	128	.else
169	PLIST_SUB+= MYSQL="@comment "	129	PLIST_SUB+= MYSQL="@comment "
170	APU_CONF_ARGS+= --without-mysql	130	APU_CONF_ARGS+= --without-mysql
Lines 176-186 Link Here
176	USE_PGSQL= YES	136	USE_PGSQL= YES
177	APU_CONF_ARGS+= --with-pgsql=${LOCALBASE}	137	APU_CONF_ARGS+= --with-pgsql=${LOCALBASE}
178	CONFIGURE_ENV+= ac_cv_path_PGSQL_CONFIG=""	138	CONFIGURE_ENV+= ac_cv_path_PGSQL_CONFIG=""
179	.if defined(PKGNAMESUFFIX)
180	PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-pgsql${PGSQL_VER}
181	.else
182	PKGNAMESUFFIX= -pgsql
183	.endif
184	.else	139	.else
185	PLIST_SUB+= PGSQL="@comment "	140	PLIST_SUB+= PGSQL="@comment "
186	APU_CONF_ARGS+= --without-pgsql	141	APU_CONF_ARGS+= --without-pgsql
Lines 191-201 Link Here
191	PLIST_SUB+= SQLITE3=""	146	PLIST_SUB+= SQLITE3=""
192	USE_SQLITE= YES	147	USE_SQLITE= YES
193	APU_CONF_ARGS+= --with-sqlite3=${LOCALBASE}	148	APU_CONF_ARGS+= --with-sqlite3=${LOCALBASE}
194	.if defined(PKGNAMESUFFIX)
195	PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-sqlite3
196	.else
197	PKGNAMESUFFIX= -sqlite3
198	.endif
199	.else	149	.else
200	APU_CONF_ARGS+= --without-sqlite3	150	APU_CONF_ARGS+= --without-sqlite3
201	PLIST_SUB+= SQLITE3="@comment "	151	PLIST_SUB+= SQLITE3="@comment "

Removed Link Here

(-)files/patch-apr_ldap_rebind.c (-15 lines)
1	--- apr-util-1.3.12/ldap/apr_ldap_rebind.c.orig 2011-06-18 14:42:15.000000000 +0000
2	+++ apr-util-1.3.12/ldap/apr_ldap_rebind.c 2011-06-18 14:42:28.000000000 +0000
3	@@ -81,11 +81,11 @@
4	get_apd
5	#endif
6
7	+#if APR_HAS_THREADS
8	/* run after apr_thread_mutex_create cleanup */
9	apr_pool_cleanup_register(pool, &apr_ldap_xref_lock, apr_ldap_pool_cleanup_set_null,
10	apr_pool_cleanup_null);
11
12	-#if APR_HAS_THREADS
13	if (apr_ldap_xref_lock == NULL) {
14	retcode = apr_thread_mutex_create(&apr_ldap_xref_lock, APR_THREAD_MUTEX_DEFAULT, pool);
15	}