[pkgsrc/trunk]: pkgsrc/mk/pkginstall Updated pkginstall framework to correct ...

[jaapb <jaapb%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a4499712b8cf
branches:  trunk
changeset: 349039:a4499712b8cf
user:      jaapb <jaapb%pkgsrc.org@localhost>
date:      Sat Jun 25 13:52:28 2016 +0000

description:
Updated pkginstall framework to correct bug in findlib registration.
Discussed on packages@ and okayed by jperkin.

diffstat:

 mk/pkginstall/ocaml-findlib-register |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (32 lines):

diff -r 3bfee4b24e2b -r a4499712b8cf mk/pkginstall/ocaml-findlib-register
--- a/mk/pkginstall/ocaml-findlib-register      Fri Jun 24 23:56:46 2016 +0000
+++ b/mk/pkginstall/ocaml-findlib-register      Sat Jun 25 13:52:28 2016 +0000
@@ -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 @@
        ;;
 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 @@
     $echo "${PKGNAME}: removing $i from ${LDCONF}"
        ;;
   esac
+  ${MV} -f "${LDCONF}.tmp" "${LDCONF}"
 done
-${MV} -f "${LDCONF}.tmp" "${LDCONF}"
 
 EOF
        ${CHMOD} +x ./+OCAML_FINDLIB_REGISTER