From 5862f23e6f70ff31c3ad9c0473c704ff7db94f98 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 12 Mar 2009 10:33:48 +0100 Subject: [PATCH] Remove $postinstall_helpers and $tar_override_cmd. These were used in the NetBSD days... not now. --HG-- extra : convert_revision : 3c3f4de397389cec1ea1326f39bded7a93173c39 --- shutils/stow_funcs.sh | 12 ++---------- shutils/tmpl_funcs.sh | 6 +++--- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/shutils/stow_funcs.sh b/shutils/stow_funcs.sh index 818f035382..f84b1ef9dc 100644 --- a/shutils/stow_funcs.sh +++ b/shutils/stow_funcs.sh @@ -88,8 +88,8 @@ stow_pkg_real() # Copy files into masterdir. for i in $(echo *); do - [ "$i" = "XBPS_PREPOST_INSTALL" ] && continue - cp -ar ${i} $XBPS_MASTERDIR + [ "$i" = "INSTALL" ] && continue + cp -a ${i} $XBPS_MASTERDIR done # @@ -102,14 +102,6 @@ stow_pkg_real() fi $XBPS_REGPKGDB_CMD $regpkgdb_flags register \ $pkg $version "$short_desc" || exit 1 - - # - # Run template postinstall helpers if requested. - # - for i in ${postinstall_helpers}; do - local pihf="$XBPS_HELPERSDIR/$i" - [ -f "$pihf" ] && . $pihf - done } # diff --git a/shutils/tmpl_funcs.sh b/shutils/tmpl_funcs.sh index 62d85ac11f..59697f55fc 100644 --- a/shutils/tmpl_funcs.sh +++ b/shutils/tmpl_funcs.sh @@ -64,13 +64,13 @@ reset_tmpl_vars() patch_files make_cmd base_package base_chroot \ make_build_target configure_script \ pre_configure pre_build pre_install post_install \ - postinstall_helpers make_install_target version \ - tar_override_cmd xml_entries sgml_entries \ + make_install_target version \ + xml_entries sgml_entries \ build_depends libtool_fixup_la_stage no_fixup_libtool \ disable_parallel_build run_depends cross_compiler \ only_for_archs patch_args conf_files keep_dirs \ install_priority noarch subpackages sourcepkg \ - abi_depends api_depends \ + abi_depends api_depends triggers \ XBPS_EXTRACT_DONE XBPS_CONFIGURE_DONE \ XBPS_BUILD_DONE XBPS_INSTALL_DONE FILESDIR DESTDIR \ SRCPKGDESTDIR"