[svn-rock-linux] r3796 - trunk/package/rene/apache

[rock-svn at rocklinux.org]

Author: clifford
Date: 2004-08-11 13:09:35 +0200 (Wed, 11 Aug 2004)
New Revision: 3796

Modified:
   trunk/package/rene/apache/apache.conf
   trunk/package/rene/apache/config.hlp
   trunk/package/rene/apache/config.in
Log:

Stefan Fiedler:
        fix apache to correctly use pkgforked bdb packages

diff -dur rock-src-orig/package/rene/apache/apache.conf rock-src/package/rene/apache/apache.conf

[2004080923501330525] (https://www.rocklinux.net/submaster)



Modified: trunk/package/rene/apache/apache.conf
===================================================================
--- trunk/package/rene/apache/apache.conf	2004-08-11 11:02:39 UTC (rev 3795)
+++ trunk/package/rene/apache/apache.conf	2004-08-11 11:09:35 UTC (rev 3796)
@@ -36,6 +36,7 @@
 	var_append extraconfopt " " "--enable-dav --enable-cache \
 --enable-disk-cache --enable-ssl --enable-proxy \
 --enable-speling --enable-rewrite --enable-so --enable-deflate"
+	# --enable-speling is not a typo!
 
 	[ "$ROCKCFG_PKG_APACHE_INFO" == 1 ] && \
 		var_append extraconfopt " " "--enable-info" 
@@ -48,6 +49,6 @@
 
 if [ "$ROCKCFG_PKG_APACHE_BDB" ] ; then
 	var_append extraconfopt " " \
-	  "--with-berkeley-db=/usr/include/$ROCKCFG_PKG_APACHE_BDB:/usr/lib"
+	  "--with-berkeley-db=/usr/include/${ROCKCFG_PKG_APACHE_BDB#b}:/usr/lib"
 fi
 

Modified: trunk/package/rene/apache/config.hlp
===================================================================
--- trunk/package/rene/apache/config.hlp	2004-08-11 11:02:39 UTC (rev 3795)
+++ trunk/package/rene/apache/config.hlp	2004-08-11 11:09:35 UTC (rev 3796)
@@ -21,4 +21,4 @@
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
 MENU_PKG_APACHE
-  Here you will find config options for the apache packages.
+  Here you will find config options for the Apache packages.

Modified: trunk/package/rene/apache/config.in
===================================================================
--- trunk/package/rene/apache/config.in	2004-08-11 11:02:39 UTC (rev 3795)
+++ trunk/package/rene/apache/config.in	2004-08-11 11:09:35 UTC (rev 3796)
@@ -23,12 +23,13 @@
 if pkgcheck apache X
 then
  	menu_begin MENU_PKG_APACHE 'Apache Package Options'
-	text 'Install prefix for apache packages' \
+	text 'Install prefix for Apache packages' \
 	     ROCKCFG_PKG_APACHE_PREFIX "opt/apache"
 
 	pkgout
 	list="" ; default=""
 	while read pkg ver ; do
+		pkg=${pkg#bdb=}
 		if [ "$pkg" = "bdb42" ] ; then
 			default="$pkg"
 		elif [ "$default" = "" ] ; then