Tue Sep 12 14:04:59 2017 UTC ()
mk/bsd.pkg.mk: Adapt changes-entry target

Prefix package name to commit message.


(wiz)
diff -r1.22 -r1.23 pkgsrc/mk/misc/developer.mk
cvs diff -r1.22 -r1.23 pkgsrc/mk/misc/developer.mk (expand / switch to unified diff)

--- pkgsrc/mk/misc/developer.mk 2014/02/22 13:11:22 1.22
+++ pkgsrc/mk/misc/developer.mk 2017/09/12 14:04:59 1.23
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: developer.mk,v 1.22 2014/02/22 13:11:22 obache Exp $ 1# $NetBSD: developer.mk,v 1.23 2017/09/12 14:04:59 wiz Exp $
2# 2#
3# Public targets for developers: 3# Public targets for developers:
4# 4#
5# changes-entry-noupdate: 5# changes-entry-noupdate:
6# Appends a correctly-formatted entry to the pkgsrc CHANGES file, 6# Appends a correctly-formatted entry to the pkgsrc CHANGES file,
7# and removes any TODO entries that were completed with this 7# and removes any TODO entries that were completed with this
8# update from the TODO file. 8# update from the TODO file.
9# The CHANGES and TODO files are presumed to be up to date and writable. 9# The CHANGES and TODO files are presumed to be up to date and writable.
10# Note that the first assumption is often wrong and that the 10# Note that the first assumption is often wrong and that the
11# second is wrong for those that set CVSREAD. 11# second is wrong for those that set CVSREAD.
12# 12#
13# Command-line variables: 13# Command-line variables:
14# 14#
@@ -116,27 +116,27 @@ changes-entry-update: .PHONY ce-error-ch @@ -116,27 +116,27 @@ changes-entry-update: .PHONY ce-error-ch
116 ${RUN} cd ${PKGSRC_CHANGES_DIR} && cvs ${_NB_CVSROOT} update ${PKGSRC_CHANGES:T} ${PKGSRC_TODO:T} 116 ${RUN} cd ${PKGSRC_CHANGES_DIR} && cvs ${_NB_CVSROOT} update ${PKGSRC_CHANGES:T} ${PKGSRC_TODO:T}
117 ${RUN} cd ${PKGSRC_CHANGES_DIR} && test -w ${PKGSRC_CHANGES:T} || cvs ${_NB_CVSROOT} edit ${PKGSRC_CHANGES:T} 117 ${RUN} cd ${PKGSRC_CHANGES_DIR} && test -w ${PKGSRC_CHANGES:T} || cvs ${_NB_CVSROOT} edit ${PKGSRC_CHANGES:T}
118 ${RUN} cd ${PKGSRC_CHANGES_DIR} && test -w ${PKGSRC_TODO:T} || cvs ${_NB_CVSROOT} edit ${PKGSRC_TODO:T} 118 ${RUN} cd ${PKGSRC_CHANGES_DIR} && test -w ${PKGSRC_TODO:T} || cvs ${_NB_CVSROOT} edit ${PKGSRC_TODO:T}
119 119
120changes-entry-add: .PHONY ce-error-check 120changes-entry-add: .PHONY ce-error-check
121 @${STEP_MSG} "Adding the change" 121 @${STEP_MSG} "Adding the change"
122 ${RUN} ${ECHO} " "${_CE_MSG:Q} >> ${PKGSRC_CHANGES} 122 ${RUN} ${ECHO} " "${_CE_MSG:Q} >> ${PKGSRC_CHANGES}
123 123
124todo-entry-remove: 124todo-entry-remove:
125 ${RUN} PKG_ADMIN=${PKG_ADMIN_CMD:Q} ${SH} ${PKGSRCDIR}/mk/scripts/remove_todo ${PKGSRC_TODO} ${PKGBASE} ${PKGVERSION} 125 ${RUN} PKG_ADMIN=${PKG_ADMIN_CMD:Q} ${SH} ${PKGSRCDIR}/mk/scripts/remove_todo ${PKGSRC_TODO} ${PKGBASE} ${PKGVERSION}
126 126
127changes-entry-commit: .PHONY ce-error-check 127changes-entry-commit: .PHONY ce-error-check
128 @${STEP_MSG} "Committing the change" 128 @${STEP_MSG} "Committing the change"
129 ${RUN} cd ${PKGSRC_CHANGES_DIR} && cvs ${_NB_CVSROOT} commit -m ${_CE_MSG1:Q} ${PKGSRC_CHANGES:T} ${PKGSRC_TODO:T} 129 ${RUN} cd ${PKGSRC_CHANGES_DIR} && cvs ${_NB_CVSROOT} commit -m ${PKGSRC_CHANGES_BASE:Q}": "${_CE_MSG1:Q} ${PKGSRC_CHANGES:T} ${PKGSRC_TODO:T}
130 130
131ce-error-check: .PHONY 131ce-error-check: .PHONY
132.if defined(_CE_ERRORS) && !empty(_CE_ERRORS:M*) 132.if defined(_CE_ERRORS) && !empty(_CE_ERRORS:M*)
133 ${RUN} for msg in ${_CE_ERRORS}; do ${ERROR_MSG} "$$msg"; done; exit 1 133 ${RUN} for msg in ${_CE_ERRORS}; do ${ERROR_MSG} "$$msg"; done; exit 1
134.else 134.else
135 @${DO_NADA} 135 @${DO_NADA}
136.endif 136.endif
137 137
138# Public targets 138# Public targets
139changes-entry-noupdate: .PHONY ce-error-check changes-entry-add todo-entry-remove 139changes-entry-noupdate: .PHONY ce-error-check changes-entry-add todo-entry-remove
140 @${DO_NADA} 140 @${DO_NADA}
141 141
142changes-entry: .PHONY ce-error-check changes-entry-update changes-entry-add todo-entry-remove 142changes-entry: .PHONY ce-error-check changes-entry-update changes-entry-add todo-entry-remove