294
295
296
297
298
299
300
301
302
303
304
305
306
307
|
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
|
+
+
+
+
+
+
+
+
+
+
+
+
+
+
|
--export-marks $gitdir/fossil.marks \
$=importmarks_fossil |
LC_ALL=C git fast-import \
--export-marks=$gitdir/git.marks \
$=importmarks_git
}
fi
if which cvs &>/dev/null; then
cvsd() {
if which colordiff &>/dev/null; then
cvs diff -uN "$@" | colordiff | less -FRX
else
red="$(tput setaf 1)"
green="$(tput setaf 2)"
reset="$(tput sgr0)"
cvs diff -uN "$@" | sed "s/^+.*$/$green&$reset/" |
sed "s/^-.*$/$red&$reset/" | less -FRX
fi
}
fi
# pkgsrc does not like MAKEFLAGS including -j
which pkg_chk &>/dev/null && alias pkg_chk="MAKEFLAGS= pkg_chk"
which pkg_rolling-replace &>/dev/null &&
alias pkg_rolling-replace="MAKEFLAGS= pkg_rolling-replace"
which url2pkg &>/dev/null && alias url2pkg="MAKEFLAGS= url2pkg"
|