From 0b7cdfa1d0bb52223c03ffed238155ab666f4d1e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 25 Feb 2009 06:15:20 +0100 Subject: [PATCH] Split pkgs required by xbps-base-system, structure based in Fedora. --HG-- extra : convert_revision : 151da3637a2745b786251e067bb924c3fd98118b --- shutils/binpkg.sh | 2 +- shutils/stow_funcs.sh | 2 ++ templates/bison/template | 4 +-- templates/cracklib/depends | 2 ++ templates/cracklib/template | 3 +- templates/dbus-devel | 1 + templates/dbus-libs | 1 + templates/dbus/depends | 2 ++ templates/dbus/devel.template | 22 ++++++++++++++ templates/dbus/libs.template | 18 ++++++++++++ templates/dbus/template | 8 ++++-- templates/eject/template | 4 +-- templates/expat-devel | 1 + templates/expat/depends | 2 ++ templates/expat/devel.template | 20 +++++++++++++ templates/expat/template | 5 +++- templates/flex/template | 5 ++-- templates/gdbm/template | 2 +- templates/gettext-devel | 1 + templates/gettext-libs | 1 + templates/gettext/depends | 2 ++ templates/gettext/devel.template | 24 ++++++++++++++++ templates/gettext/libs.template | 17 +++++++++++ templates/gettext/template | 8 ++++-- templates/glibc/template | 6 ++-- templates/groff/template | 10 +++---- templates/initramfs-tools/template | 17 ++++++++--- templates/kbd/template | 6 ++-- templates/kernel-headers/template | 5 ++-- templates/kernel/template | 14 ++++----- templates/klibc-devel | 1 + templates/klibc-utils | 1 + templates/klibc/depends | 2 ++ templates/klibc/devel.template | 23 +++++++++++++++ templates/klibc/template | 6 +++- templates/klibc/utils.template | 18 ++++++++++++ templates/less/template | 4 +-- templates/m4/template | 2 +- templates/man-db/template | 2 +- templates/module-init-tools/template | 4 +-- templates/openssl-devel | 1 + templates/openssl/depends | 2 ++ templates/openssl/devel.template | 24 ++++++++++++++++ templates/openssl/template | 8 ++++-- templates/pam-devel | 1 + templates/pam/depends | 2 ++ templates/pam/devel.template | 22 ++++++++++++++ templates/{linux-pam => pam}/template | 12 +++++--- templates/perl/depends | 2 ++ templates/perl/template | 2 +- templates/pkg-config/template | 2 +- templates/procps/template | 4 +-- templates/shadow/template | 5 ++-- templates/sudo/template | 5 ++-- templates/sysklogd/template | 6 ++-- templates/tzdata/template | 4 ++- templates/udev/template | 8 +++--- templates/upstart/template | 4 +-- templates/xbps-base-system/template | 41 +++++++++++++++++++++------ 59 files changed, 357 insertions(+), 76 deletions(-) create mode 100644 templates/cracklib/depends create mode 120000 templates/dbus-devel create mode 120000 templates/dbus-libs create mode 100644 templates/dbus/depends create mode 100644 templates/dbus/devel.template create mode 100644 templates/dbus/libs.template create mode 120000 templates/expat-devel create mode 100644 templates/expat/depends create mode 100644 templates/expat/devel.template create mode 120000 templates/gettext-devel create mode 120000 templates/gettext-libs create mode 100644 templates/gettext/depends create mode 100644 templates/gettext/devel.template create mode 100644 templates/gettext/libs.template create mode 120000 templates/klibc-devel create mode 120000 templates/klibc-utils create mode 100644 templates/klibc/depends create mode 100644 templates/klibc/devel.template create mode 100644 templates/klibc/utils.template create mode 120000 templates/openssl-devel create mode 100644 templates/openssl/depends create mode 100644 templates/openssl/devel.template create mode 120000 templates/pam-devel create mode 100644 templates/pam/depends create mode 100644 templates/pam/devel.template rename templates/{linux-pam => pam}/template (87%) create mode 100644 templates/perl/depends diff --git a/shutils/binpkg.sh b/shutils/binpkg.sh index cdb593647fc..aa7c6b9a632 100644 --- a/shutils/binpkg.sh +++ b/shutils/binpkg.sh @@ -66,7 +66,7 @@ xbps_write_metadata_pkg() [ -n "${subpackages}" ] && [ "$pkg" != "${sourcepkg}" ] && return $? - if [ -z "${run_depends}" ]; then + if [ "$build_style" = "meta-template" -a -z "${run_depends}" ]; then for subpkg in ${subpackages}; do run_depends="$run_depends ${sourcepkg}-${subpkg}-${version}" done diff --git a/shutils/stow_funcs.sh b/shutils/stow_funcs.sh index c427fea964d..f52237e4612 100644 --- a/shutils/stow_funcs.sh +++ b/shutils/stow_funcs.sh @@ -23,6 +23,8 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #- +. ${XBPS_SHUTILSDIR}/builddep_funcs.sh + stow_pkg() { local pkg="$1" diff --git a/templates/bison/template b/templates/bison/template index 2b473f67958..f67ce3b023d 100644 --- a/templates/bison/template +++ b/templates/bison/template @@ -11,5 +11,5 @@ long_desc=" Bison is the GNU replacement for yacc(1). Some programs depend on extensions present in Bison." -build_depends="m4-1.4.12" -run_depends="m4-1.4.12 glibc-2.8" +Add_dependency full glibc +Add_dependency full m4 diff --git a/templates/cracklib/depends b/templates/cracklib/depends new file mode 100644 index 00000000000..f7d5496ceba --- /dev/null +++ b/templates/cracklib/depends @@ -0,0 +1,2 @@ +abi_depends=2.8.0 +api_depends=${abi_depends} diff --git a/templates/cracklib/template b/templates/cracklib/template index d7ffb52b1b0..7380987d44c 100644 --- a/templates/cracklib/template +++ b/templates/cracklib/template @@ -13,7 +13,8 @@ long_desc=" against a dictionary file to find weak passwords (vulnerable to dictionary attacks)." -run_depends="glibc-2.8 zlib-1.2.3" +Add_dependency full glibc +Add_dependency full zlib post_install() { diff --git a/templates/dbus-devel b/templates/dbus-devel new file mode 120000 index 00000000000..95a521b44c1 --- /dev/null +++ b/templates/dbus-devel @@ -0,0 +1 @@ +dbus \ No newline at end of file diff --git a/templates/dbus-libs b/templates/dbus-libs new file mode 120000 index 00000000000..95a521b44c1 --- /dev/null +++ b/templates/dbus-libs @@ -0,0 +1 @@ +dbus \ No newline at end of file diff --git a/templates/dbus/depends b/templates/dbus/depends new file mode 100644 index 00000000000..9aace47c06d --- /dev/null +++ b/templates/dbus/depends @@ -0,0 +1,2 @@ +abi_depends=1.2.10 +api_depends=${abi_depends} diff --git a/templates/dbus/devel.template b/templates/dbus/devel.template new file mode 100644 index 00000000000..b88ead3503e --- /dev/null +++ b/templates/dbus/devel.template @@ -0,0 +1,22 @@ +# Template file for 'dbus-devel'. +# +short_desc="${short_desc} (development files)" +long_desc="${long_desc} + + This package contains files for development, headers, static libs, etc." + +Add_dependency run dbus-libs + +do_install() +{ + local destdir=${XBPS_DESTDIR}/${pkgname}-${version} + local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} + + mkdir -p ${destdir}/usr/lib + + mv ${origdir}/usr/include ${destdir}/usr + mv ${origdir}/usr/lib/dbus-* ${destdir}/usr/lib + mv ${origdir}/usr/lib/pkgconfig ${destdir}/usr/lib + mv ${origdir}/usr/lib/*.*a ${destdir}/usr/lib + mv ${origdir}/usr/lib/*.so ${destdir}/usr/lib +} diff --git a/templates/dbus/libs.template b/templates/dbus/libs.template new file mode 100644 index 00000000000..0a74f430975 --- /dev/null +++ b/templates/dbus/libs.template @@ -0,0 +1,18 @@ +# Template file for 'dbus-libs'. +# +short_desc="${short_desc} (shared libraries)" +long_desc="${long_desc} + + This package contains the shared libraries." + +Add_dependency run glibc +Add_dependency run expat + +do_install() +{ + local destdir=${XBPS_DESTDIR}/${pkgname}-${version} + local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} + + mkdir -p ${destdir}/usr/lib + mv ${origdir}/usr/lib/lib*.so.* ${destdir}/usr/lib +} diff --git a/templates/dbus/template b/templates/dbus/template index e1dd0dafa78..d9ebada0979 100644 --- a/templates/dbus/template +++ b/templates/dbus/template @@ -1,5 +1,6 @@ # Template file for 'dbus' pkgname=dbus +sourcepkg=dbus version=1.2.12 distfiles="http://dbus.freedesktop.org/releases/dbus/$pkgname-$version.tar.gz" build_style=gnu_configure @@ -23,6 +24,9 @@ long_desc=" keep_dirs="/etc/dbus-1" conf_files="/etc/dbus-1/session.conf /etc/dbus-1/system.conf" +subpackages="devel libs" -build_depends="pkg-config-0.23 expat-2.0.1" -run_depends="glibc-2.8 expat-2.0.1" +Add_dependency full glibc +Add_dependency full expat +Add_dependency run dbus-libs +Add_dependency build pkg-config diff --git a/templates/eject/template b/templates/eject/template index 2a27aaa7055..eabde1ff36b 100644 --- a/templates/eject/template +++ b/templates/eject/template @@ -19,5 +19,5 @@ long_desc=" You can also use eject to properly disconnect external mass-storage devices like digital cameras or portable music players." -build_depends="gettext-0.17" -run_depends="glibc-2.8" +Add_dependency full glibc +Add_dependency build gettext diff --git a/templates/expat-devel b/templates/expat-devel new file mode 120000 index 00000000000..0603602e737 --- /dev/null +++ b/templates/expat-devel @@ -0,0 +1 @@ +expat \ No newline at end of file diff --git a/templates/expat/depends b/templates/expat/depends new file mode 100644 index 00000000000..3c7b0e4f5b5 --- /dev/null +++ b/templates/expat/depends @@ -0,0 +1,2 @@ +abi_depends=2.0.0 +api_depends=${abi_depends} diff --git a/templates/expat/devel.template b/templates/expat/devel.template new file mode 100644 index 00000000000..7071eb9466e --- /dev/null +++ b/templates/expat/devel.template @@ -0,0 +1,20 @@ +# Template file for 'expat-devel'. +# +short_desc="${short_desc} (development files)" +long_desc="${long_desc} + + This package contains files for development, headers, static libs, etc." + +Add_dependency run expat + +do_install() +{ + local destdir=${XBPS_DESTDIR}/${pkgname}-${version} + local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} + + mkdir -p ${destdir}/usr/lib + + mv ${origdir}/usr/include ${destdir}/usr + mv ${origdir}/usr/lib/*.*a ${destdir}/usr/lib + mv ${origdir}/usr/lib/*.so ${destdir}/usr/lib +} diff --git a/templates/expat/template b/templates/expat/template index 54d0ca81b4b..f9b410e2b33 100644 --- a/templates/expat/template +++ b/templates/expat/template @@ -1,5 +1,6 @@ # Template file for 'expat' pkgname=expat +sourcepkg=expat version=2.0.1 distfiles="$SOURCEFORGE_SITE/expat/$pkgname-$version.tar.gz" build_style=gnu_configure @@ -11,4 +12,6 @@ long_desc=" oriented parser that requires setting handlers to deal with the structure that the parser discovers in the document." -run_depends="glibc-2.8" +subpackages="devel" + +Add_dependency full glibc diff --git a/templates/flex/template b/templates/flex/template index 2ee98625bd3..f6d403e8cc0 100644 --- a/templates/flex/template +++ b/templates/flex/template @@ -21,5 +21,6 @@ long_desc=" its input for occurrences of text matching the regular expressions for each rule. Whenever it finds a match, it executes the corresponding C code." -build_depends="bison-2.3" -run_depends="glibc-2.8 m4-1.4.12 bison-2.3" +Add_dependency full glibc +Add_dependency full bison +Add_dependency full m4 diff --git a/templates/gdbm/template b/templates/gdbm/template index b027020cd14..9398b7772ce 100644 --- a/templates/gdbm/template +++ b/templates/gdbm/template @@ -13,4 +13,4 @@ long_desc=" subpackages="devel" -Add_dependency run glibc +Add_dependency full glibc diff --git a/templates/gettext-devel b/templates/gettext-devel new file mode 120000 index 00000000000..d3a6700489c --- /dev/null +++ b/templates/gettext-devel @@ -0,0 +1 @@ +gettext \ No newline at end of file diff --git a/templates/gettext-libs b/templates/gettext-libs new file mode 120000 index 00000000000..d3a6700489c --- /dev/null +++ b/templates/gettext-libs @@ -0,0 +1 @@ +gettext \ No newline at end of file diff --git a/templates/gettext/depends b/templates/gettext/depends new file mode 100644 index 00000000000..9ddbd41545b --- /dev/null +++ b/templates/gettext/depends @@ -0,0 +1,2 @@ +abi_depends=0.17 +api_depends=${abi_depends} diff --git a/templates/gettext/devel.template b/templates/gettext/devel.template new file mode 100644 index 00000000000..cc6483e2329 --- /dev/null +++ b/templates/gettext/devel.template @@ -0,0 +1,24 @@ +# Template file for 'gettext-devel'. +# +short_desc="${short_desc} (development files)" +long_desc="${long_desc} + + This package contains files for development, headers, static libs, etc." + +Add_dependency run gettext + +do_install() +{ + local destdir=${XBPS_DESTDIR}/${pkgname}-${version} + local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} + + mkdir -p ${destdir}/usr/lib + mkdir -p ${destdir}/usr/share/doc + + mv ${origdir}/usr/include ${destdir}/usr + mv ${origdir}/usr/lib/*.*a ${destdir}/usr/lib + mv ${origdir}/usr/lib/*.so ${destdir}/usr/lib + mv ${origdir}/usr/share/doc/gettext ${destdir}/usr/share/doc + mv ${origdir}/usr/share/aclocal ${destdir}/usr/share + mv ${origdir}/usr/share/gettext ${destdir}/usr/share +} diff --git a/templates/gettext/libs.template b/templates/gettext/libs.template new file mode 100644 index 00000000000..1168fa1759a --- /dev/null +++ b/templates/gettext/libs.template @@ -0,0 +1,17 @@ +# Template file for 'gettext-libs'. +# +short_desc="${short_desc} (shared libraries)" +long_desc="${long_desc} + + This package contains the ${sourcepkg} shared libraries." + +Add_dependency run glibc + +do_install() +{ + local destdir=${XBPS_DESTDIR}/${pkgname}-${version} + local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} + + mkdir -p ${destdir}/usr/lib + mv ${origdir}/usr/lib/*.so.* ${destdir}/usr/lib +} diff --git a/templates/gettext/template b/templates/gettext/template index 8a0b6e8fd24..8564926b096 100644 --- a/templates/gettext/template +++ b/templates/gettext/template @@ -1,5 +1,6 @@ # Template build file for 'gettext'. pkgname=gettext +sourcepkg=gettext version=0.17 distfiles=" http://ftp.gnu.org/pub/gnu/gettext/gettext-$version.tar.gz" @@ -14,5 +15,8 @@ long_desc=" messages in different languages, as one of the steps to internationalisation (or i18n) of a utility." -build_depends="ncurses-5.6" -run_depends="glibc-2.8" +subpackages="devel libs" + +Add_dependency full glibc +Add_dependency full ncurses +Add_dependency run gettext-libs diff --git a/templates/glibc/template b/templates/glibc/template index 317370db1fb..d066e913f9a 100644 --- a/templates/glibc/template +++ b/templates/glibc/template @@ -8,9 +8,9 @@ distfiles="ftp://sources.redhat.com/pub/glibc/snapshots/$pkgname-$version-$glibc build_style=gnu_configure configure_script="../configure" configure_args="--with-tls -disable-profile --with-__thread - --enable-kernel=2.6.16 --enable-add-ons --without-gd --enable-bind-now + --enable-kernel=2.6.27 --enable-add-ons --without-gd --without-cvs --without-selinux --infodir=/usr/share/info - --libdir=/usr/lib --libexecdir=/usr/lib" + --libdir=/usr/lib --libexecdir=/usr/lib --enable-stackguard-randomization" make_install_target="install_root=$XBPS_DESTDIR/$pkgname-$version install" short_desc="The GNU C library" maintainer="Juan RP " @@ -23,10 +23,12 @@ long_desc=" languages use the C library to access the underlying operating system." base_chroot=yes +conf_files="/etc/rpc /etc/ld.so.conf /etc/nsswitch.conf" subpackages="devel locales" Add_dependency build gcc Add_dependency build gawk +Add_dependency run xbps-base-dirs Add_dependency run gcc-libgcc Add_dependency run glibc-locales diff --git a/templates/groff/template b/templates/groff/template index e13ef8c962d..c6a9edc0208 100644 --- a/templates/groff/template +++ b/templates/groff/template @@ -16,11 +16,11 @@ long_desc=" All the standard macro packages are supported. A number of other utilities are also included together with several fonts." -Add_dependency run glibc -Add_dependency run gcc-libstdc++ -Add_dependency run bash -Add_dependency run zlib -Add_dependency run sed +Add_dependency full glibc +Add_dependency full gcc-libstdc++ +Add_dependency full bash +Add_dependency full zlib +Add_dependency full sed pre_install() { diff --git a/templates/initramfs-tools/template b/templates/initramfs-tools/template index 1b53ae0779c..f1dfa3d9e5a 100644 --- a/templates/initramfs-tools/template +++ b/templates/initramfs-tools/template @@ -21,10 +21,19 @@ long_desc=" noarch=yes keep_dirs="/var/lib/$pkgname" config_files="/etc/$pkgname/initramfs.conf /etc/$pkgname/update-initramfs.conf" -build_depends="cpio-2.9 util-linux-ng-2.14 klibc-1.5.14 - module-init-tools-3.5 udev-130 busybox-initramfs-1.13" -run_depends="glibc-2.8 gawk-3.1.6 findutils-4.4.0 sed-4.1.5 grep-2.5.3 - gzip-1.3 $build_depends" + +Add_dependency full glibc +Add_dependency full cpio +Add_dependency full util-linux-ng +Add_dependency full klibc-utils +Add_dependency full module-init-tools +Add_dependency full busybox-initramfs +Add_dependency full gawk +Add_dependency full findutils +Add_dependency full sed +Add_dependency full grep +Add_dependency full gzip +Add_dependency full udev do_install() { diff --git a/templates/kbd/template b/templates/kbd/template index 060ca3f1717..343fe40ee08 100644 --- a/templates/kbd/template +++ b/templates/kbd/template @@ -12,5 +12,7 @@ long_desc=" The kbd package contains keytable files and keyboard utilities compatible with kernel version 1.1.54 and later. Setfont requires 1.1.92 or later." -build_depends="gettext-0.17 bison-2.3 flex-2.5.35" -run_depends="glibc-2.8" +Add_dependency full glibc +Add_dependency build bison +Add_dependency build m4 +Add_dependency build gettext diff --git a/templates/kernel-headers/template b/templates/kernel-headers/template index a0074237e24..12fe3d4538f 100644 --- a/templates/kernel-headers/template +++ b/templates/kernel-headers/template @@ -10,8 +10,9 @@ checksum=5374cbe80c288a366b307b5c9617c8e87248c800edcdb2eca0ea5c52ab9f13e5 long_desc=" This package provides the linux kernel headers." -build_depends="perl-5.10.0 module-init-tools-3.5" -run_depends="kernel-libc-headers-2.6.27" +Add_dependency build perl +Add_dependency build module-init-tools +Add_dependency run kernel-libc-headers ${version} do_install() { diff --git a/templates/kernel/template b/templates/kernel/template index 3b85abddaf7..110c268ee64 100644 --- a/templates/kernel/template +++ b/templates/kernel/template @@ -17,9 +17,11 @@ long_desc=" This package provides the linux kernel image, kernel modules and firmware files." -shared_deps="initramfs-tools-0.92" -build_depends="perl-5.10.0 ${shared_deps}" -run_depends="dash-0.5.4 coreutils-6.12 ${shared_deps}" +Add_dependency full glibc +Add_dependency full dash +Add_dependency full coreutils +Add_dependency full initramfs-tools +Add_dependency build perl pre_build() { @@ -47,13 +49,9 @@ post_install() { local destdir=$XBPS_DESTDIR/$pkgname-$version - # - # Install the kernel, modules and firmware files. - # This is based in the kernel26 pkgbuild from Arch Linux. - # install -d $destdir/lib $destdir/boot - cd $wrksrc || exit 1 + install -m 644 arch/x86/boot/bzImage $destdir/boot/vmlinuz-$version install -m 644 System.map $destdir/boot/System.map-$version } diff --git a/templates/klibc-devel b/templates/klibc-devel new file mode 120000 index 00000000000..baa1b8ebc99 --- /dev/null +++ b/templates/klibc-devel @@ -0,0 +1 @@ +klibc \ No newline at end of file diff --git a/templates/klibc-utils b/templates/klibc-utils new file mode 120000 index 00000000000..baa1b8ebc99 --- /dev/null +++ b/templates/klibc-utils @@ -0,0 +1 @@ +klibc \ No newline at end of file diff --git a/templates/klibc/depends b/templates/klibc/depends new file mode 100644 index 00000000000..be2fb711d4b --- /dev/null +++ b/templates/klibc/depends @@ -0,0 +1,2 @@ +abi_depends=1.5.14 +api_depends=${abi_depends} diff --git a/templates/klibc/devel.template b/templates/klibc/devel.template new file mode 100644 index 00000000000..935f6320280 --- /dev/null +++ b/templates/klibc/devel.template @@ -0,0 +1,23 @@ +# Template file for 'klibc-devel'. +# +short_desc="${short_desc} (development files)" +long_desc="${long_desc} + + This package contains files for development, headers, static libs, etc." + +Add_dependency run klibc + +do_install() +{ + local destdir=${XBPS_DESTDIR}/${pkgname}-${version} + local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} + + mkdir -p ${destdir}/usr/lib/klibc + mkdir -p ${destdir}/usr/share/man/man1 + + mv ${origdir}/usr/lib/klibc/include ${destdir}/usr/lib/klibc + mv ${origdir}/usr/lib/klibc/lib ${destdir}/usr/lib/klibc + mv ${origdir}/usr/bin ${destdir}/usr + mv ${origdir}/usr/man/man1/klcc.1 ${destdir}/usr/share/man/man1 + rm -rf ${origdir}/usr/man +} diff --git a/templates/klibc/template b/templates/klibc/template index 51a563f7866..17f307f09f5 100644 --- a/templates/klibc/template +++ b/templates/klibc/template @@ -1,5 +1,6 @@ # Template file for 'klibc' pkgname=klibc +sourcepkg=klibc version=1.5.14 distfiles=" http://www.kernel.org/pub/linux/libs/klibc/Testing/klibc-$version.tar.bz2" @@ -14,7 +15,10 @@ long_desc=" portability, not speed. It is definitely a work in progress and a lot of things are still missing." -build_depends="kernel-headers-2.6.27.3" +subpackages="devel utils" + +Add_dependency build kernel-headers +Add_dependency build bison pre_configure() { diff --git a/templates/klibc/utils.template b/templates/klibc/utils.template new file mode 100644 index 00000000000..4e9a72aa5a9 --- /dev/null +++ b/templates/klibc/utils.template @@ -0,0 +1,18 @@ +# Template file for 'klibc-utils'. +# +short_desc="${short_desc} (binary utilities)" +long_desc="${long_desc} + + This package contains the binary programs built with klibc + for use on the initramfs." + +Add_dependency run klibc + +do_install() +{ + local destdir=${XBPS_DESTDIR}/${pkgname}-${version} + local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} + + mkdir -p ${destdir}/usr/lib/klibc + mv ${origdir}/usr/lib/klibc/bin ${destdir}/usr/lib/klibc +} diff --git a/templates/less/template b/templates/less/template index 97859848943..915b451e82e 100644 --- a/templates/less/template +++ b/templates/less/template @@ -14,5 +14,5 @@ long_desc=" termcap (or terminfo on some systems), so it can run on a variety of terminals. There is even limited support for hardcopy terminals." -Add_dependency run glibc -Add_dependency full ncurses +Add_dependency full glibc +Add_dependency full ncurses diff --git a/templates/m4/template b/templates/m4/template index 90b5a0f8b3a..1f101796106 100644 --- a/templates/m4/template +++ b/templates/m4/template @@ -15,4 +15,4 @@ long_desc=" shell commands, doing arithmetic, etc. Autoconf needs GNU m4 for generating configure scripts, but not for running them." -run_depends="glibc-2.8" +Add_dependency full glibc diff --git a/templates/man-db/template b/templates/man-db/template index dbc55a09e69..8805872cbf9 100644 --- a/templates/man-db/template +++ b/templates/man-db/template @@ -16,7 +16,7 @@ long_desc=" GNU/Linux distributions, including Debian, Ubuntu, and SuSE. It also compiles and runs on a number of proprietary Unix systems." -Add_dependency run glibc +Add_dependency full glibc Add_dependency full bzip2 Add_dependency full gzip Add_dependency full less diff --git a/templates/module-init-tools/template b/templates/module-init-tools/template index 52b07cf6ece..5bffc886e19 100644 --- a/templates/module-init-tools/template +++ b/templates/module-init-tools/template @@ -16,5 +16,5 @@ long_desc=" needed by Linux systems for managing loadable Linux Kernel Modules. This includes depmod, insmod, rmmod, modprobe and tools like modinfo." -build_depends="zlib-1.2.3" -run_depends="glibc-2.8 zlib-1.2.3" +Add_dependency full glibc +Add_dependency full zlib diff --git a/templates/openssl-devel b/templates/openssl-devel new file mode 120000 index 00000000000..fc538edfef4 --- /dev/null +++ b/templates/openssl-devel @@ -0,0 +1 @@ +openssl \ No newline at end of file diff --git a/templates/openssl/depends b/templates/openssl/depends new file mode 100644 index 00000000000..761c51503c9 --- /dev/null +++ b/templates/openssl/depends @@ -0,0 +1,2 @@ +abi_depends=0.9.8 +api_depends=${abi_depends} diff --git a/templates/openssl/devel.template b/templates/openssl/devel.template new file mode 100644 index 00000000000..d5d4112bf57 --- /dev/null +++ b/templates/openssl/devel.template @@ -0,0 +1,24 @@ +# Template file for 'openssl-devel'. +# +short_desc="${short_desc} (development files)" +long_desc="${long_desc} + + This package contains files for development, headers, static libs, etc." + +Add_dependency run openssl + +do_install() +{ + local destdir=${XBPS_DESTDIR}/${pkgname}-${version} + local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} + + mkdir -p ${destdir}/usr/lib + mkdir -p ${destdir}/usr/share/man + + mv ${origdir}/usr/include ${destdir}/usr + mv ${origdir}/usr/lib/fips* ${destdir}/usr/lib + mv ${origdir}/usr/lib/*.*a ${destdir}/usr/lib + mv ${origdir}/usr/lib/*.so ${destdir}/usr/lib + mv ${origdir}/usr/lib/pkgconfig ${destdir}/usr/lib + mv ${origdir}/usr/share/man/man3 ${destdir}/usr/share/man +} diff --git a/templates/openssl/template b/templates/openssl/template index 0b66c7d7014..61521696888 100644 --- a/templates/openssl/template +++ b/templates/openssl/template @@ -1,5 +1,6 @@ # Template file for 'openssl' pkgname=openssl +sourcepkg=openssl openssl_version=0.9.8 version=${openssl_version}j distfiles="http://www.openssl.org/source/$pkgname-$version.tar.gz" @@ -22,8 +23,11 @@ long_desc=" disable_parallel_build=yes keep_dirs="/etc/ssl" conf_files="/etc/ssl/openssl.cnf" -build_depends="perl-5.10.0 zlib-1.2.3" -run_depends="glibc-2.8 zlib-1.2.3" +subpackages="devel" + +Add_dependency full glibc +Add_dependency full zlib +Add_dependency build perl post_install() { diff --git a/templates/pam-devel b/templates/pam-devel new file mode 120000 index 00000000000..4b9cd459f8c --- /dev/null +++ b/templates/pam-devel @@ -0,0 +1 @@ +pam \ No newline at end of file diff --git a/templates/pam/depends b/templates/pam/depends new file mode 100644 index 00000000000..9ff7c35b09d --- /dev/null +++ b/templates/pam/depends @@ -0,0 +1,2 @@ +abi_depends=1.0.0 +api_depends=${abi_depends} diff --git a/templates/pam/devel.template b/templates/pam/devel.template new file mode 100644 index 00000000000..db39e793f57 --- /dev/null +++ b/templates/pam/devel.template @@ -0,0 +1,22 @@ +# Template file for 'pam-devel'. +# +short_desc="${short_desc} (development files)" +long_desc="${long_desc} + + This package contains files for development, headers, static libs, etc." + +Add_dependency run pam + +do_install() +{ + local destdir=${XBPS_DESTDIR}/${pkgname}-${version} + local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} + + mkdir -p ${destdir}/lib + mkdir -p ${destdir}/usr/share/man + + mv ${origdir}/usr/include ${destdir}/usr + mv ${origdir}/usr/share/man/man3 ${destdir}/usr/share/man + mv ${origdir}/lib/*.*a ${destdir}/lib + mv ${origdir}/lib/*.so ${destdir}/lib +} diff --git a/templates/linux-pam/template b/templates/pam/template similarity index 87% rename from templates/linux-pam/template rename to templates/pam/template index c2aa8f36c76..d17e8eebae0 100644 --- a/templates/linux-pam/template +++ b/templates/pam/template @@ -1,5 +1,6 @@ -# Template file for 'linux-pam' -pkgname=linux-pam +# Template file for 'pam' +pkgname=pam +sourcepkg=pam version=1.0.2 wrksrc="Linux-PAM-$version" distfiles=" @@ -25,5 +26,8 @@ conf_files="/etc/security/access.conf /etc/security/environment /etc/security/group.conf /etc/security/limits.conf /etc/security/namespace.conf /etc/security/pam_env.conf /etc/security/time.conf" -build_depends="flex-2.5.35 cracklib-2.8.13" -run_depends="glibc-2.8 cracklib-2.8.13" +subpackages="devel" + +Add_dependency full glibc +Add_dependency full cracklib +Add_dependency build flex diff --git a/templates/perl/depends b/templates/perl/depends new file mode 100644 index 00000000000..6eb5313c1b6 --- /dev/null +++ b/templates/perl/depends @@ -0,0 +1,2 @@ +abi_depends=5.10.0 +api_depends=${abi_depends} diff --git a/templates/perl/template b/templates/perl/template index bbb80f29904..56ad679c37b 100644 --- a/templates/perl/template +++ b/templates/perl/template @@ -22,7 +22,7 @@ long_desc=" support for text processing, and has one of the world's most impressive collections of third-party modules." -run_depends="glibc-2.8" +Add_dependency full glibc pre_build() { diff --git a/templates/pkg-config/template b/templates/pkg-config/template index fa6db23163f..e0fa385902d 100644 --- a/templates/pkg-config/template +++ b/templates/pkg-config/template @@ -13,4 +13,4 @@ long_desc=" works with automake and autoconf. It replaces the ubiquitous *-config scripts you may have seen with a single tool." -run_depends="glibc-2.8" +Add_dependency full glibc diff --git a/templates/procps/template b/templates/procps/template index 1ae8becfe98..f0dd89ef3f3 100644 --- a/templates/procps/template +++ b/templates/procps/template @@ -15,5 +15,5 @@ long_desc=" Version 3 includes NPTL thread support, a rewritten top, many bug fixes, performance improvements, and new features." -build_depends="ncurses-5.6" -run_depends="glibc-2.8 ncurses-5.6" +Add_dependency full glibc +Add_dependency full ncurses diff --git a/templates/shadow/template b/templates/shadow/template index 3ffff0921da..e02d8a732ce 100644 --- a/templates/shadow/template +++ b/templates/shadow/template @@ -19,8 +19,9 @@ conf_files="/etc/pam.d/usermod /etc/pam.d/userdel /etc/pam.d/useradd /etc/pam.d/groupadd /etc/pam.d/chsh /etc/pam.d/chpasswd /etc/pam.d/chgpasswd /etc/pam.d/chfn /etc/pam.d/chage /etc/defaults/useradd /etc/login.defs" -build_depends="linux-pam-1.0.2" -run_depends="glibc-2.8 $build_depends" + +Add_dependency full glibc +Add_dependency full pam pre_build() { diff --git a/templates/sudo/template b/templates/sudo/template index 16cbdf4d4b0..c1885289958 100644 --- a/templates/sudo/template +++ b/templates/sudo/template @@ -16,8 +16,9 @@ long_desc=" work done." conf_files="/etc/pam.d/sudo /etc/sudoers" -build_depends="linux-pam-1.0.2" -run_depends="glibc-2.8 $build_depends" + +Add_dependency full glibc +Add_dependency full pam post_install() { diff --git a/templates/sysklogd/template b/templates/sysklogd/template index 4167dc5450a..eb28dc108d6 100644 --- a/templates/sysklogd/template +++ b/templates/sysklogd/template @@ -19,8 +19,10 @@ long_desc=" run as a client of syslogd or optionally as a standalone program. Klogd can now be used to decode EIP addresses if it can determine a System.map file." - -run_depends="glibc-2.8" + +conf_files="/etc/syslog.conf" + +Add_dependency full glibc post_install() { diff --git a/templates/tzdata/template b/templates/tzdata/template index 2c2b6e871ad..e1c9cc19fd2 100644 --- a/templates/tzdata/template +++ b/templates/tzdata/template @@ -18,4 +18,6 @@ long_desc=" updated periodically to reflect changes made by political bodies to time zone boundaries, UTC offsets, and daylight-saving rules." -run_depends="glibc-2.8 bash-3.2 gawk-3.1.6" +Add_dependency full glibc +Add_dependency full bash +Add_dependency full gawk diff --git a/templates/udev/template b/templates/udev/template index 1a6bd82da15..cd28f88d2df 100644 --- a/templates/udev/template +++ b/templates/udev/template @@ -1,6 +1,6 @@ # Template file for 'udev' pkgname=udev -version=137 +version=138 distfiles=" http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-${version}.tar.bz2" build_style=gnu_configure @@ -8,13 +8,13 @@ configure_args="--exec-prefix= --without-selinux --mandir=/usr/share/man" make_install_target="DESTDIR=$XBPS_DESTDIR/$pkgname-$version install" short_desc="A userspace implementation of devfs" maintainer="Juan RP " -checksum=1aaa46da688f54f6d3b6ab727d82d011898b473952b74e812e174dd477602ebc +checksum=bc525a4d6bdbace1b23433256643cc331e4049e1e2442333707e6d2ba8a173b4 long_desc=" udev is a implementation of devfs in userspace using sysfs and /sbin/hotplug. It requires a 2.5/2.6 kernel to run properly." -build_depends="initramfs-tools-0.92 procps-3.2.7" -run_depends="glibc-2.8 $build_depends" +Add_dependency full glibc +Add_dependency full procps post_install() { diff --git a/templates/upstart/template b/templates/upstart/template index e7bad46e6a9..e88ab07b8a8 100644 --- a/templates/upstart/template +++ b/templates/upstart/template @@ -20,5 +20,5 @@ long_desc=" keep_dirs="/etc/init" conf_files="/etc/dbus-1/system.d/Upstart.conf" -build_depends="dbus-1.2.4" -run_depends="glibc-2.8 dbus-1.2.4" +Add_dependency full glibc +Add_dependency full dbus diff --git a/templates/xbps-base-system/template b/templates/xbps-base-system/template index 18bc8d210c5..96a7a37e34c 100644 --- a/templates/xbps-base-system/template +++ b/templates/xbps-base-system/template @@ -10,12 +10,35 @@ long_desc=" noarch=yes -build_depends="man-pages-3.11 man-db-2.5.2 util-linux-ng-2.14.1 - initramfs-tools-0.92 less-424 kbd-1.14.1 procps-3.2.7 - sysklogd-1.5 eject-2.1.5 sudo-1.6 shadow-4.1 openssl-0.9.8 - kernel-2.6.27 tzdata-2009 upstart-0.5 iana-etc-2.30" - -run_depends="$build_depends coreutils-6.12 dash-0.5.4 - zlib-1.2.3 file-4.26 diffutils-2.8.1 sed-4.1.5 findutils-4.4.0 - grep-2.5.3 gawk-3.1.6 gzip-1.3.12 bzip2-1.0.5 tar-1.20 ncurses-5.7 - bash-3.2 glibc-2.9 wget-1.11.4" +Add_dependency full xbps-base-dirs +Add_dependency full coreutils +Add_dependency full dash +Add_dependency full zlib +Add_dependency full file +Add_dependency full diffutils +Add_dependency full sed +Add_dependency full findutils +Add_dependency full grep +Add_dependency full gawk +Add_dependency full gzip +Add_dependency full bzip2 +Add_dependency full ncurses +Add_dependency full ncurses-base +Add_dependency full bash +Add_dependency full wget +Add_dependency full man-pages +Add_dependency full man-db +Add_dependency full util-linux-ng +Add_dependency full less +Add_dependency full initramfs-tools +Add_dependency full kbd +Add_dependency full procps +Add_dependency full sysklogd +Add_dependency full eject +Add_dependency full shadow +Add_dependency full sudo +Add_dependency full e2fsprogs +Add_dependency full tzdata +Add_dependency full iana-etc +Add_dependency full upstart +Add_dependency full kernel