View | Details | Raw Unified | Return to bug 146130 | Differences between
and this patch

Collapse All | Expand All

(-)b/devel/apr/Makefile (-4 / +4 lines)
Lines 6-12 Link Here
6
6
7
PORTNAME=	apr
7
PORTNAME=	apr
8
PORTVERSION=	${APR_VERSION}.${APU_VERSION}
8
PORTVERSION=	${APR_VERSION}.${APU_VERSION}
9
PORTREVISION=	1
10
CATEGORIES=	devel
9
CATEGORIES=	devel
11
MASTER_SITES=	${MASTER_SITE_APACHE}
10
MASTER_SITES=	${MASTER_SITE_APACHE}
12
MASTER_SITE_SUBDIR=	apr
11
MASTER_SITE_SUBDIR=	apr
Lines 29-35 OPTIONS= THREADS "Enable Threads in apr" on \ Link Here
29
			PGSQL	"Enable Postgresql suport in apr-util"		off \
28
			PGSQL	"Enable Postgresql suport in apr-util"		off \
30
			SQLITE  "Enable SQLite3 support in apr-util"			off
29
			SQLITE  "Enable SQLite3 support in apr-util"			off
31
30
32
APR_VERSION=	1.3.9
31
APR_VERSION=	1.4.2
33
APU_VERSION=	1.3.9
32
APU_VERSION=	1.3.9
34
33
35
USE_ICONV=		yes
34
USE_ICONV=		yes
Lines 45-52 NO_WRKSUBDIR= yes Link Here
45
APR_WRKDIR=	${WRKDIR}/apr-${APR_VERSION}
44
APR_WRKDIR=	${WRKDIR}/apr-${APR_VERSION}
46
APU_WRKDIR=	${WRKDIR}/apr-util-${APU_VERSION}
45
APU_WRKDIR=	${WRKDIR}/apr-util-${APU_VERSION}
47
46
48
PLIST_SUB=	SHLIB_MAJOR="${SHLIB_MAJOR}"
47
PLIST_SUB=	SHLIB_APR_MAJOR="${SHLIB_APR_MAJOR}" SHLIB_APU_MAJOR="${SHLIB_APU_MAJOR}"
49
SHLIB_MAJOR=	3
48
SHLIB_APR_MAJOR=	4
49
SHLIB_APU_MAJOR=	3
50
50
51
APR_CONF_ARGS=	--with-installbuilddir=${DATADIR}/build-1
51
APR_CONF_ARGS=	--with-installbuilddir=${DATADIR}/build-1
52
APU_CONF_ARGS=	--with-apr=${APR_WRKDIR} \
52
APU_CONF_ARGS=	--with-apr=${APR_WRKDIR} \
(-)b/devel/apr/distinfo (-3 / +3 lines)
Lines 1-6 Link Here
1
MD5 (apr-1.3.9.tar.gz) = 85bcd8005153b8fa63b1e3f95ea31f07
1
MD5 (apr-1.4.2.tar.gz) = fc80cb54f158c2674f9eeb47a1f672cd
2
SHA256 (apr-1.3.9.tar.gz) = 562b5f7251f356a221641262e7ba7a4e1d966086df2fb46477ec9e2c748f9f28
2
SHA256 (apr-1.4.2.tar.gz) = 6a0291d6f6a59d5eab5ae5441c37b78b17f7a1a2fa1478741b7178f5fbc33ebe
3
SIZE (apr-1.3.9.tar.gz) = 1138996
3
SIZE (apr-1.4.2.tar.gz) = 949945
4
MD5 (apr-util-1.3.9.tar.gz) = cc2ec0ba4f01d88375f1170f762518fa
4
MD5 (apr-util-1.3.9.tar.gz) = cc2ec0ba4f01d88375f1170f762518fa
5
SHA256 (apr-util-1.3.9.tar.gz) = 20897069274a026057df26b90a6424da9d70318d930c99885c451d8753b8e4d9
5
SHA256 (apr-util-1.3.9.tar.gz) = 20897069274a026057df26b90a6424da9d70318d930c99885c451d8753b8e4d9
6
SIZE (apr-util-1.3.9.tar.gz) = 790952
6
SIZE (apr-util-1.3.9.tar.gz) = 790952
(-)b/devel/apr/files/patch-apr_buildconf (-2 / +2 lines)
Lines 1-5 Link Here
1
--- apr-1.3.9/buildconf.orig	2009-02-24 06:37:18.000000000 +0300
1
--- apr-1.4.2/buildconf.orig	2009-02-24 06:37:18.000000000 +0300
2
+++ apr-1.3.9/buildconf	2009-09-27 14:25:11.000000000 +0400
2
+++ apr-1.4.2/buildconf	2009-09-27 14:25:11.000000000 +0400
3
@@ -71,6 +71,7 @@
3
@@ -71,6 +71,7 @@
4
 
4
 
5
 echo "buildconf: Using libtool.m4 at ${ltfile}."
5
 echo "buildconf: Using libtool.m4 at ${ltfile}."
(-)b/devel/apr/files/patch-apr_hints.m4 (-2 / +2 lines)
Lines 1-5 Link Here
1
--- apr-1.3.9/build/apr_hints.m4.orig	Wed Oct 27 11:12:28 2004
1
--- apr-1.4.2/build/apr_hints.m4.orig	Wed Oct 27 11:12:28 2004
2
+++ apr-1.3.9/build/apr_hints.m4	Wed Oct 27 11:25:32 2004
2
+++ apr-1.4.2/build/apr_hints.m4	Wed Oct 27 11:25:32 2004
3
@@ -137,11 +137,7 @@
3
@@ -137,11 +137,7 @@
4
 	;;
4
 	;;
5
     *-freebsd*)
5
     *-freebsd*)
(-)b/devel/apr/pkg-plist (-3 / +2 lines)
Lines 79-89 lib/aprutil.exp Link Here
79
lib/libapr-1.a
79
lib/libapr-1.a
80
lib/libapr-1.la
80
lib/libapr-1.la
81
lib/libapr-1.so
81
lib/libapr-1.so
82
lib/libapr-1.so.%%SHLIB_MAJOR%%
82
lib/libapr-1.so.%%SHLIB_APR_MAJOR%%
83
lib/libaprutil-1.a
83
lib/libaprutil-1.a
84
lib/libaprutil-1.la
84
lib/libaprutil-1.la
85
lib/libaprutil-1.so
85
lib/libaprutil-1.so
86
lib/libaprutil-1.so.%%SHLIB_MAJOR%%
86
lib/libaprutil-1.so.%%SHLIB_APU_MAJOR%%
87
%%BDB%%lib/apr-util-1/apr_dbm_db-1.so
87
%%BDB%%lib/apr-util-1/apr_dbm_db-1.so
88
%%BDB%%lib/apr-util-1/apr_dbm_db.so
88
%%BDB%%lib/apr-util-1/apr_dbm_db.so
89
%%BDB%%lib/apr-util-1/apr_dbm_db.la
89
%%BDB%%lib/apr-util-1/apr_dbm_db.la
90
- 

Return to bug 146130