From e0030bc0fee3bb052862e5c0d766f70c21abe908 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 24 Feb 2009 07:13:11 +0100 Subject: [PATCH] Split pkgs required by xbps-base-chroot, as it was made in Fedora. - Added an additional shell func to add full (build/run), build or run time dependencies to packages. An optional third parameter can be used to specify other version than the one set in the depends file. - Use a "depends" file in package directory to specify minimum required ABI/API version for a package, so that there's no need to set the version all the time in pkgs. - Updated bash to 4.0. --HG-- extra : convert_revision : 1aa0ce32d4bdc2cd371eac19ae7bcff2c986b6b3 --- shutils/binpkg.sh | 11 +- shutils/pkgtarget_funcs.sh | 2 + shutils/tmpl_funcs.sh | 41 ++++++ templates/bash-base | 1 - templates/bash-locale | 1 - templates/bash/base.template | 21 --- templates/bash/locale.template | 17 --- templates/bash/template | 10 +- templates/binutils-dev | 1 - templates/{binutils-base => binutils-devel} | 0 templates/binutils-docs | 1 - templates/binutils-locale | 1 - templates/binutils/base.template | 20 --- templates/binutils/depends | 2 + .../binutils/{dev.template => devel.template} | 6 +- templates/binutils/docs.template | 21 --- templates/binutils/libs.depends | 1 - templates/binutils/locale.template | 17 --- templates/binutils/template | 4 +- templates/bzip2-dev | 1 - templates/{bzip2-base => bzip2-devel} | 0 templates/bzip2-docs | 1 - templates/bzip2-libs | 1 - templates/bzip2/base.template | 17 --- templates/bzip2/depends | 2 + .../bzip2/{dev.template => devel.template} | 5 +- templates/bzip2/docs.template | 18 --- templates/bzip2/libs.depends | 1 - templates/bzip2/libs.template | 17 --- templates/bzip2/template | 4 +- templates/coreutils-base | 1 - templates/coreutils-docs | 1 - templates/coreutils-locale | 1 - templates/coreutils/base.template | 17 --- templates/coreutils/docs.template | 20 --- templates/coreutils/locale.template | 17 --- templates/coreutils/template | 4 +- templates/dash/template | 2 +- templates/diffutils-base | 1 - templates/diffutils-docs | 1 - templates/diffutils-locale | 1 - templates/diffutils/base.template | 17 --- templates/diffutils/docs.template | 19 --- templates/diffutils/locale.template | 17 --- templates/diffutils/template | 4 +- templates/file-dev | 1 - templates/{file-base => file-devel} | 0 templates/file-libs | 1 - templates/file/base.template | 18 --- templates/file/depends | 2 + .../file/{dev.template => devel.template} | 5 +- templates/file/libs.depends | 1 - templates/file/libs.template | 21 --- templates/file/template | 6 +- templates/findutils-base | 1 - templates/findutils-docs | 1 - templates/findutils-locale | 1 - templates/findutils/base.template | 19 --- templates/findutils/docs.template | 19 --- templates/findutils/locale.template | 17 --- templates/findutils/template | 4 +- templates/gawk-base | 1 - templates/gawk-locale | 1 - templates/gawk/base.template | 22 --- templates/gawk/locale.template | 17 --- templates/gawk/template | 6 +- templates/{gcc-base => gcc-c++} | 0 templates/{gcc-dev => gcc-libgcc} | 0 templates/{gcc-docs => gcc-libgomp} | 0 templates/{gcc-locale => gcc-libmudflap} | 0 templates/gcc-libmudflap-devel | 1 + templates/gcc-libobjc | 1 + templates/gcc-libobjc-devel | 1 + templates/gcc-libstdc++ | 1 + templates/gcc-libstdc++-devel | 1 + templates/gcc-objc | 1 + templates/gcc-objc++ | 1 + templates/gcc/base.template | 26 ---- templates/gcc/c++.template | 35 +++++ templates/gcc/depends | 2 + templates/gcc/dev.template | 29 ---- templates/gcc/docs.template | 21 --- templates/gcc/libgcc.template | 15 ++ templates/gcc/libgomp.template | 22 +++ templates/gcc/libmudflap-devel.template | 19 +++ templates/gcc/libmudflap.template | 19 +++ templates/gcc/libobjc-devel.template | 19 +++ templates/gcc/libobjc.template | 19 +++ templates/gcc/libs.depends | 1 - templates/gcc/libstdc++-devel.template | 23 +++ templates/gcc/libstdc++.template | 26 ++++ templates/gcc/locale.template | 17 --- templates/gcc/objc++.template | 28 ++++ templates/gcc/objc.template | 32 +++++ templates/gcc/template | 17 ++- templates/{glibc-base => glibc-devel} | 0 templates/glibc-libs | 1 - templates/glibc-locale | 1 - templates/{glibc-dev => glibc-locales} | 0 templates/glibc/base.template | 25 ---- templates/glibc/depends | 2 + templates/glibc/devel.template | 20 +++ templates/glibc/libs.depends | 1 - templates/glibc/libs.template | 19 --- .../{locale.template => locales.template} | 3 +- templates/glibc/template | 8 +- templates/{gmp-dev => gmp-devel} | 0 templates/gmp-libs | 1 - templates/gmp/depends | 2 + templates/gmp/dev.template | 17 --- .../dev.template => gmp/devel.template} | 8 +- templates/gmp/libs.depends | 1 - templates/gmp/libs.template | 18 --- templates/gmp/template | 4 +- templates/grep-base | 1 - templates/grep-docs | 1 - templates/grep-locale | 1 - templates/grep/base.template | 17 --- templates/grep/docs.template | 19 --- templates/grep/locale.template | 17 --- templates/grep/template | 6 +- templates/gzip-base | 1 - templates/gzip-docs | 1 - templates/gzip/base.template | 17 --- templates/gzip/docs.template | 20 --- templates/gzip/template | 4 +- templates/libarchive-dev | 1 - .../{libarchive-base => libarchive-devel} | 0 templates/libarchive-docs | 1 - templates/libarchive-libs | 1 - templates/libarchive/base.template | 17 --- templates/libarchive/depends | 2 + .../{dev.template => devel.template} | 4 +- templates/libarchive/docs.template | 18 --- templates/libarchive/libs.depends | 1 - templates/libarchive/libs.template | 20 --- templates/libarchive/template | 7 +- templates/lzma-utils-dev | 1 - .../{lzma-utils-base => lzma-utils-devel} | 0 templates/lzma-utils-docs | 1 - templates/lzma-utils/base.template | 17 --- templates/lzma-utils/depends | 2 + .../{dev.template => devel.template} | 5 +- templates/lzma-utils/docs.template | 18 --- templates/lzma-utils/libs.depends | 1 - templates/lzma-utils/libs.template | 9 +- templates/lzma-utils/template | 5 +- templates/make-base | 1 - templates/make-docs | 1 - templates/make-locale | 1 - templates/make/base.template | 17 --- templates/make/docs.template | 19 --- templates/make/locale.template | 17 --- templates/make/template | 4 +- templates/{mpfr-dev => mpfr-devel} | 0 templates/mpfr-libs | 1 - templates/mpfr/depends | 2 + templates/mpfr/dev.template | 17 --- templates/mpfr/devel.template | 18 +++ templates/mpfr/libs.depends | 1 - templates/mpfr/libs.template | 19 --- templates/mpfr/template | 5 +- templates/{ncurses-dev => ncurses-devel} | 0 templates/{ncurses-docs => ncurses-term} | 0 templates/ncurses/base-files | 136 ++++++++++++++++++ templates/ncurses/base.template | 25 +++- templates/ncurses/depends | 2 + templates/ncurses/devel.template | 24 ++++ templates/ncurses/docs.template | 18 --- templates/ncurses/libs.depends | 1 - templates/ncurses/libs.template | 14 +- templates/ncurses/template | 5 +- templates/ncurses/term.template | 19 +++ templates/patch/template | 2 +- templates/{proplib-dev => proplib-devel} | 0 templates/proplib-docs | 1 - templates/proplib-libs | 1 - templates/proplib/depends | 2 + templates/proplib/dev.template | 17 --- .../dev.template => proplib/devel.template} | 6 +- templates/proplib/docs.template | 17 --- templates/proplib/libs.depends | 1 - templates/proplib/libs.template | 18 --- templates/proplib/template | 4 +- templates/sed-base | 1 - templates/sed-docs | 1 - templates/sed-locale | 1 - templates/sed/base.template | 17 --- templates/sed/docs.template | 19 --- templates/sed/locale.template | 17 --- templates/sed/template | 4 +- templates/tar-base | 1 - templates/tar-docs | 1 - templates/tar-locale | 1 - templates/tar/base.template | 19 --- templates/tar/docs.template | 18 --- templates/tar/locale.template | 17 --- templates/tar/template | 2 +- templates/texinfo-base | 1 - templates/texinfo-docs | 1 - templates/texinfo-locale | 1 - templates/texinfo/base.template | 18 --- templates/texinfo/docs.template | 20 --- templates/texinfo/locale.template | 17 --- templates/texinfo/template | 4 +- templates/wget-base | 1 - templates/wget-docs | 1 - templates/wget-locale | 1 - templates/wget/base.template | 20 --- templates/wget/docs.template | 19 --- templates/wget/locale.template | 17 --- templates/wget/template | 4 +- templates/xbps-base-chroot/template | 36 +++-- templates/{zlib-dev => zlib-devel} | 0 templates/zlib-libs | 1 - templates/zlib/depends | 2 + .../zlib/{dev.template => devel.template} | 6 +- templates/zlib/libs.depends | 1 - templates/zlib/libs.template | 17 --- templates/zlib/template | 4 +- 220 files changed, 719 insertions(+), 1304 deletions(-) delete mode 120000 templates/bash-base delete mode 120000 templates/bash-locale delete mode 100644 templates/bash/base.template delete mode 100644 templates/bash/locale.template delete mode 120000 templates/binutils-dev rename templates/{binutils-base => binutils-devel} (100%) delete mode 120000 templates/binutils-docs delete mode 120000 templates/binutils-locale delete mode 100644 templates/binutils/base.template create mode 100644 templates/binutils/depends rename templates/binutils/{dev.template => devel.template} (82%) delete mode 100644 templates/binutils/docs.template delete mode 100644 templates/binutils/libs.depends delete mode 100644 templates/binutils/locale.template delete mode 120000 templates/bzip2-dev rename templates/{bzip2-base => bzip2-devel} (100%) delete mode 120000 templates/bzip2-docs delete mode 120000 templates/bzip2-libs delete mode 100644 templates/bzip2/base.template create mode 100644 templates/bzip2/depends rename templates/bzip2/{dev.template => devel.template} (85%) delete mode 100644 templates/bzip2/docs.template delete mode 100644 templates/bzip2/libs.depends delete mode 100644 templates/bzip2/libs.template delete mode 120000 templates/coreutils-base delete mode 120000 templates/coreutils-docs delete mode 120000 templates/coreutils-locale delete mode 100644 templates/coreutils/base.template delete mode 100644 templates/coreutils/docs.template delete mode 100644 templates/coreutils/locale.template delete mode 120000 templates/diffutils-base delete mode 120000 templates/diffutils-docs delete mode 120000 templates/diffutils-locale delete mode 100644 templates/diffutils/base.template delete mode 100644 templates/diffutils/docs.template delete mode 100644 templates/diffutils/locale.template delete mode 120000 templates/file-dev rename templates/{file-base => file-devel} (100%) delete mode 120000 templates/file-libs delete mode 100644 templates/file/base.template create mode 100644 templates/file/depends rename templates/file/{dev.template => devel.template} (85%) delete mode 100644 templates/file/libs.depends delete mode 100644 templates/file/libs.template delete mode 120000 templates/findutils-base delete mode 120000 templates/findutils-docs delete mode 120000 templates/findutils-locale delete mode 100644 templates/findutils/base.template delete mode 100644 templates/findutils/docs.template delete mode 100644 templates/findutils/locale.template delete mode 120000 templates/gawk-base delete mode 120000 templates/gawk-locale delete mode 100644 templates/gawk/base.template delete mode 100644 templates/gawk/locale.template rename templates/{gcc-base => gcc-c++} (100%) rename templates/{gcc-dev => gcc-libgcc} (100%) rename templates/{gcc-docs => gcc-libgomp} (100%) rename templates/{gcc-locale => gcc-libmudflap} (100%) create mode 120000 templates/gcc-libmudflap-devel create mode 120000 templates/gcc-libobjc create mode 120000 templates/gcc-libobjc-devel create mode 120000 templates/gcc-libstdc++ create mode 120000 templates/gcc-libstdc++-devel create mode 120000 templates/gcc-objc create mode 120000 templates/gcc-objc++ delete mode 100644 templates/gcc/base.template create mode 100644 templates/gcc/c++.template create mode 100644 templates/gcc/depends delete mode 100644 templates/gcc/dev.template delete mode 100644 templates/gcc/docs.template create mode 100644 templates/gcc/libgcc.template create mode 100644 templates/gcc/libgomp.template create mode 100644 templates/gcc/libmudflap-devel.template create mode 100644 templates/gcc/libmudflap.template create mode 100644 templates/gcc/libobjc-devel.template create mode 100644 templates/gcc/libobjc.template delete mode 100644 templates/gcc/libs.depends create mode 100644 templates/gcc/libstdc++-devel.template create mode 100644 templates/gcc/libstdc++.template delete mode 100644 templates/gcc/locale.template create mode 100644 templates/gcc/objc++.template create mode 100644 templates/gcc/objc.template rename templates/{glibc-base => glibc-devel} (100%) delete mode 120000 templates/glibc-libs delete mode 120000 templates/glibc-locale rename templates/{glibc-dev => glibc-locales} (100%) delete mode 100644 templates/glibc/base.template create mode 100644 templates/glibc/depends create mode 100644 templates/glibc/devel.template delete mode 100644 templates/glibc/libs.depends delete mode 100644 templates/glibc/libs.template rename templates/glibc/{locale.template => locales.template} (89%) rename templates/{gmp-dev => gmp-devel} (100%) delete mode 120000 templates/gmp-libs create mode 100644 templates/gmp/depends delete mode 100644 templates/gmp/dev.template rename templates/{ncurses/dev.template => gmp/devel.template} (59%) delete mode 100644 templates/gmp/libs.depends delete mode 100644 templates/gmp/libs.template delete mode 120000 templates/grep-base delete mode 120000 templates/grep-docs delete mode 120000 templates/grep-locale delete mode 100644 templates/grep/base.template delete mode 100644 templates/grep/docs.template delete mode 100644 templates/grep/locale.template delete mode 120000 templates/gzip-base delete mode 120000 templates/gzip-docs delete mode 100644 templates/gzip/base.template delete mode 100644 templates/gzip/docs.template delete mode 120000 templates/libarchive-dev rename templates/{libarchive-base => libarchive-devel} (100%) delete mode 120000 templates/libarchive-docs delete mode 120000 templates/libarchive-libs delete mode 100644 templates/libarchive/base.template create mode 100644 templates/libarchive/depends rename templates/libarchive/{dev.template => devel.template} (82%) delete mode 100644 templates/libarchive/docs.template delete mode 100644 templates/libarchive/libs.depends delete mode 100644 templates/libarchive/libs.template delete mode 120000 templates/lzma-utils-dev rename templates/{lzma-utils-base => lzma-utils-devel} (100%) delete mode 120000 templates/lzma-utils-docs delete mode 100644 templates/lzma-utils/base.template create mode 100644 templates/lzma-utils/depends rename templates/lzma-utils/{dev.template => devel.template} (83%) delete mode 100644 templates/lzma-utils/docs.template delete mode 100644 templates/lzma-utils/libs.depends delete mode 120000 templates/make-base delete mode 120000 templates/make-docs delete mode 120000 templates/make-locale delete mode 100644 templates/make/base.template delete mode 100644 templates/make/docs.template delete mode 100644 templates/make/locale.template rename templates/{mpfr-dev => mpfr-devel} (100%) delete mode 120000 templates/mpfr-libs create mode 100644 templates/mpfr/depends delete mode 100644 templates/mpfr/dev.template create mode 100644 templates/mpfr/devel.template delete mode 100644 templates/mpfr/libs.depends delete mode 100644 templates/mpfr/libs.template rename templates/{ncurses-dev => ncurses-devel} (100%) rename templates/{ncurses-docs => ncurses-term} (100%) create mode 100644 templates/ncurses/base-files create mode 100644 templates/ncurses/depends create mode 100644 templates/ncurses/devel.template delete mode 100644 templates/ncurses/docs.template delete mode 100644 templates/ncurses/libs.depends create mode 100644 templates/ncurses/term.template rename templates/{proplib-dev => proplib-devel} (100%) delete mode 120000 templates/proplib-docs delete mode 120000 templates/proplib-libs create mode 100644 templates/proplib/depends delete mode 100644 templates/proplib/dev.template rename templates/{glibc/dev.template => proplib/devel.template} (74%) delete mode 100644 templates/proplib/docs.template delete mode 100644 templates/proplib/libs.depends delete mode 100644 templates/proplib/libs.template delete mode 120000 templates/sed-base delete mode 120000 templates/sed-docs delete mode 120000 templates/sed-locale delete mode 100644 templates/sed/base.template delete mode 100644 templates/sed/docs.template delete mode 100644 templates/sed/locale.template delete mode 120000 templates/tar-base delete mode 120000 templates/tar-docs delete mode 120000 templates/tar-locale delete mode 100644 templates/tar/base.template delete mode 100644 templates/tar/docs.template delete mode 100644 templates/tar/locale.template delete mode 120000 templates/texinfo-base delete mode 120000 templates/texinfo-docs delete mode 120000 templates/texinfo-locale delete mode 100644 templates/texinfo/base.template delete mode 100644 templates/texinfo/docs.template delete mode 100644 templates/texinfo/locale.template delete mode 120000 templates/wget-base delete mode 120000 templates/wget-docs delete mode 120000 templates/wget-locale delete mode 100644 templates/wget/base.template delete mode 100644 templates/wget/docs.template delete mode 100644 templates/wget/locale.template rename templates/{zlib-dev => zlib-devel} (100%) delete mode 120000 templates/zlib-libs create mode 100644 templates/zlib/depends rename templates/zlib/{dev.template => devel.template} (78%) delete mode 100644 templates/zlib/libs.depends delete mode 100644 templates/zlib/libs.template diff --git a/shutils/binpkg.sh b/shutils/binpkg.sh index 3d77dfcca6..cdb593647f 100644 --- a/shutils/binpkg.sh +++ b/shutils/binpkg.sh @@ -56,6 +56,7 @@ xbps_write_metadata_pkg() if [ ! -f $XBPS_TEMPLATESDIR/${sourcepkg}/${subpkg}.template ]; then msg_error "Cannot find subpackage template!" fi + unset run_depends . $XBPS_TEMPLATESDIR/${sourcepkg}/${subpkg}.template pkgname=${sourcepkg}-${subpkg} xbps_write_metadata_pkg_real @@ -65,13 +66,11 @@ xbps_write_metadata_pkg() [ -n "${subpackages}" ] && [ "$pkg" != "${sourcepkg}" ] && return $? - if [ -n "${subpackages}" ]; then - run_template ${sourcepkg} - unset run_depends + if [ -z "${run_depends}" ]; then + for subpkg in ${subpackages}; do + run_depends="$run_depends ${sourcepkg}-${subpkg}-${version}" + done fi - for subpkg in ${subpackages}; do - run_depends="$run_depends ${sourcepkg}-${subpkg}-${version}" - done xbps_write_metadata_pkg_real } diff --git a/shutils/pkgtarget_funcs.sh b/shutils/pkgtarget_funcs.sh index ac56c520db..76b3d7322c 100644 --- a/shutils/pkgtarget_funcs.sh +++ b/shutils/pkgtarget_funcs.sh @@ -23,6 +23,8 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #- +. ${XBPS_SHUTILSDIR}/tmpl_funcs.sh + # # Installs a pkg by reading its build template file. # diff --git a/shutils/tmpl_funcs.sh b/shutils/tmpl_funcs.sh index 00fc99ac9d..ead88b8cb9 100644 --- a/shutils/tmpl_funcs.sh +++ b/shutils/tmpl_funcs.sh @@ -69,6 +69,7 @@ reset_tmpl_vars() disable_parallel_build run_depends cross_compiler \ only_for_archs patch_args conf_files keep_dirs \ install_priority noarch subpackages sourcepkg \ + abi_depends api_depends \ XBPS_EXTRACT_DONE XBPS_CONFIGURE_DONE \ XBPS_BUILD_DONE XBPS_INSTALL_DONE" @@ -104,6 +105,46 @@ setup_tmpl() } +Add_dependency() +{ + local type="$1" + local pkgname="$2" + local minver="$3" + + case "$type" in + build|full|run) ;; + *) msg_error "Unknown dependency type for $pkgname." ;; + esac + + if [ -f $XBPS_TEMPLATESDIR/$pkgname/$pkgname.depends ]; then + . $XBPS_TEMPLATESDIR/$pkgname/$pkgname.depends + elif [ -f $XBPS_TEMPLATESDIR/$pkgname/depends ]; then + . $XBPS_TEMPLATESDIR/$pkgname/depends + fi + + if [ "$type" = "full" -o "$type" = "build" ]; then + if [ -z "$minver" -a -z "$api_depends" ]; then + build_depends="${build_depends} $pkgname-0" + elif [ -z "$minver" -a -n "$api_depends" ]; then + build_depends="${build_depends} $pkgname-$api_depends" + else + build_depends="${build_depends} $pkgname-$minver" + fi + fi + + if [ "$type" = "full" -o "$type" = "run" ]; then + if [ -z "$minver" -a -z "$abi_depends" ]; then + run_depends="${run_depends} $pkgname-0" + elif [ -z "$minver" -a -n "$abi_depends" ]; then + run_depends="${run_depends} $pkgname-$abi_depends" + else + run_depends="${run_depends} $pkgname-$minver" + fi + fi + + unset abi_depends api_depends +} + # # Checks some vars used in templates and sets some of them required. # diff --git a/templates/bash-base b/templates/bash-base deleted file mode 120000 index f4d7fa5708..0000000000 --- a/templates/bash-base +++ /dev/null @@ -1 +0,0 @@ -bash \ No newline at end of file diff --git a/templates/bash-locale b/templates/bash-locale deleted file mode 120000 index f4d7fa5708..0000000000 --- a/templates/bash-locale +++ /dev/null @@ -1 +0,0 @@ -bash \ No newline at end of file diff --git a/templates/bash/base.template b/templates/bash/base.template deleted file mode 100644 index 7f70fc1a6d..0000000000 --- a/templates/bash/base.template +++ /dev/null @@ -1,21 +0,0 @@ -# Template file for 'bash-base'. -# -short_desc="${short_desc} (base files)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} base files." - -# Run dependencies. -. ${XBPS_TEMPLATESDIR}/glibc/libs.depends -. ${XBPS_TEMPLATESDIR}/ncurses/libs.depends - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr/share - mv ${origdir}/bin ${destdir} - mv ${origdir}/usr/share/info ${destdir}/usr/share - mv ${origdir}/usr/share/man ${destdir}/usr/share -} diff --git a/templates/bash/locale.template b/templates/bash/locale.template deleted file mode 100644 index 1b9eff5ec2..0000000000 --- a/templates/bash/locale.template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'bash-locale'. -# -short_desc="${short_desc} (locales)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} locale files, for non US users." -run_depends= -noarch=yes - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr/share - mv ${origdir}/usr/share/locale ${destdir}/usr/share -} diff --git a/templates/bash/template b/templates/bash/template index 9f2562f135..611b7f0d52 100644 --- a/templates/bash/template +++ b/templates/bash/template @@ -1,7 +1,6 @@ # Template build file for 'bash'. pkgname=bash -sourcepkg=bash -version=3.2.48 +version=4.0 distfiles="http://ftp.gnu.org/gnu/bash/bash-$version.tar.gz" build_style=gnu_configure configure_args="--without-bash-malloc --with-curses @@ -9,7 +8,7 @@ configure_args="--without-bash-malloc --with-curses ac_cv_func_working_mktime=yes" short_desc="The GNU Bourne Again Shell" maintainer="Juan RP " -checksum=28e9dc561b48a6675dbb30b5875e066d74cfac6a4eb261755dd2d93a38d301c5 +checksum=9793d394f640a95030c77d5ac989724afe196921956db741bcaf141801c50518 long_desc=" Bash is an sh-compatible shell that incorporates useful features from the Korn shell (ksh) and C shell (csh). It is intended to conform to @@ -23,5 +22,6 @@ long_desc=" modification." base_chroot=yes -build_depends="ncurses-5.6" -subpackages="base locale" + +Add_dependency run glibc +Add_dependency full ncurses diff --git a/templates/binutils-dev b/templates/binutils-dev deleted file mode 120000 index 695eb82eae..0000000000 --- a/templates/binutils-dev +++ /dev/null @@ -1 +0,0 @@ -binutils \ No newline at end of file diff --git a/templates/binutils-base b/templates/binutils-devel similarity index 100% rename from templates/binutils-base rename to templates/binutils-devel diff --git a/templates/binutils-docs b/templates/binutils-docs deleted file mode 120000 index 695eb82eae..0000000000 --- a/templates/binutils-docs +++ /dev/null @@ -1 +0,0 @@ -binutils \ No newline at end of file diff --git a/templates/binutils-locale b/templates/binutils-locale deleted file mode 120000 index 695eb82eae..0000000000 --- a/templates/binutils-locale +++ /dev/null @@ -1 +0,0 @@ -binutils \ No newline at end of file diff --git a/templates/binutils/base.template b/templates/binutils/base.template deleted file mode 100644 index 8f54f43406..0000000000 --- a/templates/binutils/base.template +++ /dev/null @@ -1,20 +0,0 @@ -# Template file for 'binutils-base'. -# -short_desc="${short_desc} (base files)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} base programs and libraries." - -. ${XBPS_TEMPLATESDIR}/glibc/libs.depends - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr/lib - mv ${origdir}/usr/bin ${destdir}/usr - mv ${origdir}/usr/lib/libbfd-${version}.so ${destdir}/usr/lib - mv ${origdir}/usr/lib/libopcodes-${version}.so ${destdir}/usr/lib - mv ${origdir}/usr/lib/ldscripts ${destdir}/usr/lib -} diff --git a/templates/binutils/depends b/templates/binutils/depends new file mode 100644 index 0000000000..e877967f3c --- /dev/null +++ b/templates/binutils/depends @@ -0,0 +1,2 @@ +abi_depends=2.18 +api_depends=${abi_depends} diff --git a/templates/binutils/dev.template b/templates/binutils/devel.template similarity index 82% rename from templates/binutils/dev.template rename to templates/binutils/devel.template index dfa67465ab..313b5ac524 100644 --- a/templates/binutils/dev.template +++ b/templates/binutils/devel.template @@ -1,10 +1,11 @@ -# Template file for 'binutils-dev'. +# Template file for 'binutils-devel'. # short_desc="${short_desc} (development files)" long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -run_depends="binutils-base-2.19" + +Add_dependency run binutils do_install() { @@ -19,4 +20,5 @@ do_install() mv ${origdir}/usr/lib/${f}.so ${destdir}/usr/lib fi done + mv ${origdir}/usr/lib/ldscripts ${destdir}/usr/lib } diff --git a/templates/binutils/docs.template b/templates/binutils/docs.template deleted file mode 100644 index e6de5db259..0000000000 --- a/templates/binutils/docs.template +++ /dev/null @@ -1,21 +0,0 @@ -# Template file for 'binutils-docs'. -# -short_desc="${short_desc} (documentation)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} documentation: manual pages - and info files." -run_depends= -noarch=yes - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - - # Move manpages and info files. - mkdir -p ${destdir}/usr/share - mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/share/man \ - ${destdir}/usr/share - mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/share/info \ - ${destdir}/usr/share -} diff --git a/templates/binutils/libs.depends b/templates/binutils/libs.depends deleted file mode 100644 index 218cc35f3f..0000000000 --- a/templates/binutils/libs.depends +++ /dev/null @@ -1 +0,0 @@ -run_depends="${run_depends} binutils-base-2.8" diff --git a/templates/binutils/locale.template b/templates/binutils/locale.template deleted file mode 100644 index 7af89be443..0000000000 --- a/templates/binutils/locale.template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'binutils-locales'. -# -short_desc="${short_desc} (locales)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} locale files, for non US users." -run_depends= -noarch=yes - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - - mkdir -p ${destdir}/usr/share - mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/share/locale \ - ${destdir}/usr/share -} diff --git a/templates/binutils/template b/templates/binutils/template index ad5e19e537..45ab510c5c 100644 --- a/templates/binutils/template +++ b/templates/binutils/template @@ -25,4 +25,6 @@ long_desc=" and other tools." base_chroot=yes -subpackages="base dev docs locale" +subpackages="devel" + +Add_dependency run glibc diff --git a/templates/bzip2-dev b/templates/bzip2-dev deleted file mode 120000 index a989e1da11..0000000000 --- a/templates/bzip2-dev +++ /dev/null @@ -1 +0,0 @@ -bzip2 \ No newline at end of file diff --git a/templates/bzip2-base b/templates/bzip2-devel similarity index 100% rename from templates/bzip2-base rename to templates/bzip2-devel diff --git a/templates/bzip2-docs b/templates/bzip2-docs deleted file mode 120000 index a989e1da11..0000000000 --- a/templates/bzip2-docs +++ /dev/null @@ -1 +0,0 @@ -bzip2 \ No newline at end of file diff --git a/templates/bzip2-libs b/templates/bzip2-libs deleted file mode 120000 index a989e1da11..0000000000 --- a/templates/bzip2-libs +++ /dev/null @@ -1 +0,0 @@ -bzip2 \ No newline at end of file diff --git a/templates/bzip2/base.template b/templates/bzip2/base.template deleted file mode 100644 index a53022f3d5..0000000000 --- a/templates/bzip2/base.template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'bzip2-base'. -# -short_desc="${short_desc} (base files)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} base files." - -. ${XBPS_TEMPLATESDIR}/glibc/libs.depends - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr - mv ${origdir}/usr/bin ${destdir}/usr -} diff --git a/templates/bzip2/depends b/templates/bzip2/depends new file mode 100644 index 0000000000..f847cf4927 --- /dev/null +++ b/templates/bzip2/depends @@ -0,0 +1,2 @@ +abi_depends=1.0.5 +api_depends=${abi_depends} diff --git a/templates/bzip2/dev.template b/templates/bzip2/devel.template similarity index 85% rename from templates/bzip2/dev.template rename to templates/bzip2/devel.template index ff612cadd7..f49bfbeb7c 100644 --- a/templates/bzip2/dev.template +++ b/templates/bzip2/devel.template @@ -1,10 +1,11 @@ -# Template file for 'bzip2-dev'. +# Template file for 'bzip2-devel'. # short_desc="${short_desc} (development files)" long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -run_depends="bzip2-libs-${version}" + +Add_dependency run bzip2 do_install() { diff --git a/templates/bzip2/docs.template b/templates/bzip2/docs.template deleted file mode 100644 index 82323bae57..0000000000 --- a/templates/bzip2/docs.template +++ /dev/null @@ -1,18 +0,0 @@ -# Template file for 'bzip2-docs'. -# -short_desc="${short_desc} (documentation)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} documentation: manual pages - and info files." -run_depends= -noarch=yes - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr/share - mv ${origdir}/usr/share/man ${destdir}/usr/share -} diff --git a/templates/bzip2/libs.depends b/templates/bzip2/libs.depends deleted file mode 100644 index a54121a6c2..0000000000 --- a/templates/bzip2/libs.depends +++ /dev/null @@ -1 +0,0 @@ -run_depends="${run_depends} bzip2-libs-1.0.5" diff --git a/templates/bzip2/libs.template b/templates/bzip2/libs.template deleted file mode 100644 index 7b723bf78f..0000000000 --- a/templates/bzip2/libs.template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'bzip2-libs'. -# -short_desc="${short_desc} (libraries)" -long_desc="${long_desc} - - This package contains only the ${sourcepkg} shared libraries." - -. ${XBPS_TEMPLATESDIR}/glibc/libs.depends - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr/lib - mv ${origdir}/usr/lib/libbz2.so* ${destdir}/usr/lib -} diff --git a/templates/bzip2/template b/templates/bzip2/template index 870bc3f0b4..d1c9dde93d 100644 --- a/templates/bzip2/template +++ b/templates/bzip2/template @@ -25,4 +25,6 @@ long_desc=" predecessor, bzip (.bz)." base_chroot=yes -subpackages="base dev docs libs" +subpackages="devel" + +Add_dependency run glibc diff --git a/templates/coreutils-base b/templates/coreutils-base deleted file mode 120000 index a4b710b178..0000000000 --- a/templates/coreutils-base +++ /dev/null @@ -1 +0,0 @@ -coreutils \ No newline at end of file diff --git a/templates/coreutils-docs b/templates/coreutils-docs deleted file mode 120000 index a4b710b178..0000000000 --- a/templates/coreutils-docs +++ /dev/null @@ -1 +0,0 @@ -coreutils \ No newline at end of file diff --git a/templates/coreutils-locale b/templates/coreutils-locale deleted file mode 120000 index a4b710b178..0000000000 --- a/templates/coreutils-locale +++ /dev/null @@ -1 +0,0 @@ -coreutils \ No newline at end of file diff --git a/templates/coreutils/base.template b/templates/coreutils/base.template deleted file mode 100644 index 7202a9c9fd..0000000000 --- a/templates/coreutils/base.template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'coreutils-base'. -# -short_desc="${short_desc} (base files)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} base files." - -. ${XBPS_TEMPLATESDIR}/glibc/libs.depends - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir} - mv ${origdir}/bin ${destdir} -} diff --git a/templates/coreutils/docs.template b/templates/coreutils/docs.template deleted file mode 100644 index da2b8dcb1b..0000000000 --- a/templates/coreutils/docs.template +++ /dev/null @@ -1,20 +0,0 @@ -# Template file for 'coreutils-docs'. -# -short_desc="${short_desc} (documentation)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} documentation: manual pages - and info files." -run_depends= -noarch=yes - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - # Move manpages and info files. - mkdir -p ${destdir}/usr/share - mv ${origdir}/usr/share/man ${destdir}/usr/share - mv ${origdir}/usr/share/info ${destdir}/usr/share -} diff --git a/templates/coreutils/locale.template b/templates/coreutils/locale.template deleted file mode 100644 index f345cf2fe9..0000000000 --- a/templates/coreutils/locale.template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'coreutils-locale'. -# -short_desc="${short_desc} (locales)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} locale files, for non US users." -run_depends= -noarch=yes - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr/share - mv ${origdir}/usr/share/locale ${destdir}/usr/share -} diff --git a/templates/coreutils/template b/templates/coreutils/template index f30323ec0f..6e5ecb3d92 100644 --- a/templates/coreutils/template +++ b/templates/coreutils/template @@ -1,6 +1,5 @@ # Template file for 'coreutils' pkgname=coreutils -sourcepkg=coreutils version=6.12 distfiles="http://ftp.gnu.org/gnu/coreutils/$pkgname-$version.tar.gz" build_style=gnu_configure @@ -16,4 +15,5 @@ long_desc=" which are expected to exist on every operating system." base_chroot=yes -subpackages="base docs locale" + +Add_dependency run glibc diff --git a/templates/dash/template b/templates/dash/template index e7e462ce2f..b2fbbd1197 100644 --- a/templates/dash/template +++ b/templates/dash/template @@ -19,7 +19,7 @@ long_desc=" base_package=yes base_chroot=yes -. ${XBPS_TEMPLATESDIR}/glibc/libs.depends +Add_dependency run glibc post_install() { diff --git a/templates/diffutils-base b/templates/diffutils-base deleted file mode 120000 index 815745d465..0000000000 --- a/templates/diffutils-base +++ /dev/null @@ -1 +0,0 @@ -diffutils \ No newline at end of file diff --git a/templates/diffutils-docs b/templates/diffutils-docs deleted file mode 120000 index 815745d465..0000000000 --- a/templates/diffutils-docs +++ /dev/null @@ -1 +0,0 @@ -diffutils \ No newline at end of file diff --git a/templates/diffutils-locale b/templates/diffutils-locale deleted file mode 120000 index 815745d465..0000000000 --- a/templates/diffutils-locale +++ /dev/null @@ -1 +0,0 @@ -diffutils \ No newline at end of file diff --git a/templates/diffutils/base.template b/templates/diffutils/base.template deleted file mode 100644 index 2b1a6edae4..0000000000 --- a/templates/diffutils/base.template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'diffutils-base'. -# -short_desc="${short_desc} (base files)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} base files." - -. ${XBPS_TEMPLATESDIR}/glibc/libs.depends - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr - mv ${origdir}/usr/bin ${destdir}/usr -} diff --git a/templates/diffutils/docs.template b/templates/diffutils/docs.template deleted file mode 100644 index 7187bb688d..0000000000 --- a/templates/diffutils/docs.template +++ /dev/null @@ -1,19 +0,0 @@ -# Template file for 'diffutils-docs'. -# -short_desc="${short_desc} (documentation)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} documentation: manual pages - and info files." -run_depends= -noarch=yes - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr/share - mv ${origdir}/usr/share/info ${destdir}/usr/share - mv ${origdir}/usr/share/man ${destdir}/usr/share -} diff --git a/templates/diffutils/locale.template b/templates/diffutils/locale.template deleted file mode 100644 index 7091c8ddc9..0000000000 --- a/templates/diffutils/locale.template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'diffutils-locale'. -# -short_desc="${short_desc} (locales)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} locale files, for non US users." -run_depends= -noarch=yes - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr/share - mv ${origdir}/usr/share/locale ${destdir}/usr/share -} diff --git a/templates/diffutils/template b/templates/diffutils/template index 47f65a42f4..179bd94bc0 100644 --- a/templates/diffutils/template +++ b/templates/diffutils/template @@ -1,6 +1,5 @@ # Template file for 'diffutils' pkgname=diffutils -sourcepkg=diffutils version=2.8.1 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" build_style=gnu_configure @@ -14,4 +13,5 @@ long_desc=" These programs are usually used for creating patch files." base_chroot=yes -subpackages="base docs locale" + +Add_dependency run glibc diff --git a/templates/file-dev b/templates/file-dev deleted file mode 120000 index 1a010b1c0f..0000000000 --- a/templates/file-dev +++ /dev/null @@ -1 +0,0 @@ -file \ No newline at end of file diff --git a/templates/file-base b/templates/file-devel similarity index 100% rename from templates/file-base rename to templates/file-devel diff --git a/templates/file-libs b/templates/file-libs deleted file mode 120000 index 1a010b1c0f..0000000000 --- a/templates/file-libs +++ /dev/null @@ -1 +0,0 @@ -file \ No newline at end of file diff --git a/templates/file/base.template b/templates/file/base.template deleted file mode 100644 index 3e7fa64df3..0000000000 --- a/templates/file/base.template +++ /dev/null @@ -1,18 +0,0 @@ -# Template file for 'file-base'. -# -short_desc="${short_desc} (base files)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} base files." -run_depends="file-libs-${version}" - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr/share/man/man1 - mv ${origdir}/usr/bin ${destdir}/usr - mv ${origdir}/usr/share/file ${destdir}/usr/share - mv ${origdir}/usr/share/man/man1 ${destdir}/usr/share/man -} diff --git a/templates/file/depends b/templates/file/depends new file mode 100644 index 0000000000..6983d7570d --- /dev/null +++ b/templates/file/depends @@ -0,0 +1,2 @@ +abi_depends=4.90 +api_depends=${abi_depends} diff --git a/templates/file/dev.template b/templates/file/devel.template similarity index 85% rename from templates/file/dev.template rename to templates/file/devel.template index e19380a73f..976fc9d2d1 100644 --- a/templates/file/dev.template +++ b/templates/file/devel.template @@ -1,10 +1,11 @@ -# Template file for 'file-dev'. +# Template file for 'file-devel'. # short_desc="${short_desc} (development files)" long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -run_depends="file-libs-${version}" + +Add_dependency run file do_install() { diff --git a/templates/file/libs.depends b/templates/file/libs.depends deleted file mode 100644 index 4b1e4f725f..0000000000 --- a/templates/file/libs.depends +++ /dev/null @@ -1 +0,0 @@ -run_depends="${run_depends} file-libs-5.00" diff --git a/templates/file/libs.template b/templates/file/libs.template deleted file mode 100644 index 48d356c307..0000000000 --- a/templates/file/libs.template +++ /dev/null @@ -1,21 +0,0 @@ -# Template file for 'file-libs'. -# -short_desc="${short_desc} (libraries)" -long_desc="${long_desc} - - This package contains only the ${sourcepkg} shared libraries." - -. ${XBPS_TEMPLATESDIR}/glibc/libs.depends -. ${XBPS_TEMPLATESDIR}/zlib/libs.depends - -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/lib/libmagic.so* ${destdir}/usr/lib - mv ${origdir}/usr/share/man/man3 ${destdir}/usr/share/man - mv ${origdir}/usr/share/man/man4 ${destdir}/usr/share/man -} diff --git a/templates/file/template b/templates/file/template index f398275f29..92cfdc0ab3 100644 --- a/templates/file/template +++ b/templates/file/template @@ -13,5 +13,7 @@ long_desc=" a description if a match is found." base_chroot=yes -build_depends="zlib-1.2.3" -subpackages="base dev libs" +subpackages="devel" + +Add_dependency run glibc +Add_dependency full zlib diff --git a/templates/findutils-base b/templates/findutils-base deleted file mode 120000 index 44e468bf63..0000000000 --- a/templates/findutils-base +++ /dev/null @@ -1 +0,0 @@ -findutils \ No newline at end of file diff --git a/templates/findutils-docs b/templates/findutils-docs deleted file mode 120000 index 44e468bf63..0000000000 --- a/templates/findutils-docs +++ /dev/null @@ -1 +0,0 @@ -findutils \ No newline at end of file diff --git a/templates/findutils-locale b/templates/findutils-locale deleted file mode 120000 index 44e468bf63..0000000000 --- a/templates/findutils-locale +++ /dev/null @@ -1 +0,0 @@ -findutils \ No newline at end of file diff --git a/templates/findutils/base.template b/templates/findutils/base.template deleted file mode 100644 index 59ab7b3546..0000000000 --- a/templates/findutils/base.template +++ /dev/null @@ -1,19 +0,0 @@ -# Template file for 'findutils-base'. -# -short_desc="${short_desc} (base files)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} base files." - -. ${XBPS_TEMPLATESDIR}/glibc/libs.depends - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr - mv ${origdir}/usr/bin ${destdir}/usr - mv ${origdir}/usr/libexec ${destdir}/usr - mv ${origdir}/var ${destdir} -} diff --git a/templates/findutils/docs.template b/templates/findutils/docs.template deleted file mode 100644 index 2c31b77247..0000000000 --- a/templates/findutils/docs.template +++ /dev/null @@ -1,19 +0,0 @@ -# Template file for 'findutils-docs'. -# -short_desc="${short_desc} (documentation)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} documentation: manual pages - and info files." -run_depends= -noarch=yes - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr/share - mv ${origdir}/usr/share/info ${destdir}/usr/share - mv ${origdir}/usr/share/man ${destdir}/usr/share -} diff --git a/templates/findutils/locale.template b/templates/findutils/locale.template deleted file mode 100644 index 53fba5c13e..0000000000 --- a/templates/findutils/locale.template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'findutils-locale'. -# -short_desc="${short_desc} (locales)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} locale files, for non US users." -run_depends= -noarch=yes - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr/share - mv ${origdir}/usr/share/locale ${destdir}/usr/share -} diff --git a/templates/findutils/template b/templates/findutils/template index a905af4ed2..365c950e3a 100644 --- a/templates/findutils/template +++ b/templates/findutils/template @@ -1,6 +1,5 @@ # Template file for 'findutils' pkgname=findutils -sourcepkg=findutils version=4.4.0 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" build_style=gnu_configure @@ -17,4 +16,5 @@ long_desc=" locating capabilities to other commands." base_chroot=yes -subpackages="base docs locale" + +Add_dependency run glibc diff --git a/templates/gawk-base b/templates/gawk-base deleted file mode 120000 index 7ef87eea4d..0000000000 --- a/templates/gawk-base +++ /dev/null @@ -1 +0,0 @@ -gawk \ No newline at end of file diff --git a/templates/gawk-locale b/templates/gawk-locale deleted file mode 120000 index 7ef87eea4d..0000000000 --- a/templates/gawk-locale +++ /dev/null @@ -1 +0,0 @@ -gawk \ No newline at end of file diff --git a/templates/gawk/base.template b/templates/gawk/base.template deleted file mode 100644 index e41dac31db..0000000000 --- a/templates/gawk/base.template +++ /dev/null @@ -1,22 +0,0 @@ -# Template file for 'gawk-base'. -# -short_desc="${short_desc} (base files)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} base files." - -. ${XBPS_TEMPLATESDIR}/glibc/libs.depends - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr/lib - mkdir -p ${destdir}/usr/share - mv ${origdir}/usr/bin ${destdir}/usr - mv ${origdir}/usr/libexec ${destdir}/usr - mv ${origdir}/usr/share/awk ${destdir}/usr/share - mv ${origdir}/usr/share/man ${destdir}/usr/share - mv ${origdir}/usr/share/info ${destdir}/usr/share -} diff --git a/templates/gawk/locale.template b/templates/gawk/locale.template deleted file mode 100644 index a000cacf52..0000000000 --- a/templates/gawk/locale.template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'gawk-locale'. -# -short_desc="${short_desc} (locales)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} locale files, for non US users." -run_depends= -noarch=yes - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - - mkdir -p ${destdir}/usr/share - mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/share/locale \ - ${destdir}/usr/share -} diff --git a/templates/gawk/template b/templates/gawk/template index 2640735b89..391e633a6a 100644 --- a/templates/gawk/template +++ b/templates/gawk/template @@ -1,6 +1,5 @@ # Template file for 'gawk' pkgname=gawk -sourcepkg=gawk version=3.1.6 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" build_style=gnu_configure @@ -11,5 +10,6 @@ checksum=06dd872da7145088ae08475f7b11e5b9e810b8ead7d78d039003e671bb76ec65 long_desc=" The GNU AWK utility, a pattern scanning and processing tool." -base_chroot=yes -subpackages="base locale" +base_chroot=yes + +Add_dependency run glibc diff --git a/templates/gcc-base b/templates/gcc-c++ similarity index 100% rename from templates/gcc-base rename to templates/gcc-c++ diff --git a/templates/gcc-dev b/templates/gcc-libgcc similarity index 100% rename from templates/gcc-dev rename to templates/gcc-libgcc diff --git a/templates/gcc-docs b/templates/gcc-libgomp similarity index 100% rename from templates/gcc-docs rename to templates/gcc-libgomp diff --git a/templates/gcc-locale b/templates/gcc-libmudflap similarity index 100% rename from templates/gcc-locale rename to templates/gcc-libmudflap diff --git a/templates/gcc-libmudflap-devel b/templates/gcc-libmudflap-devel new file mode 120000 index 0000000000..b08d5af579 --- /dev/null +++ b/templates/gcc-libmudflap-devel @@ -0,0 +1 @@ +gcc \ No newline at end of file diff --git a/templates/gcc-libobjc b/templates/gcc-libobjc new file mode 120000 index 0000000000..b08d5af579 --- /dev/null +++ b/templates/gcc-libobjc @@ -0,0 +1 @@ +gcc \ No newline at end of file diff --git a/templates/gcc-libobjc-devel b/templates/gcc-libobjc-devel new file mode 120000 index 0000000000..b08d5af579 --- /dev/null +++ b/templates/gcc-libobjc-devel @@ -0,0 +1 @@ +gcc \ No newline at end of file diff --git a/templates/gcc-libstdc++ b/templates/gcc-libstdc++ new file mode 120000 index 0000000000..b08d5af579 --- /dev/null +++ b/templates/gcc-libstdc++ @@ -0,0 +1 @@ +gcc \ No newline at end of file diff --git a/templates/gcc-libstdc++-devel b/templates/gcc-libstdc++-devel new file mode 120000 index 0000000000..b08d5af579 --- /dev/null +++ b/templates/gcc-libstdc++-devel @@ -0,0 +1 @@ +gcc \ No newline at end of file diff --git a/templates/gcc-objc b/templates/gcc-objc new file mode 120000 index 0000000000..b08d5af579 --- /dev/null +++ b/templates/gcc-objc @@ -0,0 +1 @@ +gcc \ No newline at end of file diff --git a/templates/gcc-objc++ b/templates/gcc-objc++ new file mode 120000 index 0000000000..b08d5af579 --- /dev/null +++ b/templates/gcc-objc++ @@ -0,0 +1 @@ +gcc \ No newline at end of file diff --git a/templates/gcc/base.template b/templates/gcc/base.template deleted file mode 100644 index 630b4693f1..0000000000 --- a/templates/gcc/base.template +++ /dev/null @@ -1,26 +0,0 @@ -# Template file for 'gcc-base'. -# -short_desc="${short_desc} (base files)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} base programs and libraries." - -run_depends="binutils-base-2.18" -. ${XBPS_TEMPLATESDIR}/glibc/libs.depends -. ${XBPS_TEMPLATESDIR}/gmp/libs.depends -. ${XBPS_TEMPLATESDIR}/mpfr/libs.depends - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr/lib/gcc/${xbps_machine}-pc-linux-gnu - mv ${origdir}/usr/bin ${destdir}/usr - mv ${origdir}/usr/libexec ${destdir}/usr - mv ${origdir}/usr/lib/lib*.so.* ${destdir}/usr/lib - mv ${origdir}/usr/lib/lib*.spec ${destdir}/usr/lib - mv ${origdir}/usr/lib/gcc/${xbps_machine}-pc-linux-gnu/${version} \ - ${destdir}/usr/lib/gcc/${xbps_machine}-pc-linux-gnu - cd ${destdir}/usr/lib && ln -s libgcc_s.so.1 libgcc_s.so -} diff --git a/templates/gcc/c++.template b/templates/gcc/c++.template new file mode 100644 index 0000000000..47f15e5396 --- /dev/null +++ b/templates/gcc/c++.template @@ -0,0 +1,35 @@ +# Template file for 'gcc-c++'. +# +short_desc="GCC C++ support" +long_desc="${long_desc} + + This package contains GCC C++ support." + +Add_dependency run gcc +Add_dependency run gcc-libstdc++ + +do_install() +{ + local destdir=${XBPS_DESTDIR}/${pkgname}-${version} + local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} + local triplet= + + if [ "${xbps_machine}" = "x86_64" ]; then + triplet="${xbps_machine}-unknown-linux-gnu" + else + triplet="${xbps_machine}-pc-linux-gnu" + fi + + mkdir -p ${destdir}/usr/lib + mkdir -p ${destdir}/usr/bin + mkdir -p ${destdir}/usr/share/man/man1 + mkdir -p ${destdir}/usr/libexec/gcc/${triplet}/${version} + + for f in g++ c++ ${triplet}-g++ ${triplet}-c++; do + mv ${origdir}/usr/bin/${f} ${destdir}/usr/bin + done + mv ${origdir}/usr/libexec/gcc/${triplet}/${version}/cc1plus \ + ${destdir}/usr/libexec/gcc/${triplet}/${version} + + mv ${origdir}/usr/share/man/man1/g++.1 ${destdir}/usr/share/man/man1 +} diff --git a/templates/gcc/depends b/templates/gcc/depends new file mode 100644 index 0000000000..3cb595ff55 --- /dev/null +++ b/templates/gcc/depends @@ -0,0 +1,2 @@ +abi_depends=4.3.0 +api_depends=${abi_depends} diff --git a/templates/gcc/dev.template b/templates/gcc/dev.template deleted file mode 100644 index a5729bd23c..0000000000 --- a/templates/gcc/dev.template +++ /dev/null @@ -1,29 +0,0 @@ -# Template file for 'gcc-dev'. -# -short_desc="${short_desc} (development files)" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." -run_depends="gcc-base-${version}" - -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 - - for f in mudflap mudflapth ssp_nonshared supc++ ssp stdc++ \ - objc gomp gcc_s; do - for ext in a la; do - if [ -f ${origdir}/usr/lib/lib${f}.${ext} ]; then - mv ${origdir}/usr/lib/lib${f}.${ext} ${destdir}/usr/lib - fi - done - if [ -f ${origdir}/usr/lib/lib${f}.so ]; then - mv ${origdir}/usr/lib/lib${f}.so ${destdir}/usr/lib - fi - done -} diff --git a/templates/gcc/docs.template b/templates/gcc/docs.template deleted file mode 100644 index 0366099eec..0000000000 --- a/templates/gcc/docs.template +++ /dev/null @@ -1,21 +0,0 @@ -# Template file for 'gcc-docs'. -# -short_desc="${short_desc} (documentation)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} documentation: manual pages - and info files." -run_depends= -noarch=yes - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - - # Move manpages and info files. - mkdir -p ${destdir}/usr/share - mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/share/man \ - ${destdir}/usr/share - mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/share/info \ - ${destdir}/usr/share -} diff --git a/templates/gcc/libgcc.template b/templates/gcc/libgcc.template new file mode 100644 index 0000000000..176ea963b1 --- /dev/null +++ b/templates/gcc/libgcc.template @@ -0,0 +1,15 @@ +# Template file for 'gcc-libgcc'. +# +short_desc="GCC version ${version} shared library support" +long_desc="${long_desc} + + This package contains the GCC shared library." + +do_install() +{ + local destdir=${XBPS_DESTDIR}/${pkgname}-${version} + local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} + + mkdir -p ${destdir}/usr/lib + mv ${origdir}/usr/lib/libgcc_s.so* ${destdir}/usr/lib +} diff --git a/templates/gcc/libgomp.template b/templates/gcc/libgomp.template new file mode 100644 index 0000000000..5d2956f76a --- /dev/null +++ b/templates/gcc/libgomp.template @@ -0,0 +1,22 @@ +# Template file for 'gcc-libgomp'. +# +short_desc="GCC OpenMP v3.0 shared support library" +long_desc="${long_desc} + + This package contains GCC shared support library which is needed + for OpenMP v3.0 support." + +Add_dependency run glibc +Add_dependency run gcc-libgcc + +do_install() +{ + local destdir=${XBPS_DESTDIR}/${pkgname}-${version} + local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} + + mkdir -p ${destdir}/usr/lib + mkdir -p ${destdir}/usr/share + + mv ${origdir}/usr/lib/libgomp.* ${destdir}/usr/lib + mv ${origdir}/usr/share/info ${destdir}/usr/share +} diff --git a/templates/gcc/libmudflap-devel.template b/templates/gcc/libmudflap-devel.template new file mode 100644 index 0000000000..aed30e3b69 --- /dev/null +++ b/templates/gcc/libmudflap-devel.template @@ -0,0 +1,19 @@ +# Template file for 'gcc-libmudflap-devel'. +# +short_desc="GCC mudflap shared support library (development files)" +long_desc="${long_desc} + + This package contains GCC mudflap headers and static libraries for + building mudflap-instrumented programs." + +Add_dependency run gcc-libmudflap + +do_install() +{ + local destdir=${XBPS_DESTDIR}/${pkgname}-${version} + local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} + + mkdir -p ${destdir}/usr/lib + mv ${origdir}/usr/lib/libmudflap*.*a ${destdir}/usr/lib + mv ${origdir}/usr/lib/libmudflap*.so ${destdir}/usr/lib +} diff --git a/templates/gcc/libmudflap.template b/templates/gcc/libmudflap.template new file mode 100644 index 0000000000..38077c27ca --- /dev/null +++ b/templates/gcc/libmudflap.template @@ -0,0 +1,19 @@ +# Template file for 'gcc-libmudflap'. +# +short_desc="GCC mudflap shared support library" +long_desc="${long_desc} + + This package contains GCC shared support library which is needed + for mudflap support." + +Add_dependency run glibc +Add_dependency run gcc-libgcc + +do_install() +{ + local destdir=${XBPS_DESTDIR}/${pkgname}-${version} + local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} + + mkdir -p ${destdir}/usr/lib + mv ${origdir}/usr/lib/libmudflap*.so.* ${destdir}/usr/lib +} diff --git a/templates/gcc/libobjc-devel.template b/templates/gcc/libobjc-devel.template new file mode 100644 index 0000000000..3fb20137e9 --- /dev/null +++ b/templates/gcc/libobjc-devel.template @@ -0,0 +1,19 @@ +# Template file for 'gcc-libobjc-devel'. +# +short_desc="GCC Objective-C shared library support (development files)" +long_desc="${long_desc} + + This package contains GCC Objective-C headers and static libs, to + build Objective-C programs." + +Add_dependency run gcc-libobjc + +do_install() +{ + local destdir=${XBPS_DESTDIR}/${pkgname}-${version} + local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} + + mkdir -p ${destdir}/usr/lib + mv ${origdir}/usr/lib/libobjc.*a ${destdir}/usr/lib + mv ${origdir}/usr/lib/libobjc.so ${destdir}/usr/lib +} diff --git a/templates/gcc/libobjc.template b/templates/gcc/libobjc.template new file mode 100644 index 0000000000..ecdf6b62af --- /dev/null +++ b/templates/gcc/libobjc.template @@ -0,0 +1,19 @@ +# Template file for 'gcc-libobjc'. +# +short_desc="GCC Objective-C shared library support" +long_desc="${long_desc} + + This package contains GCC Objective-C shared support library which is needed + to run Objective-C dynamically linked programs." + +Add_dependency run glibc +Add_dependency run gcc-libgcc + +do_install() +{ + local destdir=${XBPS_DESTDIR}/${pkgname}-${version} + local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} + + mkdir -p ${destdir}/usr/lib + mv ${origdir}/usr/lib/libobjc.so.* ${destdir}/usr/lib +} diff --git a/templates/gcc/libs.depends b/templates/gcc/libs.depends deleted file mode 100644 index 8f906d3670..0000000000 --- a/templates/gcc/libs.depends +++ /dev/null @@ -1 +0,0 @@ -run_depends="${run_depends} gcc-base-4.3.2" diff --git a/templates/gcc/libstdc++-devel.template b/templates/gcc/libstdc++-devel.template new file mode 100644 index 0000000000..d43c670a2d --- /dev/null +++ b/templates/gcc/libstdc++-devel.template @@ -0,0 +1,23 @@ +# Template file for 'gcc-libstdc++-devel'. +# +short_desc="GCC Standard C++ Library (development files)" +long_desc="${long_desc} + + This package contains GCC Header files and libraries for + C++ development." + +Add_dependency run gcc-libstdc++ + +do_install() +{ + local destdir=${XBPS_DESTDIR}/${pkgname}-${version} + local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} + + mkdir -p ${destdir}/usr/lib + mkdir -p ${destdir}/usr/include + + mv ${origdir}/usr/lib/libstdc++.*a ${destdir}/usr/lib + mv ${origdir}/usr/lib/libstdc++.so ${destdir}/usr/lib + mv ${origdir}/usr/lib/libsupc++.* ${destdir}/usr/lib + mv ${origdir}/usr/include/c++ ${destdir}/usr/include +} diff --git a/templates/gcc/libstdc++.template b/templates/gcc/libstdc++.template new file mode 100644 index 0000000000..380e044b26 --- /dev/null +++ b/templates/gcc/libstdc++.template @@ -0,0 +1,26 @@ +# Template file for 'gcc-libstdc++'. +# +short_desc="GCC Standard C++ Library" +long_desc="${long_desc} + + This package contains a rewritten standard compliant GCC Standard + C++ library." + +Add_dependency run glibc +Add_dependency run gcc-libgcc + +do_install() +{ + local destdir=${XBPS_DESTDIR}/${pkgname}-${version} + local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} + + mkdir -p ${destdir}/usr/lib + mkdir -p ${destdir}/usr/share/locale/fr/LC_MESSAGES + mkdir -p ${destdir}/usr/share/locale/de/LC_MESSAGES + + mv ${origdir}/usr/lib/libstdc++.so.* ${destdir}/usr/lib + mv ${origdir}/usr/share/locale/fr/LC_MESSAGES/libstdc++.mo \ + ${destdir}/usr/share/locale/fr/LC_MESSAGES + mv ${origdir}/usr/share/locale/de/LC_MESSAGES/libstdc++.mo \ + ${destdir}/usr/share/locale/de/LC_MESSAGES +} diff --git a/templates/gcc/locale.template b/templates/gcc/locale.template deleted file mode 100644 index c214ee783a..0000000000 --- a/templates/gcc/locale.template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'gcc-locale'. -# -short_desc="${short_desc} (locales)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} locale files, for non US users." -run_depends= -noarch=yes - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - - mkdir -p ${destdir}/usr/share - mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/share/locale \ - ${destdir}/usr/share -} diff --git a/templates/gcc/objc++.template b/templates/gcc/objc++.template new file mode 100644 index 0000000000..35c4d7b60d --- /dev/null +++ b/templates/gcc/objc++.template @@ -0,0 +1,28 @@ +# Template file for 'gcc-objc++'. +# +short_desc="GCC Objective-C++ support" +long_desc="${long_desc} + + This package contains GCC Objective-C++ support." + +Add_dependency run gmp +Add_dependency run mpfr +Add_dependency run gcc-c++ +Add_dependency run gcc-objc + +do_install() +{ + local destdir=${XBPS_DESTDIR}/${pkgname}-${version} + local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} + local triplet= + + if [ "${xbps_machine}" = "x86_64" ]; then + triplet="${xbps_machine}-unknown-linux-gnu" + else + triplet="${xbps_machine}-pc-linux-gnu" + fi + + mkdir -p ${destdir}/usr/libexec/gcc/${triplet}/${version} + mv ${origdir}/usr/libexec/gcc/${triplet}/${version}/cc1objplus \ + ${destdir}/usr/libexec/gcc/${triplet}/${version} +} diff --git a/templates/gcc/objc.template b/templates/gcc/objc.template new file mode 100644 index 0000000000..5f3d79de42 --- /dev/null +++ b/templates/gcc/objc.template @@ -0,0 +1,32 @@ +# Template file for 'gcc-objc'. +# +short_desc="GCC Objective-C support" +long_desc="${long_desc} + + This package contains GCC Objective-C support." + +Add_dependency run gmp +Add_dependency run mpfr +Add_dependency run gcc +Add_dependency run gcc-libobjc + +do_install() +{ + local destdir=${XBPS_DESTDIR}/${pkgname}-${version} + local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} + local triplet= + + if [ "${xbps_machine}" = "x86_64" ]; then + triplet="${xbps_machine}-unknown-linux-gnu" + else + triplet="${xbps_machine}-pc-linux-gnu" + fi + + mkdir -p ${destdir}//usr/lib/gcc/${triplet}/${version} + mkdir -p ${destdir}/usr/libexec/gcc/${triplet}/${version}/include + + mv ${origdir}/usr/lib/gcc/${triplet}/${version}/include/objc \ + ${destdir}/usr/lib/gcc/${triplet}/${version}/include + mv ${origdir}/usr/libexec/gcc/${triplet}/${version}/cc1obj \ + ${destdir}/usr/libexec/gcc/${triplet}/${version} +} diff --git a/templates/gcc/template b/templates/gcc/template index ef28e2ea3c..aa45aea367 100644 --- a/templates/gcc/template +++ b/templates/gcc/template @@ -19,8 +19,16 @@ long_desc=" The GNU C Compiler suite, with support for C, C++, Fortran, ObjC." base_chroot=yes -build_depends="gmp-4.2.4 mpfr-2.3.2 binutils-2.18" -subpackages="base dev docs locale" +subpackages="libgcc libstdc++ libstdc++-devel libgomp libmudflap" +subpackages="${subpackages} libmudflap-devel libobjc libobjc-devel" +subpackages="${subpackages} c++ objc objc++" + +Add_dependency full gmp +Add_dependency full mpfr +Add_dependency full binutils +Add_dependency run gcc-libgcc +Add_dependency run gcc-libgomp +Add_dependency run glibc-devel # As specified in the LFS book, disable installing libiberty. pre_configure() @@ -28,8 +36,9 @@ pre_configure() sed -i 's/install_to_$(INSTALL_DEST) //' $wrksrc/libiberty/Makefile.in } -# Make /usr/bin/gcc -> /usr/bin/cc symlink. post_install() { - cd $XBPS_DESTDIR/$pkgname-$version/usr/bin && ln -s gcc cc + local destdir=$XBPS_DESTDIR/$pkgname-$version + + cd $destdir/usr/bin && ln -s gcc cc } diff --git a/templates/glibc-base b/templates/glibc-devel similarity index 100% rename from templates/glibc-base rename to templates/glibc-devel diff --git a/templates/glibc-libs b/templates/glibc-libs deleted file mode 120000 index 0c4c137d7c..0000000000 --- a/templates/glibc-libs +++ /dev/null @@ -1 +0,0 @@ -glibc \ No newline at end of file diff --git a/templates/glibc-locale b/templates/glibc-locale deleted file mode 120000 index 0c4c137d7c..0000000000 --- a/templates/glibc-locale +++ /dev/null @@ -1 +0,0 @@ -glibc \ No newline at end of file diff --git a/templates/glibc-dev b/templates/glibc-locales similarity index 100% rename from templates/glibc-dev rename to templates/glibc-locales diff --git a/templates/glibc/base.template b/templates/glibc/base.template deleted file mode 100644 index 29a5ad1e36..0000000000 --- a/templates/glibc/base.template +++ /dev/null @@ -1,25 +0,0 @@ -# Template file for 'glibc-base'. -# -short_desc="${short_desc} (base files)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} base programs and libraries." - -conf_files="/etc/localtime /etc/ld.so.cache /etc/ld.so.conf /etc/rpc - /etc/nsswitch.conf" - -. ${XBPS_TEMPLATESDIR}/glibc/libs.depends - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr/lib - mv ${origdir}/etc ${destdir} - mv ${origdir}/sbin ${destdir} - mv ${origdir}/usr/bin ${destdir}/usr - mv ${origdir}/usr/sbin ${destdir}/usr - mv ${origdir}/usr/lib/getconf ${destdir}/usr/lib - mv ${origdir}/usr/lib/pt_chown ${destdir}/usr/lib -} diff --git a/templates/glibc/depends b/templates/glibc/depends new file mode 100644 index 0000000000..2bdfdafe52 --- /dev/null +++ b/templates/glibc/depends @@ -0,0 +1,2 @@ +abi_depends=2.8 +api_depends=${abi_depends} diff --git a/templates/glibc/devel.template b/templates/glibc/devel.template new file mode 100644 index 0000000000..53b3c4a63a --- /dev/null +++ b/templates/glibc/devel.template @@ -0,0 +1,20 @@ +# Template file for 'glibc-devel'. +# +short_desc="${short_desc} (development files)" +long_desc="${long_desc} + + This package contains files for development: headers, static libs, etc." + +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/include ${destdir}/usr + mv ${origdir}/usr/lib/*.a ${destdir}/usr/lib + mv ${origdir}/usr/lib/*.so ${destdir}/usr/lib + mv ${origdir}/usr/lib/*crt1.o ${destdir}/usr/lib +} diff --git a/templates/glibc/libs.depends b/templates/glibc/libs.depends deleted file mode 100644 index 8f9dcf79ec..0000000000 --- a/templates/glibc/libs.depends +++ /dev/null @@ -1 +0,0 @@ -run_depends="${run_depends} glibc-libs-2.8" diff --git a/templates/glibc/libs.template b/templates/glibc/libs.template deleted file mode 100644 index d4c0bd06f7..0000000000 --- a/templates/glibc/libs.template +++ /dev/null @@ -1,19 +0,0 @@ -# Template file for 'glibc-libs'. -# -short_desc="${short_desc} (libraries)" -long_desc="${long_desc} - - This package contains only the ${sourcepkg} shared libraries." -run_depends="xbps-base-dirs-1.0" - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/lib - mkdir -p ${destdir}/usr/lib - mv ${origdir}/lib/*.*o* ${destdir}/lib - mv ${origdir}/usr/lib/*.*o* ${destdir}/usr/lib - mv ${origdir}/usr/lib/gconv ${destdir}/usr/lib -} diff --git a/templates/glibc/locale.template b/templates/glibc/locales.template similarity index 89% rename from templates/glibc/locale.template rename to templates/glibc/locales.template index 8ecc9d6bce..ad3cea4b87 100644 --- a/templates/glibc/locale.template +++ b/templates/glibc/locales.template @@ -1,10 +1,9 @@ -# Template file for 'glibc-locale'. +# Template file for 'glibc-locales'. # short_desc="${short_desc} (locales)" long_desc="${long_desc} This package contains the ${sourcepkg} locale files, for non US users." -run_depends= noarch=yes do_install() diff --git a/templates/glibc/template b/templates/glibc/template index 0393d4cd91..317370db1f 100644 --- a/templates/glibc/template +++ b/templates/glibc/template @@ -23,8 +23,12 @@ long_desc=" languages use the C library to access the underlying operating system." base_chroot=yes -build_depends="gcc-4.3.2 gawk-3.1.6" -subpackages="base dev libs locale" +subpackages="devel locales" + +Add_dependency build gcc +Add_dependency build gawk +Add_dependency run gcc-libgcc +Add_dependency run glibc-locales pre_configure() { diff --git a/templates/gmp-dev b/templates/gmp-devel similarity index 100% rename from templates/gmp-dev rename to templates/gmp-devel diff --git a/templates/gmp-libs b/templates/gmp-libs deleted file mode 120000 index eeaa9d938d..0000000000 --- a/templates/gmp-libs +++ /dev/null @@ -1 +0,0 @@ -gmp \ No newline at end of file diff --git a/templates/gmp/depends b/templates/gmp/depends new file mode 100644 index 0000000000..300b32091e --- /dev/null +++ b/templates/gmp/depends @@ -0,0 +1,2 @@ +abi_depends=4.2.2 +api_depends=${abi_depends} diff --git a/templates/gmp/dev.template b/templates/gmp/dev.template deleted file mode 100644 index 22ee246c3d..0000000000 --- a/templates/gmp/dev.template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'gmp-dev'. -# -short_desc="${short_desc} (development files)" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." -run_depends="gmp-libs-${version}" - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - - mkdir -p ${destdir}/usr/lib - mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/include ${destdir}/usr - mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/lib/libgmp.*a \ - ${destdir}/usr/lib -} diff --git a/templates/ncurses/dev.template b/templates/gmp/devel.template similarity index 59% rename from templates/ncurses/dev.template rename to templates/gmp/devel.template index 01529ed0f2..e02accd30e 100644 --- a/templates/ncurses/dev.template +++ b/templates/gmp/devel.template @@ -1,11 +1,11 @@ -# Template file for 'ncurses-dev'. +# Template file for 'gmp-devel'. # short_desc="${short_desc} (development files)" long_desc="${long_desc} - This package contains files for development, headers, static libs, etc." + This package contains files for development: headers, static libs, etc." -. ${XBPS_TEMPLATESDIR}/ncurses/libs.depends +Add_dependency run gmp do_install() { @@ -14,5 +14,5 @@ do_install() mkdir -p ${destdir}/usr/lib mv ${origdir}/usr/include ${destdir}/usr - mv ${origdir}/usr/lib/lib*.*a ${destdir}/usr/lib + mv ${origdir}/usr/lib/libgmp.*a ${destdir}/usr/lib } diff --git a/templates/gmp/libs.depends b/templates/gmp/libs.depends deleted file mode 100644 index 07210b6823..0000000000 --- a/templates/gmp/libs.depends +++ /dev/null @@ -1 +0,0 @@ -run_depends="${run_depends} gmp-libs-4.2.4" diff --git a/templates/gmp/libs.template b/templates/gmp/libs.template deleted file mode 100644 index 7a2207e033..0000000000 --- a/templates/gmp/libs.template +++ /dev/null @@ -1,18 +0,0 @@ -# Template file for 'gmp-libs'. -# -short_desc="${short_desc} (libraries)" -long_desc="${long_desc} - - This package contains only the ${sourcepkg} shared libraries." - -. ${XBPS_TEMPLATESDIR}/glibc/libs.depends - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - - # Move the shared lib. - mkdir -p ${destdir}/usr/lib - mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/lib/libgmp.so* \ - ${destdir}/usr/lib -} diff --git a/templates/gmp/template b/templates/gmp/template index 415ae0ce0f..a7aa2e7c0a 100644 --- a/templates/gmp/template +++ b/templates/gmp/template @@ -24,7 +24,9 @@ long_desc=" operations, since GNU MP in many cases has asymptotically faster algorithms." base_chroot=yes -subpackages="dev libs" +subpackages="devel" + +Add_dependency run glibc pre_configure() { diff --git a/templates/grep-base b/templates/grep-base deleted file mode 120000 index 9b059dc5d8..0000000000 --- a/templates/grep-base +++ /dev/null @@ -1 +0,0 @@ -grep \ No newline at end of file diff --git a/templates/grep-docs b/templates/grep-docs deleted file mode 120000 index 9b059dc5d8..0000000000 --- a/templates/grep-docs +++ /dev/null @@ -1 +0,0 @@ -grep \ No newline at end of file diff --git a/templates/grep-locale b/templates/grep-locale deleted file mode 120000 index 9b059dc5d8..0000000000 --- a/templates/grep-locale +++ /dev/null @@ -1 +0,0 @@ -grep \ No newline at end of file diff --git a/templates/grep/base.template b/templates/grep/base.template deleted file mode 100644 index e8e503d38f..0000000000 --- a/templates/grep/base.template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'grep-base'. -# -short_desc="${short_desc} (base files)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} base files." - -. ${XBPS_TEMPLATESDIR}/glibc/libs.depends - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir} - mv ${origdir}/bin ${destdir} -} diff --git a/templates/grep/docs.template b/templates/grep/docs.template deleted file mode 100644 index 201c2341c2..0000000000 --- a/templates/grep/docs.template +++ /dev/null @@ -1,19 +0,0 @@ -# Template file for 'grep-docs'. -# -short_desc="${short_desc} (documentation)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} documentation: manual pages - and info files." -run_depends= -noarch=yes - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr/share - mv ${origdir}/usr/share/info ${destdir}/usr/share - mv ${origdir}/usr/share/man ${destdir}/usr/share -} diff --git a/templates/grep/locale.template b/templates/grep/locale.template deleted file mode 100644 index 944070ef9d..0000000000 --- a/templates/grep/locale.template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'grep-locale'. -# -short_desc="${short_desc} (locales)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} locale files, for non US users." -run_depends= -noarch=yes - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr/share - mv ${origdir}/usr/share/locale ${destdir}/usr/share -} diff --git a/templates/grep/template b/templates/grep/template index d314af298d..849a27d998 100644 --- a/templates/grep/template +++ b/templates/grep/template @@ -1,6 +1,5 @@ # Template build file for 'grep'. pkgname=grep -sourcepkg=grep version=2.5.4 distfiles="http://ftp.gnu.org/gnu/grep/$pkgname-$version.tar.bz2" build_style=gnu_configure @@ -17,5 +16,6 @@ long_desc=" The result is typically many times faster than Unix grep or egrep." base_chroot=yes -build_depends="texinfo-4.13a" -subpackages="base docs locale" + +Add_dependency build texinfo +Add_dependency run glibc diff --git a/templates/gzip-base b/templates/gzip-base deleted file mode 120000 index e7aec8eaef..0000000000 --- a/templates/gzip-base +++ /dev/null @@ -1 +0,0 @@ -gzip \ No newline at end of file diff --git a/templates/gzip-docs b/templates/gzip-docs deleted file mode 120000 index e7aec8eaef..0000000000 --- a/templates/gzip-docs +++ /dev/null @@ -1 +0,0 @@ -gzip \ No newline at end of file diff --git a/templates/gzip/base.template b/templates/gzip/base.template deleted file mode 100644 index 526641d2f2..0000000000 --- a/templates/gzip/base.template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'gzip-base'. -# -short_desc="${short_desc} (base files)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} base files." - -. ${XBPS_TEMPLATESDIR}/glibc/libs.depends - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr - mv ${origdir}/usr/bin ${destdir}/usr -} diff --git a/templates/gzip/docs.template b/templates/gzip/docs.template deleted file mode 100644 index a0ce295560..0000000000 --- a/templates/gzip/docs.template +++ /dev/null @@ -1,20 +0,0 @@ -# Template file for 'gzip-docs'. -# -short_desc="${short_desc} (documentation)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} documentation: manual pages - and info files." -run_depends= -noarch=yes - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - # Move manpages and info files. - mkdir -p ${destdir}/usr/share - mv ${origdir}/usr/share/man ${destdir}/usr/share - mv ${origdir}/usr/share/info ${destdir}/usr/share -} diff --git a/templates/gzip/template b/templates/gzip/template index a4e5ad928a..b801db4108 100644 --- a/templates/gzip/template +++ b/templates/gzip/template @@ -1,6 +1,5 @@ # Template file for 'gzip' pkgname=gzip -sourcepkg=gzip version=1.3.12 distfiles="http://ftp.gnu.org/gnu/gzip/$pkgname-$version.tar.gz" build_style=gnu_configure @@ -14,4 +13,5 @@ long_desc=" standard compression program for its system." base_chroot=yes -subpackages="base docs" + +Add_dependency run glibc diff --git a/templates/libarchive-dev b/templates/libarchive-dev deleted file mode 120000 index 6e93d9cc1c..0000000000 --- a/templates/libarchive-dev +++ /dev/null @@ -1 +0,0 @@ -libarchive \ No newline at end of file diff --git a/templates/libarchive-base b/templates/libarchive-devel similarity index 100% rename from templates/libarchive-base rename to templates/libarchive-devel diff --git a/templates/libarchive-docs b/templates/libarchive-docs deleted file mode 120000 index 6e93d9cc1c..0000000000 --- a/templates/libarchive-docs +++ /dev/null @@ -1 +0,0 @@ -libarchive \ No newline at end of file diff --git a/templates/libarchive-libs b/templates/libarchive-libs deleted file mode 120000 index 6e93d9cc1c..0000000000 --- a/templates/libarchive-libs +++ /dev/null @@ -1 +0,0 @@ -libarchive \ No newline at end of file diff --git a/templates/libarchive/base.template b/templates/libarchive/base.template deleted file mode 100644 index 09adaf1ab7..0000000000 --- a/templates/libarchive/base.template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'libarchive-base'. -# -short_desc="${short_desc} (base files)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} base files." - -. ${XBPS_TEMPLATESDIR}/libarchive/libs.depends - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr - mv ${origdir}/usr/bin ${destdir}/usr -} diff --git a/templates/libarchive/depends b/templates/libarchive/depends new file mode 100644 index 0000000000..003c94e8c9 --- /dev/null +++ b/templates/libarchive/depends @@ -0,0 +1,2 @@ +abi_depends=2.6.0 +api_depends=${abi_depends} diff --git a/templates/libarchive/dev.template b/templates/libarchive/devel.template similarity index 82% rename from templates/libarchive/dev.template rename to templates/libarchive/devel.template index fc681b1575..3d0026169d 100644 --- a/templates/libarchive/dev.template +++ b/templates/libarchive/devel.template @@ -1,11 +1,11 @@ -# Template file for 'libarchive-dev'. +# Template file for 'libarchive-devel'. # short_desc="${short_desc} (development files)" long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -. ${XBPS_TEMPLATESDIR}/libarchive/libs.depends +Add_dependency run libarchive do_install() { diff --git a/templates/libarchive/docs.template b/templates/libarchive/docs.template deleted file mode 100644 index e1f91574e3..0000000000 --- a/templates/libarchive/docs.template +++ /dev/null @@ -1,18 +0,0 @@ -# Template file for 'libarchive-docs'. -# -short_desc="${short_desc} (documentation)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} documentation: manual pages - and info files." -run_depends= -noarch=yes - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr/share - mv ${origdir}/usr/share/man ${destdir}/usr/share -} diff --git a/templates/libarchive/libs.depends b/templates/libarchive/libs.depends deleted file mode 100644 index 63de5b2d89..0000000000 --- a/templates/libarchive/libs.depends +++ /dev/null @@ -1 +0,0 @@ -run_depends="${run_depends} libarchive-libs-2.6.1" diff --git a/templates/libarchive/libs.template b/templates/libarchive/libs.template deleted file mode 100644 index bca19c3694..0000000000 --- a/templates/libarchive/libs.template +++ /dev/null @@ -1,20 +0,0 @@ -# Template file for 'libarchive-libs'. -# -short_desc="${short_desc} (libraries)" -long_desc="${long_desc} - - This package contains only the ${sourcepkg} shared libraries." - -. ${XBPS_TEMPLATESDIR}/glibc/libs.depends -. ${XBPS_TEMPLATESDIR}/zlib/libs.depends -. ${XBPS_TEMPLATESDIR}/bzip2/libs.depends -. ${XBPS_TEMPLATESDIR}/lzma-utils/libs.depends - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr/lib - mv ${origdir}/usr/lib/libarchive.so* ${destdir}/usr/lib -} diff --git a/templates/libarchive/template b/templates/libarchive/template index 6d8b4d6970..b6569113f0 100644 --- a/templates/libarchive/template +++ b/templates/libarchive/template @@ -14,5 +14,8 @@ long_desc=" shar archives and read ISO9660 CDROM images and ZIP archives." base_chroot=yes -build_depends="gzip-1.3.12 bzip2-1.0.5 zlib-1.2.3 lzma-utils-4.32.7" -subpackages="base dev docs libs" +subpackages="devel" + +Add_dependency full bzip2 +Add_dependency full lzma-utils-libs +Add_dependency full zlib diff --git a/templates/lzma-utils-dev b/templates/lzma-utils-dev deleted file mode 120000 index 2be97a1091..0000000000 --- a/templates/lzma-utils-dev +++ /dev/null @@ -1 +0,0 @@ -lzma-utils \ No newline at end of file diff --git a/templates/lzma-utils-base b/templates/lzma-utils-devel similarity index 100% rename from templates/lzma-utils-base rename to templates/lzma-utils-devel diff --git a/templates/lzma-utils-docs b/templates/lzma-utils-docs deleted file mode 120000 index 2be97a1091..0000000000 --- a/templates/lzma-utils-docs +++ /dev/null @@ -1 +0,0 @@ -lzma-utils \ No newline at end of file diff --git a/templates/lzma-utils/base.template b/templates/lzma-utils/base.template deleted file mode 100644 index 81fbd2676c..0000000000 --- a/templates/lzma-utils/base.template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'lzma-utils-base'. -# -short_desc="${short_desc} (base files)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} base files." - -. ${XBPS_TEMPLATESDIR}/glibc/libs.depends - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr - mv ${origdir}/usr/bin ${destdir}/usr -} diff --git a/templates/lzma-utils/depends b/templates/lzma-utils/depends new file mode 100644 index 0000000000..810076ebea --- /dev/null +++ b/templates/lzma-utils/depends @@ -0,0 +1,2 @@ +abi_depends=4.32 +api_depends=${abi_depends} diff --git a/templates/lzma-utils/dev.template b/templates/lzma-utils/devel.template similarity index 83% rename from templates/lzma-utils/dev.template rename to templates/lzma-utils/devel.template index 824c45c61d..cf3e93abcb 100644 --- a/templates/lzma-utils/dev.template +++ b/templates/lzma-utils/devel.template @@ -1,10 +1,11 @@ -# Template file for 'lzma-utils-dev'. +# Template file for 'lzma-utils-devel'. # short_desc="${short_desc} (development files)" long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -run_depends="lzma-utils-libs-${version}" + +Add_dependency run lzma-utils-libs do_install() { diff --git a/templates/lzma-utils/docs.template b/templates/lzma-utils/docs.template deleted file mode 100644 index c2e41b6db2..0000000000 --- a/templates/lzma-utils/docs.template +++ /dev/null @@ -1,18 +0,0 @@ -# Template file for 'lzma-utils-docs'. -# -short_desc="${short_desc} (documentation)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} documentation: manual pages - and info files." -run_depends= -noarch=yes - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr/share - mv ${origdir}/usr/share/man ${destdir}/usr/share -} diff --git a/templates/lzma-utils/libs.depends b/templates/lzma-utils/libs.depends deleted file mode 100644 index ec8e3475c6..0000000000 --- a/templates/lzma-utils/libs.depends +++ /dev/null @@ -1 +0,0 @@ -run_depends="${run_depends} lzma-utils-libs-4.32.7" diff --git a/templates/lzma-utils/libs.template b/templates/lzma-utils/libs.template index 17a7870e8d..a3fa1eafe2 100644 --- a/templates/lzma-utils/libs.template +++ b/templates/lzma-utils/libs.template @@ -1,11 +1,12 @@ # Template file for 'lzma-utils-libs'. # -short_desc="${short_desc} (libraries)" +short_desc="${short_desc} (shared libraries)" long_desc="${long_desc} - This package contains only the ${sourcepkg} shared libraries." + This package contains the shared libraries." -. ${XBPS_TEMPLATESDIR}/glibc/libs.depends +Add_dependency run glibc +Add_dependency run gcc-libstdc++ do_install() { @@ -13,5 +14,5 @@ do_install() local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} mkdir -p ${destdir}/usr/lib - mv ${origdir}/usr/lib/liblzmadec.so* ${destdir}/usr/lib + mv ${origdir}/usr/lib/liblzmadec.so.* ${destdir}/usr/lib } diff --git a/templates/lzma-utils/template b/templates/lzma-utils/template index 30979e9ad4..cb356d3396 100644 --- a/templates/lzma-utils/template +++ b/templates/lzma-utils/template @@ -14,4 +14,7 @@ long_desc=" bzip2 utilities." base_chroot=yes -subpackages="base dev docs libs" +subpackages="devel libs" + +Add_dependency run glibc +Add_dependency run gcc-libstdc++ diff --git a/templates/make-base b/templates/make-base deleted file mode 120000 index ac08cdcf95..0000000000 --- a/templates/make-base +++ /dev/null @@ -1 +0,0 @@ -make \ No newline at end of file diff --git a/templates/make-docs b/templates/make-docs deleted file mode 120000 index ac08cdcf95..0000000000 --- a/templates/make-docs +++ /dev/null @@ -1 +0,0 @@ -make \ No newline at end of file diff --git a/templates/make-locale b/templates/make-locale deleted file mode 120000 index ac08cdcf95..0000000000 --- a/templates/make-locale +++ /dev/null @@ -1 +0,0 @@ -make \ No newline at end of file diff --git a/templates/make/base.template b/templates/make/base.template deleted file mode 100644 index 4400d920d4..0000000000 --- a/templates/make/base.template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'make-base'. -# -short_desc="${short_desc} (base files)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} base files." - -. ${XBPS_TEMPLATESDIR}/glibc/libs.depends - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr - mv ${origdir}/usr/bin ${destdir}/usr -} diff --git a/templates/make/docs.template b/templates/make/docs.template deleted file mode 100644 index 4339733d70..0000000000 --- a/templates/make/docs.template +++ /dev/null @@ -1,19 +0,0 @@ -# Template file for 'make-docs'. -# -short_desc="${short_desc} (documentation)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} documentation: manual pages - and info files." -run_depends= -noarch=yes - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr/share - mv ${origdir}/usr/share/info ${destdir}/usr/share - mv ${origdir}/usr/share/man ${destdir}/usr/share -} diff --git a/templates/make/locale.template b/templates/make/locale.template deleted file mode 100644 index 92bb3416f7..0000000000 --- a/templates/make/locale.template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'make-locale'. -# -short_desc="${short_desc} (locales)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} locale files, for non US users." -run_depends= -noarch=yes - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr/share - mv ${origdir}/usr/share/locale ${destdir}/usr/share -} diff --git a/templates/make/template b/templates/make/template index 262fc456e2..40ebee43c5 100644 --- a/templates/make/template +++ b/templates/make/template @@ -1,6 +1,5 @@ # Template build file for 'make' pkgname=make -sourcepkg=make version=3.81 distfiles="http://ftp.gnu.org/pub/gnu/make/$pkgname-$version.tar.bz2" build_style=gnu_configure @@ -13,4 +12,5 @@ long_desc=" recompile them, when necessary." base_chroot=yes -subpackages="base docs locale" + +Add_dependency run glibc diff --git a/templates/mpfr-dev b/templates/mpfr-devel similarity index 100% rename from templates/mpfr-dev rename to templates/mpfr-devel diff --git a/templates/mpfr-libs b/templates/mpfr-libs deleted file mode 120000 index 88fad38417..0000000000 --- a/templates/mpfr-libs +++ /dev/null @@ -1 +0,0 @@ -mpfr \ No newline at end of file diff --git a/templates/mpfr/depends b/templates/mpfr/depends new file mode 100644 index 0000000000..810ac15e6c --- /dev/null +++ b/templates/mpfr/depends @@ -0,0 +1,2 @@ +abi_depends=2.4.0 +api_depends=${abi_depends} diff --git a/templates/mpfr/dev.template b/templates/mpfr/dev.template deleted file mode 100644 index 755d5d59f4..0000000000 --- a/templates/mpfr/dev.template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'mpfr-dev'. -# -short_desc="${short_desc} (development files)" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." -run_depends="mpfr-libs-${version}" - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - - mkdir -p ${destdir}/usr/lib - mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/include ${destdir}/usr - mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/lib/libmpfr.*a \ - ${destdir}/usr/lib -} diff --git a/templates/mpfr/devel.template b/templates/mpfr/devel.template new file mode 100644 index 0000000000..d0ce5a7862 --- /dev/null +++ b/templates/mpfr/devel.template @@ -0,0 +1,18 @@ +# Template file for 'mpfr-devel'. +# +short_desc="${short_desc} (development files)" +long_desc="${long_desc} + + This package contains files for development: headers, static libs, etc." + +Add_dependency run mpfr + +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/libmpfr.*a ${destdir}/usr/lib +} diff --git a/templates/mpfr/libs.depends b/templates/mpfr/libs.depends deleted file mode 100644 index 0730ae279b..0000000000 --- a/templates/mpfr/libs.depends +++ /dev/null @@ -1 +0,0 @@ -run_depends="${run_depends} mpfr-libs-4.2.4" diff --git a/templates/mpfr/libs.template b/templates/mpfr/libs.template deleted file mode 100644 index acf5610f7b..0000000000 --- a/templates/mpfr/libs.template +++ /dev/null @@ -1,19 +0,0 @@ -# Template file for 'mpfr-libs'. -# -short_desc="${short_desc} (libraries)" -long_desc="${long_desc} - - This package contains only the ${sourcepkg} shared libraries." - -. ${XBPS_TEMPLATESDIR}/glibc/libs.depends -. ${XBPS_TEMPLATESDIR}/gmp/libs.depends - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - - # Move the shared lib. - mkdir -p ${destdir}/usr/lib - mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/lib/libmpfr.so* \ - ${destdir}/usr/lib -} diff --git a/templates/mpfr/template b/templates/mpfr/template index 2c4c9d6576..32a90beab5 100644 --- a/templates/mpfr/template +++ b/templates/mpfr/template @@ -17,5 +17,6 @@ long_desc=" library." base_chroot=yes -build_depends="gmp-4.2.4" -subpackages="dev libs" +subpackages="devel" + +Add_dependency full gmp diff --git a/templates/ncurses-dev b/templates/ncurses-devel similarity index 100% rename from templates/ncurses-dev rename to templates/ncurses-devel diff --git a/templates/ncurses-docs b/templates/ncurses-term similarity index 100% rename from templates/ncurses-docs rename to templates/ncurses-term diff --git a/templates/ncurses/base-files b/templates/ncurses/base-files new file mode 100644 index 0000000000..431990cbd7 --- /dev/null +++ b/templates/ncurses/base-files @@ -0,0 +1,136 @@ +/usr/share/tabset +/usr/share/tabset/std +/usr/share/tabset/stdcrt +/usr/share/tabset/vt100 +/usr/share/tabset/vt300 +/usr/share/terminfo +/usr/share/terminfo/A +/usr/share/terminfo/A/Apple_Terminal +/usr/share/terminfo/E +/usr/share/terminfo/E/Eterm +/usr/share/terminfo/E/Eterm-256color +/usr/share/terminfo/E/Eterm-88color +/usr/share/terminfo/E/Eterm-color +/usr/share/terminfo/a +/usr/share/terminfo/a/ansi +/usr/share/terminfo/a/ansi80x25 +/usr/share/terminfo/a/ansis +/usr/share/terminfo/c +/usr/share/terminfo/c/cons25 +/usr/share/terminfo/c/cygwin +/usr/share/terminfo/d +/usr/share/terminfo/d/dumb +/usr/share/terminfo/g +/usr/share/terminfo/g/gnome +/usr/share/terminfo/g/gnome-2007 +/usr/share/terminfo/g/gnome-256color +/usr/share/terminfo/g/gnome-fc5 +/usr/share/terminfo/g/gnome-rh62 +/usr/share/terminfo/g/gnome-rh72 +/usr/share/terminfo/g/gnome-rh80 +/usr/share/terminfo/g/gnome-rh90 +/usr/share/terminfo/h +/usr/share/terminfo/h/hurd +/usr/share/terminfo/j +/usr/share/terminfo/j/jfbterm +/usr/share/terminfo/k +/usr/share/terminfo/k/kon +/usr/share/terminfo/k/kon2 +/usr/share/terminfo/l +/usr/share/terminfo/l/linux +/usr/share/terminfo/m +/usr/share/terminfo/m/mach +/usr/share/terminfo/m/mach-bold +/usr/share/terminfo/m/mach-color +/usr/share/terminfo/m/mlterm +/usr/share/terminfo/m/mrxvt +/usr/share/terminfo/n +/usr/share/terminfo/n/nsterm +/usr/share/terminfo/n/nxterm +/usr/share/terminfo/p +/usr/share/terminfo/p/pcansi +/usr/share/terminfo/p/putty +/usr/share/terminfo/p/putty-256color +/usr/share/terminfo/p/putty-vt100 +/usr/share/terminfo/r +/usr/share/terminfo/r/rxvt +/usr/share/terminfo/r/rxvt-16color +/usr/share/terminfo/r/rxvt-256color +/usr/share/terminfo/r/rxvt-88color +/usr/share/terminfo/r/rxvt-basic +/usr/share/terminfo/r/rxvt-color +/usr/share/terminfo/r/rxvt-cygwin +/usr/share/terminfo/r/rxvt-cygwin-native +/usr/share/terminfo/r/rxvt-unicode +/usr/share/terminfo/r/rxvt-xpm +/usr/share/terminfo/s +/usr/share/terminfo/s/screen +/usr/share/terminfo/s/screen-16color +/usr/share/terminfo/s/screen-16color-bce +/usr/share/terminfo/s/screen-16color-bce-s +/usr/share/terminfo/s/screen-16color-s +/usr/share/terminfo/s/screen-256color +/usr/share/terminfo/s/screen-256color-bce +/usr/share/terminfo/s/screen-256color-bce-s +/usr/share/terminfo/s/screen-256color-s +/usr/share/terminfo/s/screen-bce +/usr/share/terminfo/s/screen-s +/usr/share/terminfo/s/screen-w +/usr/share/terminfo/s/screen.linux +/usr/share/terminfo/s/screen.mlterm +/usr/share/terminfo/s/screen.rxvt +/usr/share/terminfo/s/screen.teraterm +/usr/share/terminfo/s/screen.xterm-new +/usr/share/terminfo/s/screen.xterm-r6 +/usr/share/terminfo/s/screen.xterm-xfree86 +/usr/share/terminfo/s/sun +/usr/share/terminfo/s/sun1 +/usr/share/terminfo/s/sun2 +/usr/share/terminfo/t +/usr/share/terminfo/t/teraterm +/usr/share/terminfo/v +/usr/share/terminfo/v/vs100 +/usr/share/terminfo/v/vt100 +/usr/share/terminfo/v/vt100-am +/usr/share/terminfo/v/vt100-nav +/usr/share/terminfo/v/vt102 +/usr/share/terminfo/v/vt200 +/usr/share/terminfo/v/vt220 +/usr/share/terminfo/v/vt52 +/usr/share/terminfo/w +/usr/share/terminfo/w/wsvt25 +/usr/share/terminfo/w/wsvt25m +/usr/share/terminfo/x +/usr/share/terminfo/x/xfce +/usr/share/terminfo/x/xterm +/usr/share/terminfo/x/xterm-1002 +/usr/share/terminfo/x/xterm-1003 +/usr/share/terminfo/x/xterm-16color +/usr/share/terminfo/x/xterm-24 +/usr/share/terminfo/x/xterm-256color +/usr/share/terminfo/x/xterm-88color +/usr/share/terminfo/x/xterm-8bit +/usr/share/terminfo/x/xterm-basic +/usr/share/terminfo/x/xterm-bold +/usr/share/terminfo/x/xterm-color +/usr/share/terminfo/x/xterm-hp +/usr/share/terminfo/x/xterm-new +/usr/share/terminfo/x/xterm-nic +/usr/share/terminfo/x/xterm-noapp +/usr/share/terminfo/x/xterm-old +/usr/share/terminfo/x/xterm-pcolor +/usr/share/terminfo/x/xterm-r5 +/usr/share/terminfo/x/xterm-r6 +/usr/share/terminfo/x/xterm-sco +/usr/share/terminfo/x/xterm-sun +/usr/share/terminfo/x/xterm-vt220 +/usr/share/terminfo/x/xterm-vt52 +/usr/share/terminfo/x/xterm-xf86-v32 +/usr/share/terminfo/x/xterm-xf86-v33 +/usr/share/terminfo/x/xterm-xf86-v333 +/usr/share/terminfo/x/xterm-xf86-v40 +/usr/share/terminfo/x/xterm-xf86-v43 +/usr/share/terminfo/x/xterm-xf86-v44 +/usr/share/terminfo/x/xterm-xfree86 +/usr/share/terminfo/x/xterm-xi +/usr/share/terminfo/x/xterms diff --git a/templates/ncurses/base.template b/templates/ncurses/base.template index c8d0114be6..fdfb97fd24 100644 --- a/templates/ncurses/base.template +++ b/templates/ncurses/base.template @@ -3,17 +3,28 @@ short_desc="${short_desc} (base files)" long_desc="${long_desc} - This package contains the ${sourcepkg} base files." - -. ${XBPS_TEMPLATESDIR}/ncurses/libs.depends + This package contains the base files." do_install() { local destdir=${XBPS_DESTDIR}/${pkgname}-${version} local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - mkdir -p ${destdir}/usr/share - mv ${origdir}/usr/bin ${destdir}/usr - mv ${origdir}/usr/share/terminfo ${destdir}/usr/share - mv ${origdir}/usr/share/tabset ${destdir}/usr/share + cat $XBPS_TEMPLATESDIR/ncurses/base-files | while read line; do + if [ -f ${origdir}/${line} ]; then + install -D ${origdir}/${line} ${destdir}/${line} + rm -f ${origdir}/${line} + fi + done + + mkdir -p ${destdir}/lib/terminfo/a + mkdir -p ${destdir}/lib/terminfo/l + mkdir -p ${destdir}/lib/terminfo/v + + cp ${destdir}/usr/share/terminfo/a/ansi ${destdir}/lib/terminfo/a + cp ${destdir}/usr/share/terminfo/l/linux ${destdir}/lib/terminfo/l + for f in vt100 vt100-am vt100-nav vt102 vt200 vt220 vt52; do + cp ${destdir}/usr/share/terminfo/v/${f} \ + ${destdir}/lib/terminfo/v + done } diff --git a/templates/ncurses/depends b/templates/ncurses/depends new file mode 100644 index 0000000000..745af2f3dd --- /dev/null +++ b/templates/ncurses/depends @@ -0,0 +1,2 @@ +abi_depends=5.6 +api_depends=${abi_depends} diff --git a/templates/ncurses/devel.template b/templates/ncurses/devel.template new file mode 100644 index 0000000000..87be93a358 --- /dev/null +++ b/templates/ncurses/devel.template @@ -0,0 +1,24 @@ +# Template file for 'ncurses-devel'. +# +short_desc="${short_desc} (development files)" +long_desc="${long_desc} + + This package contains files for development: headers, static libs, etc." + +Add_dependency run ncurses + +do_install() +{ + local destdir=${XBPS_DESTDIR}/${pkgname}-${version} + local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} + + mkdir -p ${destdir}/usr/lib + mkdir -p ${destdir}/usr/bin + mkdir -p ${destdir}/usr/share/man + + mv ${origdir}/usr/include ${destdir}/usr + mv ${origdir}/usr/lib/lib*.*a ${destdir}/usr/lib + mv ${origdir}/usr/lib/lib*.so ${destdir}/usr/lib + mv ${origdir}/usr/share/man/man3 ${destdir}/usr/share/man + mv ${origdir}/usr/bin/ncurses5* ${destdir}/usr/bin +} diff --git a/templates/ncurses/docs.template b/templates/ncurses/docs.template deleted file mode 100644 index 6e87a5123d..0000000000 --- a/templates/ncurses/docs.template +++ /dev/null @@ -1,18 +0,0 @@ -# Template file for 'ncurses-docs'. -# -short_desc="${short_desc} (documentation)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} documentation: manual pages - and info files." -run_depends= -noarch=yes - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr/share - mv ${origdir}/usr/share/man ${destdir}/usr/share -} diff --git a/templates/ncurses/libs.depends b/templates/ncurses/libs.depends deleted file mode 100644 index e12449ef6e..0000000000 --- a/templates/ncurses/libs.depends +++ /dev/null @@ -1 +0,0 @@ -run_depends="${run_depends} ncurses-libs-5.6" diff --git a/templates/ncurses/libs.template b/templates/ncurses/libs.template index 1232f156bf..64b05e2815 100644 --- a/templates/ncurses/libs.template +++ b/templates/ncurses/libs.template @@ -1,11 +1,12 @@ # Template file for 'ncurses-libs'. # -short_desc="${short_desc} (libraries)" +short_desc="${short_desc} (shared libraries)" long_desc="${long_desc} - This package contains only the ${sourcepkg} shared libraries." + This package contains the shared libraries." -. ${XBPS_TEMPLATESDIR}/glibc/libs.depends +Add_dependency run glibc +Add_dependency run ncurses-base do_install() { @@ -14,9 +15,8 @@ do_install() mkdir -p ${destdir}/lib mkdir -p ${destdir}/usr/lib - mv ${origdir}/usr/lib/libncurses*.so* ${destdir}/lib - cd ${destdir}/lib && \ - ln -s libncurses.so.${version} libtinfo.so.${version} - mv ${origdir}/usr/lib/lib*.so* ${destdir}/usr/lib + mv ${origdir}/usr/lib/libcurses.so* ${destdir}/lib + mv ${origdir}/usr/lib/libncurses.so* ${destdir}/lib + mv ${origdir}/usr/lib/lib*.so.* ${destdir}/usr/lib } diff --git a/templates/ncurses/template b/templates/ncurses/template index 131e7caa67..00893f20ca 100644 --- a/templates/ncurses/template +++ b/templates/ncurses/template @@ -19,4 +19,7 @@ long_desc=" Full manual pages are provided for the library and tools." base_chroot=yes -subpackages="base dev docs libs" +subpackages="base devel libs term" + +Add_dependency run glibc +Add_dependency run ncurses-libs diff --git a/templates/ncurses/term.template b/templates/ncurses/term.template new file mode 100644 index 0000000000..bde89fb087 --- /dev/null +++ b/templates/ncurses/term.template @@ -0,0 +1,19 @@ +# Template file for 'ncurses-term'. +# +short_desc="${short_desc} (terminal descriptions)" +long_desc="${long_desc} + + This package contains all available terminal descriptions." + +Add_dependency run ncurses-base + +do_install() +{ + local destdir=${XBPS_DESTDIR}/${pkgname}-${version} + local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} + + mkdir -p ${destdir}/usr/share + + mv ${origdir}/usr/share/tabset ${destdir}/usr/share + mv ${origdir}/usr/share/terminfo ${destdir}/usr/share +} diff --git a/templates/patch/template b/templates/patch/template index 6fcf7cf2d6..5441e00fc5 100644 --- a/templates/patch/template +++ b/templates/patch/template @@ -15,4 +15,4 @@ long_desc=" base_chroot=yes -. ${XBPS_TEMPLATESDIR}/glibc/libs.depends +Add_dependency run glibc diff --git a/templates/proplib-dev b/templates/proplib-devel similarity index 100% rename from templates/proplib-dev rename to templates/proplib-devel diff --git a/templates/proplib-docs b/templates/proplib-docs deleted file mode 120000 index 3941a52d05..0000000000 --- a/templates/proplib-docs +++ /dev/null @@ -1 +0,0 @@ -proplib \ No newline at end of file diff --git a/templates/proplib-libs b/templates/proplib-libs deleted file mode 120000 index 3941a52d05..0000000000 --- a/templates/proplib-libs +++ /dev/null @@ -1 +0,0 @@ -proplib \ No newline at end of file diff --git a/templates/proplib/depends b/templates/proplib/depends new file mode 100644 index 0000000000..7bbc10b5ba --- /dev/null +++ b/templates/proplib/depends @@ -0,0 +1,2 @@ +abi_depends=0.1 +api_depends=${abi_depends} diff --git a/templates/proplib/dev.template b/templates/proplib/dev.template deleted file mode 100644 index ba7993ccd3..0000000000 --- a/templates/proplib/dev.template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'proplib-dev'. -# -short_desc="${short_desc} (development files)" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." -run_depends="proplib-libs-${version}" - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - - mkdir -p ${destdir}/usr/lib - mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/include ${destdir}/usr - mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/lib/libprop.*a \ - ${destdir}/usr/lib -} diff --git a/templates/glibc/dev.template b/templates/proplib/devel.template similarity index 74% rename from templates/glibc/dev.template rename to templates/proplib/devel.template index c75aa15c41..4683ef4e6c 100644 --- a/templates/glibc/dev.template +++ b/templates/proplib/devel.template @@ -1,11 +1,11 @@ -# Template file for 'glibc-dev'. +# Template file for 'proplib-devel'. # short_desc="${short_desc} (development files)" long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -. ${XBPS_TEMPLATESDIR}/glibc/libs.depends +Add_dependency run proplib do_install() { @@ -14,5 +14,5 @@ do_install() mkdir -p ${destdir}/usr/lib mv ${origdir}/usr/include ${destdir}/usr - mv ${origdir}/usr/lib/*.a ${destdir}/usr/lib + mv ${origdir}/usr/lib/libprop.*a ${destdir}/usr/lib } diff --git a/templates/proplib/docs.template b/templates/proplib/docs.template deleted file mode 100644 index d1e685ad22..0000000000 --- a/templates/proplib/docs.template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'proplib-docs'. -# -short_desc="${short_desc} (documentation)" -long_desc="${long_desc} - - This package contains the manual pages." -run_depends= -noarch=yes - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - - # Move manpages. - mkdir -p ${destdir}/usr - mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/share ${destdir}/usr -} diff --git a/templates/proplib/libs.depends b/templates/proplib/libs.depends deleted file mode 100644 index 89417a919a..0000000000 --- a/templates/proplib/libs.depends +++ /dev/null @@ -1 +0,0 @@ -run_depends="${run_depends} proplib-libs-0.1" diff --git a/templates/proplib/libs.template b/templates/proplib/libs.template deleted file mode 100644 index 5a2bc11504..0000000000 --- a/templates/proplib/libs.template +++ /dev/null @@ -1,18 +0,0 @@ -# Template file for 'proplib-libs'. -# -short_desc="${short_desc} (libraries)" -long_desc="${long_desc} - - This package contains only the ${sourcepkg} shared libraries." - -. ${XBPS_TEMPLATESDIR}/glibc/libs.depends - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - - # Move the shared lib. - mkdir -p ${destdir}/usr/lib - mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/lib/libprop.so* \ - ${destdir}/usr/lib -} diff --git a/templates/proplib/template b/templates/proplib/template index ffc5901bf9..dd238cc615 100644 --- a/templates/proplib/template +++ b/templates/proplib/template @@ -24,4 +24,6 @@ long_desc=" been converted to be built through the GNU autotools." base_chroot=yes -subpackages="dev docs libs" +subpackages="devel" + +Add_dependency run glibc diff --git a/templates/sed-base b/templates/sed-base deleted file mode 120000 index fb996d6d59..0000000000 --- a/templates/sed-base +++ /dev/null @@ -1 +0,0 @@ -sed \ No newline at end of file diff --git a/templates/sed-docs b/templates/sed-docs deleted file mode 120000 index fb996d6d59..0000000000 --- a/templates/sed-docs +++ /dev/null @@ -1 +0,0 @@ -sed \ No newline at end of file diff --git a/templates/sed-locale b/templates/sed-locale deleted file mode 120000 index fb996d6d59..0000000000 --- a/templates/sed-locale +++ /dev/null @@ -1 +0,0 @@ -sed \ No newline at end of file diff --git a/templates/sed/base.template b/templates/sed/base.template deleted file mode 100644 index b48109da69..0000000000 --- a/templates/sed/base.template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'sed-base'. -# -short_desc="${short_desc} (base files)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} base files." - -. ${XBPS_TEMPLATESDIR}/glibc/libs.depends - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir} - mv ${origdir}/bin ${destdir} -} diff --git a/templates/sed/docs.template b/templates/sed/docs.template deleted file mode 100644 index deb89c7493..0000000000 --- a/templates/sed/docs.template +++ /dev/null @@ -1,19 +0,0 @@ -# Template file for 'sed-docs'. -# -short_desc="${short_desc} (documentation)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} documentation: manual pages - and info files." -run_depends= -noarch=yes - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr/share - mv ${origdir}/usr/share/info ${destdir}/usr/share - mv ${origdir}/usr/share/man ${destdir}/usr/share -} diff --git a/templates/sed/locale.template b/templates/sed/locale.template deleted file mode 100644 index 22a72d514c..0000000000 --- a/templates/sed/locale.template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'sed-locale'. -# -short_desc="${short_desc} (locales)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} locale files, for non US users." -run_depends= -noarch=yes - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr/share - mv ${origdir}/usr/share/locale ${destdir}/usr/share -} diff --git a/templates/sed/template b/templates/sed/template index c42b9083c4..3c9d30981e 100644 --- a/templates/sed/template +++ b/templates/sed/template @@ -1,6 +1,5 @@ # Template file for 'sed' pkgname=sed -sourcepkg=sed version=4.1.5 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" build_style=gnu_configure @@ -13,4 +12,5 @@ long_desc=" to the standard output, edited according to a script of commands." base_chroot=yes -subpackages="base docs locale" + +Add_dependency run glibc diff --git a/templates/tar-base b/templates/tar-base deleted file mode 120000 index e1d18b02ad..0000000000 --- a/templates/tar-base +++ /dev/null @@ -1 +0,0 @@ -tar \ No newline at end of file diff --git a/templates/tar-docs b/templates/tar-docs deleted file mode 120000 index e1d18b02ad..0000000000 --- a/templates/tar-docs +++ /dev/null @@ -1 +0,0 @@ -tar \ No newline at end of file diff --git a/templates/tar-locale b/templates/tar-locale deleted file mode 120000 index e1d18b02ad..0000000000 --- a/templates/tar-locale +++ /dev/null @@ -1 +0,0 @@ -tar \ No newline at end of file diff --git a/templates/tar/base.template b/templates/tar/base.template deleted file mode 100644 index f6755e30c1..0000000000 --- a/templates/tar/base.template +++ /dev/null @@ -1,19 +0,0 @@ -# Template file for 'tar-base'. -# -short_desc="${short_desc} (base files)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} base files." - -run_depends="bzip2-base-0 gzip-base-0" -. ${XBPS_TEMPLATESDIR}/glibc/libs.depends - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr - mv ${origdir}/usr/bin ${destdir}/usr - mv ${origdir}/usr/libexec ${destdir}/usr -} diff --git a/templates/tar/docs.template b/templates/tar/docs.template deleted file mode 100644 index 93c4aea987..0000000000 --- a/templates/tar/docs.template +++ /dev/null @@ -1,18 +0,0 @@ -# Template file for 'tar-docs'. -# -short_desc="${short_desc} (documentation)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} documentation: manual pages - and info files." -run_depends= -noarch=yes - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr/share - mv ${origdir}/usr/share/info ${destdir}/usr/share -} diff --git a/templates/tar/locale.template b/templates/tar/locale.template deleted file mode 100644 index cc2f811087..0000000000 --- a/templates/tar/locale.template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'tar-locale'. -# -short_desc="${short_desc} (locales)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} locale files, for non US users." -run_depends= -noarch=yes - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr/share - mv ${origdir}/usr/share/locale ${destdir}/usr/share -} diff --git a/templates/tar/template b/templates/tar/template index 7626b8cbc5..3bcd835069 100644 --- a/templates/tar/template +++ b/templates/tar/template @@ -15,4 +15,4 @@ long_desc=" does not create "correct" ustar archives." base_chroot=yes -subpackages="base docs locale" +build_depends="gzip-1.3.12 bzip2-1.0.5" diff --git a/templates/texinfo-base b/templates/texinfo-base deleted file mode 120000 index f00c57ddbf..0000000000 --- a/templates/texinfo-base +++ /dev/null @@ -1 +0,0 @@ -texinfo \ No newline at end of file diff --git a/templates/texinfo-docs b/templates/texinfo-docs deleted file mode 120000 index f00c57ddbf..0000000000 --- a/templates/texinfo-docs +++ /dev/null @@ -1 +0,0 @@ -texinfo \ No newline at end of file diff --git a/templates/texinfo-locale b/templates/texinfo-locale deleted file mode 120000 index f00c57ddbf..0000000000 --- a/templates/texinfo-locale +++ /dev/null @@ -1 +0,0 @@ -texinfo \ No newline at end of file diff --git a/templates/texinfo/base.template b/templates/texinfo/base.template deleted file mode 100644 index 9b630c8cac..0000000000 --- a/templates/texinfo/base.template +++ /dev/null @@ -1,18 +0,0 @@ -# Template file for 'texinfo-base'. -# -short_desc="${short_desc} (base files)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} base files." - -. ${XBPS_TEMPLATESDIR}/glibc/libs.depends - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr/share - mv ${origdir}/usr/bin ${destdir}/usr - mv ${origdir}/usr/share/texinfo ${destdir}/usr/share -} diff --git a/templates/texinfo/docs.template b/templates/texinfo/docs.template deleted file mode 100644 index 54a923480c..0000000000 --- a/templates/texinfo/docs.template +++ /dev/null @@ -1,20 +0,0 @@ -# Template file for 'texinfo-docs'. -# -short_desc="${short_desc} (documentation)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} documentation: manual pages - and info files." -run_depends= -noarch=yes - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - # Move manpages and info files. - mkdir -p ${destdir}/usr/share - mv ${origdir}/usr/share/man ${destdir}/usr/share - mv ${origdir}/usr/share/info ${destdir}/usr/share -} diff --git a/templates/texinfo/locale.template b/templates/texinfo/locale.template deleted file mode 100644 index 84a7de596e..0000000000 --- a/templates/texinfo/locale.template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'texinfo-locale'. -# -short_desc="${short_desc} (locales)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} locale files, for non US users." -run_depends= -noarch=yes - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr/share - mv ${origdir}/usr/share/locale ${destdir}/usr/share -} diff --git a/templates/texinfo/template b/templates/texinfo/template index 1d7cbc0d86..6485819b8c 100644 --- a/templates/texinfo/template +++ b/templates/texinfo/template @@ -1,6 +1,5 @@ # Template file for 'texinfo' pkgname=texinfo -sourcepkg=texinfo version=4.13a wrksrc="$pkgname-4.13" distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" @@ -15,4 +14,5 @@ long_desc=" used by many non-GNU projects as well." base_chroot=yes -subpackages="base docs locale" + +Add_dependency run glibc diff --git a/templates/wget-base b/templates/wget-base deleted file mode 120000 index 79949cdec4..0000000000 --- a/templates/wget-base +++ /dev/null @@ -1 +0,0 @@ -wget \ No newline at end of file diff --git a/templates/wget-docs b/templates/wget-docs deleted file mode 120000 index 79949cdec4..0000000000 --- a/templates/wget-docs +++ /dev/null @@ -1 +0,0 @@ -wget \ No newline at end of file diff --git a/templates/wget-locale b/templates/wget-locale deleted file mode 120000 index 79949cdec4..0000000000 --- a/templates/wget-locale +++ /dev/null @@ -1 +0,0 @@ -wget \ No newline at end of file diff --git a/templates/wget/base.template b/templates/wget/base.template deleted file mode 100644 index e0e2083197..0000000000 --- a/templates/wget/base.template +++ /dev/null @@ -1,20 +0,0 @@ -# Template file for 'wget-base'. -# -short_desc="${short_desc} (base files)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} base files." - -conf_files="/etc/wgetrc" -. ${XBPS_TEMPLATESDIR}/glibc/libs.depends -# TODO: add openssl dependency - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr - mv ${origdir}/usr/bin ${destdir}/usr - mv ${origdir}/etc ${destdir} -} diff --git a/templates/wget/docs.template b/templates/wget/docs.template deleted file mode 100644 index 308fef7b85..0000000000 --- a/templates/wget/docs.template +++ /dev/null @@ -1,19 +0,0 @@ -# Template file for 'wget-docs'. -# -short_desc="${short_desc} (documentation)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} documentation: manual pages - and info files." -run_depends= -noarch=yes - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr/share - mv ${origdir}/usr/share/info ${destdir}/usr/share - mv ${origdir}/usr/share/man ${destdir}/usr/share -} diff --git a/templates/wget/locale.template b/templates/wget/locale.template deleted file mode 100644 index 7672c7799a..0000000000 --- a/templates/wget/locale.template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'wget-locale'. -# -short_desc="${short_desc} (locales)" -long_desc="${long_desc} - - This package contains the ${sourcepkg} locale files, for non US users." -run_depends= -noarch=yes - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr/share - mv ${origdir}/usr/share/locale ${destdir}/usr/share -} diff --git a/templates/wget/template b/templates/wget/template index 3ca971ec2a..63d03279a2 100644 --- a/templates/wget/template +++ b/templates/wget/template @@ -1,6 +1,5 @@ # Template file for 'wget' pkgname=wget -sourcepkg=wget version=1.11.4 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" build_style=gnu_configure @@ -31,4 +30,5 @@ long_desc=" * GNU Wget is distributed under the GNU General Public License." base_chroot=yes -subpackages="base docs locale" + +Add_dependency run glibc diff --git a/templates/xbps-base-chroot/template b/templates/xbps-base-chroot/template index 7254cb2303..d287860741 100644 --- a/templates/xbps-base-chroot/template +++ b/templates/xbps-base-chroot/template @@ -10,14 +10,30 @@ long_desc=" noarch=yes base_chroot=yes -shared_deps="kernel-libc-headers-0 dash-0 patch-0" -build_depends="xbps-base-dirs-0 glibc-0 gawk-0 bash-0 coreutils-0 - texinfo-0 libarchive-0 tar-0 grep-0 findutils-0 sed-0 make-0 - diffutils-0 gcc-0 file-0 wget-0 ncurses-0 proplib-0 ${shared_deps}" - -run_depends="glibc-base-0 glibc-dev-0 gcc-dev-0 ncurses-dev-0 - proplib-dev-0 gawk-base-0 bash-base-0 wget-base-0 tar-base-0 - coreutils-base-0 texinfo-base-0 libarchive-dev-0 grep-base-0 - findutils-base-0 sed-base-0 make-base-0 diffutils-base-0 - file-base-0 ${shared_deps}" +Add_dependency full xbps-base-dirs +Add_dependency full gcc +Add_dependency full glibc +Add_dependency full kernel-libc-headers +Add_dependency full dash +Add_dependency full patch +Add_dependency full gawk +Add_dependency full ncurses +Add_dependency full bash +Add_dependency full coreutils +Add_dependency full texinfo +Add_dependency full libarchive +Add_dependency full tar +Add_dependency full grep +Add_dependency full findutils +Add_dependency full sed +Add_dependency full make +Add_dependency full diffutils +Add_dependency full file +Add_dependency full proplib +Add_dependency run zlib-devel +Add_dependency run bzip2-devel +Add_dependency run lzma-utils-devel +Add_dependency run proplib-devel +Add_dependency run libarchive-devel +Add_dependency run ncurses-devel diff --git a/templates/zlib-dev b/templates/zlib-devel similarity index 100% rename from templates/zlib-dev rename to templates/zlib-devel diff --git a/templates/zlib-libs b/templates/zlib-libs deleted file mode 120000 index 8ccba3a29b..0000000000 --- a/templates/zlib-libs +++ /dev/null @@ -1 +0,0 @@ -zlib \ No newline at end of file diff --git a/templates/zlib/depends b/templates/zlib/depends new file mode 100644 index 0000000000..eef117f054 --- /dev/null +++ b/templates/zlib/depends @@ -0,0 +1,2 @@ +abi_depends=1.2.3 +api_depends=${abi_depends} diff --git a/templates/zlib/dev.template b/templates/zlib/devel.template similarity index 78% rename from templates/zlib/dev.template rename to templates/zlib/devel.template index 15da33aa95..6fe55a5619 100644 --- a/templates/zlib/dev.template +++ b/templates/zlib/devel.template @@ -1,10 +1,11 @@ -# Template file for 'zlib-dev'. +# Template file for 'zlib-devel'. # short_desc="${short_desc} (development files)" long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -run_depends="bzip2-libs-${version}" + +Add_dependency run zlib do_install() { @@ -14,5 +15,4 @@ do_install() mkdir -p ${destdir}/usr/lib mv ${origdir}/usr/include ${destdir}/usr mv ${origdir}/usr/lib/libz.*a ${destdir}/usr/lib - mv ${origdir}/usr/share ${destdir}/usr } diff --git a/templates/zlib/libs.depends b/templates/zlib/libs.depends deleted file mode 100644 index 866da26faa..0000000000 --- a/templates/zlib/libs.depends +++ /dev/null @@ -1 +0,0 @@ -run_depends="${run_depends} zlib-libs-1.2.3" diff --git a/templates/zlib/libs.template b/templates/zlib/libs.template deleted file mode 100644 index d193df263c..0000000000 --- a/templates/zlib/libs.template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'zlib-libs'. -# -short_desc="${short_desc} (libraries)" -long_desc="${long_desc} - - This package contains only the ${sourcepkg} shared libraries." - -. ${XBPS_TEMPLATESDIR}/glibc/libs.depends - -do_install() -{ - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr/lib - mv ${origdir}/usr/lib/libz.so* ${destdir}/usr/lib -} diff --git a/templates/zlib/template b/templates/zlib/template index 7d7ad6d410..7984d2af2c 100644 --- a/templates/zlib/template +++ b/templates/zlib/template @@ -15,4 +15,6 @@ long_desc=" by RFCs (Request for Comments) 1950 to 1952." base_chroot=yes -subpackages="dev libs" +subpackages="devel" + +Add_dependency run glibc