Update deskutils/logjam2: upgrade and fix configure error

	Fix configure errors that broke the port.
	Disable XMMS/gtkhtml3/gtkspell by default, allow for enabling them.
	Upgrade from 4.1.0 to 4.1.2 from upstream sources.

PR:		ports/52307
Submitted by:	Mike Patterson <mike.patterson@unb.ca>

4 files changed, 43 insertions, 12 deletions

diff --git a/deskutils/logjam2/Makefile b/deskutils/logjam2/Makefile
index c1dee9ce138b..c0315e698498 100644
--- a/deskutils/logjam2/Makefile
+++ b/deskutils/logjam2/Makefile
@@ -6,24 +6,48 @@
 #
 
 PORTNAME=	logjam2
-PORTVERSION=	4.1.0
-PORTREVISION=	1
+PORTVERSION=	4.1.2
 CATEGORIES=	deskutils
 MASTER_SITES=	http://logjam.danga.com/download/
 DISTNAME=	logjam-${PORTVERSION}
 
 MAINTAINER=	mike.patterson@unb.ca
-COMMENT=	A GTK interface to user journals on www.livejournal.com
+COMMENT=	A GTK2 interface to livejournals, ie www.livejournal.com
 
-LIB_DEPENDS=	curl.2:${PORTSDIR}/ftp/curl \
-		gtkspell.0:${PORTSDIR}/textproc/gtkspell2
+LIB_DEPENDS=	curl.2:${PORTSDIR}/ftp/curl
 
 MAN1=		logjam.1
 
 USE_GMAKE=	yes
-USE_GNOME=	libxml2
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
+USE_GNOME=	gtk20 libxml2
 CONFIGURE_ARGS= --program-transform-name="s/$$//"
 
+.ifdef(WITH_GTKSPELL)
+LIB_DEPENDS+=   gtkspell.0:${PORTSDIR}/textproc/gtkspell2
+.else
+CONFIGURE_ARGS+=        --without-gtkspell
+.endif
+
+.ifdef(WITH_XMMS)
+LIB_DEPENDS+=	xmms.3:${PORTSDIR}/multimedia/xmms
+.else
+CONFIGURE_ARGS+=	--without-xmms
+.endif
+
+.ifdef(WITH_GTKHTML)
+LIB_DEPENDS+=	gtkhtml-3.0.1:${PORTSDIR}/www/gtkhtml3
+.else
+CONFIGURE_ARGS+=	--without-gtkhtml
+.endif
+
+pre-everything::
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "logjam has the following tunable option(s):"
+	@${ECHO_MSG} "		WITH_GTKSPELL	Enable spell checking"
+	@${ECHO_MSG} "		WITH_XMMS	Enable XMMS music detection"
+	@${ECHO_MSG} "		WITH_GTKHTML	Enable GTK HTML3 preview"
+	@${ECHO_MSG} ""
+
 .include <bsd.port.mk>
diff --git a/deskutils/logjam2/distinfo b/deskutils/logjam2/distinfo
index 5b7befc9e7cb..513da9b33f0a 100644
--- a/deskutils/logjam2/distinfo
+++ b/deskutils/logjam2/distinfo
@@ -1 +1 @@
-MD5 (logjam-4.1.0.tar.gz) = 35770931d859a137bfdfd00286016a44
+MD5 (logjam-4.1.2.tar.gz) = bc66aa66be412819bc862e58c11461ff
diff --git a/deskutils/logjam2/pkg-descr b/deskutils/logjam2/pkg-descr
index 5a6b2a106c4e..e15f7d9d7b02 100644
--- a/deskutils/logjam2/pkg-descr
+++ b/deskutils/logjam2/pkg-descr
@@ -1,6 +1,8 @@
-"LiveJournal.com... because you like to think other people care."
-LogJam is a GTK-2 client for LiveJournal.  It sits unobtrusively in the
-corner of your screen, waiting for you to have something worthwhile to
-tell the world.
+"LiveJournal.com... because you like to think other people care." LogJam is
+a GTK2 client for the LiveJournal API.  It sits unobtrusively in the corner
+of your screen, waiting for you to have something worthwhile to tell the
+world.  It can read your current music from XMMS, spellcheck with gtkspell,
+and offers preview capabilities using gtkhtml3.  It will interface with any
+site running LiveJournal, not just www.livejournal.com.
 
-WWW: http://logjam.danga.com/
+It can read WWW: http://logjam.danga.com/
diff --git a/deskutils/logjam2/pkg-plist b/deskutils/logjam2/pkg-plist
index 798f28ae126c..74543c8068b2 100644
--- a/deskutils/logjam2/pkg-plist
+++ b/deskutils/logjam2/pkg-plist
@@ -1 +1,6 @@
 bin/logjam
+share/pixmaps/logjam_goat.png
+share/pixmaps/logjam_pencil.png
+share/pixmaps/logjam_ljuser.png
+share/pixmaps/logjam_ljcomm.png
+@dirrm share/pixmaps