Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv19151

Modified Files:
        apr.info 
Log Message:
New apr, unified, new pkg layout as well, maintianers please update your apps

Index: apr.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/apr.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- apr.info    31 May 2006 02:37:49 -0000      1.3
+++ apr.info    23 Jun 2006 17:22:00 -0000      1.4
@@ -1,21 +1,20 @@
 Package: apr
-Version: 0.9.7
-Revision: 1012
+Version: 0.9.12
+Revision: 10
 Description: Apache Portable Runtime
 License: BSD
 Maintainer: Dustin Sias <[EMAIL PROTECTED]>
 
 # Dependencies:
-Depends: %N-shlibs (= %v-%r) | apr-ssl-shlibs (= %v-%r), %N-common (= %v-%r) | 
apr-ssl-common (= %v-%r)
-BuildDepends: expat (>= 1.95.3-1), fink (>= 0.11.0-1), gdbm3, db43-ssl (>= 
4.3.29-1001) | db43 (>= 4.3.29-1001), libiconv-dev
-BuildDependsOnly: True
-Conflicts: apr-ssl, svn-client (<< 0.14.3-1), apache2 (<< 2.0.47-1), libapr1
-Replaces: apr-ssl, libapr1
+Depends: libapr0-shlibs (= %v-%r), libaprutil0-shlibs (= %v-%r)
+BuildDepends: expat (>= 1.95.3-1), fink (>= 0.11.0-1), gdbm3, db44-aes, 
libiconv-dev, openldap23-dev, cyrus-sasl2-dev (>= 2.1.21-1), system-openssl-dev
+Conflicts: svn-client (<< 0.14.3-1), apache2 (<< 2.0.47-1), libapr1
+Replaces: libapr1, apr-ssl, apr
 
 # Unpack Phase:
-Source: mirror:custom:httpd-2.0.55.tar.bz2
-Source-MD5: f1b5b65c8661db9ffe38b5a4a865a0e2
-SourceDirectory: httpd-2.0.55/srclib
+Source: mirror:custom:httpd-2.0.58.tar.bz2
+Source-MD5: ac732a8b3ec5760baa582888f5dbad66
+SourceDirectory: httpd-2.0.58/srclib
 CustomMirror: <<
   Primary: http://www.apache.org/dist/httpd/
   Secondary: http://www.apache.org/dist/httpd/old/
@@ -23,51 +22,117 @@
 
 # Patch Phase:
 PatchScript: <<
-  ### Force db 4.3
-  perl -pi -e 's/db([\-_])4([\._])0/db${1}4${2}3/' apr/configure
-  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
+  ### Fix layout
+  perl -pi -e 's,/usr,,g' apr/config.layout
+  perl -pi -e 's,/usr,,g' apr-util/config.layout
+  perl -pi -e 's,libsuffix ,libsuffix: ,g' apr-util/config.layout
 <<
-SetLIBS: -L%p/lib
 
 # Compile Phase:
-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 --disable-dependency-tracking
+ConfigureParams: --enable-layout=Debian --with-expat=%p --with-dbm=db44 
--with-ldap --with-berkeley-db=%p --disable-dependency-tracking
 SetCPPFLAGS: -no-cpp-precomp
+NoSetLDFLAGS: true
+
 CompileScript: <<
  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; AWK=/usr/bin/awk SED=/usr/bin/sed 
./configure %c --with-apr=%b/apr
+ ## Force system ssl for unified
+ cd apr-util; perl -pi -e 's,^LDFLAGS=.*,LDFLAGS=-L%p/lib/system-openssl/lib 
-lssl -lcrypto -L%p/lib,g' build/rules.mk
  cd apr-util; make
 <<
 
 # Install Phase:
-DocFiles: ../ABOUT_APACHE ../LICENSE apr/docs/*.html 
apr/CHANGES:CHANGES_apr.txt apr-util/CHANGES:CHANGES_apr-util.txt
+DocFiles: ../ABOUT_APACHE ../LICENSE
 InstallScript: <<
  cd apr; make install prefix=%i
  cd apr-util; make install prefix=%i
 <<
 SplitOff: <<
-  Depends: expat-shlibs (>= 1.95.3-1), gdbm3-shlibs, db43-ssl-shlibs (>= 
4.3.29-1001) | db43-shlibs (>= 4.3.29-1001)
-  Conflicts: apr-ssl-shlibs, svn-client (<< 0.14.3-1), apache2 (<< 2.0.47-1)
-  Replaces: apr-ssl-shlibs
-  Package: %N-shlibs
-  Files: lib/libapr-0.%v.dylib lib/libapr-0.0.dylib lib/libaprutil-0.%v.dylib 
lib/libaprutil-0.0.dylib
+  Conflicts: svn-client (<< 0.14.3-1), apache2 (<< 2.0.47-1)
+  Replaces: apr-shlibs, apr-ssl-shlibs
+  Package: libapr0-shlibs
+  Files: <<
+    lib/libapr-0.%v.dylib
+    lib/libapr-0.0.dylib 
+  <<
   Shlibs: <<
-   %p/lib/libapr-0.0.dylib 10.0.0 apr (>= 0.9.2-14)
-   %p/lib/libaprutil-0.0.dylib 10.0.0 apr (>= 0.9.2-14)
+   %p/lib/libapr-0.0.dylib 10.0.0 libapr0-shlibs (>= 0.9.12-1)
   <<
-  DocFiles: ../ABOUT_APACHE ../LICENSE apr/docs/*.html 
apr/CHANGES:CHANGES_apr.txt apr-util/CHANGES:CHANGES_apr-util.txt
+  DocFiles: ../ABOUT_APACHE ../LICENSE apr/docs/*.html 
apr/CHANGES:CHANGES_apr.txt
 <<
 SplitOff2: <<
-  Conflicts: apr-ssl-common
-  Replaces: apr-ssl-common
-  Package: %N-common
-  Files: bin/apr-config bin/apu-config share/apr-0
+  Depends: cyrus-sasl2-shlibs (>= 2.1.21-1), db44-aes-shlibs, expat-shlibs (>= 
1.95.3-1), libapr0-shlibs (= %v-%r), libiconv, openldap23-shlibs
+  Conflicts: svn-client (<< 0.14.3-1), apache2 (<< 2.0.47-1)
+  Replaces: apr-shlibs, apr-ssl-shlibs
+  Package: libaprutil0-shlibs
+  Files: <<
+    lib/libaprutil-0.%v.dylib
+    lib/libaprutil-0.0.dylib
+  <<
+  Shlibs: <<
+    %p/lib/libaprutil-0.0.dylib 10.0.0 libaprutil0-shlibs (>= 0.9.12-1)
+  <<
+  DocFiles: ../ABOUT_APACHE ../LICENSE apr-util/CHANGES:CHANGES_apr-util.txt
+<<
+SplitOff3: <<
+  Replaces: apr-common, apr-ssl-common
+  Package: apr-dev
+  Depends: libapr0-shlibs (= %v-%r)
+  BuildDependsOnly: True
+  Files: <<
+    bin/apr-config
+    share/apr
+    include/apr-0/apr*
+    lib/apr.exp
+    lib/libapr-0.a
+    lib/libapr-0.la
+    lib/libapr-0.dylib
+  <<
+  DocFiles: ../ABOUT_APACHE ../LICENSE
+<<
+SplitOff4: <<
+  Replaces: apr-common, apr-ssl-common
+  Package: aprutil-dev
+  Depends: libaprutil0-shlibs (= %v-%r), libapr0-shlibs (= %v-%r)
+  BuildDependsOnly: True
+  Files: <<
+    bin/apu-config
+    include/apr-0/apu*
+    lib/aprutil.exp
+    lib/libaprutil-0.a
+    lib/libaprutil-0.la
+    lib/libaprutil-0.dylib
+  <<
   DocFiles: ../ABOUT_APACHE ../LICENSE
 <<
+SplitOff5: <<
+  Package: apr-ssl
+  Depends: apr (= %v-%r)
+  DocFiles: ../LICENSE
+<<
+SplitOff6: <<
+  Package: apr-ssl-shlibs
+  Depends: libapr0-shlibs (= %v-%r), libaprutil0-shlibs (= %v-%r)
+  DocFiles: ../LICENSE
+<<
+SplitOff7: <<
+  Package: apr-ssl-common
+  Depends: apr-dev (= %v-%r), aprutil-dev (= %v-%r)
+  DocFiles: ../LICENSE
+<<
+SplitOff8: <<
+  Package: apr-shlibs
+  Depends: libapr0-shlibs (= %v-%r), libaprutil0-shlibs (= %v-%r)
+  DocFiles: ../LICENSE
+<<
+SplitOff9: <<
+  Package: apr-common
+  Depends: apr-dev (= %v-%r), aprutil-dev (= %v-%r)
+  DocFiles: ../LICENSE
+<<
 
 DescDetail: <<
 The mission of the Apache Portable Runtime (APR) is to provide a 


Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to