From mpatters@comrie.math.uwaterloo.ca  Thu May 15 20:13:11 2003
Return-Path: <mpatters@comrie.math.uwaterloo.ca>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2459C37B401
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 15 May 2003 20:13:11 -0700 (PDT)
Received: from comrie.uwaterloo.ca (comrie.math.uwaterloo.ca [129.97.216.108])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 51C0543FA3
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 15 May 2003 20:13:10 -0700 (PDT)
	(envelope-from mpatters@comrie.math.uwaterloo.ca)
Received: from comrie.uwaterloo.ca (localhost [127.0.0.1])
	by comrie.uwaterloo.ca (8.12.6p2/8.12.6) with ESMTP id h4G3D8nx017395
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 15 May 2003 23:13:08 -0400 (EDT)
	(envelope-from mpatters@comrie.math.uwaterloo.ca)
Received: (from mpatters@localhost)
	by comrie.uwaterloo.ca (8.12.6p2/8.12.6/Submit) id h4G3D8cx017394;
	Thu, 15 May 2003 23:13:08 -0400 (EDT)
Message-Id: <200305160313.h4G3D8cx017394@comrie.uwaterloo.ca>
Date: Thu, 15 May 2003 23:13:08 -0400 (EDT)
From: Mike Patterson <mike.patterson@unb.ca>
Reply-To: Mike Patterson <mike.patterson@unb.ca>
To: FreeBSD-gnats-submit@freebsd.org
Subject: Update deskutils/logjam2: upgrade and fix configure error
X-Send-Pr-Version: 3.113

>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:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu May 15 20:20:06 PDT 2003
>Closed-Date:    Wed Jun 04 22:43:05 PDT 2003
>Last-Modified:  Wed Jun 04 22:43:05 PDT 2003
>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@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@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@rgv.net
-COMMENT=	A GTK interface to user journals on www.livejournal.com
+MAINTAINER=	mike.patterson@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:
State-Changed-From-To: open->	 feedback 
State-Changed-By: arved 
State-Changed-When: Mon May 19 04:37:10 PDT 2003 
State-Changed-Why:  
Your diff did not apply. 

Make sure, you diff against the latest port. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=52307 

From: Mike <mike.patterson@unb.ca>
To: freebsd-gnats-submit@freebsd.org
Cc:  
Subject: Re: ports/52307: Update deskutils/logjam2: upgrade and fix configure error
Date: Tue, 20 May 2003 15:25:09 -0400

 --x+6KMIRAuhnl3hBn
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 argh, sorry about that!
 
 Don't know if GNATS prefers attachments or inline for diffs, but... see
 attachment for diff.
 
 Mike
 
 --x+6KMIRAuhnl3hBn
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename=lj412diff
 
 diff -ruN logjam2/Makefile logjam2-4.1.2/Makefile
 --- logjam2/Makefile	Sun May 18 13:59:24 2003
 +++ logjam2-4.1.2/Makefile	Thu May 15 23:00:08 2003
 @@ -2,28 +2,52 @@
  # Date created:				30 Oct 2002
  # Whom:					michael johnson <ahze@rgv.net>
  #
 -# $FreeBSD: ports/deskutils/logjam2/Makefile,v 1.5 2003/05/18 17:59:24 marcus Exp $
 +# $FreeBSD: ports/deskutils/logjam2/Makefile,v 1.4 2003/04/24 23:04:44 arved Exp $
  #
  
  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 -ruN logjam2/distinfo logjam2-4.1.2/distinfo
 --- logjam2/distinfo	Thu Apr 24 19:04:44 2003
 +++ logjam2-4.1.2/distinfo	Thu May 15 22:56:15 2003
 @@ -1 +1 @@
 -MD5 (logjam-4.1.0.tar.gz) = 35770931d859a137bfdfd00286016a44
 +MD5 (logjam-4.1.2.tar.gz) = bc66aa66be412819bc862e58c11461ff
 diff -ruN logjam2/pkg-descr logjam2-4.1.2/pkg-descr
 --- logjam2/pkg-descr	Wed Jan 15 23:26:24 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/
 
 --x+6KMIRAuhnl3hBn--
State-Changed-From-To: feedback->closed 
State-Changed-By: edwin 
State-Changed-When: Wed Jun 4 22:42:51 PDT 2003 
State-Changed-Why:  
Commited, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=52307 
>Unformatted:
