Attachment 7391 Details for Bug 16061 – file.shar

file.shar

file.shar (text/plain), 24.01 KB, created by HONDA Yasuhiro on 2000-01-11 13:00:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: HONDA Yasuhiro

Created: 2000-01-11 13:00:01 UTC

Size: 24.01 KB

patch

obsolete

># This is a shell archive.  Save it in a file, remove anything before
># this line, and then unpack it by entering "sh file".  Note, it may
># create directories; files and directories will be owned by you and
># have default permissions.
>#
># This archive contains:
>#
>#	ja-rxvt.diff
>#	patch-ak
>#	patch-al
>#	patch-am
>#	patch-an
>#
>echo x - ja-rxvt.diff
>sed 's/^X//' >ja-rxvt.diff << 'END-of-ja-rxvt.diff'
>X? patches/patch-an
>X? patches/patch-am
>X? patches/patch-al
>X? patches/patch-ak
>XIndex: Makefile
>X===================================================================
>XRCS file: /home/CVS/ports/japanese/rxvt/Makefile,v
>Xretrieving revision 1.12
>Xdiff -c -r1.12 Makefile
>X*** Makefile	1999/08/25 05:26:48	1.12
>X--- Makefile	2000/01/11 12:08:20
>X***************
>X*** 1,13 ****
>X  # New ports collection Makefile for: ja-rxvt
>X! # Version required:	2.6.1
>X  # Date created:         11 May 1999
>X  # Whom:                 HONDA Yasuhiro <honda@kashio.info.mie-u.ac.jp>
>X  #
>X  # $FreeBSD: ports/japanese/rxvt/Makefile,v 1.12 1999/08/25 05:26:48 obrien Exp $
>X  #
>X  
>X! DISTNAME=	rxvt-2.6.1
>X! PKGNAME=	ja-rxvt-2.6.1
>X  CATEGORIES=	japanese x11
>X  MASTER_SITES=	ftp://ftp.rxvt.org/pub/rxvt/
>X  
>X--- 1,13 ----
>X  # New ports collection Makefile for: ja-rxvt
>X! # Version required:	2.7.2
>X  # Date created:         11 May 1999
>X  # Whom:                 HONDA Yasuhiro <honda@kashio.info.mie-u.ac.jp>
>X  #
>X  # $FreeBSD: ports/japanese/rxvt/Makefile,v 1.12 1999/08/25 05:26:48 obrien Exp $
>X  #
>X  
>X! DISTNAME=	rxvt-2.7.2
>X! PKGNAME=	ja-rxvt-2.7.2
>X  CATEGORIES=	japanese x11
>X  MASTER_SITES=	ftp://ftp.rxvt.org/pub/rxvt/
>X  
>X***************
>X*** 18,36 ****
>X  USE_X_PREFIX=	yes
>X  GNU_CONFIGURE=	yes
>X  USE_BZIP2=	yes
>X! MAN1=		rxvt.1
>X  CONFIGURE_ARGS+=--enable-xpm-background --enable-transparency \
>X  		--enable-menubar --enable-graphics --enable-xim \
>X! 		--enable-kanji --disable-backspace-key --disable-delete-key
>X  
>X  DOCDIR=		${PREFIX}/share/doc/ja/rxvt
>X  RXVTLIB=	${PREFIX}/lib/X11/rxvt
>X  
>X  pre-install:
>X  	@${MKDIR} ${DOCDIR}
>X! 	@${INSTALL_MAN} ${FILESDIR}/README.ja ${DOCDIR}
>X  	@${MKDIR} ${RXVTLIB}
>X! 	@${INSTALL_MAN} ${FILESDIR}/ja.menu ${RXVTLIB}
>X! 	@${INSTALL_MAN} ${FILESDIR}/terminal.menu ${RXVTLIB}
>X  
>X  .include <bsd.port.mk>
>X--- 18,41 ----
>X  USE_X_PREFIX=	yes
>X  GNU_CONFIGURE=	yes
>X  USE_BZIP2=	yes
>X! MAN1=		rxvt.1 rclock.1
>X  CONFIGURE_ARGS+=--enable-xpm-background --enable-transparency \
>X  		--enable-menubar --enable-graphics --enable-xim \
>X! 		--enable-languages --with-encoding=eucj \
>X! 		--disable-backspace-key --disable-delete-key \
>X! 		--enable-utmp --enable-wtmp
>X  
>X  DOCDIR=		${PREFIX}/share/doc/ja/rxvt
>X  RXVTLIB=	${PREFIX}/lib/X11/rxvt
>X  
>X  pre-install:
>X  	@${MKDIR} ${DOCDIR}
>X! 	@${INSTALL_DATA} ${FILESDIR}/README.ja ${DOCDIR}
>X  	@${MKDIR} ${RXVTLIB}
>X! 	@${INSTALL_DATA} ${FILESDIR}/ja.menu ${RXVTLIB}
>X! 	@${INSTALL_DATA} ${FILESDIR}/terminal.menu ${RXVTLIB}
>X! 
>X! post-install:
>X! 	@${CHMOD} 4711 ${PREFIX}/bin/rxvt
>X  
>X  .include <bsd.port.mk>
>XIndex: files/md5
>X===================================================================
>XRCS file: /home/CVS/ports/japanese/rxvt/files/md5,v
>Xretrieving revision 1.8
>Xdiff -c -r1.8 md5
>X*** md5	1999/08/20 20:36:54	1.8
>X--- md5	2000/01/11 12:08:20
>X***************
>X*** 1 ****
>X! MD5 (rxvt-2.6.1.tar.bz2) = bdbda851624a74b7f223f78402e451b4
>X--- 1 ----
>X! MD5 (rxvt-2.7.2.tar.bz2) = cce181764763ceb7c1d12a8b05c3ce2e
>XIndex: patches/patch-aa
>X===================================================================
>XRCS file: /home/CVS/ports/japanese/rxvt/patches/patch-aa,v
>Xretrieving revision 1.4
>Xdiff -c -r1.4 patch-aa
>X*** patch-aa	1999/05/10 16:27:42	1.4
>X--- patch-aa	2000/01/11 12:08:20
>X***************
>X*** 1,11 ****
>X! *** Makefile.in.orig	Mon Mar 29 14:31:37 1999
>X! --- Makefile.in	Mon May 10 18:00:33 1999
>X  ***************
>X  *** 9,15 ****
>X    first_rule: all
>X    dummy:
>X    
>X! ! subdirs = src doc rclock src/graphics
>X    
>X    DIST =	INSTALL README.configure configure Makefile Makefile.in ChangeLog
>X    
>X--- 1,11 ----
>X! *** Makefile.in.orig	Tue Dec 21 19:07:54 1999
>X! --- Makefile.in	Mon Jan 10 15:29:15 2000
>X  ***************
>X  *** 9,15 ****
>X    first_rule: all
>X    dummy:
>X    
>X! ! subdirs = src doc rclock src/graphics src/test
>X    
>X    DIST =	INSTALL README.configure configure Makefile Makefile.in ChangeLog
>X    
>X***************
>X*** 13,19 ****
>X    first_rule: all
>X    dummy:
>X    
>X! ! subdirs = src doc
>X    
>X    DIST =	INSTALL README.configure configure Makefile Makefile.in ChangeLog
>X    
>X--- 13,19 ----
>X    first_rule: all
>X    dummy:
>X    
>X! ! subdirs = src doc rclock
>X    
>X    DIST =	INSTALL README.configure configure Makefile Makefile.in ChangeLog
>X    
>XIndex: patches/patch-ab
>X===================================================================
>XRCS file: /home/CVS/ports/japanese/rxvt/patches/patch-ab,v
>Xretrieving revision 1.5
>Xdiff -c -r1.5 patch-ab
>X*** patch-ab	1999/08/20 20:36:54	1.5
>X--- patch-ab	2000/01/11 12:08:20
>X***************
>X*** 1,24 ****
>X! *** doc/Makefile.in.orig	Tue Aug 17 17:16:14 1999
>X! --- doc/Makefile.in	Sat Aug 21 00:50:02 1999
>X  ***************
>X! *** 39,45 ****
>X    
>X    #-------------------------------------------------------------------------
>X    
>X! ! all:
>X!   	@if test x$(TBL) = x; then : ; else echo "Making rxvt.1"; $(TBL) $(srcdir)/rxvt.tbl > rxvt.1 ; fi
>X    
>X    SEDREPLACE = -e 's%@RXVT_VERSION@%$(VERSION)%g;'\
>X! --- 39,45 ----
>X    
>X    #-------------------------------------------------------------------------
>X    
>X! ! all: alldoc
>X!   	@if test x$(TBL) = x; then : ; else echo "Making rxvt.1"; $(TBL) $(srcdir)/rxvt.tbl > rxvt.1 ; fi
>X    
>X    SEDREPLACE = -e 's%@RXVT_VERSION@%$(VERSION)%g;'\
>X  ***************
>X! *** 55,61 ****
>X    
>X    tags allbin:
>X    
>X--- 1,29 ----
>X! *** doc/Makefile.in.orig	Tue Sep 28 16:04:39 1999
>X! --- doc/Makefile.in	Tue Jan 11 09:24:00 2000
>X  ***************
>X! *** 38,47 ****
>X    
>X    #-------------------------------------------------------------------------
>X    
>X! ! all:	rxvt.1
>X    
>X+ ! rxvt.1: rxvt.tbl Makefile
>X+ ! 	@if test x$(TBL) = x; then : ; else echo "Making rxvt.1"; $(TBL) $(srcdir)/rxvt.tbl > rxvt.1 ; fi
>X+   
>X    SEDREPLACE = -e 's%@RXVT_VERSION@%$(VERSION)%g;'\
>X!   	     -e 's%@RXVT_LSMDATE@%$(LSMDATE)%g;'\
>X! --- 38,46 ----
>X    
>X    #-------------------------------------------------------------------------
>X    
>X! ! all:	alldoc
>X!   
>X! ! rxvt.1:
>X    
>X    SEDREPLACE = -e 's%@RXVT_VERSION@%$(VERSION)%g;'\
>X+   	     -e 's%@RXVT_LSMDATE@%$(LSMDATE)%g;'\
>X  ***************
>X! *** 56,62 ****
>X    
>X    tags allbin:
>X    
>X***************
>X*** 30,63 ****
>X    
>X    tags allbin:
>X    
>X! ! alldoc:	rxvt.1
>X    
>X    yodl/versioninfo.yo: yodl/versioninfo.yo.in ../src/version.h
>X    	$(SED) $(SEDREPLACE) < $(srcdir)/yodl/versioninfo.yo.in > $@
>X  ***************
>X! *** 66,82 ****
>X    rxvt.tbl: yodl/rxvt.yo $(YODL_RXVT) yodl/versioninfo.yo yodl/masonyodl.yo
>X!   	yodl2man -orxvt.tbl yodl/rxvt.yo
>X    
>X- ! rxvt.1: rxvt.tbl Makefile
>X- ! 	@if test x$(TBL) = x; then : ; else echo "Making rxvt.1"; $(TBL) $(srcdir)/rxvt.tbl > rxvt.1 ; fi
>X-   
>X  ! rxvt.html: yodl/rxvt.yo $(YODL_RXVT) yodl/versioninfo.yo yodl/masonyodl.yo
>X! ! 	yodl2html -o$@ yodl/rxvt.yo
>X    
>X  ! rxvtRef.html: $(YODL_RREF) yodl/rxvtRef.yo yodl/masonyodl.yo
>X! ! 	yodl2html -o$@ yodl/rxvtRef.yo
>X    
>X  ! rxvtRef.txt: $(YODL_RREF) yodl/rxvtRef.yo yodl/masonyodl.yo
>X! ! 	yodl2txt -o$@ yodl/rxvtRef.yo
>X    
>X    clean:
>X    	$(RMF) rxvt.man *~ yodl/*~
>X! --- 66,78 ----
>X    rxvt.tbl: yodl/rxvt.yo $(YODL_RXVT) yodl/versioninfo.yo yodl/masonyodl.yo
>X!   	yodl2man -orxvt.tbl yodl/rxvt.yo
>X!   
>X! ! rxvt.1:
>X    
>X  ! rxvt.html:
>X    
>X--- 35,63 ----
>X    
>X    tags allbin:
>X    
>X! ! alldoc:	rxvt.1 rxvt.html rxvtRef.html rxvtRef.txt
>X    
>X    yodl/versioninfo.yo: yodl/versioninfo.yo.in ../src/version.h
>X    	$(SED) $(SEDREPLACE) < $(srcdir)/yodl/versioninfo.yo.in > $@
>X  ***************
>X! *** 67,80 ****
>X    rxvt.tbl: yodl/rxvt.yo $(YODL_RXVT) yodl/versioninfo.yo yodl/masonyodl.yo
>X!   	(cd $(srcdir)/yodl; yodl2man -o../rxvt.tbl rxvt.yo)
>X    
>X  ! rxvt.html: yodl/rxvt.yo $(YODL_RXVT) yodl/versioninfo.yo yodl/masonyodl.yo
>X! ! 	(cd $(srcdir)/yodl; yodl2html -o../rxvt.html rxvt.yo)
>X    
>X  ! rxvtRef.html: $(YODL_RREF) yodl/rxvtRef.yo yodl/masonyodl.yo
>X! ! 	(cd $(srcdir)/yodl; yodl2html -o../rxvtRef.html rxvtRef.yo)
>X    
>X  ! rxvtRef.txt: $(YODL_RREF) yodl/rxvtRef.yo yodl/masonyodl.yo
>X! ! 	(cd $(srcdir)/yodl; yodl2txt -o../rxvtRef.txt rxvtRef.yo)
>X    
>X    clean:
>X    	$(RMF) rxvt.man *~ yodl/*~
>X! --- 66,76 ----
>X    rxvt.tbl: yodl/rxvt.yo $(YODL_RXVT) yodl/versioninfo.yo yodl/masonyodl.yo
>X!   	(cd $(srcdir)/yodl; yodl2man -o../rxvt.tbl rxvt.yo)
>X    
>X  ! rxvt.html:
>X    
>X***************
>X*** 68,74 ****
>X    clean:
>X    	$(RMF) rxvt.man *~ yodl/*~
>X  ***************
>X! *** 86,93 ****
>X    
>X    distclean:
>X    
>X--- 68,74 ----
>X    clean:
>X    	$(RMF) rxvt.man *~ yodl/*~
>X  ***************
>X! *** 84,91 ****
>X    
>X    distclean:
>X    
>X***************
>X*** 77,87 ****
>X    
>X    uninstall:
>X    	-cd $(mandir); $(RMF) $(manprefix)rxvt.$(manext)
>X! --- 82,92 ----
>X    
>X    distclean:
>X    
>X! ! install: rxvt.1 rxvt.html rxvtRef.html rxvtRef.txt
>X  ! 	$(INSTALL_DATA) rxvt.1 $(mandir)/$(manprefix)rxvt.$(manext)
>X  ! 	$(INSTALL_DATA) rxvt.html $(prefix)/share/doc/ja/rxvt/rxvt.html
>X  ! 	$(INSTALL_DATA) rxvtRef.html $(prefix)/share/doc/ja/rxvt/rxvtRef.html
>X--- 77,87 ----
>X    
>X    uninstall:
>X    	-cd $(mandir); $(RMF) $(manprefix)rxvt.$(manext)
>X! --- 80,90 ----
>X    
>X    distclean:
>X    
>X! ! install:	rxvt.1 rxvt.html rxvtRef.html rxvtRef.txt
>X  ! 	$(INSTALL_DATA) rxvt.1 $(mandir)/$(manprefix)rxvt.$(manext)
>X  ! 	$(INSTALL_DATA) rxvt.html $(prefix)/share/doc/ja/rxvt/rxvt.html
>X  ! 	$(INSTALL_DATA) rxvtRef.html $(prefix)/share/doc/ja/rxvt/rxvtRef.html
>XIndex: patches/patch-ad
>X===================================================================
>XRCS file: /home/CVS/ports/japanese/rxvt/patches/patch-ad,v
>Xretrieving revision 1.7
>Xdiff -c -r1.7 patch-ad
>X*** patch-ad	1999/08/20 20:36:54	1.7
>X--- patch-ad	2000/01/11 12:08:20
>X***************
>X*** 1,7 ****
>X! *** src/command.c.orig	Fri Aug 13 01:32:39 1999
>X! --- src/command.c	Sat Aug 21 00:51:34 1999
>X  ***************
>X! *** 322,328 ****
>X    	ttydev = tty_name;
>X    
>X    # define PTYCHAR1	"pqrstuvwxyz"
>X--- 1,7 ----
>X! *** src/command.c.orig	Sun Dec 19 12:18:03 1999
>X! --- src/command.c	Tue Jan 11 09:25:48 2000
>X  ***************
>X! *** 436,442 ****
>X    	ttydev = tty_name;
>X    
>X    # define PTYCHAR1	"pqrstuvwxyz"
>X***************
>X*** 9,15 ****
>X    	for (c1 = PTYCHAR1; *c1; c1++) {
>X    	    ptydev[len] = ttydev[len] = *c1;
>X    	    for (c2 = PTYCHAR2; *c2; c2++) {
>X! --- 322,328 ----
>X    	ttydev = tty_name;
>X    
>X    # define PTYCHAR1	"pqrstuvwxyz"
>X--- 9,15 ----
>X    	for (c1 = PTYCHAR1; *c1; c1++) {
>X    	    ptydev[len] = ttydev[len] = *c1;
>X    	    for (c2 = PTYCHAR2; *c2; c2++) {
>X! --- 436,442 ----
>X    	ttydev = tty_name;
>X    
>X    # define PTYCHAR1	"pqrstuvwxyz"
>XIndex: patches/patch-aj
>X===================================================================
>XRCS file: /home/CVS/ports/japanese/rxvt/patches/patch-aj,v
>Xretrieving revision 1.4
>Xdiff -c -r1.4 patch-aj
>X*** patch-aj	1999/08/20 20:36:54	1.4
>X--- patch-aj	2000/01/11 12:08:20
>X***************
>X*** 1,7 ****
>X! *** src/feature.h.orig	Tue Aug 17 16:02:45 1999
>X! --- src/feature.h	Sat Aug 21 00:52:08 1999
>X  ***************
>X! *** 153,159 ****
>X     * This has been superceded and is only for you older users
>X     */
>X    /* #define HOTKEY_CTRL */
>X--- 1,7 ----
>X! *** src/feature.h.orig	Tue Dec 21 19:05:42 1999
>X! --- src/feature.h	Tue Jan 11 09:28:32 2000
>X  ***************
>X! *** 148,154 ****
>X     * This has been superceded and is only for you older users
>X     */
>X    /* #define HOTKEY_CTRL */
>X***************
>X*** 9,15 ****
>X    
>X    /*
>X     * To use
>X! --- 153,159 ----
>X     * This has been superceded and is only for you older users
>X     */
>X    /* #define HOTKEY_CTRL */
>X--- 9,15 ----
>X    
>X    /*
>X     * To use
>X! --- 148,154 ----
>X     * This has been superceded and is only for you older users
>X     */
>X    /* #define HOTKEY_CTRL */
>X***************
>X*** 18,38 ****
>X    /*
>X     * To use
>X  ***************
>X! *** 370,377 ****
>X!   #ifdef KANJI
>X!   # define NFONTS		5
>X!   # define FONT0_IDX	2
>X! ! # define MFONT_LIST	"k14", "jiskan16", "jiskan18", "jiskan24", "jiskan26"
>X! ! # define NFONT_LIST	"7x14", "8x16", "9x18", "12x24", "13x26"
>X    #endif
>X!   #ifdef ZH
>X!   # define NFONTS		5
>X! --- 370,377 ----
>X!   #ifdef KANJI
>X!   # define NFONTS		5
>X!   # define FONT0_IDX	2
>X  ! # define MFONT_LIST	"k14", "k10", "k12", "kanji16", "kanji24"
>X! ! # define NFONT_LIST	"7x14", "a10", "r12", "8x16", "12x24"
>X    #endif
>X-   #ifdef ZH
>X-   # define NFONTS		5
>X--- 18,44 ----
>X    /*
>X     * To use
>X  ***************
>X! *** 390,400 ****
>X!    * Sizes between multi-char fonts sets (MFONT_LIST) and single-char font
>X!    * sets (NFONT_LIST) have been matched up
>X!    */
>X! ! #define NFONTS		7
>X!   #define FONT0_IDX	2
>X! ! #define NFONT_LIST	"7x14", "6x10", "6x13", "8x13", "8x16", "10x20", "12x24"
>X!   #ifdef MULTICHAR_SET		/* multichar glyph language support */
>X! ! # define MFONT_LIST	NULL, NULL,  NULL, NULL, NULL, NULL, NULL
>X!   #endif
>X!   
>X    #endif
>X! --- 390,400 ----
>X!    * Sizes between multi-char fonts sets (MFONT_LIST) and single-char font
>X!    * sets (NFONT_LIST) have been matched up
>X!    */
>X! ! #define NFONTS		5
>X!   #define FONT0_IDX	2
>X! ! #define NFONT_LIST	"7x14", "a10", "r12", "8x16", "12x24"
>X!   #ifdef MULTICHAR_SET		/* multichar glyph language support */
>X  ! # define MFONT_LIST	"k14", "k10", "k12", "kanji16", "kanji24"
>X!   #endif
>X!   
>X    #endif
>XIndex: pkg/PLIST
>X===================================================================
>XRCS file: /home/CVS/ports/japanese/rxvt/pkg/PLIST,v
>Xretrieving revision 1.3
>Xdiff -c -r1.3 PLIST
>X*** PLIST	1999/02/12 05:56:21	1.3
>X--- PLIST	2000/01/11 12:08:21
>X***************
>X*** 1,9 ****
>X--- 1,11 ----
>X  bin/rxvt
>X+ @exec chmod 4711 %D/bin/rxvt
>X  share/doc/ja/rxvt/README.ja
>X  share/doc/ja/rxvt/rxvt.html
>X  share/doc/ja/rxvt/rxvtRef.html
>X  share/doc/ja/rxvt/rxvtRef.txt
>X  lib/X11/rxvt/ja.menu
>X  lib/X11/rxvt/terminal.menu
>X+ bin/rclock
>X  @dirrm share/doc/ja/rxvt
>X  @dirrm lib/X11/rxvt
>END-of-ja-rxvt.diff
>echo x - patch-ak
>sed 's/^X//' >patch-ak << 'END-of-patch-ak'
>X*** autoconf/config.h.in.orig	Tue Aug 17 15:55:41 1999
>X--- autoconf/config.h.in	Fri Sep 10 21:10:39 1999
>X***************
>X*** 161,167 ****
>X  #undef HAVE_UTMP_HOST
>X  
>X  /* Define location of utmp */
>X! #undef RXVT_UTMP_FILE
>X  
>X  /* Define in utmpx.h has struct utmpx */
>X  #undef HAVE_STRUCT_UTMPX
>X--- 161,167 ----
>X  #undef HAVE_UTMP_HOST
>X  
>X  /* Define location of utmp */
>X! #define RXVT_UTMP_FILE "/var/run/utmp"
>X  
>X  /* Define in utmpx.h has struct utmpx */
>X  #undef HAVE_STRUCT_UTMPX
>X***************
>X*** 173,179 ****
>X  #undef RXVT_UTMPX_FILE
>X  
>X  /* Define location of wtmp */
>X! #undef RXVT_WTMP_FILE
>X  
>X  /* Define location of wtmpx */
>X  #undef RXVT_WTMPX_FILE
>X--- 173,179 ----
>X  #undef RXVT_UTMPX_FILE
>X  
>X  /* Define location of wtmp */
>X! #define RXVT_WTMP_FILE "/var/log/wtmp"
>X  
>X  /* Define location of wtmpx */
>X  #undef RXVT_WTMPX_FILE
>END-of-patch-ak
>echo x - patch-al
>sed 's/^X//' >patch-al << 'END-of-patch-al'
>X*** rclock/Makefile.in.orig	Thu Nov 26 14:28:11 1998
>X--- rclock/Makefile.in	Tue Jan 11 10:00:16 2000
>X***************
>X*** 25,32 ****
>X  .c.o:
>X  	$(CC) -c $(CPPFLAGS) $(XINC) -I. -I$(basedir) -I$(srcdir) $(DEFS) $(CFLAGS) $<
>X  #-------------------------------------------------------------------------
>X! all:
>X! clock: alldoc allbin
>X  
>X  rclock: $(OBJS)
>X  	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(XLIB)
>X--- 25,31 ----
>X  .c.o:
>X  	$(CC) -c $(CPPFLAGS) $(XINC) -I. -I$(basedir) -I$(srcdir) $(DEFS) $(CFLAGS) $<
>X  #-------------------------------------------------------------------------
>X! all: alldoc allbin
>X  
>X  rclock: $(OBJS)
>X  	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(XLIB)
>END-of-patch-al
>echo x - patch-am
>sed 's/^X//' >patch-am << 'END-of-patch-am'
>X*** rclock/rclock.c.orig	Mon Apr 20 16:31:04 1998
>X--- rclock/rclock.c	Tue Jan 11 09:50:48 2000
>X***************
>X*** 69,74 ****
>X--- 69,89 ----
>X  
>X  #include <X11/Intrinsic.h>	/* Xlib, Xutil, Xresource, Xfuncproto */
>X  
>X+ #ifndef NO_XLOCALE
>X+ # if (XtSpecificationRelease < 6)
>X+ #  define NO_XLOCALE
>X+ # endif
>X+ #endif
>X+ 
>X+ #ifndef NO_XSETLOCALE
>X+ # define X_LOCALE
>X+ # include <X11/Xlocale.h>
>X+ #else
>X+ # ifndef NO_SETLOCALE
>X+ #  include <locale.h>
>X+ # endif
>X+ #endif                          /* NO_XLOCALE */
>X+ 
>X  #define APL_CLASS	"Clock"
>X  #define APL_NAME	"rclock"
>X  #define MSG_CLASS	"Appointment"
>X***************
>X*** 122,129 ****
>X--- 137,150 ----
>X     int width, height;
>X  } msgButton;
>X  
>X+ #ifdef MULTICHAR_SET
>X+ static XFontSet Xfont;
>X+ static XFontSetExtents *extent;
>X+ #define FontHeight()	((extent->max_logical_extent.height)*4/5 + (extent->max_logical_extent.height)/5)
>X+ #else
>X  static XFontStruct * Xfont;
>X  #define FontHeight()	(Xfont->ascent + Xfont->descent)
>X+ #endif
>X  static int	Msg_Mapped = 0;		/* message window mapped? */
>X  static int	reminderTime = -1;
>X  static char	message [256] = "";
>X***************
>X*** 184,189 ****
>X--- 205,216 ----
>X  #define REPLACE 0
>X  #define UPDATE 1
>X  
>X+ /* subroutine for MULTICHAR_SET declarations */
>X+ #ifdef MULTICHAR_SET
>X+ static XFontSet XLoadQueryFontSet(Display *, const char *);
>X+ #define XFreeFont XFreeFontSet
>X+ #define XTextWidth XmbTextEscapement
>X+ #endif
>X  /*----------------------------------------------------------------------*/
>X  
>X  static void
>X***************
>X*** 201,206 ****
>X--- 228,236 ----
>X  	{ "-fg color",		"foreground color" },
>X  #ifdef REMINDERS
>X  	{ "-fn fontname",	"normal font for messages" },
>X+ #ifdef MULTICHAR_SET
>X+ 	{ "-fm fontname",	"multibyte font for messages" },
>X+ #endif /* MULTICHAR_SET */
>X  #endif
>X  #ifdef ICONWIN
>X  	{ "-iconic",		"start iconic" },
>X***************
>X*** 277,283 ****
>X--- 307,317 ----
>X     XGCValues gcv;
>X  
>X  #ifdef REMINDERS
>X+ #ifndef MULTICHAR_SET
>X     const char * rs_font = FONT_NAME;
>X+ #else
>X+    char rs_font[BUFSIZ];
>X+ #endif /* MULTICHAR_SET */
>X  
>X     /* find the ~/.rclock file */
>X     if ((val = getenv ("HOME")) != NULL)
>X***************
>X*** 314,319 ****
>X--- 348,356 ----
>X     if ((display_name = getenv ("DISPLAY")) == NULL)
>X       display_name = ":0";
>X  
>X+ #ifdef MULTICHAR_SET
>X+    rs_font[0] = '\0';
>X+ #endif /* MULTICHAR_SET */
>X     /* parse the command line */
>X     for (i = 1; i < argc; i += 2)
>X       {
>X***************
>X*** 345,351 ****
>X--- 382,401 ----
>X  	else if (!strcmp (opt, "fg"))		rs_color [fgColor] = val;
>X  	else if (!strcmp (opt, "bg"))		rs_color [bgColor] = val;
>X  #ifdef REMINDERS
>X+ #ifndef MULTICHAR_SET
>X  	else if (!strcmp (opt, "fn"))		rs_font = val;
>X+ #else
>X+ 	else if (!strcmp (opt, "fn"))
>X+ 	  {
>X+              strncat(rs_font, val, BUFSIZ);
>X+              strncat(rs_font, ",", BUFSIZ);
>X+ 	  }
>X+ 	else if (!strcmp (opt, "fm"))
>X+ 	  {
>X+             strncat(rs_font, val, BUFSIZ);
>X+             strncat(rs_font, ",", BUFSIZ);
>X+ 	  }
>X+ #endif /* MULTICHAR_SET */
>X  #endif
>X  	else if (!strcmp (opt, "update"))
>X  	  {
>X***************
>X*** 384,389 ****
>X--- 434,449 ----
>X  	  }
>X       }
>X  
>X+ #ifdef MULTICHAR_SET
>X+    if (strlen(rs_font) > 0)  rs_font[strlen(rs_font) - 1] = '\0';
>X+    else strncpy(rs_font, FONT_NAME, BUFSIZ);
>X+ #endif /* MULTICHAR_SET */
>X+ 
>X+ #if !defined(NO_XSETLOCALE) || !defined(NO_SETLOCALE)
>X+    /* set locale */
>X+    setlocale(LC_CTYPE, "");
>X+ #endif
>X+ 
>X     /* open display */
>X     Xdisplay = XOpenDisplay (display_name);
>X     if (!Xdisplay)
>X***************
>X*** 418,430 ****
>X--- 478,499 ----
>X  
>X  #ifdef REMINDERS
>X     /* load the font for messages */
>X+ #ifdef MULTICHAR_SET
>X+    if ((Xfont = XLoadQueryFontSet (Xdisplay, rs_font)) == NULL)
>X+ #else
>X     if ((Xfont = XLoadQueryFont (Xdisplay, rs_font)) == NULL)
>X+ #endif  /* MULTICHAR_SET */
>X       {
>X  	print_error ("can't load font \"%s\"", rs_font);
>X  	goto Abort;
>X       }
>X+ #ifndef MULTICHAR_SET
>X     gcv.font = Xfont->fid;
>X+ #endif /* MULTICHAR_SET */
>X  #endif
>X+ #ifdef MULTICHAR_SET
>X+    extent = XExtentsOfFontSet(Xfont);
>X+ #endif /* MULTICHAR_SET */
>X  
>X     Create_Windows (argc, argv);
>X     /*  Create the graphics contexts */
>X***************
>X*** 433,439 ****
>X--- 502,510 ----
>X  
>X     Xgc = XCreateGC (Xdisplay, Clock.win,
>X  #ifdef REMINDERS
>X+ #ifndef MULTICHAR_SET
>X  		    GCFont |
>X+ #endif /* MULTICHAR_SET */
>X  #endif
>X  		    GCForeground | GCBackground, &gcv);
>X  
>X***************
>X*** 441,447 ****
>X     gcv.background = PixColors [fgColor];
>X     Xrvgc = XCreateGC (Xdisplay, Clock.win,
>X  #ifdef REMINDERS
>X! 		      GCFont |
>X  #endif
>X  		      GCForeground | GCBackground, &gcv);
>X  
>X--- 512,520 ----
>X     gcv.background = PixColors [fgColor];
>X     Xrvgc = XCreateGC (Xdisplay, Clock.win,
>X  #ifdef REMINDERS
>X! #ifndef MULTICHAR_SET
>X! 		    GCFont |
>X! #endif /* MULTICHAR_SET */
>X  #endif
>X  		      GCForeground | GCBackground, &gcv);
>X  
>X***************
>X*** 806,836 ****
>X--- 879,941 ----
>X  		  next = end + 2;
>X  	       }
>X  
>X+ #ifdef MULTICHAR_SET
>X+ 	     XmbDrawString (Xdisplay, Msg.win, Xfont, 
>X+ #else
>X  	     XDrawString (Xdisplay, Msg.win,
>X+ #endif /* MULTICHAR_SET */
>X  			  Xgc,
>X  			  (Msg.width -
>X  			   XTextWidth (Xfont, beg, (end-beg))) / 2,
>X+ #ifdef MULTICHAR_SET
>X+ 			  10 + extent->max_logical_extent.height*4/5 + FontHeight () * lines,
>X+ #else
>X  			  10 + Xfont->ascent + FontHeight () * lines,
>X+ #endif /* MULTICHAR_SET */
>X  			  beg, (end-beg));
>X  	  }
>X  
>X+ #ifdef MULTICHAR_SET
>X+ 	XmbDrawString (Xdisplay, msgButton.Dismiss, Xfont, 
>X+ #else
>X  	XDrawString (Xdisplay, msgButton.Dismiss,
>X+ #endif /* MULTICHAR_SET */
>X  		     Xrvgc,
>X  		     (msgButton.width - XTextWidth (Xfont, "Done", 4)) / 2,
>X+ #ifdef MULTICHAR_SET
>X+ 		     extent->max_logical_extent.height*4/5 + 2,
>X+ #else
>X  		     Xfont->ascent + 2,
>X+ #endif /* MULTICHAR_SET */
>X  		     "Done", 4);
>X  
>X+ #ifdef MULTICHAR_SET
>X+ 	XmbDrawString (Xdisplay, msgButton.Defer, Xfont, 
>X+ #else
>X  	XDrawString (Xdisplay, msgButton.Defer,
>X+ #endif /* MULTICHAR_SET */
>X  		     Xrvgc,
>X  		     (msgButton.width - XTextWidth (Xfont, "Defer", 5)) / 2,
>X+ #ifdef MULTICHAR_SET
>X+ 		     extent->max_logical_extent.height*4/5 + 2,
>X+ #else
>X  		     Xfont->ascent + 2,
>X+ #endif /* MULTICHAR_SET */
>X  		     "Defer", 5);
>X  
>X  # ifndef NO_REMINDER_EXEC
>X+ #ifdef MULTICHAR_SET
>X+ 	XmbDrawString (Xdisplay, msgButton.Start, Xfont, 
>X+ #else
>X  	XDrawString (Xdisplay, msgButton.Start,
>X+ #endif /* MULTICHAR_SET */
>X  		     Xrvgc,
>X  		     (msgButton.width - XTextWidth (Xfont, "Start", 5)) / 2,
>X+ #ifdef MULTICHAR_SET
>X+ 		     extent->max_logical_extent.height*4/5 + 2,
>X+ #else
>X  		     Xfont->ascent + 2,
>X+ #endif /* MULTICHAR_SET */
>X  		     "Start", 5);
>X  
>X          if (strlen (execPrgm) > 1)
>X***************
>X*** 1469,1472 ****
>X--- 1574,1603 ----
>X     fprintf (stderr,"\n");
>X     va_end (arg_ptr);
>X  }
>X+ 
>X+ #ifdef MULTICHAR_SET
>X+ /*
>X+  * XLoadQueryFontSet
>X+  */
>X+ XFontSet XLoadQueryFontSet(Display *disp, const char *fontset_name)
>X+ {
>X+    XFontSet fontset;
>X+    int missing_charset_count;
>X+    char **missing_charset_list;
>X+    char *def_string;
>X+ 
>X+    fontset = XCreateFontSet(disp, fontset_name,
>X+ 			    &missing_charset_list,
>X+ 			    &missing_charset_count,
>X+ 			    &def_string);
>X+ /*
>X+    if (missing_charset_count) {
>X+       fprintf(stderr, "Missing charsets in FontSet(%s) creation.\n",
>X+               fontset_name);
>X+       XFreeStringList(missing_charset_list);
>X+    }
>X+ */
>X+    return fontset;
>X+ }
>X+ #endif /* MULTICHAR_SET */
>X  /*----------------------- end-of-file (C source) -----------------------*/
>END-of-patch-am
>echo x - patch-an
>sed 's/^X//' >patch-an << 'END-of-patch-an'
>X*** src/rxvt.h.orig	Sat Dec 18 16:41:47 1999
>X--- src/rxvt.h	Tue Jan 11 20:59:24 2000
>X***************
>X*** 247,253 ****
>X  # define COLORTERMENVFULL COLORTERMENV
>X  #endif
>X  #ifndef TERMENV
>X! # ifdef KANJI
>X  #  define TERMENV	"kterm"
>X  # else
>X  #  define TERMENV	"xterm"
>X--- 247,253 ----
>X  # define COLORTERMENVFULL COLORTERMENV
>X  #endif
>X  #ifndef TERMENV
>X! # if MULTICHAR_ENCODING == EUCJ || MULTICHAR_ENCODING == SJIS
>X  #  define TERMENV	"kterm"
>X  # else
>X  #  define TERMENV	"xterm"
>END-of-patch-an
>exit

Actions: View

Attachments on bug 16061: 7391