Hello -
This patches brings Eterm up to 0.9.3. I had some help from the FreeBSD
ports.
Please test.
- David
Index: ports/x11/eterm/Makefile
===================================================================
RCS file: /cvs/ports/x11/eterm/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- ports/x11/eterm/Makefile 12 Jan 2006 01:05:22 -0000 1.21
+++ ports/x11/eterm/Makefile 7 Feb 2006 18:31:20 -0000
@@ -1,19 +1,19 @@
# $OpenBSD: Makefile,v 1.21 2006/01/12 01:05:22 naddy Exp $
COMMENT= "color X11 terminal emulator with transparency support"
-COMMENT-kanji= "color japanese terminal emulator with transparency support"
-PKGNAME= eterm-0.8.10p0
-FULLPKGNAME-kanji= ja-eterm-0.8.10p0
-DISTNAME= Eterm-0.8.10
-SHARED_LIBS= Eterm 0.8 \
- mej 0.8
+PKGNAME= eterm-0.9.3
+DISTNAME= Eterm-0.9.3
+SHARED_LIBS= Eterm 0.9
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=eterm/}
HOMEPAGE= http://eterm.sourceforge.net/
-LIB_DEPENDS= Imlib.19::graphics/imlib
+MAINTAINER= David Hill <[EMAIL PROTECTED]>
+
+LIB_DEPENDS= Imlib2.2::graphics/imlib2 \
+ ast.2::devel/libast \
# GPL with some custom licenses
PERMIT_PACKAGE_CDROM= "may not sell"
@@ -26,20 +26,21 @@
USE_LIBTOOL= Yes
CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS= ${CONFIGURE_SHARED}
-
-FLAVORS= kanji
-FLAVOR?=
+CONFIGURE_ARGS?=--enable-trans --enable-utmp \
+ --enable-xim --with-theme-update \
+ --with-backspace=bs --without-terminfo \
+ ${CONFIGURE_SHARED}
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
-.if ${FLAVOR:L:Mkanji}
-CFLAGS+= -DKANJI
-CATEGORIES+= japanese
+.if ${MACHINE_ARCH:Mi386}
+CONFIGURE_ARGS+= --enable-mmx
.endif
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/Eterm
${INSTALL_DATA} ${WRKSRC}/ReleaseNotes ${PREFIX}/share/doc/Eterm
- ${INSTALL_DATA} ${WRKSRC}/doc/Eterm.tcap ${PREFIX}/share/doc/Eterm
- ${INSTALL_DATA} ${WRKSRC}/doc/Eterm.ti ${PREFIX}/share/doc/Eterm
+# ${INSTALL_DATA} ${WRKSRC}/doc/Eterm.tcap ${PREFIX}/share/doc/Eterm
+# ${INSTALL_DATA} ${WRKSRC}/doc/Eterm.ti ${PREFIX}/share/doc/Eterm
.include <bsd.port.mk>
Index: ports/x11/eterm/distinfo
===================================================================
RCS file: /cvs/ports/x11/eterm/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- ports/x11/eterm/distinfo 5 Jan 2005 17:53:53 -0000 1.2
+++ ports/x11/eterm/distinfo 7 Feb 2006 18:31:20 -0000
@@ -1,4 +1,4 @@
-MD5 (Eterm-0.8.10.tar.gz) = 44b0b498d8186205d0898b266643fbf1
-RMD160 (Eterm-0.8.10.tar.gz) = bee0f8f842d3a3538cdea83d7638827622e9a935
-SHA1 (Eterm-0.8.10.tar.gz) = 0cafeec2c9d79c874c6b312dcb105b912168ad0d
-SIZE (Eterm-0.8.10.tar.gz) = 593026
+MD5 (Eterm-0.9.3.tar.gz) = dd089fa7768f945341d721dd4942c702
+RMD160 (Eterm-0.9.3.tar.gz) = 4e9f57807f1658cf8bea90219e296f4184f31452
+SHA1 (Eterm-0.9.3.tar.gz) = df12cb09676ca265d65b8b5ac61f1ec88d58c692
+SIZE (Eterm-0.9.3.tar.gz) = 660767
Index: ports/x11/eterm/patches/patch-doc-Makefile_in
===================================================================
RCS file: ports/x11/eterm/patches/patch-doc-Makefile_in
diff -N ports/x11/eterm/patches/patch-doc-Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ports/x11/eterm/patches/patch-doc-Makefile_in 7 Feb 2006 18:31:20
-0000
@@ -0,0 +1,36 @@
+--- doc/Makefile.in.orig Tue Dec 14 13:46:51 2004
++++ doc/Makefile.in Tue Feb 7 13:21:56 2006
+@@ -230,7 +230,6 @@
+
+ install-data-am: install-man
+ @$(NORMAL_INSTALL)
+- $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+ install-data: install-data-am
+
+ install-am: all-am
+@@ -282,24 +281,10 @@
+ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
+
+-all: Makefile Eterm.1.html
++all: Makefile
+
+ Eterm.1: $(top_srcdir)/doc/Eterm.1.in
+ $(SED) -e 's%@''VERSION''@%$(VERSION)%g' -e 's%@''DATE''@%$(DATE)%g' -e
'[EMAIL PROTECTED]@%$(pkgdatadir)/themes%g' $(top_srcdir)/doc/[EMAIL PROTECTED]
> $@
+-
+-Eterm.1.html: Eterm.1
+- (nroff -man $< | man2html -title Eterm > $@) || :
+-
+-install-data-hook:
+- $(TIC) Eterm.ti || (mkinstalldirs $(HOME)/.terminfo && $(TIC)
-o$(HOME)/.terminfo Eterm.ti) || :
+- -(infocmp -C -sc Eterm | sed -e '/Reconstructed/d' -e '/\.\.sa=/d' \
+- -e
's!^\([[:space:]]:co#.*\):\\$$!\1:pa#64:Co#8:AF=\\E[3%dm:AB=\\E[4%dm:op=\\E[39m\\E[49m:\\!'
\
+- -e 's!:$$!:\\!' ; echo '
:ac=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:' \
+- ) > Eterm.tcap.new && mv Eterm.tcap.new Eterm.tcap || rm -f
Eterm.tcap.new
+- -if test -f /usr/share/misc/termcap && test -f Eterm.tcap ; then \
+- grep -i 'Eterm Terminal Emulator' /usr/share/misc/termcap || cat
Eterm.tcap >> /usr/share/misc/termcap ; \
+- cap_mkdb termcap ; \
+- fi || :
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
Index: ports/x11/eterm/patches/patch-pixmap_c
===================================================================
RCS file: ports/x11/eterm/patches/patch-pixmap_c
diff -N ports/x11/eterm/patches/patch-pixmap_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ports/x11/eterm/patches/patch-pixmap_c 7 Feb 2006 18:31:20 -0000
@@ -0,0 +1,56 @@
+--- src/pixmap.c.orig Thu Jul 22 16:12:31 2004
++++ src/pixmap.c Tue Feb 7 13:10:50 2006
+@@ -1634,7 +1634,7 @@
+ for (x = -(w * 4); x < 0; x += 4) {
+ int r, g, b;
+
+-# ifdef WORDS_BIGENDIAN
++# if WORDS_BIGENDIAN
+ r = (ptr[x + 1] * rm) >> 8;
+ g = (ptr[x + 2] * gm) >> 8;
+ b = (ptr[x + 3] * bm) >> 8;
+@@ -1657,7 +1657,7 @@
+ for (x = -(w * 4); x < 0; x += 4) {
+ int r, g, b;
+
+-# ifdef WORDS_BIGENDIAN
++# if WORDS_BIGENDIAN
+ r = (ptr[x + 1] * rm) >> 8;
+ g = (ptr[x + 2] * gm) >> 8;
+ b = (ptr[x + 3] * bm) >> 8;
+@@ -1669,7 +1669,7 @@
+ r |= (!(r >> 8) - 1);
+ g |= (!(g >> 8) - 1);
+ b |= (!(b >> 8) - 1);
+-# ifdef WORDS_BIGENDIAN
++# if WORDS_BIGENDIAN
+ ptr[x + 1] = r;
+ ptr[x + 2] = g;
+ ptr[x + 3] = b;
+@@ -1699,7 +1699,7 @@
+ for (x = -(w * 3); x < 0; x += 3) {
+ int r, g, b;
+
+-# ifdef WORDS_BIGENDIAN
++# if WORDS_BIGENDIAN
+ r = (ptr[x + 0] * rm) >> 8;
+ g = (ptr[x + 1] * gm) >> 8;
+ b = (ptr[x + 2] * bm) >> 8;
+@@ -1722,7 +1722,7 @@
+ for (x = -(w * 3); x < 0; x += 3) {
+ int r, g, b;
+
+-# ifdef WORDS_BIGENDIAN
++# if WORDS_BIGENDIAN
+ r = (ptr[x + 0] * rm) >> 8;
+ g = (ptr[x + 1] * gm) >> 8;
+ b = (ptr[x + 2] * bm) >> 8;
+@@ -1734,7 +1734,7 @@
+ r |= (!(r >> 8) - 1);
+ g |= (!(g >> 8) - 1);
+ b |= (!(b >> 8) - 1);
+-# ifdef WORDS_BIGENDIAN
++# if WORDS_BIGENDIAN
+ ptr[x + 0] = r;
+ ptr[x + 1] = g;
+ ptr[x + 2] = b;
Index: ports/x11/eterm/patches/patch-src-Makefile_in
===================================================================
RCS file: ports/x11/eterm/patches/patch-src-Makefile_in
diff -N ports/x11/eterm/patches/patch-src-Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ports/x11/eterm/patches/patch-src-Makefile_in 7 Feb 2006 18:31:20
-0000
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig Tue Dec 14 13:46:49 2004
++++ src/Makefile.in Tue Feb 7 13:08:42 2006
+@@ -153,7 +153,7 @@
+
+ EXTRA_libEterm_la_SOURCES = $(MMX_SRCS)
+
+-libEterm_la_LDFLAGS = -release $(VERSION)
++libEterm_la_LDFLAGS = -version-info 9:9:9
+ @[EMAIL PROTECTED] = @[EMAIL PROTECTED] $(MMX_OBJS)
+ @[EMAIL PROTECTED] = @[EMAIL PROTECTED]
+ @[EMAIL PROTECTED] = @[EMAIL PROTECTED](MMX_OBJS)
Index: ports/x11/eterm/patches/patch-themes-Eterm-menus_cfg
===================================================================
RCS file: ports/x11/eterm/patches/patch-themes-Eterm-menus_cfg
diff -N ports/x11/eterm/patches/patch-themes-Eterm-menus_cfg
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ports/x11/eterm/patches/patch-themes-Eterm-menus_cfg 7 Feb 2006
18:31:20 -0000
@@ -0,0 +1,8 @@
+--- themes/Eterm/menus.cfg.orig Tue Mar 2 10:56:06 2004
++++ themes/Eterm/menus.cfg Tue Feb 7 13:11:45 2006
+@@ -1,4 +1,4 @@
+-<Eterm-0.9.1>
++<Eterm-0.9.3>
+ begin menu
+ title Font
+ begin menuitem
Index: ports/x11/eterm/patches/patch-themes-auto-menus_cfg
===================================================================
RCS file: ports/x11/eterm/patches/patch-themes-auto-menus_cfg
diff -N ports/x11/eterm/patches/patch-themes-auto-menus_cfg
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ports/x11/eterm/patches/patch-themes-auto-menus_cfg 7 Feb 2006 18:31:20
-0000
@@ -0,0 +1,8 @@
+--- themes/auto/menus.cfg.orig Tue Mar 2 10:56:06 2004
++++ themes/auto/menus.cfg Tue Feb 7 13:12:59 2006
+@@ -1,4 +1,4 @@
+-<Eterm-0.9.1>
++<Eterm-0.9.3>
+ begin menu
+ title Font
+ begin menuitem
Index: ports/x11/eterm/patches/patch-themes-trans-menus_cfg
===================================================================
RCS file: ports/x11/eterm/patches/patch-themes-trans-menus_cfg
diff -N ports/x11/eterm/patches/patch-themes-trans-menus_cfg
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ports/x11/eterm/patches/patch-themes-trans-menus_cfg 7 Feb 2006
18:31:20 -0000
@@ -0,0 +1,8 @@
+--- themes/trans/menus.cfg.orig Tue Mar 2 10:56:06 2004
++++ themes/trans/menus.cfg Tue Feb 7 13:13:29 2006
+@@ -1,4 +1,4 @@
+-<Eterm-0.9.1>
++<Eterm-0.9.3>
+ begin menu
+ title Font
+ begin menuitem
Index: ports/x11/eterm/pkg/PFRAG.shared
===================================================================
RCS file: /cvs/ports/x11/eterm/pkg/PFRAG.shared,v
retrieving revision 1.3
diff -u -r1.3 PFRAG.shared
--- ports/x11/eterm/pkg/PFRAG.shared 25 Dec 2005 21:14:26 -0000 1.3
+++ ports/x11/eterm/pkg/PFRAG.shared 7 Feb 2006 18:31:20 -0000
@@ -1,3 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/25 21:14:26 naddy Exp $
@lib lib/libEterm.so.${LIBEterm_VERSION}
[EMAIL PROTECTED] lib/libmej.so.${LIBmej_VERSION}
Index: ports/x11/eterm/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/eterm/pkg/PLIST,v
retrieving revision 1.7
diff -u -r1.7 PLIST
--- ports/x11/eterm/pkg/PLIST 18 Sep 2004 13:19:26 -0000 1.7
+++ ports/x11/eterm/pkg/PLIST 7 Feb 2006 18:31:20 -0000
@@ -3,59 +3,63 @@
@conflict eterm-*
bin/Esetroot
bin/Etbg
-bin/Etcolors.sh
+bin/Etbg_update_list
+bin/Etcolors
@mode 4755
bin/Eterm
@mode
-bin/Etmenu.sh
+bin/Etsearch
+bin/Ettable
+bin/kEsetroot
lib/libEterm.a
lib/libEterm.la
-lib/libmej.a
-lib/libmej.la
@man man/man1/Eterm.1
share/Eterm/
share/Eterm/pix/
-share/Eterm/pix/014.png
-share/Eterm/pix/40.png
-share/Eterm/pix/6.png
-share/Eterm/pix/backwave.jpg
-share/Eterm/pix/circuit.png
-share/Eterm/pix/fourthday.jpg
-share/Eterm/pix/gaia.jpg
-share/Eterm/pix/galleon.jpg
-share/Eterm/pix/nebula.jpg
-share/Eterm/pix/night_of_the_dragon.jpg
+share/Eterm/pix/bar_horizontal_1.png
+share/Eterm/pix/bar_horizontal_2.png
+share/Eterm/pix/bar_horizontal_3.png
+share/Eterm/pix/bar_vertical_1.png
+share/Eterm/pix/bar_vertical_2.png
+share/Eterm/pix/bar_vertical_3.png
+share/Eterm/pix/button_arrow_down_1.png
+share/Eterm/pix/button_arrow_down_2.png
+share/Eterm/pix/button_arrow_down_3.png
+share/Eterm/pix/button_arrow_up_1.png
+share/Eterm/pix/button_arrow_up_2.png
+share/Eterm/pix/button_arrow_up_3.png
+share/Eterm/pix/exit.png
+share/Eterm/pix/help.png
+share/Eterm/pix/menu1.png
+share/Eterm/pix/menu2.png
+share/Eterm/pix/menu3.png
share/Eterm/pix/pixmaps.list
+share/Eterm/pix/scale/
+share/Eterm/pix/scale/Neopolis-horizon.jpg
+share/Eterm/pix/thumb_1.png
+share/Eterm/pix/thumb_2.png
+share/Eterm/pix/tile/
+share/Eterm/pix/tile/circuit.jpg
share/Eterm/themes/
+share/Eterm/themes/Escreen/
+share/Eterm/themes/Escreen/menus.cfg
+share/Eterm/themes/Escreen/pixmaps.list
+share/Eterm/themes/Escreen/theme.cfg
share/Eterm/themes/Eterm/
-share/Eterm/themes/Eterm/Eterm.menu
-share/Eterm/themes/Eterm/MAIN
+share/Eterm/themes/Eterm/menus.cfg
+share/Eterm/themes/Eterm/menus.cfg.orig
share/Eterm/themes/Eterm/pixmaps.list
-share/Eterm/themes/chooser/
-share/Eterm/themes/chooser/MAIN
-share/Eterm/themes/chooser/chooser.menu
-share/Eterm/themes/chooser/pixmaps.list
-share/Eterm/themes/emacs/
-share/Eterm/themes/emacs/MAIN
-share/Eterm/themes/emacs/emacs.menu
-share/Eterm/themes/emacs/pixmaps.list
-share/Eterm/themes/irc/
-share/Eterm/themes/irc/MAIN
-share/Eterm/themes/irc/irc.menu
-share/Eterm/themes/irc/pixmaps.list
-share/Eterm/themes/mutt/
-share/Eterm/themes/mutt/MAIN
-share/Eterm/themes/mutt/mutt.menu
-share/Eterm/themes/mutt/pixmaps.list
-share/Eterm/themes/tn3270/
-share/Eterm/themes/tn3270/MAIN
-share/Eterm/themes/tn3270/pixmaps.list
+share/Eterm/themes/Eterm/theme.cfg
+share/Eterm/themes/auto/
+share/Eterm/themes/auto/menus.cfg
+share/Eterm/themes/auto/menus.cfg.orig
+share/Eterm/themes/auto/pixmaps.list
+share/Eterm/themes/auto/theme.cfg
share/Eterm/themes/trans/
-share/Eterm/themes/trans/MAIN
+share/Eterm/themes/trans/menus.cfg
+share/Eterm/themes/trans/menus.cfg.orig
share/Eterm/themes/trans/pixmaps.list
-share/Eterm/themes/trans/trans.menu
+share/Eterm/themes/trans/theme.cfg
share/doc/Eterm/
-share/doc/Eterm/Eterm.tcap
-share/doc/Eterm/Eterm.ti
share/doc/Eterm/ReleaseNotes
%%SHARED%%
