Sat Jun 25 13:52:28 2016 UTC ()
Updated pkginstall framework to correct bug in findlib registration.
Discussed on packages@ and okayed by jperkin.


(jaapb)
diff -r1.2 -r1.3 pkgsrc/mk/pkginstall/ocaml-findlib-register
cvs diff -r1.2 -r1.3 pkgsrc/mk/pkginstall/ocaml-findlib-register (expand / switch to unified diff)

--- pkgsrc/mk/pkginstall/ocaml-findlib-register 2016/06/17 08:53:42 1.2
+++ pkgsrc/mk/pkginstall/ocaml-findlib-register 2016/06/25 13:52:28 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: ocaml-findlib-register,v 1.2 2016/06/17 08:53:42 jaapb Exp $ 1# $NetBSD: ocaml-findlib-register,v 1.3 2016/06/25 13:52:28 jaapb Exp $
2# 2#
3# Generate an +OCAML_FINDLIB_REGISTER script that handles registration for 3# Generate an +OCAML_FINDLIB_REGISTER script that handles registration for
4# findlib after a binary installation 4# findlib after a binary installation
5# 5#
6case "${STAGE},$1" in 6case "${STAGE},$1" in
7UNPACK,|UNPACK,+OCAML_FINDLIB_REGISTER) 7UNPACK,|UNPACK,+OCAML_FINDLIB_REGISTER)
8 ${CAT} > ./+OCAML_FINDLIB_REGISTER << 'EOF' 8 ${CAT} > ./+OCAML_FINDLIB_REGISTER << 'EOF'
9#!@SH@ 9#!@SH@
10# 10#
11# +OCAML_FINDLIB_REGISTER - ocaml-findlib registration script 11# +OCAML_FINDLIB_REGISTER - ocaml-findlib registration script
12# 12#
13# Usage: ./+OCAML_FINDLIB_REGISTER ADD|REMOVE [findlib_pkg_dir] 13# Usage: ./+OCAML_FINDLIB_REGISTER ADD|REMOVE [findlib_pkg_dir]
14# 14#
@@ -35,35 +35,35 @@ CURDIR=`${PWD_CMD}` @@ -35,35 +35,35 @@ CURDIR=`${PWD_CMD}`
35PKG_METADATA_DIR="${2-${CURDIR}}" 35PKG_METADATA_DIR="${2-${CURDIR}}"
36: ${PKGNAME=${PKG_METADATA_DIR##*/}} 36: ${PKGNAME=${PKG_METADATA_DIR##*/}}
37: ${PKG_PREFIX=@PREFIX@} 37: ${PKG_PREFIX=@PREFIX@}
38 38
39case "${OCAML_FINDLIB_REGISTER_VERBOSE:-@OCAML_FINDLIB_REGISTER_VERBOSE@}" in 39case "${OCAML_FINDLIB_REGISTER_VERBOSE:-@OCAML_FINDLIB_REGISTER_VERBOSE@}" in
40[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) 40[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
41 echo="${ECHO}" 41 echo="${ECHO}"
42 ;; 42 ;;
43[Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0) 43[Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)
44 echo=":" 44 echo=":"
45 ;; 45 ;;
46esac 46esac
47 47
48${TOUCH} ${LDCONF}.tmp 48${TOUCH} "${LDCONF}.tmp"
49for i in ${OCAML_FINDLIB_DIRS} 49for i in ${OCAML_FINDLIB_DIRS}
50do 50do
51 ${GREP} -F -v -- "${OCAML_SITELIBDIR}/$i" < "${LDCONF}" >> "${LDCONF}.tmp" 51 ${GREP} -F -v -- "${OCAML_SITELIBDIR}/$i" < "${LDCONF}" > "${LDCONF}.tmp"
52 case $ACTION in 52 case $ACTION in
53 ADD) 53 ADD)
54 $echo "${PKGNAME}: adding $i to ${LDCONF}" 54 $echo "${PKGNAME}: adding $i to ${LDCONF}"
55 ${ECHO} "@PREFIX@/${OCAML_SITELIBDIR}/$i" >> "${LDCONF}.tmp" 55 ${ECHO} "@PREFIX@/${OCAML_SITELIBDIR}/$i" >> "${LDCONF}.tmp"
56 ;; 56 ;;
57 57
58 REMOVE) 58 REMOVE)
59 $echo "${PKGNAME}: removing $i from ${LDCONF}" 59 $echo "${PKGNAME}: removing $i from ${LDCONF}"
60 ;; 60 ;;
61 esac 61 esac
 62 ${MV} -f "${LDCONF}.tmp" "${LDCONF}"
62done 63done
63${MV} -f "${LDCONF}.tmp" "${LDCONF}" 
64 64
65EOF 65EOF
66 ${CHMOD} +x ./+OCAML_FINDLIB_REGISTER 66 ${CHMOD} +x ./+OCAML_FINDLIB_REGISTER
67 ;; 67 ;;
68esac 68esac
69 69