ports/53059: MAINT UPDATE: update logjam2, fix build error under 4.8

[Mike Patterson]

>Number:         53059
>Category:       ports
>Synopsis:       MAINT UPDATE: update logjam2, fix build error under 4.8
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jun 08 09:20:13 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Mike Patterson
>Release:        FreeBSD 5.1-RC i386
>Organization:
>Environment:
System: FreeBSD comrie 5.1-RC FreeBSD 5.1-RC #0: Wed Jun 4 15:34:57 EDT 2003 root at comrie:/usr/obj/usr/src/sys/COMRIE i386

>Description:
* update to latest upstream release
* update pkg-descr and fix typo
* add a knob for librsvg
* patch to build under 4.8-STABLE (thanks to Sergey Osokin)

>How-To-Repeat:

>Fix:
Apply diff, enjoy new features.

--- logjam2-412to420 begins here ---
diff -ruN logjam2/Makefile logjam2-420/Makefile
--- logjam2/Makefile	Thu Jun  5 01:42:43 2003
+++ logjam2-420/Makefile	Sun Jun  8 11:36:17 2003
@@ -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}
@@ -22,32 +22,39 @@
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20 libxml2
-CONFIGURE_ARGS= --program-transform-name="s/$$//"
+CONFIGURE_ARGS=	--program-transform-name="s/$$//"
 
-.ifdef(WITH_GTKSPELL)
-LIB_DEPENDS+=   gtkspell.0:${PORTSDIR}/textproc/gtkspell2
+.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 -ruN logjam2/distinfo logjam2-420/distinfo
--- logjam2/distinfo	Thu Jun  5 01:42:43 2003
+++ logjam2-420/distinfo	Sat Jun  7 14:33:55 2003
@@ -1 +1 @@
-MD5 (logjam-4.1.2.tar.gz) = bc66aa66be412819bc862e58c11461ff
+MD5 (logjam-4.2.0.tar.gz) = 4b014559874da6dcc22b0436130dfbf2
diff -ruN logjam2/files/patch-aa-remote.c logjam2-420/files/patch-aa-remote.c
--- logjam2/files/patch-aa-remote.c	Wed Dec 31 19:00:00 1969
+++ logjam2-420/files/patch-aa-remote.c	Sat Jun  7 17:40:17 2003
@@ -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 -ruN logjam2/pkg-descr logjam2-420/pkg-descr
--- logjam2/pkg-descr	Thu Jun  5 01:42:43 2003
+++ logjam2-420/pkg-descr	Sun Jun  8 11:38:35 2003
@@ -3,6 +3,7 @@
 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/
--- logjam2-412to420 ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: