Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/web
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv622
Modified Files:
apache2.info
Log Message:
Update apr and apache2 to ignore gawk (which doesn't work when built with
gcc4.0) in preperation for the 10.4 branch), matched revision numbers throught
as well.
Index: apache2.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/web/apache2.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- apache2.info 25 Sep 2005 16:16:43 -0000 1.3
+++ apache2.info 28 Oct 2005 18:28:11 -0000 1.4
@@ -1,11 +1,11 @@
Package: apache2
Version: 2.0.54
-Revision: 10
+Revision: 12
###
Conflicts: apache, apache2 (<= 2.0.47-1), apache2-ssl
Replaces: apache, apache2 (<= 2.0.47-1), apache2-ssl
Provides: httpd
-BuildDepends: gawk, apr (>= 0.9.6-1), db43, expat (>= 1.95.6-2), gdbm3,
libiconv-dev
+BuildDepends: apr (>= 0.9.6-1), db43, expat (>= 1.95.6-2), gdbm3, libiconv-dev
Depends: %N-mpm-worker (= %v-%r) | %N-mpm-perchild (= %v-%r) | %N-mpm-prefork
(= %v-%r) | %N-mpm-leader (= %v-%r) | %N-mpm-threadpool (= %v-%r), %N-common (=
%v-%r)
###
CustomMirror: <<
@@ -23,6 +23,9 @@
perl -pi -e 's/db([\-_])4([\._])0/db${1}4${2}3/' srclib/apr-util/configure
### Fix --tag for new libtool
for i in `/usr/bin/find . -name configure`; do perl -pi -e
"s,LTFLAGS=\'--silent\',LTFLAGS=\'--silent --tag=CC\',g" $i; done
+ ### Force use of awk over gawk
+ perl -pi -e 's,gawk mawk nawk awk,awk mawk nawk gawk,g' configure
+ perl -pi -e 's,gawk mawk nawk awk,awk mawk nawk gawk,g' srclib/apr/configure
<<
###
GCC: 3.3
@@ -42,31 +45,31 @@
exit 1
fi
rm -rf %d
- cat default-fink.conf | xargs ./configure --with-mpm=worker --without-ldap
--without-ssl --disable-ldap --disable-auth-ldap
+ export ac_cv_func_poll=no; export AWK=/usr/bin/awk; export SED=/usr/bin/sed;
cat default-fink.conf | xargs ./configure --with-mpm=worker --without-ldap
--without-ssl --disable-ldap --disable-auth-ldap
make
make install DESTDIR=%d
mv %i/sbin/httpd httpd-worker
mv %i/lib/apache2/modules/httpd.exp httpd.exp-worker
cd server; make clean; cd -
- export ac_cv_func_poll=no; cat default-fink.conf | xargs ./configure
--with-mpm=perchild --without-ldap --without-ssl --disable-ldap
--disable-auth-ldap
+ export ac_cv_func_poll=no; export AWK=/usr/bin/awk; export SED=/usr/bin/sed;
cat default-fink.conf | xargs ./configure --with-mpm=perchild --without-ldap
--without-ssl --disable-ldap --disable-auth-ldap
make
make install DESTDIR=%d
mv %i/sbin/httpd httpd-perchild
mv %i/lib/apache2/modules/httpd.exp httpd.exp-perchild
cd server; make clean; cd -
- export ac_cv_func_poll=no; cat default-fink.conf | xargs ./configure
--with-mpm=leader --without-ldap --without-ssl --disable-ldap
--disable-auth-ldap
+ export ac_cv_func_poll=no; export AWK=/usr/bin/awk; export SED=/usr/bin/sed;
cat default-fink.conf | xargs ./configure --with-mpm=leader --without-ldap
--without-ssl --disable-ldap --disable-auth-ldap
make
make install DESTDIR=%d
mv %i/sbin/httpd httpd-leader
mv %i/lib/apache2/modules/httpd.exp httpd.exp-leader
cd server; make clean; cd -
- export ac_cv_func_poll=no; cat default-fink.conf | xargs ./configure
--with-mpm=threadpool --without-ldap --without-ssl --disable-ldap
--disable-auth-ldap
+ export ac_cv_func_poll=no; export AWK=/usr/bin/awk; export SED=/usr/bin/sed;
cat default-fink.conf | xargs ./configure --with-mpm=threadpool --without-ldap
--without-ssl --disable-ldap --disable-auth-ldap
make
make install DESTDIR=%d
mv %i/sbin/httpd httpd-threadpool
mv %i/lib/apache2/modules/httpd.exp httpd.exp-threadpool
cd server; make clean; cd -
- export ac_cv_func_poll=no; cat default-fink.conf | xargs ./configure
--with-mpm=prefork --without-ldap --without-ssl --disable-ldap
--disable-auth-ldap
+ export ac_cv_func_poll=no; export AWK=/usr/bin/awk; export SED=/usr/bin/sed;
cat default-fink.conf | xargs ./configure --with-mpm=prefork --without-ldap
--without-ssl --disable-ldap --disable-auth-ldap
make
make install DESTDIR=%d
mv %i/sbin/httpd httpd-prefork
-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
