Date: Mon, 27 Mar 2000 20:22:36 +0800 (CST) From: clive@cirx.org To: FreeBSD-gnats-submit@freebsd.org Subject: ports/17618: update chinese/rxvt to 2.7.3 Message-ID: <200003271222.UAA68591@cartier.cirx.org>
next in thread | raw e-mail | index | archive | help
>Number: 17618
>Category: ports
>Synopsis: update chinese/rxvt to 2.7.3
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Mar 27 04:30:01 PST 2000
>Closed-Date:
>Last-Modified:
>Originator: Clive Lin <clive@CirX.ORG>
>Release: FreeBSD 5.0-CURRENT i386
>Organization:
This site doesnt' exist
>Environment:
FreeBSD 5.0-CURRENT #0: Mon Mar 27 01:20:02 CST 2000 root@cartier.cirx.org:/usr/src/sys/compile/CARTIER
>Description:
o update chinese/rxvt to 2.7.3
o merge MASTER_SITES from x11/rxvt
o kick over-bolded font out
o now it's happy with chinese/kcfonts and chinese/arphicttf
>How-To-Repeat:
>Fix:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/chinese/rxvt/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- Makefile 2000/02/23 13:50:45 1.15
+++ Makefile 2000/03/27 12:13:28
@@ -6,10 +6,13 @@
# $FreeBSD: ports/chinese/rxvt/Makefile,v 1.15 2000/02/23 13:50:45 imura Exp $
#
-DISTNAME= rxvt-2.7.2
-PKGNAME= zh-rxvt-2.7.2
+DISTNAME= rxvt-2.7.3
+PKGNAME= zh-rxvt-2.7.3
CATEGORIES= chinese x11
-MASTER_SITES= ftp://ftp.rxvt.org/pub/rxvt/
+MASTER_SITES= ftp://ftp.rxvt.org/pub/rxvt/ \
+ ftp://mason.primenet.com.au/pub/rxvt/ \
+ ${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR= X11/terms
MAINTAINER= frankch@waru.life.nthu.edu.tw
Index: files/md5
===================================================================
RCS file: /home/ncvs/ports/chinese/rxvt/files/md5,v
retrieving revision 1.8
diff -u -r1.8 md5
--- md5 2000/02/23 13:50:47 1.8
+++ md5 2000/03/27 12:13:28
@@ -1 +1 @@
-MD5 (rxvt-2.7.2.tar.bz2) = cce181764763ceb7c1d12a8b05c3ce2e
+MD5 (rxvt-2.7.3.tar.bz2) = 4f22d749152ba717c5b716df43801800
Index: patches/patch-aa
===================================================================
RCS file: /home/ncvs/ports/chinese/rxvt/patches/patch-aa,v
retrieving revision 1.8
diff -u -r1.8 patch-aa
--- patch-aa 2000/02/23 13:50:48 1.8
+++ patch-aa 2000/03/27 12:13:29
@@ -1,5 +1,5 @@
---- Makefile.in.orig Tue Dec 21 18:07:54 1999
-+++ Makefile.in Tue Feb 8 14:01:20 2000
+--- Makefile.in.orig Mon Mar 27 19:38:42 2000
++++ Makefile.in Mon Mar 27 19:39:21 2000
@@ -9,7 +9,7 @@
first_rule: all
dummy:
@@ -9,9 +9,19 @@
DIST = INSTALL README.configure configure Makefile Makefile.in ChangeLog
---- doc/Makefile.in.orig Tue Sep 28 15:04:39 1999
-+++ doc/Makefile.in Tue Feb 8 14:02:31 2000
-@@ -56,7 +56,7 @@
+--- doc/Makefile.in.orig Mon Mar 27 19:39:40 2000
++++ doc/Makefile.in Mon Mar 27 19:44:16 2000
+@@ -40,9 +40,6 @@
+
+ all: rxvt.1
+
+-rxvt.1: rxvt.tbl Makefile
+- @if test x$(TBL) = x; then : ; else echo "$(TBL) $(srcdir)/rxvt.tbl | grep -v '^.lf' > rxvt.1"; $(TBL) $(srcdir)/rxvt.tbl | grep -v '^.lf' > rxvt.1 ; fi
+-
+ SEDREPLACE = -e 's%@RXVT_VERSION@%$(VERSION)%g;'\
+ -e 's%@RXVT_LSMDATE@%$(LSMDATE)%g;'\
+ -e 's%@RXVT_DATE@%$(DATE)%g;'\
+@@ -56,7 +53,7 @@
tags allbin:
@@ -20,23 +30,23 @@
yodl/versioninfo.yo: yodl/versioninfo.yo.in ../src/version.h
$(SED) $(SEDREPLACE) < $(srcdir)/yodl/versioninfo.yo.in > $@
-@@ -85,7 +85,7 @@
+@@ -85,7 +82,7 @@
distclean:
install:
-- $(INSTALL_DATA) rxvt.1 $(DESTDIR)$(mandir)/$(manprefix)rxvt.$(manext)
+- $(INSTALL_DATA) rxvt.1 $(DESTDIR)$(mandir)/$(RXVTNAME).$(manext)
+ $(INSTALL_DATA) rxvt.1 $(PREFIX)/man/man1/crxvt.1
uninstall:
- -cd $(mandir); $(RMF) $(manprefix)rxvt.$(manext)
---- src/Makefile.in.orig Tue Feb 8 14:03:35 2000
-+++ src/Makefile.in Tue Feb 8 14:04:10 2000
-@@ -97,7 +97,7 @@
+ -(cd $(mandir); $(RMF) $(RXVTNAME).$(manext) )
+--- src/Makefile.in.orig Mon Mar 27 19:41:21 2000
++++ src/Makefile.in Mon Mar 27 19:41:38 2000
+@@ -98,7 +98,7 @@
(cd $(srcdir); $(RMF) Makefile)
install: allbin alldoc
-- $(INSTALL_PROGRAM) rxvt $(DESTDIR)$(bindir)/$(binprefix)rxvt
+- $(INSTALL_PROGRAM) rxvt $(DESTDIR)$(bindir)/$(RXVTNAME)
+ $(INSTALL_PROGRAM) rxvt $(PREFIX)/bin/crxvt
uninstall:
- (cd $(bindir); $(RMF) $(binprefix)rxvt)
+ -(cd $(bindir); $(RMF) $(RXVTNAME) )
Index: patches/patch-ab
===================================================================
RCS file: /home/ncvs/ports/chinese/rxvt/patches/patch-ab,v
retrieving revision 1.5
diff -u -r1.5 patch-ab
--- patch-ab 2000/02/23 13:50:48 1.5
+++ patch-ab 2000/03/27 12:13:30
@@ -1,6 +1,6 @@
---- src/main.c.orig Wed Feb 9 11:57:04 2000
-+++ src/main.c Wed Feb 9 12:02:43 2000
-@@ -460,6 +460,16 @@
+--- src/init.c.orig Mon Mar 27 19:50:56 2000
++++ src/init.c Mon Mar 27 19:51:44 2000
+@@ -866,6 +866,16 @@
GCForeground | GCBackground |
GCFont | GCGraphicsExposures,
&gcvalue);
@@ -9,15 +9,17 @@
+#ifdef MULTICHAR_SET
+ gcvalue.font = TermWin.mfont->fid;
+ TermWin.mgc = XCreateGC(Xdisplay, TermWin.vt,
-+ GCForeground | GCBackground |
-+ GCFont | GCGraphicsExposures,
-+ &gcvalue);
++ GCForeground | GCBackground |
++ GCFont | GCGraphicsExposures,
++ &gcvalue);
+#endif
+#endif
}
}
- /* window resizing - assuming the parent window is the correct size */
-@@ -969,7 +979,11 @@
+ /*----------------------------------------------------------------------*/
+--- src/main.c.orig Mon Mar 27 19:53:37 2000
++++ src/main.c Mon Mar 27 19:54:04 2000
+@@ -546,7 +546,11 @@
/* alter existing GC */
if (!init) {
@@ -29,18 +31,9 @@
menubar_expose();
}
---- src/rxvt.h.orig Wed Feb 9 12:01:07 2000
-+++ src/rxvt.h Wed Feb 9 12:04:17 2000
-@@ -7,6 +7,8 @@
-
- #include "feature.h"
-
-+#define FIX_ALIGNMENT
-+
- /*
- *****************************************************************************
- * SYSTEM HACKS
-@@ -170,12 +172,19 @@
+--- src/rxvt.h.orig Mon Mar 27 19:54:20 2000
++++ src/rxvt.h Mon Mar 27 19:55:36 2000
+@@ -172,12 +172,19 @@
Window parent[KNOW_PARENTS], /* parent[0] is our window */
vt; /* vt100 window */
GC gc; /* GC for drawing text */
@@ -56,66 +49,67 @@
XFontStruct *mfont; /* Multichar font structure */
+#endif
+#ifdef FIX_ALIGNMENT
-+ GC mgc;
++ GC mgc;
#endif
XFontSet fontset;
#ifdef XPM_BACKGROUND
---- src/screen.c.orig Wed Feb 9 12:04:29 2000
-+++ src/screen.c Wed Feb 9 12:23:07 2000
-@@ -2169,7 +2169,12 @@
+--- src/screen.c.orig Mon Mar 27 19:56:10 2000
++++ src/screen.c Mon Mar 27 20:00:03 2000
+@@ -2162,7 +2162,12 @@
* always go back to the base font - it's much safer
*/
wbyte = 0;
+- XSetFont(Xdisplay, TermWin.gc, TermWin.font->fid);
+#ifdef FIX_ALIGNMENT
-+ TermWin.gc = TermWin.ngc;
-+ TermWin.vascent = TermWin.font->ascent;
++ TermWin.gc = TermWin.ngc;
++ TermWin.vascent = TermWin.font->ascent;
+#else
- XSetFont(Xdisplay, TermWin.gc, TermWin.font->fid);
++ XSetFont(Xdisplay, TermWin.gc, TermWin.font->fid);
+#endif
draw_string = XDrawString;
draw_image_string = XDrawImageString;
clearfirst = clearlast = 0;
-@@ -2378,7 +2383,11 @@
+@@ -2371,7 +2376,11 @@
len = 0;
buffer[len++] = stp[col];
ypixelc = Row2Pixel(row);
+#ifdef FIX_ALIGNMENT
-+ ypixel = ypixelc + TermWin.vascent;
++ ypixel = ypixelc + TermWin.vascent;
+#else
ypixel = ypixelc + TermWin.font->ascent;
+#endif
xpixel = Col2Pixel(col);
fontdiff = 0;
wlen = 1;
-@@ -2399,7 +2408,13 @@
+@@ -2392,7 +2401,13 @@
fprop = TermWin.mprop;
if (!wbyte && TermWin.mfont) {
wbyte = 1;
+#ifdef FIX_ALIGNMENT
-+ TermWin.gc = TermWin.mgc;
-+ ypixel += TermWin.mfont->ascent - TermWin.vascent;
-+ TermWin.vascent = TermWin.mfont->ascent;
++ TermWin.gc = TermWin.mgc;
++ ypixel += TermWin.mfont->ascent - TermWin.vascent;
++ TermWin.vascent = TermWin.mfont->ascent;
+#else
XSetFont(Xdisplay, TermWin.gc, TermWin.mfont->fid);
+#endif
fontdiff = TermWin.mprop;
draw_string = XDrawString16;
draw_image_string = XDrawImageString16;
-@@ -2446,7 +2461,13 @@
+@@ -2439,7 +2454,13 @@
}
if (wbyte) {
wbyte = 0;
+#ifdef FIX_ALIGNMENT
-+ TermWin.gc = TermWin.ngc;
-+ ypixel += TermWin.font->ascent - TermWin.vascent;
-+ TermWin.vascent = TermWin.font->ascent;
++ TermWin.gc = TermWin.ngc;
++ ypixel += TermWin.font->ascent - TermWin.vascent;
++ TermWin.vascent = TermWin.font->ascent;
+#else
XSetFont(Xdisplay, TermWin.gc, TermWin.font->fid);
+#endif
draw_string = XDrawString;
draw_image_string = XDrawImageString;
}
-@@ -2544,7 +2565,11 @@
+@@ -2537,7 +2558,11 @@
rend &= ~RS_Bold; /* we've taken care of it */
} else if (bfont) {
bfont = 0;
@@ -127,7 +121,7 @@
}
#endif
/*
-@@ -2679,6 +2704,9 @@
+@@ -2672,6 +2697,9 @@
end_row = TermWin.saveLines - TermWin.view_start;
if (selection.op && current_screen == selection.screen) {
i = selection.beg.row + TermWin.saveLines;
@@ -137,3 +131,27 @@
row = selection.end.row + TermWin.saveLines;
if (i >= end_row)
col = selection.beg.col;
+--- src/feature.h.orig Mon Mar 27 20:06:40 2000
++++ src/feature.h Mon Mar 27 20:07:27 2000
+@@ -55,18 +55,18 @@
+ * overstrike just for multi char fonts
+ * Note: NO_BOLDOVERSTRIKE implies NO_BOLDOVERSTRIKE_MULTI
+ */
+-/* #define NO_BOLDOVERSTRIKE */
++#define NO_BOLDOVERSTRIKE
+ /* #define NO_BOLDOVERSTRIKE_MULTI */
+
+ /*
+ * Also use bold font or overstrike even if we use colour for bold
+ */
+-#define VERYBOLD
++/* #define VERYBOLD */
+
+ /*
+ * Compile without support for real bold fonts
+ */
+-/* #define NO_BOLDFONT */
++#define NO_BOLDFONT
+
+ /*
+ * If the screen has 24 bit mode, use that even if the default is 8 bit.
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200003271222.UAA68591>