sb118: merged in backout

afms/makefile.mk

@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify

agg/source/makefile.mk

@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify

apple_remote/AppleRemote.m

@@ -42,6 +42,9 @@ const char* AppleRemoteDeviceName = "AppleIRController";
 #ifndef NSAppKitVersionNumber10_4
 	#define NSAppKitVersionNumber10_4 824
 #endif
+#ifndef NSAppKitVersionNumber10_5
+	#define NSAppKitVersionNumber10_5 949
+#endif
 
 @implementation AppleRemote
 
@@ -53,6 +56,9 @@ const char* AppleRemoteDeviceName = "AppleIRController";
     
     // TODO : avoid such magics 
 	if (floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_4) {
+	    #ifdef DEBUG
+	    NSLog( @"setting 10.4 cookies" );
+	    #endif
 		// 10.4.x Tiger
 		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus]		forKey:@"14_12_11_6_"];
 		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus]		forKey:@"14_13_11_6_"];		
@@ -65,7 +71,10 @@ const char* AppleRemoteDeviceName = "AppleIRController";
 		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu_Hold]	forKey:@"14_6_14_6_"];
 		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Hold]	forKey:@"18_14_6_18_14_6_"];
 		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched]	forKey:@"19_"];			
-	} else {
+	} else if( floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_5 ) {
+	    #ifdef DEBUG
+	    NSLog( @"setting 10.5 cookies" );
+	    #endif
 		// 10.5.x Leopard
 		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus]		forKey:@"31_29_28_19_18_"];
 		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus]		forKey:@"31_30_28_19_18_"];	
@@ -79,6 +88,24 @@ const char* AppleRemoteDeviceName = "AppleIRController";
 		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Hold]	forKey:@"35_31_19_18_35_31_19_18_"];
 		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched]	forKey:@"19_"];			
 	}
+	else
+	{
+	    #ifdef DEBUG
+	    NSLog( @"setting 10.6 cookies" );
+	    #endif
+	    // 10.6.x Snow Leopard
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus]		forKey:@"33_31_30_21_20_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus]		forKey:@"33_32_30_21_20_2_"];	
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu]		forKey:@"33_22_21_20_2_33_22_21_20_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay]		forKey:@"33_23_21_20_2_33_23_21_20_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight]		forKey:@"33_24_21_20_2_33_24_21_20_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft]		forKey:@"33_25_21_20_2_33_25_21_20_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight_Hold]	forKey:@"33_21_20_14_12_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft_Hold]	forKey:@"33_21_20_13_12_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu_Hold]	forKey:@"33_21_20_2_33_21_20_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Hold]	forKey:@"37_33_21_20_2_37_33_21_20_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched]	forKey:@"19_"];
+	}
 }
 
 - (void) sendRemoteButtonEvent: (RemoteControlEventIdentifier) event pressedDown: (BOOL) pressedDown {

apple_remote/makefile.mk

@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify

beanshell/bsh-2.0b1-src.patch

@@ -31,20 +31,16 @@
  	<property name="legacy-excludes" 
 --- misc/BeanShell/makefile.mk	Fri Mar 28 15:56:40 2008
 +++ misc/build/BeanShell/makefile.mk	Fri Mar 28 15:56:06 2008
-@@ -1 +1,39 @@
+@@ -1 +1,35 @@
 -dummy
 +#*************************************************************************
 +#
 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 +# 
-+# Copyright 2008 by Sun Microsystems, Inc.
++# Copyright 2000, 2010 Oracle and/or its affiliates.
 +#
 +# OpenOffice.org - a multi-platform office productivity suite
 +#
-+# $RCSfile: bsh-2.0b1-src.patch,v $
-+#
-+# $Revision: 1.7 $
-+#
 +# This file is part of OpenOffice.org.
 +#
 +# OpenOffice.org is free software: you can redistribute it and/or modify

beanshell/makefile.mk

@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify

cppunit/makefile.mk

 #*************************************************************************
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify

cppunit/ooo-DllPlugInTester.mk

 #*************************************************************************
+#
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -25,6 +22,7 @@
 # version 3 along with OpenOffice.org.  If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
+#
 #***********************************************************************/
 
 PRJ = @BACKPATH@../..

cppunit/ooo-cppunit_dll.mk

 #*************************************************************************
+#
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -25,6 +22,7 @@
 # version 3 along with OpenOffice.org.  If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
+#
 #***********************************************************************/
 
 PRJ = @BACKPATH@../..

epm/makefile.mk

@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify

external/glibc-2.1.3.patch

 --- misc/glibc-2.1.3/posix/config.h	Mon Mar 31 09:43:50 2008
 +++ misc/build/glibc-2.1.3/posix/config.h	Mon Mar 31 09:43:26 2008
-@@ -1 +1,45 @@
+@@ -1 +1,42 @@
 -dummy
 +/*************************************************************************
 + *
 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 + * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
++ * Copyright 2000, 2010 Oracle and/or its affiliates.
 + *
 + * OpenOffice.org - a multi-platform office productivity suite
 + *
-+ * $RCSfile: glibc-2.1.3.patch,v $
-+ * $Revision: 1.5 $
-+ *
 + * This file is part of OpenOffice.org.
 + *
 + * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -79,20 +76,16 @@
  extern int getopt ();
 --- misc/glibc-2.1.3/posix/makefile.mk	Mon Mar 31 09:43:50 2008
 +++ misc/build/glibc-2.1.3/posix/makefile.mk	Mon Mar 31 09:43:38 2008
-@@ -1 +1,67 @@
+@@ -1 +1,63 @@
 -dummy
 +#*************************************************************************
 +#
 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 +# 
-+# Copyright 2008 by Sun Microsystems, Inc.
++# Copyright 2000, 2010 Oracle and/or its affiliates.
 +#
 +# OpenOffice.org - a multi-platform office productivity suite
 +#
-+# $RCSfile: glibc-2.1.3.patch,v $
-+#
-+# $Revision: 1.5 $
-+#
 +# This file is part of OpenOffice.org.
 +#
 +# OpenOffice.org is free software: you can redistribute it and/or modify

external/glibc/makefile.mk

@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.10 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify

external/mingwheaders/makefile.mk

@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8.10.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -63,7 +59,6 @@ FILES_TO_COPY_FROM_MINGW= \
 FILES_TO_COPY_FROM_W32API= \
     amvideo.h \
     basetyps.h \
-    oaidl.h \
     objidl.h \
     specstrings.h \
     uxtheme.h \
@@ -106,6 +101,7 @@ FILES_TO_COPY_FROM_PSDK= \
     msiquery.h \
     multimon.h \
     ntquery.h \
+    oaidl.h \
     ocidl.h \
     oleauto.h \
     olectl.h \
@@ -114,6 +110,7 @@ FILES_TO_COPY_FROM_PSDK= \
     propidl.h \
     propkeydef.h \
     propsys.h \
+    propvarutil.h \
     shlobj.h \
     shobjidl.h \
     shtypes.h \

external/mingwheaders/mingw_headers.patch

@@ -207,59 +207,6 @@
  # define BEGIN_INTERFACE
  # define END_INTERFACE
  
---- include/oaidl.h.orig	2008-12-06 11:32:03.000000000 +0900
-+++ include/oaidl.h	2009-08-21 09:21:56.000000000 +0900
-@@ -65,8 +65,11 @@
- 
- typedef _COM_interface ITypeLib *LPTYPELIB;
- typedef _COM_interface ITypeLib2 *LPTYPELIB2;
-+typedef _COM_interface ICreateTypeInfo ICreateTypeInfo;
- typedef _COM_interface ICreateTypeInfo *LPCREATETYPEINFO;
- typedef _COM_interface ICreateTypeInfo2 *LPCREATETYPEINFO2;
-+typedef _COM_interface ICreateTypeLib ICreateTypeLib;
-+typedef _COM_interface ICreateTypeLib2 ICreateTypeLib2;
- typedef _COM_interface ICreateTypeLib *LPCREATETYPELIB;
- typedef _COM_interface ICreateTypeLib2 *LPCREATETYPELIB2;
- typedef _COM_interface ITypeComp *LPTYPECOMP;
-@@ -78,6 +81,8 @@
- typedef _COM_interface ICreateErrorInfo *LPCREATEERRORINFO;
- typedef _COM_interface ISupportErrorInfo *LPSUPPORTERRORINFO;
- typedef _COM_interface IRecordInfo *LPRECORDINFO;
-+typedef _COM_interface IErrorLog *LPERRORLOG;
-+typedef _COM_interface IPropertyBag *LPPROPERTYBAG;
- 
- extern const IID IID_ITypeLib;
- extern const IID IID_ITypeLib2;
-@@ -772,6 +777,29 @@
- };
- #undef INTERFACE
- 
-+EXTERN_C const IID IID_IErrorLog;
-+#define INTERFACE IErrorLog
-+DECLARE_INTERFACE_(IErrorLog,IUnknown)
-+{
-+	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-+	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-+	STDMETHOD_(ULONG,Release)(THIS) PURE;
-+	STDMETHOD(AddError)(THIS_ LPCOLESTR,LPEXCEPINFO) PURE;
-+};
-+#undef INTERFACE
-+
-+EXTERN_C const IID IID_IPropertyBag;
-+#define INTERFACE IPropertyBag
-+DECLARE_INTERFACE_(IPropertyBag,IUnknown)
-+{
-+	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-+	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-+	STDMETHOD_(ULONG,Release)(THIS) PURE;
-+	STDMETHOD(Read)(THIS_ LPCOLESTR,LPVARIANT,LPERRORLOG) PURE;
-+	STDMETHOD(Write)(THIS_ LPCOLESTR,LPVARIANT) PURE;
-+};
-+#undef INTERFACE
-+
- #ifdef __cplusplus
- }
- #endif
 --- include/objidl.h.orig	2008-12-06 11:32:04.000000000 +0900
 +++ include/objidl.h	2009-08-21 09:21:56.000000000 +0900
 @@ -1,3 +1,6 @@
@@ -381,7 +328,7 @@
  
  #endif /*_SPECSTRINGS_H */
 --- include/uxtheme.h.orig	2008-12-06 11:32:11.000000000 +0900
-+++ include/uxtheme.h	2009-08-21 09:21:56.000000000 +0900
++++ include/uxtheme.h	2010-01-22 14:50:56.327000000 +0900
 @@ -10,7 +10,7 @@
  extern "C" {
  #endif
@@ -391,6 +338,22 @@
  #define DTBG_CLIPRECT 0x00000001
  #define DTBG_DRAWSOLID 0x00000002
  #define DTBG_OMITBORDER 0x00000004
+@@ -35,6 +35,7 @@
+ #define HTTB_RESIZINGBORDER (HTTB_RESIZINGBORDER_LEFT|HTTB_RESIZINGBORDER_TOP|HTTB_RESIZINGBORDER_RIGHT|HTTB_RESIZINGBORDER_BOTTOM)
+ #define HTTB_SIZINGTEMPLATE 0x0100
+ #define HTTB_SYSTEMSIZINGMARGINS 0x0200
++#if 0
+ #define TMT_DISPLAYNAME 0x0259
+ #define TMT_TOOLTIP 0x025A
+ #define TMT_COMPANY 0x025B
+@@ -186,6 +187,7 @@
+ #define BT_IMAGEFILE  0x0000
+ #define BT_BORDERFILL 0x0001
+ #define BT_NONE       0x0002
++#endif
+ 
+ typedef enum PROPERTYORIGIN {
+ 	PO_STATE = 0,
 --- include/winbase.h.orig	2008-12-06 11:32:11.000000000 +0900
 +++ include/winbase.h	2009-08-21 09:21:56.000000000 +0900
 @@ -1354,8 +1354,8 @@
@@ -1222,6 +1185,24 @@
  #endif // __NTQUERY_H__
  
  
+--- include/oaidl.h.orig	2008-12-06 11:32:03.000000000 +0900
++++ include/oaidl.h	2010-02-27 13:28:29.448250000 +0900
+@@ -1,3 +1,6 @@
++#if __GNUC__ >=3
++#pragma GCC system_header
++#endif
+ 
+ 
+ /* this ALWAYS GENERATED file contains the definitions for the interfaces */
+@@ -442,7 +445,7 @@
+                 FLOAT fltVal;
+                 DOUBLE dblVal;
+                 VARIANT_BOOL boolVal;
+-                _VARIANT_BOOL bool;
++//                _VARIANT_BOOL bool;
+                 SCODE scode;
+                 CY cyVal;
+                 DATE date;
 --- include/ocidl.h.orig	2008-01-18 22:17:32.000000000 +0900
 +++ include/ocidl.h	2009-08-21 09:21:56.000000000 +0900
 @@ -1,3 +1,6 @@
@@ -1388,8 +1369,15 @@
  
  
 --- include/propidl.h.orig	2008-01-18 22:17:32.000000000 +0900
-+++ include/propidl.h	2009-08-21 09:21:56.000000000 +0900
-@@ -76,6 +76,14 @@
++++ include/propidl.h	2010-02-27 14:11:52.213875000 +0900
+@@ -1,3 +1,6 @@
++#if __GNUC__ >=3
++#pragma GCC system_header
++#endif
+ 
+ 
+ /* this ALWAYS GENERATED file contains the definitions for the interfaces */
+@@ -76,6 +79,14 @@
  #include "objidl.h"
  #include "oaidl.h"
  
@@ -1404,7 +1392,7 @@
  #ifdef __cplusplus
  extern "C"{
  #endif 
-@@ -143,6 +151,7 @@
+@@ -143,6 +154,7 @@
      CHAR *pElems;
      } 	CAC;
  
@@ -1412,15 +1400,25 @@
  typedef struct tagCAUB
      {
      ULONG cElems;
-@@ -268,6 +277,7 @@
+@@ -268,7 +280,9 @@
      ULONG cElems;
      CLSID *pElems;
      } 	CACLSID;
 +#endif
  
++#if 0
  #ifdef MIDL_PASS
  // This is the PROPVARIANT padding layout for marshaling.
-@@ -509,6 +519,7 @@
+ typedef BYTE PROPVAR_PAD1;
+@@ -385,6 +399,7 @@
+ #endif
+ 
+ #endif /* _MSC_EXTENSIONS */
++#endif
+ 
+ #ifdef MIDL_PASS
+ // This is the LPPROPVARIANT definition for marshaling.
+@@ -509,6 +524,7 @@
  
  #define	PRSPEC_PROPID	( 1 )
  
@@ -1428,7 +1426,7 @@
  typedef struct tagPROPSPEC
      {
      ULONG ulKind;
-@@ -526,12 +537,14 @@
+@@ -526,12 +542,14 @@
      PROPID propid;
      VARTYPE vt;
      } 	STATPROPSTG;
@@ -1443,7 +1441,7 @@
  typedef struct tagSTATPROPSETSTG
      {
      FMTID fmtid;
-@@ -542,12 +555,14 @@
+@@ -542,12 +560,14 @@
      FILETIME atime;
      DWORD dwOSVersion;
      } 	STATPROPSETSTG;
@@ -1458,7 +1456,15 @@
  #ifndef __IPropertyStorage_INTERFACE_DEFINED__
  #define __IPropertyStorage_INTERFACE_DEFINED__
  
-@@ -1136,6 +1151,7 @@
+@@ -1119,7 +1139,6 @@
+ #endif 	/* C style interface */
+ 
+ 
+-
+ /* [call_as] */ HRESULT STDMETHODCALLTYPE IEnumSTATPROPSETSTG_RemoteNext_Proxy( 
+     IEnumSTATPROPSETSTG * This,
+     /* [in] */ ULONG celt,
+@@ -1136,6 +1155,7 @@
  
  
  #endif 	/* __IEnumSTATPROPSETSTG_INTERFACE_DEFINED__ */
@@ -1466,7 +1472,7 @@
  
  
  /* interface __MIDL_itf_propidl_0000_0004 */
-@@ -1268,6 +1284,10 @@
+@@ -1268,6 +1287,10 @@
  }
  #endif
  
@@ -1518,6 +1524,23 @@
  #endif
  
  
+--- include/propvarutil.h.orig	2008-01-18 22:17:34.000000000 +0900
++++ include/propvarutil.h	2010-02-26 19:34:40.863625000 +0900
+@@ -14,6 +14,14 @@
+ #include <shtypes.h>
+ #include <shlwapi.h>
+ 
++#define __in
++#define __out
++#ifdef __cplusplus
++#define __inline inline
++#else
++#define __inline static __inline__
++#endif
++
+ #ifndef PSSTDAPI
+ #if defined(_PROPSYS_)
+ #define PSSTDAPI          STDAPI
 --- include/shlobj.h.orig	2008-01-18 22:17:36.000000000 +0900
 +++ include/shlobj.h	2009-08-21 09:21:56.000000000 +0900
 @@ -1,3 +1,6 @@

external/prj/build.lst

-el      external :       SO:external_so soltools NULL
+el      external :       soltools NULL
 el	external					usr1 - all el_mkout NULL
 el	external\glibc		nmake	-	all	el_glibc NULL
 el	external\gcc3_specific	nmake	-	all	el_gcc3 NULL

fondu/makefile.mk

@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify

hsqldb/makefile.mk

@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.22 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify

hyphen/hyphen-2.4.patch

@@ -110,20 +110,16 @@ diff -u misc/hyphen-2.4/Makefile.in misc/build/hyphen-2.4/Makefile.in
 diff -u misc/hyphen-2.4/makefile.mk misc/build/hyphen-2.4/makefile.mk
 --- misc/hyphen-2.4/makefile.mk	2008-06-04 10:43:21.000000000 +0200
 +++ misc/build/hyphen-2.4/makefile.mk	2008-06-04 12:40:46.000000000 +0200
-@@ -1 +1,58 @@
+@@ -1 +1,54 @@
 -dummy
 +#*************************************************************************
 +#
 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 +# 
-+# Copyright 2008 by Sun Microsystems, Inc.
++# Copyright 2000, 2010 Oracle and/or its affiliates.
 +#
 +# OpenOffice.org - a multi-platform office productivity suite
 +#
-+# $RCSfile: hyphen-2.4.patch,v $
-+#
-+# $Revision: 1.1.4.2 $
-+#
 +# This file is part of OpenOffice.org.
 +#
 +# OpenOffice.org is free software: you can redistribute it and/or modify

hyphen/makefile.mk

@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8.2.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -77,7 +73,7 @@ BUILD_ACTION=make hyph_en_US.dic
 @all:
     echo "Nothing to do here."
 .ELSE
-BUILD_ACTION=make
+BUILD_ACTION=make && make check
 OUT2INC += hyphen.h 
 .ENDIF
 

icc/makefile.mk

@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify

icc/source/create_sRGB_profile/create_sRGB_profile.cpp

@@ -2,11 +2,6 @@
  *
  *  OpenOffice.org - a multi-platform office productivity suite
  *
- *  $RCSfile: create_sRGB_profile.cpp,v $
- *
- *  $Revision: 1.6 $
- *
- *  last change: $Author: rt $ $Date: 2008-04-11 07:31:14 $
 
   Derived by beppec56@openoffice.org from various examples
   in SampleICC library, the original copyright retained.

libegg/source/makefile.mk

@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify

libtextcat/libtextcat-2.2.patch

@@ -932,20 +932,16 @@
 +}
 --- misc/libtextcat-2.2/src/makefile.mk	Mon Mar 31 11:30:06 2008
 +++ misc/build/libtextcat-2.2/src/makefile.mk	Mon Mar 31 11:29:42 2008
-@@ -1 +1,91 @@
+@@ -1 +1,87 @@
 -dummy
 +#*************************************************************************
 +#
 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 +# 
-+# Copyright 2008 by Sun Microsystems, Inc.
++# Copyright 2000, 2010 Oracle and/or its affiliates.
 +#
 +# OpenOffice.org - a multi-platform office productivity suite
 +#
-+# $RCSfile: libtextcat-2.2.patch,v $
-+#
-+# $Revision: 1.8 $
-+#
 +# This file is part of OpenOffice.org.
 +#
 +# OpenOffice.org is free software: you can redistribute it and/or modify

libtextcat/makefile.mk

@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify

libwpd/makefile.mk

@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.16 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify

libxmlsec/makefile.mk

@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.19 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -131,6 +127,7 @@ xmlsec_CFLAGS+=$(C_RESTRICTIONFLAGS)
 .ENDIF			# "$(COMNAME)"=="sunpro5"
 .IF "$(EXTRA_CFLAGS)"!=""
 xmlsec_CFLAGS+=$(EXTRA_CFLAGS)
+xmlsec_CPPFLAGS+=$(EXTRA_CFLAGS)
 .ENDIF # "$(EXTRA_CFLAGS)"!=""
 xmlsec_LDFLAGS+=-L$(SYSBASE)$/usr$/lib
 .ELIF "$(OS)"=="MACOSX" # "$(SYSBASE)"!=""

lpsolve/makefile.mk

@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify

lucene/makefile.mk

@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3.2.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify

lucene/version.mk

@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: version.mk,v $
-#
-# $Revision: 1.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify

mysqlcppconn/cppconn_config.pmk

+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+#   OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJNAME = mysqlcppconn
+ENABLE_EXCEPTIONS = TRUE
+USE_LDUMP2 = TRUE
+EXTERNAL_WARNINGS_NOT_ERRORS = TRUE
+
+CPPCONN_NATIVEAPI = cppconn_nativeapi

mysqlcppconn/makefile.mk

+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.22 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=.
+
+PRJNAME=mysqlcppconn
+TARGET=so_mysqlcppconn
+
+EXT_PROJECT_NAME=mysql-connector-cpp
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+# --- Files --------------------------------------------------------
+
+TARFILE_NAME=$(EXT_PROJECT_NAME)
+ADDITIONAL_FILES=\
+                 driver$/makefile.mk \
+                 driver$/nativeapi$/makefile.mk \
+                 driver$/nativeapi$/binding_config.h \
+                 cppconn$/config.h
+
+CONVERTFILES=\
+                cppconn$/build_config.h
+
+PATCH_FILES=\
+    $(TARFILE_NAME).patch \
+    patches/default_to_protocol_tcp.patch
+
+BUILD_DIR=driver
+BUILD_ACTION = \
+            cd nativeapi \
+         && $(MAKE) $(MFLAGS) $(CALLMACROS) \
+         && cd .. \
+         && $(MAKE) $(MFLAGS) $(CALLMACROS)
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+.INCLUDE : tg_ext.mk
+
+# --- post-build ---------------------------------------------------
+
+# "normalize" the output structure, in that the C/C++ headers are
+# copied to the canonic location in OUTPATH
+# The allows, later on, to use the standard mechanisms to deliver those
+# files, instead of delivering them out of OUTPATH/misc/build/..., which
+# could cause problems
+
+NORMALIZE_FLAG_FILE=so_normalized_$(TARGET)
+
+$(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
+    @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(EXT_PROJECT_NAME)$/driver$/mysql_driver.h $(INCCOM)
+    -@$(MKDIRHIER) $(INCCOM)$/cppconn
+    @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(EXT_PROJECT_NAME)$/cppconn$/* $(INCCOM)$/cppconn
+    @$(TOUCH) $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
+
+normalize: $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
+
+$(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : normalize

mysqlcppconn/mysql_config.pmk

+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+#   OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+.IF "$(SYSTEM_MYSQL)" == "YES"
+  CFLAGS+=-DSYSTEM_MYSQL
+.ELSE
+  .IF "$(LIBMYSQL_PATH)" == ""
+    alltar:
+      @echo "need to have LIBMYSQL_PATH set to the location where libmysql (also known as 'MySQL Connector/C') is installed"
+      @force_dmake_to_error
+  .ENDIF
+.ENDIF
+
+.IF "$(GUI)"=="WNT"
+
+CFLAGS+=-DCPPDBC_WIN32 -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS
+
+.ENDIF  # "$(GUI)"=="WNT"
+
+.IF "$(SYSTEM_MYSQL)" != "YES"
+    MYSQL_INC+=-I$(LIBMYSQL_PATH)$/include
+.ENDIF
+
+CFLAGS+=-I$(PRJINC) -I$(PRJINC)$/cppconn $(MYSQL_INC) -DCPPCONN_LIB_BUILD
+

mysqlcppconn/patches/default_to_protocol_tcp.patch

+--- misc/mysql-connector-cpp/driver/mysql_connection.cpp	2009-12-16 13:24:24.088933245 +0100
++++ misc/build/mysql-connector-cpp/driver/mysql_connection.cpp	2009-12-16 13:24:15.666841004 +0100
+@@ -437,6 +437,9 @@
+ 		throw sql::InvalidArgumentException(e.what());
+ 	}
+ 
++	int default_protocol_tcp = MYSQL_PROTOCOL_TCP;
++	proxy->options(MYSQL_OPT_PROTOCOL, (const char *) &default_protocol_tcp);
++
+ #ifndef _WIN32
+ 	if (!hostName.compare(0, sizeof("unix://") - 1, "unix://")) {
+ 		protocol_tcp = false;

mysqlcppconn/prj/build.lst

+my	mysqlcppconn	:	solenv sal NULL
+my	mysqlcppconn    nmake	-	all	my_mkout NULL
+

mysqlcppconn/prj/d.lst

+# mirror the dir structure a make install would create
+mkdir: %_DEST%\inc%_EXT%\mysqlcppconn
+mkdir: %_DEST%\inc%_EXT%\mysqlcppconn\cppconn
+
+..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\mysqlcppconn\*.h
+..\%__SRC%\inc\cppconn\*.h %_DEST%\inc%_EXT%\mysqlcppconn\cppconn\*.h
+
+..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
+
+ ..\%__SRC%\lib\lib*.so* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl
+..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
+..\%__SRC%\lib\*.dylib.* %_DEST%\lib%_EXT%\*.dylib.*
+..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
+..\%__SRC%\lib\i*.lib %_DEST%\lib%_EXT%

np_sdk/mozsrc/makefile.mk

@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify

openssl/makefile.mk

@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.26 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify

openssl/version.mk

@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: version.mk,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify

redland/raptor/makefile.mk

@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify

redland/raptor/raptor-1.4.18.patch.dmake

 --- misc/raptor-1.4.18/src/makefile.mk	Thu Nov  6 15:25:51 2008
 +++ misc/build/raptor-1.4.18/src/makefile.mk	Thu Nov  6 15:33:14 2008
-@@ -1,1 +1,123 @@
+@@ -1,1 +1,119 @@
 -dummy
 +#*************************************************************************
 +#
 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 +#
-+# Copyright 2008 by Sun Microsystems, Inc.
++# Copyright 2000, 2010 Oracle and/or its affiliates.
 +#
 +# OpenOffice.org - a multi-platform office productivity suite
 +#
-+# $RCSfile: raptor-1.4.18.patch,v $
-+#
-+# $Revision: 1.1.2.1 $
-+#
 +# This file is part of OpenOffice.org.
 +#
 +# OpenOffice.org is free software: you can redistribute it and/or modify

redland/raptor/raptor2.map

-RAPTOR2 {
+UDK_3_0_0 {
     global:
         GetVersionInfo;
 raptor_ntriples_string_as_utf8_string;

redland/rasqal/makefile.mk

@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8.2.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -59,8 +55,7 @@ OOO_PATCH_FILES= \
     $(TARFILE_NAME).patch.autotools \
     $(TARFILE_NAME).patch.ooo_build \
     $(TARFILE_NAME).patch.dmake \
-    $(TARFILE_NAME).patch.win32 \
-
+    $(TARFILE_NAME).patch.win32
 
 PATCH_FILES=$(OOO_PATCH_FILES)
 

redland/rasqal/rasqal-0.9.16.patch.dmake

 --- misc/rasqal-0.9.16/src/makefile.mk	Thu Nov  6 15:56:45 2008
 +++ misc/build/rasqal-0.9.16/src/makefile.mk	Thu Nov  6 15:55:09 2008
-@@ -1,1 +1,98 @@
+@@ -1,1 +1,94 @@
 -dummy
 +#*************************************************************************
 +#
 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 +#
-+# Copyright 2008 by Sun Microsystems, Inc.
++# Copyright 2000, 2010 Oracle and/or its affiliates.
 +#
 +# OpenOffice.org - a multi-platform office productivity suite
 +#
-+# $RCSfile: rasqal-0.9.16.patch,v $
-+#
-+# $Revision: 1.1.2.1 $
-+#
 +# This file is part of OpenOffice.org.
 +#
 +# OpenOffice.org is free software: you can redistribute it and/or modify

redland/rasqal/rasqal-0.9.16.patch.ooo_build

@@ -32,3 +32,25 @@
  fi
  if test "$echo_libtool_libs" = "yes"; then
    echo @libdir@/@RASQAL_LIBTOOLLIBS@
+--- misc/rasqal-0.9.16/Makefile.am	2010-02-12 08:43:21.000000000 +0000
++++ misc/build/rasqal-0.9.16/Makefile.am	2010-02-12 08:43:56.000000000 +0000
+@@ -22,7 +22,7 @@
+ 
+ noinst_SCRIPTS = rasqal-src-config
+ 
+-SUBDIRS=src utils tests docs data win32
++SUBDIRS=src tests docs data win32
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = rasqal.pc
+--- misc/rasqal-0.9.16/Makefile.in	2010-02-12 08:43:19.000000000 +0000
++++ misc/build/rasqal-0.9.16/Makefile.in	2010-02-12 08:44:03.000000000 +0000
+@@ -242,7 +242,7 @@
+ with_raptor = @with_raptor@
+ with_redland = @with_redland@
+ noinst_SCRIPTS = rasqal-src-config
+-SUBDIRS = src utils tests docs data win32
++SUBDIRS = src tests docs data win32
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = rasqal.pc
+ EXTRA_DIST = ChangeLog ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog.4 \

redland/rasqal/rasqal2.map

-RASQAL2 {
+UDK_3_0_0 {
 global:
 GetVersionInfo;
 rasqal_xsd_decimal_set_string;

redland/redland/makefile.mk

@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8.2.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,14 +54,13 @@ OOO_PATCH_FILES= \
     $(TARFILE_NAME).patch.legal \
     $(TARFILE_NAME).patch.autotools \
     $(TARFILE_NAME).patch.dmake \
-    $(TARFILE_NAME).patch.win32 \
-
+    $(TARFILE_NAME).patch.ooo_build \
+    $(TARFILE_NAME).patch.win32
 
 PATCH_FILES=$(OOO_PATCH_FILES) \
     $(TARFILE_NAME).patch.free_null \
     $(TARFILE_NAME).patch.storage_hashes_context_serialize_get_statement \
-    $(TARFILE_NAME).patch.storage_hashes_list_duplicates \
-
+    $(TARFILE_NAME).patch.storage_hashes_list_duplicates
 
 .IF "$(OS)"=="OS2"
 BUILD_ACTION=dmake

redland/redland/redland-1.0.8.patch.dmake

 --- misc/redland-1.0.8/librdf/makefile.mk	Mon Jun 16 19:32:46 2008
 +++ misc/build/redland-1.0.8/librdf/makefile.mk	Mon Jun 16 19:26:20 2008
-@@ -1,1 +1,115 @@
+@@ -1,1 +1,111 @@
 -dummy
 +#*************************************************************************
 +#
 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 +#
-+# Copyright 2008 by Sun Microsystems, Inc.
++# Copyright 2000, 2010 Oracle and/or its affiliates.
 +#
 +# OpenOffice.org - a multi-platform office productivity suite
 +#
-+# $RCSfile: redland-1.0.8.patch,v $
-+#
-+# $Revision: 1.1.2.1 $
-+#
 +# This file is part of OpenOffice.org.
 +#
 +# OpenOffice.org is free software: you can redistribute it and/or modify

redland/redland/redland-1.0.8.patch.ooo_build

+--- misc/redland-1.0.8/Makefile.am	2010-02-12 08:47:40.000000000 +0000
++++ misc/build/redland-1.0.8/Makefile.am	2010-02-12 08:47:51.000000000 +0000
+@@ -48,7 +48,7 @@
+ # to ensure that the raptor and rasqal subdirectories are called
+ # as CONFIG_SUBDIR directories.
+ #
+-SUBDIRS=@LOCAL_SUBDIRS@ librdf examples utils demos docs data
++SUBDIRS=@LOCAL_SUBDIRS@ librdf examples demos docs data
+ 
+ EXTRA_DIST=ChangeLog ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog.4 \
+ ChangeLog.5 ChangeLog.6 ChangeLog.7 \
+--- misc/redland-1.0.8/Makefile.in	2010-02-12 08:47:39.000000000 +0000
++++ misc/build/redland-1.0.8/Makefile.in	2010-02-12 08:47:55.000000000 +0000
+@@ -283,7 +283,7 @@
+ # to ensure that the raptor and rasqal subdirectories are called
+ # as CONFIG_SUBDIR directories.
+ #
+-SUBDIRS = @LOCAL_SUBDIRS@ librdf examples utils demos docs data
++SUBDIRS = @LOCAL_SUBDIRS@ librdf examples demos docs data
+ EXTRA_DIST = ChangeLog ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog.4 \
+ ChangeLog.5 ChangeLog.6 ChangeLog.7 \
+ README      NEWS      LICENSE.txt  TODO \

redland/redland/redland2.map

-REDLAND2 {
+UDK_3_0_0 {
 global:
 GetVersionInfo;
 librdf_get_concept_resource_by_index;

redland/redlandversion.mk

@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: redlandversion.mk,v $
-#
-# $Revision: 1.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify

rhino/makefile.mk

@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.10 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify

rhino/rhino1_5R5.patch

@@ -1043,19 +1043,16 @@
  
 --- misc/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/OfficeScriptInfo.java	Fri Mar 28 17:25:34 2008
 +++ misc/build/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/OfficeScriptInfo.java	Fri Mar 28 17:24:59 2008
-@@ -1 +1,133 @@
+@@ -1 +1,130 @@
 -dummy
 +/*************************************************************************
 + *
 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 + * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
++ * Copyright 2000, 2010 Oracle and/or its affiliates.
 + *
 + * OpenOffice.org - a multi-platform office productivity suite
 + *
-+ * $RCSfile: rhino1_5R5.patch,v $
-+ * $Revision: 1.3 $
-+ *
 + * This file is part of OpenOffice.org.
 + *
 + * OpenOffice.org is free software: you can redistribute it and/or modify

twain/util/makefile.mk

@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify

vigra/makefile.mk

@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify

xsltml/makefile.mk

@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify