diff --git a/shells/bash/Makefile b/shells/bash/Makefile index ed624e714..add400ee4 100644 --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -97,6 +97,11 @@ CONFIGURE_ENV+= bash_cv_func_ctype_nonascii=yes CONFIGURE_ENV+= bash_cv_wexitstatus_offset=8 .endif +.if ${OS_VARIANT} == "Minix" +# BJG isn't properly detected +CONFIGURE_ENV+= ac_cv_header_sys_resource_h=yes +.endif + post-install: ${INSTALL_MAN} ${WRKSRC}/doc/bash.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_MAN} ${WRKSRC}/doc/bashbug.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 diff --git a/shells/bash/distinfo b/shells/bash/distinfo index c8a415ee0..f2c4f0712 100644 --- a/shells/bash/distinfo +++ b/shells/bash/distinfo @@ -7,3 +7,4 @@ SHA1 (patch-af) = dfd1d1be3d822cfc3ae0fd21bb2bbd3e35b11f0d SHA1 (patch-ag) = 4da0a43f6b890482affff46b18eef4be67770e48 SHA1 (patch-aj) = 8b3c52c2aee9cf53ee5a9ce64ead243d0970305e SHA1 (patch-builtins_ulimit.def) = d4cb59bedc6a6199f9a99a3530c99374e428baeb +SHA1 (patch-configure) = 8c5a3898a109307b81521a6f7f557a7eedf8730b diff --git a/shells/bash/patches/patch-configure b/shells/bash/patches/patch-configure new file mode 100644 index 000000000..5ae59e78d --- /dev/null +++ b/shells/bash/patches/patch-configure @@ -0,0 +1,31 @@ +$NetBSD$ + +--- configure.orig Tue Feb 11 15:38:00 2014 ++++ configure +@@ -8047,7 +8047,7 @@ fi + fi + if test "X$ltrpathdirs" != "X"; then + for found_dir in $ltrpathdirs; do +- LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir" ++ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-Wl,-R$found_dir" + done + fi + +@@ -8837,7 +8837,7 @@ fi + fi + if test "X$ltrpathdirs" != "X"; then + for found_dir in $ltrpathdirs; do +- LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir" ++ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-Wl,-R$found_dir" + done + fi + +@@ -16657,6 +16657,8 @@ do + case $ac_option in + # Handling of the options. + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ++ : Avoid regenerating within pkgsrc ++ exit 0 + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + $as_echo "$ac_cs_version"; exit ;;