Update of /cvsroot/fink/dists/10.4-transitional/unstable/crypto/finkinfo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32668
Modified Files:
apache2-ssl.info apr-ssl.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-ssl.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/crypto/finkinfo/apache2-ssl.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- apache2-ssl.info 25 Sep 2005 16:17:20 -0000 1.3
+++ apache2-ssl.info 28 Oct 2005 18:26:31 -0000 1.4
@@ -1,11 +1,11 @@
Package: apache2-ssl
Version: 2.0.54
-Revision: 10
+Revision: 12
###
Conflicts: apache, apache2
Replaces: apache, apache2
Provides: httpd
-BuildDepends: gawk, apr-ssl (>= 0.9.6-1), cyrus-sasl2-dev (>= 2.1.15-22),
db43-ssl (>= 4.2.52-12), expat (>= 1.95.6-2), gdbm3, openldap-ssl-dev (>=
2.1.22-24), libiconv-dev
+BuildDepends: apr-ssl (>= 0.9.6-1), cyrus-sasl2-dev (>= 2.1.15-22), db43-ssl
(>= 4.2.52-12), expat (>= 1.95.6-2), gdbm3, openldap-ssl-dev (>= 2.1.22-24),
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: <<
@@ -25,6 +25,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
@@ -44,31 +47,31 @@
exit 1
fi
rm -rf %d
- export ac_cv_func_poll=no; cat default-fink.conf | xargs ./configure
--with-mpm=worker --with-ldap --with-ssl=%p --enable-ssl=shared
--enable-ldap=shared --enable-auth-ldap=shared --with-ldap-include=%p/include
--with-ldap-lib=%p/lib
+ 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 --with-ldap
--with-ssl=%p --enable-ssl=shared --enable-ldap=shared
--enable-auth-ldap=shared --with-ldap-include=%p/include --with-ldap-lib=%p/lib
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 --with-ldap --with-ssl=%p --enable-ssl=shared
--enable-ldap=shared --enable-auth-ldap=shared --with-ldap-include=%p/include
--with-ldap-lib=%p/lib
+ 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 --with-ldap
--with-ssl=%p --enable-ssl=shared --enable-ldap=shared
--enable-auth-ldap=shared --with-ldap-include=%p/include --with-ldap-lib=%p/lib
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 --with-ldap --with-ssl=%p --enable-ssl=shared
--enable-ldap=shared --enable-auth-ldap=shared --with-ldap-include=%p/include
--with-ldap-lib=%p/lib
+ 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 --with-ldap
--with-ssl=%p --enable-ssl=shared --enable-ldap=shared
--enable-auth-ldap=shared --with-ldap-include=%p/include --with-ldap-lib=%p/lib
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 --with-ldap --with-ssl=%p --enable-ssl=shared
--enable-ldap=shared --enable-auth-ldap=shared --with-ldap-include=%p/include
--with-ldap-lib=%p/lib
+ 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 --with-ldap
--with-ssl=%p --enable-ssl=shared --enable-ldap=shared
--enable-auth-ldap=shared --with-ldap-include=%p/include --with-ldap-lib=%p/lib
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 --with-ldap --with-ssl=%p --enable-ssl=shared
--enable-ldap=shared --enable-auth-ldap=shared --with-ldap-include=%p/include
--with-ldap-lib=%p/lib
+ 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 --with-ldap
--with-ssl=%p --enable-ssl=shared --enable-ldap=shared
--enable-auth-ldap=shared --with-ldap-include=%p/include --with-ldap-lib=%p/lib
make
make install DESTDIR=%d
mv %i/sbin/httpd httpd-prefork
Index: apr-ssl.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/crypto/finkinfo/apr-ssl.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- apr-ssl.info 11 Jun 2005 11:14:47 -0000 1.3
+++ apr-ssl.info 28 Oct 2005 18:26:31 -0000 1.4
@@ -1,6 +1,6 @@
Package: apr-ssl
Version: 0.9.6
-Revision: 11
+Revision: 12
Description: Apache Portable Runtime
License: BSD
Maintainer: Dustin Sias <[EMAIL PROTECTED]>
@@ -29,6 +29,8 @@
perl -pi -e 's/db([\-_])4([\._])0/db${1}4${2}3/' 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' apr/configure
<<
SetLIBS: -L%p/lib
@@ -36,9 +38,9 @@
ConfigureParams: --libexecdir='${prefix}/lib/apr-0'
--datadir='${prefix}/share/apr-0' --sysconfdir='${prefix}/etc/apr-0'
--sharedstatedir='${prefix}/share/apr-0' --includedir='${prefix}/include/apr-0'
--mandir='${prefix}/share/man' --infodir='${prefix}/share/info' --with-expat=%p
--with-dbm=db4 --with-ldap
SetCPPFLAGS: -no-cpp-precomp
CompileScript: <<
- cd apr; export ac_cv_func_poll=no; SED=/usr/bin/sed ./configure %c
+ cd apr; export ac_cv_func_poll=no; AWK=/usr/bin/awk SED=/usr/bin/sed
./configure %c
cd apr; make
- cd apr-util; export ac_cv_func_poll=no; SED=/usr/bin/sed ./configure %c
--with-apr=%b/apr
+ cd apr-util; export ac_cv_func_poll=no; AWK=/usr/bin/awk SED=/usr/bin/sed
./configure %c --with-apr=%b/apr
cd apr-util; make
<<
-------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
