From 50628affd357169c828e01112c4ac6942c02a4f2 Mon Sep 17 00:00:00 2001 From: Seiichirou Hiraoka Date: Fri, 12 Feb 1999 05:56:21 +0000 Subject: Update to 2.6pre2. PR: ports/10041 Submitted-by: honda@kashio.info.mie-u.ac.jp --- japanese/rxvt/Makefile | 29 ++++++--------- japanese/rxvt/distinfo | 3 +- japanese/rxvt/files/ja.menu | 29 +++++++++++++++ japanese/rxvt/files/patch-aa | 8 ++-- japanese/rxvt/files/patch-ab | 77 +++++++++++++++++++++++++++++---------- japanese/rxvt/files/patch-ad | 4 +- japanese/rxvt/files/patch-aj | 38 +++++++++++++++++++ japanese/rxvt/files/terminal.menu | 60 ++++++++++++++++++++++++++++++ japanese/rxvt/pkg-descr | 9 ++--- japanese/rxvt/pkg-message | 13 ++++--- japanese/rxvt/pkg-plist | 6 +++ 11 files changed, 219 insertions(+), 57 deletions(-) create mode 100644 japanese/rxvt/files/ja.menu create mode 100644 japanese/rxvt/files/patch-aj create mode 100644 japanese/rxvt/files/terminal.menu (limited to 'japanese') diff --git a/japanese/rxvt/Makefile b/japanese/rxvt/Makefile index 1e7b1facb014..7e3363e77f03 100644 --- a/japanese/rxvt/Makefile +++ b/japanese/rxvt/Makefile @@ -1,22 +1,16 @@ # New ports collection Makefile for: rxvt -# Version required: 2.4.11 -# Date created: 23 November 1998 +# Version required: 2.6PRE2 +# Date created: 28 January 1999 # Whom: HONDA Yasuhiro # -# $Id: Makefile,v 1.5 1998/12/06 06:52:10 flathill Exp $ +# $Id: Makefile,v 1.6 1998/12/10 01:32:07 flathill Exp $ # -DISTNAME= rxvt-2.4.11 -PKGNAME= ja-rxvt-2.4.11 +DISTNAME= rxvt-2.6.PRE2 +PKGNAME= ja-rxvt-2.6p2 CATEGORIES= japanese x11 MASTER_SITES= ftp://mason.primenet.com.au/pub/rxvt/ -.if !defined(NOXIMSUPPORT) -PATCH_SITES= http://www.kashio.info.mie-u.ac.jp/~honda/rxvt/ -PATCHFILES= rxvt-2.4.11-JP-XIM.patch.gz -PATCH_DIST_STRIP= -p1 -.endif - MAINTAINER= honda@kashio.info.mie-u.ac.jp LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm @@ -24,17 +18,16 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm USE_X_PREFIX= yes GNU_CONFIGURE= yes MAN1= rxvt.1 -CONFIGURE_ARGS= --enable-xpm-background --enable-kanji --enable-menubar --enable-graphics --disable-backspace-key --disable-delete-key +CONFIGURE_ARGS= --enable-xpm-background --enable-xim --enable-kanji --enable-menubar --enable-graphics --disable-backspace-key --disable-delete-key DOCDIR= ${PREFIX}/share/doc/ja/rxvt +RXVTLIB= ${PREFIX}/lib/X11/rxvt -post-install: -.if !defined(NOPORTDOCS) +pre-install: @${MKDIR} ${DOCDIR} @${INSTALL_MAN} ${FILESDIR}/README.ja ${DOCDIR} -.endif -.if !defined(NOXIMSUPPORT) - @${CAT} ${PKGDIR}/MESSAGE -.endif + @${MKDIR} ${RXVTLIB} + @${INSTALL_MAN} ${FILESDIR}/ja.menu ${RXVTLIB} + @${INSTALL_MAN} ${FILESDIR}/terminal.menu ${RXVTLIB} .include diff --git a/japanese/rxvt/distinfo b/japanese/rxvt/distinfo index d98aa1e32bb4..ce75690e2010 100644 --- a/japanese/rxvt/distinfo +++ b/japanese/rxvt/distinfo @@ -1,2 +1 @@ -MD5 (rxvt-2.4.11.tar.gz) = 806d163e3113d22b31535785088f37c2 -MD5 (rxvt-2.4.11-JP-XIM.patch.gz) = f17c391bc43d6b2772eff1f3a819da04 +MD5 (rxvt-2.6.PRE2.tar.gz) = 094caf133557b61b2204f78cf314c7e2 diff --git a/japanese/rxvt/files/ja.menu b/japanese/rxvt/files/ja.menu new file mode 100644 index 000000000000..ee93971fb4c9 --- /dev/null +++ b/japanese/rxvt/files/ja.menu @@ -0,0 +1,29 @@ +#------------------------------------------------------------------------- +[menu:shell] +[clear] +[title:shell] +# [pixmap:name] + +# not necessarily useful, but an example of using the rxvt menuBar + +# assuming we have ksh with Emacs bindings +^P^N^F^B + +/Commands/* +{manual} man +{manual apropos} man -k +{manual whatis} man -f +{-} +{Exit Shell} exit\r + +/Programs/* +{Mule} mule &\r +{Mule(no X)} mule -nw\r +{Mail} Mail\r +{WWW} lynx\r + +[read:terminal] +[show] +[done:shell] + +#--------------------------------------------------------------------- eof diff --git a/japanese/rxvt/files/patch-aa b/japanese/rxvt/files/patch-aa index 4a27f9bbeed4..d64920b00d24 100644 --- a/japanese/rxvt/files/patch-aa +++ b/japanese/rxvt/files/patch-aa @@ -1,7 +1,7 @@ -*** Makefile.in.orig Sun Sep 20 17:48:18 1998 ---- Makefile.in Thu Nov 19 00:19:50 1998 +*** Makefile.in.orig Fri Jan 29 22:10:45 1999 +--- Makefile.in Fri Jan 29 22:11:13 1999 *************** -*** 8,14 **** +*** 9,15 **** first_rule: all dummy: @@ -9,7 +9,7 @@ DIST = INSTALL README.configure configure Makefile Makefile.in ---- 8,14 ---- +--- 9,15 ---- first_rule: all dummy: diff --git a/japanese/rxvt/files/patch-ab b/japanese/rxvt/files/patch-ab index 678e168ad9e6..04db3777b050 100644 --- a/japanese/rxvt/files/patch-ab +++ b/japanese/rxvt/files/patch-ab @@ -1,54 +1,91 @@ -*** doc/Makefile.in.orig Wed Nov 18 16:20:14 1998 ---- doc/Makefile.in Thu Nov 19 00:22:01 1998 +*** doc/Makefile.in.orig Sun Jan 10 18:46:43 1999 +--- doc/Makefile.in Fri Jan 29 23:49:25 1999 *************** -*** 37,43 **** +*** 38,44 **** #------------------------------------------------------------------------- ! all: + @if test x$(TBL) = x; then : ; else echo "Making rxvt.1"; $(TBL) $(srcdir)/rxvt.tbl > rxvt.1 ; fi SEDREPLACE = -e 's%@RXVT_VERSION@%$(VERSION)%g;'\ - -e 's%@RXVT_LSMDATE@%$(LSMDATE)%g;'\ ---- 37,43 ---- +--- 38,44 ---- #------------------------------------------------------------------------- ! all: alldoc + @if test x$(TBL) = x; then : ; else echo "Making rxvt.1"; $(TBL) $(srcdir)/rxvt.tbl > rxvt.1 ; fi SEDREPLACE = -e 's%@RXVT_VERSION@%$(VERSION)%g;'\ - -e 's%@RXVT_LSMDATE@%$(LSMDATE)%g;'\ *************** -*** 55,61 **** +*** 54,60 **** tags allbin: ! alldoc: $(basedir)/$(VERNAME).lsm rxvt.1 rxvt.html rxvtRef.html rxvtRef.txt - $(basedir)/$(VERNAME).lsm: LSM.in $(srcdir)/../autoconf/Make.common.in $(srcdir)/../src/version.h - $(SED) $(SEDREPLACE) < $(srcdir)/LSM.in > $@ ---- 55,61 ---- + yodl/versioninfo.yo: yodl/versioninfo.yo.in ../autoconf/Make.common.in + $(SED) $(SEDREPLACE) < $(srcdir)/yodl/versioninfo.yo.in > $@ +--- 54,60 ---- tags allbin: ! alldoc: rxvt.1 - $(basedir)/$(VERNAME).lsm: LSM.in $(srcdir)/../autoconf/Make.common.in $(srcdir)/../src/version.h - $(SED) $(SEDREPLACE) < $(srcdir)/LSM.in > $@ + yodl/versioninfo.yo: yodl/versioninfo.yo.in ../autoconf/Make.common.in + $(SED) $(SEDREPLACE) < $(srcdir)/yodl/versioninfo.yo.in > $@ *************** -*** 63,70 **** +*** 65,81 **** rxvt.tbl: yodl/rxvt.yo $(YODL_RXVT) yodl/versioninfo.yo yodl/masonyodl.yo yodl2man -orxvt.tbl yodl/rxvt.yo -! rxvt.1: rxvt.tbl -! tbl rxvt.tbl > $@ +! rxvt.1: rxvt.tbl Makefile +! @if test x$(TBL) = x; then : ; else echo "Making rxvt.1"; $(TBL) $(srcdir)/rxvt.tbl > rxvt.1 ; fi - rxvt.html: yodl/rxvt.yo $(YODL_RXVT) yodl/versioninfo.yo yodl/masonyodl.yo - yodl2html -o$@ yodl/rxvt.yo ---- 63,69 ---- +! rxvt.html: yodl/rxvt.yo $(YODL_RXVT) yodl/versioninfo.yo yodl/masonyodl.yo +! yodl2html -o$@ yodl/rxvt.yo + +! rxvtRef.html: $(YODL_RREF) yodl/rxvtRef.yo yodl/masonyodl.yo +! yodl2html -o$@ yodl/rxvtRef.yo + +! rxvtRef.txt: $(YODL_RREF) yodl/rxvtRef.yo yodl/masonyodl.yo +! yodl2txt -o$@ yodl/rxvtRef.yo + + clean: + $(RMF) rxvt.man *~ yodl/*~ +--- 65,77 ---- rxvt.tbl: yodl/rxvt.yo $(YODL_RXVT) yodl/versioninfo.yo yodl/masonyodl.yo yodl2man -orxvt.tbl yodl/rxvt.yo ! rxvt.1: - rxvt.html: yodl/rxvt.yo $(YODL_RXVT) yodl/versioninfo.yo yodl/masonyodl.yo - yodl2html -o$@ yodl/rxvt.yo +! rxvt.html: + +! rxvtRef.html: + +! rxvtRef.txt: + + clean: + $(RMF) rxvt.man *~ yodl/*~ +*************** +*** 85,92 **** + + distclean: + +! install: rxvt.1 +! $(INSTALL_DATA) rxvt.1 $(DESTDIR)$(mandir)/$(manprefix)rxvt.$(manext) + + uninstall: + -cd $(mandir); $(RMF) $(manprefix)rxvt.$(manext) +--- 81,91 ---- + + distclean: + +! install: rxvt.1 rxvt.html rxvtRef.html rxvtRef.txt +! $(INSTALL_DATA) rxvt.1 $(mandir)/$(manprefix)rxvt.$(manext) +! $(INSTALL_DATA) rxvt.html $(prefix)/share/doc/ja/rxvt/rxvt.html +! $(INSTALL_DATA) rxvtRef.html $(prefix)/share/doc/ja/rxvt/rxvtRef.html +! $(INSTALL_DATA) rxvtRef.txt $(prefix)/share/doc/ja/rxvt/rxvtRef.txt + + uninstall: + -cd $(mandir); $(RMF) $(manprefix)rxvt.$(manext) diff --git a/japanese/rxvt/files/patch-ad b/japanese/rxvt/files/patch-ad index b7d89440da79..f75c0c7a44b3 100644 --- a/japanese/rxvt/files/patch-ad +++ b/japanese/rxvt/files/patch-ad @@ -1,5 +1,5 @@ -*** src/command.c.orig Wed Dec 9 18:26:44 1998 ---- src/command.c Wed Dec 9 18:27:31 1998 +*** src/command.c.orig Sun Jan 24 14:39:54 1999 +--- src/command.c Fri Jan 29 22:57:48 1999 *************** *** 289,295 **** ttydev = tty_name; diff --git a/japanese/rxvt/files/patch-aj b/japanese/rxvt/files/patch-aj new file mode 100644 index 000000000000..c110e52c36e0 --- /dev/null +++ b/japanese/rxvt/files/patch-aj @@ -0,0 +1,38 @@ +*** src/feature.h.orig Fri Jan 22 21:25:16 1999 +--- src/feature.h Sat Jan 30 00:48:14 1999 +*************** +*** 153,159 **** + * This has been superceded and is only for you older users + */ + /* #define HOTKEY_CTRL */ +! /* #define HOTKEY_META */ + + /* + * To use +--- 153,159 ---- + * This has been superceded and is only for you older users + */ + /* #define HOTKEY_CTRL */ +! #define HOTKEY_META + + /* + * To use +*************** +*** 351,358 **** + #ifdef KANJI + # define NFONTS 5 + # define FONT0_IDX 2 +! # define MFONT_LIST "k14", "jiskan16", "jiskan18", "jiskan24", "jiskan26" +! # define NFONT_LIST "7x14", "8x16", "9x18", "12x24", "13x26" + #else + # ifdef ZH + # define NFONTS 5 +--- 351,358 ---- + #ifdef KANJI + # define NFONTS 5 + # define FONT0_IDX 2 +! # define MFONT_LIST "k14", "k10", "k12", "kanji16", "kanji24" +! # define NFONT_LIST "7x14", "a10", "r12", "8x16", "12x24" + #else + # ifdef ZH + # define NFONTS 5 diff --git a/japanese/rxvt/files/terminal.menu b/japanese/rxvt/files/terminal.menu new file mode 100644 index 000000000000..72160df19004 --- /dev/null +++ b/japanese/rxvt/files/terminal.menu @@ -0,0 +1,60 @@ +# standard settings for a `terminal' control menu +# only attach to an existing menubar +[menu] + +/Terminal/* +./Font/* +{Normal} ^@\E]50;# +{Larger}{(M->)} ^@\E]50;#+ +{Smaller}{(M-<)}^@\E]50;#- +{-} +{Font 1} ^@\E]50;#1 +{Font 2} ^@\E]50;#2 +{Font 3} ^@\E]50;#3 +{Font 4} ^@\E]50;#4 +../Screen/* +{ReverseVideo} ^@\E[?5t +{Toggle Width} ^@\E[?3t +{Cursor} ^@\E[?25t +{Switch} ^@\E[?47t +{-} +{menuBar} ^@\E[?10t +{refresh menu} ^@\E[?10h +{scrollBar} ^@\E[?30t +{-} +{Toggle scroll-on-TTY} ^@\E[?1010t +{Toggle scroll-on-Key} ^@\E[?1011t +../Keys/* +{XTerm} ^@\E[?35t +{Backspace} ^@\E[?67t +{Cursor} ^@\E[?1t +{KeyPad} ^@\E[?66t +../ +{-} +./Pixmap/* +{None} ^@\E[m\E]20;\a +#{-} +# load .xpm files (assuming Rxvt*path: has been properly set) +# notice there are 2 ways to do this task +#{background5} ^@\E]20;background5 +#{Mona} ^@\E]10;[pixmap:monalisa;100] +#{world} ^@\E]20;world +{-} +./Attrib/* +{Full} ^@\E]20;;100x100+50+50;? +{Tiled} ^@\E]20;;0 +{Centre} ^@\E]20;;=+50+50;? +{-} +# set `quick arrow' keys +{Zoom}{200/50%} ^@\E]10;[:\^@\\E]20;;200x050x00x2000x50;?:] +{Pos}{5%} ^@\E]10;[:\^@\\E]20;;+5+0-5+0+0-5+0+5;?:] +../ +../ +{-} +{Version} ^@\E[8n +/ + +# make sure the change gets updated +[show] +[done] +#--------------------------------------------------------------------- eof diff --git a/japanese/rxvt/pkg-descr b/japanese/rxvt/pkg-descr index e079e1fa1fa2..dd072d7a39c9 100644 --- a/japanese/rxvt/pkg-descr +++ b/japanese/rxvt/pkg-descr @@ -3,12 +3,9 @@ suitable for use on machines with small memories. Tek4010 support is removed. This supports Japanese input with X Input Method (XIM) Protocol. -Supported input styles are `OverTheSpot' and `Root'. The Patch is -contributed from Nobutaka Mantani . More -information can be found at: +Supported input styles are `OverTheSpot', 'OffTheSpot' and `Root'. +More information can be found at: http://www.nobutaka.com/programs/rxvt.html - -Modifications were made by Rob Nation (nation@rocket.sanders.lockheed.com) -to make it a little more compact, and to add and remove certain features. +Documents are at /usr/X11R6/share/doc/ja/rxvt/. HomePage of rxvt: http://babayaga.math.fu-berlin.de/rxvt/ diff --git a/japanese/rxvt/pkg-message b/japanese/rxvt/pkg-message index 29e9a73bd72d..2155de3b971f 100644 --- a/japanese/rxvt/pkg-message +++ b/japanese/rxvt/pkg-message @@ -1,9 +1,12 @@ ---------------------------------------------------------- + See /usr/X11R6/share/doc/ja/rxvt/README.ja for more information +about using Japanese XIM. - If you want information about rxvt in - Japanese environment , please see - /usr/X11R6/share/doc/ja/rxvt/README.ja (in Japanese) . + If you want to enjoy menuBar features, add following 2 line ---------------------------------------------------------- + Rxvt*path: /usr/X11R6/lib/X11/rxvt/ + Rxvt*menu: ja +to your ~/.Xdefaults. + +Documents are at /usr/X11R6/share/doc/ja/rxvt/. diff --git a/japanese/rxvt/pkg-plist b/japanese/rxvt/pkg-plist index 8ddeb152d310..51f6f6e6cd66 100644 --- a/japanese/rxvt/pkg-plist +++ b/japanese/rxvt/pkg-plist @@ -1,3 +1,9 @@ bin/rxvt share/doc/ja/rxvt/README.ja +share/doc/ja/rxvt/rxvt.html +share/doc/ja/rxvt/rxvtRef.html +share/doc/ja/rxvt/rxvtRef.txt +lib/X11/rxvt/ja.menu +lib/X11/rxvt/terminal.menu @dirrm share/doc/ja/rxvt +@dirrm lib/X11/rxvt -- cgit v1.2.3