From d020e43ac98f0d8f130b5ffbc842e2035f7d9265 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 9 Apr 2010 18:29:18 +0200 Subject: [PATCH] Bump revision after openssl abi_depends update. --HG-- extra : convert_revision : 959459dfd308499581def2c41d978adca81bda77 --- srcpkgs/curl/curl-libs.template | 2 + srcpkgs/curl/template | 7 ++-- srcpkgs/git/template | 7 ++++ srcpkgs/heimdal/heimdal-devel.template | 1 + srcpkgs/heimdal/heimdal-libs.template | 2 + srcpkgs/heimdal/template | 1 + srcpkgs/lftp/template | 4 +- srcpkgs/libarchive/bsdcpio.template | 2 + srcpkgs/libarchive/bsdtar.template | 2 + srcpkgs/libarchive/libarchive-devel.template | 2 + srcpkgs/libarchive/template | 1 + srcpkgs/mit-krb5/mit-krb5-devel.template | 1 + srcpkgs/mit-krb5/template | 1 + srcpkgs/mysql/libmysqlclient.template | 2 + srcpkgs/mysql/mysql-client.template | 2 + srcpkgs/mysql/template | 1 + srcpkgs/postgresql/postgresql-client.template | 2 + srcpkgs/postgresql/postgresql-libs.template | 2 + srcpkgs/postgresql/template | 1 + srcpkgs/python/python-devel.template | 2 + srcpkgs/python/template | 1 + srcpkgs/qemu/template | 1 + srcpkgs/qt/qt-devel.template | 2 + srcpkgs/qt/template | 4 +- srcpkgs/rsyslog/rsyslog-mysql.template | 2 + srcpkgs/transmission/template | 38 ++++++++++++++----- srcpkgs/wget/template | 1 + srcpkgs/wpa_supplicant/template | 1 + srcpkgs/xbps/template | 1 + srcpkgs/xorg-server/template | 1 + .../xorg-server/xorg-server-devel.template | 2 + xbps-src/common/mapping_shlib_binpkg.txt | 4 ++ 32 files changed, 87 insertions(+), 16 deletions(-) diff --git a/srcpkgs/curl/curl-libs.template b/srcpkgs/curl/curl-libs.template index 94c2f35248f..1c9534d521c 100644 --- a/srcpkgs/curl/curl-libs.template +++ b/srcpkgs/curl/curl-libs.template @@ -5,6 +5,8 @@ long_desc="${long_desc} This package contains the shared libraries." +revision=1 + Add_dependency run glibc Add_dependency run libidn Add_dependency run zlib diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template index 8091a1e6f6d..4516d418605 100644 --- a/srcpkgs/curl/template +++ b/srcpkgs/curl/template @@ -1,6 +1,7 @@ # Template build file for 'curl'. pkgname=curl version=7.20.0 +revision=1 distfiles="http://curl.haxx.se/download/$pkgname-$version.tar.bz2" build_style=gnu_configure short_desc="Client that groks URLs" @@ -15,11 +16,11 @@ long_desc=" useful tricks." subpackages="$pkgname-devel $pkgname-libs" -Add_dependency run curl-libs -Add_dependency run libidn Add_dependency run glibc -Add_dependency run openssl Add_dependency run zlib +Add_dependency run libidn +Add_dependency run openssl +Add_dependency run curl-libs Add_dependency build pkg-config Add_dependency build libidn-devel Add_dependency build glibc-devel diff --git a/srcpkgs/git/template b/srcpkgs/git/template index f37a0d9afcd..f141969371f 100644 --- a/srcpkgs/git/template +++ b/srcpkgs/git/template @@ -1,6 +1,7 @@ # Template build file for 'git". pkgname=git version=1.7.0.3 +revision=1 distfiles="http://www.kernel.org/pub/software/scm/git/git-$version.tar.bz2" build_style=gnu_configure configure_args="--with-shell=/bin/sh --with-curl --with-expat --without-tcltk" @@ -32,3 +33,9 @@ Add_dependency build expat-devel Add_dependency build openssl-devel Add_dependency build asciidoc Add_dependency build xmlto + +post_build() +{ + # Build the manpages. + cd ${wrksrc} && make -C Documentation man +} diff --git a/srcpkgs/heimdal/heimdal-devel.template b/srcpkgs/heimdal/heimdal-devel.template index 1e238877554..df1584c9939 100644 --- a/srcpkgs/heimdal/heimdal-devel.template +++ b/srcpkgs/heimdal/heimdal-devel.template @@ -5,6 +5,7 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." +revision=1 noverifyrdeps=yes Add_dependency run db-devel diff --git a/srcpkgs/heimdal/heimdal-libs.template b/srcpkgs/heimdal/heimdal-libs.template index 1738c7208c8..9c50c806329 100644 --- a/srcpkgs/heimdal/heimdal-libs.template +++ b/srcpkgs/heimdal/heimdal-libs.template @@ -5,6 +5,8 @@ long_desc="${long_desc} This package contains the shared libraries." +revision=1 + Add_dependency run glibc Add_dependency run db Add_dependency run openssl diff --git a/srcpkgs/heimdal/template b/srcpkgs/heimdal/template index 08e713d6662..0e45e7ab362 100644 --- a/srcpkgs/heimdal/template +++ b/srcpkgs/heimdal/template @@ -1,6 +1,7 @@ # Template file for 'heimdal' pkgname=heimdal version=1.3.1 +revision=1 distfiles="http://www.h5l.org/dist/src/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args="--enable-shared=yes --without-x --datadir=/var/lib/heimdal diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template index 70cb06b8181..d02fff9cbcd 100644 --- a/srcpkgs/lftp/template +++ b/srcpkgs/lftp/template @@ -1,6 +1,7 @@ # Template file for 'lftp' pkgname=lftp version=4.0.5 +revision=1 distfiles="http://ftp.yars.free.net/pub/source/lftp/lftp-$version.tar.bz2" build_style=gnu_configure configure_args="--with-modules --disable-rpath --without-included-regex @@ -16,8 +17,9 @@ long_desc=" conf_files="/etc/lftp.conf" +Add_dependency run libgcc Add_dependency run glibc -Add_dependency run ncurses +Add_dependency run ncurses-libs Add_dependency run readline Add_dependency run openssl Add_dependency run expat diff --git a/srcpkgs/libarchive/bsdcpio.template b/srcpkgs/libarchive/bsdcpio.template index 897382d4ecb..f88705c842e 100644 --- a/srcpkgs/libarchive/bsdcpio.template +++ b/srcpkgs/libarchive/bsdcpio.template @@ -26,6 +26,8 @@ long_desc=" * GNU tar support. Libarchive reads most GNU tar archives. If there is demand, this can be improved further." +revision=1 + Add_dependency run glibc Add_dependency run acl Add_dependency run attr diff --git a/srcpkgs/libarchive/bsdtar.template b/srcpkgs/libarchive/bsdtar.template index 162aa535fdd..5ff4706dac1 100644 --- a/srcpkgs/libarchive/bsdtar.template +++ b/srcpkgs/libarchive/bsdtar.template @@ -27,6 +27,8 @@ long_desc=" * GNU tar support. Libarchive reads most GNU tar archives. If there is demand, this can be improved further." +revision=1 + Add_dependency run glibc Add_dependency run acl Add_dependency run attr diff --git a/srcpkgs/libarchive/libarchive-devel.template b/srcpkgs/libarchive/libarchive-devel.template index fe1c5443401..ede9e9d83f9 100644 --- a/srcpkgs/libarchive/libarchive-devel.template +++ b/srcpkgs/libarchive/libarchive-devel.template @@ -5,6 +5,8 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." +revision=1 + Add_dependency run acl-devel Add_dependency run zlib-devel Add_dependency run bzip2-devel diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template index 4a7dc94ae98..76f632cac1f 100644 --- a/srcpkgs/libarchive/template +++ b/srcpkgs/libarchive/template @@ -1,6 +1,7 @@ # Template file for 'libarchive' pkgname=libarchive version=2.8.3 +revision=1 distfiles="http://libarchive.googlecode.com/files/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args="--without-xml2" diff --git a/srcpkgs/mit-krb5/mit-krb5-devel.template b/srcpkgs/mit-krb5/mit-krb5-devel.template index fed758af66b..8af3cab9bf0 100644 --- a/srcpkgs/mit-krb5/mit-krb5-devel.template +++ b/srcpkgs/mit-krb5/mit-krb5-devel.template @@ -5,6 +5,7 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." +revision=1 noverifyrdeps=yes Add_dependency run db-devel diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template index c44457a8d58..4ccc7402b28 100644 --- a/srcpkgs/mit-krb5/template +++ b/srcpkgs/mit-krb5/template @@ -1,6 +1,7 @@ # Template file for 'mit-krb5' pkgname=mit-krb5 version=1.8 +revision=1 wrksrc="krb5-${version}" distfiles="http://web.mit.edu/Kerberos/dist/krb5/$version/krb5-$version-signed.tar" build_style=gnu_configure diff --git a/srcpkgs/mysql/libmysqlclient.template b/srcpkgs/mysql/libmysqlclient.template index 61ce2e612f3..0c280b99438 100644 --- a/srcpkgs/mysql/libmysqlclient.template +++ b/srcpkgs/mysql/libmysqlclient.template @@ -5,6 +5,8 @@ long_desc="${long_desc} This package includes the client library." +revision=1 + Add_dependency run glibc Add_dependency run zlib Add_dependency run openssl diff --git a/srcpkgs/mysql/mysql-client.template b/srcpkgs/mysql/mysql-client.template index 23f26f98e68..4f980bf7e93 100644 --- a/srcpkgs/mysql/mysql-client.template +++ b/srcpkgs/mysql/mysql-client.template @@ -6,6 +6,8 @@ long_desc="${long_desc} This package includes the client binaries and the additional tools innotop and mysqlreport." +revision=1 + Add_dependency run libgcc Add_dependency run glibc Add_dependency run libstdc++ diff --git a/srcpkgs/mysql/template b/srcpkgs/mysql/template index c55a79a35a8..0aa03a6adee 100644 --- a/srcpkgs/mysql/template +++ b/srcpkgs/mysql/template @@ -1,6 +1,7 @@ # Template file for 'mysql' pkgname=mysql version=5.1.44 +revision=1 distfiles="http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.1/mysql-${version}.tar.gz" build_style=gnu_configure configure_args="--localstatedir=/var --sysconfdir=/etc/mysql diff --git a/srcpkgs/postgresql/postgresql-client.template b/srcpkgs/postgresql/postgresql-client.template index 7777f25af1c..d2b4b16feb5 100644 --- a/srcpkgs/postgresql/postgresql-client.template +++ b/srcpkgs/postgresql/postgresql-client.template @@ -12,6 +12,8 @@ long_desc="${long_desc} On a network, you can install this package on many client machines, while the server package may be installed on only one machine." +revision=1 + Add_dependency run glibc Add_dependency run zlib Add_dependency run openssl diff --git a/srcpkgs/postgresql/postgresql-libs.template b/srcpkgs/postgresql/postgresql-libs.template index 625ea411c4e..cd5ece6d405 100644 --- a/srcpkgs/postgresql/postgresql-libs.template +++ b/srcpkgs/postgresql/postgresql-libs.template @@ -5,6 +5,8 @@ long_desc="${long_desc} This package provides the shared libraries used by PostgreSQL applications." +revision=1 + Add_dependency run glibc Add_dependency run openssl diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template index b957f9604ad..65cc05393ff 100644 --- a/srcpkgs/postgresql/template +++ b/srcpkgs/postgresql/template @@ -1,6 +1,7 @@ # Template file for 'postgresql' pkgname=postgresql version=8.4.2 +revision=1 distfiles="ftp://ftp.postgresql.org/pub/source/v${version}/${pkgname}-${version}.tar.bz2" build_style=gnu_configure configure_args="--with-docdir=/usr/share/doc --with-openssl --with-python diff --git a/srcpkgs/python/python-devel.template b/srcpkgs/python/python-devel.template index cd4ffe133ff..322ef1f7657 100644 --- a/srcpkgs/python/python-devel.template +++ b/srcpkgs/python/python-devel.template @@ -5,6 +5,8 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." +revision=1 + Add_dependency run libffi-devel Add_dependency run zlib-devel Add_dependency run readline-devel diff --git a/srcpkgs/python/template b/srcpkgs/python/template index 03f0f35db10..de260d361db 100644 --- a/srcpkgs/python/template +++ b/srcpkgs/python/template @@ -1,6 +1,7 @@ # Template build file for 'python'. pkgname=python version=2.6.5 +revision=1 wrksrc="Python-$version" distfiles="http://www.python.org/ftp/python/$version/Python-$version.tar.bz2" configure_args="--with-threads --enable-ipv6 --with-signal-module diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template index 31e78098d11..fb9c3ad6289 100644 --- a/srcpkgs/qemu/template +++ b/srcpkgs/qemu/template @@ -1,6 +1,7 @@ # Template file for 'qemu' pkgname=qemu version=0.12.2 +revision=1 distfiles="http://download.savannah.gnu.org/releases/qemu/qemu-$version.tar.gz" build_style=configure configure_args="--prefix=/usr --disable-strip --enable-sdl diff --git a/srcpkgs/qt/qt-devel.template b/srcpkgs/qt/qt-devel.template index db86aadc48e..b8e356de962 100644 --- a/srcpkgs/qt/qt-devel.template +++ b/srcpkgs/qt/qt-devel.template @@ -6,6 +6,8 @@ long_desc="${long_desc} This package contains the header development files and development programs used for runing Qt applications." +revision=1 + Add_dependency run openssl-devel Add_dependency run dbus-devel Add_dependency run fontconfig-devel diff --git a/srcpkgs/qt/template b/srcpkgs/qt/template index e1efd8710d6..3606cdc86df 100644 --- a/srcpkgs/qt/template +++ b/srcpkgs/qt/template @@ -1,10 +1,10 @@ # Template file for 'qt' pkgname=qt version=4.6.2 -#revision=1 +revision=1 _distname=qt-everywhere-opensource-src wrksrc=${_distname}-${version} -distfiles="ftp://ftp.qtsoftware.com/qt/source/${_distname}-$version.tar.gz" +distfiles="ftp://ftp.qt.nokia.com/qt/source/${_distname}-$version.tar.gz" build_style=configure configure_args="-confirm-license -opensource -prefix /usr -sysconfdir /etc -plugindir /usr/lib/qt/plugins diff --git a/srcpkgs/rsyslog/rsyslog-mysql.template b/srcpkgs/rsyslog/rsyslog-mysql.template index 4a6e305c031..48a0e0f918c 100644 --- a/srcpkgs/rsyslog/rsyslog-mysql.template +++ b/srcpkgs/rsyslog/rsyslog-mysql.template @@ -5,6 +5,8 @@ long_desc="${long_desc} This package contains the MySQL add-on to store log messages." +revision=1 + Add_dependency run glibc Add_dependency run zlib Add_dependency run openssl diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template index 085d86cc260..b3a49cb76ff 100644 --- a/srcpkgs/transmission/template +++ b/srcpkgs/transmission/template @@ -1,6 +1,7 @@ # Template file for 'transmission' pkgname=transmission version=1.77 +revision=1 distfiles="http://mirrors.m0k.org/$pkgname/files/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--enable-gtk --enable-libnotify --enable-nls --enable-cli @@ -15,18 +16,35 @@ long_desc=" gtk_iconcache_dirs="/usr/share/icons/hicolor" +Add_dependency run glibc +Add_dependency run zlib +Add_dependency run libnotify +Add_dependency run atk +Add_dependency run glib +Add_dependency run pango +Add_dependency run cairo +Add_dependency run freetype +Add_dependency run fontconfig +Add_dependency run gtk+ +Add_dependency run dbus-glib +Add_dependency run dbus-libs +Add_dependency run openssl +Add_dependency run curl-libs Add_dependency build pkg-config Add_dependency build intltool +Add_dependency build libnotify-devel +Add_dependency build gtk+-devel +Add_dependency build atk-devel +Add_dependency build glib-devel +Add_dependency build pango-devel +Add_dependency build cairo-devel +Add_dependency build freetype-devel +Add_dependency build fontconfig-devel +Add_dependency build glibc-devel +Add_dependency build dbus-glib-devel +Add_dependency build dbus-devel +Add_dependency build openssl-devel Add_dependency build curl-devel -Add_dependency run glibc -Add_dependency run curl-libs +Add_dependency build zlib-devel Add_dependency full desktop-file-utils Add_dependency full hicolor-icon-theme - -_deps="atk cairo glib pango gtk+ openssl dbus dbus-glib libevent" -_deps="${_deps} fontconfig freetype libnotify zlib" - -for _dep_ in ${_deps}; do - Add_dependency run ${_dep_} - Add_dependency build ${_dep_}-devel -done diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template index 651268677d7..948bc65604c 100644 --- a/srcpkgs/wget/template +++ b/srcpkgs/wget/template @@ -1,6 +1,7 @@ # Template file for 'wget' pkgname=wget version=1.12 +revision=1 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" build_style=gnu_configure short_desc="The GNU wget utility" diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template index 0474ecf955c..7743d81be4e 100644 --- a/srcpkgs/wpa_supplicant/template +++ b/srcpkgs/wpa_supplicant/template @@ -1,6 +1,7 @@ # Template file for 'wpa_supplicant' pkgname=wpa_supplicant version=0.7.0 +revision=1 wrksrc=${pkgname}-${version}/${pkgname} distfiles="http://hostap.epitest.fi/releases/$pkgname-$version.tar.gz" build_style=gnu_makefile diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template index 842406991e0..0a2acde7b43 100644 --- a/srcpkgs/xbps/template +++ b/srcpkgs/xbps/template @@ -1,6 +1,7 @@ # Template file for 'xbps' pkgname=xbps version=0.4.1 +revision=1 distfiles="http://launchpad.net/xbps/head/$version/+download/xbps-$version.tar.gz" build_style=gnu_makefile make_install_args="PREFIX= MANDIR=/usr/share/man INCLUDEDIR=/usr/include" diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template index a165959c198..89873d07932 100644 --- a/srcpkgs/xorg-server/template +++ b/srcpkgs/xorg-server/template @@ -1,6 +1,7 @@ # Template build file for 'xorg-server'. pkgname=xorg-server version=1.8.0 +revision=1 distfiles="${XORG_SITE}/xserver/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--with-dri-driver-path=/usr/lib/dri --enable-ipv6 diff --git a/srcpkgs/xorg-server/xorg-server-devel.template b/srcpkgs/xorg-server/xorg-server-devel.template index 460d0d873d0..1b743d9cb84 100644 --- a/srcpkgs/xorg-server/xorg-server-devel.template +++ b/srcpkgs/xorg-server/xorg-server-devel.template @@ -5,6 +5,8 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." +revision=1 + Add_dependency run pkg-config Add_dependency run perl Add_dependency run flex diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt index 4d36d1d9956..14bbe6fe792 100644 --- a/xbps-src/common/mapping_shlib_binpkg.txt +++ b/xbps-src/common/mapping_shlib_binpkg.txt @@ -509,3 +509,7 @@ libkdb5.so mit-krb5-libs mit-krb5-devel libkrb5.so mit-krb5-libs mit-krb5-devel libkrb5support.so mit-krb5-libs mit-krb5-devel libmenu-cache.so menu-cache menu-cache-devel +liblftp-jobs.so lftp +liblftp-tasks.so lftp +liblftp-network.so lftp +liblftp-pty.so lftp