summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjaapb <jaapb>2016-06-25 13:52:28 +0000
committerjaapb <jaapb>2016-06-25 13:52:28 +0000
commit93a5b2ddc1942d9cef8ed1fffe054ae9e97e4651 (patch)
tree8f87859a0c08aa8f35bda1a70590e3817d28c641 /mk
parent25eeeaa4ae94e1ef1a5cf063ad8cd09eb31b8cff (diff)
downloadpkgsrc-93a5b2ddc1942d9cef8ed1fffe054ae9e97e4651.tar.gz
Updated pkginstall framework to correct bug in findlib registration.
Discussed on packages@ and okayed by jperkin.
Diffstat (limited to 'mk')
-rw-r--r--mk/pkginstall/ocaml-findlib-register8
1 files changed, 4 insertions, 4 deletions
diff --git a/mk/pkginstall/ocaml-findlib-register b/mk/pkginstall/ocaml-findlib-register
index 82aef07fcc2..7550e973cf9 100644
--- a/mk/pkginstall/ocaml-findlib-register
+++ b/mk/pkginstall/ocaml-findlib-register
@@ -1,4 +1,4 @@
-# $NetBSD: ocaml-findlib-register,v 1.2 2016/06/17 08:53:42 jaapb Exp $
+# $NetBSD: ocaml-findlib-register,v 1.3 2016/06/25 13:52:28 jaapb Exp $
#
# Generate an +OCAML_FINDLIB_REGISTER script that handles registration for
# findlib after a binary installation
@@ -45,10 +45,10 @@ case "${OCAML_FINDLIB_REGISTER_VERBOSE:-@OCAML_FINDLIB_REGISTER_VERBOSE@}" in
;;
esac
-${TOUCH} ${LDCONF}.tmp
+${TOUCH} "${LDCONF}.tmp"
for i in ${OCAML_FINDLIB_DIRS}
do
- ${GREP} -F -v -- "${OCAML_SITELIBDIR}/$i" < "${LDCONF}" >> "${LDCONF}.tmp"
+ ${GREP} -F -v -- "${OCAML_SITELIBDIR}/$i" < "${LDCONF}" > "${LDCONF}.tmp"
case $ACTION in
ADD)
$echo "${PKGNAME}: adding $i to ${LDCONF}"
@@ -59,8 +59,8 @@ do
$echo "${PKGNAME}: removing $i from ${LDCONF}"
;;
esac
+ ${MV} -f "${LDCONF}.tmp" "${LDCONF}"
done
-${MV} -f "${LDCONF}.tmp" "${LDCONF}"
EOF
${CHMOD} +x ./+OCAML_FINDLIB_REGISTER