[Lunar-commits] r19698 - in moonbase/trunk/libs: apr apr-iconv apr-util

[Jerry Lundström]

Author: prox
Date: 2006-04-17 10:34:53 +0000 (Mon, 17 Apr 2006)
New Revision: 19698

Modified:
   moonbase/trunk/libs/apr-iconv/DETAILS
   moonbase/trunk/libs/apr-util/BUILD
   moonbase/trunk/libs/apr-util/DEPENDS
   moonbase/trunk/libs/apr-util/DETAILS
   moonbase/trunk/libs/apr/DETAILS
Log:
apr/apr-util bump

Modified: moonbase/trunk/libs/apr/DETAILS
===================================================================
--- moonbase/trunk/libs/apr/DETAILS	2006-04-17 04:57:55 UTC (rev 19697)
+++ moonbase/trunk/libs/apr/DETAILS	2006-04-17 10:34:53 UTC (rev 19698)
@@ -1,11 +1,13 @@
           MODULE=apr
-         VERSION=1.2.2
+         VERSION=1.2.7
           SOURCE=$MODULE-$VERSION.tar.bz2
-      SOURCE_URL=http://apache.archive.sunet.se/dist/apr/
-      SOURCE_VFY=sha1:93bd33ba204bdfabb8ce36d694bffb66f86650ae
+   SOURCE_URL[0]=ftp://ftp.sunet.se/pub/www/servers/apache/dist/apr/
+   SOURCE_URL[1]=ftp://mirror2.dataphone.se/pub/apache/apr/
+   SOURCE_URL[2]=http://www.apache.org/dist/apr/
+      SOURCE_VFY=sha1:98fb4d52053ec53a823061f2f906474a26c88633
         WEB_SITE=http://apr.apache.org/
          ENTERED=20051208
-         UPDATED=20051208
+         UPDATED=20060417
       MAINTAINER="prox at lunar-linux.org"
            SHORT="Apache Portable Runtime Project"
 

Modified: moonbase/trunk/libs/apr-iconv/DETAILS
===================================================================
--- moonbase/trunk/libs/apr-iconv/DETAILS	2006-04-17 04:57:55 UTC (rev 19697)
+++ moonbase/trunk/libs/apr-iconv/DETAILS	2006-04-17 10:34:53 UTC (rev 19698)
@@ -1,7 +1,9 @@
           MODULE=apr-iconv
          VERSION=1.1.1
           SOURCE=$MODULE-$VERSION.tar.bz2
-      SOURCE_URL=http://apache.archive.sunet.se/dist/apr/
+   SOURCE_URL[0]=ftp://ftp.sunet.se/pub/www/servers/apache/dist/apr/
+   SOURCE_URL[1]=ftp://mirror2.dataphone.se/pub/apache/apr/
+   SOURCE_URL[2]=http://www.apache.org/dist/apr/
       SOURCE_VFY=sha1:17198b12b1b5924a15f4c2bd17cacd6e1391a5da
         WEB_SITE=http://apr.apache.org/
          ENTERED=20051208

Modified: moonbase/trunk/libs/apr-util/BUILD
===================================================================
--- moonbase/trunk/libs/apr-util/BUILD	2006-04-17 04:57:55 UTC (rev 19697)
+++ moonbase/trunk/libs/apr-util/BUILD	2006-04-17 10:34:53 UTC (rev 19698)
@@ -1,4 +1,5 @@
 (
-  OPTS="$OPTS --with-apr=`which apr-$(installed_version apr | cut -d. -f1)-config`"
+  patch_it $SOURCE2 1 &&
+  OPTS="$OPTS --with-apr=`which apr-$(installed_version apr | cut -d. -f1)-config` --with-iconv=/usr --without-mysql" &&
   default_build
 ) > $C_FIFO 2>&1

Modified: moonbase/trunk/libs/apr-util/DEPENDS
===================================================================
--- moonbase/trunk/libs/apr-util/DEPENDS	2006-04-17 04:57:55 UTC (rev 19697)
+++ moonbase/trunk/libs/apr-util/DEPENDS	2006-04-17 10:34:53 UTC (rev 19698)
@@ -1,2 +1,8 @@
 depends apr &&
-depends db
+
+optional_depends "db" "--with-dbm=db44 --with-berkeley-db=/usr" "" "berkeley db support" &&
+optional_depends "openldap" "--with-ldap=ldap" "" "ldap support" &&
+optional_depends "mysql" "--with-mysql=/usr" "" "mysql support" &&
+optional_depends "postgresql" "--with-pgsql=/usr" "" "postgresql support" &&
+optional_depends "sqlite" "--with-sqlite3=/usr" "" "sqlite support" &&
+optional_depends "expat" "--with-expat=/usr" "" "expat support"

Modified: moonbase/trunk/libs/apr-util/DETAILS
===================================================================
--- moonbase/trunk/libs/apr-util/DETAILS	2006-04-17 04:57:55 UTC (rev 19697)
+++ moonbase/trunk/libs/apr-util/DETAILS	2006-04-17 10:34:53 UTC (rev 19698)
@@ -1,11 +1,16 @@
           MODULE=apr-util
-         VERSION=1.2.2
+         VERSION=1.2.7
           SOURCE=$MODULE-$VERSION.tar.bz2
-      SOURCE_URL=http://apache.archive.sunet.se/dist/apr/
-      SOURCE_VFY=sha1:1928fde55a81cef07c6e60bfa3d796d26f534f48
+   SOURCE_URL[0]=ftp://ftp.sunet.se/pub/www/servers/apache/dist/apr/
+   SOURCE_URL[1]=ftp://mirror2.dataphone.se/pub/apache/apr/
+   SOURCE_URL[2]=http://www.apache.org/dist/apr/
+      SOURCE_VFY=sha1:1b25cf401f21e404f1a9ecded77bc6e0c484d441
+         SOURCE2=$MODULE-$VERSION-dbd_mysql.patch.gz
+     SOURCE2_URL=$PATCH_URL/
+     SOURCE2_VFY=2c1761eb51652ff768888e7294d93e55ceb1399c
         WEB_SITE=http://apr.apache.org/
          ENTERED=20051208
-         UPDATED=20051208
+         UPDATED=20060417
       MAINTAINER="prox at lunar-linux.org"
            SHORT="Apache Portable Runtime Project"