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

(-)ports/www/apache22/Makefile (-2 / +3 lines)
Lines 9-15 Link Here
9
9
10
PORTNAME=	apache
10
PORTNAME=	apache
11
PORTVERSION=	2.2.6
11
PORTVERSION=	2.2.6
12
PORTREVISION=	3
12
PORTREVISION=	4
13
CATEGORIES=	www
13
CATEGORIES=	www
14
MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD}
14
MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD}
15
DISTNAME=	httpd-${PORTVERSION}
15
DISTNAME=	httpd-${PORTVERSION}
Lines 60-66 Link Here
60
	PGSQL "Enable PostgreSQL support for apr-dbd" Off \
60
	PGSQL "Enable PostgreSQL support for apr-dbd" Off \
61
	SQLITE "Enable SQLite support for apr-dbd" Off \
61
	SQLITE "Enable SQLite support for apr-dbd" Off \
62
	IPV6 "Enable IPv6 support" On \
62
	IPV6 "Enable IPv6 support" On \
63
	PCRE_FROM_PORTS "Use devel/pcre instead of bundled one" Off
63
	PCRE_FROM_PORTS "Use devel/pcre instead of bundled one" Off \
64
	BDB "Enable BerkeleyDB dbm" Off
64
.include "${APACHEDIR}/Makefile.options"
65
.include "${APACHEDIR}/Makefile.options"
65
.endif
66
.endif
66
67
(-)ports/www/apache22/Makefile.doc (-3 / +4 lines)
Lines 37-45 Link Here
37
##      WITH_THREADS:             Enable threads support !! USE IT WITH CARE !!
37
##      WITH_THREADS:             Enable threads support !! USE IT WITH CARE !!
38
##      WITH_DBM:                 Choose your DBM: bdb (Berkeley DB), gdbm or
38
##      WITH_DBM:                 Choose your DBM: bdb (Berkeley DB), gdbm or
39
##                                ndbm (default)
39
##                                ndbm (default)
40
##          WITH_BERKELEYDB:      Choose your BerkeleyDB version: db2, db3,
40
##          WITH_BDB:             Define to select bdb via bsd.databases.mk
41
##                                db4, db41, db42, db43, db44, db45, db46 
41
##                                desired version may be set with
42
##                                or FreeBSD (1.85, default)
42
##                                WITH_BDB_VER or APACHE22_WITH_BDB_VER
43
##          WITH_BDB_BASE:        Define to use bdb from base (1.85)
43
##      WITH_STATIC_SUPPORT:      Build statically linked support binaries
44
##      WITH_STATIC_SUPPORT:      Build statically linked support binaries
44
##      WITH_STATIC_APACHE:       Build a static version of httpd (implies 
45
##      WITH_STATIC_APACHE:       Build a static version of httpd (implies 
45
##                                WITH_STATIC_MODULES)
46
##                                WITH_STATIC_MODULES)
(-)ports/www/apache22/Makefile.modules (-42 / +7 lines)
Lines 76-86 Link Here
76
76
77
# xDBM section
77
# xDBM section
78
#
78
#
79
.if !defined(WITH_DBM) && defined(WITH_BERKELEYDB)
79
.if !defined(WITH_DBM)
80
.   if defined(WITH_BDB) || defined(WITH_BDB_BASE)
80
WITH_DBM=bdb
81
WITH_DBM=bdb
81
.endif
82
.   endif
82
.if defined(WITH_DBM) && !defined(WITH_BERKELEYDB)
83
WITH_BERKELEYDB=	FreeBSD
84
.endif
83
.endif
85
84
86
.if defined(WITH_DBM)
85
.if defined(WITH_DBM)
Lines 90-136 Link Here
90
LIB_DEPENDS+=		gdbm.3:${PORTSDIR}/databases/gdbm
89
LIB_DEPENDS+=		gdbm.3:${PORTSDIR}/databases/gdbm
91
CONFIGURE_ARGS+=	--with-gdbm=${LOCALBASE}
90
CONFIGURE_ARGS+=	--with-gdbm=${LOCALBASE}
92
.   elif ${WITH_DBM:L} == "db" || ${WITH_DBM:L} == "bdb"
91
.   elif ${WITH_DBM:L} == "db" || ${WITH_DBM:L} == "bdb"
93
.       if ${WITH_BERKELEYDB} == "FreeBSD"
92
.	if defined(WITH_BDB_BASE)
94
CONFIGURE_ARGS+=	--with-dbm=db185 \
93
CONFIGURE_ARGS+=	--with-dbm=db185 \
95
			--with-berkeley-db=/usr
94
			--with-berkeley-db=/usr
96
.       elif ${WITH_BERKELEYDB} == "db2"
95
.	else
97
LIB_DEPENDS+=		db2:${PORTSDIR}/databases/db2
96
USE_BDB=		yes
98
CONFIGURE_ARGS+=	--with-dbm=db2 \
97
CONFIGURE_ARGS+=	--with-dbm=db${BDB_VER:S/40/4/} \
99
			--with-berkeley-db=${LOCALBASE}
100
.       elif ${WITH_BERKELEYDB} == "db3"
101
LIB_DEPENDS+=		db3:${PORTSDIR}/databases/db3
102
CONFIGURE_ARGS+=	--with-dbm=db3 \
103
			--with-berkeley-db=${LOCALBASE}
104
.       elif ${WITH_BERKELEYDB} == "db4"
105
LIB_DEPENDS+=		db4:${PORTSDIR}/databases/db4
106
CONFIGURE_ARGS+=	--with-dbm=db4 \
107
			--with-berkeley-db=${LOCALBASE}
108
.       elif ${WITH_BERKELEYDB} == "db41"
109
LIB_DEPENDS+=		db41:${PORTSDIR}/databases/db41
110
CONFIGURE_ARGS+=	--with-dbm=db41 \
111
			--with-berkeley-db=${LOCALBASE}
98
			--with-berkeley-db=${LOCALBASE}
112
.       elif ${WITH_BERKELEYDB} == "db42"
113
LIB_DEPENDS+=		db-4.2:${PORTSDIR}/databases/db42
114
CONFIGURE_ARGS+=	--with-dbm=db42 \
115
			--with-berkeley-db=${LOCALBASE}/include:${LOCALBASE}/lib/db42
116
.       elif ${WITH_BERKELEYDB} == "db43"
117
LIB_DEPENDS+=		db-4.3:${PORTSDIR}/databases/db43
118
CONFIGURE_ARGS+=	--with-dbm=db43 \
119
			--with-berkeley-db=${LOCALBASE}/include:${LOCALBASE}/lib/db43
120
.       elif ${WITH_BERKELEYDB} == "db44"
121
LIB_DEPENDS+=		db-4.4:${PORTSDIR}/databases/db44
122
CONFIGURE_ARGS+=	--with-dbm=db44 \
123
			--with-berkeley-db=${LOCALBASE}/include:${LOCALBASE}/lib/db44
124
.       elif ${WITH_BERKELEYDB} == "db45"
125
LIB_DEPENDS+=		db-4.5:${PORTSDIR}/databases/db45
126
CONFIGURE_ARGS+=	--with-dbm=db45 \
127
			--with-berkeley-db=${LOCALBASE}/include:${LOCALBASE}/lib/db45
128
.       elif ${WITH_BERKELEYDB} == "db46"
129
LIB_DEPENDS+=		db-4.6:${PORTSDIR}/databases/db46
130
CONFIGURE_ARGS+=	--with-dbm=db46 \
131
			--with-berkeley-db=${LOCALBASE}/include:${LOCALBASE}/lib/db46
132
.       else
133
IGNORE=		"Unknown Berkeley DB version"
134
.       endif
99
.       endif
135
.   else
100
.   else
136
IGNORE=		"Unknown DBM"
101
IGNORE=		"Unknown DBM"

Return to bug 119711