diff options
| author | jlam <jlam@pkgsrc.org> | 2003-10-06 10:51:04 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2003-10-06 10:51:04 +0000 |
| commit | 827195bab5fbb351688119f51a468df63e77e9c4 (patch) | |
| tree | 15ae8085b4d595a013906a9f3c8c4902ba0e4c60 | |
| parent | 80f555cb2ea28d9193c4bf0a82a791e6b51bf81a (diff) | |
| download | pkgsrc-827195bab5fbb351688119f51a468df63e77e9c4.tar.gz | |
Simplify by using gsub() instead of gensub() in awk script.
| -rw-r--r-- | mk/buildlink3/bsd.buildlink3.mk | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk index bf9a7b4d281..6269b9f174d 100644 --- a/mk/buildlink3/bsd.buildlink3.mk +++ b/mk/buildlink3/bsd.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink3.mk,v 1.23 2003/10/03 19:39:19 jlam Exp $ +# $NetBSD: bsd.buildlink3.mk,v 1.24 2003/10/06 10:51:04 jlam Exp $ # # An example package buildlink3.mk file: # @@ -472,15 +472,14 @@ _BLNK_LT_ARCHIVE_FILTER_AWK_SCRIPT.${_pkg_}= # empty # _BLNK_LT_ARCHIVE_FILTER_AWK_SCRIPT.${_pkg_}+= \ /^dependency_libs=/ { \ - line = $$0; \ - line = gensub("/usr(/lib/lib[^/ ]*\.la)", "${BUILDLINK_DIR}\\1", "g", line); \ - line = gensub("${DEPOTBASE}/[^/ ]*(/[^ ]*/lib[^/ ]*\.la)", "${BUILDLINK_DIR}\\1", "g", line); \ - line = gensub("${X11BASE}(/[^ ]*/lib[^/ ]*\.la)", "${BUILDLINK_X11_DIR}\\1", "g", line); \ - line = gensub("${LOCALBASE}(/[^ ]*/lib[^/ ]*\.la)", "${BUILDLINK_DIR}\\1", "g", line); \ - line = gensub("-L/usr/lib[^/ ]*[ ]*", "", "g", line); \ - line = gensub("-L${X11BASE}/[^ ]*[ ]*", "", "g", line); \ - line = gensub("-L${LOCALBASE}/[^ ]*[ ]*", "", "g", line); \ - print line; \ + gsub("/usr(/lib/lib[^/ ]*\.la)", "${BUILDLINK_DIR}\\1"); \ + gsub("${DEPOTBASE}/[^/ ]*(/[^ ]*/lib[^/ ]*\.la)", "${BUILDLINK_DIR}\\1"); \ + gsub("${X11BASE}(/[^ ]*/lib[^/ ]*\.la)", "${BUILDLINK_X11_DIR}\\1"); \ + gsub("${LOCALBASE}(/[^ ]*/lib[^/ ]*\.la)", "${BUILDLINK_DIR}\\1"); \ + gsub("-L/usr/lib[^/ ]*[ ]*", ""); \ + gsub("-L${X11BASE}/[^ ]*[ ]*", ""); \ + gsub("-L${LOCALBASE}/[^ ]*[ ]*", ""); \ + print; \ next; \ } . if (${PKG_INSTALLATION_TYPE} == "overwrite") || \ @@ -492,12 +491,11 @@ _BLNK_LT_ARCHIVE_FILTER_AWK_SCRIPT.${_pkg_}+= \ # _BLNK_LT_ARCHIVE_FILTER_AWK_SCRIPT.${_pkg_}+= \ /^libdir=/ { \ - line = $$0; \ - line = gensub("/usr(/lib/[^ ]*)", "${BUILDLINK_DIR}\\1", "g", line); \ - line = gensub("${DEPOTBASE}/[^/ ]*(/[^ ]*)", "${BUILDLINK_DIR}\\1", "g", line); \ - line = gensub("${X11BASE}(/[^ ]*)", "${BUILDLINK_X11_DIR}\\1", "g", line); \ - line = gensub("${LOCALBASE}(/[^ ]*)", "${BUILDLINK_DIR}\\1", "g", line); \ - print line; \ + gsub("/usr(/lib/[^ ]*)", "${BUILDLINK_DIR}\\1"); \ + gsub("${DEPOTBASE}/[^/ ]*(/[^ ]*)", "${BUILDLINK_DIR}\\1"); \ + gsub("${X11BASE}(/[^ ]*)", "${BUILDLINK_X11_DIR}\\1"); \ + gsub("${LOCALBASE}(/[^ ]*)", "${BUILDLINK_DIR}\\1"); \ + print; \ next; \ } . endif |