Date: Mon, 26 Oct 1998 17:56:57 -0800 (PST) From: Nakai@Abricot.co.jp To: freebsd-gnats-submit@FreeBSD.ORG Subject: ports/8461: Fixed port: Eterm (Update and KANJI patch) Message-ID: <199810270156.RAA23160@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 8461 >Category: ports >Synopsis: Fixed port: Eterm (Update and KANJI patch) >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 Oct 26 18:00:00 PST 1998 >Last-Modified: >Originator: Yukihiro Nakai >Organization: Apricot Computer, Japan >Release: 2.2.7 >Environment: >Description: >How-To-Repeat: I fixed the port eterm to follow its latest version and add KANJI option. KANJI option enables the Japanese charactors on the Eterm. Please enjoy... Mr. Stokely, the MAINTAINER of this port said me to send-pr this directory. Yukihiro Nakai -------------- diff -ruN eterm.orig/Makefile eterm/Makefile --- eterm.orig/Makefile Mon Oct 26 18:49:51 1998 +++ eterm/Makefile Mon Oct 26 19:48:25 1998 @@ -1,13 +1,13 @@ # New ports collection makefile for: eterm -# Version required: 0.8.6 +# Version required: 0.8.7 # Date created: 24 November 1997 # Whom: Murray Stokely <murray@cdrom.com> # # $Id: Makefile,v 1.9 1998/10/09 18:05:11 vanilla Exp $ # -DISTNAME= Eterm-0.8.6 -PKGNAME= eterm-0.8.6 +DISTNAME= Eterm-0.8.7 +PKGNAME= eterm-0.8.7 CATEGORIES= x11 MASTER_SITES= ftp://ftp.enlightenment.org/pub/Eterm/ \ http://www.tcserv.com/archive/E/ @@ -23,14 +23,16 @@ #ALL_TARGET= FreeBSD MAN1= Eterm.1 +pre-patch: +.if ( defined(KANJI) ) + ${CP} ${FILESDIR}/patch-kanji ${PATCHDIR} +.endif + post-install: - strip ${PREFIX}/bin/Eterm-0.8 - chown root.wheel ${PREFIX}/bin/Eterm-0.8 - chmod 4755 ${PREFIX}/bin/Eterm-0.8 + chown root.wheel ${PREFIX}/bin/Eterm + chmod 4755 ${PREFIX}/bin/Eterm + .ifndef NOPORTDOCS - ${INSTALL_DATA} ${WRKSRC}/ReleaseNotes ${PREFIX}/share/Eterm - ${INSTALL_DATA} ${WRKSRC}/doc/Eterm.help ${PREFIX}/share/Eterm - ${INSTALL_DATA} ${WRKSRC}/doc/Eterm.menu ${PREFIX}/share/Eterm ${INSTALL_DATA} ${WRKSRC}/doc/Eterm.ref ${PREFIX}/share/Eterm ${INSTALL_DATA} ${WRKSRC}/doc/Eterm.tcap ${PREFIX}/share/Eterm ${INSTALL_DATA} ${WRKSRC}/doc/Eterm.ti ${PREFIX}/share/Eterm diff -ruN eterm.orig/files/md5 eterm/files/md5 --- eterm.orig/files/md5 Mon Oct 26 18:49:50 1998 +++ eterm/files/md5 Mon Oct 26 18:50:06 1998 @@ -1 +1 @@ -MD5 (Eterm-0.8.6.tar.gz) = 795d4353a156232fec4283e946573d93 +MD5 (Eterm-0.8.7.tar.gz) = 00de2b1fb7d35bff42337a9723195114 diff -ruN eterm.orig/files/patch-kanji eterm/files/patch-kanji --- eterm.orig/files/patch-kanji Thu Jan 1 09:00:00 1970 +++ eterm/files/patch-kanji Mon Oct 26 19:34:54 1998 @@ -0,0 +1,9 @@ +--- config.h.in.orig Mon Oct 26 19:34:07 1998 ++++ config.h.in Mon Oct 26 19:34:37 1998 +@@ -206,3 +206,6 @@ + + /* Define if you have the Kenny library (-lKenny). */ + #undef HAVE_LIBKENNY ++ ++/* Define if you want the KANJI mode enable. */ ++#define KANJI diff -ruN eterm.orig/patches/patch-aa eterm/patches/patch-aa --- eterm.orig/patches/patch-aa Mon Oct 26 18:49:51 1998 +++ eterm/patches/patch-aa Thu Jan 1 09:00:00 1970 @@ -1,10 +0,0 @@ ---- libmej/strings.h.orig Sat Oct 10 01:08:10 1998 -+++ libmej/strings.h Sat Oct 10 01:08:31 1998 -@@ -60,6 +60,7 @@ - extern "C" int advance(const char *, char *); - extern "C" char *compile(const char *, char *, char *); - #else -+# include <unistd.h> - # include <regex.h> - #endif - diff -ruN eterm.orig/patches/patch-ac eterm/patches/patch-ac --- eterm.orig/patches/patch-ac Mon Oct 26 18:49:51 1998 +++ eterm/patches/patch-ac Mon Oct 26 18:55:07 1998 @@ -1,13 +1,12 @@ ---- src/Makefile.in.orig Tue Sep 15 01:05:43 1998 -+++ src/Makefile.in Sat Oct 10 01:06:41 1998 -@@ -25,6 +25,10 @@ - main.h menubar.h misc.h rxvtgrx.h screen.h scrollbar.h options.h \ - system.h - +--- src/Makefile.in.orig Fri Oct 23 01:09:50 1998 ++++ src/Makefile.in Mon Oct 26 18:54:35 1998 +@@ -123,6 +123,9 @@ + system.h threads.h graphics/Makefile.am graphics/Makefile.in \ + graphics/README graphics/data graphics/grxlib.c graphics/grxlib.h \ + graphics/qplot.c +ifeq ($(PORTOBJFORMAT),elf) +LDFLAGS+=-Wl,-rpath,$(X11BASE)/lib +endif -+ - # - # Distribution variables - # + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h + CONFIG_CLEAN_FILES = diff -ruN eterm.orig/patches/patch-ad eterm/patches/patch-ad --- eterm.orig/patches/patch-ad Mon Oct 26 18:49:51 1998 +++ eterm/patches/patch-ad Mon Oct 26 19:19:16 1998 @@ -1,11 +1,29 @@ ---- autoconf/Make.common.in.orig Tue Sep 1 10:28:10 1998 -+++ autoconf/Make.common.in Sat Oct 10 01:10:12 1998 -@@ -25,7 +25,7 @@ - manprefix = - bindir = @bindir@ - mandir = @mandir@/man1 --themedir = @libdir@/Eterm/themes -+themedir = @prefix@/share/Eterm/themes - manext = 1 - - # Tools & program stuff +--- themes/Makefile.in.orig Mon Oct 26 19:16:43 1998 ++++ themes/Makefile.in Mon Oct 26 19:18:55 1998 +@@ -196,17 +196,17 @@ + -@for i in $(THEMES) ; do \ + $(SED) -e 's%@''PREFIX''@%${prefix}%g' $$i/MAIN.in > $$i/MAIN ; \ + done +- $(mkinstalldirs) $(pkglibdir)/themes ++ $(mkinstalldirs) $(pkgdatadir)/themes + -@for i in $(THEMES) ; do \ +- if test ! -d $(pkglibdir)/themes/$$i ; then \ +- echo "Installing $$i theme in $(pkglibdir)/themes" ; \ +- $(mkinstalldirs) $(pkglibdir)/themes/$$i ; \ +- $(CP) $$i/???* $(pkglibdir)/themes/$$i ; \ +- $(CHMOD) 755 $(pkglibdir)/themes/$$i ; \ +- $(CHMOD) 644 $(pkglibdir)/themes/$$i/???* ; \ +- rm -f $(pkglibdir)/themes/$$i/MAIN.in ; \ ++ if test ! -d $(pkgdatadir)/themes/$$i ; then \ ++ echo "Installing $$i theme in $(pkgdatadir)/themes" ; \ ++ $(mkinstalldirs) $(pkgdatadir)/themes/$$i ; \ ++ $(CP) $$i/???* $(pkgdatadir)/themes/$$i ; \ ++ $(CHMOD) 755 $(pkgdatadir)/themes/$$i ; \ ++ $(CHMOD) 644 $(pkgdatadir)/themes/$$i/???* ; \ ++ rm -f $(pkgdatadir)/themes/$$i/MAIN.in ; \ + else \ +- echo "ALERT! Not overwriting theme $$i in $(pkglibdir)/themes. You will need to update this theme manually." ; \ ++ echo "ALERT! Not overwriting theme $$i in $(pkgdatadir)/themes. You will need to update this theme manually." ; \ + fi ; \ + done + @if test ! -f $(HOME)/.active.tags ; then $(CP) active.tags $(HOME)/.active.tags ; \ diff -ruN eterm.orig/patches/patch-ae eterm/patches/patch-ae --- eterm.orig/patches/patch-ae Mon Oct 26 18:49:51 1998 +++ eterm/patches/patch-ae Mon Oct 26 19:23:29 1998 @@ -1,87 +1,77 @@ ---- themes/Eterm/MAIN.in.orig Sat Oct 10 01:40:02 1998 -+++ themes/Eterm/MAIN.in Sat Oct 10 01:40:23 1998 +--- themes/Eterm/MAIN.in.orig Mon Oct 26 19:20:51 1998 ++++ themes/Eterm/MAIN.in Mon Oct 26 19:21:53 1998 @@ -94,7 +94,7 @@ # scale 100%, 0 to tile, any other number specifies W/H in pixels begin pixmaps - background %random(`cat pixmaps.list`) + background %random(`cat pixmaps.list 2>/dev/null`) - path "./pix/:~/.Eterm/:~/.Eterm/themes/Eterm/pix:~/.Eterm/pix/:@PREFIX@/lib/Eterm/pix/" + path "./pix/:~/.Eterm/:~/.Eterm/themes/Eterm/pix:~/.Eterm/pix/:@PREFIX@/share/Eterm/pix/" # Support for these is forthcoming # scroll_up -1 -1 ~/.Eterm/up_arrow.ppm ---- themes/chooser/MAIN.in.orig Sat Oct 10 01:40:32 1998 -+++ themes/chooser/MAIN.in Sat Oct 10 01:40:42 1998 +--- themes/chooser/MAIN.in.orig Mon Oct 26 19:20:51 1998 ++++ themes/chooser/MAIN.in Mon Oct 26 19:21:54 1998 @@ -94,7 +94,7 @@ # scale 100%, 0 to tile, any other number specifies W/H in pixels begin pixmaps - background %random(`cat pixmaps.list`) + background %random(`cat pixmaps.list 2>/dev/null`) - path "./pix/:~/.Eterm/:~/.Eterm/themes/Eterm/pix:~/.Eterm/pix/:@PREFIX@/lib/Eterm/pix/" + path "./pix/:~/.Eterm/:~/.Eterm/themes/Eterm/pix:~/.Eterm/pix/:@PREFIX@/share/Eterm/pix/" # Support for these is forthcoming # scroll_up -1 -1 ~/.Eterm/up_arrow.ppm ---- themes/emacs/MAIN.in.orig Sat Oct 10 01:40:49 1998 -+++ themes/emacs/MAIN.in Sat Oct 10 01:41:00 1998 +--- themes/emacs/MAIN.in.orig Mon Oct 26 19:20:51 1998 ++++ themes/emacs/MAIN.in Mon Oct 26 19:21:54 1998 @@ -94,7 +94,7 @@ # scale 100%, 0 to tile, any other number specifies W/H in pixels begin pixmaps - background %random(`cat pixmaps.list`) + background %random(`cat pixmaps.list 2>/dev/null`) - path "./pix/:~/.Eterm/:~/.Eterm/themes/Eterm/pix:~/.Eterm/pix/:@PREFIX@/lib/Eterm/pix/" + path "./pix/:~/.Eterm/:~/.Eterm/themes/Eterm/pix:~/.Eterm/pix/:@PREFIX@/share/Eterm/pix/" # Support for these is forthcoming # scroll_up -1 -1 ~/.Eterm/up_arrow.ppm ---- themes/irc/MAIN.in.orig Sat Oct 10 01:41:07 1998 -+++ themes/irc/MAIN.in Sat Oct 10 01:41:17 1998 +--- themes/irc/MAIN.in.orig Mon Oct 26 19:20:51 1998 ++++ themes/irc/MAIN.in Mon Oct 26 19:21:54 1998 @@ -94,7 +94,7 @@ # scale 100%, 0 to tile, any other number specifies W/H in pixels begin pixmaps - background %random(`cat pixmaps.list`) + background %random(`cat pixmaps.list 2>/dev/null`) - path "./pix/:~/.Eterm/:~/.Eterm/themes/Eterm/pix:~/.Eterm/pix/:@PREFIX@/lib/Eterm/pix/" + path "./pix/:~/.Eterm/:~/.Eterm/themes/Eterm/pix:~/.Eterm/pix/:@PREFIX@/share/Eterm/pix/" # Support for these is forthcoming # scroll_up -1 -1 ~/.Eterm/up_arrow.ppm ---- themes/mutt/MAIN.in.orig Sat Oct 10 01:41:23 1998 -+++ themes/mutt/MAIN.in Sat Oct 10 01:42:06 1998 +--- themes/mutt/MAIN.in.orig Mon Oct 26 19:20:51 1998 ++++ themes/mutt/MAIN.in Mon Oct 26 19:21:54 1998 @@ -94,7 +94,7 @@ # scale 100%, 0 to tile, any other number specifies W/H in pixels begin pixmaps - background %random(`cat pixmaps.list`) + background %random(`cat pixmaps.list 2>/dev/null`) - path "~/.Eterm/:~/.Eterm/themes/Eterm/pix:~/.Eterm/pix/:@PREFIX@/lib/Eterm/pix/" + path "~/.Eterm/:~/.Eterm/themes/Eterm/pix:~/.Eterm/pix/:@PREFIX@/share/Eterm/pix/" # Support for these is forthcoming # scroll_up -1 -1 ~/.Eterm/up_arrow.ppm ---- themes/tn3270/MAIN.in.orig Sat Oct 10 01:42:12 1998 -+++ themes/tn3270/MAIN.in Sat Oct 10 01:42:25 1998 +--- themes/tn3270/MAIN.in.orig Mon Oct 26 19:20:51 1998 ++++ themes/tn3270/MAIN.in Mon Oct 26 19:21:54 1998 @@ -94,7 +94,7 @@ # scale 100%, 0 to tile, any other number specifies W/H in pixels begin pixmaps - background %random(`cat pixmaps.list`) + background %random(`cat pixmaps.list 2>/dev/null`) - path "~/.Eterm/:~/.Eterm/themes/Eterm/pix:~/.Eterm/pix/:@PREFIX@/lib/Eterm/pix/" + path "~/.Eterm/:~/.Eterm/themes/Eterm/pix:~/.Eterm/pix/:@PREFIX@/share/Eterm/pix/" # Support for these is forthcoming # scroll_up -1 -1 ~/.Eterm/up_arrow.ppm ---- themes/trans/MAIN.in.orig Sat Oct 10 01:42:30 1998 -+++ themes/trans/MAIN.in Sat Oct 10 01:42:44 1998 +--- themes/trans/MAIN.in.orig Mon Oct 26 19:20:51 1998 ++++ themes/trans/MAIN.in Mon Oct 26 19:21:54 1998 @@ -94,7 +94,7 @@ # scale 100%, 0 to tile, any other number specifies W/H in pixels begin pixmaps - # background %random(`cat pixmaps.list`) + # background %random(`cat pixmaps.list 2>/dev/null`) -# path "./pix/:~/.Eterm/:~/.Eterm/themes/Eterm/pix:~/.Eterm/pix/:@PREFIX@/lib/Eterm/pix/" +# path "./pix/:~/.Eterm/:~/.Eterm/themes/Eterm/pix:~/.Eterm/pix/:@PREFIX@/share/Eterm/pix/" # Support for these is forthcoming # scroll_up -1 -1 ~/.Eterm/up_arrow.ppm ---- themes/Makefile.in.orig Sat Oct 10 01:51:23 1998 -+++ themes/Makefile.in Sat Oct 10 01:51:47 1998 -@@ -37,6 +37,7 @@ - $(CHMOD) 755 $(themedir)/$$i ; \ - $(CHMOD) 644 $(themedir)/$$i/???* ; \ - $(RMF) $(themedir)/$$i/MAIN.in ; \ -+ $(RMF) $(themedir)/$$i/MAIN.in.orig ; \ - else \ - echo "ALERT! Not overwriting theme $$i in $(themedir). You will need to update this theme manually." ; \ - fi ; \ diff -ruN eterm.orig/pkg/DESCR eterm/pkg/DESCR --- eterm.orig/pkg/DESCR Mon Oct 26 18:49:50 1998 +++ eterm/pkg/DESCR Mon Oct 26 19:36:30 1998 @@ -4,6 +4,9 @@ qualities slightly above stability. Allows you to use scaled images as your background for terminal windows, and much more! +If you want the KANJI feature enable, use +make -DKANJI install + http://www.tcserv.com/Eterm http://www.rasterman.com ported by murray@cdrom.com diff -ruN eterm.orig/pkg/PLIST eterm/pkg/PLIST --- eterm.orig/pkg/PLIST Mon Oct 26 18:49:50 1998 +++ eterm/pkg/PLIST Mon Oct 26 19:48:41 1998 @@ -1,6 +1,5 @@ bin/Esetroot bin/Eterm -bin/Eterm-0.8 share/Eterm/themes/Eterm/Eterm.menu share/Eterm/themes/Eterm/MAIN share/Eterm/themes/chooser/MAIN @@ -15,7 +14,6 @@ share/Eterm/themes/trans/MAIN share/Eterm/themes/trans/trans.menu share/Eterm/Eterm.help -share/Eterm/Eterm.menu share/Eterm/Eterm.ref share/Eterm/Eterm.tcap share/Eterm/Eterm.ti >Fix: >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?199810270156.RAA23160>