From rnoland@rnoland-ibm.acs.internap.com  Fri Aug 10 16:00:40 2007
Return-Path: <rnoland@rnoland-ibm.acs.internap.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BC08716A41A
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 10 Aug 2007 16:00:40 +0000 (UTC)
	(envelope-from rnoland@rnoland-ibm.acs.internap.com)
Received: from gizmo.2hip.net (gizmo.2hip.net [64.74.207.195])
	by mx1.freebsd.org (Postfix) with ESMTP id 94C1B13C4B3
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 10 Aug 2007 16:00:40 +0000 (UTC)
	(envelope-from rnoland@rnoland-ibm.acs.internap.com)
Received: from rnoland-ibm.acs.internap.com (rnoland-ibm.acs.internap.com [63.251.67.21])
	(authenticated bits=0)
	by gizmo.2hip.net (8.13.8/8.13.8) with ESMTP id l7AG0Y6j010167
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 10 Aug 2007 12:00:34 -0400 (EDT)
	(envelope-from rnoland@rnoland-ibm.acs.internap.com)
Received: from rnoland-ibm.acs.internap.com (localhost.acs.internap.com [127.0.0.1])
	by rnoland-ibm.acs.internap.com (8.14.1/8.14.1) with ESMTP id l7AG0Tnn037629
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 10 Aug 2007 12:00:29 -0400 (EDT)
	(envelope-from rnoland@rnoland-ibm.acs.internap.com)
Received: (from rnoland@localhost)
	by rnoland-ibm.acs.internap.com (8.14.1/8.14.1/Submit) id l7AG0Te0037628;
	Fri, 10 Aug 2007 12:00:29 -0400 (EDT)
	(envelope-from rnoland)
Message-Id: <200708101600.l7AG0Te0037628@rnoland-ibm.acs.internap.com>
Date: Fri, 10 Aug 2007 12:00:29 -0400 (EDT)
From: Robert Noland <rnoland@2hip.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER] x11-toolkits/swt-devel: Fix build on amd64
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         115384
>Category:       ports
>Synopsis:       [MAINTAINER] x11-toolkits/swt-devel: Fix build on amd64
>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:   Fri Aug 10 16:10:00 GMT 2007
>Closed-Date:    Sat Aug 11 15:26:50 GMT 2007
>Last-Modified:  Sat Aug 11 15:30:14 GMT 2007
>Originator:     Robert Noland
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD rnoland-ibm.2hip.net 7.0-CURRENT FreeBSD 7.0-CURRENT #105: Mon Jul 30 17:10:59 EDT 2007
>Description:
Fix build on amd64

Added file(s):
- files/extra-patch-amd64-os.c
- files/extra-patch-i386-os.c

Removed file(s):
- files/patch-os.c

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

--- swt-devel-3.3_1,1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/swt-devel/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- Makefile	3 Aug 2007 21:53:44 -0000	1.8
+++ Makefile	10 Aug 2007 15:57:58 -0000
@@ -19,6 +19,8 @@
 
 ONLY_FOR_ARCHS=	i386 amd64
 
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-${ARCH}-os.c
+
 SWT_VERSION=	3346
 OUTPUT_JAR=	swt-devel.jar
 
Index: files/extra-patch-amd64-os.c
===================================================================
RCS file: files/extra-patch-amd64-os.c
diff -N files/extra-patch-amd64-os.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/extra-patch-amd64-os.c	10 Aug 2007 15:57:58 -0000
@@ -0,0 +1,20 @@
+--- os.c.orig	2007-06-25 16:06:14.000000000 -0400
++++ os.c	2007-08-10 11:54:37.000000000 -0400
+@@ -17397,11 +17397,16 @@
+ 	jlong rc = 0;
+ 	OS_NATIVE_ENTER(env, that, realpath_FUNC);
+ 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
+-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
++	if (arg1) {
++		if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
++	} else
++		lparg1 = malloc(PATH_MAX);
+ 	rc = (jlong)realpath((const char *)lparg0, (char *)lparg1);
+ fail:
+ 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+ 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
++	if (!arg1 && lparg1 && rc == 0)
++		free(lparg1);
+ 	OS_NATIVE_EXIT(env, that, realpath_FUNC);
+ 	return rc;
+ }
Index: files/extra-patch-i386-os.c
===================================================================
RCS file: files/extra-patch-i386-os.c
diff -N files/extra-patch-i386-os.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/extra-patch-i386-os.c	10 Aug 2007 15:57:58 -0000
@@ -0,0 +1,20 @@
+--- os.c.orig	2007-04-26 14:03:00.000000000 -0400
++++ os.c	2007-08-10 11:56:22.000000000 -0400
+@@ -17397,11 +17397,16 @@
+ 	jint rc = 0;
+ 	OS_NATIVE_ENTER(env, that, realpath_FUNC);
+ 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
+-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
++	if (arg1) {
++	    if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
++	} else
++	    lparg1 = malloc(PATH_MAX);
+ 	rc = (jint)realpath((const char *)lparg0, (char *)lparg1);
+ fail:
+ 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+ 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
++	if (!arg1 && lparg1 && rc == 0)
++	    free(lparg1);
+ 	OS_NATIVE_EXIT(env, that, realpath_FUNC);
+ 	return rc;
+ }
Index: files/patch-os.c
===================================================================
RCS file: files/patch-os.c
diff -N files/patch-os.c
--- files/patch-os.c	3 Aug 2007 21:53:45 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
---- ./os.c	2007-07-22 11:53:22.000000000 +0400
-+++ ./os.c	2007-07-22 11:57:56.000000000 +0400
-@@ -17397,11 +17397,16 @@
- 	jint rc = 0;
- 	OS_NATIVE_ENTER(env, that, realpath_FUNC);
- 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
--	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-+	if (arg1) {
-+	    if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-+	} else
-+	    lparg1 = malloc(PATH_MAX);
- 	rc = (jint)realpath((const char *)lparg0, (char *)lparg1);
- fail:
- 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
- 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-+	if (!arg1 && lparg1 && rc == 0)
-+	    free(lparg1);
- 	OS_NATIVE_EXIT(env, that, realpath_FUNC);
- 	return rc;
- }
-
--- swt-devel-3.3_1,1.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: rafan 
State-Changed-When: Sat Aug 11 15:26:48 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/115384: commit references a PR
Date: Sat, 11 Aug 2007 15:26:49 +0000 (UTC)

 rafan       2007-08-11 15:26:43 UTC
 
   FreeBSD ports repository
 
   Modified files:
     x11-toolkits/swt-devel Makefile 
   Added files:
     x11-toolkits/swt-devel/files extra-patch-amd64-os.c 
                                  extra-patch-i386-os.c 
   Removed files:
     x11-toolkits/swt-devel/files patch-os.c 
   Log:
   - Fix build on amd64
   
   PR:             ports/115384
   Submitted by:   Robert Noland <rnoland at 2hip.net> (maintainer)
   
   Revision  Changes    Path
   1.9       +2 -0      ports/x11-toolkits/swt-devel/Makefile
   1.1       +20 -0     ports/x11-toolkits/swt-devel/files/extra-patch-amd64-os.c (new)
   1.1       +20 -0     ports/x11-toolkits/swt-devel/files/extra-patch-i386-os.c (new)
   1.2       +0 -21     ports/x11-toolkits/swt-devel/files/patch-os.c (dead)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
