ports/52583: [PATCH] deskutils/logjam2: fix building on 4.8-RC

[Sergey A.Osokin]

>Number:         52583
>Category:       ports
>Synopsis:       [PATCH] deskutils/logjam2: fix building on 4.8-RC
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu May 22 09:20:08 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Sergey A. Osokin
>Release:        FreeBSD 5.1-BETA i386
>Organization:
n/a
>Environment:
System: FreeBSD 5.1-BETA i386

>Description:
	Fix building on -RC (maybe on -STABLE too)
	Add missing headers
	Bump PORTREVISION
	Tested on -CURRENT by: Dmitry Dyomin <old at old.com.ua>
	Tested on 4.8-RC by: Alexandr Kovalenko <never at nevermind.kiev.ua>
	Spotted by: Alexandr Kovalenko <never at nevermind.kiev.ua>
>How-To-Repeat:
	under 4.8-RC
	$ cd ports/deskutils/logjum2 && make
>Fix:

--- /dev/null	Thu May 22 19:35:48 2003
+++ ports/deskutils/logjam2/files/patch-src::init.c	Thu May 22 20:00:12 2003
@@ -0,0 +1,40 @@
+--- src/init.c.orig	Thu May 22 19:00:58 2003
++++ src/init.c	Thu May 22 19:24:34 2003
+@@ -10,21 +10,20 @@
+ #include <glib.h>
+ 
+ #define _GNU_SOURCE
+-#ifdef HAVE_GETOPT_H
++/* #ifdef HAVE_GETOPT_H */
+ #include <getopt.h>
+-#endif
++/* #endif */
+ 
+ #ifndef G_OS_WIN32
+ #include <unistd.h>
+ #endif
+ 
+-#include <stdlib.h>  /* for exit (and __argc and __argv on windows) */
+-
+-#include <string.h>
+-#include <stdio.h>
++#include <locale.h>
+ #include <errno.h>
+ #include <signal.h>
+-#include <locale.h>
++#include <stdio.h>
++#include <stdlib.h>  /* for exit (and __argc and __argv on windows) */
++#include <string.h>
+ 
+ #include "network.h"
+ #include "conf.h"
+@@ -356,9 +355,7 @@
+ 	gboolean has_gtk;
+ 	Entry  *entry;
+ 	gchar  *accelpath;
+-#ifdef HAVE_GETOPT_H
+ 	GError *err   = NULL;
+-#endif
+ 
+ 	/* This call actually initializes the locale settings,
+ 	 * and doesn't just clear LC_ALL (which is sorta what
--- /dev/null	Thu May 22 19:35:48 2003
+++ ports/deskutils/logjam2/files/patch-src::remote.c	Thu May 22 20:00:22 2003
@@ -0,0 +1,20 @@
+--- src/remote.c.orig	Thu May 22 19:36:05 2003
++++ src/remote.c	Thu May 22 19:50:16 2003
+@@ -13,12 +13,15 @@
+ #include "config.h"
+ 
+ #include <gtk/gtk.h>
+-#include <sys/select.h>
++
+ #include <sys/types.h>
++#include <sys/select.h>
+ #include <sys/socket.h>
++#include <sys/uio.h>
+ #include <sys/un.h>
+-#include <unistd.h>
++
+ #include <errno.h>
++#include <unistd.h>
+ 
+ #include "util.h"
+ #include "conf.h"
Index: ports/deskutils/logjam2/Makefile
===================================================================
RCS file: /home/ncvs/ports/deskutils/logjam2/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- ports/deskutils/logjam2/Makefile	18 May 2003 17:59:24 -0000	1.5
+++ ports/deskutils/logjam2/Makefile	22 May 2003 16:06:01 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	logjam2
 PORTVERSION=	4.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
 MASTER_SITES=	http://logjam.danga.com/download/
 DISTNAME=	logjam-${PORTVERSION}

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