Chase the gtkhtml3 internal version change.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@8544 df743ca5-7f9a-e211-a948-0013205c9059

7 files changed, 140 insertions, 0 deletions

diff --git a/deskutils/logjam/Makefile b/deskutils/logjam/Makefile
new file mode 100644
index 000000000..8a71e02c6
--- /dev/null
+++ b/deskutils/logjam/Makefile
@@ -0,0 +1,74 @@
+# New ports collection makefile for:	logjam
+# Date created:		13 Aug 01
+# Whom:			alanp@unixpower.org
+#
+# $FreeBSD: ports/deskutils/logjam/Makefile,v 1.25 2006/12/13 12:41:22 roam Exp $
+#
+
+PORTNAME=	logjam
+PORTVERSION=	4.5.3
+PORTREVISION=	3
+CATEGORIES=	deskutils
+MASTER_SITES=	http://logjam.danga.com/download/
+
+MAINTAINER=	novel@FreeBSD.org
+COMMENT=	A GTK2 interface to livejournals, ie www.livejournal.com
+
+LIB_DEPENDS=	curl.4:${PORTSDIR}/ftp/curl
+
+MAN1=		logjam.1
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+WANT_GNOME=	yes
+USE_X_PREFIX=	yes
+GNU_CONFIGURE=	yes
+USE_GNOME=	gnomehack gnomeprefix gtk20 libxml2 intlhack
+CONFIGURE_ARGS=	--program-transform-name="s/$$//"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+
+.ifndef(WITHOUT_GTKSPELL)
+LIB_DEPENDS+=		gtkspell.0:${PORTSDIR}/textproc/gtkspell
+.else
+CONFIGURE_ARGS+=	--without-gtkspell
+.endif
+
+.if defined(WITH_SQLITE)
+CONFIGURE_ARGS+=	--with-sqlite3
+LIB_DEPENDS+=		sqlite3.8:${PORTSDIR}/databases/sqlite3
+.endif
+
+.if defined(WITH_XMMS)
+LIB_DEPENDS+=		xmms.4:${PORTSDIR}/multimedia/xmms
+PLIST_SUB+=		WITH_XMMS=""
+.else
+PLIST_SUB+=		WITH_XMMS="@comment "
+CONFIGURE_ARGS+=	--without-xmms
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if ${HAVE_GNOME:Mgtkhtml3}!=""
+USE_GNOME+=		gtkhtml3
+.else
+CONFIGURE_ARGS+=	--without-gtkhtml
+.endif
+
+.if ${HAVE_GNOME:Mlibrsvg2}!=""
+USE_GNOME+=		librsvg2
+.else
+CONFIGURE_ARGS+=	--without-librsvg
+.endif
+
+pre-everything::
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "logjam has the following tunable option(s):"
+	@${ECHO_MSG} "		WITHOUT_GTKSPELL	Disable spell checking"
+	@${ECHO_MSG} "		WITH_XMMS		Enable XMMS music detection"
+	@${ECHO_MSG} ""
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|libgtkhtml-3.0|libgtkhtml-3.18|g' ${WRKSRC}/configure
+
+.include <bsd.port.post.mk>
diff --git a/deskutils/logjam/distinfo b/deskutils/logjam/distinfo
new file mode 100644
index 000000000..b268677ee
--- /dev/null
+++ b/deskutils/logjam/distinfo
@@ -0,0 +1,3 @@
+MD5 (logjam-4.5.3.tar.bz2) = 48092c00e1f40ebee431b4e0071ae273
+SHA256 (logjam-4.5.3.tar.bz2) = ae76c22c31f7ce75dfa23d94510b0423bcf302a622d4d2391c432a127c500184
+SIZE (logjam-4.5.3.tar.bz2) = 748831
diff --git a/deskutils/logjam/files/patch-protocol-liblivejournal-livejournal-entry.c b/deskutils/logjam/files/patch-protocol-liblivejournal-livejournal-entry.c
new file mode 100644
index 000000000..c81d0ed04
--- /dev/null
+++ b/deskutils/logjam/files/patch-protocol-liblivejournal-livejournal-entry.c
@@ -0,0 +1,15 @@
+--- protocol/liblivejournal/livejournal/entry.c.orig	Thu Aug 17 01:40:10 2006
++++ protocol/liblivejournal/livejournal/entry.c	Thu Aug 17 01:45:24 2006
+@@ -610,6 +610,12 @@
+ 	else if (g_ascii_strcasecmp(key, "time") == 0) {
+ 		if (entry) lj_ljdate_to_tm(val, &entry->time);
+ 	}
++	else if (g_ascii_strcasecmp(key, "backdated") == 0) {
++		if (entry && val[0]) {
++			if (g_ascii_strcasecmp(val, "yes") == 0)
++				entry->backdated = TRUE;
++		}
++	}
+ 	else return FALSE;
+ 
+ 	return TRUE;
diff --git a/deskutils/logjam/files/patch-src-get_cmd_out.c b/deskutils/logjam/files/patch-src-get_cmd_out.c
new file mode 100644
index 000000000..161746150
--- /dev/null
+++ b/deskutils/logjam/files/patch-src-get_cmd_out.c
@@ -0,0 +1,10 @@
+--- src/get_cmd_out.c.orig	Sun Jun  5 22:09:21 2005
++++ src/get_cmd_out.c	Sun Jun  5 22:09:38 2005
+@@ -11,6 +11,7 @@
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <errno.h>
++#include <signal.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ #include "util.h"
diff --git a/deskutils/logjam/files/patch-src-menu.c b/deskutils/logjam/files/patch-src-menu.c
new file mode 100644
index 000000000..14f2e328f
--- /dev/null
+++ b/deskutils/logjam/files/patch-src-menu.c
@@ -0,0 +1,10 @@
+--- src/menu.c.orig	Mon Oct 24 00:11:08 2005
++++ src/menu.c	Thu Aug 17 02:01:02 2006
+@@ -408,7 +408,7 @@
+ 	0, NULL },
+ {    "/Insert/---",               NULL, NULL, 0, "<Separator>" },
+ { N_("/Insert/_Link..."),         "<ctl>L",      menu_make_link },
+-{ N_("/Insert/_Image..."),        NULL,          menu_insert_image },
++{ N_("/Insert/_Image..."),        "<ctl><alt>P", menu_insert_image },
+ { N_("/Insert/_Journal Link..."), "<ctl><alt>L", menu_make_journal_link },
+ { N_("/Insert/lj-_cut..."),       "<ctl><alt>X", menu_ljcut, 0, NULL },
diff --git a/deskutils/logjam/pkg-descr b/deskutils/logjam/pkg-descr
new file mode 100644
index 000000000..24d15377b
--- /dev/null
+++ b/deskutils/logjam/pkg-descr
@@ -0,0 +1,9 @@
+"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, and can create
+offline copies of your journal.
+
+WWW: http://logjam.danga.com/
diff --git a/deskutils/logjam/pkg-plist b/deskutils/logjam/pkg-plist
new file mode 100644
index 000000000..a3e4100cf
--- /dev/null
+++ b/deskutils/logjam/pkg-plist
@@ -0,0 +1,19 @@
+bin/logjam
+%%WITH_XMMS%%bin/logjam-xmms-client
+share/gnome/applications/logjam.desktop
+share/gnome/pixmaps/logjam_goat.png
+share/gnome/pixmaps/logjam_pencil.png
+share/locale/de/LC_MESSAGES/logjam.mo
+share/locale/en_GB/LC_MESSAGES/logjam.mo
+share/locale/en_US.UTF-8/LC_MESSAGES/logjam.mo
+share/locale/es/LC_MESSAGES/logjam.mo
+share/locale/he/LC_MESSAGES/logjam.mo
+share/locale/ru_RU/LC_MESSAGES/logjam.mo
+share/locale/uk_UA/LC_MESSAGES/logjam.mo
+share/locale/ja/LC_MESSAGES/logjam.mo
+@dirrmtry share/locale/en_US.UTF-8/LC_MESSAGES
+@dirrmtry share/locale/en_US.UTF-8
+@dirrmtry share/locale/ru_RU/LC_MESSAGES
+@dirrmtry share/locale/ru_RU
+@dirrmtry share/locale/uk_UA/LC_MESSAGES
+@dirrmtry share/locale/uk_UA