Index: developer.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/misc/developer.mk,v
retrieving revision 1.26
diff -u -r1.26 developer.mk
--- developer.mk	16 Jun 2022 04:56:49 -0000	1.26
+++ developer.mk	9 May 2024 10:37:04 -0000
@@ -5,9 +5,9 @@
 #
 # cce:
 # commit-changes-entry:
-#	Updates the CHANGES and TODO files from CVS, appends an entry to the
-#	CHANGES file, removes any TODO entries that were completed with this
-#	update, and finally commits the changes to CVS.
+#	Appends an entry to the CHANGES file, removes any TODO entries
+#	that were completed with this update, and finally commits the
+#	changes to git.
 #
 #	CTYPE
 #		The type of entry to add:
@@ -35,10 +35,6 @@
 #		entries are removed.
 #		The default is ${PKGSRCDIR}/TODO.
 #
-#	USE_NETBSD_REPO
-#		Explicitly use cvs.netbsd.org:/cvsroot for all cvs commands
-#		issued by changes-entry and co.
-#
 #	Example usage:
 #		% cd /usr/pkgsrc/category/package
 #		% make cce CTYPE=Added
@@ -46,14 +42,9 @@
 # changes-entry:
 #	Like commit-changes-entry, except for actually committing the changes.
 #
-# changes-entry-noupdate:
-#	Like changes-entry, except that the CHANGES and TODO files are not
-#	updated from CVS.  Typically used to add several change entries in a
-#	single batch.
-#
-#	The CHANGES and TODO files are presumed to be up to date and writable.
-#	Note that the first assumption is often wrong and that the second is
-#	wrong for those that set CVSREAD.
+#	The CHANGES and TODO files are presumed to be up to date.
+#	Note that the first assumption is often wrong, but will be
+#	fixed by the git rebase.
 #
 #
 # upload-distfiles:
@@ -77,12 +68,6 @@
 _CDATE_cmd=		${DATE} -u +%Y-%m-%d
 _NETBSD_LOGIN_NAME_cmd=	${ID} -nu
 
-USE_NETBSD_REPO?=	no
-
-.if !empty(USE_NETBSD_REPO:M[Yy][Ee][Ss])
-_NB_CVSROOT=	-d ${NETBSD_LOGIN_NAME:Q}@cvs.NetBSD.org:/cvsroot
-.endif
-
 .if !empty(CTYPE:tl:Mup*)				# updated
 _CE_MSG1=	Updated ${PKGPATH} to ${PKGVERSION}
 .elif !empty(CTYPE:tl:Mrem*) || !empty(CTYPE:tl:Mrm)	# removed
@@ -111,16 +96,7 @@
 # commit operation will have a sensible message with all of the
 # previous operations.
 
-# XXX Fail if uid is 0, or perhaps != CVS meta files owner, to catch
-# the case of invoking these targets as root.
-
-# Targets for the update, add, commit elementary operations.
-changes-entry-update: .PHONY ce-error-check
-	@${STEP_MSG} "Updating ${PKGSRC_CHANGES:T} and ${PKGSRC_TODO:T}"
-	${RUN} cd ${PKGSRC_CHANGES_DIR} && cvs ${_NB_CVSROOT} update ${PKGSRC_CHANGES:T} ${PKGSRC_TODO:T}
-	${RUN} cd ${PKGSRC_CHANGES_DIR} && test -w ${PKGSRC_CHANGES:T} || cvs ${_NB_CVSROOT} edit ${PKGSRC_CHANGES:T}
-	${RUN} cd ${PKGSRC_CHANGES_DIR} && test -w ${PKGSRC_TODO:T} || cvs ${_NB_CVSROOT} edit ${PKGSRC_TODO:T}
-
+# Targets for the add and commit elementary operations.
 changes-entry-add: .PHONY ce-error-check
 	@${STEP_MSG} "Adding the change"
 	${RUN} ${ECHO} "	"${_CE_MSG:Q} >> ${PKGSRC_CHANGES}
@@ -130,7 +106,7 @@
 
 changes-entry-commit: .PHONY ce-error-check
 	@${STEP_MSG} "Committing the change"
-	${RUN} cd ${PKGSRC_CHANGES_DIR} && cvs ${_NB_CVSROOT} commit -m "doc: "${_CE_MSG1:Q} ${PKGSRC_CHANGES:T} ${PKGSRC_TODO:T}
+	${RUN} cd ${PKGSRC_CHANGES_DIR} && git commit -m "doc: "${_CE_MSG1:Q} ${PKGSRC_CHANGES:T} ${PKGSRC_TODO:T}
 
 ce-error-check: .PHONY
 .if defined(_CE_ERRORS) && !empty(_CE_ERRORS:M*)
@@ -143,10 +119,10 @@
 changes-entry-noupdate: .PHONY ce-error-check changes-entry-add todo-entry-remove
 	@${DO_NADA}
 
-changes-entry: .PHONY ce-error-check changes-entry-update changes-entry-add todo-entry-remove
+changes-entry: .PHONY ce-error-check changes-entry-add todo-entry-remove
 	@${DO_NADA}
 
-commit-changes-entry cce: .PHONY ce-error-check changes-entry-update changes-entry-add todo-entry-remove changes-entry-commit
+commit-changes-entry cce: .PHONY ce-error-check changes-entry-add todo-entry-remove changes-entry-commit
 	@${DO_NADA}
 
 .PHONY: upload-distfiles