ports/151895: [patch] x11/evilvte version upgrade 0.4.7.1
Aragon Gouveia
aragon at phat.za.net
Tue Nov 2 19:30:12 UTC 2010
>Number: 151895
>Category: ports
>Synopsis: [patch] x11/evilvte version upgrade 0.4.7.1
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Nov 02 19:30:11 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Aragon Gouveia
>Release: 8.1-STABLE
>Organization:
>Environment:
FreeBSD igor.geek.sh 8.1-STABLE FreeBSD 8.1-STABLE #0: Sat Jul 24 19:06:08 SAST 2010 toor at igor.geek.sh:/usr/obj/usr/src/sys/IGOR amd64
>Description:
Attached patch updates x11/evilvte to latest version.
Thanks.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -uNr evilvte/Makefile evilvte.new/Makefile
--- evilvte/Makefile 2010-06-11 18:08:11.000000000 +0200
+++ evilvte.new/Makefile 2010-11-02 21:24:22.000000000 +0200
@@ -6,7 +6,7 @@
#
PORTNAME= evilvte
-PORTVERSION= 0.4.6
+PORTVERSION= 0.4.7.1
CATEGORIES= x11 gnome
MASTER_SITES= http://www.calno.com/${PORTNAME}/ \
LOCAL/glarkin
@@ -39,7 +39,8 @@
post-patch:
# disable man page installation
- @${REINPLACE_CMD} -e '29,30 d' ${WRKSRC}/Makefile
+ @${REINPLACE_CMD} -e '37,38 d' ${WRKSRC}/Makefile
+ @${REINPLACE_CMD} -e '/^make/ s/make/gmake/' ${WRKSRC}/src/process.sh
.if defined(EVILVTE_CONF)
@${ECHO_MSG} "creating config.h from ${EVILVTE_CONF}"
@${CP} ${EVILVTE_CONF} ${WRKSRC}/src/config.h
diff -uNr evilvte/distinfo evilvte.new/distinfo
--- evilvte/distinfo 2010-04-21 23:47:12.000000000 +0200
+++ evilvte.new/distinfo 2010-11-02 21:24:55.000000000 +0200
@@ -1,3 +1,2 @@
-MD5 (evilvte-0.4.6.tar.gz) = 323155af3f511b0acc0a526c0d5cce1f
-SHA256 (evilvte-0.4.6.tar.gz) = 08f2836ba45ffbb8af4102cc9033cda2e1e7790714175ea1d5befcf8aa2e2cf1
-SIZE (evilvte-0.4.6.tar.gz) = 38170
+SHA256 (evilvte-0.4.7.1.tar.gz) = a47ad312fde918a7064f37a933a66eeb8c252190224d06a8b804911ad5cdacf0
+SIZE (evilvte-0.4.7.1.tar.gz) = 39142
diff -uNr evilvte/files/patch-evilvte.c evilvte.new/files/patch-evilvte.c
--- evilvte/files/patch-evilvte.c 2010-05-04 12:57:16.000000000 +0200
+++ evilvte.new/files/patch-evilvte.c 1970-01-01 02:00:00.000000000 +0200
@@ -1,51 +0,0 @@
---- src/evilvte.c.orig 2010-04-06 07:35:41.000000000 +0200
-+++ src/evilvte.c 2010-04-23 02:01:06.000000000 +0200
-@@ -930,7 +930,6 @@
- #endif
- #if WINDOW_TITLE_DYNAMIC
- gtk_window_set_title(GTK_WINDOW(main_window), vte_terminal_get_window_title(VTE_TERMINAL(term->vte)));
-- gtk_window_set_icon_name(GTK_WINDOW(main_window), vte_terminal_get_icon_title(VTE_TERMINAL(term->vte)));
- #endif
- }
- #endif
-@@ -939,7 +938,7 @@
- int menu_popup(GtkWidget *widget, GdkEventButton *event)
- {
- #ifdef MATCH_STRING_EXEC
-- if (event->button == 1) {
-+ if (event->button == 2) {
- int tag = -1;
- #if TAB
- current_tab = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook)));
-@@ -948,11 +947,12 @@
- matched_url = vte_terminal_match_check(VTE_TERMINAL(term->vte), event->x / vte_terminal_get_char_width(VTE_TERMINAL(term->vte)), event->y / vte_terminal_get_char_height(VTE_TERMINAL(term->vte)), &tag);
- if (matched_url != NULL) {
- char new_window_str[256];
-- g_snprintf(new_window_str, sizeof(new_window_str), "%s %s &", MATCH_STRING_EXEC, matched_url);
-+ g_snprintf(new_window_str, sizeof(new_window_str), "%s '%s' &", MATCH_STRING_EXEC, matched_url);
- system(new_window_str);
- matched_url = NULL;
-+ return TRUE;
- }
-- return TRUE;
-+ return FALSE;
- }
- #endif
-
-@@ -2318,7 +2318,7 @@
- void do_match_open()
- {
- char new_window_str[256];
-- g_snprintf(new_window_str, sizeof(new_window_str), "%s %s &", MENU_MATCH_STRING_EXEC, matched_url);
-+ g_snprintf(new_window_str, sizeof(new_window_str), "%s '%s' &", MENU_MATCH_STRING_EXEC, matched_url);
- system(new_window_str);
- matched_url = NULL;
- }
-@@ -2699,7 +2699,6 @@
- #endif
- #if WINDOW_TITLE_DYNAMIC
- gtk_window_set_title(GTK_WINDOW(main_window), vte_terminal_get_window_title(VTE_TERMINAL(term->vte)));
-- gtk_window_set_icon_name(GTK_WINDOW(main_window), vte_terminal_get_icon_title(VTE_TERMINAL(term->vte)));
- #endif
- }
-
diff -uNr evilvte/files/patch-src-process.sh evilvte.new/files/patch-src-process.sh
--- evilvte/files/patch-src-process.sh 2010-04-21 23:47:12.000000000 +0200
+++ evilvte.new/files/patch-src-process.sh 2010-11-02 21:19:42.000000000 +0200
@@ -1,14 +1,28 @@
---- src/process.sh.orig 2010-04-06 07:35:41.000000000 +0200
-+++ src/process.sh 2010-04-14 01:05:42.000000000 +0200
-@@ -24,9 +24,9 @@
- echo \#define MENU_DEFAULT_ENCODING 1 >> $NEWCONFFILE
- fi
+--- src/process.sh.orig 2010-10-06 08:19:31.000000000 +0200
++++ src/process.sh 2010-11-02 21:09:49.000000000 +0200
+@@ -19,11 +19,11 @@
+ grep ^#define src/config.o > $CONFFILE
+ rm -f $1 src/evilvte.o
--MENU_ENCODING_LIST_SIZE=`grep MENU_ENCODING_LIST src/custom.h | tr -s ' ' ' ' | sed 's/^ //' | grep -v ^\/\/ | tail -n 1 | sed 's/,/\n/g' | wc -l`
-+MENU_ENCODING_LIST_SIZE=`grep MENU_ENCODING_LIST src/custom.h | tr -s ' ' ' ' | sed 's/^ //' | grep -v ^\/\/ | tail -n 1 | tr ',' '\n' | wc -l`
- TOGGLE_BG_ORDER_SIZE=`grep TOGGLE_BG_ORDER src/custom.h | tr -s ' ' ' ' | sed 's/^ //' | grep -v ^\/\/ | tail -n 1 | sed 's/,/\n/g' | wc -l`
--MENU_CUSTOM_SIZE=`grep MENU_CUSTOM src/custom.h | tr -s ' ' ' ' | sed 's/^ //' | grep -v ^\/\/ | tail -n 1 | sed 's/,/\n/g' | wc -l`
-+MENU_CUSTOM_SIZE=`grep MENU_CUSTOM src/custom.h | tr -s ' ' ' ' | sed 's/^ //' | grep -v ^\/\/ | tail -n 1 | tr ',' '\n' | wc -l`
- echo \#define MENU_ENCODING_LIST_SIZE $MENU_ENCODING_LIST_SIZE >> $NEWCONFFILE
- echo \#define TOGGLE_BG_ORDER_SIZE $TOGGLE_BG_ORDER_SIZE | grep -v ' 0$' >> $NEWCONFFILE
- echo \#define MENU_CUSTOM_SIZE $MENU_CUSTOM_SIZE >> $NEWCONFFILE
+-MENU_DEFAULT_ENCODING=`grep MENU_ENCODING_LIST src/custom.h | sed -e 's/\t/ /g' -e 's/^\( \)*//g' | grep -v ^\/\/ | tail -n 1 | grep 'Default Encoding'`
+-MENU_ENCODING_LIST_SIZE=`grep MENU_ENCODING_LIST src/custom.h | sed -e 's/\t/ /g' -e 's/^\( \)*//g' | grep -v ^\/\/ | tail -n 1 | tr ',' '\n' | grep '"' | wc -l`
+-TOGGLE_BG_ORDER_SIZE=`grep TOGGLE_BG_ORDER src/custom.h | sed -e 's/\t/ /g' -e 's/^\( \)*//g' | grep -v ^\/\/ | tail -n 1 | tr ',' '\n' | grep '"' | wc -l`
+-MENU_CUSTOM_SIZE=`grep MENU_CUSTOM src/custom.h | sed -e 's/\t/ /g' -e 's/^\( \)*//g' | grep -v ^\/\/ | tail -n 1 | tr ',' '\n' | grep '"' | wc -l`
+-UPPER_PROGRAM_NAME=`grep PROGRAM_NAME src/custom.h | sed -e 's/\t/ /g' -e 's/^\( \)*//g' | grep -v ^\/\/ | tail -n 1 | cut -d '"' -f 2 | sed 's/\b\(.\)/\u\1/'`
++MENU_DEFAULT_ENCODING=`grep MENU_ENCODING_LIST src/custom.h | tr '\t' ' ' | sed -e 's/^\( \)*//g' | grep -v ^\/\/ | tail -n 1 | grep 'Default Encoding'`
++MENU_ENCODING_LIST_SIZE=`grep MENU_ENCODING_LIST src/custom.h | sed -e 's/^\( \)*//g' | grep -v ^\/\/ | tail -n 1 | tr '\t,' ' \n' | grep '"' | wc -l`
++TOGGLE_BG_ORDER_SIZE=`grep TOGGLE_BG_ORDER src/custom.h | sed -e 's/^\( \)*//g' | grep -v ^\/\/ | tail -n 1 | tr '\t,' ' \n' | grep '"' | wc -l`
++MENU_CUSTOM_SIZE=`grep MENU_CUSTOM src/custom.h | sed -e 's/^\( \)*//g' | grep -v ^\/\/ | tail -n 1 | tr '\t,' ' \n' | grep '"' | wc -l`
++UPPER_PROGRAM_NAME=`grep PROGRAM_NAME src/custom.h | sed -e 's/^\( \)*//g' | grep -v ^\/\/ | tail -n 1 | cut -d '"' -f 2 | tr '[:lower:]' '[:upper:]'`
+ [ "$MENU_DEFAULT_ENCODING" != "" ] && echo \#define MENU_DEFAULT_ENCODING 1 >> $CONFFILE
+ [ "$MENU_ENCODING_LIST_SIZE" != "0" ] && echo \#define MENU_ENCODING_LIST_SIZE $MENU_ENCODING_LIST_SIZE >> $CONFFILE
+ [ "$TOGGLE_BG_ORDER_SIZE" != "0" ] && echo \#define TOGGLE_BG_ORDER_SIZE $TOGGLE_BG_ORDER_SIZE >> $CONFFILE
+@@ -52,7 +52,7 @@
+ [ "$TOGGLE_BG_NO_BACKGROUND" != "" ] && echo \#define TOGGLE_BG_NO_BACKGROUND 1 >> $CONFFILE
+ [ "$TOGGLE_BG_OPACITY" != "" ] && echo \#define TOGGLE_BG_OPACITY 1 >> $CONFFILE
+
+-MENU_CUSTOM_DEFINE=`grep MENU_CUSTOM src/custom.h | sed -e 's/\t/ /g' -e 's/^\( \)*//g' | grep -v ^\/\/ | tail -n 1`
++MENU_CUSTOM_DEFINE=`grep MENU_CUSTOM src/custom.h | sed -e 's/^\( \)*//g' | grep -v ^\/\/ | tail -n 1`
+
+ MENU_COPY=`echo $MENU_CUSTOM_DEFINE | grep Copy`
+ [ "$MENU_COPY" != "" ] && echo \#define MENU_COPY 1 >> $CONFFILE
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list