xterm/xterm-man-paths.patch
Miroslav Lichvar ade4ff71bd update to 287
2012-11-26 17:33:21 +01:00

51 lines
2.0 KiB
Diff

diff -up xterm-287/minstall.in.man-paths xterm-287/minstall.in
--- xterm-287/minstall.in.man-paths 2012-10-29 10:23:22.000000000 +0100
+++ xterm-287/minstall.in 2012-11-26 17:24:37.331416504 +0100
@@ -122,6 +122,11 @@ VERSION_H=`echo "$OLD_FILE" | sed -e 's,
PATCH_NUM=`fgrep XTERM_PATCH $VERSION_H|sed -e 's/[^0-9]*//g'`
PATCH_YMD=`fgrep XTERM_DATE $VERSION_H|sed -e 's,[^0-9/.-]*,,g'`
+fontpath=/usr/share/X11/fonts
+xorgcfgdir=/etc/X11
+xorgcfgfil=xorg.conf
+X_MANSECT=7
+
# Provide for renaming in test-builds:
APP_Name=`echo "$APP_name" | sed -e s/xterm/Xterm/`
APP_NAME=`echo "$APP_name" | tr '[a-z]' '[A-Z]'`
@@ -148,6 +153,9 @@ sed -e 's%__vendorversion__%"X Window Sy
-e s%/etc/utmp%$UTMP_PATH%g \
-e s%fIwtmp'\\%fI'$WTMP_NAME'\\%g' \
-e s%/etc/wtmp%$WTMP_PATH%g \
+ -e s%__fontpath__%$fontpath%g \
+ -e s%__xorgcfgdir__%$xorgcfgdir%g \
+ -e s%__xorgcfgfil__%$xorgcfgfil%g \
$OLD_FILE >$NEW_FILE
echo "$MINSTALL $OLD_FILE $END_FILE"
diff -up xterm-287/xterm.man.man-paths xterm-287/xterm.man
--- xterm-287/xterm.man.man-paths 2012-11-22 19:42:30.000000000 +0100
+++ xterm-287/xterm.man 2012-11-26 17:25:43.593546008 +0100
@@ -1970,18 +1970,18 @@ Since X11R6, bitmap fonts have been scal
The font server claims to provide the bold font that \fI\*n\fP requests,
but the result is not always readable.
XFree86 introduced a feature which can be used to suppress the scaling.
-In the X server's configuration file (e.g., \*(``/etc/X11/XFree86\*(''), you
+In the X server's configuration file (e.g., \*(``__xorgcfgdir__/__xorgcfgfil__\*(''), you
can add \*(``:unscaled\*('' to the end of the directory specification for the
\*(``misc\*('' fonts,
which comprise the fixed-pitch fonts that are used by \fI\*n\fP.
For example
.NS
-FontPath "/usr/lib/X11/fonts/misc/"
+FontPath "__fontpath__/misc/"
.NE
.IP
would become
.NS
-FontPath "/usr/lib/X11/fonts/misc/:unscaled"
+FontPath "__fontpath__/misc/:unscaled"
.NE
.IP
Depending on your configuration, the font server may have its own configuration