xterm/xterm-man-paths.patch
Miroslav Lichvar 0b67e2eed5 update to 284
2012-10-15 12:33:06 +02:00

58 lines
2.3 KiB
Diff

diff -up xterm-284/minstall.in.man-paths xterm-284/minstall.in
--- xterm-284/minstall.in.man-paths 2012-10-14 21:45:07.000000000 +0200
+++ xterm-284/minstall.in 2012-10-15 12:23:37.602431393 +0200
@@ -118,12 +118,17 @@ WTMP_PATH=$WTMP_PATH/$WTMP_NAME
X_MANSECT=`man X 2>&1 | tr '\012' '\020' | sed -e 's/^[^0123456789]*\([^) ][^) ]*\).*/\1/'`
test -z "$X_MANSECT" && X_MANSECT=$suffix
+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/`
sed -e 's%__vendorversion__%"X Window System"%' \
- -e "s%^\.ds N Xterm%.ds n $APP_Name%" \
- -e "s%^\.ds n xterm%.ds N $APP_name%" \
+ -e "s%^\.ds N Xterm%.ds N $APP_Name%" \
+ -e "s%^\.ds n xterm%.ds n $APP_name%" \
-e s%__default_termname__%@default_TERM@% \
-e s%__default_termid__%@default_termid@% \
-e s%__alt_sends_esc__%@alt_sends_esc@% \
@@ -140,6 +145,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-284/xterm.man.man-paths xterm-284/xterm.man
--- xterm-284/xterm.man.man-paths 2012-10-14 21:47:51.000000000 +0200
+++ xterm-284/xterm.man 2012-10-15 12:19:30.161179717 +0200
@@ -1961,17 +1961,17 @@ 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
would become
.NS
-FontPath "/usr/lib/X11/fonts/misc/:unscaled"
+FontPath "__fontpath__/misc/:unscaled"
.NE
Depending on your configuration, the font server may have its own configuration
file.