From root@distalzou.net  Sat Sep 24 05:47:43 2005
Return-Path: <root@distalzou.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A1E3316A41F;
	Sat, 24 Sep 2005 05:47:43 +0000 (GMT)
	(envelope-from root@distalzou.net)
Received: from mail.distalzou.net (203.141.139.231.user.ad.il24.net [203.141.139.231])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5542F43D55;
	Sat, 24 Sep 2005 05:47:42 +0000 (GMT)
	(envelope-from root@distalzou.net)
Received: from root by mail.distalzou.net with local (Exim 4.52 (FreeBSD))
	id 1EJ2su-000IXS-U5; Sat, 24 Sep 2005 14:47:40 +0900
Message-Id: <E1EJ2su-000IXS-U5@mail.distalzou.net>
Date: Sat, 24 Sep 2005 14:47:40 +0900
From: Tod McQuillin <devin@spamcop.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: nectar@FreeBSD.org
Subject: [PATCH] japanese/ja-im-ja: [fix build on 4.x, use GCONF_SCHAMAS]
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         86521
>Category:       ports
>Synopsis:       [PATCH] japanese/ja-im-ja: [fix build on 4.x, use GCONF_SCHAMAS]
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    nectar
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Sep 24 05:50:15 GMT 2005
>Closed-Date:    Thu Dec 29 22:19:45 GMT 2005
>Last-Modified:  Thu Dec 29 22:19:45 GMT 2005
>Originator:     Tod McQuillin
>Release:        FreeBSD 4.11-STABLE i386
>Organization:
>Environment:
System: FreeBSD plexi.pun-pun.prv 4.11-STABLE FreeBSD 4.11-STABLE #1: Wed Aug 10 22:19:18 JST 2005
>Description:
im-ja does not build on FreeBSD 4.x.  The attached
patch-src_helper_helper-socket.c allows the build to succeed.

Also use GCONF_SCHEMAS in the Makefile as demanded by portlint.

Added file(s):
- files/patch-src_helper_helper-socket.c

Port maintainer (nectar@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- ja-im-ja-1.4.patch begins here ---
Index: Makefile
===================================================================
RCS file: /usr/src/cvs-repo/ports/japanese/im-ja/Makefile,v
retrieving revision 1.17
diff -u -u -r1.17 Makefile
--- Makefile	1 Aug 2005 16:57:19 -0000	1.17
+++ Makefile	24 Sep 2005 05:43:54 -0000
@@ -31,6 +31,7 @@
 CONFIGURE_ENV+=	INTLTOOL_PERL="${PERL}"
 
 MAN1=		im-ja-conf.1 im-ja-xim-server.1
+GCONF_SCHAMAS=	im-ja.schemas
 
 .include <bsd.port.pre.mk>
 
Index: pkg-plist
===================================================================
RCS file: /usr/src/cvs-repo/ports/japanese/im-ja/pkg-plist,v
retrieving revision 1.7
diff -u -u -r1.7 pkg-plist
--- pkg-plist	1 Aug 2005 16:57:19 -0000	1.7
+++ pkg-plist	24 Sep 2005 05:43:29 -0000
@@ -1,7 +1,6 @@
 bin/im-ja-conf
 bin/im-ja-xim-server
 @unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/im-ja.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/im-ja.schemas
 @exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/im-ja.schemas > /dev/null || /usr/bin/true
 lib/gtk-2.0/2.4.0/immodules/im-ja.so
 lib/im-ja/im-ja-applet
Index: files/patch-src_helper_helper-socket.c
===================================================================
RCS file: files/patch-src_helper_helper-socket.c
diff -N files/patch-src_helper_helper-socket.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-src_helper_helper-socket.c	24 Sep 2005 05:36:21 -0000
@@ -0,0 +1,14 @@
+--- src/helper/helper-socket.c~	Wed Apr 13 03:10:13 2005
++++ src/helper/helper-socket.c	Sat Sep 24 14:31:08 2005
+@@ -25,9 +25,10 @@
+ 
+ #include <glib.h>
+ 
++#include <sys/types.h>
++#include <sys/time.h>
+ #include <netinet/in.h>
+ #include <string.h>
+-#include <sys/types.h>
+ #include <sys/un.h>
+ #include <sys/socket.h>
+ #include <sys/select.h>
--- ja-im-ja-1.4.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->nectar 
Responsible-Changed-By: mnag 
Responsible-Changed-When: Sun Sep 25 05:19:49 GMT 2005 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=86521 
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Thu Dec 29 22:19:37 UTC 2005 
State-Changed-Why:  
Committed, thanks! 

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