ports/76332: [patch] unbreak graphics/osg

[IIJIMA Hiromitsu]

>Number:         76332
>Category:       ports
>Synopsis:       [patch] unbreak graphics/osg
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 17 07:00:39 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     IIJIMA Hiromitsu
>Release:        FreeBSD 4.10-RELEASE i386
>Organization:
DENNOU GEDOU GAKKAI, N.D.D.
>Environment:
System: FreeBSD sodans.usata.org 4.10-RELEASE FreeBSD 4.10-RELEASE #3: Mon Jun 14 20:22:42 JST 2004 root at sodans.usata.org:/var/obj/usr/src/sys/SODANS i386


>Description:
osg's header files #define the symbol 'NULL' by itself, which causes some files uncompilable.


>How-To-Repeat:
	# cd /usr/ports/graphics/osg
	# make build TRYBROKEN=yes

>Fix:

Do not #define NULL by itself. Use standard library's definition instead.
--- osg/Export.orig	Wed Apr 30 20:40:16 2003
+++ osg/Export	Mon Jan 17 15:46:34 2005
@@ -48,7 +48,8 @@
 
 /* Define NULL pointer value */
 
-#ifndef NULL
+#include<stdlib.h>
+#if 0
     #ifdef  __cplusplus
         #define NULL    0
     #else
--- osgGL2/Export.orig	Tue Jul 15 19:45:46 2003
+++ osgGL2/Export	Mon Jan 17 15:46:16 2005
@@ -35,7 +35,8 @@
 
 /* Define NULL pointer value */
 
-#ifndef NULL
+#include <stdlib.h>
+#if 0
 #ifdef  __cplusplus
 #define NULL    0
 #else
--- osgSim/Export.orig	Mon Mar 17 06:58:27 2003
+++ osgSim/Export	Mon Jan 17 15:45:59 2005
@@ -35,7 +35,8 @@
 
 /* Define NULL pointer value */
 
-#ifndef NULL
+#include <stdlib.h>
+#if 0
 #ifdef  __cplusplus
 #define NULL    0
 #else



--- Makefile~	Mon Dec 20 03:56:51 2004
+++ Makefile	Mon Jan 17 15:52:27 2005
@@ -26,10 +26,6 @@
 		freetype.9:${PORTSDIR}/print/freetype2 \
 		xml2.5:${PORTSDIR}/textproc/libxml2
 
-BROKEN=		"Does not compile"
-EXPIRATION_DATE=2005-02-18
-DEPRECATED=	${BROKEN}
-
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_MESA=	yes
>Release-Note:
>Audit-Trail:
>Unformatted: