From 84222395b87e96592f1646c5a1f7d8aa476d3d7e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 11 Mar 2009 06:31:56 +0100 Subject: [PATCH] Provide some vars for use in template's targets. These new vars are DESTDIR (by default XBPS_DESTDIR/pkgname-version), SRCPKGDESTDIR (XBPS_DESTDIR/sourcepkg-version) and FILESDIR (XBPS_TEMPLATESDIR/pkgname/files). This simplifies packages that used them. --HG-- extra : convert_revision : 287ea7128cb5df19870ca7aff0a3b8f99a11d63a --- shutils/binpkg.sh | 26 ++++----- shutils/builddep_funcs.sh | 56 ++++++++------------ shutils/configure_funcs.sh | 5 +- shutils/install_funcs.sh | 7 ++- shutils/stow_funcs.sh | 16 ++---- shutils/tmpl_funcs.sh | 21 ++++++-- templates/binutils/devel.template | 17 +++--- templates/bzip2/devel.template | 11 ++-- templates/cmake/template | 11 ++-- templates/coreutils/template | 6 +-- templates/cracklib-words/template | 7 ++- templates/cracklib/template | 12 ++--- templates/curl/devel.template | 27 +++++----- templates/curl/libs.template | 7 +-- templates/dbus/devel.template | 15 +++--- templates/dbus/libs.template | 7 +-- templates/e2fsprogs/devel.template | 30 +++++------ templates/e2fsprogs/libs.template | 7 +-- templates/e2fsprogs/template | 6 +-- templates/expat/devel.template | 11 ++-- templates/file/devel.template | 9 ++-- templates/findutils/template | 4 +- templates/gcc-multilib/template | 26 ++++----- templates/gcc/c++.template | 19 ++++--- templates/gcc/libgcc.template | 7 +-- templates/gcc/libgomp.template | 11 ++-- templates/gcc/libmudflap-devel.template | 9 ++-- templates/gcc/libmudflap.template | 7 +-- templates/gcc/libobjc-devel.template | 9 ++-- templates/gcc/libobjc.template | 7 +-- templates/gcc/libstdc++-devel.template | 15 +++--- templates/gcc/libstdc++.template | 19 +++---- templates/gcc/objc++.template | 8 ++- templates/gcc/objc.template | 14 +++-- templates/gcc/template | 4 +- templates/gdbm/devel.template | 9 ++-- templates/gettext/devel.template | 19 +++---- templates/gettext/libs.template | 7 +-- templates/glib/devel.template | 27 +++++----- templates/glibc/devel.template | 13 ++--- templates/glibc/locales.template | 9 ++-- templates/glibc/template | 14 +++-- templates/glibc32/template | 29 +++++----- templates/gmp/devel.template | 9 ++-- templates/initng/template | 8 ++- templates/initramfs-tools/template | 61 +++++++++++----------- templates/initscripts/template | 14 +++-- templates/irssi/devel.template | 15 +++--- templates/kernel-headers/template | 4 +- templates/kernel/template | 15 ++++-- templates/klibc-module-init-tools/template | 6 +-- templates/klibc-udev/template | 24 ++++----- templates/klibc/devel.template | 17 +++--- templates/klibc/utils.template | 17 +++--- templates/libarchive/devel.template | 9 ++-- templates/libidn/devel.template | 17 +++--- templates/lzma-utils/devel.template | 9 ++-- templates/lzma-utils/libs.template | 7 +-- templates/minilogd/template | 6 +-- templates/mpfr/devel.template | 9 ++-- templates/ncurses/base.template | 23 ++++---- templates/ncurses/devel.template | 19 +++---- templates/ncurses/libs.template | 13 ++--- templates/ncurses/term.template | 9 ++-- templates/net-tools/template | 6 +-- templates/ntp/perl.template | 7 +-- templates/ntp/template | 18 +++---- templates/openssh/client.template | 25 ++++----- templates/openssh/server.template | 33 ++++++------ templates/openssh/template | 16 +++--- templates/openssl/devel.template | 19 +++---- templates/openssl/template | 6 +-- templates/pam/devel.template | 17 +++--- templates/pcre/devel.template | 21 ++++---- templates/perl/template | 11 ++-- templates/proplib/devel.template | 9 ++-- templates/rcorder/template | 10 ++-- templates/readline/template | 6 +-- templates/shadow/template | 4 +- templates/sudo/template | 7 ++- templates/sysklogd/template | 9 ++-- templates/sysvinit/template | 14 +++-- templates/tcp_wrappers/devel.template | 15 +++--- templates/tcp_wrappers/libs.template | 13 ++--- templates/tcp_wrappers/template | 14 +++-- templates/udev/template | 22 ++++---- templates/util-linux-ng/template | 8 ++- templates/xbps-base-dirs/template | 32 ++++++------ templates/xbps-base-pkg/template | 8 ++- templates/zlib/devel.template | 9 ++-- 90 files changed, 535 insertions(+), 735 deletions(-) diff --git a/shutils/binpkg.sh b/shutils/binpkg.sh index fae005e321b..6cc7a592eca 100644 --- a/shutils/binpkg.sh +++ b/shutils/binpkg.sh @@ -59,6 +59,7 @@ xbps_write_metadata_pkg() unset run_depends conf_files keep_dirs noarch install_priority . $XBPS_TEMPLATESDIR/${sourcepkg}/${subpkg}.template pkgname=${sourcepkg}-${subpkg} + set_tmpl_common_vars xbps_write_metadata_pkg_real run_template ${sourcepkg} [ "${pkg}" = "${sourcepkg}-${subpkg}" ] && break @@ -71,6 +72,7 @@ xbps_write_metadata_pkg() run_depends="$run_depends ${sourcepkg}-${subpkg}-${version}" done fi + set_tmpl_common_vars xbps_write_metadata_pkg_real } @@ -80,12 +82,11 @@ xbps_write_metadata_pkg() # xbps_write_metadata_pkg_real() { - local destdir=$XBPS_DESTDIR/$pkgname-$version - local metadir=$destdir/var/db/xbps/metadata/$pkgname + local metadir=${DESTDIR}/var/db/xbps/metadata/$pkgname local f i j arch prioinst TMPFLIST TMPFPLIST - local fpattern="s|$destdir||g;s|^\./$||g;/^$/d" + local fpattern="s|${DESTDIR}||g;s|^\./$||g;/^$/d" - if [ ! -d "$destdir" ]; then + if [ ! -d "${DESTDIR}" ]; then echo "ERROR: $pkgname not installed into destdir." exit 1 fi @@ -111,7 +112,7 @@ xbps_write_metadata_pkg_real() write_metadata_flist_header $TMPFPLIST # Pass 1: add links. - for f in $(find $destdir -type l); do + for f in $(find ${DESTDIR} -type l); do j=$(echo $f|sed -e "$fpattern") [ "$j" = "" ] && continue printf "$j\n" >> $TMPFLIST @@ -124,7 +125,7 @@ xbps_write_metadata_pkg_real() done # Pass 2: add regular files. - for f in $(find $destdir -type f); do + for f in $(find ${DESTDIR} -type f); do j=$(echo $f|sed -e "$fpattern") [ "$j" = "" ] && continue printf "$j\n" >> $TMPFLIST @@ -146,7 +147,7 @@ xbps_write_metadata_pkg_real() done # Pass 3: add directories. - for f in $(find $destdir -type d|sort -ur); do + for f in $(find ${DESTDIR} -type d|sort -ur); do j=$(echo $f|sed -e "$fpattern") [ "$j" = "" ] && continue printf "$j\n" >> $TMPFLIST @@ -184,7 +185,7 @@ xbps_write_metadata_pkg_real() priority $prioinst installed_size -$(du -sb $destdir|awk '{print $1}') +$(du -sb ${DESTDIR}|awk '{print $1}') maintainer $(echo $maintainer|sed -e 's|<|[|g;s|>|]|g') short_desc @@ -243,8 +244,8 @@ _EOF rm -f $TMPFLIST $TMPFPLIST $TMPFPROPS if [ -f "$XBPS_TEMPLATESDIR/$pkgname/INSTALL" ]; then - cp -f $XBPS_TEMPLATESDIR/$pkgname/INSTALL $destdir - chmod +x $destdir/INSTALL + cp -f $XBPS_TEMPLATESDIR/$pkgname/INSTALL ${DESTDIR} + chmod +x ${DESTDIR}/INSTALL fi if [ -f "$XBPS_TEMPLATESDIR/$pkgname/REMOVE" ]; then cp -f $XBPS_TEMPLATESDIR/$pkgname/REMOVE $metadir @@ -261,12 +262,14 @@ xbps_make_binpkg() if [ "$pkg" = "$pkgname-$subpkg" ]; then . $XBPS_TEMPLATESDIR/$pkgname/$subpkg.template pkgname=${sourcepkg}-${subpkg} + set_tmpl_common_vars xbps_make_binpkg_real return $? fi run_template ${sourcepkg} done + set_tmpl_common_vars xbps_make_binpkg_real return $? } @@ -277,13 +280,12 @@ xbps_make_binpkg() # xbps_make_binpkg_real() { - local destdir=$XBPS_DESTDIR/$pkgname-$version local binpkg= local pkgdir= local arch= local use_sudo= - cd $destdir || exit 1 + cd ${DESTDIR} || exit 1 if [ -n "$noarch" ]; then arch=noarch diff --git a/shutils/builddep_funcs.sh b/shutils/builddep_funcs.sh index 9ae446440ca..797e4937f11 100644 --- a/shutils/builddep_funcs.sh +++ b/shutils/builddep_funcs.sh @@ -32,20 +32,21 @@ install_pkg_deps() { local curpkg="$1" - local saved_prevpkg=$(xbps-pkgdb getpkgname ${2}) - local curpkgname j jver jname reqver + local curpkgname=$(xbps-pkgdb getpkgname $1) + local saved_prevpkg=$(xbps-pkgdb getpkgname $2) + local j jver jname reqver [ -z "$curpkg" ] && return 1 - [ -n "$prev_pkg" ] && curpkg=$prev_pkg - curpkgname=$(xbps-pkgdb getpkgname ${curpkg}) + + if [ -n "$prev_pkg" ]; then + curpkg=$prev_pkg + curpkgname=$(xbps-pkgdb getpkgname ${curpkg}) + fi + + echo "==> Installing $saved_prevpkg dependency: $curpkgname." run_template $curpkgname - check_installed_pkg $curpkg - [ $? -eq 0 ] && continue - - echo "==> Installing $saved_prevpkg dependency: $curpkg" - - check_build_depends_pkg $curpkg + check_build_depends_pkg if [ $? -eq 0 ]; then echo "==> Dependency $curpkgname requires:" for j in ${build_depends}; do @@ -78,6 +79,7 @@ install_pkg_deps() done install_pkg $curpkgname auto + [ -n "$prev_pkg" ] && unset prev_pkg } # @@ -87,11 +89,7 @@ install_dependencies_pkg() { local pkg="$1" local lpkgname=$(xbps-pkgdb getpkgname ${pkg}) - local i= - local ipkgname= - local iversion= - local reqvers= - local notinstalled_deps= + local i ipkgname iversion reqvers notinstalled_deps [ -z "$pkg" ] && return 1 @@ -112,19 +110,17 @@ install_dependencies_pkg() fi done - if [ -z "$notinstalled_deps" ]; then - return 0 - fi + [ -z "$notinstalled_deps" ] && return 0 for i in ${notinstalled_deps}; do - ipkgname=$(xbps-pkgdb getpkgname ${i}) - run_template $ipkgname check_installed_pkg $i [ $? -eq 0 ] && continue - check_build_depends_pkg $i + ipkgname=$(xbps-pkgdb getpkgname ${i}) + run_template $ipkgname + check_build_depends_pkg if [ $? -eq 1 ]; then - msg_normal "Installing $lpkgname dependency: $ipkgname" + msg_normal "Installing $lpkgname dependency: $ipkgname." install_pkg $ipkgname auto else install_pkg_deps $i $pkg @@ -136,8 +132,7 @@ install_builddeps_required_pkg() { local pkg="$1" local pkgname=$(xbps-pkgdb getpkgname ${pkg}) - local dep= - local depname= + local dep depname [ -z "$pkg" ] && return 1 @@ -160,11 +155,9 @@ install_builddeps_required_pkg() check_installed_pkg() { local pkg="$1" - local pkgname= - local reqver= - local iver= + local pkgname reqver iver - [ -z "$pkg" ] && return 1 + [ -z "$pkg" ] && return 2 pkgname=$(xbps-pkgdb getpkgname $pkg) reqver=$(xbps-pkgdb getpkgversion $pkg) @@ -185,12 +178,7 @@ check_installed_pkg() # check_build_depends_pkg() { - local pkg="$1" - local pkgname=$(xbps-pkgdb getpkgname ${pkg}) - - [ -z $pkg ] && return 1 - - run_template $pkgname + [ -z "$pkgname" ] && return 2 if [ -n "$build_depends" ]; then return 0 diff --git a/shutils/configure_funcs.sh b/shutils/configure_funcs.sh index 33fd9dc9958..334580a07cb 100644 --- a/shutils/configure_funcs.sh +++ b/shutils/configure_funcs.sh @@ -31,7 +31,6 @@ configure_src_phase() { local pkg="$1" local f= - local destdir=$XBPS_DESTDIR/$pkgname-$version [ -z $pkg ] && [ -z $pkgname ] && return 1 @@ -87,8 +86,8 @@ configure_src_phase() if [ "$build_style" = "gnu_configure" ]; then ${configure_script} \ --prefix=${_prefix} --sysconfdir=/etc \ - --infodir=$destdir/usr/share/info \ - --mandir=$destdir/usr/share/man \ + --infodir=${DESTDIR}/usr/share/info \ + --mandir=${DESTDIR}/usr/share/man \ ${configure_args} # # Packages using propietary configure scripts. diff --git a/shutils/install_funcs.sh b/shutils/install_funcs.sh index 1432b645935..1cd9766b10c 100644 --- a/shutils/install_funcs.sh +++ b/shutils/install_funcs.sh @@ -91,6 +91,7 @@ install_src_phase() fi . $XBPS_TEMPLATESDIR/$pkgname/$subpkg.template pkgname=${sourcepkg}-${subpkg} + set_tmpl_common_vars run_func do_install run_template ${sourcepkg} [ "$pkg" = "${sourcepkg}-${subpkg}" ] && break @@ -113,11 +114,9 @@ install_src_phase() make_install() { - local destdir=$XBPS_DESTDIR/$pkgname-$version - if [ -z "$make_install_target" ]; then - make_install_target="install prefix=$destdir/usr" - make_install_target="$make_install_target sysconfdir=$destdir/etc" + make_install_target="install prefix=${DESTDIR}/usr" + make_install_target="$make_install_target sysconfdir=${DESTDIR}/etc" fi [ -z "$make_cmd" ] && make_cmd=/usr/bin/make diff --git a/shutils/stow_funcs.sh b/shutils/stow_funcs.sh index f52237e4612..818f0353829 100644 --- a/shutils/stow_funcs.sh +++ b/shutils/stow_funcs.sh @@ -44,6 +44,7 @@ stow_pkg() fi . $XBPS_TEMPLATESDIR/${sourcepkg}/${subpkg}.template pkgname=${sourcepkg}-${subpkg} + set_tmpl_common_vars stow_pkg_real ${pkgname} ${automatic} run_template ${sourcepkg} if [ "${pkg}" = "${sourcepkg}-${subpkg}" ]; then @@ -70,7 +71,6 @@ stow_pkg_real() local pkg="$1" local automatic="$2" local i= - local destdir=$XBPS_DESTDIR/$pkg-$version [ -z "$pkg" ] && return 2 @@ -79,16 +79,12 @@ stow_pkg_real() fi if [ "$build_style" = "meta-template" ]; then - [ ! -d $destdir ] && mkdir -p $destdir + [ ! -d ${DESTDIR} ] && mkdir -p ${DESTDIR} fi - if [ -n "$stow_flag" ]; then - if [ "$pkgname" != "$pkg" ]; then - . $XBPS_TEMPLATESDIR/$pkg/template - fi - fi + [ -n "$stow_flag" ] && run_template $pkg - cd $destdir || exit 1 + cd ${DESTDIR} || exit 1 # Copy files into masterdir. for i in $(echo *); do @@ -133,9 +129,7 @@ unstow_pkg() msg_error "cannot unstow $pkg! (permission denied)" fi - if [ "$pkgname" != "$pkg" ]; then - . $XBPS_TEMPLATESDIR/$pkg/template - fi + run_template $pkg ver=$($XBPS_REGPKGDB_CMD version $pkg) if [ -z "$ver" ]; then diff --git a/shutils/tmpl_funcs.sh b/shutils/tmpl_funcs.sh index a97dd9fce34..f5952f8c2db 100644 --- a/shutils/tmpl_funcs.sh +++ b/shutils/tmpl_funcs.sh @@ -1,5 +1,5 @@ #- -# Copyright (c) 2008 Juan Romero Pardines. +# Copyright (c) 2008-2009 Juan Romero Pardines. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -42,7 +42,8 @@ info_tmpl() echo "$long_desc" echo . $XBPS_SHUTILSDIR/builddep_funcs.sh - check_build_depends_pkg $pkgname-$version + run_template $pkgname + check_build_depends_pkg if [ $? -eq 0 ]; then echo "This package requires the following dependencies to be built:" for i in ${build_depends}; do @@ -71,7 +72,8 @@ reset_tmpl_vars() install_priority noarch subpackages sourcepkg \ abi_depends api_depends \ XBPS_EXTRACT_DONE XBPS_CONFIGURE_DONE \ - XBPS_BUILD_DONE XBPS_INSTALL_DONE FILESDIR" + XBPS_BUILD_DONE XBPS_INSTALL_DONE FILESDIR DESTDIR \ + SRCPKGDESTDIR" for v in ${TMPL_VARS}; do eval unset "$v" @@ -94,6 +96,7 @@ setup_tmpl() if [ -f "$XBPS_TEMPLATESDIR/$pkg/template" ]; then if [ "$pkgname" != "$pkg" ]; then + reset_tmpl_vars . $XBPS_TEMPLATESDIR/$pkg/template fi prepare_tmpl @@ -190,7 +193,7 @@ prepare_tmpl() XBPS_BUILD_DONE="$wrksrc/.xbps_build_done" XBPS_INSTALL_DONE="$wrksrc/.xbps_install_done" - FILESDIR=${XBPS_TEMPLATESDIR}/${pkgname}/files + set_tmpl_common_vars if [ -z "$in_chroot" ]; then export PATH="$XBPS_MASTERDIR/bin:$XBPS_MASTERDIR/sbin" @@ -200,6 +203,15 @@ prepare_tmpl() fi } +set_tmpl_common_vars() +{ + [ -z "$pkgname" ] && return 1 + + FILESDIR=${XBPS_TEMPLATESDIR}/${pkgname}/files + DESTDIR=${XBPS_DESTDIR}/${pkgname}-${version} + SRCPKGDESTDIR=${XBPS_DESTDIR}/${sourcepkg}-${version} +} + run_template() { local pkg="$1" @@ -207,5 +219,6 @@ run_template() if [ "$pkgname" != "$pkg" ]; then reset_tmpl_vars . $XBPS_TEMPLATESDIR/$pkg/template + set_tmpl_common_vars fi } diff --git a/templates/binutils/devel.template b/templates/binutils/devel.template index 313b5ac5248..1e5358cf353 100644 --- a/templates/binutils/devel.template +++ b/templates/binutils/devel.template @@ -1,6 +1,6 @@ # Template file for 'binutils-devel'. # -short_desc="${short_desc} (development files)" +short_desc="binutils development files" long_desc="${long_desc} This package contains files for development, headers, static libs, etc." @@ -9,16 +9,13 @@ Add_dependency run binutils 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 + mkdir -p ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr for f in libopcodes libbfd libiberty; do - mv ${origdir}/usr/lib/${f}.*a ${destdir}/usr/lib - if [ -f ${origdir}/usr/lib/${f}.so ]; then - mv ${origdir}/usr/lib/${f}.so ${destdir}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/${f}.*a ${DESTDIR}/usr/lib + if [ -f ${SRCPKGDESTDIR}/usr/lib/${f}.so ]; then + mv ${SRCPKGDESTDIR}/usr/lib/${f}.so ${DESTDIR}/usr/lib fi done - mv ${origdir}/usr/lib/ldscripts ${destdir}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/ldscripts ${DESTDIR}/usr/lib } diff --git a/templates/bzip2/devel.template b/templates/bzip2/devel.template index f49bfbeb7c1..6c707c3215c 100644 --- a/templates/bzip2/devel.template +++ b/templates/bzip2/devel.template @@ -1,6 +1,6 @@ # Template file for 'bzip2-devel'. # -short_desc="${short_desc} (development files)" +short_desc="${sourcepkg} development files" long_desc="${long_desc} This package contains files for development, headers, static libs, etc." @@ -9,10 +9,7 @@ Add_dependency run bzip2 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/libbz2.*a ${destdir}/usr/lib + mkdir -p ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr + mv ${SRCPKGDESTDIR}/usr/lib/libbz2.*a ${DESTDIR}/usr/lib } diff --git a/templates/cmake/template b/templates/cmake/template index 8309c7ef708..5a3167d29cb 100644 --- a/templates/cmake/template +++ b/templates/cmake/template @@ -1,7 +1,7 @@ # Template file for 'cmake' pkgname=cmake version=2.6.2 -distfiles="http://www.cmake.org/files/v2.6/cmake-2.6.2.tar.gz" +distfiles="http://www.cmake.org/files/v2.6/$pkgname-$version.tar.gz" build_style=configure configure_script=./bootstrap configure_args="--prefix=$XBPS_DESTDIR/$pkgname-$version/usr" @@ -17,12 +17,11 @@ long_desc=" makefiles and workspaces that can be used in the compiler environment of your choice." -run_depends="glibc-2.8 openssl-0.9.8" +Add_dependency full glibc +Add_dependency full openssl post_install() { - local destdir=$XBPS_DESTDIR/$pkgname-$version - - mv -v $destdir/usr/doc $destdir/usr/share/doc - mv -v $destdir/usr/man $destdir/usr/share/man + mv -v ${DESTDIR}/usr/doc ${DESTDIR}/usr/share/doc + mv -v ${DESTDIR}/usr/man ${DESTDIR}/usr/share/man } diff --git a/templates/coreutils/template b/templates/coreutils/template index 954d5d58b7b..ee0031fb595 100644 --- a/templates/coreutils/template +++ b/templates/coreutils/template @@ -22,9 +22,7 @@ Add_dependency run glibc post_install() { - local destdir=$XBPS_DESTDIR/$pkgname-$version - # Most programs expect /usr/bin/env. - install -d ${destdir}/usr/bin - cd ${destdir}/usr/bin && ln -s ../../bin/env . + install -d ${DESTDIR}/usr/bin + cd ${DESTDIR}/usr/bin && ln -s ../../bin/env . } diff --git a/templates/cracklib-words/template b/templates/cracklib-words/template index c2a11e71ce3..8fb374dc0ba 100644 --- a/templates/cracklib-words/template +++ b/templates/cracklib-words/template @@ -14,8 +14,7 @@ long_desc=" do_install() { - local destdir=$XBPS_DESTDIR/$pkgname-$version - - install -d $destdir/usr/share/dict - install $wrksrc/$pkgname-${words_date} $destdir/usr/share/dict/$pkgname + install -d ${DESTDIR}/usr/share/dict + install $wrksrc/$pkgname-${words_date} \ + ${DESTDIR}/usr/share/dict/${pkgname} } diff --git a/templates/cracklib/template b/templates/cracklib/template index 7380987d44c..6e0eab65053 100644 --- a/templates/cracklib/template +++ b/templates/cracklib/template @@ -18,15 +18,13 @@ Add_dependency full zlib post_install() { - local destdir=$XBPS_DESTDIR/$pkgname-$version - # Create default small wordlist. cd $wrksrc || exit 1 install -v -D dicts/cracklib-small \ - $destdir/usr/share/dict/cracklib-small + ${DESTDIR}/usr/share/dict/cracklib-small sh ./util/cracklib-format dicts/cracklib-small \ - | sh ./util/cracklib-packer $destdir/usr/share/cracklib/pw_dict - install -d $destdir/lib/cracklib - install -v $destdir/usr/share/cracklib/pw_dict* $destdir/lib/cracklib - gzip -9 $destdir/lib/cracklib/pw_dict.pwd + | sh ./util/cracklib-packer ${DESTDIR}/usr/share/cracklib/pw_dict + install -d ${DESTDIR}/lib/cracklib + install ${DESTDIR}/usr/share/cracklib/pw_dict* ${DESTDIR}/lib/cracklib + gzip -9 ${DESTDIR}/lib/cracklib/pw_dict.pwd } diff --git a/templates/curl/devel.template b/templates/curl/devel.template index 45e482d1a76..6b908921c3a 100644 --- a/templates/curl/devel.template +++ b/templates/curl/devel.template @@ -1,6 +1,6 @@ # Template file for 'curl-devel'. # -short_desc="${short_desc} (development files)" +short_desc="curl development files" long_desc="${long_desc} This package contains files for development, headers, static libs, etc." @@ -9,19 +9,16 @@ Add_dependency run curl-libs do_install() { - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} + mkdir -p ${DESTDIR}/usr/bin + mkdir -p ${DESTDIR}/usr/lib + mkdir -p ${DESTDIR}/usr/share/man/man1 - mkdir -p ${destdir}/usr/bin - mkdir -p ${destdir}/usr/lib - mkdir -p ${destdir}/usr/share/man/man1 - - mv ${origdir}/usr/bin/curl-config ${destdir}/usr/bin - 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/pkgconfig ${destdir}/usr/lib - mv ${origdir}/usr/share/man/man1/curl-config* \ - ${destdir}/usr/share/man/man1 - mv ${origdir}/usr/share/man/man3 ${destdir}/usr/share/man + mv ${SRCPKGDESTDIR}/usr/bin/curl-config ${DESTDIR}/usr/bin + mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr + mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/share/man/man1/curl-config* \ + ${DESTDIR}/usr/share/man/man1 + mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man } diff --git a/templates/curl/libs.template b/templates/curl/libs.template index a55e812512f..94c2f35248f 100644 --- a/templates/curl/libs.template +++ b/templates/curl/libs.template @@ -12,9 +12,6 @@ Add_dependency run openssl do_install() { - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr/lib - mv ${origdir}/usr/lib/lib*.so.* ${destdir}/usr/lib + mkdir -p ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/lib*.so.* ${DESTDIR}/usr/lib } diff --git a/templates/dbus/devel.template b/templates/dbus/devel.template index b88ead3503e..7227d3e2e83 100644 --- a/templates/dbus/devel.template +++ b/templates/dbus/devel.template @@ -9,14 +9,11 @@ Add_dependency run dbus-libs do_install() { - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} + mkdir -p ${DESTDIR}/usr/lib - mkdir -p ${destdir}/usr/lib - - mv ${origdir}/usr/include ${destdir}/usr - mv ${origdir}/usr/lib/dbus-* ${destdir}/usr/lib - mv ${origdir}/usr/lib/pkgconfig ${destdir}/usr/lib - mv ${origdir}/usr/lib/*.*a ${destdir}/usr/lib - mv ${origdir}/usr/lib/*.so ${destdir}/usr/lib + mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr + mv ${SRCPKGDESTDIR}/usr/lib/dbus-* ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib } diff --git a/templates/dbus/libs.template b/templates/dbus/libs.template index 0a74f430975..c7b7429ca63 100644 --- a/templates/dbus/libs.template +++ b/templates/dbus/libs.template @@ -10,9 +10,6 @@ Add_dependency run expat do_install() { - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr/lib - mv ${origdir}/usr/lib/lib*.so.* ${destdir}/usr/lib + mkdir -p ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/lib*.so.* ${DESTDIR}/usr/lib } diff --git a/templates/e2fsprogs/devel.template b/templates/e2fsprogs/devel.template index ef3c11a512e..9366beac1a8 100644 --- a/templates/e2fsprogs/devel.template +++ b/templates/e2fsprogs/devel.template @@ -9,23 +9,21 @@ Add_dependency run e2fsprogs-libs do_install() { - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} + mkdir -p ${DESTDIR}/lib + mkdir -p ${DESTDIR}/usr/lib + mkdir -p ${DESTDIR}/usr/bin + mkdir -p ${DESTDIR}/usr/share/info + mkdir -p ${DESTDIR}/usr/share/man/man1 - mkdir -p ${destdir}/lib - mkdir -p ${destdir}/usr/lib - mkdir -p ${destdir}/usr/bin - mkdir -p ${destdir}/usr/share/info - mkdir -p ${destdir}/usr/share/man/man1 - - mv ${origdir}/usr/include ${destdir}/usr - mv ${origdir}/lib/*.*a ${destdir}/lib - mv ${origdir}/usr/lib/pkgconfig ${destdir}/usr/lib + mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr + mv ${SRCPKGDESTDIR}/lib/*.*a ${DESTDIR}/lib + mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib for f in compile_et mk_cmds; do - mv ${origdir}/bin/${f} ${destdir}/usr/bin - mv ${origdir}/usr/share/man/man1/${f}* \ - ${destdir}/usr/share/man/man1 + mv ${SRCPKGDESTDIR}/bin/${f} ${DESTDIR}/usr/bin + mv ${SRCPKGDESTDIR}/usr/share/man/man1/${f}* \ + ${DESTDIR}/usr/share/man/man1 done - mv ${origdir}/usr/share/man/man3 ${destdir}/usr/share/man - mv ${origdir}/usr/share/info/libext2fs.info* ${destdir}/usr/share/info + mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man + mv ${SRCPKGDESTDIR}/usr/share/info/libext2fs.info* \ + ${DESTDIR}/usr/share/info } diff --git a/templates/e2fsprogs/libs.template b/templates/e2fsprogs/libs.template index bf964b9bcd2..310e3277820 100644 --- a/templates/e2fsprogs/libs.template +++ b/templates/e2fsprogs/libs.template @@ -9,9 +9,6 @@ Add_dependency run glibc do_install() { - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/lib - mv ${origdir}/lib/lib*.so.* ${destdir}/lib + mkdir -p ${DESTDIR}/lib + mv ${SRCPKGDESTDIR}/lib/lib*.so.* ${DESTDIR}/lib } diff --git a/templates/e2fsprogs/template b/templates/e2fsprogs/template index dd4fabb80fd..570e81ddf20 100644 --- a/templates/e2fsprogs/template +++ b/templates/e2fsprogs/template @@ -30,9 +30,7 @@ Add_dependency run e2fsprogs-libs post_install() { - local destdir=$XBPS_DESTDIR/$pkgname-$version - # Move libraries to /lib. - install -d ${destdir}/lib - mv ${destdir}/usr/lib/lib* ${destdir}/lib + install -d ${DESTDIR}/lib + mv ${DESTDIR}/usr/lib/lib* ${DESTDIR}/lib } diff --git a/templates/expat/devel.template b/templates/expat/devel.template index 7071eb9466e..0d323c1428d 100644 --- a/templates/expat/devel.template +++ b/templates/expat/devel.template @@ -9,12 +9,9 @@ Add_dependency run expat do_install() { - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} + mkdir -p ${DESTDIR}/usr/lib - 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 ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr + mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib } diff --git a/templates/file/devel.template b/templates/file/devel.template index 976fc9d2d17..f2920d206a1 100644 --- a/templates/file/devel.template +++ b/templates/file/devel.template @@ -9,10 +9,7 @@ Add_dependency run file 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/libmagic.*a ${destdir}/usr/lib + mkdir -p ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr + mv ${SRCPKGDESTDIR}/usr/lib/libmagic.*a ${DESTDIR}/usr/lib } diff --git a/templates/findutils/template b/templates/findutils/template index 0a3941c08d8..e7044ac3188 100644 --- a/templates/findutils/template +++ b/templates/findutils/template @@ -21,7 +21,5 @@ Add_dependency run glibc post_install() { - local destdir=$XBPS_DESTDIR/$pkgname-$version - - sed -i -e "s|$XBPS_MASTERDIR||g" ${destdir}/usr/bin/updatedb + sed -i -e "s|$XBPS_MASTERDIR||g" ${DESTDIR}/usr/bin/updatedb } diff --git a/templates/gcc-multilib/template b/templates/gcc-multilib/template index f613eef682c..f9b1187dfb7 100644 --- a/templates/gcc-multilib/template +++ b/templates/gcc-multilib/template @@ -18,22 +18,22 @@ long_desc=" code on x86_64 systems." only_for_archs="x86_64" -build_depends="glibc32-2.8" -run_depends="$build_depends" + +Add_dependency full glibc32 post_install() { - local destdir=$XBPS_DESTDIR/$pkgname-$version + local DESTDIR=$XBPS_DESTDIR/$pkgname-$version # We are only interested in 32bit libs, remove anything else. - rm -r $destdir/usr/lib64 - rm -r $destdir/usr/libexec - rm -r $destdir/usr/include - rm -r $destdir/usr/bin - rm -r $destdir/usr/share - rm $destdir/usr/lib/libiberty* - rm -r $destdir/usr/lib/gcc/x86_64-unknown-linux-gnu/$version/*include* - rm -r $destdir/usr/lib/gcc/x86_64-unknown-linux-gnu/$version/install-tools - rm $destdir/usr/lib/gcc/x86_64-unknown-linux-gnu/$version/crt* - rm $destdir/usr/lib/gcc/x86_64-unknown-linux-gnu/$version/libgcov* + rm -r $DESTDIR/usr/lib64 + rm -r $DESTDIR/usr/libexec + rm -r $DESTDIR/usr/include + rm -r $DESTDIR/usr/bin + rm -r $DESTDIR/usr/share + rm $DESTDIR/usr/lib/libiberty* + rm -r $DESTDIR/usr/lib/gcc/x86_64-unknown-linux-gnu/$version/*include* + rm -r $DESTDIR/usr/lib/gcc/x86_64-unknown-linux-gnu/$version/install-tools + rm $DESTDIR/usr/lib/gcc/x86_64-unknown-linux-gnu/$version/crt* + rm $DESTDIR/usr/lib/gcc/x86_64-unknown-linux-gnu/$version/libgcov* } diff --git a/templates/gcc/c++.template b/templates/gcc/c++.template index dc3d249fe53..ef461b32c1a 100644 --- a/templates/gcc/c++.template +++ b/templates/gcc/c++.template @@ -10,8 +10,6 @@ Add_dependency run gcc-libstdc++ ${version} do_install() { - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} local triplet= if [ "${xbps_machine}" = "x86_64" ]; then @@ -20,16 +18,17 @@ do_install() 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} + 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 + mv ${SRCPKGDESTDIR}/usr/bin/${f} ${DESTDIR}/usr/bin done - mv ${origdir}/usr/libexec/gcc/${triplet}/${version}/cc1plus \ - ${destdir}/usr/libexec/gcc/${triplet}/${version} + mv ${SRCPKGDESTDIR}/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 + mv ${SRCPKGDESTDIR}/usr/share/man/man1/g++.1 \ + ${DESTDIR}/usr/share/man/man1 } diff --git a/templates/gcc/libgcc.template b/templates/gcc/libgcc.template index 624403fe188..12112078006 100644 --- a/templates/gcc/libgcc.template +++ b/templates/gcc/libgcc.template @@ -8,9 +8,6 @@ install_priority=50 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 + mkdir -p ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/libgcc_s.so* ${DESTDIR}/usr/lib } diff --git a/templates/gcc/libgomp.template b/templates/gcc/libgomp.template index 5d2956f76ad..fdeb8520e00 100644 --- a/templates/gcc/libgomp.template +++ b/templates/gcc/libgomp.template @@ -11,12 +11,9 @@ 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 - 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 + mv ${SRCPKGDESTDIR}/usr/lib/libgomp.* ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/share/info ${DESTDIR}/usr/share } diff --git a/templates/gcc/libmudflap-devel.template b/templates/gcc/libmudflap-devel.template index aed30e3b697..e62afee7f97 100644 --- a/templates/gcc/libmudflap-devel.template +++ b/templates/gcc/libmudflap-devel.template @@ -10,10 +10,7 @@ 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 + mkdir -p ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/libmudflap*.*a ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/libmudflap*.so ${DESTDIR}/usr/lib } diff --git a/templates/gcc/libmudflap.template b/templates/gcc/libmudflap.template index 062f4121029..304f7f9192b 100644 --- a/templates/gcc/libmudflap.template +++ b/templates/gcc/libmudflap.template @@ -11,9 +11,6 @@ Add_dependency run gcc-libgcc ${version} 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 + mkdir -p ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/libmudflap*.so.* ${DESTDIR}/usr/lib } diff --git a/templates/gcc/libobjc-devel.template b/templates/gcc/libobjc-devel.template index 3fb20137e9b..3cec073c0a9 100644 --- a/templates/gcc/libobjc-devel.template +++ b/templates/gcc/libobjc-devel.template @@ -10,10 +10,7 @@ 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 + mkdir -p ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/libobjc.*a ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/libobjc.so ${DESTDIR}/usr/lib } diff --git a/templates/gcc/libobjc.template b/templates/gcc/libobjc.template index ecdf6b62af2..47e02212363 100644 --- a/templates/gcc/libobjc.template +++ b/templates/gcc/libobjc.template @@ -11,9 +11,6 @@ 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 + mkdir -p ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/libobjc.so.* ${DESTDIR}/usr/lib } diff --git a/templates/gcc/libstdc++-devel.template b/templates/gcc/libstdc++-devel.template index d43c670a2dd..8571cb50e5d 100644 --- a/templates/gcc/libstdc++-devel.template +++ b/templates/gcc/libstdc++-devel.template @@ -10,14 +10,11 @@ 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 - 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 + mv ${SRCPKGDESTDIR}/usr/lib/libstdc++.*a ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/libstdc++.so ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/libsupc++.* ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/include/c++ ${DESTDIR}/usr/include } diff --git a/templates/gcc/libstdc++.template b/templates/gcc/libstdc++.template index 380e044b264..d695e56da5b 100644 --- a/templates/gcc/libstdc++.template +++ b/templates/gcc/libstdc++.template @@ -11,16 +11,13 @@ 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 - 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 + mv ${SRCPKGDESTDIR}/usr/lib/libstdc++.so.* ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/share/locale/fr/LC_MESSAGES/libstdc++.mo \ + ${DESTDIR}/usr/share/locale/fr/LC_MESSAGES + mv ${SRCPKGDESTDIR}/usr/share/locale/de/LC_MESSAGES/libstdc++.mo \ + ${DESTDIR}/usr/share/locale/de/LC_MESSAGES } diff --git a/templates/gcc/objc++.template b/templates/gcc/objc++.template index 35c4d7b60da..fdde79cdcff 100644 --- a/templates/gcc/objc++.template +++ b/templates/gcc/objc++.template @@ -12,8 +12,6 @@ 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 @@ -22,7 +20,7 @@ do_install() 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} + mkdir -p ${DESTDIR}/usr/libexec/gcc/${triplet}/${version} + mv ${SRCPKGDESTDIR}/usr/libexec/gcc/${triplet}/${version}/cc1objplus \ + ${DESTDIR}/usr/libexec/gcc/${triplet}/${version} } diff --git a/templates/gcc/objc.template b/templates/gcc/objc.template index 5f3d79de425..cf5bbfc2325 100644 --- a/templates/gcc/objc.template +++ b/templates/gcc/objc.template @@ -12,8 +12,6 @@ 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 @@ -22,11 +20,11 @@ do_install() triplet="${xbps_machine}-pc-linux-gnu" fi - mkdir -p ${destdir}//usr/lib/gcc/${triplet}/${version} - mkdir -p ${destdir}/usr/libexec/gcc/${triplet}/${version}/include + 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} + mv ${SRCPKGDESTDIR}/usr/lib/gcc/${triplet}/${version}/include/objc \ + ${DESTDIR}/usr/lib/gcc/${triplet}/${version}/include + mv ${SRCPKGDESTDIR}/usr/libexec/gcc/${triplet}/${version}/cc1obj \ + ${DESTDIR}/usr/libexec/gcc/${triplet}/${version} } diff --git a/templates/gcc/template b/templates/gcc/template index a66808aabce..12411b06691 100644 --- a/templates/gcc/template +++ b/templates/gcc/template @@ -38,7 +38,5 @@ pre_configure() post_install() { - local destdir=$XBPS_DESTDIR/$pkgname-$version - - cd $destdir/usr/bin && ln -s gcc cc + cd ${DESTDIR}/usr/bin && ln -s gcc cc } diff --git a/templates/gdbm/devel.template b/templates/gdbm/devel.template index 1cd784c444b..1c1ede4242e 100644 --- a/templates/gdbm/devel.template +++ b/templates/gdbm/devel.template @@ -9,10 +9,7 @@ Add_dependency run gdbm 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 + mkdir -p ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr + mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib } diff --git a/templates/gettext/devel.template b/templates/gettext/devel.template index cc6483e2329..65f63022c5f 100644 --- a/templates/gettext/devel.template +++ b/templates/gettext/devel.template @@ -9,16 +9,13 @@ Add_dependency run gettext do_install() { - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} + mkdir -p ${DESTDIR}/usr/lib + mkdir -p ${DESTDIR}/usr/share/doc - mkdir -p ${destdir}/usr/lib - mkdir -p ${destdir}/usr/share/doc - - mv ${origdir}/usr/include ${destdir}/usr - mv ${origdir}/usr/lib/*.*a ${destdir}/usr/lib - mv ${origdir}/usr/lib/*.so ${destdir}/usr/lib - mv ${origdir}/usr/share/doc/gettext ${destdir}/usr/share/doc - mv ${origdir}/usr/share/aclocal ${destdir}/usr/share - mv ${origdir}/usr/share/gettext ${destdir}/usr/share + mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr + mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/share/doc/gettext ${DESTDIR}/usr/share/doc + mv ${SRCPKGDESTDIR}/usr/share/aclocal ${DESTDIR}/usr/share + mv ${SRCPKGDESTDIR}/usr/share/gettext ${DESTDIR}/usr/share } diff --git a/templates/gettext/libs.template b/templates/gettext/libs.template index 1168fa1759a..9d5ec2aea6b 100644 --- a/templates/gettext/libs.template +++ b/templates/gettext/libs.template @@ -9,9 +9,6 @@ Add_dependency run glibc do_install() { - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr/lib - mv ${origdir}/usr/lib/*.so.* ${destdir}/usr/lib + mkdir -p ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/*.so.* ${DESTDIR}/usr/lib } diff --git a/templates/glib/devel.template b/templates/glib/devel.template index 8f01edf6f5a..f039e40899b 100644 --- a/templates/glib/devel.template +++ b/templates/glib/devel.template @@ -9,20 +9,17 @@ Add_dependency run glib do_install() { - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} + mkdir -p ${DESTDIR}/usr/lib + mkdir -p ${DESTDIR}/usr/share - mkdir -p ${destdir}/usr/lib - mkdir -p ${destdir}/usr/share - - mv ${origdir}/usr/bin ${destdir}/usr - mv ${origdir}/usr/include ${destdir}/usr - mv ${origdir}/usr/lib/glib-2.0 ${destdir}/usr/lib - mv ${origdir}/usr/lib/*.*a ${destdir}/usr/lib - mv ${origdir}/usr/lib/*.so ${destdir}/usr/lib - mv ${origdir}/usr/lib/pkgconfig ${destdir}/usr/lib - mv ${origdir}/usr/share/man ${destdir}/usr/share - mv ${origdir}/usr/share/gtk-doc ${destdir}/usr/share - mv ${origdir}/usr/share/aclocal ${destdir}/usr/share - mv ${origdir}/usr/share/glib-2.0 ${destdir}/usr/share + mv ${SRCPKGDESTDIR}/usr/bin ${DESTDIR}/usr + mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr + mv ${SRCPKGDESTDIR}/usr/lib/glib-2.0 ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/share/man ${DESTDIR}/usr/share + mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share + mv ${SRCPKGDESTDIR}/usr/share/aclocal ${DESTDIR}/usr/share + mv ${SRCPKGDESTDIR}/usr/share/glib-2.0 ${DESTDIR}/usr/share } diff --git a/templates/glibc/devel.template b/templates/glibc/devel.template index 53b3c4a63a0..9c7ba227336 100644 --- a/templates/glibc/devel.template +++ b/templates/glibc/devel.template @@ -9,12 +9,9 @@ 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 + mkdir -p ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr + mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/*crt1.o ${DESTDIR}/usr/lib } diff --git a/templates/glibc/locales.template b/templates/glibc/locales.template index ad3cea4b87f..e6e95d74d81 100644 --- a/templates/glibc/locales.template +++ b/templates/glibc/locales.template @@ -8,10 +8,7 @@ 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/i18n ${destdir}/usr/share - mv ${origdir}/usr/share/locale ${destdir}/usr/share + mkdir -p ${DESTDIR}/usr/share + mv ${SRCPKGDESTDIR}/usr/share/i18n ${DESTDIR}/usr/share + mv ${SRCPKGDESTDIR}/usr/share/locale ${DESTDIR}/usr/share } diff --git a/templates/glibc/template b/templates/glibc/template index dff6abf5874..f964fbef18c 100644 --- a/templates/glibc/template +++ b/templates/glibc/template @@ -51,24 +51,22 @@ pre_configure() pre_install() { - # Create destdir/etc/ld.so.conf - mkdir -p $XBPS_DESTDIR/$pkgname-$version/etc - echo "/usr/local/lib" > $XBPS_DESTDIR/$pkgname-$version/etc/ld.so.conf + # Create DESTDIR/etc/ld.so.conf + mkdir -p ${DESTDIR}/etc + echo "/usr/local/lib" > ${DESTDIR}/etc/ld.so.conf } post_install() { - local destdir=$XBPS_DESTDIR/$pkgname-$version - # Replace hardcoded path to bash. . $XBPS_HELPERSDIR/replace-interpreter.sh - replace_interpreter bash $destdir/usr/bin/ldd + replace_interpreter bash ${DESTDIR}/usr/bin/ldd # On x86_64, add dynamic linker's 32bit version to ldd. if [ "$xbps_machine" = "x86_64" ]; then rtldlist="/lib/ld-linux.so.2 /lib/ld-linux-x86-64.so.2" sed -i "s|^RTLDLIST.*$|RTLDLIST=\"$rtldlist\"|" \ - $destdir/usr/bin/ldd + ${DESTDIR}/usr/bin/ldd fi # Create nsswitch.conf @@ -84,7 +82,7 @@ post_install() echo "services: files"; \ echo "ethers: files"; \ echo "rpc: files"; \ - ) > $destdir/etc/nsswitch.conf + ) > ${DESTDIR}/etc/nsswitch.conf wrksrc=${wrksrc%%/build_obj} } diff --git a/templates/glibc32/template b/templates/glibc32/template index 47bc312f39e..53cda59589c 100644 --- a/templates/glibc32/template +++ b/templates/glibc32/template @@ -51,31 +51,30 @@ pre_install() post_install() { - local destdir=$XBPS_DESTDIR/$pkgname-$version local tmpdir=$XBPS_BUILDDIR/$pkgname-tmp mkdir -p $tmpdir/usr/include/gnu mkdir -p $tmpdir/usr/include/sys # Remove all headers except the ones required for 32bits stuff. - mv -v $destdir/usr/include/gnu/stubs-32.h $tmpdir/usr/include/gnu - mv -v $destdir/usr/include/sys/elf.h $tmpdir/usr/include/sys - mv -v $destdir/usr/include/sys/vm86.h $tmpdir/usr/include/sys + mv -v $DESTDIR/usr/include/gnu/stubs-32.h $tmpdir/usr/include/gnu + mv -v $DESTDIR/usr/include/sys/elf.h $tmpdir/usr/include/sys + mv -v $DESTDIR/usr/include/sys/vm86.h $tmpdir/usr/include/sys - rm -rf $destdir/usr/include - mkdir -p $destdir/lib - mkdir -p $destdir/usr/include - mkdir -p $destdir/usr/lib32/gconv - mv -v $tmpdir/usr/include/* $destdir/usr/include + rm -rf $DESTDIR/usr/include + mkdir -p $DESTDIR/lib + mkdir -p $DESTDIR/usr/include + mkdir -p $DESTDIR/usr/lib32/gconv + mv -v $tmpdir/usr/include/* $DESTDIR/usr/include # Remove bins and unneeded stuff for compat32. - [ -d $destdir/xbps_destdir ] && rm -rf $destdir/xbps_destdir - rm -rf $destdir/sbin $destdir/bin $destdir/usr/sbin $destdir/usr/bin - rm -rf $destdir/usr/share $destdir/usr/libexec $destdir/etc - mv -v $destdir/usr/lib/* $destdir/usr/lib32/ - rmdir $destdir/usr/lib + [ -d $DESTDIR/xbps_DESTDIR ] && rm -rf $DESTDIR/xbps_DESTDIR + rm -rf $DESTDIR/sbin $DESTDIR/bin $DESTDIR/usr/sbin $DESTDIR/usr/bin + rm -rf $DESTDIR/usr/share $DESTDIR/usr/libexec $DESTDIR/etc + mv -v $DESTDIR/usr/lib/* $DESTDIR/usr/lib32/ + rmdir $DESTDIR/usr/lib - cd $destdir/lib && ln -s ../lib32/ld-linux.so.2 . + cd $DESTDIR/lib && ln -s ../lib32/ld-linux.so.2 . # Add /lib32 and /usr/lib32 into ld.so.conf. echo "/lib32" >> $XBPS_MASTERDIR/etc/ld.so.conf diff --git a/templates/gmp/devel.template b/templates/gmp/devel.template index e02accd30ea..e8ede6993f3 100644 --- a/templates/gmp/devel.template +++ b/templates/gmp/devel.template @@ -9,10 +9,7 @@ Add_dependency run gmp 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/libgmp.*a ${destdir}/usr/lib + mkdir -p ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr + mv ${SRCPKGDESTDIR}/usr/lib/libgmp.*a ${DESTDIR}/usr/lib } diff --git a/templates/initng/template b/templates/initng/template index b026c3adfe2..6ed8fc2f14e 100644 --- a/templates/initng/template +++ b/templates/initng/template @@ -26,11 +26,9 @@ run_depends="glibc-2.8 bash-3.2" post_install() { - local destdir=$XBPS_DESTDIR/$pkgname-$version - # Make /sbin/initng -> /sbin/init link. - cd $destdir/sbin && ln -sf initng init + cd $DESTDIR/sbin && ln -sf initng init # Fix /bin/pidof link. - rm -v $destdir/bin/pidof - cd $destdir/bin && ln -sf ../sbin/killalli5 pidof + rm -v $DESTDIR/bin/pidof + cd $DESTDIR/bin && ln -sf ../sbin/killalli5 pidof } diff --git a/templates/initramfs-tools/template b/templates/initramfs-tools/template index 181fc8d9a3b..1e2059a7759 100644 --- a/templates/initramfs-tools/template +++ b/templates/initramfs-tools/template @@ -37,8 +37,7 @@ Add_dependency full gzip do_install() { - local destdir=$XBPS_DESTDIR/$pkgname-$version - local etcdir=$destdir/etc/$pkgname + local etcdir=$DESTDIR/etc/$pkgname # Required dirs install -d $etcdir/hooks @@ -49,52 +48,52 @@ do_install() install -d $etcdir/scripts/local-bottom install -d $etcdir/scripts/local-premount install -d $etcdir/scripts/local-top - install -d $destdir/usr/share/$pkgname - install -d $destdir/usr/share/$pkgname/conf.d - install -d $destdir/usr/share/$pkgname/hooks - install -d $destdir/usr/share/$pkgname/hooksconf.d - install -d $destdir/usr/share/$pkgname/modules.d - install -d $destdir/usr/share/$pkgname/scripts - install -d $destdir/usr/share/$pkgname/scripts/init-premount - install -d $destdir/usr/share/$pkgname/scripts/init-top - install -d $destdir/usr/share/$pkgname/scripts/local-premount - install -d $destdir/usr/share/$pkgname/scripts/local-top - install -d $destdir/usr/share/doc/$pkgname - install -d $destdir/usr/share/doc/$pkgname/examples - install -d $destdir/usr/share/man/man5 - install -d $destdir/usr/share/man/man8 - install -d $destdir/usr/sbin - install -d $destdir/var/lib/$pkgname + install -d $DESTDIR/usr/share/$pkgname + install -d $DESTDIR/usr/share/$pkgname/conf.d + install -d $DESTDIR/usr/share/$pkgname/hooks + install -d $DESTDIR/usr/share/$pkgname/hooksconf.d + install -d $DESTDIR/usr/share/$pkgname/modules.d + install -d $DESTDIR/usr/share/$pkgname/scripts + install -d $DESTDIR/usr/share/$pkgname/scripts/init-premount + install -d $DESTDIR/usr/share/$pkgname/scripts/init-top + install -d $DESTDIR/usr/share/$pkgname/scripts/local-premount + install -d $DESTDIR/usr/share/$pkgname/scripts/local-top + install -d $DESTDIR/usr/share/doc/$pkgname + install -d $DESTDIR/usr/share/doc/$pkgname/examples + install -d $DESTDIR/usr/share/man/man5 + install -d $DESTDIR/usr/share/man/man8 + install -d $DESTDIR/usr/sbin + install -d $DESTDIR/var/lib/$pkgname # /etc config files install -m 644 $wrksrc/conf/initramfs.conf $etcdir install -m 644 $wrksrc/conf/update-initramfs.conf $etcdir # Data - install -m 755 $wrksrc/init $destdir/usr/share/$pkgname + install -m 755 $wrksrc/init $DESTDIR/usr/share/$pkgname for f in functions local nfs; do install -m 644 $wrksrc/scripts/$f \ - $destdir/usr/share/$pkgname/scripts + $DESTDIR/usr/share/$pkgname/scripts done install -m 755 $wrksrc/scripts/init-premount/* \ - $destdir/usr/share/$pkgname/scripts/init-premount + $DESTDIR/usr/share/$pkgname/scripts/init-premount install -m 755 $wrksrc/scripts/init-top/* \ - $destdir/usr/share/$pkgname/scripts/init-top + $DESTDIR/usr/share/$pkgname/scripts/init-top install -m 755 $wrksrc/scripts/local-premount/* \ - $destdir/usr/share/$pkgname/scripts/local-premount - install -m 755 $wrksrc/hooks/* $destdir/usr/share/$pkgname/hooks - install -m 644 $wrksrc/hook-functions $destdir/usr/share/$pkgname + $DESTDIR/usr/share/$pkgname/scripts/local-premount + install -m 755 $wrksrc/hooks/* $DESTDIR/usr/share/$pkgname/hooks + install -m 644 $wrksrc/hook-functions $DESTDIR/usr/share/$pkgname install -m 644 $wrksrc/conf/modules $etcdir # Examples - install -m 644 $wrksrc/docs/* $destdir/usr/share/doc/$pkgname/examples + install -m 644 $wrksrc/docs/* $DESTDIR/usr/share/doc/$pkgname/examples # Manpages - install -m 644 $wrksrc/*.5 $destdir/usr/share/man/man5 - install -m 644 $wrksrc/*.8 $destdir/usr/share/man/man8 + install -m 644 $wrksrc/*.5 $DESTDIR/usr/share/man/man5 + install -m 644 $wrksrc/*.8 $DESTDIR/usr/share/man/man8 # Scripts - install -m 755 $wrksrc/mkinitramfs $destdir/usr/sbin - install -m 755 $wrksrc/mkinitramfs-kpkg $destdir/usr/sbin - install -m 755 $wrksrc/update-initramfs $destdir/usr/sbin + install -m 755 $wrksrc/mkinitramfs $DESTDIR/usr/sbin + install -m 755 $wrksrc/mkinitramfs-kpkg $DESTDIR/usr/sbin + install -m 755 $wrksrc/update-initramfs $DESTDIR/usr/sbin } diff --git a/templates/initscripts/template b/templates/initscripts/template index 7a731fb0898..8792a215d09 100644 --- a/templates/initscripts/template +++ b/templates/initscripts/template @@ -31,15 +31,13 @@ Add_dependency full dhcpcd do_install() { - local destdir=$XBPS_DESTDIR/$pkgname-$version - - install -d ${destdir}/etc/rc.d - install -d ${destdir}/etc/rc.conf.d - install -d ${destdir}/etc/defaults + install -d ${DESTDIR}/etc/rc.d + install -d ${DESTDIR}/etc/rc.conf.d + install -d ${DESTDIR}/etc/defaults for f in inittab rc.*; do - install -m755 ${FILESDIR}/${f} ${destdir}/etc + install -m755 ${FILESDIR}/${f} ${DESTDIR}/etc done - install -m644 ${FILESDIR}/defaults/rc.conf ${destdir}/etc/defaults - install -m755 ${FILESDIR}/rc.d/* ${destdir}/etc/rc.d + install -m644 ${FILESDIR}/defaults/rc.conf ${DESTDIR}/etc/defaults + install -m755 ${FILESDIR}/rc.d/* ${DESTDIR}/etc/rc.d } diff --git a/templates/irssi/devel.template b/templates/irssi/devel.template index feb06a8fcf5..c3aca937807 100644 --- a/templates/irssi/devel.template +++ b/templates/irssi/devel.template @@ -9,14 +9,11 @@ Add_dependency run irssi do_install() { - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} + mkdir -p ${DESTDIR}/usr/lib/irssi/modules - mkdir -p ${destdir}/usr/lib/irssi/modules - - mv ${origdir}/usr/include ${destdir}/usr - mv ${origdir}/usr/lib/irssi/modules/*.*a \ - ${destdir}/usr/lib/irssi/modules - mv ${origdir}/usr/lib/irssi/modules/*.so \ - ${destdir}/usr/lib/irssi/modules + mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr + mv ${SRCPKGDESTDIR}/usr/lib/irssi/modules/*.*a \ + ${DESTDIR}/usr/lib/irssi/modules + mv ${SRCPKGDESTDIR}/usr/lib/irssi/modules/*.so \ + ${DESTDIR}/usr/lib/irssi/modules } diff --git a/templates/kernel-headers/template b/templates/kernel-headers/template index 846a22d1960..c6ff4c0d28c 100644 --- a/templates/kernel-headers/template +++ b/templates/kernel-headers/template @@ -16,7 +16,7 @@ Add_dependency run kernel-libc-headers ${version} do_install() { - local destdir=$XBPS_DESTDIR/$pkgname-$version/usr/src/$pkgname-$version + local destdir=${DESTDIR}/usr/src/$pkgname-$version local arch= local incdirs="acpi asm-generic config linux math-emu media \ net pcmcia scsi sound video" @@ -45,7 +45,7 @@ do_install() for i in ${incdirs}; do cp -a include/$i $destdir/include done - cp -ar arch/x86/include/asm $destdir/include + cp -a arch/x86/include/asm $destdir/include cp -a scripts $destdir mkdir -p $destdir/arch/x86/kernel diff --git a/templates/kernel/template b/templates/kernel/template index f7096aaf0cb..5d5693c3666 100644 --- a/templates/kernel/template +++ b/templates/kernel/template @@ -20,6 +20,7 @@ long_desc=" Add_dependency full glibc Add_dependency full dash Add_dependency full coreutils +Add_dependency full module-init-tools Add_dependency full initramfs-tools Add_dependency build perl @@ -47,11 +48,15 @@ pre_build() post_install() { - local destdir=$XBPS_DESTDIR/$pkgname-$version - - install -d $destdir/lib $destdir/boot + install -d ${DESTDIR}/lib ${DESTDIR}/boot cd $wrksrc || exit 1 - install -m 644 arch/x86/boot/bzImage $destdir/boot/vmlinuz-$version - install -m 644 System.map $destdir/boot/System.map-$version + install -m 644 arch/x86/boot/bzImage ${DESTDIR}/boot/vmlinuz-$version + install -m 644 System.map ${DESTDIR}/boot/System.map-$version + install -m 644 .config ${DESTDIR}/boot/config-$version + + cd ${DESTDIR}/lib/modules/${version} && \ + rm -f source build && \ + ln -sf ../../../usr/src/kernel-headers-${version} build && \ + ln -sf build source } diff --git a/templates/klibc-module-init-tools/template b/templates/klibc-module-init-tools/template index db31b23e067..01267dd397b 100644 --- a/templates/klibc-module-init-tools/template +++ b/templates/klibc-module-init-tools/template @@ -20,8 +20,6 @@ Add_dependency run klibc do_install() { - local destdir=$XBPS_DESTDIR/$pkgname-$version - cd $wrksrc CFLAGS="-O2 -DCONFIG_NO_BACKWARDS_COMPAT" \ CC=klcc LD=klcc ./configure --prefix= @@ -29,8 +27,8 @@ do_install() sed 's|getc_unlocked|getc|g' -i *.c make || return 1 - install -d ${destdir}/usr/lib/klibc/sbin + install -d ${DESTDIR}/usr/lib/klibc/sbin for f in depmod modinfo modprobe insmod lsmod rmmod; do - install -s -m755 ${f} ${destdir}/usr/lib/klibc/sbin + install -s -m755 ${f} ${DESTDIR}/usr/lib/klibc/sbin done } diff --git a/templates/klibc-udev/template b/templates/klibc-udev/template index 41dd9dbe93d..5efd2dc00e3 100644 --- a/templates/klibc-udev/template +++ b/templates/klibc-udev/template @@ -19,26 +19,24 @@ Add_dependency run klibc do_install() { - local destdir=$XBPS_DESTDIR/$pkgname-$version - cd $wrksrc CC=klcc LD=klcc CFLAGS="-O2" ./configure --prefix= make || exit 1 - install -d ${destdir}/usr/lib/klibc/udev - install -s -m755 udev/udevd ${destdir}/usr/lib/klibc/udev - install -s -m755 udev/udevadm ${destdir}/usr/lib/klibc/udev - install -m755 extras/path_id/path_id ${destdir}/usr/lib/klibc/udev - install -s -m755 extras/volume_id/vol_id ${destdir}/usr/lib/klibc/udev + install -d ${DESTDIR}/usr/lib/klibc/udev + install -s -m755 udev/udevd ${DESTDIR}/usr/lib/klibc/udev + install -s -m755 udev/udevadm ${DESTDIR}/usr/lib/klibc/udev + install -m755 extras/path_id/path_id ${DESTDIR}/usr/lib/klibc/udev + install -s -m755 extras/volume_id/vol_id ${DESTDIR}/usr/lib/klibc/udev # Install the initramfs-tools hook. - install -d $destdir/usr/share/initramfs-tools/hooks - install -d $destdir/usr/share/initramfs-tools/scripts/init-premount - install -d $destdir/usr/share/initramfs-tools/scripts/init-bottom + install -d $DESTDIR/usr/share/initramfs-tools/hooks + install -d $DESTDIR/usr/share/initramfs-tools/scripts/init-premount + install -d $DESTDIR/usr/share/initramfs-tools/scripts/init-bottom install -m 755 ${FILESDIR}/udev.initramfs-hook \ - $destdir/usr/share/initramfs-tools/hooks/udev + $DESTDIR/usr/share/initramfs-tools/hooks/udev install -m 755 ${FILESDIR}/udev.initramfs-premount \ - $destdir/usr/share/initramfs-tools/scripts/init-premount/udev + $DESTDIR/usr/share/initramfs-tools/scripts/init-premount/udev install -m 755 ${FILESDIR}/udev.initramfs-bottom \ - $destdir/usr/share/initramfs-tools/scripts/init-bottom/udev + $DESTDIR/usr/share/initramfs-tools/scripts/init-bottom/udev } diff --git a/templates/klibc/devel.template b/templates/klibc/devel.template index 8ed466031f2..3d073af3924 100644 --- a/templates/klibc/devel.template +++ b/templates/klibc/devel.template @@ -10,15 +10,12 @@ Add_dependency run perl do_install() { - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} + mkdir -p ${DESTDIR}/usr/lib/klibc + mkdir -p ${DESTDIR}/usr/share/man/man1 - mkdir -p ${destdir}/usr/lib/klibc - mkdir -p ${destdir}/usr/share/man/man1 - - mv ${origdir}/usr/lib/klibc/include ${destdir}/usr/lib/klibc - mv ${origdir}/usr/lib/klibc/lib ${destdir}/usr/lib/klibc - mv ${origdir}/usr/bin ${destdir}/usr - mv ${origdir}/usr/man/man1/klcc.1 ${destdir}/usr/share/man/man1 - rm -rf ${origdir}/usr/man + mv ${SRCPKGDESTDIR}/usr/lib/klibc/include ${DESTDIR}/usr/lib/klibc + mv ${SRCPKGDESTDIR}/usr/lib/klibc/lib ${DESTDIR}/usr/lib/klibc + mv ${SRCPKGDESTDIR}/usr/bin ${DESTDIR}/usr + mv ${SRCPKGDESTDIR}/usr/man/man1/klcc.1 ${DESTDIR}/usr/share/man/man1 + rm -rf ${SRCPKGDESTDIR}/usr/man } diff --git a/templates/klibc/utils.template b/templates/klibc/utils.template index 98db89bdb78..66bb7f8ce95 100644 --- a/templates/klibc/utils.template +++ b/templates/klibc/utils.template @@ -10,14 +10,11 @@ Add_dependency run klibc do_install() { - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr/lib/klibc - rm -f ${origdir}/usr/lib/klibc/bin/kinit - mv ${origdir}/usr/lib/klibc/bin/kinit.shared \ - ${origdir}/usr/lib/klibc/bin/kinit - mv ${origdir}/usr/lib/klibc/bin/sh.shared \ - ${origdir}/usr/lib/klibc/bin/sh - mv ${origdir}/usr/lib/klibc/bin ${destdir}/usr/lib/klibc + mkdir -p ${DESTDIR}/usr/lib/klibc + rm -f ${SRCPKGDESTDIR}/usr/lib/klibc/bin/kinit + mv ${SRCPKGDESTDIR}/usr/lib/klibc/bin/kinit.shared \ + ${SRCPKGDESTDIR}/usr/lib/klibc/bin/kinit + mv ${SRCPKGDESTDIR}/usr/lib/klibc/bin/sh.shared \ + ${SRCPKGDESTDIR}/usr/lib/klibc/bin/sh + mv ${SRCPKGDESTDIR}/usr/lib/klibc/bin ${DESTDIR}/usr/lib/klibc } diff --git a/templates/libarchive/devel.template b/templates/libarchive/devel.template index 3d0026169d5..b449e42add2 100644 --- a/templates/libarchive/devel.template +++ b/templates/libarchive/devel.template @@ -9,10 +9,7 @@ Add_dependency run libarchive 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/libarchive.*a ${destdir}/usr/lib + mkdir -p ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr + mv ${SRCPKGDESTDIR}/usr/lib/libarchive.*a ${DESTDIR}/usr/lib } diff --git a/templates/libidn/devel.template b/templates/libidn/devel.template index 3d78596ad67..fbd252103e9 100644 --- a/templates/libidn/devel.template +++ b/templates/libidn/devel.template @@ -9,15 +9,12 @@ Add_dependency run libidn 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 - mkdir -p ${destdir}/usr/lib - mkdir -p ${destdir}/usr/share/man - - 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/pkgconfig ${destdir}/usr/lib - mv ${origdir}/usr/share/man/man3 ${destdir}/usr/share/man + mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr + mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man } diff --git a/templates/lzma-utils/devel.template b/templates/lzma-utils/devel.template index cf3e93abcbe..6400d994f87 100644 --- a/templates/lzma-utils/devel.template +++ b/templates/lzma-utils/devel.template @@ -9,10 +9,7 @@ Add_dependency run lzma-utils-libs do_install() { - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr/lib - mv ${origdir}/usr/include ${destdir}/usr - mv ${origdir}/usr/lib/liblzmadec.*a ${destdir}/usr/lib + mkdir -p ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr + mv ${SRCPKGDESTDIR}/usr/lib/liblzmadec.*a ${DESTDIR}/usr/lib } diff --git a/templates/lzma-utils/libs.template b/templates/lzma-utils/libs.template index 33bdd3904e5..ef6f2813a64 100644 --- a/templates/lzma-utils/libs.template +++ b/templates/lzma-utils/libs.template @@ -10,9 +10,6 @@ Add_dependency run gcc-libstdc++ do_install() { - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr/lib - mv ${origdir}/usr/lib/liblzmadec.so* ${destdir}/usr/lib + mkdir -p ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/liblzmadec.so* ${DESTDIR}/usr/lib } diff --git a/templates/minilogd/template b/templates/minilogd/template index a649608e606..67b87420266 100644 --- a/templates/minilogd/template +++ b/templates/minilogd/template @@ -14,12 +14,10 @@ Add_dependency run glibc do_install() { - local destdir=$XBPS_DESTDIR/$pkgname-$version - - install -d ${destdir}/sbin + install -d ${DESTDIR}/sbin cd ${FILESDIR} gcc ${CFLAGS} minilogd.c -o minilogd chmod 755 minilogd - mv minilogd ${destdir}/sbin + mv minilogd ${DESTDIR}/sbin } diff --git a/templates/mpfr/devel.template b/templates/mpfr/devel.template index d0ce5a7862c..48911fe90fe 100644 --- a/templates/mpfr/devel.template +++ b/templates/mpfr/devel.template @@ -9,10 +9,7 @@ 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 + mkdir -p ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr + mv ${SRCPKGDESTDIR}/usr/lib/libmpfr.*a ${DESTDIR}/usr/lib } diff --git a/templates/ncurses/base.template b/templates/ncurses/base.template index fdfb97fd246..cda1e35be35 100644 --- a/templates/ncurses/base.template +++ b/templates/ncurses/base.template @@ -7,24 +7,21 @@ long_desc="${long_desc} do_install() { - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - 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} + if [ -f ${SRCPKGDESTDIR}/${line} ]; then + install -D ${SRCPKGDESTDIR}/${line} ${DESTDIR}/${line} + rm -f ${SRCPKGDESTDIR}/${line} fi done - mkdir -p ${destdir}/lib/terminfo/a - mkdir -p ${destdir}/lib/terminfo/l - mkdir -p ${destdir}/lib/terminfo/v + 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 + 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 + cp ${DESTDIR}/usr/share/terminfo/v/${f} \ + ${DESTDIR}/lib/terminfo/v done } diff --git a/templates/ncurses/devel.template b/templates/ncurses/devel.template index 87be93a3588..ef4471fe621 100644 --- a/templates/ncurses/devel.template +++ b/templates/ncurses/devel.template @@ -9,16 +9,13 @@ 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 - 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 + mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr + mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/lib*.so ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man + mv ${SRCPKGDESTDIR}/usr/bin/ncurses5* ${DESTDIR}/usr/bin } diff --git a/templates/ncurses/libs.template b/templates/ncurses/libs.template index 64b05e28154..c77bec948fc 100644 --- a/templates/ncurses/libs.template +++ b/templates/ncurses/libs.template @@ -10,13 +10,10 @@ Add_dependency run ncurses-base do_install() { - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} + mkdir -p ${DESTDIR}/lib + mkdir -p ${DESTDIR}/usr/lib - mkdir -p ${destdir}/lib - mkdir -p ${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 + mv ${SRCPKGDESTDIR}/usr/lib/libcurses.so* ${DESTDIR}/lib + mv ${SRCPKGDESTDIR}/usr/lib/libncurses.so* ${DESTDIR}/lib + mv ${SRCPKGDESTDIR}/usr/lib/lib*.so.* ${DESTDIR}/usr/lib } diff --git a/templates/ncurses/term.template b/templates/ncurses/term.template index bde89fb087d..694f423b91b 100644 --- a/templates/ncurses/term.template +++ b/templates/ncurses/term.template @@ -9,11 +9,8 @@ Add_dependency run ncurses-base do_install() { - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} + mkdir -p ${DESTDIR}/usr/share - mkdir -p ${destdir}/usr/share - - mv ${origdir}/usr/share/tabset ${destdir}/usr/share - mv ${origdir}/usr/share/terminfo ${destdir}/usr/share + mv ${SRCPKGDESTDIR}/usr/share/tabset ${DESTDIR}/usr/share + mv ${SRCPKGDESTDIR}/usr/share/terminfo ${DESTDIR}/usr/share } diff --git a/templates/net-tools/template b/templates/net-tools/template index cfc8fd30e53..a8a0aa093e0 100644 --- a/templates/net-tools/template +++ b/templates/net-tools/template @@ -14,13 +14,11 @@ Add_dependency run glibc do_install() { - local destdir=$XBPS_DESTDIR/$pkgname-$version - cd $wrksrc . $XBPS_HELPERSDIR/replace-interpreter.sh replace_interpreter bash configure.sh yes "" | make || exit 1 - make BASEDIR=${destdir} update - rm -rf ${destdir}/usr/share/man/man1 + make BASEDIR=${DESTDIR} update + rm -rf ${DESTDIR}/usr/share/man/man1 } diff --git a/templates/ntp/perl.template b/templates/ntp/perl.template index 80345041f93..b0eeaedcfb0 100644 --- a/templates/ntp/perl.template +++ b/templates/ntp/perl.template @@ -10,11 +10,8 @@ Add_dependency run perl do_install() { - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr/bin + mkdir -p ${DESTDIR}/usr/bin for f in ntp-wait ntptrace; do - mv ${origdir}/usr/bin/${f} ${destdir}/usr/bin + mv ${SRCPKGDESTDIR}/usr/bin/${f} ${DESTDIR}/usr/bin done } diff --git a/templates/ntp/template b/templates/ntp/template index 9f88e811dfb..ace47d474dc 100644 --- a/templates/ntp/template +++ b/templates/ntp/template @@ -25,14 +25,12 @@ Add_dependency full openssl post_install() { - local destdir=$XBPS_DESTDIR/$pkgname-$version - - install -d ${destdir}/etc/rc.d - install -d ${destdir}/usr/share/ntp - install -d ${destdir}/usr/share/doc/ntp - install -m 755 ${FILESDIR}/ntpd ${destdir}/etc/rc.d/ntpd - install -m 755 ${FILESDIR}/ntpdate ${destdir}/etc/rc.d/ntpdate - install -m 644 ${FILESDIR}/ntp.conf ${destdir}/etc/ntp.conf - cp -a ${wrksrc}/html ${destdir}/usr/share/doc/ntp - cp -a ${wrksrc}/conf ${destdir}/usr/share/ntp + install -d ${DESTDIR}/etc/rc.d + install -d ${DESTDIR}/usr/share/ntp + install -d ${DESTDIR}/usr/share/doc/ntp + install -m 755 ${FILESDIR}/ntpd ${DESTDIR}/etc/rc.d/ntpd + install -m 755 ${FILESDIR}/ntpdate ${DESTDIR}/etc/rc.d/ntpdate + install -m 644 ${FILESDIR}/ntp.conf ${DESTDIR}/etc/ntp.conf + cp -a ${wrksrc}/html ${DESTDIR}/usr/share/doc/ntp + cp -a ${wrksrc}/conf ${DESTDIR}/usr/share/ntp } diff --git a/templates/openssh/client.template b/templates/openssh/client.template index 12e66228517..256047aa0fb 100644 --- a/templates/openssh/client.template +++ b/templates/openssh/client.template @@ -14,21 +14,18 @@ Add_dependency run openssh do_install() { - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/usr/bin - mkdir -p ${destdir}/etc/ssh - mkdir -p ${destdir}/usr/share/man/man1 - mkdir -p ${destdir}/usr/share/man/man5 + mkdir -p ${DESTDIR}/usr/bin + mkdir -p ${DESTDIR}/etc/ssh + mkdir -p ${DESTDIR}/usr/share/man/man1 + mkdir -p ${DESTDIR}/usr/share/man/man5 for f in scp sftp slogin ssh ssh-add ssh-agent \ ssh-copy-id ssh-keyscan findssl; do - mv ${origdir}/usr/bin/${f} ${destdir}/usr/bin - [ ! -f ${origdir}/usr/share/man/man1/${f}.1 ] && continue - mv ${origdir}/usr/share/man/man1/${f}.1 \ - ${destdir}/usr/share/man/man1 + mv ${SRCPKGDESTDIR}/usr/bin/${f} ${DESTDIR}/usr/bin + [ ! -f ${SRCPKGDESTDIR}/usr/share/man/man1/${f}.1 ] && continue + mv ${SRCPKGDESTDIR}/usr/share/man/man1/${f}.1 \ + ${DESTDIR}/usr/share/man/man1 done - mv ${origdir}/etc/ssh/ssh_config ${destdir}/etc/ssh - mv ${origdir}/usr/share/man/man5/ssh_config.5 \ - ${destdir}/usr/share/man/man5 + mv ${SRCPKGDESTDIR}/etc/ssh/ssh_config ${DESTDIR}/etc/ssh + mv ${SRCPKGDESTDIR}/usr/share/man/man5/ssh_config.5 \ + ${DESTDIR}/usr/share/man/man5 } diff --git a/templates/openssh/server.template b/templates/openssh/server.template index 2be61e72a43..f7fb605e771 100644 --- a/templates/openssh/server.template +++ b/templates/openssh/server.template @@ -15,24 +15,21 @@ Add_dependency run openssh do_install() { - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} - - mkdir -p ${destdir}/etc/ssh - mkdir -p ${destdir}/usr/libexec/openssh - mkdir -p ${destdir}/usr/share/man/man5 - mkdir -p ${destdir}/usr/share/man/man8 - mv ${origdir}/usr/libexec/openssh/sftp-server \ - ${destdir}/usr/libexec/openssh - mv ${origdir}/etc/ssh/sshd_config ${destdir}/etc/ssh - mv ${origdir}/usr/sbin ${destdir}/usr - mv ${origdir}/usr/share/man/man5/sshd_config.5 \ - ${destdir}/usr/share/man/man5 + mkdir -p ${DESTDIR}/etc/ssh + mkdir -p ${DESTDIR}/usr/libexec/openssh + mkdir -p ${DESTDIR}/usr/share/man/man5 + mkdir -p ${DESTDIR}/usr/share/man/man8 + mv ${SRCPKGDESTDIR}/usr/libexec/openssh/sftp-server \ + ${DESTDIR}/usr/libexec/openssh + mv ${SRCPKGDESTDIR}/etc/ssh/sshd_config ${DESTDIR}/etc/ssh + mv ${SRCPKGDESTDIR}/usr/sbin ${DESTDIR}/usr + mv ${SRCPKGDESTDIR}/usr/share/man/man5/sshd_config.5 \ + ${DESTDIR}/usr/share/man/man5 for f in sftp-server sshd; do - mv ${origdir}/usr/share/man/man8/${f}.8 \ - ${destdir}/usr/share/man/man8 + mv ${SRCPKGDESTDIR}/usr/share/man/man8/${f}.8 \ + ${DESTDIR}/usr/share/man/man8 done - mv ${origdir}/etc/pam.d ${destdir}/etc - mv ${origdir}/etc/rc.d ${destdir}/etc - mv ${origdir}/var ${destdir} + mv ${SRCPKGDESTDIR}/etc/pam.d ${DESTDIR}/etc + mv ${SRCPKGDESTDIR}/etc/rc.d ${DESTDIR}/etc + mv ${SRCPKGDESTDIR}/var ${DESTDIR} } diff --git a/templates/openssh/template b/templates/openssh/template index 754dd1917f7..9b7a295a1aa 100644 --- a/templates/openssh/template +++ b/templates/openssh/template @@ -1,6 +1,6 @@ # Template file for 'openssh' pkgname=openssh -sourcepkg=openssh +sourcepkg=$pkgname version=5.2p1 distfiles=" http://sunsite.rediris.es/pub/OpenBSD/OpenSSH/portable/$pkgname-$version.tar.gz" @@ -43,21 +43,19 @@ Add_dependency build tcp_wrappers post_install() { - local destdir=$XBPS_DESTDIR/$pkgname-$version - install -D -m644 ${wrksrc}/contrib/sshd.pam.generic \ - ${destdir}/etc/pam.d/sshd + ${DESTDIR}/etc/pam.d/sshd install -D -m755 ${wrksrc}/contrib/findssl.sh \ - ${destdir}/usr/bin/findssl + ${DESTDIR}/usr/bin/findssl install -D -m755 ${wrksrc}/contrib/ssh-copy-id \ - ${destdir}/usr/bin/ssh-copy-id + ${DESTDIR}/usr/bin/ssh-copy-id install -D -m644 ${wrksrc}/contrib/ssh-copy-id.1 \ - ${destdir}/usr/share/man/man1/ssh-copy-id.1 - install -D -m755 ${FILESDIR}/sshd ${destdir}/etc/rc.d/sshd + ${DESTDIR}/usr/share/man/man1/ssh-copy-id.1 + install -D -m755 ${FILESDIR}/sshd ${DESTDIR}/etc/rc.d/sshd sed -i \ -e 's|^#ListenAddress 0.0.0.0|ListenAddress 0.0.0.0|g' \ -e 's|^#UsePAM no|UsePAM yes|g' \ -e 's|^#ChallengeResponseAuthentication yes|ChallengeResponseAuthentication no|g' \ - ${destdir}/etc/ssh/sshd_config + ${DESTDIR}/etc/ssh/sshd_config } diff --git a/templates/openssl/devel.template b/templates/openssl/devel.template index d5d4112bf57..a8519b7a19e 100644 --- a/templates/openssl/devel.template +++ b/templates/openssl/devel.template @@ -9,16 +9,13 @@ Add_dependency run openssl do_install() { - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} + mkdir -p ${DESTDIR}/usr/lib + mkdir -p ${DESTDIR}/usr/share/man - mkdir -p ${destdir}/usr/lib - mkdir -p ${destdir}/usr/share/man - - mv ${origdir}/usr/include ${destdir}/usr - mv ${origdir}/usr/lib/fips* ${destdir}/usr/lib - mv ${origdir}/usr/lib/*.*a ${destdir}/usr/lib - mv ${origdir}/usr/lib/*.so ${destdir}/usr/lib - mv ${origdir}/usr/lib/pkgconfig ${destdir}/usr/lib - mv ${origdir}/usr/share/man/man3 ${destdir}/usr/share/man + mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr + mv ${SRCPKGDESTDIR}/usr/lib/fips* ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man } diff --git a/templates/openssl/template b/templates/openssl/template index 61521696888..02f8274dfd2 100644 --- a/templates/openssl/template +++ b/templates/openssl/template @@ -31,13 +31,11 @@ Add_dependency build perl post_install() { - local destdir="$XBPS_DESTDIR/$pkgname-$version" - # Grr. Stupid Makefile, remove stuff installed in wrong dir. - rm -rf $destdir/usr/usr + rm -rf $DESTDIR/usr/usr # Fix for correct SONAME in shared libs. - cd $destdir/usr/lib || exit 1 + cd $DESTDIR/usr/lib || exit 1 for f in libssl libcrypto; do ln -sf $f.so.${openssl_version} $f.so.7 done diff --git a/templates/pam/devel.template b/templates/pam/devel.template index 68a1c4e5a86..80f77a60411 100644 --- a/templates/pam/devel.template +++ b/templates/pam/devel.template @@ -9,15 +9,12 @@ Add_dependency run pam do_install() { - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} + mkdir -p ${DESTDIR}/lib/security + mkdir -p ${DESTDIR}/usr/share/man - mkdir -p ${destdir}/lib/security - mkdir -p ${destdir}/usr/share/man - - mv ${origdir}/usr/include ${destdir}/usr - mv ${origdir}/usr/share/man/man3 ${destdir}/usr/share/man - mv ${origdir}/lib/*.*a ${destdir}/lib - mv ${origdir}/lib/*.so ${destdir}/lib - mv ${origdir}/lib/security/*.*a ${destdir}/lib/security + mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr + mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man + mv ${SRCPKGDESTDIR}/lib/*.*a ${DESTDIR}/lib + mv ${SRCPKGDESTDIR}/lib/*.so ${DESTDIR}/lib + mv ${SRCPKGDESTDIR}/lib/security/*.*a ${DESTDIR}/lib/security } diff --git a/templates/pcre/devel.template b/templates/pcre/devel.template index 5a1539973fb..616392ee2e5 100644 --- a/templates/pcre/devel.template +++ b/templates/pcre/devel.template @@ -9,17 +9,14 @@ Add_dependency run pcre do_install() { - local destdir=${XBPS_DESTDIR}/${pkgname}-${version} - local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} + mkdir -p ${DESTDIR}/usr/bin + mkdir -p ${DESTDIR}/usr/lib + mkdir -p ${DESTDIR}/usr/share/man - mkdir -p ${destdir}/usr/bin - mkdir -p ${destdir}/usr/lib - mkdir -p ${destdir}/usr/share/man - - mv ${origdir}/usr/bin/pcre-config ${destdir}/usr/bin - 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/pkgconfig ${destdir}/usr/lib - mv ${origdir}/usr/share/man/man3 ${destdir}/usr/share/man + mv ${SRCPKGDESTDIR}/usr/bin/pcre-config ${DESTDIR}/usr/bin + mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr + mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man } diff --git a/templates/perl/template b/templates/perl/template index 56ad679c37b..98da80ad042 100644 --- a/templates/perl/template +++ b/templates/perl/template @@ -44,17 +44,16 @@ pre_build() post_install() { # Remove hardcoded paths of XBPS_DESTDIR. - local destdir="$XBPS_DESTDIR/$pkgname-$version" local FILES="Config.pm Config_heavy.pl .packlist" local opmult="${xbps_machine}-linux-thread-multi" - local thrdir="${destdir}/usr/lib/perl5/${version}/${opmult}" + local thrdir="${DESTDIR}/usr/lib/perl5/${version}/${opmult}" for f in ${FILES}; do - sed -i -e "s|$destdir||g" ${thrdir}/${f} + sed -i -e "s|$DESTDIR||g" ${thrdir}/${f} done - for f in $(find $destdir/usr/bin/ -type f -print); do - if $(echo $f|grep -q $destdir); then - sed -i -e "s|$destdir||g" $f + for f in $(find $DESTDIR/usr/bin/ -type f -print); do + if $(echo $f|grep -q $DESTDIR); then + sed -i -e "s|$DESTDIR||g" $f fi done } diff --git a/templates/proplib/devel.template b/templates/proplib/devel.template index 4683ef4e6cf..408c35965d6 100644 --- a/templates/proplib/devel.template +++ b/templates/proplib/devel.template @@ -9,10 +9,7 @@ Add_dependency run proplib 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/libprop.*a ${destdir}/usr/lib + mkdir -p ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr + mv ${SRCPKGDESTDIR}/usr/lib/libprop.*a ${DESTDIR}/usr/lib } diff --git a/templates/rcorder/template b/templates/rcorder/template index 97029ab0155..86e679906c6 100644 --- a/templates/rcorder/template +++ b/templates/rcorder/template @@ -16,14 +16,12 @@ Add_dependency run glibc do_install() { - local destdir=$XBPS_DESTDIR/$pkgname-$version - - mkdir -p ${destdir}/sbin - mkdir -p ${destdir}/usr/share/man/man8 + mkdir -p ${DESTDIR}/sbin + mkdir -p ${DESTDIR}/usr/share/man/man8 cd $XBPS_TEMPLATESDIR/rcorder/files make || exit 1 - install -m755 ./rcorder ${destdir}/sbin - install -m644 ./rcorder.8 ${destdir}/usr/share/man/man8 + install -m755 ./rcorder ${DESTDIR}/sbin + install -m644 ./rcorder.8 ${DESTDIR}/usr/share/man/man8 make clean } diff --git a/templates/readline/template b/templates/readline/template index dea2681e26d..b53aa98b117 100644 --- a/templates/readline/template +++ b/templates/readline/template @@ -38,9 +38,7 @@ pre_configure() post_install() { - local destdir=$XBPS_DESTDIR/$pkgname-$version - # Move shared libs into /lib. - mkdir -p $destdir/lib - mv $destdir/usr/lib/lib*.so* $destdir/lib + mkdir -p $DESTDIR/lib + mv $DESTDIR/usr/lib/lib*.so* $DESTDIR/lib } diff --git a/templates/shadow/template b/templates/shadow/template index 5bba871b460..bd369a86b5e 100644 --- a/templates/shadow/template +++ b/templates/shadow/template @@ -33,11 +33,9 @@ pre_build() post_install() { - local destdir=$XBPS_DESTDIR/$pkgname-$version - # Use the same auth file for all these cmds. for f in chpasswd chgpasswd groupadd groupdel groupmems \ groupmod newusers useradd userdel usermod other; do - install -m644 $destdir/etc/pam.d/chage $destdir/etc/pam.d/${f} + install -m644 $DESTDIR/etc/pam.d/chage $DESTDIR/etc/pam.d/${f} done } diff --git a/templates/sudo/template b/templates/sudo/template index c1885289958..824819d2897 100644 --- a/templates/sudo/template +++ b/templates/sudo/template @@ -22,10 +22,8 @@ Add_dependency full pam post_install() { - local destdir=$XBPS_DESTDIR/$pkgname-$version - - install -d $destdir/etc/pam.d - cat > $destdir/etc/pam.d/sudo <<_EOF + install -d $DESTDIR/etc/pam.d + cat > $DESTDIR/etc/pam.d/sudo <<_EOF auth required pam_unix.so account required pam_unix.so session optional pam_mail.so dir=/var/mail standard @@ -33,4 +31,5 @@ session optional pam_xauth.so session required pam_env.so session required pam_unix.so _EOF + chmod 644 $DESTDIR/etc/pam.d/sudo } diff --git a/templates/sysklogd/template b/templates/sysklogd/template index d1974e3a171..6ac77da93f1 100644 --- a/templates/sysklogd/template +++ b/templates/sysklogd/template @@ -26,10 +26,8 @@ Add_dependency full glibc post_install() { - local destdir=$XBPS_DESTDIR/$pkgname-$version - # Create a default syslog.conf. - install -d ${destdir}/etc/rc.d + install -d ${DESTDIR}/etc/rc.d ( \ echo "auth,authpriv.* -/var/log/auth.log"; \ echo "*.*;auth,authpriv.none -/var/log/sys.log"; \ @@ -38,8 +36,9 @@ post_install() echo "mail.* -/var/log/mail.log"; \ echo "user.* -/var/log/user.log"; \ echo "*.emerg *"; \ - ) > $destdir/etc/syslog.conf + ) > $DESTDIR/etc/syslog.conf + chmod 644 $DESTDIR/etc/syslog.conf # Install the rc.d scripts. - install -m755 ${FILESDIR}/* ${destdir}/etc/rc.d + install -m755 ${FILESDIR}/* ${DESTDIR}/etc/rc.d } diff --git a/templates/sysvinit/template b/templates/sysvinit/template index 7fe7bae1a6e..344b9e0df85 100644 --- a/templates/sysvinit/template +++ b/templates/sysvinit/template @@ -18,13 +18,11 @@ Add_dependency full gawk do_install() { - local destdir=$XBPS_DESTDIR/$pkgname-$version - - mkdir -p ${destdir}/bin ${destdir}/sbin - mkdir -p ${destdir}/usr/bin ${destdir}/usr/include - mkdir -p ${destdir}/usr/share/man/man1 - mkdir -p ${destdir}/usr/share/man/man5 - mkdir -p ${destdir}/usr/share/man/man8 + mkdir -p ${DESTDIR}/bin ${DESTDIR}/sbin + mkdir -p ${DESTDIR}/usr/bin ${DESTDIR}/usr/include + mkdir -p ${DESTDIR}/usr/share/man/man1 + mkdir -p ${DESTDIR}/usr/share/man/man5 + mkdir -p ${DESTDIR}/usr/share/man/man8 sed -i -e 's/utmpdump wall/utmpdump/' \ -e 's/mountpoint.1 wall.1/mountpoint.1/' src/Makefile @@ -32,5 +30,5 @@ do_install() $wrksrc/src/init.c cd $wrksrc && make -C src && \ - make -C src MANDIR=/usr/share/man ROOT=${destdir} install + make -C src MANDIR=/usr/share/man ROOT=${DESTDIR} install } diff --git a/templates/tcp_wrappers/devel.template b/templates/tcp_wrappers/devel.template index 3dd97a3e451..319c8a14794 100644 --- a/templates/tcp_wrappers/devel.template +++ b/templates/tcp_wrappers/devel.template @@ -9,14 +9,11 @@ Add_dependency run tcp_wrappers-libs 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/man3 - mkdir -p ${destdir}/usr/lib - mkdir -p ${destdir}/usr/share/man/man3 - - mv ${origdir}/usr/share/man/man3 ${destdir}/usr/share/man - mv ${origdir}/usr/include ${destdir}/usr - mv ${origdir}/usr/lib/*.a ${destdir}/usr/lib - mv ${origdir}/usr/lib/*.so ${destdir}/usr/lib + mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man + mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr + mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib } diff --git a/templates/tcp_wrappers/libs.template b/templates/tcp_wrappers/libs.template index 922dbcbb1a2..d6eb3473d84 100644 --- a/templates/tcp_wrappers/libs.template +++ b/templates/tcp_wrappers/libs.template @@ -11,12 +11,9 @@ Add_dependency run glibc 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/lib*.so.* ${destdir}/usr/lib - mv ${origdir}/etc ${destdir} - mv ${origdir}/usr/share/man/man5 ${destdir}/usr/share/man + mkdir -p ${DESTDIR}/usr/lib + mkdir -p ${DESTDIR}/usr/share/man + mv ${SRCPKGDESTDIR}/usr/lib/lib*.so.* ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/etc ${DESTDIR} + mv ${SRCPKGDESTDIR}/usr/share/man/man5 ${DESTDIR}/usr/share/man } diff --git a/templates/tcp_wrappers/template b/templates/tcp_wrappers/template index e34a7d26720..b161cd9be83 100644 --- a/templates/tcp_wrappers/template +++ b/templates/tcp_wrappers/template @@ -24,14 +24,12 @@ Add_dependency run tcp_wrappers-libs pre_install() { - local destdir=$XBPS_DESTDIR/$pkgname-$version - - install -d ${destdir}/usr/lib - install -d ${destdir}/usr/sbin - install -d ${destdir}/usr/include + install -d ${DESTDIR}/usr/lib + install -d ${DESTDIR}/usr/sbin + install -d ${DESTDIR}/usr/include for f in 3 5 8; do - install -d ${destdir}/usr/share/man/man${f} + install -d ${DESTDIR}/usr/share/man/man${f} done - install -D -m644 ${FILESDIR}/hosts.allow ${destdir}/etc/hosts.allow - install -m644 ${FILESDIR}/hosts.deny ${destdir}/etc/hosts.deny + install -D -m644 ${FILESDIR}/hosts.allow ${DESTDIR}/etc/hosts.allow + install -m644 ${FILESDIR}/hosts.deny ${DESTDIR}/etc/hosts.deny } diff --git a/templates/udev/template b/templates/udev/template index 66cd6e713bc..a902746d0af 100644 --- a/templates/udev/template +++ b/templates/udev/template @@ -18,16 +18,14 @@ Add_dependency full procps post_install() { - local destdir=$XBPS_DESTDIR/$pkgname-$version - - install -d $destdir/lib/firmware - install -d $destdir/lib/udev/devices/pts - install -d $destdir/lib/udev/devices/shm - mknod -m0666 $destdir/lib/udev/devices/null c 1 3 - mknod -m0600 $destdir/lib/udev/devices/kmsg c 1 11 - ln -s /proc/self/fd $destdir/lib/udev/devices/fd - ln -s /proc/self/fd/0 $destdir/lib/udev/devices/stdin - ln -s /proc/self/fd/1 $destdir/lib/udev/devices/stdout - ln -s /proc/self/fd/2 $destdir/lib/udev/devices/stderr - ln -s /proc/kcore $destdir/lib/udev/devices/core + install -d $DESTDIR/lib/firmware + install -d $DESTDIR/lib/udev/devices/pts + install -d $DESTDIR/lib/udev/devices/shm + mknod -m0666 $DESTDIR/lib/udev/devices/null c 1 3 + mknod -m0600 $DESTDIR/lib/udev/devices/kmsg c 1 11 + ln -s /proc/self/fd $DESTDIR/lib/udev/devices/fd + ln -s /proc/self/fd/0 $DESTDIR/lib/udev/devices/stdin + ln -s /proc/self/fd/1 $DESTDIR/lib/udev/devices/stdout + ln -s /proc/self/fd/2 $DESTDIR/lib/udev/devices/stderr + ln -s /proc/kcore $DESTDIR/lib/udev/devices/core } diff --git a/templates/util-linux-ng/template b/templates/util-linux-ng/template index 4ee135a83c1..479f3b2c0d1 100644 --- a/templates/util-linux-ng/template +++ b/templates/util-linux-ng/template @@ -30,10 +30,8 @@ post_configure() post_install() { - local destdir=$XBPS_DESTDIR/$pkgname-$version - # Move logger to /bin. - install -d -m 755 ${destdir}/bin - mv ${destdir}/usr/bin/logger ${destdir}/bin - mkdir -p ${destdir}/var/lib/hwclock + install -d -m 755 ${DESTDIR}/bin + mv ${DESTDIR}/usr/bin/logger ${DESTDIR}/bin + mkdir -p ${DESTDIR}/var/lib/hwclock } diff --git a/templates/xbps-base-dirs/template b/templates/xbps-base-dirs/template index 79160b7da0a..bb828a0cffb 100644 --- a/templates/xbps-base-dirs/template +++ b/templates/xbps-base-dirs/template @@ -13,41 +13,39 @@ install_priority=100 do_install() { - local destdir=$XBPS_DESTDIR/$pkgname-$version - for f in bin sbin boot etc home lib dev proc mnt opt sys var \ media/cdrom; do - mkdir -p $destdir/$f + mkdir -p $DESTDIR/$f done - mkdir -p -m 0750 $destdir/root - mkdir -p -m 1777 $destdir/tmp $destdir/var/tmp + mkdir -p -m 0750 $DESTDIR/root + mkdir -p -m 1777 $DESTDIR/tmp $DESTDIR/var/tmp for f in local bin include lib sbin src; do - mkdir -p $destdir/usr/$f + mkdir -p $DESTDIR/usr/$f done for f in locale misc terminfo zoneinfo doc info; do - mkdir -p $destdir/usr/share/$f - mkdir -p $destdir/usr/local/share/$f + mkdir -p $DESTDIR/usr/share/$f + mkdir -p $DESTDIR/usr/local/share/$f done for f in 1 2 3 4 5 6 7 8; do - mkdir -p $destdir/usr/share/man/man$f - mkdir -p $destdir/usr/local/share/man/man$f + mkdir -p $DESTDIR/usr/share/man/man$f + mkdir -p $DESTDIR/usr/local/share/man/man$f done - cd $destdir/usr && ln -s ./share/man man - cd $destdir/usr/local && ln -s ./share/man man + cd $DESTDIR/usr && ln -s ./share/man man + cd $DESTDIR/usr/local && ln -s ./share/man man for f in lock log mail run spool opt cache lib; do - mkdir -p $destdir/var/$f + mkdir -p $DESTDIR/var/$f done if [ "$xbps_machine" = "x86_64" ]; then - mkdir -p $destdir/usr/lib - mkdir -p $destdir/lib - cd $destdir && ln -s lib lib64 - cd $destdir/usr && ln -s lib lib64 + mkdir -p $DESTDIR/usr/lib + mkdir -p $DESTDIR/lib + cd $DESTDIR && ln -s lib lib64 + cd $DESTDIR/usr && ln -s lib lib64 fi } diff --git a/templates/xbps-base-pkg/template b/templates/xbps-base-pkg/template index a0111168ef1..4f473ddb3d9 100644 --- a/templates/xbps-base-pkg/template +++ b/templates/xbps-base-pkg/template @@ -14,13 +14,11 @@ Add_dependency run proplib do_install() { - local destdir=$XBPS_DESTDIR/$pkgname-$version - - mkdir -p ${destdir}/lib + mkdir -p ${DESTDIR}/lib for f in bin cmpver digest repo pkgdb; do install -D -m755 /usr/local/sbin/xbps-${f} \ - ${destdir}/sbin/xbps-${f} + ${DESTDIR}/sbin/xbps-${f} done - cp -a /usr/local/lib/libxbps.so* ${destdir}/lib + cp -a /usr/local/lib/libxbps.so* ${DESTDIR}/lib } diff --git a/templates/zlib/devel.template b/templates/zlib/devel.template index 6fe55a56197..619e0f7c13a 100644 --- a/templates/zlib/devel.template +++ b/templates/zlib/devel.template @@ -9,10 +9,7 @@ Add_dependency run zlib 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/libz.*a ${destdir}/usr/lib + mkdir -p ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr + mv ${SRCPKGDESTDIR}/usr/lib/libz.*a ${DESTDIR}/usr/lib }