ports/52307: Update deskutils/logjam2: upgrade and fix configure error

[Mike Patterson]

>Number:         52307
>Category:       ports
>Synopsis:       Update deskutils/logjam2: upgrade and fix configure error
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu May 15 20:20:06 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Mike Patterson
>Release:        FreeBSD 5.0-RELEASE-p7 i386
>Organization:
>Environment:
System: FreeBSD comrie 5.0-RELEASE-p7 FreeBSD 5.0-RELEASE-p7 #0: Mon Apr 21 10:14:44 EDT 2003 root at comrie:/usr/obj/usr/src/sys/COMRIE i386


	
>Description:
	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.
>How-To-Repeat:
>Fix:
	Apply diff.  Enjoy.

--- logjam412diff begins here ---
diff -ruN logjam2/Makefile logjam2-4.1.2/Makefile
--- logjam2/Makefile	Thu May 15 22:59:17 2003
+++ logjam2-4.1.2/Makefile	Thu May 15 23:00:08 2003
@@ -2,25 +2,52 @@
 # Date created:				30 Oct 2002
 # Whom:					michael johnson <ahze at rgv.net>
 #
-# $FreeBSD: ports/deskutils/logjam2/Makefile,v 1.3 2003/02/21 11:15:55 knu Exp $
+# $FreeBSD: ports/deskutils/logjam2/Makefile,v 1.4 2003/04/24 23:04:44 arved Exp $
 #
 
 PORTNAME=	logjam2
-PORTVERSION=	4.0.0
+PORTVERSION=	4.1.2
 CATEGORIES=	deskutils
 MASTER_SITES=	http://logjam.danga.com/download/
 DISTNAME=	logjam-${PORTVERSION}
 
-MAINTAINER=	ahze at rgv.net
-COMMENT=	A GTK interface to user journals on www.livejournal.com
+MAINTAINER=	mike.patterson at unb.ca
+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_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 -ruN logjam2/distinfo logjam2-4.1.2/distinfo
--- logjam2/distinfo	Thu May 15 22:59:17 2003
+++ logjam2-4.1.2/distinfo	Thu May 15 22:56:15 2003
@@ -1 +1 @@
-MD5 (logjam-4.0.0.tar.gz) = 8bc409c821c08ed2955feb3423aed7d7
+MD5 (logjam-4.1.2.tar.gz) = bc66aa66be412819bc862e58c11461ff
diff -ruN logjam2/pkg-descr logjam2-4.1.2/pkg-descr
--- logjam2/pkg-descr	Thu May 15 22:59:17 2003
+++ logjam2-4.1.2/pkg-descr	Thu May 15 22:57:58 2003
@@ -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/
--- logjam412diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: