jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Changed $replaces to accept pkg patterns, like Add_dependency().

Browse source 
Changed all packages using $replaces to the new format and bump
the revision. Require XBPS utils >= 20100121 for this to work.

--HG--
extra : convert_revision : 7593b3cb7465f7613f48aba0f2e86cdcd5430ac0
This commit is contained in:
Juan RP 2010-01-21 03:33:26 +01:00
parent 8a50cd385f
commit 0da86577ab
20 changed files with 37 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
srcpkgs/gcc/libgcc.template
View file

@ -5,8 +5,8 @@ long_desc="${long_desc}
This package contains the GCC shared library."
replaces="gcc-libgcc"
revision=1
replaces="gcc-libgcc>=0"
revision=2
do_install()
{

4
srcpkgs/gcc/libgomp.template
View file

@ -9,8 +9,8 @@ long_desc="${long_desc}
Add_dependency run glibc
Add_dependency run libgcc
replaces="gcc-libgomp"
revision=1
replaces="gcc-libgomp>=0"
revision=2
do_install()
{

4
srcpkgs/gcc/libmudflap-devel.template
View file

@ -8,8 +8,8 @@ long_desc="${long_desc}
Add_dependency run libmudflap
replaces="gcc-libmudflap-devel"
revision=1
replaces="gcc-libmudflap-devel>=0"
revision=2
do_install()
{

4
srcpkgs/gcc/libmudflap.template
View file

@ -9,8 +9,8 @@ long_desc="${long_desc}
Add_dependency run glibc
Add_dependency run libgcc
replaces="gcc-libmudflap"
revision=1
replaces="gcc-libmudflap>=0"
revision=2
do_install()
{

4
srcpkgs/gcc/libobjc-devel.template
View file

@ -8,8 +8,8 @@ long_desc="${long_desc}
Add_dependency run libobjc
replaces="gcc-libobjc-devel"
revision=1
replaces="gcc-libobjc-devel>=0"
revision=2
do_install()
{

4
srcpkgs/gcc/libobjc.template
View file

@ -9,8 +9,8 @@ long_desc="${long_desc}
Add_dependency run glibc
Add_dependency run libgcc
replaces="gcc-libobjc"
revision=1
replaces="gcc-libobjc>=0"
revision=2
do_install()
{

4
srcpkgs/gcc/libstdc++-devel.template
View file

@ -8,8 +8,8 @@ long_desc="${long_desc}
Add_dependency run libstdc++
replaces="gcc-libstdc++-devel"
revision=1
replaces="gcc-libstdc++-devel>=0"
revision=2
do_install()
{

4
srcpkgs/gcc/libstdc++.template
View file

@ -9,8 +9,8 @@ long_desc="${long_desc}
Add_dependency run glibc
Add_dependency run libgcc
replaces="gcc-libstdc++"
revision=1
replaces="gcc-libstdc++>=0"
revision=2
do_install()
{

3
srcpkgs/libtool/libltdl.template
View file

@ -10,7 +10,8 @@ long_desc="
system-installed ltdl libraries; they are not needed by software built using the
rest of the GNU Autotools (including GNU Autoconf and GNU Automake)."
replaces="libtool-ltdl"
revision=1
replaces="libtool-ltdl>=0"
Add_dependency run glibc
do_install()

4
srcpkgs/lvm2/device-mapper.template
View file

@ -5,8 +5,8 @@ long_desc="
This package contains the supporting userspace utility, dmsetup,
for the kernel device-mapper and its required library, libdevmapper."
replaces="lvm2-device-mapper"
revision=3
replaces="lvm2-device-mapper>=0"
revision=4
Add_dependency run glibc
Add_dependency run readline

3
srcpkgs/polkit/polkit-devel.template
View file

@ -5,7 +5,8 @@ long_desc="${long_desc}
This package contains files for development, headers, static libs, etc."
replaces="PolicyKit-devel"
revision=1
replaces="PolicyKit-devel>=0"
Add_dependency run pkg-config
Add_dependency run gobject-introspection-devel

3
srcpkgs/polkit/template
View file

@ -1,6 +1,7 @@
# Template file for 'polkit'
pkgname=polkit
version=0.96
revision=1
distfiles="http://hal.freedesktop.org/releases/$pkgname-$version.tar.gz"
build_style=gnu_configure
configure_args="--disable-static --localstatedir=/var --with-os-type=gentoo"
@ -15,7 +16,7 @@ long_desc="
to granting access to privileged operations (like calling the HAL Mount()
method) for unprivileged (desktop) applications."
replaces="PolicyKit"
replaces="PolicyKit>=0"
subpackages="$pkgname-devel"
Add_dependency run glib
Add_dependency run glibc

4
srcpkgs/udev/libgudev-devel.template
View file

@ -6,8 +6,8 @@ long_desc="${long_desc}
This package contains the libgudev development files (static libs, headers,
etc), a library to interact with udev through the GLib bindings."
revision=1
replaces="udev-glib-devel"
revision=2
replaces="udev-glib-devel>=0"
Add_dependency run libudev-devel
Add_dependency run glib-devel

4
srcpkgs/udev/libgudev.template
View file

@ -6,8 +6,8 @@ long_desc="${long_desc}
This package contains libgudev, a library to interact with udev through
the GLib bindings."
revision=1
replaces="udev-glib"
revision=2
replaces="udev-glib>=0"
Add_dependency run udev
Add_dependency run glib

3
srcpkgs/udev/libudev-devel.template
View file

@ -6,7 +6,8 @@ long_desc="${long_desc}
This package contains the files needed for developing applications
that use libudev."
replaces="udev-devel"
revision=1
replaces="udev-devel>=0"
Add_dependency run glibc-devel
Add_dependency run libudev

3
srcpkgs/xorg-apps/template
View file

@ -8,7 +8,8 @@ long_desc="
This is the Xorg applications meta-package for installing various
applications from the modular Xorg project."
replaces="xorg-server-utils"
revision=1
replaces="xorg-server-utils>=0"
noarch=yes
Add_dependency full iceauth ">=1.0.3"

4
srcpkgs/xz/template
View file

@ -1,7 +1,7 @@
# Template file for 'xz'
pkgname=xz
version=4.999.9
revision=1
revision=2
wrksrc=${pkgname}-${version}beta
distfiles="http://tukaani.org/xz/xz-${version}beta.tar.bz2"
build_style=gnu_configure
@ -32,7 +32,7 @@ long_desc="
* A few shell scripts make diffing and grepping LZMA compressed
files easy. The scripts were adapted from gzip and bzip2."
replaces="lzma-utils lzma-utils-libs"
replaces="lzma-utils>=0 lzma-utils-libs>=0"
subpackages="xz-devel"
Add_dependency run glibc
Add_dependency run libstdc++

4
srcpkgs/xz/xz-devel.template
View file

@ -5,8 +5,8 @@ long_desc="${long_desc}
This package contains files for development, headers, static libs, etc."
replaces="lzma-utils-devel"
revision=1
replaces="lzma-utils-devel>=0"
revision=2
Add_dependency run glibc-devel
Add_dependency run libstdc++-devel

11
xbps-src/shutils/pkgtarget_funcs.sh.in
View file

@ -121,17 +121,6 @@ install_pkg_with_binpkg()
{
local pkgpattern="$1"
#
# Check that installed xbps utils version is recent enough.
#
instver=$(${XBPS_BIN_CMD} -V)
${XBPS_CMPVER_CMD} "${instver}" "20100114"
if [ $? -eq 255 ]; then
echo -n "Your xbps utilities are too old, "
echo "required version: 20100114"
return 1
fi
msg_normal "Installing binary pkg: $pkgpattern"
${fakeroot_cmd} ${fakeroot_cmd_args} ${XBPS_BIN_CMD} \
-y install "$pkgpattern"

2
xbps-src/xbps-src.sh.in
View file

@ -33,7 +33,7 @@ trap "echo && exit 1" INT QUIT
: ${sudo_cmd:=sudo}
: ${chroot_cmd:=chroot}
: ${xbps_machine:=$(uname -m)}
: ${XBPS_UTILS_REQVER:=20091124-1}
: ${XBPS_UTILS_REQVER:=20100121}
usage()
{