Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28458

Modified Files:
        libapr.0-shlibs.info libaprutil.0-mysql.info 
        libaprutil.0-odbc.info libaprutil.0-postgresql.info 
        libaprutil.0-shlibs.info libaprutil.0-sqlite3.info 
Log Message:
New upstream libapr.0 1.4.8 and libaprutil.0 1.5.2.
Move header files from %p/include/apache2 to %p/include/apr to avoid breaking 
newer apache2.
apr-using packages use apr-1-config to find headers so there should be no 
breakage.

Index: libaprutil.0-shlibs.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/libaprutil.0-shlibs.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- libaprutil.0-shlibs.info    30 Dec 2012 12:39:53 -0000      1.4
+++ libaprutil.0-shlibs.info    8 Aug 2013 00:44:58 -0000       1.5
@@ -1,25 +1,25 @@
 Package: libaprutil.0-shlibs
-Version: 1.5.1
+Version: 1.5.2
 Revision: 1
 
 Depends: <<
        db53-aes-shlibs,
        expat1-shlibs,
        gdbm3-shlibs,
-       libapr.0-shlibs (>= 1.4.6-1),
+       libapr.0-shlibs (>= 1.4.8-1),
        libiconv,
        openldap24-shlibs,
-       openssl100-shlibs (>= 1.0.1c-1)
+       openssl100-shlibs (>= 1.0.1e-1)
 <<
 BuildDepends: <<
        db53-aes,
        expat1,
        fink (>= 0.24.12),
        gdbm3,
-       libapr.0-dev (>= 1.4.6-1),
+       libapr.0-dev (>= 1.4.8-1),
        libiconv-dev,
        openldap24-dev,
-       openssl100-dev (>= 1.0.1c-1),
+       openssl100-dev (>= 1.0.1e-1),
        pkgconfig
 <<
 Replaces: libaprutil0-shlibs
@@ -28,7 +28,7 @@
 Suggests: libaprutil.0-mysql, libaprutil.0-odbc, libaprutil.0-postgresql, 
libaprutil.0-sqlite2, libaprutil.0-sqlite3
 
 Source: mirror:apache:apr/apr-util-%v.tar.bz2
-Source-MD5: 9c1db8606e520f201c451ec9a0b095f6
+Source-MD5: 89c1348aa79e898d7c34a6206311c9c2
 
 PatchFile: %n.patch
 PatchFile-MD5: eb4274f2998a4146164237056265fa6e
@@ -41,6 +41,7 @@
 UseMaxBuildJobs: false
 ConfigureParams: <<
   --enable-layout=GNU \
+  --includedir=%p/include/apr \
   --with-apr=%p \
   --with-ldap-include=%p/include \
   --with-ldap-lib=%p/lib \
@@ -112,6 +113,10 @@
   Must keep the libaprutil.0-*.info versions in sync with this.
   
   Previously maintained by Justin F. Hallett <the...@users.sourceforge.net>
+  
+  As of 1.5.2-1 headers have been moved from %p/include/apache2 to
+  %p/include/apr to avoid conflicts with newer apaches.
+  *Always* use apu-1-config to get the include directory!
 <<
 License: BSD
 Maintainer: Daniel Johnson <dan...@daniel-johnson.org>

Index: libapr.0-shlibs.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/libapr.0-shlibs.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- libapr.0-shlibs.info        30 Jun 2012 11:36:51 -0000      1.4
+++ libapr.0-shlibs.info        8 Aug 2013 00:44:58 -0000       1.5
@@ -1,5 +1,5 @@
 Package: libapr.0-shlibs
-Version: 1.4.6
+Version: 1.4.8
 Revision: 1
 
 BuildDepends: pkgconfig
@@ -7,11 +7,13 @@
 # a transient libapr0-shlibs accidentally installed something else at the 
install_name location
 
 Source: mirror:apache:apr/apr-%v.tar.bz2
-Source-MD5: ffee70a111fd07372982b0550bbb14b7
+Source-MD5: ce2ab01a0c3cdb71cf0a6326b8654f41
 
 PatchScript: <<
   ### Fix layout
   perl -pi -e 's,/usr/local,%p,g' config.layout
+  # -no-cpp-precomp is BAD. It hasn't been needed in a LONG time.
+  perl -pi -e 's/ -no-cpp-precomp//' configure
 <<
 
 UseMaxBuildJobs: false
@@ -22,6 +24,8 @@
        --enable-threads \
        --with-pic \
        --with-sendfile=no \
+       --includedir=%p/include/apr \
+       --with-installbuilddir=%p/share/apr/build \
        SED=/usr/bin/sed \
        lt_cv_path_SED=/usr/bin/sed \
        AWK=/usr/bin/awk
@@ -56,7 +60,7 @@
   Description: Headers and static libraries for APR
   Files: <<
     bin
-    share/apache2
+    share/apr
     include
     lib/libapr.la
     lib/libapr-1.dylib
@@ -88,6 +92,10 @@
 <<
 DescPackaging: <<
   Previously maintained by Justin F. Hallett <the...@users.sourceforge.net>
+  
+  As of 1.4.8-1 headers have been moved from %p/include/apache2 to
+  %p/include/apr to avoid conflicts with newer apaches.
+  *Always* use apr-1-config to get the include directory!
 <<
 
 License: BSD

Index: libaprutil.0-odbc.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/libaprutil.0-odbc.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libaprutil.0-odbc.info      30 Dec 2012 12:39:53 -0000      1.1
+++ libaprutil.0-odbc.info      8 Aug 2013 00:44:58 -0000       1.2
@@ -1,5 +1,5 @@
 Package: libaprutil.0-odbc
-Version: 1.5.1
+Version: 1.5.2
 Revision: 1
 
 Depends: <<
@@ -12,11 +12,11 @@
        expat1,
        fink (>= 0.24.12),
        gdbm3,
-       libapr.0-dev (>= 1.4.6-1),
+       libapr.0-dev (>= 1.4.8-1),
        libaprutil.0-dev (>= %v-%r),
        libiconv-dev,
        openldap24-dev,
-       openssl100-dev (>= 1.0.1c-1),
+       openssl100-dev (>= 1.0.1e-1),
        pkgconfig,
        libodbc3-dev | libodbc3-nox-dev
 <<
@@ -24,7 +24,7 @@
 # a transient libaprutil0-shlibs accidentally installed something else at the 
install_name location
 
 Source: mirror:apache:apr/apr-util-%v.tar.bz2
-Source-MD5: 9c1db8606e520f201c451ec9a0b095f6
+Source-MD5: 89c1348aa79e898d7c34a6206311c9c2
 
 PatchFile: libaprutil.0-shlibs.patch
 PatchFile-MD5: eb4274f2998a4146164237056265fa6e
@@ -38,6 +38,7 @@
 ConfigureParams: <<
   --enable-layout=GNU \
   --with-apr=%p \
+  --includedir=%p/include/apr \
   --with-ldap-include=%p/include \
   --with-ldap-lib=%p/lib \
   --with-ldap \

Index: libaprutil.0-mysql.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/libaprutil.0-mysql.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libaprutil.0-mysql.info     30 Dec 2012 12:39:53 -0000      1.1
+++ libaprutil.0-mysql.info     8 Aug 2013 00:44:58 -0000       1.2
@@ -1,5 +1,5 @@
 Package: libaprutil.0-mysql
-Version: 1.5.1
+Version: 1.5.2
 Revision: 1
 
 Depends: <<
@@ -12,19 +12,19 @@
        expat1,
        fink (>= 0.24.12),
        gdbm3,
-       libapr.0-dev (>= 1.4.6-1),
+       libapr.0-dev (>= 1.4.8-1),
        libaprutil.0-dev (>= %v-%r),
        libiconv-dev,
        mysql-unified-dev,
        openldap24-dev,
-       openssl100-dev (>= 1.0.1c-1),
+       openssl100-dev (>= 1.0.1e-1),
        pkgconfig
 <<
 Replaces: libaprutil0-shlibs, libaprutil.0-shlibs (<< 1.3.4-9)
 # a transient libaprutil0-shlibs accidentally installed something else at the 
install_name location
 
 Source: mirror:apache:apr/apr-util-%v.tar.bz2
-Source-MD5: 9c1db8606e520f201c451ec9a0b095f6
+Source-MD5: 89c1348aa79e898d7c34a6206311c9c2
 
 PatchFile: libaprutil.0-shlibs.patch
 PatchFile-MD5: eb4274f2998a4146164237056265fa6e
@@ -38,6 +38,7 @@
 ConfigureParams: <<
   --enable-layout=GNU \
   --with-apr=%p \
+  --includedir=%p/include/apr \
   --with-ldap-include=%p/include \
   --with-ldap-lib=%p/lib \
   --with-ldap \

Index: libaprutil.0-postgresql.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/libaprutil.0-postgresql.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- libaprutil.0-postgresql.info        14 Jan 2013 15:23:49 -0000      1.5
+++ libaprutil.0-postgresql.info        8 Aug 2013 00:44:58 -0000       1.6
@@ -1,6 +1,6 @@
 Package: libaprutil.0-postgresql
-Version: 1.5.1
-Revision: 2
+Version: 1.5.2
+Revision: 1
 
 Depends: <<
        libaprutil.0-shlibs (>= %v-1),
@@ -12,11 +12,11 @@
        expat1,
        fink (>= 0.24.12),
        gdbm3,
-       libapr.0-dev (>= 1.4.6-1),
+       libapr.0-dev (>= 1.4.8-1),
        libaprutil.0-dev (>= %v-1),
        libiconv-dev,
        openldap24-dev,
-       openssl100-dev (>= 1.0.1c-1),
+       openssl100-dev (>= 1.0.1e-1),
        pkgconfig,
        postgresql92-dev (>= 1:0-0)
 <<
@@ -24,7 +24,7 @@
 # a transient libaprutil0-shlibs accidentally installed something else at the 
install_name location
 
 Source: mirror:apache:apr/apr-util-%v.tar.bz2
-Source-MD5: 9c1db8606e520f201c451ec9a0b095f6
+Source-MD5: 89c1348aa79e898d7c34a6206311c9c2
 
 PatchFile: libaprutil.0-shlibs.patch
 PatchFile-MD5: eb4274f2998a4146164237056265fa6e
@@ -38,6 +38,7 @@
 ConfigureParams: <<
   --enable-layout=GNU \
   --with-apr=%p \
+  --includedir=%p/include/apr \
   --with-ldap-include=%p/include \
   --with-ldap-lib=%p/lib \
   --with-ldap \

Index: libaprutil.0-sqlite3.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/libaprutil.0-sqlite3.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- libaprutil.0-sqlite3.info   30 Dec 2012 12:39:53 -0000      1.4
+++ libaprutil.0-sqlite3.info   8 Aug 2013 00:44:58 -0000       1.5
@@ -1,5 +1,5 @@
 Package: libaprutil.0-sqlite3
-Version: 1.5.1
+Version: 1.5.2
 Revision: 1
 
 Depends: <<
@@ -12,11 +12,11 @@
        expat1,
        fink (>= 0.24.12),
        gdbm3,
-       libapr.0-dev (>= 1.4.6-1),
+       libapr.0-dev (>= 1.4.8-1),
        libaprutil.0-dev (>= %v-%r),
        libiconv-dev,
        openldap24-dev,
-       openssl100-dev (>= 1.0.1c-1),
+       openssl100-dev (>= 1.0.1e-1),
        pkgconfig,
        sqlite3-dev
 <<
@@ -24,7 +24,7 @@
 # a transient libaprutil0-shlibs accidentally installed something else at the 
install_name location
 
 Source: mirror:apache:apr/apr-util-%v.tar.bz2
-Source-MD5: 9c1db8606e520f201c451ec9a0b095f6
+Source-MD5: 89c1348aa79e898d7c34a6206311c9c2
 
 PatchFile: libaprutil.0-shlibs.patch
 PatchFile-MD5: eb4274f2998a4146164237056265fa6e
@@ -38,6 +38,7 @@
 ConfigureParams: <<
   --enable-layout=GNU \
   --with-apr=%p \
+  --includedir=%p/include/apr \
   --with-ldap-include=%p/include \
   --with-ldap-lib=%p/lib \
   --with-ldap \


------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead. 
Download for free and get started troubleshooting in minutes. 
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to