5 files changed, 40 insertions, 6 deletions

diff --git a/x11/stjerm/Makefile b/x11/stjerm/Makefile
index 2c744c125a72..e261b0a81505 100644
--- a/x11/stjerm/Makefile
+++ b/x11/stjerm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	stjerm
-PORTVERSION=	0.14
+PORTVERSION=	0.15
 CATEGORIES=	x11
 MASTER_SITES=	http://stjerm-terminal.googlecode.com/files/
 
diff --git a/x11/stjerm/distinfo b/x11/stjerm/distinfo
index 216a6e556b71..f3e27bdb5388 100644
--- a/x11/stjerm/distinfo
+++ b/x11/stjerm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (stjerm-0.14.tar.gz) = 1c2f121c0f81a6ca70c9baf9d9f2e65637015f927709d6290d896b13370b3249
-SIZE (stjerm-0.14.tar.gz) = 28545
+SHA256 (stjerm-0.15.tar.gz) = c1b17dbd95ba7a40c86dbd7bc409a90ce79eb8e3b0e49bd1c741866e1d99c263
+SIZE (stjerm-0.15.tar.gz) = 29155
diff --git a/x11/stjerm/files/patch-src_config.c b/x11/stjerm/files/patch-src_config.c
index 26e46f4f14b8..aa87a4072b9d 100644
--- a/x11/stjerm/files/patch-src_config.c
+++ b/x11/stjerm/files/patch-src_config.c
@@ -1,6 +1,18 @@
---- src/config.c.orig	2011-03-25 16:35:40.389707429 -0500
-+++ src/config.c	2011-03-25 16:41:20.529584111 -0500
-@@ -546,7 +546,7 @@ void conf_init(void)
+--- src/config.c.orig	2011-07-19 16:52:33.000000000 -0500
++++ src/config.c	2011-10-12 17:05:50.164711868 -0500
+@@ -146,7 +146,11 @@ pid_t get_stjerm_pid(void)
+     char buffer[100];
+     char **list;
+     int i = 0;
++#ifdef __FreeBSD__
++    FILE *p = popen("pgrep stjerm", "r");
++#else
+     FILE *p = popen("pidof stjerm", "r");
++#endif
+     
+     if(p == NULL)
+     {
+@@ -552,7 +556,7 @@ void conf_init(void)
          exit(1);
      }
  
diff --git a/x11/stjerm/files/patch-src_mainwindow.c b/x11/stjerm/files/patch-src_mainwindow.c
new file mode 100644
index 000000000000..4f039bbe950a
--- /dev/null
+++ b/x11/stjerm/files/patch-src_mainwindow.c
@@ -0,0 +1,11 @@
+--- src/mainwindow.c~	2011-07-19 16:52:33.000000000 -0500
++++ src/mainwindow.c	2011-10-12 17:26:33.324269165 -0500
+@@ -322,7 +322,7 @@ void mainwindow_create_tab(void)
+     }
+ 
+     char buffer [100];
+-    sprintf(buffer, "%s %d", conf_get_term_name(), activetab + 1);
++    sprintf(buffer, "%s %d", conf_get_term_name(), tabcount);
+     GtkLabel* tmp_label = GTK_LABEL(gtk_label_new(buffer));
+ 
+     if(conf_get_opacity() < 100)
diff --git a/x11/stjerm/files/patch-src_term.c b/x11/stjerm/files/patch-src_term.c
new file mode 100644
index 000000000000..36c6cb12d2cb
--- /dev/null
+++ b/x11/stjerm/files/patch-src_term.c
@@ -0,0 +1,11 @@
+--- src/term.c~	2011-07-19 16:52:33.000000000 -0500
++++ src/term.c	2011-10-12 17:17:37.148128623 -0500
+@@ -230,7 +230,7 @@ static void term_app_request(VteTerminal
+ 
+ static void term_fork_command(VteTerminal *term, char *cmd)
+ {
+-    #if VTE_CHECK_VERSION(0,25,0)
++    #if 0
+     char **argv = NULL;
+     
+     g_shell_parse_argv(cmd, NULL, &argv, NULL);