From girgen@smtp.chello.se  Sat Apr 19 15:49:47 2003
Return-Path: <girgen@smtp.chello.se>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id D636437B401; Sat, 19 Apr 2003 15:49:47 -0700 (PDT)
Received: from amsfep14-int.chello.nl (amsfep14-int.chello.nl [213.46.243.22])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 29F5643FAF; Sat, 19 Apr 2003 15:49:46 -0700 (PDT)
	(envelope-from girgen@smtp.chello.se)
Received: from palle.girgensohn.se ([213.89.138.245])
          by amsfep14-int.chello.nl
          (InterMail vM.5.01.05.17 201-253-122-126-117-20021021) with ESMTP
          id <20030419224944.DQWM11499.amsfep14-int.chello.nl@palle.girgensohn.se>;
          Sun, 20 Apr 2003 00:49:44 +0200
Received: from palle.girgensohn.se (localhost [127.0.0.1])
	by palle.girgensohn.se (8.12.9/8.12.9) with ESMTP id h3JMnir3098102;
	Sun, 20 Apr 2003 00:49:44 +0200 (CEST)
	(envelope-from girgen@palle.girgensohn.se)
Received: (from girgen@localhost)
	by palle.girgensohn.se (8.12.9/8.12.9/Submit) id h3JMnhB7098101;
	Sun, 20 Apr 2003 00:49:43 +0200 (CEST)
	(envelope-from girgen)
Message-Id: <200304192249.h3JMnhB7098101@palle.girgensohn.se>
Date: Sun, 20 Apr 2003 00:49:43 +0200 (CEST)
From: Palle Girgensohn <girgen@pingpong.net>
Reply-To: Palle Girgensohn <girgen@pingpong.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: openoffice@freebsd.org
Subject: openoffice, rtld patches included in fbsd-4.8, bump version for warning
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         51169
>Category:       ports
>Synopsis:       openoffice, rtld patches included in fbsd-4.8, bump version for warning
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    openoffice
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Apr 19 15:50:16 PDT 2003
>Closed-Date:    Sat Apr 19 17:15:56 PDT 2003
>Last-Modified:  Sat Apr 19 17:15:56 PDT 2003
>Originator:     Palle Girgensohn <girgen@pingpong.net>
>Release:        FreeBSD 4.8-STABLE i386
>Organization:
PING PONG
>Environment:
System: FreeBSD palle.girgensohn.se 4.8-STABLE FreeBSD 4.8-STABLE #1: Sat Apr 12 20:24:35 CEST 2003     girgen@palle.girgensohn.se:/usr/local/obj/usr/src/sys/STORDATAN  i386

	
>Description:
The patches rtld-deadlock and rtld-builddeadlock have been MFC:ed and
are included in 4.8-RELEASE. Hence, we need not warn 4.8 users.

>How-To-Repeat:
make openoffice on FreeBSD-4.8-release. a warning is issued that you
need two patches to rtld, but both are already in the
system.

>Fix:

	


Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/editors/openoffice/Makefile,v
retrieving revision 1.168
diff -u -r1.168 Makefile
--- Makefile	18 Apr 2003 10:45:01 -0000	1.168
+++ Makefile	19 Apr 2003 22:42:50 -0000
@@ -306,7 +306,7 @@
 	@${ECHO} "REQUIRED SYSTEM PATCHES:"
 	@${ECHO}
 .endif
-.if ${OSVERSION} < 500000
+.if ${OSVERSION} < 480000
 	@${ECHO} "OO.org can crash if you enter a non existing path"
 	@${ECHO} "or URL in the location bar. To fix these crashes"
 	@${ECHO} "you need a uncommitted system patch for rtld:"
@@ -332,7 +332,7 @@
 	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-deadlock.diff"
 	@${ECHO}
 .endif
-.if ${OSVERSION} < 500000
+.if ${OSVERSION} < 480000
 	@${ECHO}
 	@${ECHO} "OO.org build can deadlock in regmerge. You can work around"
 	@${ECHO} "this problem with this patch:"
@@ -434,7 +434,7 @@
 	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
 	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
 	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
-	
+
 .if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment)
 	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
 .endif
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: mbr 
State-Changed-When: Sat Apr 19 17:15:04 PDT 2003 
State-Changed-Why:  
bugs -> openoffice 


Responsible-Changed-From-To: freebsd-ports-bugs->openoffice 
Responsible-Changed-By: mbr 
Responsible-Changed-When: Sat Apr 19 17:15:04 PDT 2003 
Responsible-Changed-Why:  
Committed, thanks ! 

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