diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2014-07-31 20:13:41 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2014-07-31 20:13:41 +0000 |
| commit | b0f68dda5ac4408d2e3a713dd3b3b6712634e68b (patch) | |
| tree | 8dc3f4ae200e09c4237e402f8097f68aa65974bb /app/xterm | |
| parent | 51e9a5a33ee06c8e5d02f3f43938bb545ad71fc2 (diff) | |
Complete man page substitutions for xterm(1) and resize(1)
problem noticed by and tweaks by naddy@. ok deraadt@
Diffstat (limited to 'app/xterm')
| -rw-r--r-- | app/xterm/Makefile | 20 | ||||
| -rw-r--r-- | app/xterm/resize/Makefile | 9 |
2 files changed, 26 insertions, 3 deletions
diff --git a/app/xterm/Makefile b/app/xterm/Makefile index 288e74063..7e184568e 100644 --- a/app/xterm/Makefile +++ b/app/xterm/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2014/05/09 19:56:40 matthieu Exp $ +# $OpenBSD: Makefile,v 1.25 2014/07/31 20:13:40 matthieu Exp $ .include <bsd.xconf.mk> SUBDIR= icons resize @@ -54,12 +54,28 @@ beforedepend: builtin_icons.h .SUFFIXES: .man .1 +PATCH_NUM != sed -n '/XTERM_PATCH/s/[^0-9]*//gp' ${.CURDIR}/version.h +PATCH_YMD != sed -n '/XTERM_DATE/s,[^0-9/.-]*,,gp' ${.CURDIR}/version.h + .man.1: sed -e 's#__vendorversion__#"X Window System"#g' \ -e 's#__mansuffix__#1#g' \ -e 's#__miscmansuffix__#7#g' \ -e 's#__apploaddir__#${X11ETC}/app-defaults#g' \ - < $< > $@ + -e 's%__app_version__%Patch\ \#'$(PATCH_NUM)% \ + -e 's%__app_date__%'${PATCH_YMD}% \ + -e s%__default_termname__%xterm% \ + -e s%__default_termid__%vt100% \ + -e s%__alt_sends_esc__%false% \ + -e s%__meta_sends_esc__%false% \ + -e s%__backarrow_is_bs__%true% \ + -e s%__backarrow_is_erase__%true% \ + -e s%__delete_is_del__%true% \ + -e s%__default_class__%XTerm% \ + -e s%__pixmapsdir__%${X11BASE}/include/X11/pixmaps/% \ + -e s%/etc/utmp%/var/run/utmp%g \ + -e s%/etc/wtmp%/var/run/wtmp%g \ + < $< > $@ CLEANFILES+= ${MAN} builtin_icons.h diff --git a/app/xterm/resize/Makefile b/app/xterm/resize/Makefile index 3b42e51c9..7cdd29397 100644 --- a/app/xterm/resize/Makefile +++ b/app/xterm/resize/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2013/03/09 14:45:39 matthieu Exp $ +# $OpenBSD: Makefile,v 1.7 2014/07/31 20:13:40 matthieu Exp $ PROG= resize MAN= resize.1 @@ -15,11 +15,18 @@ MANDIR= ${X11BASE}/man/man SRCS= resize.c version.c xstrings.c +PATCH_NUM != sed -n '/XTERM_PATCH/s/[^0-9]*//gp' ${.CURDIR}/../version.h +PATCH_YMD != sed -n '/XTERM_DATE/s,[^0-9/.-]*,,gp' ${.CURDIR}/../version.h + + resize.1: resize.man sed -e 's#__vendorversion__#"X Window System"#g' \ -e 's#__mansuffix__#1#g' \ -e 's#__miscmansuffix__#7#g' \ -e 's#__apploaddir__#${X11ETC}/app-defaults#g' \ + -e s%__default_termname__%xterm% \ + -e 's%__app_version__%Patch\ \#'$(PATCH_NUM)% \ + -e 's%__app_date__%'${PATCH_YMD}% \ < ${.CURDIR}/../resize.man > $@ CLEANFILES+= resize.1 |