xterm/xterm-255-man-page_paths.patch

61 lines
2.4 KiB
Diff
Raw Normal View History

2010-02-02 17:29:15 +00:00
diff -up xterm-255/minstall.sh.man-page_paths xterm-255/minstall.sh
--- xterm-255/minstall.sh.man-page_paths 2010-01-20 11:55:42.000000000 +0100
+++ xterm-255/minstall.sh 2010-02-02 17:52:11.000000000 +0100
@@ -74,9 +74,9 @@ MY_MANSECT=$suffix
# are only a few common choices. Note that they may not necessarily appear
# in the same directories. Prefer utmpx/wtmpx to utmp/wtmp, since that's
# the way the configure script is designed.
-UTMP_NAME=utmp22
+UTMP_NAME=utmp
UTMP_PATH=/etc
-for name in /etc /var/adm /var/log
+for name in /etc /var/adm /var/log /var/run
do
if test -f $name/utmpx ; then
UTMP_NAME=utmpx
@@ -109,6 +109,10 @@ 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
sed -e 's%__vendorversion__%"X Window System"%' \
-e s%__apploaddir__%$APPS_DIR% \
-e s%__mansuffix__%$MY_MANSECT%g \
@@ -117,6 +121,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-255/xterm.man.man-page_paths xterm-255/xterm.man
--- xterm-255/xterm.man.man-page_paths 2010-01-20 11:55:58.000000000 +0100
+++ xterm-255/xterm.man 2010-02-02 17:50:29.000000000 +0100
@@ -1701,17 +1701,17 @@ Since X11R6, bitmap fonts have been scal
The font server claims to provide the bold font that \fIxterm\fP requests,
but the result is not always readable.
XFree86 provides 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 \fIxterm\fP.
For example
.RS
- FontPath "/usr/lib/X11/fonts/misc/"
+ FontPath "__fontpath__"
.RE
.IP
would become
.RS
- FontPath "/usr/lib/X11/fonts/misc/:unscaled"
+ FontPath "__fontpath__/misc/:unscaled"
.RE
.IP
Depending on your configuration, the font server may have its own configuration