From 0b2f801e1e96fe5e7ebbf61a432e15c775f43540 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 15 Dec 2011 16:42:05 +0100 Subject: [PATCH] Require xbps-src>=11 to build pkgs that use virtualpkgs. --- srcpkgs/cronie/template | 3 ++- srcpkgs/dcron/template | 3 ++- srcpkgs/libjpeg-turbo/libjpeg-turbo-devel.template | 3 +-- srcpkgs/libjpeg-turbo/libjpeg-turbo-tools.template | 3 +-- srcpkgs/libjpeg-turbo/template | 3 ++- srcpkgs/mumble122/template | 3 ++- srcpkgs/rsyslog/template | 2 ++ srcpkgs/vim-x11/template | 2 ++ srcpkgs/xbps-devel/template | 1 + srcpkgs/xf86-video-ati-git-snapshot/template | 1 + srcpkgs/xfce4-notifyd/template | 4 ++-- 11 files changed, 18 insertions(+), 10 deletions(-) diff --git a/srcpkgs/cronie/template b/srcpkgs/cronie/template index fa47e71018..90dffa4458 100644 --- a/srcpkgs/cronie/template +++ b/srcpkgs/cronie/template @@ -1,7 +1,7 @@ # Template file for 'cronie' pkgname=cronie version=1.4.8 -revision=10 +revision=11 distfiles="https://fedorahosted.org/releases/c/r/cronie/cronie-$version.tar.gz" build_style=gnu-configure configure_args="--with-inotify --without-selinux --with-pam --disable-anacron @@ -17,6 +17,7 @@ long_desc=" has security and configuration enhancements like the ability to use PAM and SELinux." +build_requires=11 conf_files="/etc/crontab /etc/pam.d/crond /etc/cron.deny" systemd_services="cronie.service on" provides="cron-daemon-0" diff --git a/srcpkgs/dcron/template b/srcpkgs/dcron/template index 36299bf85a..e025240564 100644 --- a/srcpkgs/dcron/template +++ b/srcpkgs/dcron/template @@ -1,7 +1,7 @@ # Template file for 'dcron' pkgname=dcron version=4.5 -revision=13 +revision=14 distfiles="http://www.jimpryor.net/linux/releases/dcron-${version}.tar.gz" short_desc="Dillon's lightweight cron daemon" maintainer="Juan RP " @@ -15,6 +15,7 @@ long_desc=" like anacron makes for too much complexity. So the goal is a simple cron daemon that can also take over the central functions of anacron." +build_requires=11 replaces="cronie>=0" systemd_services="dcron.service on" conf_files="/var/spool/cron/root" diff --git a/srcpkgs/libjpeg-turbo/libjpeg-turbo-devel.template b/srcpkgs/libjpeg-turbo/libjpeg-turbo-devel.template index 710d510f5b..0b830c986a 100644 --- a/srcpkgs/libjpeg-turbo/libjpeg-turbo-devel.template +++ b/srcpkgs/libjpeg-turbo/libjpeg-turbo-devel.template @@ -10,8 +10,7 @@ Add_dependency run libjpeg-turbo provides="jpeg-devel-8" replaces="jpeg-devel>=0" - -revision=5 +revision=6 do_install() { diff --git a/srcpkgs/libjpeg-turbo/libjpeg-turbo-tools.template b/srcpkgs/libjpeg-turbo/libjpeg-turbo-tools.template index 675a207508..4badcf4d59 100644 --- a/srcpkgs/libjpeg-turbo/libjpeg-turbo-tools.template +++ b/srcpkgs/libjpeg-turbo/libjpeg-turbo-tools.template @@ -9,8 +9,7 @@ Add_dependency run libjpeg-turbo ">=${version}" provides="jpeg-tools-8" replaces="jpeg-tools>=0" - -revision=6 +revision=7 do_install() { diff --git a/srcpkgs/libjpeg-turbo/template b/srcpkgs/libjpeg-turbo/template index b1db822acc..d5a53b9d10 100644 --- a/srcpkgs/libjpeg-turbo/template +++ b/srcpkgs/libjpeg-turbo/template @@ -1,7 +1,7 @@ # Template build file for 'libjpeg-turbo'. pkgname=libjpeg-turbo version=1.1.1 -revision=6 +revision=7 homepage="http://libjpeg-turbo.virtualgl.org/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" build_style=gnu-configure @@ -17,6 +17,7 @@ long_desc=" generally 2-4x as fast as the unmodified version of libjpeg, all else being equal." +build_requires=11 provides="jpeg-8" replaces="jpeg>=0" subpackages="${pkgname}-devel ${pkgname}-tools" diff --git a/srcpkgs/mumble122/template b/srcpkgs/mumble122/template index bc7f64659b..210628c0bc 100644 --- a/srcpkgs/mumble122/template +++ b/srcpkgs/mumble122/template @@ -2,7 +2,7 @@ __pkgname=mumble pkgname=${__pkgname}122 version=1.2.2 -revision=2 +revision=3 homepage="http://${__pkgname}.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${__pkgname}/${__pkgname}-${version}.tar.gz" short_desc="Open source, low-latency, high quality voice chat for gaming" @@ -23,6 +23,7 @@ disable_parallel_build=yes replaces="lib${__pkgname}<=1.2.3 ${__pkgname}>=0" provides="${__pkgname}-999" gtk_iconcache_dirs="/usr/share/icons/hicolor" +build_requires=11 Add_dependency run jack Add_dependency run qt-plugin-sqlite diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template index 9aa2072460..9b135b82ed 100644 --- a/srcpkgs/rsyslog/template +++ b/srcpkgs/rsyslog/template @@ -1,6 +1,7 @@ # Template file for 'rsyslog' pkgname=rsyslog version=5.8.6 +revision=1 homepage="http://www.rsyslog.com" distfiles="${homepage}/files/download/rsyslog/$pkgname-$version.tar.gz" build_style=gnu-configure @@ -22,6 +23,7 @@ conf_files="/etc/rsyslog.conf" systemd_services="rsyslog.service on" provides="syslog-daemon-0" replaces="syslog-daemon>=0" +build_requires=11 Add_dependency build pkg-config Add_dependency build zlib-devel diff --git a/srcpkgs/vim-x11/template b/srcpkgs/vim-x11/template index b8070c46a4..86e429b65c 100644 --- a/srcpkgs/vim-x11/template +++ b/srcpkgs/vim-x11/template @@ -14,6 +14,8 @@ long_desc="${long_desc} provides="vim-${version}" replaces="vim>=${version}" +revision=1 +build_requires=11 Add_dependency build pkg-config Add_dependency build libXt-devel diff --git a/srcpkgs/xbps-devel/template b/srcpkgs/xbps-devel/template index b357c161d5..f9bf35068c 100644 --- a/srcpkgs/xbps-devel/template +++ b/srcpkgs/xbps-devel/template @@ -13,6 +13,7 @@ long_desc=" binary package manager. This packages includes code from a development branch available from https://github.com/xtraeme/xbps" +build_requires=11 conf_files="/etc/xbps/xbps.conf" subpackages="$pkgname-static" provides="xbps-9999" diff --git a/srcpkgs/xf86-video-ati-git-snapshot/template b/srcpkgs/xf86-video-ati-git-snapshot/template index 6e52a16ec4..7429ae911a 100644 --- a/srcpkgs/xf86-video-ati-git-snapshot/template +++ b/srcpkgs/xf86-video-ati-git-snapshot/template @@ -7,6 +7,7 @@ maintainer="Juan RP " long_desc=" This is the video driver for ATI Radeon cards for the Xorg X11 server." +build_requires=11 replaces="xf86-video-ati>=0" provides="xf86-video-ati-6.15" nofetch=yes diff --git a/srcpkgs/xfce4-notifyd/template b/srcpkgs/xfce4-notifyd/template index 631bddc457..ee57020d3e 100644 --- a/srcpkgs/xfce4-notifyd/template +++ b/srcpkgs/xfce4-notifyd/template @@ -1,7 +1,7 @@ # Template file for 'xfce4-notifyd' pkgname=xfce4-notifyd version=0.2.1 -revision=6 +revision=7 distfiles="http://archive.xfce.org/src/apps/$pkgname/0.2/$pkgname-$version.tar.bz2" build_style=gnu-configure short_desc="Simple, visually-appealing notification daemon for Xfce" @@ -14,10 +14,10 @@ long_desc=" provides="notification-daemon-${version}" conflicts="notification-daemon>=0" replaces="notification-daemon>=0" +build_requires=11 gtk_iconcache_dirs="/usr/share/icons/hicolor" - Add_dependency build pkg-config Add_dependency build intltool Add_dependency build libxfce4util-devel