updated subversion (0.34.0)

added default bdb selection to the apache config.in (defaults to 42)


git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1968 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc

Documentation/Developers/CHANGELOG-RENE

@@ -5,6 +5,8 @@
                    various base updates
  - Alejandro Mery: updated mono, mono-doc, mono-debugger, mono-xsp,
                    mod_mono, gtk-sharp
+ - updated subversion (0.34.0)
+ - added default bdb selection to the apache config.in (defaults to 42)
 
 *) 2003-12-11 (2.0.0-rc3 - 2.0.0-rc4)
 

package/rene/apache/apache.conf

@@ -35,9 +35,13 @@ if [ $pkg = "apache" ] ; then
 	# or maybe www would be nicer than lib ?!? ...
 	var_append extraconfopt " " "--enable-dav --enable-cache \
 --enable-disk-cache --enable-ssl --enable-proxy \
---enable-speling --enable-rewrite --enable-so \
---with-berkeley-db=/usr/include/db40:/usr/lib"
+--enable-speling --enable-rewrite --enable-so"
 
 	hook_add postmake 3 "install_init httpd $confdir/httpd.init"
 fi
 
+if [ "$ROCKCFG_PKG_APACHE_BDB" ] ; then
+	var_append extraconfopt " " \
+	  "--with-berkeley-db=/usr/include/$ROCKCFG_PKG_APACHE_BDB:/usr/lib"
+fi
+

package/rene/apache/config.in

@@ -20,12 +20,27 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-
 if pkgcheck apache X
 then
  	menu_begin MENU_PKG_APACHE 'Apache Package Options'
-		text 'Install prefix for apache packages' \
-		     ROCKCFG_PKG_APACHE_PREFIX "opt/apache"
+	text 'Install prefix for apache packages' \
+	     ROCKCFG_PKG_APACHE_PREFIX "opt/apache"
+
+	list="" ; default=""
+	while read pkg ver ; do
+		if [ "$pkg" = "bdb42" ] ; then
+			default="$pkg"
+		elif [ "$default" = "" ] ; then
+			default="$pkg"
+		fi
+		list="$list $pkg Use_${pkg}_($ver)_as_standard_DB"
+	done < <(grep  "^X .* bdb[0-9 ]*" config/$config/packages | \
+	         cut -f5,6 -d' ' | sort)
+
+	if [ "$list" ] ; then
+		choice ROCKCFG_PKG_APACHE_BDB $default $list
+	fi
+
 	menu_end
 fi
 

package/rene/subversion-static/subversion-static.desc

@@ -36,8 +36,8 @@
 
 [L] OpenSource
 [S] Beta
-[V] 0.32.1
+[V] 0.34.0
 [P] X -----5---9 864.000
 
-[D] 171207409 subversion-0.32.1.tar.gz http://svn.collab.net/tarballs/
+[D] 56230852 subversion-0.34.0.tar.gz http://subversion.tigris.org/tarballs/
 

package/rene/subversion/subversion.conf

@@ -29,7 +29,8 @@
 if pkgcheck apache X ; then
 	var_append extraconfopt " " "--with-apxs=/$prefix/sbin/apxs \
 --with-apr=/$prefix/bin/apr-config --with-apr-util=/$prefix \
---with-berkeley-db=/usr/include/db40:/usr/lib --disable-mod-activation"
+--disable-mod-activation"
+# --with-berkeley-db=/usr/include/db40:/usr/lib
 fi
 
 # use system wide neon

package/rene/subversion/subversion.desc

@@ -36,8 +36,8 @@
 
 [L] OpenSource
 [S] Beta
-[V] 0.32.1
+[V] 0.34.0
 [P] X -----5---9 864.000
 
-[D] 171207409 subversion-0.32.1.tar.gz http://svn.collab.net/tarballs/
+[D] 56230852 subversion-0.34.0.tar.gz http://subversion.tigris.org/tarballs/