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
This commit is contained in:
Juan RP 2009-03-11 06:31:56 +01:00
parent 529cb677ff
commit 84222395b8
90 changed files with 535 additions and 735 deletions
shutils
templates

View file

@ -59,6 +59,7 @@ xbps_write_metadata_pkg()
unset run_depends conf_files keep_dirs noarch install_priority unset run_depends conf_files keep_dirs noarch install_priority
. $XBPS_TEMPLATESDIR/${sourcepkg}/${subpkg}.template . $XBPS_TEMPLATESDIR/${sourcepkg}/${subpkg}.template
pkgname=${sourcepkg}-${subpkg} pkgname=${sourcepkg}-${subpkg}
set_tmpl_common_vars
xbps_write_metadata_pkg_real xbps_write_metadata_pkg_real
run_template ${sourcepkg} run_template ${sourcepkg}
[ "${pkg}" = "${sourcepkg}-${subpkg}" ] && break [ "${pkg}" = "${sourcepkg}-${subpkg}" ] && break
@ -71,6 +72,7 @@ xbps_write_metadata_pkg()
run_depends="$run_depends ${sourcepkg}-${subpkg}-${version}" run_depends="$run_depends ${sourcepkg}-${subpkg}-${version}"
done done
fi fi
set_tmpl_common_vars
xbps_write_metadata_pkg_real xbps_write_metadata_pkg_real
} }
@ -80,12 +82,11 @@ xbps_write_metadata_pkg()
# #
xbps_write_metadata_pkg_real() 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 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." echo "ERROR: $pkgname not installed into destdir."
exit 1 exit 1
fi fi
@ -111,7 +112,7 @@ xbps_write_metadata_pkg_real()
write_metadata_flist_header $TMPFPLIST write_metadata_flist_header $TMPFPLIST
# Pass 1: add links. # 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=$(echo $f|sed -e "$fpattern")
[ "$j" = "" ] && continue [ "$j" = "" ] && continue
printf "$j\n" >> $TMPFLIST printf "$j\n" >> $TMPFLIST
@ -124,7 +125,7 @@ xbps_write_metadata_pkg_real()
done done
# Pass 2: add regular files. # 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=$(echo $f|sed -e "$fpattern")
[ "$j" = "" ] && continue [ "$j" = "" ] && continue
printf "$j\n" >> $TMPFLIST printf "$j\n" >> $TMPFLIST
@ -146,7 +147,7 @@ xbps_write_metadata_pkg_real()
done done
# Pass 3: add directories. # 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=$(echo $f|sed -e "$fpattern")
[ "$j" = "" ] && continue [ "$j" = "" ] && continue
printf "$j\n" >> $TMPFLIST printf "$j\n" >> $TMPFLIST
@ -184,7 +185,7 @@ xbps_write_metadata_pkg_real()
<key>priority</key> <key>priority</key>
<integer>$prioinst</integer> <integer>$prioinst</integer>
<key>installed_size</key> <key>installed_size</key>
<integer>$(du -sb $destdir|awk '{print $1}')</integer> <integer>$(du -sb ${DESTDIR}|awk '{print $1}')</integer>
<key>maintainer</key> <key>maintainer</key>
<string>$(echo $maintainer|sed -e 's|<|[|g;s|>|]|g')</string> <string>$(echo $maintainer|sed -e 's|<|[|g;s|>|]|g')</string>
<key>short_desc</key> <key>short_desc</key>
@ -243,8 +244,8 @@ _EOF
rm -f $TMPFLIST $TMPFPLIST $TMPFPROPS rm -f $TMPFLIST $TMPFPLIST $TMPFPROPS
if [ -f "$XBPS_TEMPLATESDIR/$pkgname/INSTALL" ]; then if [ -f "$XBPS_TEMPLATESDIR/$pkgname/INSTALL" ]; then
cp -f $XBPS_TEMPLATESDIR/$pkgname/INSTALL $destdir cp -f $XBPS_TEMPLATESDIR/$pkgname/INSTALL ${DESTDIR}
chmod +x $destdir/INSTALL chmod +x ${DESTDIR}/INSTALL
fi fi
if [ -f "$XBPS_TEMPLATESDIR/$pkgname/REMOVE" ]; then if [ -f "$XBPS_TEMPLATESDIR/$pkgname/REMOVE" ]; then
cp -f $XBPS_TEMPLATESDIR/$pkgname/REMOVE $metadir cp -f $XBPS_TEMPLATESDIR/$pkgname/REMOVE $metadir
@ -261,12 +262,14 @@ xbps_make_binpkg()
if [ "$pkg" = "$pkgname-$subpkg" ]; then if [ "$pkg" = "$pkgname-$subpkg" ]; then
. $XBPS_TEMPLATESDIR/$pkgname/$subpkg.template . $XBPS_TEMPLATESDIR/$pkgname/$subpkg.template
pkgname=${sourcepkg}-${subpkg} pkgname=${sourcepkg}-${subpkg}
set_tmpl_common_vars
xbps_make_binpkg_real xbps_make_binpkg_real
return $? return $?
fi fi
run_template ${sourcepkg} run_template ${sourcepkg}
done done
set_tmpl_common_vars
xbps_make_binpkg_real xbps_make_binpkg_real
return $? return $?
} }
@ -277,13 +280,12 @@ xbps_make_binpkg()
# #
xbps_make_binpkg_real() xbps_make_binpkg_real()
{ {
local destdir=$XBPS_DESTDIR/$pkgname-$version
local binpkg= local binpkg=
local pkgdir= local pkgdir=
local arch= local arch=
local use_sudo= local use_sudo=
cd $destdir || exit 1 cd ${DESTDIR} || exit 1
if [ -n "$noarch" ]; then if [ -n "$noarch" ]; then
arch=noarch arch=noarch

View file

@ -32,20 +32,21 @@
install_pkg_deps() install_pkg_deps()
{ {
local curpkg="$1" local curpkg="$1"
local saved_prevpkg=$(xbps-pkgdb getpkgname ${2}) local curpkgname=$(xbps-pkgdb getpkgname $1)
local curpkgname j jver jname reqver local saved_prevpkg=$(xbps-pkgdb getpkgname $2)
local j jver jname reqver
[ -z "$curpkg" ] && return 1 [ -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 run_template $curpkgname
check_installed_pkg $curpkg check_build_depends_pkg
[ $? -eq 0 ] && continue
echo "==> Installing $saved_prevpkg dependency: $curpkg"
check_build_depends_pkg $curpkg
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "==> Dependency $curpkgname requires:" echo "==> Dependency $curpkgname requires:"
for j in ${build_depends}; do for j in ${build_depends}; do
@ -78,6 +79,7 @@ install_pkg_deps()
done done
install_pkg $curpkgname auto install_pkg $curpkgname auto
[ -n "$prev_pkg" ] && unset prev_pkg
} }
# #
@ -87,11 +89,7 @@ install_dependencies_pkg()
{ {
local pkg="$1" local pkg="$1"
local lpkgname=$(xbps-pkgdb getpkgname ${pkg}) local lpkgname=$(xbps-pkgdb getpkgname ${pkg})
local i= local i ipkgname iversion reqvers notinstalled_deps
local ipkgname=
local iversion=
local reqvers=
local notinstalled_deps=
[ -z "$pkg" ] && return 1 [ -z "$pkg" ] && return 1
@ -112,19 +110,17 @@ install_dependencies_pkg()
fi fi
done done
if [ -z "$notinstalled_deps" ]; then [ -z "$notinstalled_deps" ] && return 0
return 0
fi
for i in ${notinstalled_deps}; do for i in ${notinstalled_deps}; do
ipkgname=$(xbps-pkgdb getpkgname ${i})
run_template $ipkgname
check_installed_pkg $i check_installed_pkg $i
[ $? -eq 0 ] && continue [ $? -eq 0 ] && continue
check_build_depends_pkg $i ipkgname=$(xbps-pkgdb getpkgname ${i})
run_template $ipkgname
check_build_depends_pkg
if [ $? -eq 1 ]; then if [ $? -eq 1 ]; then
msg_normal "Installing $lpkgname dependency: $ipkgname" msg_normal "Installing $lpkgname dependency: $ipkgname."
install_pkg $ipkgname auto install_pkg $ipkgname auto
else else
install_pkg_deps $i $pkg install_pkg_deps $i $pkg
@ -136,8 +132,7 @@ install_builddeps_required_pkg()
{ {
local pkg="$1" local pkg="$1"
local pkgname=$(xbps-pkgdb getpkgname ${pkg}) local pkgname=$(xbps-pkgdb getpkgname ${pkg})
local dep= local dep depname
local depname=
[ -z "$pkg" ] && return 1 [ -z "$pkg" ] && return 1
@ -160,11 +155,9 @@ install_builddeps_required_pkg()
check_installed_pkg() check_installed_pkg()
{ {
local pkg="$1" local pkg="$1"
local pkgname= local pkgname reqver iver
local reqver=
local iver=
[ -z "$pkg" ] && return 1 [ -z "$pkg" ] && return 2
pkgname=$(xbps-pkgdb getpkgname $pkg) pkgname=$(xbps-pkgdb getpkgname $pkg)
reqver=$(xbps-pkgdb getpkgversion $pkg) reqver=$(xbps-pkgdb getpkgversion $pkg)
@ -185,12 +178,7 @@ check_installed_pkg()
# #
check_build_depends_pkg() check_build_depends_pkg()
{ {
local pkg="$1" [ -z "$pkgname" ] && return 2
local pkgname=$(xbps-pkgdb getpkgname ${pkg})
[ -z $pkg ] && return 1
run_template $pkgname
if [ -n "$build_depends" ]; then if [ -n "$build_depends" ]; then
return 0 return 0

View file

@ -31,7 +31,6 @@ configure_src_phase()
{ {
local pkg="$1" local pkg="$1"
local f= local f=
local destdir=$XBPS_DESTDIR/$pkgname-$version
[ -z $pkg ] && [ -z $pkgname ] && return 1 [ -z $pkg ] && [ -z $pkgname ] && return 1
@ -87,8 +86,8 @@ configure_src_phase()
if [ "$build_style" = "gnu_configure" ]; then if [ "$build_style" = "gnu_configure" ]; then
${configure_script} \ ${configure_script} \
--prefix=${_prefix} --sysconfdir=/etc \ --prefix=${_prefix} --sysconfdir=/etc \
--infodir=$destdir/usr/share/info \ --infodir=${DESTDIR}/usr/share/info \
--mandir=$destdir/usr/share/man \ --mandir=${DESTDIR}/usr/share/man \
${configure_args} ${configure_args}
# #
# Packages using propietary configure scripts. # Packages using propietary configure scripts.

View file

@ -91,6 +91,7 @@ install_src_phase()
fi fi
. $XBPS_TEMPLATESDIR/$pkgname/$subpkg.template . $XBPS_TEMPLATESDIR/$pkgname/$subpkg.template
pkgname=${sourcepkg}-${subpkg} pkgname=${sourcepkg}-${subpkg}
set_tmpl_common_vars
run_func do_install run_func do_install
run_template ${sourcepkg} run_template ${sourcepkg}
[ "$pkg" = "${sourcepkg}-${subpkg}" ] && break [ "$pkg" = "${sourcepkg}-${subpkg}" ] && break
@ -113,11 +114,9 @@ install_src_phase()
make_install() make_install()
{ {
local destdir=$XBPS_DESTDIR/$pkgname-$version
if [ -z "$make_install_target" ]; then if [ -z "$make_install_target" ]; then
make_install_target="install prefix=$destdir/usr" make_install_target="install prefix=${DESTDIR}/usr"
make_install_target="$make_install_target sysconfdir=$destdir/etc" make_install_target="$make_install_target sysconfdir=${DESTDIR}/etc"
fi fi
[ -z "$make_cmd" ] && make_cmd=/usr/bin/make [ -z "$make_cmd" ] && make_cmd=/usr/bin/make

View file

@ -44,6 +44,7 @@ stow_pkg()
fi fi
. $XBPS_TEMPLATESDIR/${sourcepkg}/${subpkg}.template . $XBPS_TEMPLATESDIR/${sourcepkg}/${subpkg}.template
pkgname=${sourcepkg}-${subpkg} pkgname=${sourcepkg}-${subpkg}
set_tmpl_common_vars
stow_pkg_real ${pkgname} ${automatic} stow_pkg_real ${pkgname} ${automatic}
run_template ${sourcepkg} run_template ${sourcepkg}
if [ "${pkg}" = "${sourcepkg}-${subpkg}" ]; then if [ "${pkg}" = "${sourcepkg}-${subpkg}" ]; then
@ -70,7 +71,6 @@ stow_pkg_real()
local pkg="$1" local pkg="$1"
local automatic="$2" local automatic="$2"
local i= local i=
local destdir=$XBPS_DESTDIR/$pkg-$version
[ -z "$pkg" ] && return 2 [ -z "$pkg" ] && return 2
@ -79,16 +79,12 @@ stow_pkg_real()
fi fi
if [ "$build_style" = "meta-template" ]; then if [ "$build_style" = "meta-template" ]; then
[ ! -d $destdir ] && mkdir -p $destdir [ ! -d ${DESTDIR} ] && mkdir -p ${DESTDIR}
fi fi
if [ -n "$stow_flag" ]; then [ -n "$stow_flag" ] && run_template $pkg
if [ "$pkgname" != "$pkg" ]; then
. $XBPS_TEMPLATESDIR/$pkg/template
fi
fi
cd $destdir || exit 1 cd ${DESTDIR} || exit 1
# Copy files into masterdir. # Copy files into masterdir.
for i in $(echo *); do for i in $(echo *); do
@ -133,9 +129,7 @@ unstow_pkg()
msg_error "cannot unstow $pkg! (permission denied)" msg_error "cannot unstow $pkg! (permission denied)"
fi fi
if [ "$pkgname" != "$pkg" ]; then run_template $pkg
. $XBPS_TEMPLATESDIR/$pkg/template
fi
ver=$($XBPS_REGPKGDB_CMD version $pkg) ver=$($XBPS_REGPKGDB_CMD version $pkg)
if [ -z "$ver" ]; then if [ -z "$ver" ]; then

View file

@ -1,5 +1,5 @@
#- #-
# Copyright (c) 2008 Juan Romero Pardines. # Copyright (c) 2008-2009 Juan Romero Pardines.
# All rights reserved. # All rights reserved.
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -42,7 +42,8 @@ info_tmpl()
echo "$long_desc" echo "$long_desc"
echo echo
. $XBPS_SHUTILSDIR/builddep_funcs.sh . $XBPS_SHUTILSDIR/builddep_funcs.sh
check_build_depends_pkg $pkgname-$version run_template $pkgname
check_build_depends_pkg
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "This package requires the following dependencies to be built:" echo "This package requires the following dependencies to be built:"
for i in ${build_depends}; do for i in ${build_depends}; do
@ -71,7 +72,8 @@ reset_tmpl_vars()
install_priority noarch subpackages sourcepkg \ install_priority noarch subpackages sourcepkg \
abi_depends api_depends \ abi_depends api_depends \
XBPS_EXTRACT_DONE XBPS_CONFIGURE_DONE \ 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 for v in ${TMPL_VARS}; do
eval unset "$v" eval unset "$v"
@ -94,6 +96,7 @@ setup_tmpl()
if [ -f "$XBPS_TEMPLATESDIR/$pkg/template" ]; then if [ -f "$XBPS_TEMPLATESDIR/$pkg/template" ]; then
if [ "$pkgname" != "$pkg" ]; then if [ "$pkgname" != "$pkg" ]; then
reset_tmpl_vars
. $XBPS_TEMPLATESDIR/$pkg/template . $XBPS_TEMPLATESDIR/$pkg/template
fi fi
prepare_tmpl prepare_tmpl
@ -190,7 +193,7 @@ prepare_tmpl()
XBPS_BUILD_DONE="$wrksrc/.xbps_build_done" XBPS_BUILD_DONE="$wrksrc/.xbps_build_done"
XBPS_INSTALL_DONE="$wrksrc/.xbps_install_done" XBPS_INSTALL_DONE="$wrksrc/.xbps_install_done"
FILESDIR=${XBPS_TEMPLATESDIR}/${pkgname}/files set_tmpl_common_vars
if [ -z "$in_chroot" ]; then if [ -z "$in_chroot" ]; then
export PATH="$XBPS_MASTERDIR/bin:$XBPS_MASTERDIR/sbin" export PATH="$XBPS_MASTERDIR/bin:$XBPS_MASTERDIR/sbin"
@ -200,6 +203,15 @@ prepare_tmpl()
fi 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() run_template()
{ {
local pkg="$1" local pkg="$1"
@ -207,5 +219,6 @@ run_template()
if [ "$pkgname" != "$pkg" ]; then if [ "$pkgname" != "$pkg" ]; then
reset_tmpl_vars reset_tmpl_vars
. $XBPS_TEMPLATESDIR/$pkg/template . $XBPS_TEMPLATESDIR/$pkg/template
set_tmpl_common_vars
fi fi
} }

View file

@ -1,6 +1,6 @@
# Template file for 'binutils-devel'. # Template file for 'binutils-devel'.
# #
short_desc="${short_desc} (development files)" short_desc="binutils development files"
long_desc="${long_desc} long_desc="${long_desc}
This package contains files for development, headers, static libs, etc." This package contains files for development, headers, static libs, etc."
@ -9,16 +9,13 @@ Add_dependency run binutils
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/usr/lib
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
mkdir -p ${destdir}/usr/lib
mv ${origdir}/usr/include ${destdir}/usr
for f in libopcodes libbfd libiberty; do for f in libopcodes libbfd libiberty; do
mv ${origdir}/usr/lib/${f}.*a ${destdir}/usr/lib mv ${SRCPKGDESTDIR}/usr/lib/${f}.*a ${DESTDIR}/usr/lib
if [ -f ${origdir}/usr/lib/${f}.so ]; then if [ -f ${SRCPKGDESTDIR}/usr/lib/${f}.so ]; then
mv ${origdir}/usr/lib/${f}.so ${destdir}/usr/lib mv ${SRCPKGDESTDIR}/usr/lib/${f}.so ${DESTDIR}/usr/lib
fi fi
done done
mv ${origdir}/usr/lib/ldscripts ${destdir}/usr/lib mv ${SRCPKGDESTDIR}/usr/lib/ldscripts ${DESTDIR}/usr/lib
} }

View file

@ -1,6 +1,6 @@
# Template file for 'bzip2-devel'. # Template file for 'bzip2-devel'.
# #
short_desc="${short_desc} (development files)" short_desc="${sourcepkg} development files"
long_desc="${long_desc} long_desc="${long_desc}
This package contains files for development, headers, static libs, etc." This package contains files for development, headers, static libs, etc."
@ -9,10 +9,7 @@ Add_dependency run bzip2
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/usr/lib
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
mv ${SRCPKGDESTDIR}/usr/lib/libbz2.*a ${DESTDIR}/usr/lib
mkdir -p ${destdir}/usr/lib
mv ${origdir}/usr/include ${destdir}/usr
mv ${origdir}/usr/lib/libbz2.*a ${destdir}/usr/lib
} }

View file

@ -1,7 +1,7 @@
# Template file for 'cmake' # Template file for 'cmake'
pkgname=cmake pkgname=cmake
version=2.6.2 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 build_style=configure
configure_script=./bootstrap configure_script=./bootstrap
configure_args="--prefix=$XBPS_DESTDIR/$pkgname-$version/usr" 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 makefiles and workspaces that can be used in the compiler environment
of your choice." of your choice."
run_depends="glibc-2.8 openssl-0.9.8" Add_dependency full glibc
Add_dependency full openssl
post_install() 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
} }

View file

@ -22,9 +22,7 @@ Add_dependency run glibc
post_install() post_install()
{ {
local destdir=$XBPS_DESTDIR/$pkgname-$version
# Most programs expect /usr/bin/env. # Most programs expect /usr/bin/env.
install -d ${destdir}/usr/bin install -d ${DESTDIR}/usr/bin
cd ${destdir}/usr/bin && ln -s ../../bin/env . cd ${DESTDIR}/usr/bin && ln -s ../../bin/env .
} }

View file

@ -14,8 +14,7 @@ long_desc="
do_install() do_install()
{ {
local destdir=$XBPS_DESTDIR/$pkgname-$version install -d ${DESTDIR}/usr/share/dict
install $wrksrc/$pkgname-${words_date} \
install -d $destdir/usr/share/dict ${DESTDIR}/usr/share/dict/${pkgname}
install $wrksrc/$pkgname-${words_date} $destdir/usr/share/dict/$pkgname
} }

View file

@ -18,15 +18,13 @@ Add_dependency full zlib
post_install() post_install()
{ {
local destdir=$XBPS_DESTDIR/$pkgname-$version
# Create default small wordlist. # Create default small wordlist.
cd $wrksrc || exit 1 cd $wrksrc || exit 1
install -v -D dicts/cracklib-small \ 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-format dicts/cracklib-small \
| sh ./util/cracklib-packer $destdir/usr/share/cracklib/pw_dict | sh ./util/cracklib-packer ${DESTDIR}/usr/share/cracklib/pw_dict
install -d $destdir/lib/cracklib install -d ${DESTDIR}/lib/cracklib
install -v $destdir/usr/share/cracklib/pw_dict* $destdir/lib/cracklib install ${DESTDIR}/usr/share/cracklib/pw_dict* ${DESTDIR}/lib/cracklib
gzip -9 $destdir/lib/cracklib/pw_dict.pwd gzip -9 ${DESTDIR}/lib/cracklib/pw_dict.pwd
} }

View file

@ -1,6 +1,6 @@
# Template file for 'curl-devel'. # Template file for 'curl-devel'.
# #
short_desc="${short_desc} (development files)" short_desc="curl development files"
long_desc="${long_desc} long_desc="${long_desc}
This package contains files for development, headers, static libs, etc." This package contains files for development, headers, static libs, etc."
@ -9,19 +9,16 @@ Add_dependency run curl-libs
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/usr/bin
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} mkdir -p ${DESTDIR}/usr/lib
mkdir -p ${DESTDIR}/usr/share/man/man1
mkdir -p ${destdir}/usr/bin mv ${SRCPKGDESTDIR}/usr/bin/curl-config ${DESTDIR}/usr/bin
mkdir -p ${destdir}/usr/lib mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
mkdir -p ${destdir}/usr/share/man/man1 mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib
mv ${origdir}/usr/bin/curl-config ${destdir}/usr/bin mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
mv ${origdir}/usr/include ${destdir}/usr mv ${SRCPKGDESTDIR}/usr/share/man/man1/curl-config* \
mv ${origdir}/usr/lib/*.*a ${destdir}/usr/lib ${DESTDIR}/usr/share/man/man1
mv ${origdir}/usr/lib/*.so ${destdir}/usr/lib mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
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
} }

View file

@ -12,9 +12,6 @@ Add_dependency run openssl
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/usr/lib
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} mv ${SRCPKGDESTDIR}/usr/lib/lib*.so.* ${DESTDIR}/usr/lib
mkdir -p ${destdir}/usr/lib
mv ${origdir}/usr/lib/lib*.so.* ${destdir}/usr/lib
} }

View file

@ -9,14 +9,11 @@ Add_dependency run dbus-libs
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/usr/lib
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
mkdir -p ${destdir}/usr/lib mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
mv ${SRCPKGDESTDIR}/usr/lib/dbus-* ${DESTDIR}/usr/lib
mv ${origdir}/usr/include ${destdir}/usr mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
mv ${origdir}/usr/lib/dbus-* ${destdir}/usr/lib mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
mv ${origdir}/usr/lib/pkgconfig ${destdir}/usr/lib mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib
mv ${origdir}/usr/lib/*.*a ${destdir}/usr/lib
mv ${origdir}/usr/lib/*.so ${destdir}/usr/lib
} }

View file

@ -10,9 +10,6 @@ Add_dependency run expat
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/usr/lib
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} mv ${SRCPKGDESTDIR}/usr/lib/lib*.so.* ${DESTDIR}/usr/lib
mkdir -p ${destdir}/usr/lib
mv ${origdir}/usr/lib/lib*.so.* ${destdir}/usr/lib
} }

View file

@ -9,23 +9,21 @@ Add_dependency run e2fsprogs-libs
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/lib
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} 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 mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
mkdir -p ${destdir}/usr/lib mv ${SRCPKGDESTDIR}/lib/*.*a ${DESTDIR}/lib
mkdir -p ${destdir}/usr/bin mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
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
for f in compile_et mk_cmds; do for f in compile_et mk_cmds; do
mv ${origdir}/bin/${f} ${destdir}/usr/bin mv ${SRCPKGDESTDIR}/bin/${f} ${DESTDIR}/usr/bin
mv ${origdir}/usr/share/man/man1/${f}* \ mv ${SRCPKGDESTDIR}/usr/share/man/man1/${f}* \
${destdir}/usr/share/man/man1 ${DESTDIR}/usr/share/man/man1
done done
mv ${origdir}/usr/share/man/man3 ${destdir}/usr/share/man mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
mv ${origdir}/usr/share/info/libext2fs.info* ${destdir}/usr/share/info mv ${SRCPKGDESTDIR}/usr/share/info/libext2fs.info* \
${DESTDIR}/usr/share/info
} }

View file

@ -9,9 +9,6 @@ Add_dependency run glibc
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/lib
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} mv ${SRCPKGDESTDIR}/lib/lib*.so.* ${DESTDIR}/lib
mkdir -p ${destdir}/lib
mv ${origdir}/lib/lib*.so.* ${destdir}/lib
} }

View file

@ -30,9 +30,7 @@ Add_dependency run e2fsprogs-libs
post_install() post_install()
{ {
local destdir=$XBPS_DESTDIR/$pkgname-$version
# Move libraries to /lib. # Move libraries to /lib.
install -d ${destdir}/lib install -d ${DESTDIR}/lib
mv ${destdir}/usr/lib/lib* ${destdir}/lib mv ${DESTDIR}/usr/lib/lib* ${DESTDIR}/lib
} }

View file

@ -9,12 +9,9 @@ Add_dependency run expat
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/usr/lib
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
mkdir -p ${destdir}/usr/lib mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
mv ${origdir}/usr/include ${destdir}/usr mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib
mv ${origdir}/usr/lib/*.*a ${destdir}/usr/lib
mv ${origdir}/usr/lib/*.so ${destdir}/usr/lib
} }

View file

@ -9,10 +9,7 @@ Add_dependency run file
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/usr/lib
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
mv ${SRCPKGDESTDIR}/usr/lib/libmagic.*a ${DESTDIR}/usr/lib
mkdir -p ${destdir}/usr/lib
mv ${origdir}/usr/include ${destdir}/usr
mv ${origdir}/usr/lib/libmagic.*a ${destdir}/usr/lib
} }

View file

@ -21,7 +21,5 @@ Add_dependency run glibc
post_install() 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
} }

View file

@ -18,22 +18,22 @@ long_desc="
code on x86_64 systems." code on x86_64 systems."
only_for_archs="x86_64" only_for_archs="x86_64"
build_depends="glibc32-2.8"
run_depends="$build_depends" Add_dependency full glibc32
post_install() post_install()
{ {
local destdir=$XBPS_DESTDIR/$pkgname-$version local DESTDIR=$XBPS_DESTDIR/$pkgname-$version
# We are only interested in 32bit libs, remove anything else. # We are only interested in 32bit libs, remove anything else.
rm -r $destdir/usr/lib64 rm -r $DESTDIR/usr/lib64
rm -r $destdir/usr/libexec rm -r $DESTDIR/usr/libexec
rm -r $destdir/usr/include rm -r $DESTDIR/usr/include
rm -r $destdir/usr/bin rm -r $DESTDIR/usr/bin
rm -r $destdir/usr/share rm -r $DESTDIR/usr/share
rm $destdir/usr/lib/libiberty* 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/*include*
rm -r $destdir/usr/lib/gcc/x86_64-unknown-linux-gnu/$version/install-tools 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/crt*
rm $destdir/usr/lib/gcc/x86_64-unknown-linux-gnu/$version/libgcov* rm $DESTDIR/usr/lib/gcc/x86_64-unknown-linux-gnu/$version/libgcov*
} }

View file

@ -10,8 +10,6 @@ Add_dependency run gcc-libstdc++ ${version}
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
local triplet= local triplet=
if [ "${xbps_machine}" = "x86_64" ]; then if [ "${xbps_machine}" = "x86_64" ]; then
@ -20,16 +18,17 @@ do_install()
triplet="${xbps_machine}-pc-linux-gnu" triplet="${xbps_machine}-pc-linux-gnu"
fi fi
mkdir -p ${destdir}/usr/lib mkdir -p ${DESTDIR}/usr/lib
mkdir -p ${destdir}/usr/bin mkdir -p ${DESTDIR}/usr/bin
mkdir -p ${destdir}/usr/share/man/man1 mkdir -p ${DESTDIR}/usr/share/man/man1
mkdir -p ${destdir}/usr/libexec/gcc/${triplet}/${version} mkdir -p ${DESTDIR}/usr/libexec/gcc/${triplet}/${version}
for f in g++ c++ ${triplet}-g++ ${triplet}-c++; do 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 done
mv ${origdir}/usr/libexec/gcc/${triplet}/${version}/cc1plus \ mv ${SRCPKGDESTDIR}/usr/libexec/gcc/${triplet}/${version}/cc1plus \
${destdir}/usr/libexec/gcc/${triplet}/${version} ${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
} }

View file

@ -8,9 +8,6 @@ install_priority=50
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/usr/lib
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} mv ${SRCPKGDESTDIR}/usr/lib/libgcc_s.so* ${DESTDIR}/usr/lib
mkdir -p ${destdir}/usr/lib
mv ${origdir}/usr/lib/libgcc_s.so* ${destdir}/usr/lib
} }

View file

@ -11,12 +11,9 @@ Add_dependency run gcc-libgcc
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/usr/lib
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} mkdir -p ${DESTDIR}/usr/share
mkdir -p ${destdir}/usr/lib mv ${SRCPKGDESTDIR}/usr/lib/libgomp.* ${DESTDIR}/usr/lib
mkdir -p ${destdir}/usr/share mv ${SRCPKGDESTDIR}/usr/share/info ${DESTDIR}/usr/share
mv ${origdir}/usr/lib/libgomp.* ${destdir}/usr/lib
mv ${origdir}/usr/share/info ${destdir}/usr/share
} }

View file

@ -10,10 +10,7 @@ Add_dependency run gcc-libmudflap
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/usr/lib
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} mv ${SRCPKGDESTDIR}/usr/lib/libmudflap*.*a ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/lib/libmudflap*.so ${DESTDIR}/usr/lib
mkdir -p ${destdir}/usr/lib
mv ${origdir}/usr/lib/libmudflap*.*a ${destdir}/usr/lib
mv ${origdir}/usr/lib/libmudflap*.so ${destdir}/usr/lib
} }

View file

@ -11,9 +11,6 @@ Add_dependency run gcc-libgcc ${version}
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/usr/lib
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} mv ${SRCPKGDESTDIR}/usr/lib/libmudflap*.so.* ${DESTDIR}/usr/lib
mkdir -p ${destdir}/usr/lib
mv ${origdir}/usr/lib/libmudflap*.so.* ${destdir}/usr/lib
} }

View file

@ -10,10 +10,7 @@ Add_dependency run gcc-libobjc
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/usr/lib
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} mv ${SRCPKGDESTDIR}/usr/lib/libobjc.*a ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/lib/libobjc.so ${DESTDIR}/usr/lib
mkdir -p ${destdir}/usr/lib
mv ${origdir}/usr/lib/libobjc.*a ${destdir}/usr/lib
mv ${origdir}/usr/lib/libobjc.so ${destdir}/usr/lib
} }

View file

@ -11,9 +11,6 @@ Add_dependency run gcc-libgcc
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/usr/lib
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} mv ${SRCPKGDESTDIR}/usr/lib/libobjc.so.* ${DESTDIR}/usr/lib
mkdir -p ${destdir}/usr/lib
mv ${origdir}/usr/lib/libobjc.so.* ${destdir}/usr/lib
} }

View file

@ -10,14 +10,11 @@ Add_dependency run gcc-libstdc++
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/usr/lib
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} mkdir -p ${DESTDIR}/usr/include
mkdir -p ${destdir}/usr/lib mv ${SRCPKGDESTDIR}/usr/lib/libstdc++.*a ${DESTDIR}/usr/lib
mkdir -p ${destdir}/usr/include mv ${SRCPKGDESTDIR}/usr/lib/libstdc++.so ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/lib/libsupc++.* ${DESTDIR}/usr/lib
mv ${origdir}/usr/lib/libstdc++.*a ${destdir}/usr/lib mv ${SRCPKGDESTDIR}/usr/include/c++ ${DESTDIR}/usr/include
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
} }

View file

@ -11,16 +11,13 @@ Add_dependency run gcc-libgcc
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/usr/lib
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} mkdir -p ${DESTDIR}/usr/share/locale/fr/LC_MESSAGES
mkdir -p ${DESTDIR}/usr/share/locale/de/LC_MESSAGES
mkdir -p ${destdir}/usr/lib mv ${SRCPKGDESTDIR}/usr/lib/libstdc++.so.* ${DESTDIR}/usr/lib
mkdir -p ${destdir}/usr/share/locale/fr/LC_MESSAGES mv ${SRCPKGDESTDIR}/usr/share/locale/fr/LC_MESSAGES/libstdc++.mo \
mkdir -p ${destdir}/usr/share/locale/de/LC_MESSAGES ${DESTDIR}/usr/share/locale/fr/LC_MESSAGES
mv ${SRCPKGDESTDIR}/usr/share/locale/de/LC_MESSAGES/libstdc++.mo \
mv ${origdir}/usr/lib/libstdc++.so.* ${destdir}/usr/lib ${DESTDIR}/usr/share/locale/de/LC_MESSAGES
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
} }

View file

@ -12,8 +12,6 @@ Add_dependency run gcc-objc
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
local triplet= local triplet=
if [ "${xbps_machine}" = "x86_64" ]; then if [ "${xbps_machine}" = "x86_64" ]; then
@ -22,7 +20,7 @@ do_install()
triplet="${xbps_machine}-pc-linux-gnu" triplet="${xbps_machine}-pc-linux-gnu"
fi fi
mkdir -p ${destdir}/usr/libexec/gcc/${triplet}/${version} mkdir -p ${DESTDIR}/usr/libexec/gcc/${triplet}/${version}
mv ${origdir}/usr/libexec/gcc/${triplet}/${version}/cc1objplus \ mv ${SRCPKGDESTDIR}/usr/libexec/gcc/${triplet}/${version}/cc1objplus \
${destdir}/usr/libexec/gcc/${triplet}/${version} ${DESTDIR}/usr/libexec/gcc/${triplet}/${version}
} }

View file

@ -12,8 +12,6 @@ Add_dependency run gcc-libobjc
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
local triplet= local triplet=
if [ "${xbps_machine}" = "x86_64" ]; then if [ "${xbps_machine}" = "x86_64" ]; then
@ -22,11 +20,11 @@ do_install()
triplet="${xbps_machine}-pc-linux-gnu" triplet="${xbps_machine}-pc-linux-gnu"
fi fi
mkdir -p ${destdir}//usr/lib/gcc/${triplet}/${version} mkdir -p ${DESTDIR}//usr/lib/gcc/${triplet}/${version}
mkdir -p ${destdir}/usr/libexec/gcc/${triplet}/${version}/include mkdir -p ${DESTDIR}/usr/libexec/gcc/${triplet}/${version}/include
mv ${origdir}/usr/lib/gcc/${triplet}/${version}/include/objc \ mv ${SRCPKGDESTDIR}/usr/lib/gcc/${triplet}/${version}/include/objc \
${destdir}/usr/lib/gcc/${triplet}/${version}/include ${DESTDIR}/usr/lib/gcc/${triplet}/${version}/include
mv ${origdir}/usr/libexec/gcc/${triplet}/${version}/cc1obj \ mv ${SRCPKGDESTDIR}/usr/libexec/gcc/${triplet}/${version}/cc1obj \
${destdir}/usr/libexec/gcc/${triplet}/${version} ${DESTDIR}/usr/libexec/gcc/${triplet}/${version}
} }

View file

@ -38,7 +38,5 @@ pre_configure()
post_install() post_install()
{ {
local destdir=$XBPS_DESTDIR/$pkgname-$version cd ${DESTDIR}/usr/bin && ln -s gcc cc
cd $destdir/usr/bin && ln -s gcc cc
} }

View file

@ -9,10 +9,7 @@ Add_dependency run gdbm
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/usr/lib
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
mkdir -p ${destdir}/usr/lib
mv ${origdir}/usr/include ${destdir}/usr
mv ${origdir}/usr/lib/*.*a ${destdir}/usr/lib
} }

View file

@ -9,16 +9,13 @@ Add_dependency run gettext
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/usr/lib
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} mkdir -p ${DESTDIR}/usr/share/doc
mkdir -p ${destdir}/usr/lib mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
mkdir -p ${destdir}/usr/share/doc mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib
mv ${origdir}/usr/include ${destdir}/usr mv ${SRCPKGDESTDIR}/usr/share/doc/gettext ${DESTDIR}/usr/share/doc
mv ${origdir}/usr/lib/*.*a ${destdir}/usr/lib mv ${SRCPKGDESTDIR}/usr/share/aclocal ${DESTDIR}/usr/share
mv ${origdir}/usr/lib/*.so ${destdir}/usr/lib mv ${SRCPKGDESTDIR}/usr/share/gettext ${DESTDIR}/usr/share
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
} }

View file

@ -9,9 +9,6 @@ Add_dependency run glibc
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/usr/lib
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} mv ${SRCPKGDESTDIR}/usr/lib/*.so.* ${DESTDIR}/usr/lib
mkdir -p ${destdir}/usr/lib
mv ${origdir}/usr/lib/*.so.* ${destdir}/usr/lib
} }

View file

@ -9,20 +9,17 @@ Add_dependency run glib
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/usr/lib
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} mkdir -p ${DESTDIR}/usr/share
mkdir -p ${destdir}/usr/lib mv ${SRCPKGDESTDIR}/usr/bin ${DESTDIR}/usr
mkdir -p ${destdir}/usr/share mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
mv ${SRCPKGDESTDIR}/usr/lib/glib-2.0 ${DESTDIR}/usr/lib
mv ${origdir}/usr/bin ${destdir}/usr mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
mv ${origdir}/usr/include ${destdir}/usr mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib
mv ${origdir}/usr/lib/glib-2.0 ${destdir}/usr/lib mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
mv ${origdir}/usr/lib/*.*a ${destdir}/usr/lib mv ${SRCPKGDESTDIR}/usr/share/man ${DESTDIR}/usr/share
mv ${origdir}/usr/lib/*.so ${destdir}/usr/lib mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share
mv ${origdir}/usr/lib/pkgconfig ${destdir}/usr/lib mv ${SRCPKGDESTDIR}/usr/share/aclocal ${DESTDIR}/usr/share
mv ${origdir}/usr/share/man ${destdir}/usr/share mv ${SRCPKGDESTDIR}/usr/share/glib-2.0 ${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
} }

View file

@ -9,12 +9,9 @@ Add_dependency run glibc
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/usr/lib
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib
mkdir -p ${destdir}/usr/lib mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib
mv ${origdir}/usr/include ${destdir}/usr mv ${SRCPKGDESTDIR}/usr/lib/*crt1.o ${DESTDIR}/usr/lib
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
} }

View file

@ -8,10 +8,7 @@ noarch=yes
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/usr/share
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} mv ${SRCPKGDESTDIR}/usr/share/i18n ${DESTDIR}/usr/share
mv ${SRCPKGDESTDIR}/usr/share/locale ${DESTDIR}/usr/share
mkdir -p ${destdir}/usr/share
mv ${origdir}/usr/share/i18n ${destdir}/usr/share
mv ${origdir}/usr/share/locale ${destdir}/usr/share
} }

View file

@ -51,24 +51,22 @@ pre_configure()
pre_install() pre_install()
{ {
# Create destdir/etc/ld.so.conf # Create DESTDIR/etc/ld.so.conf
mkdir -p $XBPS_DESTDIR/$pkgname-$version/etc mkdir -p ${DESTDIR}/etc
echo "/usr/local/lib" > $XBPS_DESTDIR/$pkgname-$version/etc/ld.so.conf echo "/usr/local/lib" > ${DESTDIR}/etc/ld.so.conf
} }
post_install() post_install()
{ {
local destdir=$XBPS_DESTDIR/$pkgname-$version
# Replace hardcoded path to bash. # Replace hardcoded path to bash.
. $XBPS_HELPERSDIR/replace-interpreter.sh . $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. # On x86_64, add dynamic linker's 32bit version to ldd.
if [ "$xbps_machine" = "x86_64" ]; then if [ "$xbps_machine" = "x86_64" ]; then
rtldlist="/lib/ld-linux.so.2 /lib/ld-linux-x86-64.so.2" rtldlist="/lib/ld-linux.so.2 /lib/ld-linux-x86-64.so.2"
sed -i "s|^RTLDLIST.*$|RTLDLIST=\"$rtldlist\"|" \ sed -i "s|^RTLDLIST.*$|RTLDLIST=\"$rtldlist\"|" \
$destdir/usr/bin/ldd ${DESTDIR}/usr/bin/ldd
fi fi
# Create nsswitch.conf # Create nsswitch.conf
@ -84,7 +82,7 @@ post_install()
echo "services: files"; \ echo "services: files"; \
echo "ethers: files"; \ echo "ethers: files"; \
echo "rpc: files"; \ echo "rpc: files"; \
) > $destdir/etc/nsswitch.conf ) > ${DESTDIR}/etc/nsswitch.conf
wrksrc=${wrksrc%%/build_obj} wrksrc=${wrksrc%%/build_obj}
} }

View file

@ -51,31 +51,30 @@ pre_install()
post_install() post_install()
{ {
local destdir=$XBPS_DESTDIR/$pkgname-$version
local tmpdir=$XBPS_BUILDDIR/$pkgname-tmp local tmpdir=$XBPS_BUILDDIR/$pkgname-tmp
mkdir -p $tmpdir/usr/include/gnu mkdir -p $tmpdir/usr/include/gnu
mkdir -p $tmpdir/usr/include/sys mkdir -p $tmpdir/usr/include/sys
# Remove all headers except the ones required for 32bits stuff. # 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/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/elf.h $tmpdir/usr/include/sys
mv -v $destdir/usr/include/sys/vm86.h $tmpdir/usr/include/sys mv -v $DESTDIR/usr/include/sys/vm86.h $tmpdir/usr/include/sys
rm -rf $destdir/usr/include rm -rf $DESTDIR/usr/include
mkdir -p $destdir/lib mkdir -p $DESTDIR/lib
mkdir -p $destdir/usr/include mkdir -p $DESTDIR/usr/include
mkdir -p $destdir/usr/lib32/gconv mkdir -p $DESTDIR/usr/lib32/gconv
mv -v $tmpdir/usr/include/* $destdir/usr/include mv -v $tmpdir/usr/include/* $DESTDIR/usr/include
# Remove bins and unneeded stuff for compat32. # Remove bins and unneeded stuff for compat32.
[ -d $destdir/xbps_destdir ] && rm -rf $destdir/xbps_destdir [ -d $DESTDIR/xbps_DESTDIR ] && rm -rf $DESTDIR/xbps_DESTDIR
rm -rf $destdir/sbin $destdir/bin $destdir/usr/sbin $destdir/usr/bin rm -rf $DESTDIR/sbin $DESTDIR/bin $DESTDIR/usr/sbin $DESTDIR/usr/bin
rm -rf $destdir/usr/share $destdir/usr/libexec $destdir/etc rm -rf $DESTDIR/usr/share $DESTDIR/usr/libexec $DESTDIR/etc
mv -v $destdir/usr/lib/* $destdir/usr/lib32/ mv -v $DESTDIR/usr/lib/* $DESTDIR/usr/lib32/
rmdir $destdir/usr/lib 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. # Add /lib32 and /usr/lib32 into ld.so.conf.
echo "/lib32" >> $XBPS_MASTERDIR/etc/ld.so.conf echo "/lib32" >> $XBPS_MASTERDIR/etc/ld.so.conf

View file

@ -9,10 +9,7 @@ Add_dependency run gmp
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/usr/lib
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
mv ${SRCPKGDESTDIR}/usr/lib/libgmp.*a ${DESTDIR}/usr/lib
mkdir -p ${destdir}/usr/lib
mv ${origdir}/usr/include ${destdir}/usr
mv ${origdir}/usr/lib/libgmp.*a ${destdir}/usr/lib
} }

View file

@ -26,11 +26,9 @@ run_depends="glibc-2.8 bash-3.2"
post_install() post_install()
{ {
local destdir=$XBPS_DESTDIR/$pkgname-$version
# Make /sbin/initng -> /sbin/init link. # Make /sbin/initng -> /sbin/init link.
cd $destdir/sbin && ln -sf initng init cd $DESTDIR/sbin && ln -sf initng init
# Fix /bin/pidof link. # Fix /bin/pidof link.
rm -v $destdir/bin/pidof rm -v $DESTDIR/bin/pidof
cd $destdir/bin && ln -sf ../sbin/killalli5 pidof cd $DESTDIR/bin && ln -sf ../sbin/killalli5 pidof
} }

View file

@ -37,8 +37,7 @@ Add_dependency full gzip
do_install() do_install()
{ {
local destdir=$XBPS_DESTDIR/$pkgname-$version local etcdir=$DESTDIR/etc/$pkgname
local etcdir=$destdir/etc/$pkgname
# Required dirs # Required dirs
install -d $etcdir/hooks install -d $etcdir/hooks
@ -49,52 +48,52 @@ do_install()
install -d $etcdir/scripts/local-bottom install -d $etcdir/scripts/local-bottom
install -d $etcdir/scripts/local-premount install -d $etcdir/scripts/local-premount
install -d $etcdir/scripts/local-top install -d $etcdir/scripts/local-top
install -d $destdir/usr/share/$pkgname install -d $DESTDIR/usr/share/$pkgname
install -d $destdir/usr/share/$pkgname/conf.d install -d $DESTDIR/usr/share/$pkgname/conf.d
install -d $destdir/usr/share/$pkgname/hooks install -d $DESTDIR/usr/share/$pkgname/hooks
install -d $destdir/usr/share/$pkgname/hooksconf.d install -d $DESTDIR/usr/share/$pkgname/hooksconf.d
install -d $destdir/usr/share/$pkgname/modules.d install -d $DESTDIR/usr/share/$pkgname/modules.d
install -d $destdir/usr/share/$pkgname/scripts install -d $DESTDIR/usr/share/$pkgname/scripts
install -d $destdir/usr/share/$pkgname/scripts/init-premount 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/init-top
install -d $destdir/usr/share/$pkgname/scripts/local-premount install -d $DESTDIR/usr/share/$pkgname/scripts/local-premount
install -d $destdir/usr/share/$pkgname/scripts/local-top install -d $DESTDIR/usr/share/$pkgname/scripts/local-top
install -d $destdir/usr/share/doc/$pkgname install -d $DESTDIR/usr/share/doc/$pkgname
install -d $destdir/usr/share/doc/$pkgname/examples install -d $DESTDIR/usr/share/doc/$pkgname/examples
install -d $destdir/usr/share/man/man5 install -d $DESTDIR/usr/share/man/man5
install -d $destdir/usr/share/man/man8 install -d $DESTDIR/usr/share/man/man8
install -d $destdir/usr/sbin install -d $DESTDIR/usr/sbin
install -d $destdir/var/lib/$pkgname install -d $DESTDIR/var/lib/$pkgname
# /etc config files # /etc config files
install -m 644 $wrksrc/conf/initramfs.conf $etcdir install -m 644 $wrksrc/conf/initramfs.conf $etcdir
install -m 644 $wrksrc/conf/update-initramfs.conf $etcdir install -m 644 $wrksrc/conf/update-initramfs.conf $etcdir
# Data # 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 for f in functions local nfs; do
install -m 644 $wrksrc/scripts/$f \ install -m 644 $wrksrc/scripts/$f \
$destdir/usr/share/$pkgname/scripts $DESTDIR/usr/share/$pkgname/scripts
done done
install -m 755 $wrksrc/scripts/init-premount/* \ 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/* \ 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/* \ install -m 755 $wrksrc/scripts/local-premount/* \
$destdir/usr/share/$pkgname/scripts/local-premount $DESTDIR/usr/share/$pkgname/scripts/local-premount
install -m 755 $wrksrc/hooks/* $destdir/usr/share/$pkgname/hooks install -m 755 $wrksrc/hooks/* $DESTDIR/usr/share/$pkgname/hooks
install -m 644 $wrksrc/hook-functions $destdir/usr/share/$pkgname install -m 644 $wrksrc/hook-functions $DESTDIR/usr/share/$pkgname
install -m 644 $wrksrc/conf/modules $etcdir install -m 644 $wrksrc/conf/modules $etcdir
# Examples # Examples
install -m 644 $wrksrc/docs/* $destdir/usr/share/doc/$pkgname/examples install -m 644 $wrksrc/docs/* $DESTDIR/usr/share/doc/$pkgname/examples
# Manpages # Manpages
install -m 644 $wrksrc/*.5 $destdir/usr/share/man/man5 install -m 644 $wrksrc/*.5 $DESTDIR/usr/share/man/man5
install -m 644 $wrksrc/*.8 $destdir/usr/share/man/man8 install -m 644 $wrksrc/*.8 $DESTDIR/usr/share/man/man8
# Scripts # Scripts
install -m 755 $wrksrc/mkinitramfs $destdir/usr/sbin install -m 755 $wrksrc/mkinitramfs $DESTDIR/usr/sbin
install -m 755 $wrksrc/mkinitramfs-kpkg $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/update-initramfs $DESTDIR/usr/sbin
} }

View file

@ -31,15 +31,13 @@ Add_dependency full dhcpcd
do_install() 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/rc.d install -d ${DESTDIR}/etc/defaults
install -d ${destdir}/etc/rc.conf.d
install -d ${destdir}/etc/defaults
for f in inittab rc.*; do for f in inittab rc.*; do
install -m755 ${FILESDIR}/${f} ${destdir}/etc install -m755 ${FILESDIR}/${f} ${DESTDIR}/etc
done done
install -m644 ${FILESDIR}/defaults/rc.conf ${destdir}/etc/defaults install -m644 ${FILESDIR}/defaults/rc.conf ${DESTDIR}/etc/defaults
install -m755 ${FILESDIR}/rc.d/* ${destdir}/etc/rc.d install -m755 ${FILESDIR}/rc.d/* ${DESTDIR}/etc/rc.d
} }

View file

@ -9,14 +9,11 @@ Add_dependency run irssi
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/usr/lib/irssi/modules
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
mkdir -p ${destdir}/usr/lib/irssi/modules mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
mv ${SRCPKGDESTDIR}/usr/lib/irssi/modules/*.*a \
mv ${origdir}/usr/include ${destdir}/usr ${DESTDIR}/usr/lib/irssi/modules
mv ${origdir}/usr/lib/irssi/modules/*.*a \ mv ${SRCPKGDESTDIR}/usr/lib/irssi/modules/*.so \
${destdir}/usr/lib/irssi/modules ${DESTDIR}/usr/lib/irssi/modules
mv ${origdir}/usr/lib/irssi/modules/*.so \
${destdir}/usr/lib/irssi/modules
} }

View file

@ -16,7 +16,7 @@ Add_dependency run kernel-libc-headers ${version}
do_install() do_install()
{ {
local destdir=$XBPS_DESTDIR/$pkgname-$version/usr/src/$pkgname-$version local destdir=${DESTDIR}/usr/src/$pkgname-$version
local arch= local arch=
local incdirs="acpi asm-generic config linux math-emu media \ local incdirs="acpi asm-generic config linux math-emu media \
net pcmcia scsi sound video" net pcmcia scsi sound video"
@ -45,7 +45,7 @@ do_install()
for i in ${incdirs}; do for i in ${incdirs}; do
cp -a include/$i $destdir/include cp -a include/$i $destdir/include
done done
cp -ar arch/x86/include/asm $destdir/include cp -a arch/x86/include/asm $destdir/include
cp -a scripts $destdir cp -a scripts $destdir
mkdir -p $destdir/arch/x86/kernel mkdir -p $destdir/arch/x86/kernel

View file

@ -20,6 +20,7 @@ long_desc="
Add_dependency full glibc Add_dependency full glibc
Add_dependency full dash Add_dependency full dash
Add_dependency full coreutils Add_dependency full coreutils
Add_dependency full module-init-tools
Add_dependency full initramfs-tools Add_dependency full initramfs-tools
Add_dependency build perl Add_dependency build perl
@ -47,11 +48,15 @@ pre_build()
post_install() post_install()
{ {
local destdir=$XBPS_DESTDIR/$pkgname-$version install -d ${DESTDIR}/lib ${DESTDIR}/boot
install -d $destdir/lib $destdir/boot
cd $wrksrc || exit 1 cd $wrksrc || exit 1
install -m 644 arch/x86/boot/bzImage $destdir/boot/vmlinuz-$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 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
} }

View file

@ -20,8 +20,6 @@ Add_dependency run klibc
do_install() do_install()
{ {
local destdir=$XBPS_DESTDIR/$pkgname-$version
cd $wrksrc cd $wrksrc
CFLAGS="-O2 -DCONFIG_NO_BACKWARDS_COMPAT" \ CFLAGS="-O2 -DCONFIG_NO_BACKWARDS_COMPAT" \
CC=klcc LD=klcc ./configure --prefix= CC=klcc LD=klcc ./configure --prefix=
@ -29,8 +27,8 @@ do_install()
sed 's|getc_unlocked|getc|g' -i *.c sed 's|getc_unlocked|getc|g' -i *.c
make || return 1 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 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 done
} }

View file

@ -19,26 +19,24 @@ Add_dependency run klibc
do_install() do_install()
{ {
local destdir=$XBPS_DESTDIR/$pkgname-$version
cd $wrksrc cd $wrksrc
CC=klcc LD=klcc CFLAGS="-O2" ./configure --prefix= CC=klcc LD=klcc CFLAGS="-O2" ./configure --prefix=
make || exit 1 make || exit 1
install -d ${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/udevd ${DESTDIR}/usr/lib/klibc/udev
install -s -m755 udev/udevadm ${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 -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 -s -m755 extras/volume_id/vol_id ${DESTDIR}/usr/lib/klibc/udev
# Install the initramfs-tools hook. # Install the initramfs-tools hook.
install -d $destdir/usr/share/initramfs-tools/hooks 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-premount
install -d $destdir/usr/share/initramfs-tools/scripts/init-bottom install -d $DESTDIR/usr/share/initramfs-tools/scripts/init-bottom
install -m 755 ${FILESDIR}/udev.initramfs-hook \ 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 \ 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 \ 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
} }

View file

@ -10,15 +10,12 @@ Add_dependency run perl
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/usr/lib/klibc
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} mkdir -p ${DESTDIR}/usr/share/man/man1
mkdir -p ${destdir}/usr/lib/klibc mv ${SRCPKGDESTDIR}/usr/lib/klibc/include ${DESTDIR}/usr/lib/klibc
mkdir -p ${destdir}/usr/share/man/man1 mv ${SRCPKGDESTDIR}/usr/lib/klibc/lib ${DESTDIR}/usr/lib/klibc
mv ${SRCPKGDESTDIR}/usr/bin ${DESTDIR}/usr
mv ${origdir}/usr/lib/klibc/include ${destdir}/usr/lib/klibc mv ${SRCPKGDESTDIR}/usr/man/man1/klcc.1 ${DESTDIR}/usr/share/man/man1
mv ${origdir}/usr/lib/klibc/lib ${destdir}/usr/lib/klibc rm -rf ${SRCPKGDESTDIR}/usr/man
mv ${origdir}/usr/bin ${destdir}/usr
mv ${origdir}/usr/man/man1/klcc.1 ${destdir}/usr/share/man/man1
rm -rf ${origdir}/usr/man
} }

View file

@ -10,14 +10,11 @@ Add_dependency run klibc
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/usr/lib/klibc
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} rm -f ${SRCPKGDESTDIR}/usr/lib/klibc/bin/kinit
mv ${SRCPKGDESTDIR}/usr/lib/klibc/bin/kinit.shared \
mkdir -p ${destdir}/usr/lib/klibc ${SRCPKGDESTDIR}/usr/lib/klibc/bin/kinit
rm -f ${origdir}/usr/lib/klibc/bin/kinit mv ${SRCPKGDESTDIR}/usr/lib/klibc/bin/sh.shared \
mv ${origdir}/usr/lib/klibc/bin/kinit.shared \ ${SRCPKGDESTDIR}/usr/lib/klibc/bin/sh
${origdir}/usr/lib/klibc/bin/kinit mv ${SRCPKGDESTDIR}/usr/lib/klibc/bin ${DESTDIR}/usr/lib/klibc
mv ${origdir}/usr/lib/klibc/bin/sh.shared \
${origdir}/usr/lib/klibc/bin/sh
mv ${origdir}/usr/lib/klibc/bin ${destdir}/usr/lib/klibc
} }

View file

@ -9,10 +9,7 @@ Add_dependency run libarchive
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/usr/lib
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
mv ${SRCPKGDESTDIR}/usr/lib/libarchive.*a ${DESTDIR}/usr/lib
mkdir -p ${destdir}/usr/lib
mv ${origdir}/usr/include ${destdir}/usr
mv ${origdir}/usr/lib/libarchive.*a ${destdir}/usr/lib
} }

View file

@ -9,15 +9,12 @@ Add_dependency run libidn
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/usr/lib
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} mkdir -p ${DESTDIR}/usr/share/man
mkdir -p ${destdir}/usr/lib mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
mkdir -p ${destdir}/usr/share/man mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib
mv ${origdir}/usr/include ${destdir}/usr mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
mv ${origdir}/usr/lib/*.*a ${destdir}/usr/lib mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
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
} }

View file

@ -9,10 +9,7 @@ Add_dependency run lzma-utils-libs
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/usr/lib
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
mv ${SRCPKGDESTDIR}/usr/lib/liblzmadec.*a ${DESTDIR}/usr/lib
mkdir -p ${destdir}/usr/lib
mv ${origdir}/usr/include ${destdir}/usr
mv ${origdir}/usr/lib/liblzmadec.*a ${destdir}/usr/lib
} }

View file

@ -10,9 +10,6 @@ Add_dependency run gcc-libstdc++
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/usr/lib
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} mv ${SRCPKGDESTDIR}/usr/lib/liblzmadec.so* ${DESTDIR}/usr/lib
mkdir -p ${destdir}/usr/lib
mv ${origdir}/usr/lib/liblzmadec.so* ${destdir}/usr/lib
} }

View file

@ -14,12 +14,10 @@ Add_dependency run glibc
do_install() do_install()
{ {
local destdir=$XBPS_DESTDIR/$pkgname-$version install -d ${DESTDIR}/sbin
install -d ${destdir}/sbin
cd ${FILESDIR} cd ${FILESDIR}
gcc ${CFLAGS} minilogd.c -o minilogd gcc ${CFLAGS} minilogd.c -o minilogd
chmod 755 minilogd chmod 755 minilogd
mv minilogd ${destdir}/sbin mv minilogd ${DESTDIR}/sbin
} }

View file

@ -9,10 +9,7 @@ Add_dependency run mpfr
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/usr/lib
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
mv ${SRCPKGDESTDIR}/usr/lib/libmpfr.*a ${DESTDIR}/usr/lib
mkdir -p ${destdir}/usr/lib
mv ${origdir}/usr/include ${destdir}/usr
mv ${origdir}/usr/lib/libmpfr.*a ${destdir}/usr/lib
} }

View file

@ -7,24 +7,21 @@ long_desc="${long_desc}
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
cat $XBPS_TEMPLATESDIR/ncurses/base-files | while read line; do cat $XBPS_TEMPLATESDIR/ncurses/base-files | while read line; do
if [ -f ${origdir}/${line} ]; then if [ -f ${SRCPKGDESTDIR}/${line} ]; then
install -D ${origdir}/${line} ${destdir}/${line} install -D ${SRCPKGDESTDIR}/${line} ${DESTDIR}/${line}
rm -f ${origdir}/${line} rm -f ${SRCPKGDESTDIR}/${line}
fi fi
done done
mkdir -p ${destdir}/lib/terminfo/a mkdir -p ${DESTDIR}/lib/terminfo/a
mkdir -p ${destdir}/lib/terminfo/l mkdir -p ${DESTDIR}/lib/terminfo/l
mkdir -p ${destdir}/lib/terminfo/v mkdir -p ${DESTDIR}/lib/terminfo/v
cp ${destdir}/usr/share/terminfo/a/ansi ${destdir}/lib/terminfo/a 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/l/linux ${DESTDIR}/lib/terminfo/l
for f in vt100 vt100-am vt100-nav vt102 vt200 vt220 vt52; do for f in vt100 vt100-am vt100-nav vt102 vt200 vt220 vt52; do
cp ${destdir}/usr/share/terminfo/v/${f} \ cp ${DESTDIR}/usr/share/terminfo/v/${f} \
${destdir}/lib/terminfo/v ${DESTDIR}/lib/terminfo/v
done done
} }

View file

@ -9,16 +9,13 @@ Add_dependency run ncurses
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/usr/lib
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} mkdir -p ${DESTDIR}/usr/bin
mkdir -p ${DESTDIR}/usr/share/man
mkdir -p ${destdir}/usr/lib mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
mkdir -p ${destdir}/usr/bin mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib
mkdir -p ${destdir}/usr/share/man mv ${SRCPKGDESTDIR}/usr/lib/lib*.so ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
mv ${origdir}/usr/include ${destdir}/usr mv ${SRCPKGDESTDIR}/usr/bin/ncurses5* ${DESTDIR}/usr/bin
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
} }

View file

@ -10,13 +10,10 @@ Add_dependency run ncurses-base
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/lib
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} mkdir -p ${DESTDIR}/usr/lib
mkdir -p ${destdir}/lib mv ${SRCPKGDESTDIR}/usr/lib/libcurses.so* ${DESTDIR}/lib
mkdir -p ${destdir}/usr/lib mv ${SRCPKGDESTDIR}/usr/lib/libncurses.so* ${DESTDIR}/lib
mv ${SRCPKGDESTDIR}/usr/lib/lib*.so.* ${DESTDIR}/usr/lib
mv ${origdir}/usr/lib/libcurses.so* ${destdir}/lib
mv ${origdir}/usr/lib/libncurses.so* ${destdir}/lib
mv ${origdir}/usr/lib/lib*.so.* ${destdir}/usr/lib
} }

View file

@ -9,11 +9,8 @@ Add_dependency run ncurses-base
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/usr/share
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
mkdir -p ${destdir}/usr/share mv ${SRCPKGDESTDIR}/usr/share/tabset ${DESTDIR}/usr/share
mv ${SRCPKGDESTDIR}/usr/share/terminfo ${DESTDIR}/usr/share
mv ${origdir}/usr/share/tabset ${destdir}/usr/share
mv ${origdir}/usr/share/terminfo ${destdir}/usr/share
} }

View file

@ -14,13 +14,11 @@ Add_dependency run glibc
do_install() do_install()
{ {
local destdir=$XBPS_DESTDIR/$pkgname-$version
cd $wrksrc cd $wrksrc
. $XBPS_HELPERSDIR/replace-interpreter.sh . $XBPS_HELPERSDIR/replace-interpreter.sh
replace_interpreter bash configure.sh replace_interpreter bash configure.sh
yes "" | make || exit 1 yes "" | make || exit 1
make BASEDIR=${destdir} update make BASEDIR=${DESTDIR} update
rm -rf ${destdir}/usr/share/man/man1 rm -rf ${DESTDIR}/usr/share/man/man1
} }

View file

@ -10,11 +10,8 @@ Add_dependency run perl
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/usr/bin
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
mkdir -p ${destdir}/usr/bin
for f in ntp-wait ntptrace; do for f in ntp-wait ntptrace; do
mv ${origdir}/usr/bin/${f} ${destdir}/usr/bin mv ${SRCPKGDESTDIR}/usr/bin/${f} ${DESTDIR}/usr/bin
done done
} }

View file

@ -25,14 +25,12 @@ Add_dependency full openssl
post_install() post_install()
{ {
local destdir=$XBPS_DESTDIR/$pkgname-$version install -d ${DESTDIR}/etc/rc.d
install -d ${DESTDIR}/usr/share/ntp
install -d ${destdir}/etc/rc.d install -d ${DESTDIR}/usr/share/doc/ntp
install -d ${destdir}/usr/share/ntp install -m 755 ${FILESDIR}/ntpd ${DESTDIR}/etc/rc.d/ntpd
install -d ${destdir}/usr/share/doc/ntp install -m 755 ${FILESDIR}/ntpdate ${DESTDIR}/etc/rc.d/ntpdate
install -m 755 ${FILESDIR}/ntpd ${destdir}/etc/rc.d/ntpd install -m 644 ${FILESDIR}/ntp.conf ${DESTDIR}/etc/ntp.conf
install -m 755 ${FILESDIR}/ntpdate ${destdir}/etc/rc.d/ntpdate cp -a ${wrksrc}/html ${DESTDIR}/usr/share/doc/ntp
install -m 644 ${FILESDIR}/ntp.conf ${destdir}/etc/ntp.conf cp -a ${wrksrc}/conf ${DESTDIR}/usr/share/ntp
cp -a ${wrksrc}/html ${destdir}/usr/share/doc/ntp
cp -a ${wrksrc}/conf ${destdir}/usr/share/ntp
} }

View file

@ -14,21 +14,18 @@ Add_dependency run openssh
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/usr/bin
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} mkdir -p ${DESTDIR}/etc/ssh
mkdir -p ${DESTDIR}/usr/share/man/man1
mkdir -p ${destdir}/usr/bin mkdir -p ${DESTDIR}/usr/share/man/man5
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 \ for f in scp sftp slogin ssh ssh-add ssh-agent \
ssh-copy-id ssh-keyscan findssl; do ssh-copy-id ssh-keyscan findssl; do
mv ${origdir}/usr/bin/${f} ${destdir}/usr/bin mv ${SRCPKGDESTDIR}/usr/bin/${f} ${DESTDIR}/usr/bin
[ ! -f ${origdir}/usr/share/man/man1/${f}.1 ] && continue [ ! -f ${SRCPKGDESTDIR}/usr/share/man/man1/${f}.1 ] && continue
mv ${origdir}/usr/share/man/man1/${f}.1 \ mv ${SRCPKGDESTDIR}/usr/share/man/man1/${f}.1 \
${destdir}/usr/share/man/man1 ${DESTDIR}/usr/share/man/man1
done done
mv ${origdir}/etc/ssh/ssh_config ${destdir}/etc/ssh mv ${SRCPKGDESTDIR}/etc/ssh/ssh_config ${DESTDIR}/etc/ssh
mv ${origdir}/usr/share/man/man5/ssh_config.5 \ mv ${SRCPKGDESTDIR}/usr/share/man/man5/ssh_config.5 \
${destdir}/usr/share/man/man5 ${DESTDIR}/usr/share/man/man5
} }

View file

@ -15,24 +15,21 @@ Add_dependency run openssh
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/etc/ssh
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} mkdir -p ${DESTDIR}/usr/libexec/openssh
mkdir -p ${DESTDIR}/usr/share/man/man5
mkdir -p ${destdir}/etc/ssh mkdir -p ${DESTDIR}/usr/share/man/man8
mkdir -p ${destdir}/usr/libexec/openssh mv ${SRCPKGDESTDIR}/usr/libexec/openssh/sftp-server \
mkdir -p ${destdir}/usr/share/man/man5 ${DESTDIR}/usr/libexec/openssh
mkdir -p ${destdir}/usr/share/man/man8 mv ${SRCPKGDESTDIR}/etc/ssh/sshd_config ${DESTDIR}/etc/ssh
mv ${origdir}/usr/libexec/openssh/sftp-server \ mv ${SRCPKGDESTDIR}/usr/sbin ${DESTDIR}/usr
${destdir}/usr/libexec/openssh mv ${SRCPKGDESTDIR}/usr/share/man/man5/sshd_config.5 \
mv ${origdir}/etc/ssh/sshd_config ${destdir}/etc/ssh ${DESTDIR}/usr/share/man/man5
mv ${origdir}/usr/sbin ${destdir}/usr
mv ${origdir}/usr/share/man/man5/sshd_config.5 \
${destdir}/usr/share/man/man5
for f in sftp-server sshd; do for f in sftp-server sshd; do
mv ${origdir}/usr/share/man/man8/${f}.8 \ mv ${SRCPKGDESTDIR}/usr/share/man/man8/${f}.8 \
${destdir}/usr/share/man/man8 ${DESTDIR}/usr/share/man/man8
done done
mv ${origdir}/etc/pam.d ${destdir}/etc mv ${SRCPKGDESTDIR}/etc/pam.d ${DESTDIR}/etc
mv ${origdir}/etc/rc.d ${destdir}/etc mv ${SRCPKGDESTDIR}/etc/rc.d ${DESTDIR}/etc
mv ${origdir}/var ${destdir} mv ${SRCPKGDESTDIR}/var ${DESTDIR}
} }

View file

@ -1,6 +1,6 @@
# Template file for 'openssh' # Template file for 'openssh'
pkgname=openssh pkgname=openssh
sourcepkg=openssh sourcepkg=$pkgname
version=5.2p1 version=5.2p1
distfiles=" distfiles="
http://sunsite.rediris.es/pub/OpenBSD/OpenSSH/portable/$pkgname-$version.tar.gz" http://sunsite.rediris.es/pub/OpenBSD/OpenSSH/portable/$pkgname-$version.tar.gz"
@ -43,21 +43,19 @@ Add_dependency build tcp_wrappers
post_install() post_install()
{ {
local destdir=$XBPS_DESTDIR/$pkgname-$version
install -D -m644 ${wrksrc}/contrib/sshd.pam.generic \ 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 \ install -D -m755 ${wrksrc}/contrib/findssl.sh \
${destdir}/usr/bin/findssl ${DESTDIR}/usr/bin/findssl
install -D -m755 ${wrksrc}/contrib/ssh-copy-id \ 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 \ install -D -m644 ${wrksrc}/contrib/ssh-copy-id.1 \
${destdir}/usr/share/man/man1/ssh-copy-id.1 ${DESTDIR}/usr/share/man/man1/ssh-copy-id.1
install -D -m755 ${FILESDIR}/sshd ${destdir}/etc/rc.d/sshd install -D -m755 ${FILESDIR}/sshd ${DESTDIR}/etc/rc.d/sshd
sed -i \ sed -i \
-e 's|^#ListenAddress 0.0.0.0|ListenAddress 0.0.0.0|g' \ -e 's|^#ListenAddress 0.0.0.0|ListenAddress 0.0.0.0|g' \
-e 's|^#UsePAM no|UsePAM yes|g' \ -e 's|^#UsePAM no|UsePAM yes|g' \
-e 's|^#ChallengeResponseAuthentication yes|ChallengeResponseAuthentication no|g' \ -e 's|^#ChallengeResponseAuthentication yes|ChallengeResponseAuthentication no|g' \
${destdir}/etc/ssh/sshd_config ${DESTDIR}/etc/ssh/sshd_config
} }

View file

@ -9,16 +9,13 @@ Add_dependency run openssl
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/usr/lib
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} mkdir -p ${DESTDIR}/usr/share/man
mkdir -p ${destdir}/usr/lib mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
mkdir -p ${destdir}/usr/share/man mv ${SRCPKGDESTDIR}/usr/lib/fips* ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
mv ${origdir}/usr/include ${destdir}/usr mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib
mv ${origdir}/usr/lib/fips* ${destdir}/usr/lib mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
mv ${origdir}/usr/lib/*.*a ${destdir}/usr/lib mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
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
} }

View file

@ -31,13 +31,11 @@ Add_dependency build perl
post_install() post_install()
{ {
local destdir="$XBPS_DESTDIR/$pkgname-$version"
# Grr. Stupid Makefile, remove stuff installed in wrong dir. # 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. # 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 for f in libssl libcrypto; do
ln -sf $f.so.${openssl_version} $f.so.7 ln -sf $f.so.${openssl_version} $f.so.7
done done

View file

@ -9,15 +9,12 @@ Add_dependency run pam
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/lib/security
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} mkdir -p ${DESTDIR}/usr/share/man
mkdir -p ${destdir}/lib/security mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
mkdir -p ${destdir}/usr/share/man mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
mv ${SRCPKGDESTDIR}/lib/*.*a ${DESTDIR}/lib
mv ${origdir}/usr/include ${destdir}/usr mv ${SRCPKGDESTDIR}/lib/*.so ${DESTDIR}/lib
mv ${origdir}/usr/share/man/man3 ${destdir}/usr/share/man mv ${SRCPKGDESTDIR}/lib/security/*.*a ${DESTDIR}/lib/security
mv ${origdir}/lib/*.*a ${destdir}/lib
mv ${origdir}/lib/*.so ${destdir}/lib
mv ${origdir}/lib/security/*.*a ${destdir}/lib/security
} }

View file

@ -9,17 +9,14 @@ Add_dependency run pcre
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/usr/bin
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} mkdir -p ${DESTDIR}/usr/lib
mkdir -p ${DESTDIR}/usr/share/man
mkdir -p ${destdir}/usr/bin mv ${SRCPKGDESTDIR}/usr/bin/pcre-config ${DESTDIR}/usr/bin
mkdir -p ${destdir}/usr/lib mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
mkdir -p ${destdir}/usr/share/man mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib
mv ${origdir}/usr/bin/pcre-config ${destdir}/usr/bin mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
mv ${origdir}/usr/include ${destdir}/usr mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
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
} }

View file

@ -44,17 +44,16 @@ pre_build()
post_install() post_install()
{ {
# Remove hardcoded paths of XBPS_DESTDIR. # Remove hardcoded paths of XBPS_DESTDIR.
local destdir="$XBPS_DESTDIR/$pkgname-$version"
local FILES="Config.pm Config_heavy.pl .packlist" local FILES="Config.pm Config_heavy.pl .packlist"
local opmult="${xbps_machine}-linux-thread-multi" 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 for f in ${FILES}; do
sed -i -e "s|$destdir||g" ${thrdir}/${f} sed -i -e "s|$DESTDIR||g" ${thrdir}/${f}
done done
for f in $(find $destdir/usr/bin/ -type f -print); do for f in $(find $DESTDIR/usr/bin/ -type f -print); do
if $(echo $f|grep -q $destdir); then if $(echo $f|grep -q $DESTDIR); then
sed -i -e "s|$destdir||g" $f sed -i -e "s|$DESTDIR||g" $f
fi fi
done done
} }

View file

@ -9,10 +9,7 @@ Add_dependency run proplib
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/usr/lib
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
mv ${SRCPKGDESTDIR}/usr/lib/libprop.*a ${DESTDIR}/usr/lib
mkdir -p ${destdir}/usr/lib
mv ${origdir}/usr/include ${destdir}/usr
mv ${origdir}/usr/lib/libprop.*a ${destdir}/usr/lib
} }

View file

@ -16,14 +16,12 @@ Add_dependency run glibc
do_install() 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 cd $XBPS_TEMPLATESDIR/rcorder/files
make || exit 1 make || exit 1
install -m755 ./rcorder ${destdir}/sbin install -m755 ./rcorder ${DESTDIR}/sbin
install -m644 ./rcorder.8 ${destdir}/usr/share/man/man8 install -m644 ./rcorder.8 ${DESTDIR}/usr/share/man/man8
make clean make clean
} }

View file

@ -38,9 +38,7 @@ pre_configure()
post_install() post_install()
{ {
local destdir=$XBPS_DESTDIR/$pkgname-$version
# Move shared libs into /lib. # Move shared libs into /lib.
mkdir -p $destdir/lib mkdir -p $DESTDIR/lib
mv $destdir/usr/lib/lib*.so* $destdir/lib mv $DESTDIR/usr/lib/lib*.so* $DESTDIR/lib
} }

View file

@ -33,11 +33,9 @@ pre_build()
post_install() post_install()
{ {
local destdir=$XBPS_DESTDIR/$pkgname-$version
# Use the same auth file for all these cmds. # Use the same auth file for all these cmds.
for f in chpasswd chgpasswd groupadd groupdel groupmems \ for f in chpasswd chgpasswd groupadd groupdel groupmems \
groupmod newusers useradd userdel usermod other; do 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 done
} }

View file

@ -22,10 +22,8 @@ Add_dependency full pam
post_install() 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 auth required pam_unix.so
account required pam_unix.so account required pam_unix.so
session optional pam_mail.so dir=/var/mail standard 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_env.so
session required pam_unix.so session required pam_unix.so
_EOF _EOF
chmod 644 $DESTDIR/etc/pam.d/sudo
} }

View file

@ -26,10 +26,8 @@ Add_dependency full glibc
post_install() post_install()
{ {
local destdir=$XBPS_DESTDIR/$pkgname-$version
# Create a default syslog.conf. # 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.* -/var/log/auth.log"; \
echo "*.*;auth,authpriv.none -/var/log/sys.log"; \ echo "*.*;auth,authpriv.none -/var/log/sys.log"; \
@ -38,8 +36,9 @@ post_install()
echo "mail.* -/var/log/mail.log"; \ echo "mail.* -/var/log/mail.log"; \
echo "user.* -/var/log/user.log"; \ echo "user.* -/var/log/user.log"; \
echo "*.emerg *"; \ echo "*.emerg *"; \
) > $destdir/etc/syslog.conf ) > $DESTDIR/etc/syslog.conf
chmod 644 $DESTDIR/etc/syslog.conf
# Install the rc.d scripts. # Install the rc.d scripts.
install -m755 ${FILESDIR}/* ${destdir}/etc/rc.d install -m755 ${FILESDIR}/* ${DESTDIR}/etc/rc.d
} }

View file

@ -18,13 +18,11 @@ Add_dependency full gawk
do_install() 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}/bin ${destdir}/sbin mkdir -p ${DESTDIR}/usr/share/man/man1
mkdir -p ${destdir}/usr/bin ${destdir}/usr/include mkdir -p ${DESTDIR}/usr/share/man/man5
mkdir -p ${destdir}/usr/share/man/man1 mkdir -p ${DESTDIR}/usr/share/man/man8
mkdir -p ${destdir}/usr/share/man/man5
mkdir -p ${destdir}/usr/share/man/man8
sed -i -e 's/utmpdump wall/utmpdump/' \ sed -i -e 's/utmpdump wall/utmpdump/' \
-e 's/mountpoint.1 wall.1/mountpoint.1/' src/Makefile -e 's/mountpoint.1 wall.1/mountpoint.1/' src/Makefile
@ -32,5 +30,5 @@ do_install()
$wrksrc/src/init.c $wrksrc/src/init.c
cd $wrksrc && make -C src && \ 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
} }

View file

@ -9,14 +9,11 @@ Add_dependency run tcp_wrappers-libs
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/usr/lib
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} mkdir -p ${DESTDIR}/usr/share/man/man3
mkdir -p ${destdir}/usr/lib mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
mkdir -p ${destdir}/usr/share/man/man3 mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib
mv ${origdir}/usr/share/man/man3 ${destdir}/usr/share/man mv ${SRCPKGDESTDIR}/usr/lib/*.so ${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
} }

View file

@ -11,12 +11,9 @@ Add_dependency run glibc
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/usr/lib
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} mkdir -p ${DESTDIR}/usr/share/man
mv ${SRCPKGDESTDIR}/usr/lib/lib*.so.* ${DESTDIR}/usr/lib
mkdir -p ${destdir}/usr/lib mv ${SRCPKGDESTDIR}/etc ${DESTDIR}
mkdir -p ${destdir}/usr/share/man mv ${SRCPKGDESTDIR}/usr/share/man/man5 ${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
} }

View file

@ -24,14 +24,12 @@ Add_dependency run tcp_wrappers-libs
pre_install() pre_install()
{ {
local destdir=$XBPS_DESTDIR/$pkgname-$version install -d ${DESTDIR}/usr/lib
install -d ${DESTDIR}/usr/sbin
install -d ${destdir}/usr/lib install -d ${DESTDIR}/usr/include
install -d ${destdir}/usr/sbin
install -d ${destdir}/usr/include
for f in 3 5 8; do for f in 3 5 8; do
install -d ${destdir}/usr/share/man/man${f} install -d ${DESTDIR}/usr/share/man/man${f}
done done
install -D -m644 ${FILESDIR}/hosts.allow ${destdir}/etc/hosts.allow install -D -m644 ${FILESDIR}/hosts.allow ${DESTDIR}/etc/hosts.allow
install -m644 ${FILESDIR}/hosts.deny ${destdir}/etc/hosts.deny install -m644 ${FILESDIR}/hosts.deny ${DESTDIR}/etc/hosts.deny
} }

View file

@ -18,16 +18,14 @@ Add_dependency full procps
post_install() post_install()
{ {
local destdir=$XBPS_DESTDIR/$pkgname-$version install -d $DESTDIR/lib/firmware
install -d $DESTDIR/lib/udev/devices/pts
install -d $destdir/lib/firmware install -d $DESTDIR/lib/udev/devices/shm
install -d $destdir/lib/udev/devices/pts mknod -m0666 $DESTDIR/lib/udev/devices/null c 1 3
install -d $destdir/lib/udev/devices/shm mknod -m0600 $DESTDIR/lib/udev/devices/kmsg c 1 11
mknod -m0666 $destdir/lib/udev/devices/null c 1 3 ln -s /proc/self/fd $DESTDIR/lib/udev/devices/fd
mknod -m0600 $destdir/lib/udev/devices/kmsg c 1 11 ln -s /proc/self/fd/0 $DESTDIR/lib/udev/devices/stdin
ln -s /proc/self/fd $destdir/lib/udev/devices/fd ln -s /proc/self/fd/1 $DESTDIR/lib/udev/devices/stdout
ln -s /proc/self/fd/0 $destdir/lib/udev/devices/stdin ln -s /proc/self/fd/2 $DESTDIR/lib/udev/devices/stderr
ln -s /proc/self/fd/1 $destdir/lib/udev/devices/stdout ln -s /proc/kcore $DESTDIR/lib/udev/devices/core
ln -s /proc/self/fd/2 $destdir/lib/udev/devices/stderr
ln -s /proc/kcore $destdir/lib/udev/devices/core
} }

View file

@ -30,10 +30,8 @@ post_configure()
post_install() post_install()
{ {
local destdir=$XBPS_DESTDIR/$pkgname-$version
# Move logger to /bin. # Move logger to /bin.
install -d -m 755 ${destdir}/bin install -d -m 755 ${DESTDIR}/bin
mv ${destdir}/usr/bin/logger ${destdir}/bin mv ${DESTDIR}/usr/bin/logger ${DESTDIR}/bin
mkdir -p ${destdir}/var/lib/hwclock mkdir -p ${DESTDIR}/var/lib/hwclock
} }

View file

@ -13,41 +13,39 @@ install_priority=100
do_install() do_install()
{ {
local destdir=$XBPS_DESTDIR/$pkgname-$version
for f in bin sbin boot etc home lib dev proc mnt opt sys var \ for f in bin sbin boot etc home lib dev proc mnt opt sys var \
media/cdrom; do media/cdrom; do
mkdir -p $destdir/$f mkdir -p $DESTDIR/$f
done done
mkdir -p -m 0750 $destdir/root mkdir -p -m 0750 $DESTDIR/root
mkdir -p -m 1777 $destdir/tmp $destdir/var/tmp mkdir -p -m 1777 $DESTDIR/tmp $DESTDIR/var/tmp
for f in local bin include lib sbin src; do for f in local bin include lib sbin src; do
mkdir -p $destdir/usr/$f mkdir -p $DESTDIR/usr/$f
done done
for f in locale misc terminfo zoneinfo doc info; do for f in locale misc terminfo zoneinfo doc info; do
mkdir -p $destdir/usr/share/$f mkdir -p $DESTDIR/usr/share/$f
mkdir -p $destdir/usr/local/share/$f mkdir -p $DESTDIR/usr/local/share/$f
done done
for f in 1 2 3 4 5 6 7 8; do for f in 1 2 3 4 5 6 7 8; do
mkdir -p $destdir/usr/share/man/man$f mkdir -p $DESTDIR/usr/share/man/man$f
mkdir -p $destdir/usr/local/share/man/man$f mkdir -p $DESTDIR/usr/local/share/man/man$f
done done
cd $destdir/usr && ln -s ./share/man man cd $DESTDIR/usr && ln -s ./share/man man
cd $destdir/usr/local && 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 for f in lock log mail run spool opt cache lib; do
mkdir -p $destdir/var/$f mkdir -p $DESTDIR/var/$f
done done
if [ "$xbps_machine" = "x86_64" ]; then if [ "$xbps_machine" = "x86_64" ]; then
mkdir -p $destdir/usr/lib mkdir -p $DESTDIR/usr/lib
mkdir -p $destdir/lib mkdir -p $DESTDIR/lib
cd $destdir && ln -s lib lib64 cd $DESTDIR && ln -s lib lib64
cd $destdir/usr && ln -s lib lib64 cd $DESTDIR/usr && ln -s lib lib64
fi fi
} }

View file

@ -14,13 +14,11 @@ Add_dependency run proplib
do_install() 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 for f in bin cmpver digest repo pkgdb; do
install -D -m755 /usr/local/sbin/xbps-${f} \ install -D -m755 /usr/local/sbin/xbps-${f} \
${destdir}/sbin/xbps-${f} ${DESTDIR}/sbin/xbps-${f}
done done
cp -a /usr/local/lib/libxbps.so* ${destdir}/lib cp -a /usr/local/lib/libxbps.so* ${DESTDIR}/lib
} }

View file

@ -9,10 +9,7 @@ Add_dependency run zlib
do_install() do_install()
{ {
local destdir=${XBPS_DESTDIR}/${pkgname}-${version} mkdir -p ${DESTDIR}/usr/lib
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
mv ${SRCPKGDESTDIR}/usr/lib/libz.*a ${DESTDIR}/usr/lib
mkdir -p ${destdir}/usr/lib
mv ${origdir}/usr/include ${destdir}/usr
mv ${origdir}/usr/lib/libz.*a ${destdir}/usr/lib
} }