--- cppu/prj/d.lst	9 May 2007 13:35:55 -0000	1.19
+++ cppu/prj/d.lst	25 Jul 2007 23:40:12 -0000
@@ -59,7 +59,7 @@
 
 ..\%__SRC%\lib\ipurpenvhelper*        %_DEST%\lib%_EXT%\*
 ..\%__SRC%\bin\purpenvhelper*.dll     %_DEST%\bin%_EXT%\*
-..\%__SRC%\lib\libuno_purpenvhelper*  %_DEST%\lib%_EXT%\*
+..\%__SRC%\lib\libuno_purpenvhelper*.*.*  %_DEST%\lib%_EXT%\*
 
 ..\%__SRC%\bin\unsafe_uno_uno*.dll    %_DEST%\bin%_EXT%\*
 ..\%__SRC%\lib\libunsafe_uno_uno.*    %_DEST%\lib%_EXT%\*
@@ -68,3 +68,4 @@
 ..\%__SRC%\lib\libaffine_uno_uno.*   %_DEST%\lib%_EXT%\*
 
 linklib: libuno_cppu.*.*
+linklib: libuno_purpenvhelper*.*.*
--- curl/curl-7.12.2.patch	6 Jul 2007 14:28:58 -0000	1.16
+++ curl/curl-7.12.2.patch	25 Jul 2007 19:56:50 -0000
@@ -523,68 +523,3 @@
      * Check the current list of connections to see if we can
      * re-use an already existing one or if we have to create a
      * new one.
-*** misc/curl-7.12.2/ltmain.sh	2004-08-09 13:12:17.000000000 +0200
---- misc/build/curl-7.12.2/ltmain.sh	2006-11-28 15:18:20.000000000 +0100
-***************
-*** 2915,2926 ****
-  	  # which has an extra 1 added just for fun
-  	  #
-  	  case $version_type in
-! 	  darwin|linux|osf|windows)
-  	    current=`expr $number_major + $number_minor`
-  	    age="$number_minor"
-  	    revision="$number_revision"
-  	    ;;
-! 	  freebsd-aout|freebsd-elf|sunos)
-  	    current="$number_major"
-  	    revision="$number_minor"
-  	    age="0"
---- 2915,2926 ----
-  	  # which has an extra 1 added just for fun
-  	  #
-  	  case $version_type in
-! 	  darwin|linux|osf|windows|freebsd-aout|freebsd-elf)
-  	    current=`expr $number_major + $number_minor`
-  	    age="$number_minor"
-  	    revision="$number_revision"
-  	    ;;
-! 	  sunos)
-  	    current="$number_major"
-  	    revision="$number_minor"
-  	    age="0"
-***************
-*** 2990,3005 ****
-  	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-  	  ;;
-  
-- 	freebsd-aout)
-- 	  major=".$current"
-- 	  versuffix=".$current.$revision";
-- 	  ;;
-- 
-- 	freebsd-elf)
-- 	  major=".$current"
-- 	  versuffix=".$current";
-- 	  ;;
-- 
-  	irix | nonstopux)
-  	  major=`expr $current - $age + 1`
-  
---- 2990,2995 ----
-***************
-*** 3022,3028 ****
-  	  versuffix="$major.$revision"
-  	  ;;
-  
-! 	linux)
-  	  major=.`expr $current - $age`
-  	  versuffix="$major.$age.$revision"
-  	  ;;
---- 3012,3018 ----
-  	  versuffix="$major.$revision"
-  	  ;;
-  
-! 	linux|freebsd-aout|freebsd-elf)
-  	  major=.`expr $current - $age`
-  	  versuffix="$major.$age.$revision"
-  	  ;;
--- curl/curlversion.mk	2007-07-27 13:11:00.000000000 -0400
+++ curl/curlversion.mk	2007-07-27 12:58:01.000000000 -0400
@@ -0,0 +1,42 @@
+#*************************************************************************
+#
+#   OpenOffice.org - a multi-platform office productivity suite
+#
+#   $RCSfile$
+#
+#   $Revision$
+#
+#   last change: $Author$ $Date$
+#
+#   The Contents of this file are made available subject to
+#   the terms of GNU Lesser General Public License Version 2.1.
+#
+#
+#     GNU Lesser General Public License Version 2.1
+#     =============================================
+#     Copyright 2005 by Sun Microsystems, Inc.
+#     901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#     This library is free software; you can redistribute it and/or
+#     modify it under the terms of the GNU Lesser General Public
+#     License version 2.1, as published by the Free Software Foundation.
+#
+#     This library 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 for more details.
+#
+#     You should have received a copy of the GNU Lesser General Public
+#     License along with this library; if not, write to the Free Software
+#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#     MA  02111-1307  USA
+#
+#*************************************************************************
+# major 
+CURL_MAJOR=7
+# minor 
+CURL_MINOR=12
+# micro 
+CURL_MICRO=2
+# short
+CURL_SHORT=3
--- curl/makefile.mk	26 Mar 2007 15:00:23 -0000	1.20
+++ curl/makefile.mk	27 Jul 2007 17:11:39 -0000
@@ -49,8 +49,12 @@
 
 # --- Files --------------------------------------------------------
 
-TARFILE_NAME=curl-7.12.2
-PATCH_FILE_NAME=curl-7.12.2.patch
+.INCLUDE :	curlversion.mk
+
+CURLVERSION=$(CURL_MAJOR).$(CURL_MINOR).$(CURL_MICRO)
+
+TARFILE_NAME=curl-$(CURLVERSION)
+PATCH_FILE_NAME=$(TARFILE_NAME).patch
 CONVERTFILES= \
     lib$/Makefile.vc6
 
@@ -78,7 +82,7 @@
 .ENDIF
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 
-OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl*$(DLLPOST)*
+OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl*$(DLLPOST).*
 .ENDIF			# "$(GUI)"=="UNX"
 
 
--- curl/prj/d.lst	26 Mar 2007 15:00:47 -0000	1.3
+++ curl/prj/d.lst	27 Jul 2007 17:12:12 -0000
@@ -8,6 +8,9 @@
 ..\%__SRC%\inc\types.h %_DEST%\inc%_EXT%\external\curl\types.h
 
 ..\%__SRC%\bin\libcurl*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\lib\libcurl.* %_DEST%\lib%_EXT%\libcurl.*
+..\%__SRC%\lib\libcurl.so.* %_DEST%\lib%_EXT%\libcurl.so.*
+..\%__SRC%\lib\libcurl.dylib.* %_DEST%\lib%_EXT%\libcurl.dylib.*
+..\curlversion.mk %_DEST%\inc%_EXT%\curlversion.mk
 
-linklib: libcurl.*.*
\ No newline at end of file
+linklib: libcurl.so.*
+linklib: libcurl.dylib.*
--- libxml2/libxml2-2.6.17.patch	5 Jul 2007 08:54:42 -0000	1.7
+++ libxml2/libxml2-2.6.17.patch	25 Jul 2007 18:50:23 -0000
@@ -258,27 +258,6 @@
   #define DEBUG_MEMORY_LOCATION
   #endif
   
-*** misc/libxml2-2.6.17/ltmain.sh	Sun Jan 16 21:02:25 2005
---- misc/build/libxml2-2.6.17/ltmain.sh	Thu Apr 19 13:52:02 2007
-***************
-*** 2999,3006 ****
-  	  ;;
-  
-  	freebsd-elf)
-! 	  major=".$current"
-! 	  versuffix=".$current";
-  	  ;;
-  
-  	irix | nonstopux)
---- 2999,3006 ----
-  	  ;;
-  
-  	freebsd-elf)
-! 	  major=.`expr $current - $age`
-! 	  versuffix="$major.$age.$revision"
-  	  ;;
-  
-  	irix | nonstopux)
 *** misc/libxml2-2.6.17/nanohttp.c	Tue Jan  4 15:49:47 2005
 --- misc/build/libxml2-2.6.17/nanohttp.c	Thu Apr 19 13:52:02 2007
 ***************
--- libxml2/makefile.mk	25 May 2007 15:02:19 -0000	1.17
+++ libxml2/makefile.mk	27 Jul 2007 17:12:31 -0000
@@ -50,7 +50,9 @@
 
 # --- Files --------------------------------------------------------
 
-LIBXML2VERSION=2.6.17
+.INCLUDE :	xml2version.mk
+
+LIBXML2VERSION=$(XML2_MAJOR).$(XML2_MINOR).$(XML2_MICRO)
 
 TARFILE_NAME=$(PRJNAME)-$(LIBXML2VERSION)
 .IF "$(OS)$(COM)"=="WNTGCC"
@@ -116,7 +118,7 @@
 OUT2BIN+=win32$/bin.msvc$/xmllint.exe
 .ENDIF
 .ELSE
-OUT2LIB+=.libs$/libxml2.so*
+OUT2LIB+=.libs$/libxml2.so.*
 OUT2BIN+=.libs$/xmllint
 .ENDIF
 
@@ -125,4 +127,3 @@
 .INCLUDE : set_ext.mk
 .INCLUDE : target.mk
 .INCLUDE : tg_ext.mk
-
--- libxml2/xml2version.mk	2007-07-27 13:11:00.000000000 -0400
+++ libxml2/xml2version.mk	2007-07-27 12:50:22.000000000 -0400
@@ -0,0 +1,42 @@
+#*************************************************************************
+#
+#   OpenOffice.org - a multi-platform office productivity suite
+#
+#   $RCSfile$
+#
+#   $Revision$
+#
+#   last change: $Author$ $Date$
+#
+#   The Contents of this file are made available subject to
+#   the terms of GNU Lesser General Public License Version 2.1.
+#
+#
+#     GNU Lesser General Public License Version 2.1
+#     =============================================
+#     Copyright 2005 by Sun Microsystems, Inc.
+#     901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#     This library is free software; you can redistribute it and/or
+#     modify it under the terms of the GNU Lesser General Public
+#     License version 2.1, as published by the Free Software Foundation.
+#
+#     This library 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 for more details.
+#
+#     You should have received a copy of the GNU Lesser General Public
+#     License along with this library; if not, write to the Free Software
+#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#     MA  02111-1307  USA
+#
+#*************************************************************************
+# major 
+XML2_MAJOR=2
+# minor 
+XML2_MINOR=6
+# micro 
+XML2_MICRO=17
+# short
+XML2_SHORT=8
--- libxml2/prj/d.lst	25 May 2007 15:02:32 -0000	1.4
+++ libxml2/prj/d.lst	27 Jul 2007 17:13:12 -0000
@@ -1,8 +1,10 @@
 mkdir: %_DEST%\inc%_EXT%\external\libxml
 ..\%__SRC%\inc\libxml\*.h %_DEST%\inc%_EXT%\external\libxml\*.h
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
 ..\%__SRC%\lib\lib*.so.* %_DEST%\lib%_EXT%
 ..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%
 ..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%
 ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%
 ..\%__SRC%\bin\xmllint* %_DEST%\bin%_EXT%
+..\xml2version.mk %_DEST%\inc%_EXT%\xml2version.mk
+
+linklib: lib*.so.*
--- libxmlsec/xmlsec1-1.2.6.patch	5 Jul 2007 08:51:39 -0000	1.21
+++ libxmlsec/xmlsec1-1.2.6.patch	25 Jul 2007 19:57:10 -0000
@@ -3405,35 +3405,6 @@
   	  if test "$pass" = conv; then
   	    deplibs="$deplib $deplibs"
 ***************
-*** 2994,3006 ****
-  	  ;;
-  
-  	freebsd-aout)
-! 	  major=".$current"
-! 	  versuffix=".$current.$revision";
-  	  ;;
-  
-  	freebsd-elf)
-! 	  major=".$current"
-! 	  versuffix=".$current";
-  	  ;;
-  
-  	irix | nonstopux)
---- 3003,3015 ----
-  	  ;;
-  
-  	freebsd-aout)
-! 	  major=.`expr $current - $age`
-! 	  versuffix="$major.$age.$revision"
-  	  ;;
-  
-  	freebsd-elf)
-! 	  major=.`expr $current - $age`
-! 	  versuffix="$major.$age.$revision"
-  	  ;;
-  
-  	irix | nonstopux)
-***************
 *** 3564,3570 ****
   		fi
   	      else
--- libxmlsec/makefile.mk	27 Jun 2007 13:58:24 -0000	1.13
+++ libxmlsec/makefile.mk	27 Jul 2007 19:03:45 -0000
@@ -50,8 +50,9 @@
 
 # --- Files --------------------------------------------------------
 
-XMLSEC1VERSION=1.2.6
+.INCLUDE :	xmlsec1version.mk
 
+XMLSEC1VERSION=$(XMLSEC1_MAJOR).$(XMLSEC1_MINOR).$(XMLSEC1_MICRO)
 TARFILE_NAME=$(PRJNAME)-$(XMLSEC1VERSION)
 PATCH_FILE_NAME=$(TARFILE_NAME).patch
 
@@ -166,7 +167,7 @@
 OUT2BIN+=win32$/binaries$/*.dll
 .ENDIF
 .ELSE
-OUT2LIB+=src$/.libs$/libxmlsec1.so* src$/nss$/.libs$/libxmlsec1-nss.so*
+OUT2LIB+=src$/.libs$/libxmlsec1.so.* src$/nss$/.libs$/libxmlsec1-nss.so.*
 .ENDIF
 
 # --- Targets ------------------------------------------------------
@@ -174,5 +175,3 @@
 .INCLUDE : set_ext.mk
 .INCLUDE : target.mk
 .INCLUDE : tg_ext.mk
-
-
--- libxmlsec/xmlsec1version.mk	2007-07-27 15:00:00.000000000 -0400
+++ libxmlsec/xmlsec1version.mk	2007-07-27 14:17:08.000000000 -0400
@@ -0,0 +1,42 @@
+#*************************************************************************
+#
+#   OpenOffice.org - a multi-platform office productivity suite
+#
+#   $RCSfile$
+#
+#   $Revision$
+#
+#   last change: $Author$ $Date$
+#
+#   The Contents of this file are made available subject to
+#   the terms of GNU Lesser General Public License Version 2.1.
+#
+#
+#     GNU Lesser General Public License Version 2.1
+#     =============================================
+#     Copyright 2005 by Sun Microsystems, Inc.
+#     901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#     This library is free software; you can redistribute it and/or
+#     modify it under the terms of the GNU Lesser General Public
+#     License version 2.1, as published by the Free Software Foundation.
+#
+#     This library 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 for more details.
+#
+#     You should have received a copy of the GNU Lesser General Public
+#     License along with this library; if not, write to the Free Software
+#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#     MA  02111-1307  USA
+#
+#*************************************************************************
+# major 
+XMLSEC1_MAJOR=1
+# minor 
+XMLSEC1_MINOR=2
+# micro 
+XMLSEC1_MICRO=6
+# short
+XMLSEC1_SHORT=3
--- libxmlsec/prj/d.lst	10 Mar 2005 17:49:59 -0000	1.3
+++ libxmlsec/prj/d.lst	27 Jul 2007 19:04:09 -0000
@@ -4,9 +4,11 @@
 ..\%__SRC%\inc\xmlsec\*.h %_DEST%\inc%_EXT%\external\xmlsec\*.h
 ..\%__SRC%\inc\xmlsec\nss\*.h %_DEST%\inc%_EXT%\external\xmlsec\nss\*.h
 ..\%__SRC%\inc\xmlsec\mscrypto\*.h %_DEST%\inc%_EXT%\external\xmlsec\mscrypto\*.h
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
 ..\%__SRC%\lib\lib*.so.* %_DEST%\lib%_EXT%
 ..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%
 ..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%
 ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%
 ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%
+..\xmlsec1version.mk %_DEST%\inc%_EXT%\xmlsec1version.mk
+
+linklib: lib*.so.*
--- libxslt/libxslt-1.1.16.patch	19 Jul 2007 13:25:43 -0000	1.5
+++ libxslt/libxslt-1.1.16.patch	25 Jul 2007 18:50:42 -0000
@@ -107,45 +107,3 @@
   } xsltStyleType;
   
   /**
-*** misc/libxslt-1.1.16/ltmain.sh	Sun Feb 12 01:50:49 2006
---- misc/build/libxslt-1.1.16/ltmain.sh	Thu Jul 19 13:47:15 2007
-***************
-*** 3192,3200 ****
-  	    revision="$number_revision"
-  	    ;;
-  	  freebsd-aout|freebsd-elf|sunos)
-! 	    current="$number_major"
-! 	    revision="$number_minor"
-! 	    age="0"
-  	    ;;
-  	  irix|nonstopux)
-  	    current=`expr $number_major + $number_minor - 1`
---- 3192,3200 ----
-  	    revision="$number_revision"
-  	    ;;
-  	  freebsd-aout|freebsd-elf|sunos)
-! 	    current=`expr $number_major + $number_minor`
-! 	    age="$number_minor"
-! 	    revision="$number_revision"
-  	    ;;
-  	  irix|nonstopux)
-  	    current=`expr $number_major + $number_minor - 1`
-***************
-*** 3267,3274 ****
-  	  ;;
-  
-  	freebsd-elf)
-! 	  major=".$current"
-! 	  versuffix=".$current";
-  	  ;;
-  
-  	irix | nonstopux)
---- 3267,3274 ----
-  	  ;;
-  
-  	freebsd-elf)
-! 	  major=.`expr $current - $age`
-! 	  versuffix="$major.$age.$revision"
-  	  ;;
-  
-  	irix | nonstopux)
--- libxslt/makefile.mk	19 Jul 2007 11:21:19 -0000	1.7
+++ libxslt/makefile.mk	27 Jul 2007 17:13:30 -0000
@@ -50,7 +50,9 @@
 
 # --- Files --------------------------------------------------------
 
-LIBXSLTVERSION=1.1.16
+.INCLUDE :	xsltversion.mk
+
+LIBXSLTVERSION=$(XSLT_MAJOR).$(XSLT_MINOR).$(XSLT_MICRO)
 
 TARFILE_NAME=$(PRJNAME)-$(LIBXSLTVERSION)
 PATCH_FILE_NAME=$(TARFILE_NAME).patch
@@ -113,8 +123,8 @@
 OUT2BIN+=win32$/bin.msvc$/*.exe*
 .ENDIF
 .ELSE
-OUT2LIB+=libxslt$/.libs$/libxslt.so*
-OUT2LIB+=libexslt$/.libs$/libexslt.so*
+OUT2LIB+=libxslt$/.libs$/libxslt.so.*
+OUT2LIB+=libexslt$/.libs$/libexslt.so.*
 OUT2BIN+=xsltproc$/.libs$/xsltproc
 .ENDIF
 
--- libxslt/xsltversion.mk	2007-07-27 13:11:00.000000000 -0400
+++ libxslt/xsltversion.mk	2007-07-27 12:55:05.000000000 -0400
@@ -0,0 +1,42 @@
+#*************************************************************************
+#
+#   OpenOffice.org - a multi-platform office productivity suite
+#
+#   $RCSfile$
+#
+#   $Revision$
+#
+#   last change: $Author$ $Date$
+#
+#   The Contents of this file are made available subject to
+#   the terms of GNU Lesser General Public License Version 2.1.
+#
+#
+#     GNU Lesser General Public License Version 2.1
+#     =============================================
+#     Copyright 2005 by Sun Microsystems, Inc.
+#     901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#     This library is free software; you can redistribute it and/or
+#     modify it under the terms of the GNU Lesser General Public
+#     License version 2.1, as published by the Free Software Foundation.
+#
+#     This library 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 for more details.
+#
+#     You should have received a copy of the GNU Lesser General Public
+#     License along with this library; if not, write to the Free Software
+#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#     MA  02111-1307  USA
+#
+#*************************************************************************
+# major 
+XSLT_MAJOR=1
+# minor 
+XSLT_MINOR=1
+# micro 
+XSLT_MICRO=16
+# short
+XSLT_SHORT=2
--- libxslt/prj/d.lst	9 Oct 2006 12:27:37 -0000	1.1
+++ libxslt/prj/d.lst	27 Jul 2007 17:13:59 -0000
@@ -1,8 +1,10 @@
 mkdir: %_DEST%\inc%_EXT%\external\libxslt
 ..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\external\libxslt\*.h
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
 ..\%__SRC%\lib\lib*.so.* %_DEST%\lib%_EXT%
 ..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%
 ..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%
 ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%
 ..\%__SRC%\bin\xsltproc* %_DEST%\bin%_EXT%
+..\xsltversion.mk %_DEST%\inc%_EXT%\xsltversion.mk
+
+linklib: lib*.so.*
--- scp2/inc/macros.inc	8 Mar 2006 14:05:47 -0000	1.15
+++ scp2/inc/macros.inc	27 Jul 2007 18:59:44 -0000
@@ -23,10 +23,6 @@
 #define DOCONCAT9( x, y, z, a, b, c, u, v, w)   x##y##z##a##b##c##u##v##w
 #define CONCAT9( x, y, z, a, b, c, u, v, w)     DOCONCAT9(x,y,z,a,b,c,u,v,w)
 
-#define CURL_MAJOR 3
-#define CURL_MINOR 0
-#define CURL_MICRO 0
-
 #define MOD_NAME_DESC(id) \
         ALL_LANG(Name,STR_NAME_##id); \
         ALL_LANG(Description,STR_DESC_##id)
--- scp2/source/ooo/file_library_ooo.scp	17 Jul 2007 13:46:57 -0000	1.253
+++ scp2/source/ooo/file_library_ooo.scp	27 Jul 2007 18:59:45 -0000
@@ -535,8 +535,10 @@
     Styles = (PACKED, PATCH);
     Dir = gid_Dir_Program;
   #ifdef UNX
-    #ifdef MACOSX
-       Name = STRING(CONCAT2(libcurl.3,UNXSUFFIX));
+    #if defined(FREEBSD)
+       Name = STRING(CONCAT4(libcurl,UNXSUFFIX,.,CURL_SHORT));
+    #elif defined(MACOSX)
+       Name = STRING(CONCAT3(libcurl.,CURL_SHORT,UNXSUFFIX));
     #else
        Name = STRING(CONCAT8(libcurl,UNXSUFFIX,.,CURL_MAJOR,.,CURL_MINOR,.,CURL_MICRO));
     #endif
@@ -2422,45 +2424,21 @@
     Styles              = (PACKED);
 End
 
-Shortcut gid_Shortcut_Lib_Portaudio
-    FileID              = gid_File_Lib_Portaudio;
-    Dir                 = gid_Dir_Program;
-    Name                = STRING(CONCAT3(libportaudio,UNXSUFFIX,.0));
-    Styles              = (NETWORK, RELATIVE);
-End
-
-Shortcut gid_Shortcut_Lib_Portaudio_2
-    ShortcutID  = gid_Shortcut_Lib_Portaudio;
-    Dir         = gid_Dir_Program;
-    Name        = STRING(CONCAT2(libportaudio,UNXSUFFIX));
-    Styles      = (NETWORK, RELATIVE);
-End
-
 #endif
 
 #ifndef SYSTEM_SNDFILE
 
 File gid_File_Lib_Sndfile
     TXT_FILE_BODY;
-    Name    = STRING(CONCAT3(libsndfile,UNXSUFFIX,.1.0.9));
+    #ifdef FREEBSD
+      Name  = STRING(CONCAT4(libsndfile,UNXSUFFIX,.,SNDFILE_SHORT));
+    #else
+      Name  = STRING(CONCAT8(libsndfile,UNXSUFFIX,.,SNDFILE_MAJOR,.,SNDFILE_MINOR,.,SNDFILE_MICRO));
+    #endif
     Dir                 = gid_Dir_Program;
     Styles              = (PACKED);
 End
 
-Shortcut gid_Shortcut_Lib_Sndfile
-    FileID              = gid_File_Lib_Sndfile;
-    Dir                 = gid_Dir_Program;
-    Name                = STRING(CONCAT3(libsndfile,UNXSUFFIX,.1));
-    Styles              = (NETWORK, RELATIVE);
-End
-
-Shortcut gid_Shortcut_Lib_Sndfile_2
-    ShortcutID  = gid_Shortcut_Lib_Sndfile;
-    Dir         = gid_Dir_Program;
-    Name        = STRING(CONCAT2(libsndfile,UNXSUFFIX));
-    Styles      = (NETWORK, RELATIVE);
-End
-
 #endif
 
 #endif
@@ -2508,10 +2486,12 @@
     Styles = (PACKED);
     Dir = gid_Dir_Program;
   #ifdef UNX
-    #ifdef MACOSX
-       Name = STRING(CONCAT3(libxml2,.2.6.17,UNXSUFFIX));
+    #if defined(FREEBSD)
+      Name  = STRING(CONCAT4(libxml2,UNXSUFFIX,.,XML2_SHORT));
+    #elif defined(MACOSX)
+      Name  = STRING(CONCAT7(libxml2.,XML2_MAJOR,.,XML2_MINOR,.,XML2_MICRO,UNXSUFFIX));
     #else
-       Name = STRING(CONCAT3(libxml2,UNXSUFFIX,.2.6.17));
+      Name  = STRING(CONCAT8(libxml2,UNXSUFFIX,.,XML2_MAJOR,.,XML2_MINOR,.,XML2_MICRO));
     #endif
   #else
    #ifdef _gcc3
@@ -2529,10 +2509,12 @@
     Styles = (PACKED,PATCH);
     Dir = gid_Dir_Program;
   #ifdef UNX
-    #ifdef MACOSX
-       Name = STRING(CONCAT3(libxslt,.1.1.16,UNXSUFFIX));
+    #if defined(FREEBSD)
+      Name  = STRING(CONCAT4(libxslt,UNXSUFFIX,.,XSLT_SHORT));
+    #elif defined(MACOSX)
+      Name  = STRING(CONCAT7(libxslt.,XSLT_MAJOR,.,XSLT_MINOR,.,XSLT_MICRO,UNXSUFFIX));
     #else
-       Name = STRING(CONCAT3(libxslt,UNXSUFFIX,.1.1.16));
+      Name  = STRING(CONCAT8(libxslt,UNXSUFFIX,.,XSLT_MAJOR,.,XSLT_MINOR,.,XSLT_MICRO));
     #endif
   #else
    #ifdef _gcc3
@@ -2587,11 +2569,11 @@
 #ifndef WITHOUT_MOZILLA
 File gid_File_Lib_XSec_Framework
     TXT_FILE_BODY;
-	#ifdef UNX
-        Name = STRING(CONCAT2(libxsec_fw,UNXSUFFIX));
-    #else
-        Name = "xsec_fw.dll";
-    #endif
+  #ifdef UNX
+    Name = STRING(CONCAT2(libxsec_fw,UNXSUFFIX));
+  #else
+    Name = "xsec_fw.dll";
+  #endif
     Dir = gid_Dir_Program;
     Styles = (PACKED,UNO_COMPONENT,PATCH);
     RegistryID = gid_Starregistry_Services_Rdb;
@@ -2599,11 +2581,11 @@
 
 File gid_File_Lib_XSec_XmlSec
     TXT_FILE_BODY;
-	#ifdef UNX
-        Name = STRING(CONCAT2(libxsec_xmlsec,UNXSUFFIX));
-    #else
-        Name = "xsec_xmlsec.dll";
-    #endif
+  #ifdef UNX
+    Name = STRING(CONCAT2(libxsec_xmlsec,UNXSUFFIX));
+  #else
+    Name = "xsec_xmlsec.dll";
+  #endif
     Dir = gid_Dir_Program;
     Styles = (PACKED,UNO_COMPONENT,PATCH);
     RegistryID = gid_Starregistry_Services_Rdb;
@@ -2611,11 +2593,11 @@
 
 File gid_File_Lib_XSec_XMLSecurity
     TXT_FILE_BODY;
-	#ifdef UNX
-        Name = STRING(CONCAT2(libxmlsecurity,UNXSUFFIX));
-    #else
-        Name = "xmlsecurity.dll";
-    #endif
+  #ifdef UNX
+    Name = STRING(CONCAT2(libxmlsecurity,UNXSUFFIX));
+  #else
+    Name = "xmlsecurity.dll";
+  #endif
     Dir = gid_Dir_Program;
     Styles = (PACKED,UNO_COMPONENT, PATCH);
     RegistryID = gid_Starregistry_Services_Rdb;
@@ -2623,19 +2605,21 @@
 
 File gid_File_Lib_LibXMLSec_xmlseccore
     TXT_FILE_BODY;
-    #ifdef UNX
-        #ifdef MACOSX
-            Name = STRING(CONCAT2(libxmlsec1.1.2.6,UNXSUFFIX));
-        #else
-            Name = STRING(CONCAT3(libxmlsec1,UNXSUFFIX,.1.2.6));
-        #endif
+  #ifdef UNX
+    #if defined(FREEBSD)
+      Name = STRING(CONCAT4(libxmlsec1,.,XMLSEC1_SHORT,UNXSUFFIX));
+    #elif defined(MACOSX)
+      Name = STRING(CONCAT8(libxmlsec1,.,XMLSEC1_MAJOR,.,XMLSEC1_MINOR,.,XMLSEC1_MICRO,UNXSUFFIX));
     #else
-      #ifdef _gcc3
-        Name = "libxmlsec1-1.dll";
-      #else
-        Name = "libxmlsec.dll";
-      #endif
+      Name = STRING(CONCAT8(libxmlsec1,UNXSUFFIX,.,XMLSEC1_MAJOR,.,XMLSEC1_MINOR,.,XMLSEC1_MICRO));
     #endif
+  #else
+    #ifdef _gcc3
+      Name = "libxmlsec1-1.dll";
+    #else
+      Name = "libxmlsec.dll";
+    #endif
+  #endif
     Dir = gid_Dir_Program;
     Styles = (PACKED);
 End
@@ -2656,11 +2640,13 @@
 #ifdef UNX
 File gid_File_Lib_LibXMLSec_xmlsecnss
     TXT_FILE_BODY;
-    #ifdef MACOSX
-        Name = STRING(CONCAT2(libxmlsec1-nss.1.2.6,UNXSUFFIX));
-    #else
-        Name = STRING(CONCAT3(libxmlsec1-nss,UNXSUFFIX,.1.2.6));
-    #endif
+  #if defined(FREEBSD)
+    Name = STRING(CONCAT4(libxmlsec1-nss,.,XMLSEC1_SHORT,UNXSUFFIX));
+  #elif defined(MACOSX)
+    Name = STRING(CONCAT8(libxmlsec1-nss,.,XMLSEC1_MAJOR,.,XMLSEC1_MINOR,.,XMLSEC1_MICRO,UNXSUFFIX));
+  #else
+    Name = STRING(CONCAT8(libxmlsec1-nss,UNXSUFFIX,.,XMLSEC1_MAJOR,.,XMLSEC1_MINOR,.,XMLSEC1_MICRO));
+  #endif
     Dir = gid_Dir_Program;
     Styles = (PACKED,PATCH);
 End
--- scp2/source/ooo/makefile.mk	5 Jun 2007 11:53:45 -0000	1.55
+++ scp2/source/ooo/makefile.mk	27 Jul 2007 18:59:45 -0000
@@ -109,10 +109,24 @@
 
 .IF "$(SYSTEM_LIBXML)" == "YES"
 SCPDEFS+=-DSYSTEM_LIBXML
+.ELSE
+.INCLUDE :  xml2version.mk
+SCPDEFS+=\
+    -DXML2_MAJOR=$(XML2_MAJOR) \
+    -DXML2_MINOR=$(XML2_MINOR) \
+    -DXML2_MICRO=$(XML2_MICRO) \
+    -DXML2_SHORT=$(XML2_SHORT)
 .ENDIF
 
 .IF "$(SYSTEM_LIBXSLT)" == "YES"
 SCPDEFS+=-DSYSTEM_LIBXSLT
+.ELSE
+.INCLUDE :  xsltversion.mk
+SCPDEFS+=\
+    -DXSLT_MAJOR=$(XSLT_MAJOR) \
+    -DXSLT_MINOR=$(XSLT_MINOR) \
+    -DXSLT_MICRO=$(XSLT_MICRO) \
+    -DXSLT_SHORT=$(XSLT_SHORT)
 .ENDIF
 
 .IF "$(SYSTEM_DB)" == "YES"
@@ -125,6 +139,13 @@
 
 .IF "$(WITH_MOZILLA)" == "NO"
 SCPDEFS+=-DWITHOUT_MOZILLA
+.ELSE
+.INCLUDE :  xmlsec1version.mk
+SCPDEFS+=\
+    -DXMLSEC1_MAJOR=$(XMLSEC1_MAJOR) \
+    -DXMLSEC1_MINOR=$(XMLSEC1_MINOR) \
+    -DXMLSEC1_MICRO=$(XMLSEC1_MICRO) \
+    -DXMLSEC1_SHORT=$(XMLSEC1_SHORT)
 .ENDIF
 
 .IF "$(SYSTEM_MOZILLA)" == "YES"
@@ -137,6 +158,13 @@
 
 .IF "$(SYSTEM_CURL)" == "YES"
 SCPDEFS+=-DSYSTEM_CURL
+.ELSE
+.INCLUDE :  curlversion.mk
+SCPDEFS+=\
+    -DCURL_MAJOR=$(CURL_MAJOR) \
+    -DCURL_MINOR=$(CURL_MINOR) \
+    -DCURL_MICRO=$(CURL_MICRO) \
+    -DCURL_SHORT=$(CURL_SHORT)
 .ENDIF
 
 .IF "$(WITH_BINFILTER)" == "NO"
@@ -149,6 +177,13 @@
 
 .IF "$(SYSTEM_SNDFILE)" == "YES"
 SCPDEFS+=-DSYSTEM_SNDFILE
+.ELSE
+.INCLUDE :  sndfileversion.mk
+SCPDEFS+=\
+    -DSNDFILE_MAJOR=$(SNDFILE_MAJOR) \
+    -DSNDFILE_MINOR=$(SNDFILE_MINOR) \
+    -DSNDFILE_MICRO=$(SNDFILE_MICRO) \
+    -DSNDFILE_SHORT=$(SNDFILE_SHORT)
 .ENDIF
 
 .IF "$(SYSTEM_PORTAUDIO)" == "YES"
@@ -289,4 +324,4 @@
 $(ICUVERSION_DEPENDENT_FILES) : $(SOLARINCDIR)$/icuversion.mk
 .ENDIF
 
-$(ISOLANGVERSION_DEPENDENT_FILES) : $(SOLARINCDIR)$/i18npool/version.mk
\ No newline at end of file
+$(ISOLANGVERSION_DEPENDENT_FILES) : $(SOLARINCDIR)$/i18npool/version.mk
--- scp2/source/ooo/shortcut_ooo.scp	18 Jun 2007 16:37:26 -0000	1.24
+++ scp2/source/ooo/shortcut_ooo.scp	27 Jul 2007 18:59:45 -0000
@@ -35,61 +35,113 @@
 
 #include "macros.inc"
 
+#ifdef USE_PASF
+
+#ifdef UNX
+
+#ifndef SYSTEM_PORTAUDIO
+
+Shortcut gid_Shortcut_Lib_Portaudio
+    FileID = gid_File_Lib_Portaudio;
+    Dir = gid_Dir_Program;
+    Name = STRING(CONCAT3(libportaudio,UNXSUFFIX,.0));
+    Styles = (NETWORK, RELATIVE);
+End
+
+Shortcut gid_Shortcut_Lib_Portaudio_2
+    FileID = gid_File_Lib_Portaudio;
+    Dir = gid_Dir_Program;
+    Name = STRING(CONCAT2(libportaudio,UNXSUFFIX));
+    Styles = (NETWORK, RELATIVE);
+End
+
+#endif	/* SYSTEM_PORTAUDIO */
+
+#ifndef SYSTEM_SNDFILE
+
+#ifndef FREEBSD
+
+Shortcut gid_Shortcut_Lib_Sndfile
+    FileID = gid_File_Lib_Sndfile;
+    Dir = gid_Dir_Program;
+    Name = STRING(CONCAT3(libsndfile,UNXSUFFIX,.SNDFILE_MAJOR));
+    Styles = (NETWORK, RELATIVE);
+End
+
+#endif	/* FREEBSD */
+
+Shortcut gid_Shortcut_Lib_Sndfile_2
+    FileID = gid_File_Lib_Sndfile;
+    Dir = gid_Dir_Program;
+    Name = STRING(CONCAT2(libsndfile,UNXSUFFIX));
+    Styles = (NETWORK, RELATIVE);
+End
+
+#endif	/* SYSTEM_SNDFILE */
+
+#endif	/* UNX */
+
+#endif	/* USE_PASF */
+
 #ifndef SYSTEM_LIBXML
+
 #ifdef UNX
 
+#ifndef FREEBSD
+
 Shortcut gid_Shortcut_Lib_Xml2
     FileID = gid_File_Lib_Xml2;
     Dir = gid_Dir_Program;
-#ifdef MACOSX
-    Name = STRING(CONCAT2(libxml2.2,UNXSUFFIX));
+#if defined(MACOSX)
+    Name = STRING(CONCAT4(libxml2,.,XML2_MAJOR,UNXSUFFIX));
 #else
-    Name = STRING(CONCAT3(libxml2,UNXSUFFIX,.2));
+    Name = STRING(CONCAT4(libxml2,UNXSUFFIX,.,XML2_MAJOR));
 #endif
     Styles = (NETWORK,RELATIVE);
 End
 
-#endif
-
-#ifdef UNX
+#endif	/* FREEBSD */
 
 Shortcut gid_Shortcut_Lib_Xml2_2
-    ShortcutID = gid_Shortcut_Lib_Xml2;
+    FileID = gid_File_Lib_Xml2;
     Dir = gid_Dir_Program;
     Name = STRING(CONCAT2(libxml2,UNXSUFFIX));
     Styles = (NETWORK,RELATIVE);
 End
 
-#endif
-#endif
+#endif	/* UNX */
+
+#endif	/* SYSTEM_LIBXML */
 
 #ifndef SYSTEM_LIBXSLT
+
 #ifdef UNX
 
+#ifndef FREEBSD
+
 Shortcut gid_Shortcut_Lib_Xslt
     FileID = gid_File_Lib_Xslt;
     Dir = gid_Dir_Program;
-#ifdef MACOSX
-    Name = STRING(CONCAT2(libxslt.1,UNXSUFFIX));
+#if defined(MACOSX)
+    Name = STRING(CONCAT4(libxslt,.,XSLT_MAJOR,UNXSUFFIX));
 #else
-    Name = STRING(CONCAT3(libxslt,UNXSUFFIX,.1));
+    Name = STRING(CONCAT4(libxslt,UNXSUFFIX,.,XSLT_MAJOR));
 #endif
     Styles = (NETWORK,RELATIVE);
 End
 
-#endif
-
-#ifdef UNX
+#endif	/* FreeBSD */
 
 Shortcut gid_Shortcut_Lib_Xslt_2
-    ShortcutID = gid_Shortcut_Lib_Xslt;
+    FileID = gid_File_Lib_Xslt;
     Dir = gid_Dir_Program;
     Name = STRING(CONCAT2(libxslt,UNXSUFFIX));
     Styles = (NETWORK,RELATIVE);
 End
 
-#endif
-#endif
+#endif	/* UNX */
+
+#endif	/* SYSTEM_LIBXSLT */
 
 #ifdef UNX
 
@@ -100,10 +152,6 @@
     Styles = (NETWORK,RELATIVE);
 End
 
-#endif
-
-#ifdef UNX
-
 Shortcut gid_Shortcut_Lib_Cppu_Old
     FileID = gid_File_Lib_Cppu;
     Dir = gid_Dir_Program;
@@ -111,10 +159,6 @@
     Styles = (NETWORK,RELATIVE);
 End
 
-#endif
-
-#ifdef UNX
-
 Shortcut gid_Shortcut_Lib_Cppu_Old_Linker
     ShortcutID = gid_Shortcut_Lib_Cppu_Old;
     Dir = gid_Dir_Program;
@@ -122,10 +166,6 @@
     Styles = (NETWORK,RELATIVE);
 End
 
-#endif
-
-#ifdef UNX
-
 Shortcut gid_Shortcut_Lib_Cppuhelper_Linker
     FileID = gid_File_Lib_Cppuhelper;
     Dir = gid_Dir_Program;
@@ -133,10 +173,6 @@
     Styles = (NETWORK,RELATIVE);
 End
 
-#endif
-
-#ifdef UNX
-
 Shortcut gid_Shortcut_Lib_Cppuhelper_Old
     FileID = gid_File_Lib_Cppuhelper;
     Dir = gid_Dir_Program;
@@ -144,10 +180,6 @@
     Styles = (NETWORK,RELATIVE);
 End
 
-#endif
-
-#ifdef UNX
-
 Shortcut gid_Shortcut_Lib_Cppuhelper_Old_Linker
     ShortcutID = gid_Shortcut_Lib_Cppuhelper_Old;
     Dir = gid_Dir_Program;
@@ -155,10 +187,6 @@
     Styles = (NETWORK,RELATIVE);
 End
 
-#endif
-
-#ifdef UNX
-
 Shortcut gid_Shortcut_Lib_Cppuhelper_3
     ShortcutID = gid_Shortcut_Lib_Cppuhelper_Old;
     Dir = gid_Dir_Program;
@@ -166,7 +194,7 @@
     Styles = (NETWORK,RELATIVE);
 End
 
-#endif
+#endif	/* UNX */
 
 #ifndef SYSTEM_CURL
 
@@ -179,9 +207,7 @@
     Styles = (NETWORK,RELATIVE);
 End
 
-#endif
-
-#ifdef UNX
+#ifndef FREEBSD
 
 Shortcut gid_Shortcut_Lib_Curl_1
     FileID = gid_File_Lib_Curl;
@@ -190,11 +216,14 @@
     Styles = (NETWORK,RELATIVE);
 End
 
-#endif
+#endif	/* FREEBSD */
 
-#endif
+#endif	/* UNX */
+
+#endif	/* SYSTEM_CURL */
 
 #ifdef UNX
+
 #ifndef SYSTEM_ICU
 
 Shortcut gid_Shortcut_Lib_Icudata
@@ -204,6 +233,13 @@
     Styles = (NETWORK,RELATIVE,PATCH,FORCE_INTO_UPDATE_PACKAGE);
 End
 
+Shortcut gid_Shortcut_Lib_Icudata_2
+    FileID = gid_File_Lib_Icudata;
+    Dir = gid_Dir_Program;
+    Name = STRING(CONCAT2(libicudata,UNXSUFFIX));
+    Styles = (NETWORK,RELATIVE,PATCH,FORCE_INTO_UPDATE_PACKAGE);
+End
+
 Shortcut gid_Shortcut_Lib_Icui18n
     FileID = gid_File_Lib_Icui18n;
     Dir = gid_Dir_Program;
@@ -211,6 +247,13 @@
     Styles = (NETWORK,RELATIVE,PATCH,FORCE_INTO_UPDATE_PACKAGE);
 End
 
+Shortcut gid_Shortcut_Lib_Icui18n_2
+    FileID = gid_File_Lib_Icui18n;
+    Dir = gid_Dir_Program;
+    Name = STRING(CONCAT2(libicui18n,UNXSUFFIX));
+    Styles = (NETWORK,RELATIVE,PATCH,FORCE_INTO_UPDATE_PACKAGE);
+End
+
 Shortcut gid_Shortcut_Lib_Icule
     FileID = gid_File_Lib_Icule;
     Dir = gid_Dir_Program;
@@ -218,6 +261,13 @@
     Styles = (NETWORK,RELATIVE,PATCH,FORCE_INTO_UPDATE_PACKAGE);
 End
 
+Shortcut gid_Shortcut_Lib_Icule_2
+    FileID = gid_File_Lib_Icule;
+    Dir = gid_Dir_Program;
+    Name = STRING(CONCAT2(libicule,UNXSUFFIX));
+    Styles = (NETWORK,RELATIVE,PATCH,FORCE_INTO_UPDATE_PACKAGE);
+End
+
 Shortcut gid_Shortcut_Lib_Icuuc
     FileID = gid_File_Lib_Icuuc;
     Dir = gid_Dir_Program;
@@ -225,8 +275,16 @@
     Styles = (NETWORK,RELATIVE,PATCH,FORCE_INTO_UPDATE_PACKAGE);
 End
 
-#endif
-#endif
+Shortcut gid_Shortcut_Lib_Icuuc_2
+    FileID = gid_File_Lib_Icuuc;
+    Dir = gid_Dir_Program;
+    Name = STRING(CONCAT2(libicuuc,UNXSUFFIX));
+    Styles = (NETWORK,RELATIVE,PATCH,FORCE_INTO_UPDATE_PACKAGE);
+End
+
+#endif	/* SYSTEM_ICU */
+
+#endif	/* UNX */
 
 #ifdef UNX
 
@@ -239,9 +297,9 @@
     Styles = (NETWORK,RELATIVE);
 End
 
-#endif
+#endif	/* SOLAR_JAVA */
 
-#endif
+#endif	/* UNX */
 
 #ifdef UNX
 
@@ -252,7 +310,7 @@
     Styles = (NETWORK,RELATIVE);
 End
 
-#endif
+#endif	/* UNX */
 
 #ifdef UNX
 
@@ -263,7 +321,7 @@
     Styles = (NETWORK,RELATIVE);
 End
 
-#endif
+#endif	/* UNX */
 
 #ifdef UNX
 
@@ -274,10 +332,6 @@
     Styles = (NETWORK, RELATIVE);
 End
 
-#endif
-
-#ifdef UNX
-
 Shortcut gid_Shortcut_Lib_Sal_Old
     FileID = gid_File_Lib_Sal;
     Dir = gid_Dir_Program;
@@ -285,10 +339,6 @@
     Styles = (NETWORK, RELATIVE);
 End
 
-#endif
-
-#ifdef UNX
-
 Shortcut gid_Shortcut_Lib_Sal_Old_Linker
     ShortcutID = gid_Shortcut_Lib_Sal_Old;
     Dir = gid_Dir_Program;
@@ -296,10 +346,6 @@
     Styles = (NETWORK, RELATIVE);
 End
 
-#endif
-
-#ifdef UNX
-
 Shortcut gid_Shortcut_Lib_Salhelper_Linker
     FileID = gid_File_Lib_Salhelper;
     Dir = gid_Dir_Program;
@@ -307,10 +353,6 @@
     Styles = (NETWORK,RELATIVE);
 End
 
-#endif
-
-#ifdef UNX
-
 Shortcut gid_Shortcut_Lib_Salhelper_Old
     FileID = gid_File_Lib_Salhelper;
     Dir = gid_Dir_Program;
@@ -318,10 +360,6 @@
     Styles = (NETWORK,RELATIVE);
 End
 
-#endif
-
-#ifdef UNX
-
 Shortcut gid_Shortcut_Lib_Salhelper_Old_Linker
     ShortcutID = gid_Shortcut_Lib_Salhelper_Old;
     Dir = gid_Dir_Program;
@@ -329,10 +367,6 @@
     Styles = (NETWORK,RELATIVE);
 End
 
-#endif
-
-#ifdef UNX
-
 Shortcut gid_Shortcut_Lib_Salhelper_3
     ShortcutID = gid_Shortcut_Lib_Salhelper_Old;
     Dir = gid_Dir_Program;
@@ -340,7 +374,7 @@
     Styles = (NETWORK,RELATIVE);
 End
 
-#endif
+#endif	/* UNX */
 
 #ifdef UNX
 
@@ -351,7 +385,7 @@
     Styles = (NETWORK, RELATIVE);
 End
 
-#endif
+#endif	/* UNX */
 
 #ifdef UNX
 
@@ -369,7 +403,7 @@
     Styles = (STANDALONE, NETWORK, RELATIVE);
 End
 
-#endif
+#endif	/* UNX */
 
 #if defined(UNX) && !defined(QUARTZ)
 
@@ -380,7 +414,7 @@
     Styles = (NETWORK, RELATIVE);
 End
 
-#endif
+#endif	/* UNX && !QUARTZ */
 
 #ifdef UNX
 
@@ -393,56 +427,62 @@
     Styles = (NETWORK,RELATIVE);
 End
 
-#endif
+#endif	/* SOLAR_JAVA */
 
-#endif
+#endif	/* UNX */
 
 //i38417
 #ifndef WITHOUT_MOZILLA
+
 #ifdef UNX
+
+#ifndef FREEBSD
+
 Shortcut gid_Shortcut_Lib_LibXMLSec_xmlseccore
     FileID = gid_File_Lib_LibXMLSec_xmlseccore;
     Dir = gid_Dir_Program;
 #ifdef MACOSX
-    Name = STRING(CONCAT2(libxmlsec1.1,UNXSUFFIX));
+    Name = STRING(CONCAT4(libxmlsec1,.,XMLSEC1_MAJOR,UNXSUFFIX));
 #else
-    Name = STRING(CONCAT3(libxmlsec1,UNXSUFFIX,.1));
+    Name = STRING(CONCAT4(libxmlsec1,UNXSUFFIX,.,XMLSEC1_MAJOR));
 #endif
     Styles = (NETWORK,RELATIVE);
 End
-#endif
 
-#ifdef UNX
+#endif	/* FREEBSD */
+
 Shortcut gid_Shortcut_Lib_LibXMLSec_xmlseccore_2
-    ShortcutID = gid_Shortcut_Lib_LibXMLSec_xmlseccore;
+    FileID = gid_File_Lib_LibXMLSec_xmlseccore;
     Dir = gid_Dir_Program;
     Name = STRING(CONCAT2(libxmlsec1,UNXSUFFIX));
     Styles = (NETWORK,RELATIVE);
 End
-#endif
 
-#ifdef UNX
+#ifndef FREEBSD
+
 Shortcut gid_Shortcut_Lib_LibXMLSec_xmlsecnss
     FileID = gid_File_Lib_LibXMLSec_xmlsecnss;
     Dir = gid_Dir_Program;
 #ifdef MACOSX
-    Name = STRING(CONCAT2(libxmlsec1-nss.1,UNXSUFFIX));
+    Name = STRING(CONCAT4(libxmlsec1-nss,.,XMLSEC1_MAJOR,UNXSUFFIX));
 #else
-    Name = STRING(CONCAT3(libxmlsec1-nss,UNXSUFFIX,.1));
+    Name = STRING(CONCAT4(libxmlsec1-nss,UNXSUFFIX,.,XMLSEC1_MAJOR));
 #endif
     Styles = (NETWORK,RELATIVE);
 End
-#endif
 
-#ifdef UNX
+#endif	/* FREEBSD */
+
 Shortcut gid_Shortcut_Lib_LibXMLSec_xmlsecnss_2
-    ShortcutID = gid_Shortcut_Lib_LibXMLSec_xmlsecnss;
+    FileID = gid_File_Lib_LibXMLSec_xmlsecnss;
     Dir = gid_Dir_Program;
     Name = STRING(CONCAT2(libxmlsec1-nss,UNXSUFFIX));
     Styles = (NETWORK,RELATIVE);
 End
-#endif
-#endif
+
+#endif	/* UNX */
+
+#endif	/* WITHOUT_MOZILLA */
 //i38417 -end-
 
 
@@ -457,10 +497,6 @@
     Styles = (NETWORK, RELATIVE);
 End
 
-#endif
-
-#ifdef MACOSX
-
 Shortcut gid_Shortcut_Lib_Hsqldb_2
     FileID = gid_File_Lib_Hsqldb_2;
     Dir = gid_Dir_Program;
@@ -468,6 +504,6 @@
     Styles = (NETWORK, RELATIVE);
 End
 
-#endif
+#endif	/* MACOSX */
 
 //i44154 -end-
--- scp2/source/ure/makefile.mk	22 Nov 2006 10:45:11 -0000	1.7
+++ scp2/source/ure/makefile.mk	27 Jul 2007 18:59:45 -0000
@@ -48,6 +48,13 @@
 
 .IF "$(SYSTEM_LIBXML)" == "YES"
 SCPDEFS+=-DSYSTEM_LIBXML
+.ELSE
+.INCLUDE :  xml2version.mk
+SCPDEFS+=\
+    -DXML2_MAJOR=$(XML2_MAJOR) \
+    -DXML2_MINOR=$(XML2_MINOR) \
+    -DXML2_MICRO=$(XML2_MICRO) \
+    -DXML2_SHORT=$(XML2_SHORT)
 .ENDIF
 
 .IF "$(SYSTEM_STDLIBS)" == "YES"
--- scp2/source/ure/ure.scp	18 Jul 2007 08:07:32 -0000	1.14
+++ scp2/source/ure/ure.scp	27 Jul 2007 18:59:46 -0000
@@ -604,14 +604,16 @@
     Dir = SCP2_URE_DL_DIR;
 #if defined WNT
 #if defined _gcc3
-    Name = SCP2_URE_DL_NORMAL(libxml2-2);
+    Name = SCP2_URE_DL_NORMAL(CONCAT3(libxml2, -, XML2_MAJOR));
 #else
     Name = SCP2_URE_DL_NORMAL(libxml2);
 #endif
-#elif defined MACOSX
-    Name = SCP2_URE_DL_NORMAL(xml2.2);
+#elif defined(FREEBSD)
+    Name = SCP2_URE_DL_VER(xml2, XML2_SHORT);
+#elif defined(MACOSX)
+    Name = SCP2_URE_DL_NORMAL(CONCAT3(xml2, ., XML2_MAJOR));
 #else
-    Name = SCP2_URE_DL_VER(xml2, 2);
+    Name = SCP2_URE_DL_VER(xml2, XML2_MAJOR);
 #endif
     Styles = (PACKED);
 End
--- sndfile/libsndfile-1.0.9.patch	5 Jul 2007 08:47:17 -0000	1.4
+++ sndfile/libsndfile-1.0.9.patch	25 Jul 2007 19:57:20 -0000
@@ -280,27 +280,6 @@
     version_type=freebsd-$objformat
     case $version_type in
       freebsd-elf*)
-*** misc/libsndfile-1.0.9/ltmain.sh	Sat Mar 27 05:02:07 2004
---- misc/build/libsndfile-1.0.9/ltmain.sh	Mon Jan 23 20:13:31 2006
-***************
-*** 2980,2987 ****
-  	  ;;
-  
-  	freebsd-elf)
-! 	  major=".$current"
-! 	  versuffix=".$current";
-  	  ;;
-  
-  	irix | nonstopux)
---- 2980,2987 ----
-  	  ;;
-  
-  	freebsd-elf)
-! 	  major=.`expr $current - $age`
-! 	  versuffix="$major.$age.$revision"
-  	  ;;
-  
-  	irix | nonstopux)
 *** misc/libsndfile-1.0.9/src/float_cast.h	Wed Mar  3 09:23:12 2004
 --- misc/build/libsndfile-1.0.9/src/float_cast.h	Mon Jan 23 20:16:33 2006
 ***************
--- sndfile/makefile.mk	26 Mar 2007 12:22:58 -0000	1.9
+++ sndfile/makefile.mk	27 Jul 2007 17:14:13 -0000
@@ -47,9 +47,11 @@
 .IF "$(ENABLE_PASF)" != ""
 .IF "$(SYSTEM_SNDFILE)" != "YES"
 
-TARFILE_NAME=libsndfile-1.0.9
+.INCLUDE :	sndfileversion.mk
 
-PATCH_FILE_NAME=libsndfile-1.0.9.patch
+LIBSNDFILEVERSION=$(SNDFILE_MAJOR).$(SNDFILE_MINOR).$(SNDFILE_MICRO)
+TARFILE_NAME=libsndfile-$(LIBSNDFILEVERSION)
+PATCH_FILE_NAME=$(TARFILE_NAME).patch
 
 CONFIGURE_DIR=
 
@@ -68,8 +70,11 @@
 BUILD_DIR=$(CONFIGURE_DIR)
 BUILD_ACTION=$(GNUMAKE)
 
-OUT2LIB= \
-	$/src$/.libs$/libsndfile.*
+.IF "$(OS)"!="MACOSX"
+OUT2LIB=$/src$/.libs$/libsndfile.so.*
+.ELSE
+OUT2LIB=$/src$/.libs$/libsndfile.dylib.*
+.ENDIF
 
 OUT2INC= \
 	$/src$/sndfile.h
--- sndfile/sndfileversion.mk	2007-07-27 13:11:00.000000000 -0400
+++ sndfile/sndfileversion.mk	2007-07-27 13:05:05.000000000 -0400
@@ -0,0 +1,42 @@
+#*************************************************************************
+#
+#   OpenOffice.org - a multi-platform office productivity suite
+#
+#   $RCSfile$
+#
+#   $Revision$
+#
+#   last change: $Author$ $Date$
+#
+#   The Contents of this file are made available subject to
+#   the terms of GNU Lesser General Public License Version 2.1.
+#
+#
+#     GNU Lesser General Public License Version 2.1
+#     =============================================
+#     Copyright 2005 by Sun Microsystems, Inc.
+#     901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#     This library is free software; you can redistribute it and/or
+#     modify it under the terms of the GNU Lesser General Public
+#     License version 2.1, as published by the Free Software Foundation.
+#
+#     This library 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 for more details.
+#
+#     You should have received a copy of the GNU Lesser General Public
+#     License along with this library; if not, write to the Free Software
+#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#     MA  02111-1307  USA
+#
+#*************************************************************************
+# major 
+SNDFILE_MAJOR=1
+# minor 
+SNDFILE_MINOR=0
+# micro 
+SNDFILE_MICRO=9
+# short
+SNDFILE_SHORT=1
--- sndfile/prj/d.lst	6 Oct 2004 11:49:37 -0000	1.1
+++ sndfile/prj/d.lst	27 Jul 2007 17:14:29 -0000
@@ -1,6 +1,8 @@
 mkdir: %_DEST%\inc%_EXT%\sndfile
 ..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\sndfile\*.h
-..\%__SRC%\lib\libsndfile.*.1.0.9 %_DEST%\lib%_EXT%\libsndfile.*.1.0.9
+..\%__SRC%\lib\libsndfile.so.* %_DEST%\lib%_EXT%\libsndfile.so.*
+..\%__SRC%\lib\libsndfile.dylib.* %_DEST%\lib%_EXT%\libsndfile.dylib.*
+..\sndfileversion.mk %_DEST%\inc%_EXT%\sndfileversion.mk
 
-linklib: libsndfile.so.*.*.*
-linklib: libsndfile.dylib.*.*.*
+linklib: libsndfile.so.*
+linklib: libsndfile.dylib.*
--- stlport/prj/d.lst	2 Feb 2004 20:28:29 -0000	1.10
+++ stlport/prj/d.lst	25 Jul 2007 23:27:56 -0000
@@ -17,9 +17,10 @@
 ..\%__SRC%\inc\stlport\using\h\* %_DEST%\inc%_EXT%\stl\using\h\*
 ..\%__SRC%\inc\stlport\wrap_std\* %_DEST%\inc%_EXT%\stl\wrap_std\*
 ..\%__SRC%\inc\stlport\wrap_std\h\* %_DEST%\inc%_EXT%\stl\wrap_std\h\*
-..\%__SRC%\lib\lib*.so* %_DEST%\lib%_EXT%\lib*.so*
+..\%__SRC%\lib\lib*.so.* %_DEST%\lib%_EXT%\lib*.so.*
 ..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%\lib*.a
 ..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%\lib*.dylib
 ..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
 ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
 
+linklib: lib*.so.*