From 3b5f38aeee4589a479b253c9413dbd65179b2912 Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Tue, 14 Dec 2010 22:50:58 +0000
Subject: [PATCH] - update logjam to 4.6.1

---
 misc/logjam/Makefile  | 42 ++++++++++++++++++++++++------------------
 misc/logjam/distinfo  | 10 +++++-----
 misc/logjam/pkg/DESCR |  3 +--
 3 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/misc/logjam/Makefile b/misc/logjam/Makefile
index 5689ce2de7b..f3dd7e65376 100644
--- a/misc/logjam/Makefile
+++ b/misc/logjam/Makefile
@@ -1,12 +1,11 @@
-# $OpenBSD: Makefile,v 1.29 2010/11/19 07:23:12 espie Exp $
+# $OpenBSD: Makefile,v 1.30 2010/12/14 22:50:58 jasper Exp $
 
-COMMENT =	gtk livejournal client
+COMMENT =	GTK client for LiveJournal
 
-DISTNAME =	logjam-4.5.3
-REVISION =	5
+DISTNAME =	logjam-4.6.1
 CATEGORIES =	misc x11
 
-HOMEPAGE =	http://logjam.danga.com/
+HOMEPAGE =	http://andy-shev.github.com/LogJam/
 
 # GPLv2
 PERMIT_PACKAGE_CDROM =   Yes
@@ -14,32 +13,39 @@ PERMIT_PACKAGE_FTP =     Yes
 PERMIT_DISTFILES_CDROM = Yes
 PERMIT_DISTFILES_FTP =   Yes
 
-WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
-WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo crypto expat
-WANTLIB += fontconfig freetype gio-2.0 glib-2.0 gmodule-2.0
-WANTLIB += gobject-2.0 gthread-2.0 idn m pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs ssl xcb z
-WANTLIB += gdk_pixbuf-2.0 gtk-x11-2.0 gdk-x11-2.0 sqlite3 curl xml2
+WANTLIB += GL ORBit-2 X11 Xau Xcomposite Xcursor Xdamage Xdmcp
+WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0
+WANTLIB += c cairo dbus-1 dbus-glib-1 drm enchant expat fontconfig
+WANTLIB += freetype gailutil gconf-2 gcrypt gdk-x11-2.0 gdk_pixbuf-2.0
+WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gnutls gobject-2.0 gpg-error
+WANTLIB += gthread-2.0 gtk-x11-2.0 gtkhtml-3.14 m pango-1.0 pangocairo-1.0
+WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs
+WANTLIB += soup-2.4 sqlite3 stdc++ tasn1 xcb xcb-render xcb-shm
+WANTLIB += xml2 z
 
-MASTER_SITES =	http://logjam.danga.com/download/
+MASTER_SITES =	${HOMEPAGE}/download/
 EXTRACT_SUFX =	.tar.bz2
 
 MODULES =	devel/gettext \
 		textproc/intltool
 
-LIB_DEPENDS =	x11/gtk+2 \
-		databases/sqlite3 \
-		net/curl \
-		textproc/libxml
+LIB_DEPENDS =	databases/sqlite3 \
+		devel/libsoup \
+		textproc/libxml \
+		www/gtkhtml3
 
 RUN_DEPENDS =	devel/desktop-file-utils
 
 USE_GROFF =		Yes
+USE_GMAKE =		Yes
 CONFIGURE_STYLE =	gnu
-CONFIGURE_ARGS =	--without-gnome \
+CONFIGURE_ARGS =	--with-gtkhtml314 \
+			--with-libsoup \
+			--with-sqlite3 \
 			--without-librsvg \
 			--without-gtkspell \
-			--without-xmms
+			--without-xmms \
+			--without-banshee
 
 CONFIGURE_ENV =		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/misc/logjam/distinfo b/misc/logjam/distinfo
index a4f6321847b..8fb73f28c0c 100644
--- a/misc/logjam/distinfo
+++ b/misc/logjam/distinfo
@@ -1,5 +1,5 @@
-MD5 (logjam-4.5.3.tar.bz2) = SAksAOH0Dr7kMbTgBxricw==
-RMD160 (logjam-4.5.3.tar.bz2) = LINBeK43yVYhgUuBhSxSjyELrtI=
-SHA1 (logjam-4.5.3.tar.bz2) = Bc/pKwRpb6S3229L2R4/W1l1e+o=
-SHA256 (logjam-4.5.3.tar.bz2) = rnbCLDH3znXfoj2UUQsEI7zzAqYi1NI5HEMqEnxQAYQ=
-SIZE (logjam-4.5.3.tar.bz2) = 748831
+MD5 (logjam-4.6.1.tar.bz2) = cEtosporo42mmY4xIIgqpA==
+RMD160 (logjam-4.6.1.tar.bz2) = 1sRkRUoJaQxa0dMtgeMnQEukngs=
+SHA1 (logjam-4.6.1.tar.bz2) = NAqnpEd1U65A9QKOFi1fGmL1eVw=
+SHA256 (logjam-4.6.1.tar.bz2) = F3UMbmrGEqHstZ6ulNznprpOlQ26gHSPp/Oe5bu5LS0=
+SIZE (logjam-4.6.1.tar.bz2) = 758876
diff --git a/misc/logjam/pkg/DESCR b/misc/logjam/pkg/DESCR
index a5d68cd8171..998638e9e81 100644
--- a/misc/logjam/pkg/DESCR
+++ b/misc/logjam/pkg/DESCR
@@ -1,3 +1,2 @@
 LogJam is a fully featured GTK2 client for journal sites using the LiveJournal
-project code (LiveJournal.com, DeadJournal.com, etc.). It will notice when 
-you're running xmms and add your current playlist to journal entries.
+project code (LiveJournal.com, DeadJournal.com, etc.).