- Updated to 0.4.7.1 (http://www.calno.com/evilvte/ChangeLog)

PR:		ports/151895
Submitted by:	Aragon Gouveia <aragon at phat dot za dot net> (maintainer)

4 files changed, 33 insertions, 69 deletions

diff --git a/x11/evilvte/Makefile b/x11/evilvte/Makefile
index b5e5fc653712..78a487287878 100644
--- a/x11/evilvte/Makefile
+++ b/x11/evilvte/Makefile
@@ -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 @@ pre-everything::
 
 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 --git a/x11/evilvte/distinfo b/x11/evilvte/distinfo
index 98c494eb1ce1..4b2b8e407e65 100644
--- a/x11/evilvte/distinfo
+++ b/x11/evilvte/distinfo
@@ -1,3 +1,3 @@
-MD5 (evilvte-0.4.6.tar.gz) = 323155af3f511b0acc0a526c0d5cce1f
-SHA256 (evilvte-0.4.6.tar.gz) = 08f2836ba45ffbb8af4102cc9033cda2e1e7790714175ea1d5befcf8aa2e2cf1
-SIZE (evilvte-0.4.6.tar.gz) = 38170
+MD5 (evilvte-0.4.7.1.tar.gz) = c77cb47e3ca6dc53f81474ded7e162f1
+SHA256 (evilvte-0.4.7.1.tar.gz) = a47ad312fde918a7064f37a933a66eeb8c252190224d06a8b804911ad5cdacf0
+SIZE (evilvte-0.4.7.1.tar.gz) = 39142
diff --git a/x11/evilvte/files/patch-evilvte.c b/x11/evilvte/files/patch-evilvte.c
deleted file mode 100644
index 22340178413b..000000000000
--- a/x11/evilvte/files/patch-evilvte.c
+++ /dev/null
@@ -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 --git a/x11/evilvte/files/patch-src-process.sh b/x11/evilvte/files/patch-src-process.sh
index 95f333eb1286..6a3f7c392f46 100644
--- a/x11/evilvte/files/patch-src-process.sh
+++ b/x11/evilvte/files/patch-src-process.sh
@@ -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