From marc@leeloo.intern.geht.de  Mon Jun 10 02:21:44 2002
Return-Path: <marc@leeloo.intern.geht.de>
Received: from leeloo.intern.geht.de (pD9527DC5.dip.t-dialin.net [217.82.125.197])
	by hub.freebsd.org (Postfix) with SMTP id 0349A37B40E
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 10 Jun 2002 02:21:42 -0700 (PDT)
Received: (qmail 6711 invoked by uid 1001); 10 Jun 2002 09:21:39 -0000
Message-Id: <20020610092139.6710.qmail@leeloo.intern.geht.de>
Date: 10 Jun 2002 09:21:39 -0000
From: marc@informatik.uni-bremen.de
Reply-To: marc@informatik.uni-bremen.de
To: FreeBSD-gnats-submit@freebsd.org
Cc: perky@fallin.lv
Subject: mv *-config to libdir to coexist with apr-devel
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         39091
>Category:       ports
>Synopsis:       mv *-config to libdir to coexist with apr-devel
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    perky
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 10 02:30:01 PDT 2002
>Closed-Date:    Wed Jan 08 11:30:31 GMT 2003
>Last-Modified:  Wed Jan 08 11:30:31 GMT 2003
>Originator:     Marc Recht
>Release:        FreeBSD 4.6-RC i386
>Organization:
>Environment:
System: FreeBSD leeloo.intern.geht.de 4.6-RC FreeBSD 4.6-RC #0: Sun Jun 9 23:03:22 CEST 2002 marc@leeloo.intern.geht.de:/usr/src/sys/compile/LEELOO i386


	
>Description:
apr-config and apu-config can't be in $PATH if we want other apr based software (eg. subversion) to be installed on the same box.
	
>How-To-Repeat:
	
>Fix:

	

--- apache2.diff begins here ---
diff -Nur apache2.old/files/patch-configure apache2/files/patch-configure
--- apache2.old/files/patch-configure	Fri Jun  7 22:54:03 2002
+++ apache2/files/patch-configure	Mon Jun 10 11:11:24 2002
@@ -1,5 +1,5 @@
---- configure.orig	Thu May  2 05:53:00 2002
-+++ configure	Wed May  8 16:12:46 2002
+--- configure.my	Fri Jun  7 23:00:19 2002
++++ configure	Fri Jun  7 23:03:19 2002
 @@ -1503,7 +1503,7 @@
        $srcdir/config.layout > $pldconf
    layout_name=$LAYOUT
@@ -9,6 +9,24 @@
    for var in prefix exec_prefix bindir sbindir libexecdir mandir \
               sysconfdir datadir errordir iconsdir htdocsdir cgidir \
               includedir localstatedir runtimedir logfiledir libdir \
+@@ -2510,7 +2510,7 @@
+   esac
+ 
+   # The eval makes quoting arguments work.
+-  if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir "$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir --datadir=$datadir --with-installbuilddir=$installbuilddir"
++  if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir "$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$libdir --datadir=$datadir --with-installbuilddir=$installbuilddir"
+   then :
+     echo "srclib/apr configured properly"
+   else
+@@ -2620,7 +2620,7 @@
+   esac
+ 
+   # The eval makes quoting arguments work.
+-  if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir "--with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir"
++  if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir "--with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$libdir"
+   then :
+     echo "srclib/apr-util configured properly"
+   else
 @@ -15077,6 +15077,9 @@
  
  cat >>confdefs.h <<_ACEOF
diff -Nur apache2.old/pkg-plist apache2/pkg-plist
--- apache2.old/pkg-plist	Fri Jun  7 22:54:03 2002
+++ apache2/pkg-plist	Mon Jun 10 11:15:17 2002
@@ -1,5 +1,3 @@
-bin/apr-config
-bin/apu-config
 @unexec if cmp -s %D/etc/apache2/highperformance.conf %D/etc/apache2/highperformance-std.conf; then rm -f %D/etc/apache2/highperformance.conf; fi
 etc/apache2/highperformance-std.conf
 @exec [ -f %B/highperformance.conf ] || cp %B/%f %B/highperformance.conf
@@ -117,6 +115,8 @@
 include/apache2/util_script.h
 include/apache2/util_time.h
 include/apache2/util_xml.h
+lib/apache2/apr-config
+lib/apache2/apu-config
 lib/apache2/APRVARS
 lib/apache2/apr.exp
 lib/apache2/aprutil.exp
--- apache2.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports->perky 
Responsible-Changed-By: tom 
Responsible-Changed-When: Wed Nov 20 11:39:48 PST 2002 
Responsible-Changed-Why:  
This is an apache2 PR, over to the port's maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=39091 
State-Changed-From-To: open->closed 
State-Changed-By: perky 
State-Changed-When: Wed Jan 8 11:30:14 GMT 2003 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=39091 
>Unformatted:
