diff options
| author | joerg <joerg@pkgsrc.org> | 2013-04-12 13:53:57 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2013-04-12 13:53:57 +0000 |
| commit | 78285aadeda7edf4c1a5a7dab320ee974f1c7c18 (patch) | |
| tree | 24f2dea5befd7865e94463b2f4f5266ad45b3706 /mk | |
| parent | 7bdf33c0aca60d4a42d5e754dccd058f016079ea (diff) | |
| download | pkgsrc-78285aadeda7edf4c1a5a7dab320ee974f1c7c18.tar.gz | |
Allow running on systems where pkg_admin is not in PATH
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/misc/developer.mk | 4 | ||||
| -rwxr-xr-x | mk/scripts/remove_todo | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mk/misc/developer.mk b/mk/misc/developer.mk index ae8ee53a6be..58225e1aec5 100644 --- a/mk/misc/developer.mk +++ b/mk/misc/developer.mk @@ -1,4 +1,4 @@ -# $NetBSD: developer.mk,v 1.19 2011/09/15 21:45:52 wiz Exp $ +# $NetBSD: developer.mk,v 1.20 2013/04/12 13:53:57 joerg Exp $ # # Public targets for developers: # @@ -117,7 +117,7 @@ changes-entry-add: .PHONY ce-error-check ${RUN} ${ECHO} " "${_CE_MSG:Q} >> ${PKGSRC_CHANGES} todo-entry-remove: - ${RUN} ${SH} ${PKGSRCDIR}/mk/scripts/remove_todo ${PKGSRC_TODO} ${PKGBASE} ${PKGVERSION} + ${RUN} PKG_ADMIN=${PKG_ADMIN_CMD:Q} ${SH} ${PKGSRCDIR}/mk/scripts/remove_todo ${PKGSRC_TODO} ${PKGBASE} ${PKGVERSION} changes-entry-commit: .PHONY ce-error-check @${STEP_MSG} "Committing the change" diff --git a/mk/scripts/remove_todo b/mk/scripts/remove_todo index 75ca0f32375..41d18cb020d 100755 --- a/mk/scripts/remove_todo +++ b/mk/scripts/remove_todo @@ -23,6 +23,7 @@ TODO=$1 PKGBASE=$(echo $2 | sed "s/^py[0-9][0-9]-/py-/") PKGVERSION=$3 TMPFILE="$TODO.$$" +PKG_ADMIN="${PKG_ADMIN:-pkg_admin}" MATCH=$(grep -n '^[ ]*o '"$PKGBASE"'-[0-9]' "$TODO" | sed 's/^\([^:]*:\)[ ]*o /\1/;s/ .*//') @@ -35,7 +36,7 @@ fi LINE=$(echo "$MATCH" | sed 's/:.*//') FOUNDPKG=$(echo "$MATCH" | sed -e "s/^[^:]*://") -if pkg_admin pmatch "$PKGBASE"\<="$PKGVERSION" "$FOUNDPKG"; then +if ${PKG_ADMIN} pmatch "$PKGBASE"\<="$PKGVERSION" "$FOUNDPKG"; then echo Removing "$FOUNDPKG" from TODO sed < "$TODO" "$LINE"d > "$TMPFILE" mv "$TMPFILE" "$TODO" |