Hi Wim,
your diff doesn't apply correctly. (esp. Makefile)
Updated patch attached.
Bernd
--- misc/logjam/Makefile.orig Sat Jul 23 16:09:54 2005
+++ misc/logjam/Makefile Sat Jul 23 16:44:52 2005
@@ -2,8 +2,9 @@
COMMENT= "gtk livejournal client"
-VERSION= 4.0.1
+VERSION= 4.4.1
DISTNAME= logjam-${VERSION}
+EXTRACT_SUFX= tar.bz2
CATEGORIES= misc x11
HOMEPAGE= http://logjam.danga.com/
@@ -13,29 +14,54 @@
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= X11 Xcursor Xext Xft Xinerama Xrender atk-1.0.0.0 c \
- crypto fontconfig freetype gmodule-2.0.0.0 m \
- pango-1.0.0.0 pangox-1.0.0.0 pangoxft-1.0.0.0 ssl z
+WANTLIB= ICE X11 Xft Xrender atk-1.0.0.0 c \
+ ssl crypto fontconfig freetype m z \
+ pango-1.0.0.0 pangox-1.0.0.0 pangoft2-1.0.0.0 pangoxft-1.0.0.0 \
+ glib-2.0.0.0 gobject-2.0.0.0 gmodule-2.0.0.0
MASTER_SITES= http://logjam.danga.com/download/
MODULES= devel/gettext
+FLAVORS= gtkspell gtkhtml
+FLAVOR?=
+
+.if ${FLAVOR:Mgtkspell}
+LIB_DEPENDS+= gtkspell.0::textproc/gtkspell
+WANTLIB+= aspell stdc++
+CONFIGURE_ARGS+= --with-gtkspell
+CXXHACK= -lstdc++ -lm
+.else
+CONFIGURE_ARGS+= --without-gtkspell
+CXXHACK=
+.endif
+
+.if ${FLAVOR:Mgtkhtml}
+LIB_DEPENDS+= rsvg-2:librsvg->=2.0.0:x11/gnome/librsvg \
+ gtkhtml-3.8.0.0::www/gtkhtml
+WANTLIB+= ICE SM pthread ORBit-2 ORBitCosNaming-2 \
+ art_lgpl_2 audiofile bz2 gailutil jpeg popt \
+ gthread-2.0.0.0
+CONFIGURE_ARGS+= --with-gtkhtml --with-librsvg
+.else
+CONFIGURE_ARGS+= --without-gtkhtml --without-librsvg
+.endif
+
BUILD_DEPENDS+= :pkgconfig-*:devel/pkgconfig
-LIB_DEPENDS= glib-2.0.0.0,gobject-2.0.0.0,gthread-2.0.0.0::devel/glib2 \
- gtk-x11-2.0.0.0,gdk-x11-2.0.0.0,gdk_pixbuf-2.0.0.0::x11/gtk+2 \
+LIB_DEPENDS+= gtk-x11-2.0.0.0,gdk-x11-2.0.0.0,gdk_pixbuf-2.0.0.0::x11/gtk+2 \
curl.2::net/curl \
xml2::textproc/libxml
PORTHOME= ${WRKDIR}
-CONFIGURE_ARGS+= --without-gnome
+CONFIGURE_ARGS+= --with-gtk
CONFIGURE_ARGS+= --with-xmms=runtime
USE_X11= Yes
+USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ LDFLAGS="-L${LOCALBASE}/lib ${CXXHACK}"
.include <bsd.port.mk>
Index: misc/logjam/distinfo
===================================================================
RCS file: /cvs/ports/misc/logjam/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- misc/logjam/distinfo 5 Jan 2005 17:05:05 -0000 1.3
+++ misc/logjam/distinfo 22 Jul 2005 22:22:29 -0000
@@ -1,4 +1,3 @@
-MD5 (logjam-4.0.1.tar.gz) = d7616d5e03add8b8a79d844b5e11f1be
-RMD160 (logjam-4.0.1.tar.gz) = 915b83b7722772c6722a6a47038d13c861100e12
-SHA1 (logjam-4.0.1.tar.gz) = c68e1d20ae0030e00e1c1a0c1375b9fcc7479095
-SIZE (logjam-4.0.1.tar.gz) = 256368
+SHA1 (logjam-4.4.1.tar.bz2) = bad3485cb64a364d32f701ec69d7a0008254a89b
+RMD160 (logjam-4.4.1.tar.bz2) = 91e28bedeed1b43f78d47116d432753d42dea60f
+SIZE (logjam-4.4.1.tar.bz2) = 715636
Index: misc/logjam/patches/patch-configure
===================================================================
RCS file: /cvs/ports/misc/logjam/patches/patch-configure,v
retrieving revision 1.1
diff -u -r1.1 patch-configure
--- misc/logjam/patches/patch-configure 17 Nov 2004 23:47:13 -0000 1.1
+++ misc/logjam/patches/patch-configure 22 Jul 2005 22:22:31 -0000
@@ -1,22 +1,25 @@
-$OpenBSD: patch-configure,v 1.1 2004/11/17 23:47:13 espie Exp $
---- configure.orig Thu Nov 18 00:41:48 2004
-+++ configure Thu Nov 18 00:44:12 2004
-@@ -1502,8 +1502,10 @@ ac_config_commands="$ac_config_commands
- BASEMODULES="gtk+-2.0 libxml-2.0"
- HAVE_GTKSPELL=yes
-
-+: ${WANT_GTKSPELL:=no}
- succeeded=no
-
-+if test $WANT_GTKSPELL = yes; then
- if test -z "$PKG_CONFIG"; then
- # Extract the first word of "pkg-config", so it can be a program name
with args.
- set dummy pkg-config; ac_word=$2
-@@ -1591,6 +1593,7 @@ echo "${ECHO_T}$LOGJAM_LIBS" >&6
- fi
- fi
-
-+fi
- if test $succeeded = yes; then
- :
+$OpenBSD$
+--- configure.orig Thu Jul 14 17:15:43 2005
++++ configure Thu Jul 14 17:16:03 2005
+@@ -21081,9 +21081,9 @@ fi
+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get
pkg-config."
else
+ if test "$with_gtkhtml" = "yes"; then
+- echo "$as_me:$LINENO: checking for libgtkhtml-3.0" >&5
+-echo $ECHO_N "checking for libgtkhtml-3.0... $ECHO_C" >&6
+- if $PKG_CONFIG --exists "libgtkhtml-3.0" ; then
++ echo "$as_me:$LINENO: checking for libgtkhtml-3.8" >&5
++echo $ECHO_N "checking for libgtkhtml-3.8... $ECHO_C" >&6
++ if $PKG_CONFIG --exists "libgtkhtml-3.8" ; then
+ echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ HAVE_GTKHTML=yes
+@@ -21092,7 +21092,7 @@ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_GTKHTML 1
+ _ACEOF
+
+- MODULES="$MODULES libgtkhtml-3.0"
++ MODULES="$MODULES libgtkhtml-3.8"
+ else
+ echo "$as_me:$LINENO: result: not found" >&5
+ echo "${ECHO_T}not found" >&6
Index: misc/logjam/patches/patch-protocol_liblivejournal_livejournal_entry_c
===================================================================
RCS file: misc/logjam/patches/patch-protocol_liblivejournal_livejournal_entry_c
diff -N misc/logjam/patches/patch-protocol_liblivejournal_livejournal_entry_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ misc/logjam/patches/patch-protocol_liblivejournal_livejournal_entry_c
22 Jul 2005 22:22:31 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- protocol/liblivejournal/livejournal/entry.c.orig Fri Jul 22 15:16:32 2005
++++ protocol/liblivejournal/livejournal/entry.c Fri Jul 22 15:17:44 2005
+@@ -814,7 +814,7 @@ lj_entry_from_user_editor(const char *fi
+ gchar *editor =
+ (getenv("VISUAL") ? getenv("VISUAL") :
+ getenv("EDITOR") ? getenv("EDITOR") : "vi");
+- execlp(editor, editor, filename, NULL);
++ execlp(editor, editor, filename, (char *)NULL);
+ _exit(0);
+ }
+
Index: misc/logjam/patches/patch-src_friends_c
===================================================================
RCS file: misc/logjam/patches/patch-src_friends_c
diff -N misc/logjam/patches/patch-src_friends_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ misc/logjam/patches/patch-src_friends_c 22 Jul 2005 22:22:31 -0000
@@ -0,0 +1,26 @@
+$OpenBSD$
+--- src/friends.c.orig Thu Jul 14 13:23:24 2005
++++ src/friends.c Thu Jul 14 13:29:44 2005
+@@ -1008,17 +1008,19 @@ export_do(JamFriendsUI *fui, GtkFileSele
+
+ static void
+ suggest_cb(GtkWidget *w, GtkWidget *entry) {
+- char buf[50];
++ char *buf;
+ time_t curtime;
+ struct tm *date;
+
+ time(&curtime);
+ date = localtime(&curtime);
+
+- sprintf(buf, "friends.%04d-%02d-%02d",
+- date->tm_year+1900, date->tm_mon+1, date->tm_mday);
++ buf = g_strdup_printf("friends.%04d-%02d-%02d",
++ date->tm_year+1900, date->tm_mon+1,
date->tm_mday);
+
+ gtk_entry_set_text(GTK_ENTRY(entry), buf);
++
++ free(buf);
+ }
+
+ static void
Index: misc/logjam/patches/patch-src_get_cmd_out_c
===================================================================
RCS file: misc/logjam/patches/patch-src_get_cmd_out_c
diff -N misc/logjam/patches/patch-src_get_cmd_out_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ misc/logjam/patches/patch-src_get_cmd_out_c 22 Jul 2005 22:22:31 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/get_cmd_out.c.orig Fri Jul 22 15:15:03 2005
++++ src/get_cmd_out.c Fri Jul 22 15:15:59 2005
+@@ -44,7 +44,7 @@ gboolean mypopen_r(const char *command,
+ close(fds[0]);
+ dup2(fds[1], 1);
+ close(fds[1]);
+- execl("/bin/sh", "sh", "-c", command, NULL);
++ execl("/bin/sh", "sh", "-c", command, (char *)NULL);
+ /* if execl failed, exit with code 127 */
+ exit(127);
+ }
Index: misc/logjam/patches/patch-src_jam_xml_c
===================================================================
RCS file: misc/logjam/patches/patch-src_jam_xml_c
diff -N misc/logjam/patches/patch-src_jam_xml_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ misc/logjam/patches/patch-src_jam_xml_c 22 Jul 2005 22:22:31 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/jam_xml.c.orig Thu Jul 14 13:15:34 2005
++++ src/jam_xml.c Thu Jul 14 13:18:26 2005
+@@ -46,7 +46,7 @@ jam_xmlGetInt(xmlDocPtr doc, xmlNodePtr
+ xmlNodePtr
+ jam_xmlAddInt(xmlNodePtr node, char *name, int val) {
+ char buf[20];
+- sprintf(buf, "%d", val);
++ snprintf(buf, 20, "%d", val);
+ return xmlNewTextChild(node, NULL, name, buf);
+ }
+
Index: misc/logjam/patches/patch-src_ljtypes_c
===================================================================
RCS file: misc/logjam/patches/patch-src_ljtypes_c
diff -N misc/logjam/patches/patch-src_ljtypes_c
--- misc/logjam/patches/patch-src_ljtypes_c 2 Jan 2004 22:09:23 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,37 +0,0 @@
-$OpenBSD: patch-src_ljtypes_c,v 1.2 2004/01/02 22:09:23 espie Exp $
---- src/ljtypes.c.orig 2002-12-04 05:55:54.000000000 +0100
-+++ src/ljtypes.c 2004-01-02 23:03:20.000000000 +0100
-@@ -279,12 +279,12 @@ addtextchildenc(xmlDocPtr doc, xmlNodePt
-
- #define XML_ENTRY_META_GET(A) \
- if ((!strcmp(cur->name, #A))) { \
-- entry->##A = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1); \
-+ entry->A = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1); \
- }
-
- #define XML_ENTRY_META_SET(A) \
-- if (entry->##A) \
-- addtextchildenc(doc, root, #A, entry->##A);
-+ if (entry->A) \
-+ addtextchildenc(doc, root, #A, entry->A);
-
- static xmlDocPtr
- entry_to_xml(Entry *entry) {
-@@ -443,7 +443,7 @@ static gboolean
- rfc822_load_entry(const char *key, const char *val, Entry *entry) {
- #define RFC822_GET(A) \
- if (g_ascii_strcasecmp(key, #A) == 0) { \
-- entry->##A = g_strdup(val); \
-+ entry->A = g_strdup(val); \
- }
-
- RFC822_GET(subject)
-@@ -662,7 +662,7 @@ entry_from_user_editor(const char *filen
- gchar *editor =
- (getenv("VISUAL") ? getenv("VISUAL") :
- getenv("EDITOR") ? getenv("EDITOR") : "vi");
-- execlp(editor, editor, filename, NULL);
-+ execlp(editor, editor, filename, (void *)NULL);
- _exit(0);
- }
-
Index: misc/logjam/patches/patch-src_settings_c
===================================================================
RCS file: misc/logjam/patches/patch-src_settings_c
diff -N misc/logjam/patches/patch-src_settings_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ misc/logjam/patches/patch-src_settings_c 22 Jul 2005 22:22:31 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/settings.c.orig Thu Jul 14 13:30:43 2005
++++ src/settings.c Thu Jul 14 13:31:03 2005
+@@ -194,7 +194,7 @@ integer_tie_cb(GtkEditable *e, SettingsW
+ static void
+ integer_tie(SettingsWidget *sw) {
+ char buf[30];
+- sprintf(buf, "%d", *(int*)sw->conf);
++ snprintf(buf, 30, "%d", *(int*)sw->conf);
+ gtk_entry_set_text(GTK_ENTRY(sw->widget), buf);
+ g_signal_connect(G_OBJECT(sw->widget), "changed",
+ G_CALLBACK(integer_tie_cb), sw);
Index: misc/logjam/pkg/DESCR
===================================================================
RCS file: /cvs/ports/misc/logjam/pkg/DESCR,v
retrieving revision 1.3
diff -u -r1.3 DESCR
--- misc/logjam/pkg/DESCR 15 Dec 2003 21:42:43 -0000 1.3
+++ misc/logjam/pkg/DESCR 22 Jul 2005 22:22:31 -0000
@@ -1,3 +1,8 @@
LogJam is a fully featured GTK2 client for journal sites using the LiveJournal
project code (LiveJournal.com, DeadJournal.com, etc.). It will notice when
you're running xmms and add your current playlist to journal entries.
+
+Available flavors:
+ gtkspell - as-you-type spelling check for journal entries
+ gtkhtml - adds an HTML preview window
+
Index: misc/logjam/pkg/PLIST
===================================================================
RCS file: /cvs/ports/misc/logjam/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- misc/logjam/pkg/PLIST 12 Feb 2003 18:14:28 -0000 1.2
+++ misc/logjam/pkg/PLIST 22 Jul 2005 22:22:31 -0000
@@ -1,3 +1,22 @@
@comment $OpenBSD: PLIST,v 1.2 2003/02/12 18:14:28 brad Exp $
bin/logjam
-man/man1/logjam.1
[EMAIL PROTECTED] man/man1/logjam.1
+share/applications/
+share/applications/logjam.desktop
+share/locale/de/LC_MESSAGES/logjam.mo
+share/locale/en_GB/LC_MESSAGES/
+share/locale/en_GB/LC_MESSAGES/logjam.mo
+share/locale/en_US.UTF-8/
+share/locale/en_US.UTF-8/LC_MESSAGES/
+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/
+share/locale/ru_RU/LC_MESSAGES/
+share/locale/ru_RU/LC_MESSAGES/logjam.mo
+share/locale/uk_UA/
+share/locale/uk_UA/LC_MESSAGES/
+share/locale/uk_UA/LC_MESSAGES/logjam.mo
+share/pixmaps/
+share/pixmaps/logjam_goat.png
+share/pixmaps/logjam_pencil.png
