diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template index 7e31bb92fe..e7626cf871 100644 --- a/srcpkgs/apr-util/template +++ b/srcpkgs/apr-util/template @@ -1,7 +1,7 @@ # Template file for 'apr-util' pkgname=apr-util version=1.5.3 -revision=1 +revision=2 build_style=gnu-configure # XXX: add freetds and unixodbc modules. configure_args=" @@ -35,14 +35,6 @@ post_install() { find ${DESTDIR} -type f -name \*.a -delete } -apr-util-db_package() { - depends="apr-util>=${version}" - short_desc+=" - Berkeley DB module" - pkg_install() { - vmove "usr/lib/apr-util-1/apr_dbm_db*" - } -} - apr-util-devel_package() { depends="apr-devel expat-devel libldap-devel ${sourcepkg}>=${version}" short_desc+=" - development files" @@ -54,6 +46,15 @@ apr-util-devel_package() { } } +apr-util-db_package() { + lib32disabled=yes + depends="apr-util>=${version}" + short_desc+=" - Berkeley DB module" + pkg_install() { + vmove "usr/lib/apr-util-1/apr_dbm_db*" + } +} + apr-util-gdbm_package() { depends="apr-util>=${version}" short_desc+=" - GDBM module" @@ -63,6 +64,7 @@ apr-util-gdbm_package() { } apr-util-ldap_package() { + lib32disabled=yes depends="apr-util>=${version}" short_desc+=" - LDAP support" pkg_install() { @@ -71,6 +73,7 @@ apr-util-ldap_package() { } apr-util-mysql_package() { + lib32disabled=yes depends="apr-util>=${version}" short_desc+=" - MySQL module" pkg_install() { @@ -79,6 +82,7 @@ apr-util-mysql_package() { } apr-util-pgsql_package() { + lib32disabled=yes depends="apr-util>=${version}" short_desc+=" - PostgreSQL module" pkg_install() { @@ -87,6 +91,7 @@ apr-util-pgsql_package() { } apr-util-sqlite_package() { + lib32disabled=yes depends="apr-util>=${version}" short_desc+=" - SQLite module" pkg_install() {