From 316c784d67a9548f38587662af783c53ace44b2d Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Wed, 11 Aug 2004 11:09:35 +0000 Subject: [PATCH] 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) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@3796 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/rene/apache/apache.conf | 3 ++- package/rene/apache/config.hlp | 2 +- package/rene/apache/config.in | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/rene/apache/apache.conf b/package/rene/apache/apache.conf index df67f445f..a05bdf3e9 100644 --- a/package/rene/apache/apache.conf +++ b/package/rene/apache/apache.conf @@ -36,6 +36,7 @@ if [ $pkg = "apache" ] ; then 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 @@ fi 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 diff --git a/package/rene/apache/config.hlp b/package/rene/apache/config.hlp index d43812c1f..526c121c9 100644 --- a/package/rene/apache/config.hlp +++ b/package/rene/apache/config.hlp @@ -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. diff --git a/package/rene/apache/config.in b/package/rene/apache/config.in index d068266d6..1ed8ffdf1 100644 --- a/package/rene/apache/config.in +++ b/package/rene/apache/config.in @@ -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