CVS commit: pkgsrc/mk/pkginstall

["Jaap Boender" <jaapb%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Sat Jun 25 13:52:28 UTC 2016

Modified Files:
        pkgsrc/mk/pkginstall: ocaml-findlib-register

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


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mk/pkginstall/ocaml-findlib-register

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/pkginstall/ocaml-findlib-register
diff -u pkgsrc/mk/pkginstall/ocaml-findlib-register:1.2 pkgsrc/mk/pkginstall/ocaml-findlib-register:1.3
--- pkgsrc/mk/pkginstall/ocaml-findlib-register:1.2     Fri Jun 17 08:53:42 2016
+++ pkgsrc/mk/pkginstall/ocaml-findlib-register Sat Jun 25 13:52:28 2016
@@ -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:-
        ;;
 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