Date: Fri, 8 Dec 2006 21:39:04 +0100 (CET) From: trasz <trasz@pin.if.uz.zgora.pl> To: FreeBSD-gnats-submit@FreeBSD.org Cc: olgeni@FreeBSD.org Subject: ports/106495: [PATCH] x11/eterm: update to 0.9.4 Message-ID: <20061208203904.28A8A39DBA@pin.if.uz.zgora.pl> Resent-Message-ID: <200612082040.kB8KeE50024099@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 106495
>Category: ports
>Synopsis: [PATCH] x11/eterm: update to 0.9.4
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Dec 08 20:40:13 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: trasz
>Release: FreeBSD 6.1-RELEASE-p10 i386
>Organization:
>Environment:
System: FreeBSD pin.if.uz.zgora.pl 6.1-RELEASE-p10 FreeBSD 6.1-RELEASE-p10 #0: Wed Nov 15 19:16:30 CET 2006
>Description:
- Update to 0.9.4
- Remove USE_X_PREFIX
Removed file(s):
- files/patch-configure
- files/patch-src_misc.c
- files/patch-src_misc.h
- files/patch-src_options.c
- files/patch-src_pixmap.c
- files/patch-src_windows.c
Port maintainer (olgeni@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- eterm-0.9.4.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/x11/eterm/Makefile /home/trasz/eterm/Makefile
--- /usr/ports/x11/eterm/Makefile Sat Oct 28 23:10:47 2006
+++ /home/trasz/eterm/Makefile Fri Dec 8 21:38:18 2006
@@ -6,8 +6,7 @@
#
PORTNAME= eterm
-PORTVERSION= 0.9.3
-PORTREVISION= 5
+PORTVERSION= 0.9.4
CATEGORIES+= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -20,7 +19,6 @@
LIB_DEPENDS= Imlib2.3:${PORTSDIR}/graphics/imlib2 \
ast.2:${PORTSDIR}/devel/libast
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS?=--enable-trans --enable-utmp \
@@ -30,6 +28,7 @@
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
OPTIONS= MMX "With MMX instruction set" off
+USE_XLIB= yes
MAN1= Eterm.1
diff -ruN --exclude=CVS /usr/ports/x11/eterm/distinfo /home/trasz/eterm/distinfo
--- /usr/ports/x11/eterm/distinfo Tue Jan 24 04:59:33 2006
+++ /home/trasz/eterm/distinfo Fri Dec 8 21:38:19 2006
@@ -1,3 +1,3 @@
-MD5 (Eterm-0.9.3.tar.gz) = dd089fa7768f945341d721dd4942c702
-SHA256 (Eterm-0.9.3.tar.gz) = b6ba658ac1e1b1c0705e10bf36bc9a5980eb8f458c18d5e4374c38b01d2ca76a
-SIZE (Eterm-0.9.3.tar.gz) = 660767
+MD5 (Eterm-0.9.4.tar.gz) = b8869ee9c9b9516231af9eefa595cee3
+SHA256 (Eterm-0.9.4.tar.gz) = 0eaeba125781276fe7300b320cd7c180f41ccd47d4dcbdb214ad89dd3fc5420a
+SIZE (Eterm-0.9.4.tar.gz) = 814823
diff -ruN --exclude=CVS /usr/ports/x11/eterm/files/patch-configure /home/trasz/eterm/files/patch-configure
--- /usr/ports/x11/eterm/files/patch-configure Mon Mar 31 20:24:53 2003
+++ /home/trasz/eterm/files/patch-configure Thu Jan 1 01:00:00 1970
@@ -1,13 +0,0 @@
-
-$FreeBSD: ports/x11/eterm/files/patch-configure,v 1.1 2003/03/31 18:24:53 olgeni Exp $
-
---- configure.orig Thu Oct 31 18:48:54 2002
-+++ configure Thu Mar 27 23:47:00 2003
-@@ -5610,6 +5610,7 @@
-
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff -ruN --exclude=CVS /usr/ports/x11/eterm/files/patch-doc:Makefile.in /home/trasz/eterm/files/patch-doc:Makefile.in
--- /usr/ports/x11/eterm/files/patch-doc:Makefile.in Mon Mar 31 20:24:53 2003
+++ /home/trasz/eterm/files/patch-doc:Makefile.in Fri Dec 8 21:38:18 2006
@@ -1,15 +1,15 @@
---- doc/Makefile.in.orig Thu Feb 13 20:03:45 2003
-+++ doc/Makefile.in Thu Feb 13 20:04:52 2003
-@@ -215,7 +215,6 @@
+--- doc/Makefile.in.orig Tue Aug 22 20:40:17 2006
++++ doc/Makefile.in Fri Dec 8 20:44:14 2006
+@@ -372,7 +372,6 @@
install-data-am: install-man
@$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) install-data-hook
- install-data: install-data-am
- install-am: all-am
-@@ -267,24 +266,10 @@
- maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+ install-exec-am:
+
+@@ -414,26 +413,17 @@
+ uninstall-man1
-all: Makefile Eterm.1.html
@@ -17,20 +17,22 @@
Eterm.1: $(top_srcdir)/doc/Eterm.1.in
$(SED) -e 's%@''VERSION''@%$(VERSION)%g' -e 's%@''DATE''@%$(DATE)%g' -e 's%@THEMEDIR@%$(pkgdatadir)/themes%g' $(top_srcdir)/doc/$@.in > $@
--
+
-Eterm.1.html: Eterm.1
- (nroff -man $< | man2html -title Eterm > $@) || :
-
+ Eterm.tcap: 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
+
-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.
+ .NOEXPORT:
diff -ruN --exclude=CVS /usr/ports/x11/eterm/files/patch-src:Makefile.in /home/trasz/eterm/files/patch-src:Makefile.in
--- /usr/ports/x11/eterm/files/patch-src:Makefile.in Mon Mar 31 20:24:53 2003
+++ /home/trasz/eterm/files/patch-src:Makefile.in Fri Dec 8 21:38:18 2006
@@ -1,11 +1,11 @@
---- src/Makefile.in.orig Fri Feb 14 00:23:27 2003
-+++ src/Makefile.in Fri Feb 14 00:24:05 2003
-@@ -138,7 +138,7 @@
-
- EXTRA_libEterm_la_SOURCES = $(MMX_SRCS)
+--- src/Makefile.in.orig Tue Aug 22 20:40:19 2006
++++ src/Makefile.in Fri Dec 8 20:48:59 2006
+@@ -257,7 +257,7 @@
+ defaultfont.h libscream.c scream.h screamcfg.h
+ EXTRA_libEterm_la_SOURCES = $(MMX_SRCS) $(SSE2_SRCS)
-libEterm_la_LDFLAGS = -release $(VERSION)
+libEterm_la_LDFLAGS = -version-info 9:9:9
- @HAVE_MMX_TRUE@libEterm_la_DEPENDENCIES = @HAVE_MMX_TRUE@feature.h $(MMX_OBJS)
- @HAVE_MMX_FALSE@libEterm_la_DEPENDENCIES = @HAVE_MMX_FALSE@feature.h
- @HAVE_MMX_TRUE@libEterm_la_LIBADD = @HAVE_MMX_TRUE@$(MMX_OBJS)
+ @HAVE_MMX_FALSE@@HAVE_SSE2_FALSE@libEterm_la_DEPENDENCIES = feature.h
+ @HAVE_MMX_TRUE@@HAVE_SSE2_FALSE@libEterm_la_DEPENDENCIES = feature.h $(MMX_OBJS)
+ @HAVE_SSE2_TRUE@libEterm_la_DEPENDENCIES = feature.h $(SSE2_OBJS)
diff -ruN --exclude=CVS /usr/ports/x11/eterm/files/patch-src_misc.c /home/trasz/eterm/files/patch-src_misc.c
--- /usr/ports/x11/eterm/files/patch-src_misc.c Tue Mar 21 01:10:27 2006
+++ /home/trasz/eterm/files/patch-src_misc.c Thu Jan 1 01:00:00 1970
@@ -1,59 +0,0 @@
-
-$FreeBSD: ports/x11/eterm/files/patch-src_misc.c,v 1.1 2006/03/21 00:10:27 olgeni Exp $
-
---- src/misc.c.orig
-+++ src/misc.c
-@@ -223,6 +223,53 @@
- return (pnew - str);
- }
-
-+spif_charptr_t
-+escape_string(spif_charptr_t str, spif_char_t quote, spif_int32_t maxlen)
-+{
-+ spif_charptr_t buff, s = str, pbuff;
-+
-+ D_STRINGS(("escape_string(%s %c %ld)\n", (char *) str, quote, maxlen));
-+ if (! quote) {
-+ quote = '\"';
-+ }
-+
-+ /* The escaped string will be at most twice the length of the original. */
-+ buff = SPIF_CAST(charptr) MALLOC(strlen(SPIF_CAST_PTR(char) str) * 2 + 1);
-+
-+ /* Copy and escape the string from str into buff. */
-+ for (pbuff = buff; (*s); s++, pbuff++) {
-+ if (*s == quote) {
-+ D_STRINGS(("Double-escaping \'%c\' at position %d\n", *s, s - str));
-+ *pbuff = '\\';
-+ pbuff++;
-+ *pbuff = '\\';
-+ pbuff++;
-+ } else {
-+ if (quote == '\"') {
-+ if ((*s == '\\') || (*s == '`')) {
-+ D_STRINGS(("Escaping \'%c\' at position %d\n", *s, s - str));
-+ *pbuff = '\\';
-+ pbuff++;
-+ }
-+ }
-+ }
-+ D_STRINGS(("Copying \'%c\' at position %d\n", *s, s - str));
-+ *pbuff = *s;
-+ }
-+ *pbuff = 0;
-+
-+ if (maxlen) {
-+ /* Given maxlen, we know "str" can hold at least "maxlen" chars. */
-+ if (!spiftool_safe_strncpy(str, buff, maxlen)) {
-+ str[maxlen] = 0;
-+ }
-+ FREE(buff);
-+ return str;
-+ } else {
-+ return buff;
-+ }
-+}
-+
- char *
- safe_print_string(const char *str, unsigned long len)
- {
diff -ruN --exclude=CVS /usr/ports/x11/eterm/files/patch-src_misc.h /home/trasz/eterm/files/patch-src_misc.h
--- /usr/ports/x11/eterm/files/patch-src_misc.h Tue Mar 21 01:10:27 2006
+++ /home/trasz/eterm/files/patch-src_misc.h Thu Jan 1 01:00:00 1970
@@ -1,13 +0,0 @@
-
-$FreeBSD: ports/x11/eterm/files/patch-src_misc.h,v 1.1 2006/03/21 00:10:27 olgeni Exp $
-
---- src/misc.h.orig
-+++ src/misc.h
-@@ -40,6 +40,7 @@
- extern unsigned long str_leading_match(register const char *, register const char *);
- extern char *str_trim(char *str);
- extern int parse_escaped_string(char *str);
-+extern spif_charptr_t escape_string(spif_charptr_t str, spif_char_t quote, spif_int32_t maxlen);
- extern char *safe_print_string(const char *buff, unsigned long len);
- extern unsigned long add_carriage_returns(unsigned char *buff, unsigned long cnt);
- extern unsigned char mkdirhier(const char *);
diff -ruN --exclude=CVS /usr/ports/x11/eterm/files/patch-src_options.c /home/trasz/eterm/files/patch-src_options.c
--- /usr/ports/x11/eterm/files/patch-src_options.c Tue Mar 21 01:10:27 2006
+++ /home/trasz/eterm/files/patch-src_options.c Thu Jan 1 01:00:00 1970
@@ -1,17 +0,0 @@
-
-$FreeBSD: ports/x11/eterm/files/patch-src_options.c,v 1.1 2006/03/21 00:10:27 olgeni Exp $
-
---- src/options.c.orig
-+++ src/options.c
-@@ -3832,7 +3832,10 @@
- }
- #ifdef CUTCHAR_OPTION
- if (rs_cutchars) {
-- fprintf(fp, " cut_chars '%s'\n", rs_cutchars);
-+ spif_charptr_t cut_chars_escaped;
-+
-+ cut_chars_escaped = escape_string(SPIF_CAST(charptr) rs_cutchars, '\"', 0);
-+ fprintf(fp, " cut_chars \"%s\"\n", (char *) cut_chars_escaped);
- }
- #endif
- fprintf(fp, "end misc\n\n");
diff -ruN --exclude=CVS /usr/ports/x11/eterm/files/patch-src_pixmap.c /home/trasz/eterm/files/patch-src_pixmap.c
--- /usr/ports/x11/eterm/files/patch-src_pixmap.c Sat Jul 30 11:57:48 2005
+++ /home/trasz/eterm/files/patch-src_pixmap.c Thu Jan 1 01:00:00 1970
@@ -1,59 +0,0 @@
-
-$FreeBSD: ports/x11/eterm/files/patch-src_pixmap.c,v 1.1 2005/07/30 09:57:48 olgeni Exp $
-
---- src/pixmap.c.orig
-+++ src/pixmap.c
-@@ -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;
diff -ruN --exclude=CVS /usr/ports/x11/eterm/files/patch-src_windows.c /home/trasz/eterm/files/patch-src_windows.c
--- /usr/ports/x11/eterm/files/patch-src_windows.c Tue Mar 21 01:10:27 2006
+++ /home/trasz/eterm/files/patch-src_windows.c Thu Jan 1 01:00:00 1970
@@ -1,16 +0,0 @@
-
-$FreeBSD: ports/x11/eterm/files/patch-src_windows.c,v 1.1 2006/03/21 00:10:27 olgeni Exp $
-
---- src/windows.c.orig
-+++ src/windows.c
-@@ -467,9 +467,7 @@
- XClearWindow(Xdisplay, TermWin.vt);
- }
- XDefineCursor(Xdisplay, TermWin.vt, TermWin_cursor);
-- TermWin.mask = (KeyPressMask | EnterWindowMask | LeaveWindowMask | ExposureMask
-- | ButtonPressMask | ButtonReleaseMask | Button1MotionMask
-- | Button2MotionMask | Button3MotionMask);
-+ TermWin.mask = (EnterWindowMask | LeaveWindowMask | ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask | Button2MotionMask | Button3MotionMask);
- XSelectInput(Xdisplay, TermWin.vt, TermWin.mask);
-
- /* If the user wants a specific desktop, tell the WM that */
diff -ruN --exclude=CVS /usr/ports/x11/eterm/pkg-plist /home/trasz/eterm/pkg-plist
--- /usr/ports/x11/eterm/pkg-plist Thu Feb 23 11:39:46 2006
+++ /home/trasz/eterm/pkg-plist Fri Dec 8 21:38:19 2006
@@ -10,6 +10,7 @@
lib/libEterm.la
lib/libEterm.so
lib/libEterm.so.9
+share/Eterm/gdb.scr
share/Eterm/pix/bar_horizontal_1.png
share/Eterm/pix/bar_horizontal_2.png
share/Eterm/pix/bar_horizontal_3.png
--- eterm-0.9.4.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20061208203904.28A8A39DBA>