ports/51169: openoffice, rtld patches included in fbsd-4.8, bump version for warning

[Palle Girgensohn]

>Number:         51169
>Category:       ports
>Synopsis:       openoffice, rtld patches included in fbsd-4.8, bump version for warning
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Apr 19 15:50:16 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Palle Girgensohn <girgen at 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 at 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:
>Unformatted: