From dcaa308afedc316c7d2d1adf15c386fc6cd9fabc Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 14 Oct 2008 19:44:22 +0200 Subject: [PATCH] font-util: use replace-interpreter.sh and remove perl-replace-path.sh helper which isn't used now. --HG-- extra : convert_revision : b1291d48a5b55e229c37e0374a618ab079eaeb83 --- helper-templates/perl-replace-path.sh | 18 ------------------ templates/font-util-runstuff-before-build.sh | 6 ++++++ templates/font-util.tmpl | 5 ----- 3 files changed, 6 insertions(+), 23 deletions(-) delete mode 100644 helper-templates/perl-replace-path.sh create mode 100644 templates/font-util-runstuff-before-build.sh diff --git a/helper-templates/perl-replace-path.sh b/helper-templates/perl-replace-path.sh deleted file mode 100644 index 32f0cfad979..00000000000 --- a/helper-templates/perl-replace-path.sh +++ /dev/null @@ -1,18 +0,0 @@ -# -# This helper transforms files with wrong perl path to the correct -# one pointing at XBPS_MASTERDIR/bin/perl. -# - -perl_transform_file() -{ - local files="$@" - - [ -z "$files" ] && exit 1 - - for f in ${files}; do - [ ! -f $f ] && continue - $sed_cmd -e "s|^#!.*/usr/bin/perl|#!$XBPS_MASTERDIR/bin/perl|" \ - $f > $f.in && $mv_cmd -f $f.in $f && \ - echo "=> Transformed $(basename $f) with correct path." - done -} diff --git a/templates/font-util-runstuff-before-build.sh b/templates/font-util-runstuff-before-build.sh new file mode 100644 index 00000000000..394891c07d0 --- /dev/null +++ b/templates/font-util-runstuff-before-build.sh @@ -0,0 +1,6 @@ +# +# Transform perl shebang path with correct one in bdftruncate.pl. +# + +. $XBPS_TMPLHELPDIR/replace-interpreter.sh +replace_interpreter perl bdftruncate.pl diff --git a/templates/font-util.tmpl b/templates/font-util.tmpl index 03d6a80fdde..942913a0c61 100644 --- a/templates/font-util.tmpl +++ b/templates/font-util.tmpl @@ -13,8 +13,3 @@ long_desc=" and generating truncated BDF font from ISO 10646-1-encoded BDF font. It also provides mapping-files (character set tables) and the fontutil pkg-config and autoconf macro files." - -# Transform bdftruncate.pl with correct path. -run_stuff_before_build_cmd=" -. $XBPS_TMPLHELPDIR/perl-replace-path.sh -perl_transform_file $wrksrc/bdftruncate.pl"