[pkgsrc/trunk]: pkgsrc/mk/misc In cce, run cvs edit if the file is not writab...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6aa28930c689
branches:  trunk
changeset: 531165:6aa28930c689
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Sat Jul 21 22:31:02 2007 +0000

description:
In cce, run cvs edit if the file is not writable.  This occurs with
CVSREAD=t, and should result in unchanged behavior with writable
files.  Split _CCE_CHANGES definition into _CCE_CHANGES_{DIR/BASE} to
facilitate above.

diffstat:

 mk/misc/developer.mk |  11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r 3ee16bfd452b -r 6aa28930c689 mk/misc/developer.mk
--- a/mk/misc/developer.mk      Sat Jul 21 22:29:02 2007 +0000
+++ b/mk/misc/developer.mk      Sat Jul 21 22:31:02 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: developer.mk,v 1.6 2007/04/01 21:14:27 wiz Exp $
+# $NetBSD: developer.mk,v 1.7 2007/07/21 22:31:02 gdt Exp $
 #
 # Public targets for developers:
 #
@@ -64,7 +64,9 @@
 _CE_MSG2=      [${NETBSD_LOGIN_NAME} ${_CDATE_cmd:sh}]
 _CE_MSG=       ${_CE_MSG1} ${_CE_MSG2}
 
-_CCE_CHANGES=  ${PKGSRCDIR}/doc/CHANGES-${_CYEAR_cmd:sh}
+_CCE_CHANGES_DIR=      ${PKGSRCDIR}/doc/
+_CCE_CHANGES_BASE=     CHANGES-${_CYEAR_cmd:sh}
+_CCE_CHANGES=  ${_CCE_CHANGES_DIR}/${_CCE_CHANGES_BASE}
 
 .PHONY: changes-entry
 changes-entry: ce-error-check
@@ -72,11 +74,12 @@
 
 commit-changes-entry cce: .PHONY ce-error-check
        @${STEP_MSG} "Updating ${PKGSRC_CHANGES:T}"
-       ${RUN} cd ${PKGSRCDIR}/doc && cvs update ${_CCE_CHANGES:T}
+       ${RUN} cd ${_CCE_CHANGES_DIR} && cvs update ${_CCE_CHANGES:T}
+       ${RUN} cd ${_CCE_CHANGES_DIR} && test -w ${_CCE_CHANGES:T} || cvs edit ${_CCE_CHANGES:T}
        @${STEP_MSG} "Adding the change"
        ${RUN} ${ECHO} "        "${_CE_MSG:Q} >> ${_CCE_CHANGES}
        @${STEP_MSG} "Committing the change"
-       ${RUN} cd ${PKGSRCDIR}/doc && cvs commit -m ${_CE_MSG1:Q} ${_CCE_CHANGES:T}
+       ${RUN} cd ${_CCE_CHANGES_DIR} && cvs commit -m ${_CE_MSG1:Q} ${_CCE_CHANGES:T}
 
 ce-error-check:
 .if defined(_CE_ERRORS) && !empty(_CE_ERRORS:M*)