o Update to 4.2.0

o Update DESCR and fix typo
o Add WITH_RSVG knob for librsvg2 port support
o Fix build on 4-STABLE branch [1]
o PREFIX safeness using both gnomehack and gnomeprefix

PR:		53059
Submitted by:	maintainer,
		Sergey Osokin [1]

5 files changed, 40 insertions, 18 deletions

diff --git a/deskutils/logjam2/Makefile b/deskutils/logjam2/Makefile
index c0315e698498..d6d618b31ecb 100644
--- a/deskutils/logjam2/Makefile
+++ b/deskutils/logjam2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	logjam2
-PORTVERSION=	4.1.2
+PORTVERSION=	4.2.0
 CATEGORIES=	deskutils
 MASTER_SITES=	http://logjam.danga.com/download/
 DISTNAME=	logjam-${PORTVERSION}
@@ -21,33 +21,43 @@ MAN1=		logjam.1
 USE_GMAKE=	yes
 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
+USE_GNOME=	gnomehack \
+		gnomeprefix \
+		gtk20 \
+		libxml2
+CONFIGURE_ARGS=	--program-transform-name="s/$$//"
+
+.if defined(WITH_GTKSPELL)
+LIB_DEPENDS+=	gtkspell.0:${PORTSDIR}/textproc/gtkspell2
 .else
-CONFIGURE_ARGS+=        --without-gtkspell
+CONFIGURE_ARGS+=	--without-gtkspell
 .endif
 
-.ifdef(WITH_XMMS)
+.if defined(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
+.if defined(WITH_GTKHTML)
+LIB_DEPENDS+=	gtkhtml-3:${PORTSDIR}/www/gtkhtml3
 .else
 CONFIGURE_ARGS+=	--without-gtkhtml
 .endif
 
+.if defined(WITH_RSVG)
+USE_GNOME+=	librsvg2
+.else
+CONFIGURE_ARGS+=	--without-librsvg
+.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} "		WITH_RSVG	Enable librsvg"
 	@${ECHO_MSG} ""
 
 .include <bsd.port.mk>
diff --git a/deskutils/logjam2/distinfo b/deskutils/logjam2/distinfo
index 513da9b33f0a..0bcebccfcf7c 100644
--- a/deskutils/logjam2/distinfo
+++ b/deskutils/logjam2/distinfo
@@ -1 +1 @@
-MD5 (logjam-4.1.2.tar.gz) = bc66aa66be412819bc862e58c11461ff
+MD5 (logjam-4.2.0.tar.gz) = 4b014559874da6dcc22b0436130dfbf2
diff --git a/deskutils/logjam2/files/patch-aa-remote.c b/deskutils/logjam2/files/patch-aa-remote.c
new file mode 100644
index 000000000000..406814e904c9
--- /dev/null
+++ b/deskutils/logjam2/files/patch-aa-remote.c
@@ -0,0 +1,12 @@
+--- src/remote.orig	Sat Jun  7 17:39:10 2003
++++ src/remote.c	Sat Jun  7 17:39:20 2003
+@@ -14,8 +14,8 @@
+ 
+ #include <gtk/gtk.h>
+ #ifndef G_OS_WIN32
+-#include <sys/select.h>
+ #include <sys/types.h>
++#include <sys/select.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
+ #include <unistd.h>
diff --git a/deskutils/logjam2/pkg-descr b/deskutils/logjam2/pkg-descr
index e15f7d9d7b02..24d15377b9c4 100644
--- a/deskutils/logjam2/pkg-descr
+++ b/deskutils/logjam2/pkg-descr
@@ -3,6 +3,7 @@ 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.
+site running LiveJournal, not just www.livejournal.com, and can create
+offline copies of your journal.
 
-It can read WWW: http://logjam.danga.com/
+WWW: http://logjam.danga.com/
diff --git a/deskutils/logjam2/pkg-plist b/deskutils/logjam2/pkg-plist
index 74543c8068b2..84d0c204cb86 100644
--- a/deskutils/logjam2/pkg-plist
+++ b/deskutils/logjam2/pkg-plist
@@ -1,6 +1,5 @@
 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
+share/gnome/pixmaps/logjam_goat.png
+share/gnome/pixmaps/logjam_ljcomm.png
+share/gnome/pixmaps/logjam_ljuser.png
+share/gnome/pixmaps/logjam_pencil.png