7 files changed, 13 insertions, 49 deletions

diff --git a/deskutils/logjam/Makefile b/deskutils/logjam/Makefile
index 1394cc16ab67..09cd5d6d761a 100644
--- a/deskutils/logjam/Makefile
+++ b/deskutils/logjam/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	logjam
-PORTVERSION=	4.4.0
-PORTREVISION=	5
+PORTVERSION=	4.4.1
 CATEGORIES=	deskutils
 MASTER_SITES=	http://logjam.danga.com/download/
 
diff --git a/deskutils/logjam/distinfo b/deskutils/logjam/distinfo
index 9d4f58c19e3e..173c60452d1e 100644
--- a/deskutils/logjam/distinfo
+++ b/deskutils/logjam/distinfo
@@ -1,4 +1,4 @@
-MD5 (logjam-4.4.0.tar.bz2) = 7ff366dee32d354338132bfd5c5adb46
-SIZE (logjam-4.4.0.tar.bz2) = 604310
+MD5 (logjam-4.4.1.tar.bz2) = f16f68a4a6b15fb5bb650614f3ff081c
+SIZE (logjam-4.4.1.tar.bz2) = 715636
 MD5 (logjam_link.c.diff) = 944d94d47e0b3252098b3738dd5c8432
 SIZE (logjam_link.c.diff) = 2991
diff --git a/deskutils/logjam/files/patch-src-get_cmd_out.c b/deskutils/logjam/files/patch-src-get_cmd_out.c
new file mode 100644
index 000000000000..161746150a9e
--- /dev/null
+++ b/deskutils/logjam/files/patch-src-get_cmd_out.c
@@ -0,0 +1,10 @@
+--- src/get_cmd_out.c.orig	Sun Jun  5 22:09:21 2005
++++ src/get_cmd_out.c	Sun Jun  5 22:09:38 2005
+@@ -11,6 +11,7 @@
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <errno.h>
++#include <signal.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ #include "util.h"
diff --git a/deskutils/logjam/files/patch-src::cmdline.c b/deskutils/logjam/files/patch-src::cmdline.c
deleted file mode 100644
index 3b5d9c51ecd5..000000000000
--- a/deskutils/logjam/files/patch-src::cmdline.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/cmdline.c.orig	Wed Mar 31 05:03:06 2004
-+++ src/cmdline.c	Mon May 10 00:19:23 2004
-@@ -13,6 +13,7 @@
- #endif
- 
- #ifdef HAVE_REGEX_H
-+#include <sys/types.h>
- #include <regex.h>
- #endif
- 
diff --git a/deskutils/logjam/files/patch-src::get_cmd_out.c b/deskutils/logjam/files/patch-src::get_cmd_out.c
deleted file mode 100644
index 91f21b18491e..000000000000
--- a/deskutils/logjam/files/patch-src::get_cmd_out.c
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/get_cmd_out.c.orig  Sun May  9 16:29:56 2004
-+++ src/get_cmd_out.c       Sun May  9 16:30:55 2004
-@@ -12,6 +12,7 @@
- #include <unistd.h>
- #include <errno.h>
- #include <sys/types.h>
-+#include <signal.h>
- #include <sys/wait.h>
- #include "util.h"
diff --git a/deskutils/logjam/files/patch-src::network-libxml.c b/deskutils/logjam/files/patch-src::network-libxml.c
deleted file mode 100644
index b9f6ddd59cb4..000000000000
--- a/deskutils/logjam/files/patch-src::network-libxml.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/network-libxml.c.orig	Thu Aug 12 09:48:05 2004
-+++ src/network-libxml.c	Thu Aug 12 09:48:15 2004
-@@ -72,7 +72,7 @@
- 		g_set_error(err, NET_ERROR, NET_ERROR_PROTOCOL,
- 				_("File not found."));
- 		goto out;
--	default:
-+	default:;
- 	}
- 
- 	response = g_string_new(NULL);
diff --git a/deskutils/logjam/files/patch-src::sync.c b/deskutils/logjam/files/patch-src::sync.c
deleted file mode 100644
index 5d010136d36a..000000000000
--- a/deskutils/logjam/files/patch-src::sync.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- protocol/liblivejournal/livejournal/sync.c.old	Fri Jun 18 14:57:51 2004
-+++ protocol/liblivejournal/livejournal/sync.c	Fri Jun 18 14:58:20 2004
-@@ -33,8 +33,10 @@
- static int
- entry_date_compare_func(const void *a, const void *b) {
- 	/* struct tm* cast needed to un-constify the times passed to mktime. */
--	const LJEntry *entrya = a; time_t timea = mktime((struct tm*)&entrya->time);
--	const LJEntry *entryb = b; time_t timeb = mktime((struct tm*)&entryb->time);
-+	const LJEntry *entrya = *(LJEntry **)a;
-+	const LJEntry *entryb = *(LJEntry **)b;
-+	time_t timea = mktime((struct tm*)&entrya->time);
-+	time_t timeb = mktime((struct tm*)&entryb->time);
- 	/* mktime actually converts the times to local time, which isn't
- 	 * quite correct, but since we're comparing times directly like this
- 	 * it should still sort the same way and timegm is potentially slower. */