diff --git a/srcpkgs/apr-util/apr-util-gdbm.rshlibs b/srcpkgs/apr-util/apr-util-gdbm.rshlibs index 9716509c9e..e5dad653dc 100644 --- a/srcpkgs/apr-util/apr-util-gdbm.rshlibs +++ b/srcpkgs/apr-util/apr-util-gdbm.rshlibs @@ -1,3 +1,3 @@ -libgdbm.so.3 libpthread.so.0 libc.so.6 +libgdbm.so.4 diff --git a/srcpkgs/apr-util/apr-util-gdbm.template b/srcpkgs/apr-util/apr-util-gdbm.template index 77e0b8db2a..6fd51a09b6 100644 --- a/srcpkgs/apr-util/apr-util-gdbm.template +++ b/srcpkgs/apr-util/apr-util-gdbm.template @@ -1,6 +1,6 @@ # Template file for 'apr-util-gdbm'. # -revision=1 +revision=2 short_desc="${short_desc} - GDBM module" long_desc=" ${long_desc} diff --git a/srcpkgs/avahi/avahi-ui-libs-gtk3.rshlibs b/srcpkgs/avahi/avahi-ui-libs-gtk3.rshlibs index 530a47c977..af61750c02 100644 --- a/srcpkgs/avahi/avahi-ui-libs-gtk3.rshlibs +++ b/srcpkgs/avahi/avahi-ui-libs-gtk3.rshlibs @@ -21,6 +21,6 @@ libgmodule-2.0.so.0 libgthread-2.0.so.0 librt.so.1 libglib-2.0.so.0 -libgdbm.so.3 libssp.so.0 libc.so.6 +libgdbm.so.4 diff --git a/srcpkgs/avahi/avahi-ui-libs-gtk3.template b/srcpkgs/avahi/avahi-ui-libs-gtk3.template index d1969f94c9..dec6970344 100644 --- a/srcpkgs/avahi/avahi-ui-libs-gtk3.template +++ b/srcpkgs/avahi/avahi-ui-libs-gtk3.template @@ -5,7 +5,7 @@ long_desc="${long_desc} This package contains the GTK+3 UI shared libraries provided by Avahi." -revision=3 +revision=4 Add_dependency run libpng diff --git a/srcpkgs/avahi/avahi-ui-libs.rshlibs b/srcpkgs/avahi/avahi-ui-libs.rshlibs index dbad385c2e..dff8322ccd 100644 --- a/srcpkgs/avahi/avahi-ui-libs.rshlibs +++ b/srcpkgs/avahi/avahi-ui-libs.rshlibs @@ -20,6 +20,6 @@ libgmodule-2.0.so.0 libgthread-2.0.so.0 librt.so.1 libglib-2.0.so.0 -libgdbm.so.3 libssp.so.0 libc.so.6 +libgdbm.so.4 diff --git a/srcpkgs/avahi/avahi-ui-libs.template b/srcpkgs/avahi/avahi-ui-libs.template index 474af7b62d..a9b1ecdd74 100644 --- a/srcpkgs/avahi/avahi-ui-libs.template +++ b/srcpkgs/avahi/avahi-ui-libs.template @@ -5,7 +5,7 @@ long_desc="${long_desc} This package contains the UI shared libraries provided by Avahi." -revision=3 +revision=4 Add_dependency run libpng diff --git a/srcpkgs/avahi/avahi-utils.rshlibs b/srcpkgs/avahi/avahi-utils.rshlibs index ef9ed8dc0f..b2a5758510 100644 --- a/srcpkgs/avahi/avahi-utils.rshlibs +++ b/srcpkgs/avahi/avahi-utils.rshlibs @@ -1,6 +1,6 @@ libavahi-client.so.3 libpthread.so.0 libavahi-common.so.3 -libgdbm.so.3 libssp.so.0 libc.so.6 +libgdbm.so.4 diff --git a/srcpkgs/avahi/avahi-utils.template b/srcpkgs/avahi/avahi-utils.template index 6508304004..12cfe2fec6 100644 --- a/srcpkgs/avahi/avahi-utils.template +++ b/srcpkgs/avahi/avahi-utils.template @@ -1,6 +1,6 @@ # Template file for 'avahi-utils'. # -revision=1 +revision=2 short_desc="Avahi browsing, publishing and discovery utilities" long_desc="${long_desc} diff --git a/srcpkgs/man-db/man-db.rshlibs b/srcpkgs/man-db/man-db.rshlibs index d604b87d74..17b1ca627c 100644 --- a/srcpkgs/man-db/man-db.rshlibs +++ b/srcpkgs/man-db/man-db.rshlibs @@ -1,4 +1,4 @@ -libgdbm.so.3 libc.so.6 libpipeline.so.1 libz.so.1 +libgdbm.so.4 diff --git a/srcpkgs/man-db/template b/srcpkgs/man-db/template index da6feaf6f9..f17d6c9cab 100644 --- a/srcpkgs/man-db/template +++ b/srcpkgs/man-db/template @@ -7,7 +7,7 @@ configure_args="--with-db=gdbm --with-pager=less --with-gzip=/usr/bin/gzip --with-bzip2=/usr/bin/bzip2 --disable-rpath --enable-threads=posix --with-lzma=/usr/bin/lzma --with-xz=/usr/bin/xz --disable-setuid --without-included-regex --enable-automatic-create" -revision=1 +revision=2 short_desc="The on-line manual database" maintainer="Juan RP " checksum=537bdb60b12c7d34aa21c397024a6d604c5130b61f9aff5554ab443329b728a7 diff --git a/srcpkgs/perl/perl.rshlibs b/srcpkgs/perl/perl.rshlibs index 28c5932683..2e3286299f 100644 --- a/srcpkgs/perl/perl.rshlibs +++ b/srcpkgs/perl/perl.rshlibs @@ -6,5 +6,5 @@ libutil.so.1 libpthread.so.0 libc.so.6 libdb-4.8.so -libgdbm.so.3 librt.so.1 +libgdbm.so.4 diff --git a/srcpkgs/perl/template b/srcpkgs/perl/template index 0e36340151..0633c2abcc 100644 --- a/srcpkgs/perl/template +++ b/srcpkgs/perl/template @@ -2,7 +2,7 @@ pkgname=perl version=5.14.2 distfiles="http://www.cpan.org/src/5.0/$pkgname-$version.tar.bz2" -revision=1 +revision=2 short_desc="Practical Extraction and Report Language" maintainer="Juan RP " homepage="http://www.perl.org" @@ -24,8 +24,7 @@ Add_dependency build db-devel Add_dependency build less Add_dependency build groff -do_build() -{ +do_build() { ./Configure \ -des -Dusethreads -Duseshrplib \ -Dinstallprefix=/usr \ @@ -45,8 +44,7 @@ do_build() make ${makejobs} } -do_install() -{ +do_install() { # We use the same defaults than Arch Linux. make DESTDIR=${DESTDIR} install diff --git a/srcpkgs/python/python.rshlibs b/srcpkgs/python/python.rshlibs index 313b8cd6df..01c276c32e 100644 --- a/srcpkgs/python/python.rshlibs +++ b/srcpkgs/python/python.rshlibs @@ -14,6 +14,6 @@ libpanelw.so.6 libssl.so.1 libbz2.so.1 libnsl.so.1 -libgdbm.so.3 libdl.so.2 libutil.so.1 +libgdbm.so.4 diff --git a/srcpkgs/python/template b/srcpkgs/python/template index e89dfb2c31..45a74b4f8a 100644 --- a/srcpkgs/python/template +++ b/srcpkgs/python/template @@ -1,7 +1,7 @@ # Template build file for 'python'. pkgname=python version=2.7.2 -revision=4 +revision=5 patch_args="-Np1" wrksrc="Python-$version" distfiles="http://www.python.org/ftp/python/$version/Python-$version.tar.bz2" @@ -26,7 +26,6 @@ stow_copy=yes pycompile_dirs="usr/lib/python2.7" subpackages="$pkgname-devel" - Add_dependency build libffi-devel Add_dependency build zlib-devel Add_dependency build readline-devel @@ -38,8 +37,7 @@ Add_dependency build db-devel Add_dependency build ncurses-devel Add_dependency build sqlite-devel -do_configure() -{ +do_configure() { # Enable built-in SQLite3 module to load extensions (Arch fix FS#22122) sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py @@ -50,13 +48,11 @@ do_configure() --with-wctype-functions } -do_build() -{ +do_build() { make ${makejobs} } -do_install() -{ +do_install() { make DESTDIR=${DESTDIR} install chmod 755 ${DESTDIR}/usr/lib/libpython*.so* diff --git a/srcpkgs/subversion/libsvn.rshlibs b/srcpkgs/subversion/libsvn.rshlibs index a9976df5dc..9fab8fd1d3 100644 --- a/srcpkgs/subversion/libsvn.rshlibs +++ b/srcpkgs/subversion/libsvn.rshlibs @@ -2,7 +2,6 @@ libaprutil-1.so.0 libldap-2.4.so.2 liblber-2.4.so.2 libdb-4.8.so -libgdbm.so.3 libexpat.so.1 libapr-1.so.0 libuuid.so.1 @@ -15,3 +14,4 @@ libsqlite3.so.0 libc.so.6 libsasl2.so.2 libneon.so.27 +libgdbm.so.4 diff --git a/srcpkgs/subversion/libsvn.template b/srcpkgs/subversion/libsvn.template index 7a8db97cd4..227f474481 100644 --- a/srcpkgs/subversion/libsvn.template +++ b/srcpkgs/subversion/libsvn.template @@ -1,6 +1,6 @@ # Template file for 'libsvn'. # -revision=1 +revision=2 short_desc="${short_desc} - shared libraries" long_desc="${long_desc} diff --git a/srcpkgs/subversion/subversion-perl.rshlibs b/srcpkgs/subversion/subversion-perl.rshlibs index 1e1c0c231e..a0e5ce57d0 100644 --- a/srcpkgs/subversion/subversion-perl.rshlibs +++ b/srcpkgs/subversion/subversion-perl.rshlibs @@ -4,7 +4,6 @@ libaprutil-1.so.0 libldap-2.4.so.2 liblber-2.4.so.2 libdb-4.8.so -libgdbm.so.3 libexpat.so.1 libapr-1.so.0 libuuid.so.1 @@ -19,3 +18,4 @@ libsvn_fs-1.so.0 libsvn_ra-1.so.0 libsvn_repos-1.so.0 libsvn_wc-1.so.0 +libgdbm.so.4 diff --git a/srcpkgs/subversion/subversion-perl.template b/srcpkgs/subversion/subversion-perl.template index a8ab01b926..04919a9043 100644 --- a/srcpkgs/subversion/subversion-perl.template +++ b/srcpkgs/subversion/subversion-perl.template @@ -1,6 +1,6 @@ # Template file for 'subversion-perl'. # -revision=1 +revision=2 short_desc="${short_desc} - perl bindings" long_desc="${long_desc} diff --git a/srcpkgs/subversion/subversion-python.rshlibs b/srcpkgs/subversion/subversion-python.rshlibs index 0342a082aa..fb52496d9a 100644 --- a/srcpkgs/subversion/subversion-python.rshlibs +++ b/srcpkgs/subversion/subversion-python.rshlibs @@ -17,5 +17,5 @@ libaprutil-1.so.0 libldap-2.4.so.2 liblber-2.4.so.2 libdb-4.8.so -libgdbm.so.3 libexpat.so.1 +libgdbm.so.4 diff --git a/srcpkgs/subversion/subversion-python.template b/srcpkgs/subversion/subversion-python.template index a0f4a12c57..f879497b71 100644 --- a/srcpkgs/subversion/subversion-python.template +++ b/srcpkgs/subversion/subversion-python.template @@ -1,6 +1,6 @@ # Template file for 'subversion-python'. # -revision=1 +revision=2 short_desc="${short_desc} - python bindings" long_desc="${long_desc} diff --git a/srcpkgs/subversion/subversion-ruby.rshlibs b/srcpkgs/subversion/subversion-ruby.rshlibs index 67e4c8745a..6ce4ebb441 100644 --- a/srcpkgs/subversion/subversion-ruby.rshlibs +++ b/srcpkgs/subversion/subversion-ruby.rshlibs @@ -7,7 +7,6 @@ libaprutil-1.so.0 libldap-2.4.so.2 liblber-2.4.so.2 libdb-4.8.so -libgdbm.so.3 libexpat.so.1 libapr-1.so.0 libuuid.so.1 @@ -20,3 +19,4 @@ libsvn_diff-1.so.0 libsvn_fs-1.so.0 libsvn_ra-1.so.0 libsvn_repos-1.so.0 +libgdbm.so.4 diff --git a/srcpkgs/subversion/subversion-ruby.template b/srcpkgs/subversion/subversion-ruby.template index c8e88a0248..87de814153 100644 --- a/srcpkgs/subversion/subversion-ruby.template +++ b/srcpkgs/subversion/subversion-ruby.template @@ -1,6 +1,6 @@ # Template file for 'subversion-ruby'. # -revision=1 +revision=2 short_desc="${short_desc} - ruby bindings" long_desc="${long_desc} diff --git a/srcpkgs/zsh/template b/srcpkgs/zsh/template index 4e34d8b19e..8acd247352 100644 --- a/srcpkgs/zsh/template +++ b/srcpkgs/zsh/template @@ -14,7 +14,7 @@ configure_args="--enable-etcdir=/etc/zsh --enable-fndir=/usr/share/zsh/functions --enable-scriptdir=/usr/share/zsh/scripts --enable-pcre --enable-multibyte --enable-cap --with-tcsetpgrp" -revision=1 +revision=2 short_desc="Z SHell" maintainer="Juan RP " homepage="http://www.zsh.org" diff --git a/srcpkgs/zsh/zsh.rshlibs b/srcpkgs/zsh/zsh.rshlibs index 2edfc83104..dc108cc355 100644 --- a/srcpkgs/zsh/zsh.rshlibs +++ b/srcpkgs/zsh/zsh.rshlibs @@ -3,5 +3,5 @@ libdl.so.2 libncursesw.so.6 libm.so.6 libc.so.6 -libgdbm.so.3 libpcre.so.0 +libgdbm.so.4