diff options
| -rw-r--r-- | UPDATING | 9 | ||||
| -rw-r--r-- | www/apache20/Makefile | 3 | ||||
| -rw-r--r-- | www/apache20/Makefile.doc | 7 | ||||
| -rw-r--r-- | www/apache20/Makefile.modules | 57 | ||||
| -rw-r--r-- | www/apache20/distinfo | 6 |
5 files changed, 37 insertions, 45 deletions
@@ -7,6 +7,15 @@ time you update your ports collection, before attempting any port upgrades. 20080120: + AFFECTS: users of www/apache20 + AUTHOR: clement@FreeBSD.org + + BDB framework provided by bsd.database.mk is now used by www/apache20 + port. WITH_BERKELEYDB knob is deprecated in favor of WITH_BDB and + WITH_BDB_VER/WITH_BDB_BASE, see documentation for more details. + ('make show-options'). + +20080120: AFFECTS: users of www/apache22 AUTHOR: clement@FreeBSD.org diff --git a/www/apache20/Makefile b/www/apache20/Makefile index b7d73fd578e8..23b5fcdb9afe 100644 --- a/www/apache20/Makefile +++ b/www/apache20/Makefile @@ -8,8 +8,7 @@ # PORTNAME= apache -PORTVERSION= 2.0.61 -PORTREVISION= 2 +PORTVERSION= 2.0.63 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} \ ${MASTER_SITE_LOCAL:S/$/:powerlogo/} diff --git a/www/apache20/Makefile.doc b/www/apache20/Makefile.doc index 30743ed70eac..4d8e373535b0 100644 --- a/www/apache20/Makefile.doc +++ b/www/apache20/Makefile.doc @@ -35,9 +35,10 @@ ## WITH_THREADS: Enable threads support !! USE IT WITH CARE !! ## WITH_DBM: Choose your DBM: bdb (Berkeley DB), gdbm or ## ndbm (default) -## WITH_BERKELEYDB: Choose your BerkeleyDB version: db2, db3, -## db4, db41, db42, db43 or FreeBSD (1.85) -## (default) +## WITH_BDB: Define to select bdb via bsd.database.mk +## desired version may be set with +## WITH_BDB_VER or APACHE22_WITH_BDB_VER +## WITH_BDB_BASE: Define to use bdb from base (1.85) ## WITH_STATIC_SUPPORT: Build statically linked support binaries ## WITH_STATIC_APACHE: Build a static version of httpd (implies ## WITH_STATIC_MODULES) diff --git a/www/apache20/Makefile.modules b/www/apache20/Makefile.modules index 168d9d567f82..97bc379b8847 100644 --- a/www/apache20/Makefile.modules +++ b/www/apache20/Makefile.modules @@ -45,11 +45,18 @@ PLIST_SUB+= PREFORK="@comment " WORKER="@comment " THREADPOOL="@comment " # xDBM section # -.if !defined(WITH_DBM) && defined(WITH_BERKELEYDB) +.if !defined(WITH_DBM) +. if defined(WITH_BDB) || defined(WITH_BDB_BASE) || defined(WITH_BERKELEYDB) WITH_DBM=bdb +. endif .endif -.if defined(WITH_DBM) && !defined(WITH_BERKELEYDB) -WITH_BERKELEYDB= FreeBSD + +.if defined(WITH_BERKELEYDB) +. if ${WITH_BERKELEYDB} == "FreeBSD" + WITH_BDB_BASE=YES +. else + WITH_BDB_VER=${WITH_BERKELEYDB:S/db//} +. endif .endif .if defined(WITH_DBM) @@ -59,40 +66,16 @@ CONFIGURE_ARGS+= --with-dbm=sdbm LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm CONFIGURE_ARGS+= --with-gdbm=${LOCALBASE} . elif ${WITH_DBM:L} == "db" || ${WITH_DBM:L} == "bdb" -. if ${WITH_BERKELEYDB} == "FreeBSD" -CONFIGURE_ARGS+= --with-dbm=db185 \ - --with-berkeley-db=/usr -. elif ${WITH_BERKELEYDB} == "db2" -LIB_DEPENDS+= db2:${PORTSDIR}/databases/db2 -CONFIGURE_ARGS+= --with-dbm=db2 \ - --with-berkeley-db=${LOCALBASE} -. elif ${WITH_BERKELEYDB} == "db3" -LIB_DEPENDS+= db3:${PORTSDIR}/databases/db3 -CONFIGURE_ARGS+= --with-dbm=db3 \ - --with-berkeley-db=${LOCALBASE} -. elif ${WITH_BERKELEYDB} == "db4" -LIB_DEPENDS+= db4:${PORTSDIR}/databases/db4 -CONFIGURE_ARGS+= --with-dbm=db4 \ - --with-berkeley-db=${LOCALBASE} -. elif ${WITH_BERKELEYDB} == "db41" -LIB_DEPENDS+= db41:${PORTSDIR}/databases/db41 -CONFIGURE_ARGS+= --with-dbm=db41 \ - --with-berkeley-db=${LOCALBASE} -. elif ${WITH_BERKELEYDB} == "db42" -LIB_DEPENDS+= db-4.2:${PORTSDIR}/databases/db42 -CONFIGURE_ARGS+= --with-dbm=db42 \ - --with-berkeley-db=${LOCALBASE}/include:${LOCALBASE}/lib/db42 -. elif ${WITH_BERKELEYDB} == "db43" -LIB_DEPENDS+= db-4.3:${PORTSDIR}/databases/db43 -CONFIGURE_ARGS+= --with-dbm=db43 \ - --with-berkeley-db=${LOCALBASE}/include:${LOCALBASE}/lib/db43 -. elif ${WITH_BERKELEYDB} == "db44" -LIB_DEPENDS+= db-4.4:${PORTSDIR}/databases/db44 -CONFIGURE_ARGS+= --with-dbm=db44 \ - --with-berkeley-db=${LOCALBASE}/include:${LOCALBASE}/lib/db44 -. else -IGNORE= "Unknown Berkeley DB version" -. endif +. if defined(WITH_BDB_BASE) +CONFIGURE_ARGS+= --with-dbm=db185 \ + --with-berkeley-db=/usr +. else +USE_BDB= yes +INVALID_BDB_VER= 46 +CONFIGURE_ARGS+= --with-dbm=db${BDB_VER:S/40/4/} \ + --with-berkeley-db=${LOCALBASE} +. endif +. else . else IGNORE= "Unknown DBM" . endif diff --git a/www/apache20/distinfo b/www/apache20/distinfo index 2df83d28f5e7..975f7e53ced9 100644 --- a/www/apache20/distinfo +++ b/www/apache20/distinfo @@ -1,6 +1,6 @@ -MD5 (apache2/httpd-2.0.61.tar.bz2) = 7d78bbaa17adc16ce4e0303a4fb87247 -SHA256 (apache2/httpd-2.0.61.tar.bz2) = c257d3a6c120a21a637b422cf9973be2fca9bee58ae70478f5235adb5fac8899 -SIZE (apache2/httpd-2.0.61.tar.bz2) = 4580339 +MD5 (apache2/httpd-2.0.63.tar.bz2) = c7924ebe95f9f66c9f80c0f9d4012152 +SHA256 (apache2/httpd-2.0.63.tar.bz2) = bbe879d82f347a6082a1fe11a94ea1e5d4c2c8ecfe1fbec9c514a9a7b82eba7a +SIZE (apache2/httpd-2.0.63.tar.bz2) = 4587670 MD5 (apache2/powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62 SHA256 (apache2/powerlogo.gif) = 0144675a80761b9660bdb652d331d9ba3bebdff89c0fa35a56aa463662a53254 SIZE (apache2/powerlogo.gif) = 5279 |