diff --git a/srcpkgs/xbps-base-files/files/DIR_COLORS b/srcpkgs/base-files/files/DIR_COLORS similarity index 100% rename from srcpkgs/xbps-base-files/files/DIR_COLORS rename to srcpkgs/base-files/files/DIR_COLORS diff --git a/srcpkgs/xbps-base-files/files/DIR_COLORS.256color b/srcpkgs/base-files/files/DIR_COLORS.256color similarity index 100% rename from srcpkgs/xbps-base-files/files/DIR_COLORS.256color rename to srcpkgs/base-files/files/DIR_COLORS.256color diff --git a/srcpkgs/xbps-base-files/files/DIR_COLORS.xterm b/srcpkgs/base-files/files/DIR_COLORS.xterm similarity index 100% rename from srcpkgs/xbps-base-files/files/DIR_COLORS.xterm rename to srcpkgs/base-files/files/DIR_COLORS.xterm diff --git a/srcpkgs/xbps-base-files/files/blacklist.conf b/srcpkgs/base-files/files/blacklist.conf similarity index 100% rename from srcpkgs/xbps-base-files/files/blacklist.conf rename to srcpkgs/base-files/files/blacklist.conf diff --git a/srcpkgs/xbps-base-files/files/colorls.sh b/srcpkgs/base-files/files/colorls.sh similarity index 100% rename from srcpkgs/xbps-base-files/files/colorls.sh rename to srcpkgs/base-files/files/colorls.sh diff --git a/srcpkgs/xbps-base-files/files/dot_bash_logout b/srcpkgs/base-files/files/dot_bash_logout similarity index 100% rename from srcpkgs/xbps-base-files/files/dot_bash_logout rename to srcpkgs/base-files/files/dot_bash_logout diff --git a/srcpkgs/xbps-base-files/files/dot_bash_profile b/srcpkgs/base-files/files/dot_bash_profile similarity index 100% rename from srcpkgs/xbps-base-files/files/dot_bash_profile rename to srcpkgs/base-files/files/dot_bash_profile diff --git a/srcpkgs/xbps-base-files/files/dot_bashrc b/srcpkgs/base-files/files/dot_bashrc similarity index 100% rename from srcpkgs/xbps-base-files/files/dot_bashrc rename to srcpkgs/base-files/files/dot_bashrc diff --git a/srcpkgs/xbps-base-files/files/host.conf b/srcpkgs/base-files/files/host.conf similarity index 100% rename from srcpkgs/xbps-base-files/files/host.conf rename to srcpkgs/base-files/files/host.conf diff --git a/srcpkgs/xbps-base-files/files/hosts b/srcpkgs/base-files/files/hosts similarity index 100% rename from srcpkgs/xbps-base-files/files/hosts rename to srcpkgs/base-files/files/hosts diff --git a/srcpkgs/xbps-base-files/files/issue b/srcpkgs/base-files/files/issue similarity index 100% rename from srcpkgs/xbps-base-files/files/issue rename to srcpkgs/base-files/files/issue diff --git a/srcpkgs/xbps-base-files/files/licenses/Apache-2.0 b/srcpkgs/base-files/files/licenses/Apache-2.0 similarity index 100% rename from srcpkgs/xbps-base-files/files/licenses/Apache-2.0 rename to srcpkgs/base-files/files/licenses/Apache-2.0 diff --git a/srcpkgs/xbps-base-files/files/licenses/Artistic b/srcpkgs/base-files/files/licenses/Artistic similarity index 100% rename from srcpkgs/xbps-base-files/files/licenses/Artistic rename to srcpkgs/base-files/files/licenses/Artistic diff --git a/srcpkgs/xbps-base-files/files/licenses/BSD b/srcpkgs/base-files/files/licenses/BSD similarity index 100% rename from srcpkgs/xbps-base-files/files/licenses/BSD rename to srcpkgs/base-files/files/licenses/BSD diff --git a/srcpkgs/xbps-base-files/files/licenses/GFDL-1.2 b/srcpkgs/base-files/files/licenses/GFDL-1.2 similarity index 100% rename from srcpkgs/xbps-base-files/files/licenses/GFDL-1.2 rename to srcpkgs/base-files/files/licenses/GFDL-1.2 diff --git a/srcpkgs/xbps-base-files/files/licenses/GFDL-1.3 b/srcpkgs/base-files/files/licenses/GFDL-1.3 similarity index 100% rename from srcpkgs/xbps-base-files/files/licenses/GFDL-1.3 rename to srcpkgs/base-files/files/licenses/GFDL-1.3 diff --git a/srcpkgs/xbps-base-files/files/licenses/GPL-2 b/srcpkgs/base-files/files/licenses/GPL-2 similarity index 100% rename from srcpkgs/xbps-base-files/files/licenses/GPL-2 rename to srcpkgs/base-files/files/licenses/GPL-2 diff --git a/srcpkgs/xbps-base-files/files/licenses/GPL-3 b/srcpkgs/base-files/files/licenses/GPL-3 similarity index 100% rename from srcpkgs/xbps-base-files/files/licenses/GPL-3 rename to srcpkgs/base-files/files/licenses/GPL-3 diff --git a/srcpkgs/xbps-base-files/files/licenses/LGPL-2 b/srcpkgs/base-files/files/licenses/LGPL-2 similarity index 100% rename from srcpkgs/xbps-base-files/files/licenses/LGPL-2 rename to srcpkgs/base-files/files/licenses/LGPL-2 diff --git a/srcpkgs/xbps-base-files/files/licenses/LGPL-2.1 b/srcpkgs/base-files/files/licenses/LGPL-2.1 similarity index 100% rename from srcpkgs/xbps-base-files/files/licenses/LGPL-2.1 rename to srcpkgs/base-files/files/licenses/LGPL-2.1 diff --git a/srcpkgs/xbps-base-files/files/licenses/LGPL-3 b/srcpkgs/base-files/files/licenses/LGPL-3 similarity index 100% rename from srcpkgs/xbps-base-files/files/licenses/LGPL-3 rename to srcpkgs/base-files/files/licenses/LGPL-3 diff --git a/srcpkgs/xbps-base-files/files/licenses/MPL-1.1 b/srcpkgs/base-files/files/licenses/MPL-1.1 similarity index 100% rename from srcpkgs/xbps-base-files/files/licenses/MPL-1.1 rename to srcpkgs/base-files/files/licenses/MPL-1.1 diff --git a/srcpkgs/xbps-base-files/files/lsb-release b/srcpkgs/base-files/files/lsb-release similarity index 100% rename from srcpkgs/xbps-base-files/files/lsb-release rename to srcpkgs/base-files/files/lsb-release diff --git a/srcpkgs/xbps-base-files/files/mozplugin.sh b/srcpkgs/base-files/files/mozplugin.sh similarity index 100% rename from srcpkgs/xbps-base-files/files/mozplugin.sh rename to srcpkgs/base-files/files/mozplugin.sh diff --git a/srcpkgs/xbps-base-files/files/profile b/srcpkgs/base-files/files/profile similarity index 100% rename from srcpkgs/xbps-base-files/files/profile rename to srcpkgs/base-files/files/profile diff --git a/srcpkgs/xbps-base-files/files/securetty b/srcpkgs/base-files/files/securetty similarity index 100% rename from srcpkgs/xbps-base-files/files/securetty rename to srcpkgs/base-files/files/securetty diff --git a/srcpkgs/xbps-base-files/files/usb-load-ehci-first b/srcpkgs/base-files/files/usb-load-ehci-first similarity index 100% rename from srcpkgs/xbps-base-files/files/usb-load-ehci-first rename to srcpkgs/base-files/files/usb-load-ehci-first diff --git a/srcpkgs/xbps-base-files/files/vim.sh b/srcpkgs/base-files/files/vim.sh similarity index 100% rename from srcpkgs/xbps-base-files/files/vim.sh rename to srcpkgs/base-files/files/vim.sh diff --git a/srcpkgs/xbps-base-files/files/which2.sh b/srcpkgs/base-files/files/which2.sh similarity index 100% rename from srcpkgs/xbps-base-files/files/which2.sh rename to srcpkgs/base-files/files/which2.sh diff --git a/srcpkgs/xbps-base-files/template b/srcpkgs/base-files/template similarity index 92% rename from srcpkgs/xbps-base-files/template rename to srcpkgs/base-files/template index 37380bc7af..db65522aa2 100644 --- a/srcpkgs/xbps-base-files/template +++ b/srcpkgs/base-files/template @@ -1,8 +1,8 @@ -# Template file for 'xbps-base-files' -pkgname=xbps-base-files +# Template file for 'base-files' +pkgname=base-files version=0.41 build_style=custom-install -short_desc="XBPS Base System files" +short_desc="Vanilla Base System files" maintainer="Juan RP <xtraeme@gmail.com>" homepage="http://code.google.com/p/xbps" license="public domain" @@ -10,6 +10,7 @@ long_desc=" This package installs the base system files that aren't installed by any other package and are required on any GNU/Linux system." +replaces="xbps-base-files>=0" noarch=yes base_chroot=yes diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template index 922afb5026..ae592c2937 100644 --- a/srcpkgs/glibc/template +++ b/srcpkgs/glibc/template @@ -1,7 +1,7 @@ # Template file for 'glibc' pkgname=glibc version=2.14 -revision=3 +revision=4 distfiles="http://ftp.gnu.org/gnu/glibc/glibc-${version}.tar.bz2" build_style=custom-install short_desc="The GNU C library" @@ -22,7 +22,7 @@ base_chroot=yes conf_files="/etc/rpc /etc/ld.so.conf /etc/nsswitch.conf" subpackages="glibc-devel glibc-locales nscd" -Add_dependency run xbps-base-files +Add_dependency run base-files Add_dependency run libgcc Add_dependency run glibc-locales Add_dependency build gcc