ports/164965: openoffice.org-3 fails to build in moz, nss, and connectivity modules

[Jimmy Kelley]

>Number:         164965
>Category:       ports
>Synopsis:       openoffice.org-3 fails to build in moz, nss, and connectivity modules
>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:   Fri Feb 10 17:00:27 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Jimmy Kelley
>Release:        9.0-STABLE
>Organization:
>Environment:
FreeBSD jmobile.jimmy.local 9.0-STABLE FreeBSD 9.0-STABLE #0: Wed Feb  8 11:23:55 CST 2012     root at jmobile.jimmy.local:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
OpenOffice.org-3 build fails in the moz and nss modules due to a conflict with an include file named mpi.h; there are two such files: one in the openoffice build area(s) (the one that needs to be used by the failing modules), and one in /usr/X11R6/include.  Modifying the appropriate Makefiles to have the include search path look in the build area BEFORE looking in other system areas fixes this problem.
The build next fails in the connectivity module due to a char const * to sal_Char conversion error.
>How-To-Repeat:
Attempt to build openoffice.org-3 from the ports.
>Fix:
The attached patches, applied to the build area as the failures happen, got me a completed build that successfully installs and runs.  

Patch attached with submission follows:

--- nss/unxfbsdi.pro/misc/build/nss-3.12.6/mozilla/security/nss/lib/freebl/Makefile.orig	2012-02-10 10:20:57.000000000 -0600
+++ nss/unxfbsdi.pro/misc/build/nss-3.12.6/mozilla/security/nss/lib/freebl/Makefile	2012-02-10 10:23:24.000000000 -0600
@@ -464,7 +464,7 @@
 vpath %.S mpi ecl
 vpath %.s mpi ecl
 vpath %.asm mpi ecl
-INCLUDES += -Impi -Iecl
+INCLUDES := -Impi -Iecl $(INCLUDES)
 
 
 DEFINES += -DMP_API_COMPATIBLE
--- moz/unxfbsdi.pro/misc/build/mozilla/security/nss-fips/lib/freebl/Makefile.orig	2012-02-10 10:11:01.000000000 -0600
+++ moz/unxfbsdi.pro/misc/build/mozilla/security/nss-fips/lib/freebl/Makefile	2012-02-10 10:11:37.000000000 -0600
@@ -431,7 +431,7 @@
 vpath %.c mpi ecl
 vpath %.S mpi ecl
 vpath %.s mpi ecl
-INCLUDES += -Impi -Iecl
+INCLUDES := -Impi -Iecl $(INCLUDES)
 
 
 DEFINES += -DMP_API_COMPATIBLE
--- moz/unxfbsdi.pro/misc/build/mozilla/security/nss/lib/freebl/Makefile.orig	2012-02-09 19:51:09.000000000 -0600
+++ moz/unxfbsdi.pro/misc/build/mozilla/security/nss/lib/freebl/Makefile	2012-02-10 10:25:01.000000000 -0600
@@ -429,7 +429,7 @@
 vpath %.c mpi ecl
 vpath %.S mpi ecl
 vpath %.s mpi ecl
-INCLUDES += -Impi -Iecl
+INCLUDES := -Impi -Iecl $(INCLUDES)
 
 
 DEFINES += -DMP_API_COMPATIBLE
--- connectivity/unxfbsdi.pro/misc/sqlbison.cxx.orig	2012-02-09 21:20:28.000000000 -0600
+++ connectivity/unxfbsdi.pro/misc/sqlbison.cxx	2012-02-09 22:45:52.000000000 -0600
@@ -7788,7 +7788,7 @@
 # define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
                                         yyssp, yytoken)
       {
-        char const *yymsgp = YY_("syntax error");
+        char *yymsgp = YY_("syntax error");
         int yysyntax_error_status;
         yysyntax_error_status = YYSYNTAX_ERROR;
         if (yysyntax_error_status == 0)


>Release-Note:
>Audit-Trail:
>Unformatted: