5 files changed, 75 insertions, 8 deletions

diff --git a/x11/evilvte/Makefile b/x11/evilvte/Makefile
index 4994f1e1900a..973c5009e1ba 100644
--- a/x11/evilvte/Makefile
+++ b/x11/evilvte/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	evilvte
-PORTVERSION=	0.4.5
-PORTREVISION=	2
+PORTVERSION=	0.4.6
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://www.calno.com/${PORTNAME}/ \
 		LOCAL/glarkin
@@ -16,6 +15,8 @@ MAINTAINER=	aragon@phat.za.net
 COMMENT=	A VTE based, super lightweight terminal emulator
 
 USE_GMAKE=	yes
+HAS_CONFIGURE=	yes
+ALL_TARGET=	evilvte
 USE_GNOME=	vte
 
 MAN1=		evilvte.1 showvte.1
@@ -31,8 +32,8 @@ pre-everything::
 .endif
 
 post-patch:
-	# disable man page installation
-	@${REINPLACE_CMD} -e '53,54 d' ${WRKSRC}/Makefile
+#	 disable man page installation
+	@${REINPLACE_CMD} -e '29,30 d' ${WRKSRC}/Makefile
 .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 fd59a1ee2a41..98c494eb1ce1 100644
--- a/x11/evilvte/distinfo
+++ b/x11/evilvte/distinfo
@@ -1,3 +1,3 @@
-MD5 (evilvte-0.4.5.tar.gz) = 3193ea2fce163a8a99ce876c4e9b2d28
-SHA256 (evilvte-0.4.5.tar.gz) = c9dccc8e59cfd58fccd6fb88fb07070f2722b755ab7e18f7717533342f49f60f
-SIZE (evilvte-0.4.5.tar.gz) = 37088
+MD5 (evilvte-0.4.6.tar.gz) = 323155af3f511b0acc0a526c0d5cce1f
+SHA256 (evilvte-0.4.6.tar.gz) = 08f2836ba45ffbb8af4102cc9033cda2e1e7790714175ea1d5befcf8aa2e2cf1
+SIZE (evilvte-0.4.6.tar.gz) = 38170
diff --git a/x11/evilvte/files/patch-evilvte.c b/x11/evilvte/files/patch-evilvte.c
new file mode 100644
index 000000000000..22340178413b
--- /dev/null
+++ b/x11/evilvte/files/patch-evilvte.c
@@ -0,0 +1,51 @@
+--- 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
new file mode 100644
index 000000000000..95f333eb1286
--- /dev/null
+++ b/x11/evilvte/files/patch-src-process.sh
@@ -0,0 +1,14 @@
+--- 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
+ 
+-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
diff --git a/x11/evilvte/pkg-plist b/x11/evilvte/pkg-plist
index 7e9734e523fb..9c337cb6207d 100644
--- a/x11/evilvte/pkg-plist
+++ b/x11/evilvte/pkg-plist
@@ -2,5 +2,6 @@ bin/evilvte
 bin/showvte
 share/applications/evilvte.desktop
 share/pixmaps/evilvte.png
-share/pixmaps/evilvte.xpm
+share/gnome-control-center/default-apps/evilvte.xml
 @dirrmtry share/applications
+@dirrmtry share/gnome-control-center/default-apps