cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 1.9m73

Browse Source
This commit is contained in:
Maho Nakata 2005-01-24 11:44:27 +00:00
parent 6007d77674
commit 6d3e0cf511
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=127172
96 changed files with 60 additions and 16620 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editors/openoffice-2.0-devel/Makefile
View File

@ -19,7 +19,7 @@ EXTRACT_ONLY= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
SNAPDATE= 20050119
SNAPDATE= 20050123
NO_LATEST_LINK= yes
USE_GNOME= gtk20
MOZILLA_PROJECT= cws_srx645_mozooo.20041016.tar.gz
@ -49,7 +49,7 @@ BROKEN= "rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
CODELINE= 680
RELEASE_NR= 1.9
MILESTONE= 72
MILESTONE= 73
INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE}
EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
DIST_SUBDIR= openoffice.org2.0

4
editors/openoffice-2.0-devel/distinfo
View File

@ -1,5 +1,5 @@
MD5 (openoffice.org2.0/OOo_1.9m72_source.tar.bz2) = c51fa9d749f1e5eb3733d50b91f97fe8
SIZE (openoffice.org2.0/OOo_1.9m72_source.tar.bz2) = 233690890
MD5 (openoffice.org2.0/OOo_1.9m73_source.tar.bz2) = 0885bb45bd204b03b16f8276cbd922e0
SIZE (openoffice.org2.0/OOo_1.9m73_source.tar.bz2) = 233756500
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
MD5 (openoffice.org2.0/cws_srx645_mozooo.20041016.tar.gz) = eda0ab73b24c45890ae08bdfe04049bd

2
editors/openoffice-2.0-devel/files/Makefile.knobs
View File

@ -19,7 +19,7 @@ CONFIGURE_ARGS+= --enable-cups
.if defined(ALL_LOCALIZED_LANGS)
CONFIGURE_ARGS+= --with-lang="en-US ar ca cs da de el es et fi fr he hi-IN hu it ja ko pl pt pt-BR ru sk sl sv th tr zh-CN zh-TW"
#following langs still seem to be under development
#following langs still seem to be under development
#af bg cy eo eu gl kn-IN lt nb nl nn ns tn zu
#CONFIGURE_ARGS+= --with-lang=ALL
.else

25
editors/openoffice-2.0-devel/files/patch-config_office+set_soenv.in
View File

@ -1,25 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=37731
o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=2030&Path=SRC680%2Fpj16
o pj16
Description
Do not export LINK to environment
Index: config_office/set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.31
diff -u -r1.31 set_soenv.in
--- config_office/set_soenv.in 5 Jan 2005 12:10:00 -0000 1.31
+++ config_office/set_soenv.in 9 Jan 2005 18:51:24 -0000
@@ -1684,9 +1684,6 @@
ToFile( "CC", $CC, "e" );
ToFile( "CXX", $CXX, "e" );
ToFile( "USE_SYSTEM_STL", "@USE_SYSTEM_STL@", "e" );
-if ( $COM ne "MSC" ) {
- ToFile( "LINK", $CC, "e" );
-}
ToFile( "ENABLE_SYMBOLS", "@ENABLE_SYMBOLS@", "e" );
ToFile( "ENABLE_CRASHDUMP", "@ENABLE_CRASHDUMP@", "e" );
ToFile( "ENABLE_CUPS", "@ENABLE_CUPS@", "e" );

1004
editors/openoffice-2.0-devel/files/patch-project-bridges
View File

File diff suppressed because it is too large Load Diff

65
editors/openoffice-2.0-devel/files/patch-project-extentions
View File

@ -1,65 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=40179
o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=2030&Path=SRC680%2Fpj16
o pj16
Description
o source/config/ldap/makefile.mk needs -lcompat since re_comp is defined here.
o FreeBSD doesn't have -ldl
o INC+= -DNP_LINUX is also requried for FreeBSD
Index: source/config/ldap/makefile.mk
===================================================================
RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
retrieving revision 1.4
diff -u -r1.4 makefile.mk
--- extensions/source/config/ldap/makefile.mk 15 Nov 2004 14:14:22 -0000 1.4
+++ extensions/source/config/ldap/makefile.mk 8 Jan 2005 02:48:29 -0000
@@ -116,6 +116,9 @@
$(CPPULIB) \
$(SALHELPERLIB) \
$(SALLIB)
+.IF "$(OS)"=="FREEBSD"
+SHL1STDLIBS+=-lcompat
+.ENDIF
DEF1NAME=$(SHL1TARGET)
DEF1EXPORTFILE=exports.dxp
Index: source/nsplugin/source/makefile.mk
===================================================================
RCS file: /cvs/util/extensions/source/nsplugin/source/makefile.mk,v
retrieving revision 1.8
diff -u -r1.8 makefile.mk
--- extensions/source/nsplugin/source/makefile.mk 3 Jan 2005 09:04:51 -0000 1.8
+++ extensions/source/nsplugin/source/makefile.mk 8 Jan 2005 02:48:30 -0000
@@ -78,7 +78,7 @@
@echo GTK disabled - nothing to build
.ELSE # "$(ENABLE_GTK)"==""
-.IF "$(OS)"=="LINUX"
+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
INC+= -DNP_LINUX
.ENDIF
PKGCONFIG_MODULES=gtk+-2.0
@@ -99,8 +99,10 @@
.IF "$(GUI)"=="UNX"
SHL1OBJS+=$(SLO)$/npunix.obj
SLOFILES+=$(SLO)$/npunix.obj
+.IF "$(OS)"!="FREEBSD"
SHL1STDLIBS+= -ldl -lnsl
-.ENDIF
+.ENDIF #FREEBSD
+.ENDIF #UNX
.IF "$(GUI)"=="WNT"
SHL1OBJS+=$(SLO)$/npwin.obj
SLOFILES+=$(SLO)$/npwin.obj
@@ -131,7 +133,7 @@
.IF "$(GUI)"=="UNX"
APP1STDLIBS+=$(PKGCONFIG_LIBS:s/-lpangoxft-1.0//)
-.IF "$(OS)"=="LINUX"
+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
.ELSE
APP1STDLIBS+= -ldl -lnsl -lnls -lsocket
.ENDIF

262
editors/openoffice-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk
View File

@ -1,262 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=40182
Description
o catch up recent unxlngi6.mk
o -Wl,-z,defs -> comment out
Index: solenv/inc/unxfbsdi.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
retrieving revision 1.11
diff -u -r1.11 unxfbsdi.mk
--- solenv/inc/unxfbsdi.mk 20 Sep 2004 08:37:13 -0000 1.11
+++ solenv/inc/unxfbsdi.mk 10 Jan 2005 07:44:44 -0000
@@ -60,16 +60,26 @@
#
#*************************************************************************
-# mak file for unxfbsdi
-ASM=$(CC)
-AFLAGS=-x assembler-with-cpp -c $(CDEFS)
+# mk file for unxfbsdi
+ASM=
+AFLAGS=
+
+SOLAR_JAVA*=TRUE
+JAVAFLAGSDEBUG=-g
# filter for supressing verbose messages from linker
#not needed at the moment
#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+# _PTHREADS is needed for the stl
+CDEFS+=$(PTHREAD_CFLAGS) -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
+
+# enable visibility define in "sal/types.h"
+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+
# this is a platform with JAVA support
-SOLAR_JAVA*=TRUE
.IF "$(SOLAR_JAVA)"!=""
JAVADEF=-DSOLAR_JAVA
.IF "$(debug)"==""
@@ -83,90 +93,82 @@
CXX*=g++
# name of C Compiler
CC*=gcc
+.IF "$(SYSBASE)"!=""
+CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
+CXX+:=$(CFLAGS_SYSBASE)
+CC+:=$(CFLAGS_SYSBASE)
+.ENDIF # "$(SYSBASE)"!=""
+CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
+.IF "$(PRODUCT)"!=""
+CFLAGS+=-Wuninitialized
+.ENDIF
-# filter for supressing verbose messages from linker
-# not needed at the moment
-LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+# flags to enable build with symbols; required for crashdump feature
+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
+CFLAGSENABLESYMBOLS=-g1
+.ELSE
+CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
-# options for C and C++ Compiler
-CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=450 -DOSVERSION=$(OSVERSION)
-CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT
-
-# flags for C and C++ Compile
-CFLAGS+= -w -c $(INCLUDE)
-CFLAGS+= -I/usr/X11R6/include
+.ENDIF
# flags for the C++ Compiler
-CFLAGSCC= -pipe -fno-rtti
-CFLAGSCXX= -pipe -fno-rtti
-CFLAGSCXX+= -Wno-ctor-dtor-privacy
-
+CFLAGSCC= -pipe -mtune=pentiumpro
# Flags for enabling exception handling
-CFLAGSEXCEPTIONS= -fexceptions
-CFLAGS_NO_EXCEPTIONS= -fno-exceptions
-
-# Compiler flags for compiling static object in single threaded
-# environment with graphical user interface
-CFLAGSOBJGUIST= -fPIC
-
-# Compiler flags for compiling static object in single threaded
-# environment with character user interface
-CFLAGSOBJCUIST= -fPIC
-
-# Compiler flags for compiling static object in multi threaded
-# environment with graphical user interface
-CFLAGSOBJGUIMT= -fPIC
-
-# Compiler flags for compiling static object in multi threaded
-# environment with character user interface
-CFLAGSOBJCUIMT= -fPIC
-
-# Compiler flags for compiling shared object in multi threaded
-# environment with graphical user interface
-CFLAGSSLOGUIMT= -fPIC
-
-# Compiler flags for compiling shared object in multi threaded
-# environment with character user interface
-CFLAGSSLOCUIMT= -fPIC
+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
+# Flags for disabling exception handling
+CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-# Compiler flags for profilin
-CFLAGSPROF= -pg
+# -fpermissive should be removed as soon as possible
+CFLAGSCXX= -pipe -mtune=pentiumpro
+CFLAGSCXX+= -Wno-ctor-dtor-privacy
+# Compiler flags for compiling static object in single threaded environment with graphical user interface
+CFLAGSOBJGUIST=
+# Compiler flags for compiling static object in single threaded environment with character user interface
+CFLAGSOBJCUIST=
+# Compiler flags for compiling static object in multi threaded environment with graphical user interface
+CFLAGSOBJGUIMT=
+# Compiler flags for compiling static object in multi threaded environment with character user interface
+CFLAGSOBJCUIMT=
+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
+CFLAGSSLOGUIMT=-fPIC
+# Compiler flags for compiling shared object in multi threaded environment with character user interface
+CFLAGSSLOCUIMT=-fPIC
+# Compiler flags for profiling
+CFLAGSPROF=
# Compiler flags for debugging
-CFLAGSDEBUG= -g
+CFLAGSDEBUG=-g
CFLAGSDBGUTIL=
-
-# Compiler flags to enable optimizations
-# -02 is broken for FreeBSD
-CFLAGSOPT= -O
-
-# Compiler flags to disable optimizations
-# -0 is broken for STLport for FreeBSD
-CFLAGSNOOPT= -O0
-
-# Compiler flags for the output path
-CFLAGSOUTOBJ= -o
-
+# Compiler flags for enabling optimazations
+.IF "$(PRODUCT)"!=""
+CFLAGSOPT=-Os -fno-strict-aliasing # optimizing for products
+.ELSE # "$(PRODUCT)"!=""
+CFLAGSOPT= # no optimizing for non products
+.ENDIF # "$(PRODUCT)"!=""
+# Compiler flags for disabling optimazations
+CFLAGSNOOPT=-O0
+# Compiler flags for discibing the output path
+CFLAGSOUTOBJ=-o
# Enable all warnings
CFLAGSWALL=-Wall
-
# Set default warn level
-CFLAGSDFLTWARN=-w
+CFLAGSDFLTWARN=
# switches for dynamic and static linking
-STATIC= -Wl,-Bstatic
-DYNAMIC= -Wl,-Bdynamic
+STATIC = -Wl,-Bstatic
+DYNAMIC = -Wl,-Bdynamic
# name of linker
-LINK=$(CC)
+LINK*=$(CXX)
# default linker flags
-# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-LINKFLAGS=$(LINKFLAGSRUNPATH)
+LINKFLAGSDEFS*=#-Wl,-z,defs
+LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
+LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
# linker flags for linking applications
-LINKFLAGSAPPGUI= -Wl,--noinhibit-exec
-LINKFLAGSAPPCUI= -Wl,--noinhibit-exec
+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
# linker flags for linking shared libraries
LINKFLAGSSHLGUI= -shared
@@ -177,23 +179,19 @@
LINKFLAGSDEBUG=-g
LINKFLAGSOPT=
-.IF "$(NO_BSYMBOLIC)"==""
-.IF "$(PRJNAME)" != "envtest"
-LINKFLAGSSHLGUI+= -Wl,-Bsymbolic
-LINKFLAGSSHLCUI+= -Wl,-Bsymbolic
-.ENDIF
-.ENDIF
+# linker flags for optimization (symbol hashtable)
+# for now, applied to symbol scoped libraries, only
+LINKFLAGSOPTIMIZE*=-Wl,-O1
+LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
-LINKVERSIONMAPFLAG=-Wl,--version-script
+SONAME_SWITCH=-Wl,-h
# Sequence of libs does matter !
-STDLIBCPP=-lstdc++
-# _SYSLIBS= -L/usr/lib -lm
-# _X11LIBS= -L/usr/X11R6/lib -lXext -lX11
-# _CXXLIBS= -L/usr/lib -lstdc++ -L/usr/local/lib
+STDLIBCPP=-lstdc++
# default objectfilenames to link
+STDOBJVCL=$(L)$/salmain.o
STDOBJGUI=
STDSLOGUI=
STDOBJCUI=
@@ -201,24 +199,25 @@
# libraries for linking applications
STDLIBCUIST=-lm
-STDLIBGUIST=-lXaw -lXt -lX11 -lm
-STDLIBGUIMT=-lXaw -lXt -lX11 $(PTHREAD_LIBS) -lm
+STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
STDLIBCUIMT=$(PTHREAD_LIBS) -lm
-
+STDLIBGUIST=-lX11 -lm
# libraries for linking shared libraries
-STDSHLGUIMT=-lXaw -lXt -lX11 -lXext $(PTHREAD_LIBS) -lm
+STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
STDSHLCUIMT=$(PTHREAD_LIBS) -lm
+STDSHLGUIST=-lX11 -lXext -lm
+STDSHLCUIST=-lm
LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-# STLport always needs pthread.
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(STDLIBCPP) $(PTHREAD_LIBS)
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) $(PTHREAD_LIBS)
+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
+
+#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
# name of library manager
LIBMGR=ar
LIBFLAGS=-r
-LIBEXT= .a
# tool for generating import libraries
IMPLIB=
@@ -237,3 +236,4 @@
DLLPOSTFIX=fi
DLLPRE=lib
DLLPOST=.so
+

24
editors/openoffice-2.0-devel/files/patch-transex3+source+xmlparse.cxx
View File

@ -1,24 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=40184
o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=2030&Path=SRC680%2Fpj16
o pj16
Description
FreeBSD doesn't have alloca.h
Index: source/xmlparse.cxx
===================================================================
RCS file: /cvs/l10n/transex3/source/xmlparse.cxx,v
retrieving revision 1.5
diff -u -r1.5 xmlparse.cxx
--- transex3/source/xmlparse.cxx 18 Nov 2004 08:17:50 -0000 1.5
+++ transex3/source/xmlparse.cxx 8 Jan 2005 02:56:14 -0000
@@ -67,7 +67,7 @@
#ifdef WIN32
#include <malloc.h>
#else
-#ifndef MACOSX
+#if !(defined(MACOSX) || defined(FREEBSD))
#include <alloca.h>
#endif
#endif

4
editors/openoffice-3-devel/Makefile
View File

@ -19,7 +19,7 @@ EXTRACT_ONLY= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
SNAPDATE= 20050119
SNAPDATE= 20050123
NO_LATEST_LINK= yes
USE_GNOME= gtk20
MOZILLA_PROJECT= cws_srx645_mozooo.20041016.tar.gz
@ -49,7 +49,7 @@ BROKEN= "rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
CODELINE= 680
RELEASE_NR= 1.9
MILESTONE= 72
MILESTONE= 73
INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE}
EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
DIST_SUBDIR= openoffice.org2.0

4
editors/openoffice-3-devel/distinfo
View File

@ -1,5 +1,5 @@
MD5 (openoffice.org2.0/OOo_1.9m72_source.tar.bz2) = c51fa9d749f1e5eb3733d50b91f97fe8
SIZE (openoffice.org2.0/OOo_1.9m72_source.tar.bz2) = 233690890
MD5 (openoffice.org2.0/OOo_1.9m73_source.tar.bz2) = 0885bb45bd204b03b16f8276cbd922e0
SIZE (openoffice.org2.0/OOo_1.9m73_source.tar.bz2) = 233756500
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
MD5 (openoffice.org2.0/cws_srx645_mozooo.20041016.tar.gz) = eda0ab73b24c45890ae08bdfe04049bd

2
editors/openoffice-3-devel/files/Makefile.knobs
View File

@ -19,7 +19,7 @@ CONFIGURE_ARGS+= --enable-cups
.if defined(ALL_LOCALIZED_LANGS)
CONFIGURE_ARGS+= --with-lang="en-US ar ca cs da de el es et fi fr he hi-IN hu it ja ko pl pt pt-BR ru sk sl sv th tr zh-CN zh-TW"
#following langs still seem to be under development
#following langs still seem to be under development
#af bg cy eo eu gl kn-IN lt nb nl nn ns tn zu
#CONFIGURE_ARGS+= --with-lang=ALL
.else

25
editors/openoffice-3-devel/files/patch-config_office+set_soenv.in
View File

@ -1,25 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=37731
o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=2030&Path=SRC680%2Fpj16
o pj16
Description
Do not export LINK to environment
Index: config_office/set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.31
diff -u -r1.31 set_soenv.in
--- config_office/set_soenv.in 5 Jan 2005 12:10:00 -0000 1.31
+++ config_office/set_soenv.in 9 Jan 2005 18:51:24 -0000
@@ -1684,9 +1684,6 @@
ToFile( "CC", $CC, "e" );
ToFile( "CXX", $CXX, "e" );
ToFile( "USE_SYSTEM_STL", "@USE_SYSTEM_STL@", "e" );
-if ( $COM ne "MSC" ) {
- ToFile( "LINK", $CC, "e" );
-}
ToFile( "ENABLE_SYMBOLS", "@ENABLE_SYMBOLS@", "e" );
ToFile( "ENABLE_CRASHDUMP", "@ENABLE_CRASHDUMP@", "e" );
ToFile( "ENABLE_CUPS", "@ENABLE_CUPS@", "e" );

1004
editors/openoffice-3-devel/files/patch-project-bridges
View File

File diff suppressed because it is too large Load Diff

65
editors/openoffice-3-devel/files/patch-project-extentions
View File

@ -1,65 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=40179
o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=2030&Path=SRC680%2Fpj16
o pj16
Description
o source/config/ldap/makefile.mk needs -lcompat since re_comp is defined here.
o FreeBSD doesn't have -ldl
o INC+= -DNP_LINUX is also requried for FreeBSD
Index: source/config/ldap/makefile.mk
===================================================================
RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
retrieving revision 1.4
diff -u -r1.4 makefile.mk
--- extensions/source/config/ldap/makefile.mk 15 Nov 2004 14:14:22 -0000 1.4
+++ extensions/source/config/ldap/makefile.mk 8 Jan 2005 02:48:29 -0000
@@ -116,6 +116,9 @@
$(CPPULIB) \
$(SALHELPERLIB) \
$(SALLIB)
+.IF "$(OS)"=="FREEBSD"
+SHL1STDLIBS+=-lcompat
+.ENDIF
DEF1NAME=$(SHL1TARGET)
DEF1EXPORTFILE=exports.dxp
Index: source/nsplugin/source/makefile.mk
===================================================================
RCS file: /cvs/util/extensions/source/nsplugin/source/makefile.mk,v
retrieving revision 1.8
diff -u -r1.8 makefile.mk
--- extensions/source/nsplugin/source/makefile.mk 3 Jan 2005 09:04:51 -0000 1.8
+++ extensions/source/nsplugin/source/makefile.mk 8 Jan 2005 02:48:30 -0000
@@ -78,7 +78,7 @@
@echo GTK disabled - nothing to build
.ELSE # "$(ENABLE_GTK)"==""
-.IF "$(OS)"=="LINUX"
+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
INC+= -DNP_LINUX
.ENDIF
PKGCONFIG_MODULES=gtk+-2.0
@@ -99,8 +99,10 @@
.IF "$(GUI)"=="UNX"
SHL1OBJS+=$(SLO)$/npunix.obj
SLOFILES+=$(SLO)$/npunix.obj
+.IF "$(OS)"!="FREEBSD"
SHL1STDLIBS+= -ldl -lnsl
-.ENDIF
+.ENDIF #FREEBSD
+.ENDIF #UNX
.IF "$(GUI)"=="WNT"
SHL1OBJS+=$(SLO)$/npwin.obj
SLOFILES+=$(SLO)$/npwin.obj
@@ -131,7 +133,7 @@
.IF "$(GUI)"=="UNX"
APP1STDLIBS+=$(PKGCONFIG_LIBS:s/-lpangoxft-1.0//)
-.IF "$(OS)"=="LINUX"
+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
.ELSE
APP1STDLIBS+= -ldl -lnsl -lnls -lsocket
.ENDIF

262
editors/openoffice-3-devel/files/patch-solenv+inc+unxfbsdi.mk
View File

@ -1,262 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=40182
Description
o catch up recent unxlngi6.mk
o -Wl,-z,defs -> comment out
Index: solenv/inc/unxfbsdi.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
retrieving revision 1.11
diff -u -r1.11 unxfbsdi.mk
--- solenv/inc/unxfbsdi.mk 20 Sep 2004 08:37:13 -0000 1.11
+++ solenv/inc/unxfbsdi.mk 10 Jan 2005 07:44:44 -0000
@@ -60,16 +60,26 @@
#
#*************************************************************************
-# mak file for unxfbsdi
-ASM=$(CC)
-AFLAGS=-x assembler-with-cpp -c $(CDEFS)
+# mk file for unxfbsdi
+ASM=
+AFLAGS=
+
+SOLAR_JAVA*=TRUE
+JAVAFLAGSDEBUG=-g
# filter for supressing verbose messages from linker
#not needed at the moment
#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+# _PTHREADS is needed for the stl
+CDEFS+=$(PTHREAD_CFLAGS) -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
+
+# enable visibility define in "sal/types.h"
+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+
# this is a platform with JAVA support
-SOLAR_JAVA*=TRUE
.IF "$(SOLAR_JAVA)"!=""
JAVADEF=-DSOLAR_JAVA
.IF "$(debug)"==""
@@ -83,90 +93,82 @@
CXX*=g++
# name of C Compiler
CC*=gcc
+.IF "$(SYSBASE)"!=""
+CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
+CXX+:=$(CFLAGS_SYSBASE)
+CC+:=$(CFLAGS_SYSBASE)
+.ENDIF # "$(SYSBASE)"!=""
+CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
+.IF "$(PRODUCT)"!=""
+CFLAGS+=-Wuninitialized
+.ENDIF
-# filter for supressing verbose messages from linker
-# not needed at the moment
-LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+# flags to enable build with symbols; required for crashdump feature
+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
+CFLAGSENABLESYMBOLS=-g1
+.ELSE
+CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
-# options for C and C++ Compiler
-CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=450 -DOSVERSION=$(OSVERSION)
-CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT
-
-# flags for C and C++ Compile
-CFLAGS+= -w -c $(INCLUDE)
-CFLAGS+= -I/usr/X11R6/include
+.ENDIF
# flags for the C++ Compiler
-CFLAGSCC= -pipe -fno-rtti
-CFLAGSCXX= -pipe -fno-rtti
-CFLAGSCXX+= -Wno-ctor-dtor-privacy
-
+CFLAGSCC= -pipe -mtune=pentiumpro
# Flags for enabling exception handling
-CFLAGSEXCEPTIONS= -fexceptions
-CFLAGS_NO_EXCEPTIONS= -fno-exceptions
-
-# Compiler flags for compiling static object in single threaded
-# environment with graphical user interface
-CFLAGSOBJGUIST= -fPIC
-
-# Compiler flags for compiling static object in single threaded
-# environment with character user interface
-CFLAGSOBJCUIST= -fPIC
-
-# Compiler flags for compiling static object in multi threaded
-# environment with graphical user interface
-CFLAGSOBJGUIMT= -fPIC
-
-# Compiler flags for compiling static object in multi threaded
-# environment with character user interface
-CFLAGSOBJCUIMT= -fPIC
-
-# Compiler flags for compiling shared object in multi threaded
-# environment with graphical user interface
-CFLAGSSLOGUIMT= -fPIC
-
-# Compiler flags for compiling shared object in multi threaded
-# environment with character user interface
-CFLAGSSLOCUIMT= -fPIC
+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
+# Flags for disabling exception handling
+CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-# Compiler flags for profilin
-CFLAGSPROF= -pg
+# -fpermissive should be removed as soon as possible
+CFLAGSCXX= -pipe -mtune=pentiumpro
+CFLAGSCXX+= -Wno-ctor-dtor-privacy
+# Compiler flags for compiling static object in single threaded environment with graphical user interface
+CFLAGSOBJGUIST=
+# Compiler flags for compiling static object in single threaded environment with character user interface
+CFLAGSOBJCUIST=
+# Compiler flags for compiling static object in multi threaded environment with graphical user interface
+CFLAGSOBJGUIMT=
+# Compiler flags for compiling static object in multi threaded environment with character user interface
+CFLAGSOBJCUIMT=
+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
+CFLAGSSLOGUIMT=-fPIC
+# Compiler flags for compiling shared object in multi threaded environment with character user interface
+CFLAGSSLOCUIMT=-fPIC
+# Compiler flags for profiling
+CFLAGSPROF=
# Compiler flags for debugging
-CFLAGSDEBUG= -g
+CFLAGSDEBUG=-g
CFLAGSDBGUTIL=
-
-# Compiler flags to enable optimizations
-# -02 is broken for FreeBSD
-CFLAGSOPT= -O
-
-# Compiler flags to disable optimizations
-# -0 is broken for STLport for FreeBSD
-CFLAGSNOOPT= -O0
-
-# Compiler flags for the output path
-CFLAGSOUTOBJ= -o
-
+# Compiler flags for enabling optimazations
+.IF "$(PRODUCT)"!=""
+CFLAGSOPT=-Os -fno-strict-aliasing # optimizing for products
+.ELSE # "$(PRODUCT)"!=""
+CFLAGSOPT= # no optimizing for non products
+.ENDIF # "$(PRODUCT)"!=""
+# Compiler flags for disabling optimazations
+CFLAGSNOOPT=-O0
+# Compiler flags for discibing the output path
+CFLAGSOUTOBJ=-o
# Enable all warnings
CFLAGSWALL=-Wall
-
# Set default warn level
-CFLAGSDFLTWARN=-w
+CFLAGSDFLTWARN=
# switches for dynamic and static linking
-STATIC= -Wl,-Bstatic
-DYNAMIC= -Wl,-Bdynamic
+STATIC = -Wl,-Bstatic
+DYNAMIC = -Wl,-Bdynamic
# name of linker
-LINK=$(CC)
+LINK*=$(CXX)
# default linker flags
-# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-LINKFLAGS=$(LINKFLAGSRUNPATH)
+LINKFLAGSDEFS*=#-Wl,-z,defs
+LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
+LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
# linker flags for linking applications
-LINKFLAGSAPPGUI= -Wl,--noinhibit-exec
-LINKFLAGSAPPCUI= -Wl,--noinhibit-exec
+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
# linker flags for linking shared libraries
LINKFLAGSSHLGUI= -shared
@@ -177,23 +179,19 @@
LINKFLAGSDEBUG=-g
LINKFLAGSOPT=
-.IF "$(NO_BSYMBOLIC)"==""
-.IF "$(PRJNAME)" != "envtest"
-LINKFLAGSSHLGUI+= -Wl,-Bsymbolic
-LINKFLAGSSHLCUI+= -Wl,-Bsymbolic
-.ENDIF
-.ENDIF
+# linker flags for optimization (symbol hashtable)
+# for now, applied to symbol scoped libraries, only
+LINKFLAGSOPTIMIZE*=-Wl,-O1
+LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
-LINKVERSIONMAPFLAG=-Wl,--version-script
+SONAME_SWITCH=-Wl,-h
# Sequence of libs does matter !
-STDLIBCPP=-lstdc++
-# _SYSLIBS= -L/usr/lib -lm
-# _X11LIBS= -L/usr/X11R6/lib -lXext -lX11
-# _CXXLIBS= -L/usr/lib -lstdc++ -L/usr/local/lib
+STDLIBCPP=-lstdc++
# default objectfilenames to link
+STDOBJVCL=$(L)$/salmain.o
STDOBJGUI=
STDSLOGUI=
STDOBJCUI=
@@ -201,24 +199,25 @@
# libraries for linking applications
STDLIBCUIST=-lm
-STDLIBGUIST=-lXaw -lXt -lX11 -lm
-STDLIBGUIMT=-lXaw -lXt -lX11 $(PTHREAD_LIBS) -lm
+STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
STDLIBCUIMT=$(PTHREAD_LIBS) -lm
-
+STDLIBGUIST=-lX11 -lm
# libraries for linking shared libraries
-STDSHLGUIMT=-lXaw -lXt -lX11 -lXext $(PTHREAD_LIBS) -lm
+STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
STDSHLCUIMT=$(PTHREAD_LIBS) -lm
+STDSHLGUIST=-lX11 -lXext -lm
+STDSHLCUIST=-lm
LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-# STLport always needs pthread.
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(STDLIBCPP) $(PTHREAD_LIBS)
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) $(PTHREAD_LIBS)
+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
+
+#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
# name of library manager
LIBMGR=ar
LIBFLAGS=-r
-LIBEXT= .a
# tool for generating import libraries
IMPLIB=
@@ -237,3 +236,4 @@
DLLPOSTFIX=fi
DLLPRE=lib
DLLPOST=.so
+

24
editors/openoffice-3-devel/files/patch-transex3+source+xmlparse.cxx
View File

@ -1,24 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=40184
o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=2030&Path=SRC680%2Fpj16
o pj16
Description
FreeBSD doesn't have alloca.h
Index: source/xmlparse.cxx
===================================================================
RCS file: /cvs/l10n/transex3/source/xmlparse.cxx,v
retrieving revision 1.5
diff -u -r1.5 xmlparse.cxx
--- transex3/source/xmlparse.cxx 18 Nov 2004 08:17:50 -0000 1.5
+++ transex3/source/xmlparse.cxx 8 Jan 2005 02:56:14 -0000
@@ -67,7 +67,7 @@
#ifdef WIN32
#include <malloc.h>
#else
-#ifndef MACOSX
+#if !(defined(MACOSX) || defined(FREEBSD))
#include <alloca.h>
#endif
#endif

4
editors/openoffice-3/Makefile
View File

@ -19,7 +19,7 @@ EXTRACT_ONLY= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
SNAPDATE= 20050119
SNAPDATE= 20050123
NO_LATEST_LINK= yes
USE_GNOME= gtk20
MOZILLA_PROJECT= cws_srx645_mozooo.20041016.tar.gz
@ -49,7 +49,7 @@ BROKEN= "rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
CODELINE= 680
RELEASE_NR= 1.9
MILESTONE= 72
MILESTONE= 73
INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE}
EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
DIST_SUBDIR= openoffice.org2.0

4
editors/openoffice-3/distinfo
View File

@ -1,5 +1,5 @@
MD5 (openoffice.org2.0/OOo_1.9m72_source.tar.bz2) = c51fa9d749f1e5eb3733d50b91f97fe8
SIZE (openoffice.org2.0/OOo_1.9m72_source.tar.bz2) = 233690890
MD5 (openoffice.org2.0/OOo_1.9m73_source.tar.bz2) = 0885bb45bd204b03b16f8276cbd922e0
SIZE (openoffice.org2.0/OOo_1.9m73_source.tar.bz2) = 233756500
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
MD5 (openoffice.org2.0/cws_srx645_mozooo.20041016.tar.gz) = eda0ab73b24c45890ae08bdfe04049bd

2
editors/openoffice-3/files/Makefile.knobs
View File

@ -19,7 +19,7 @@ CONFIGURE_ARGS+= --enable-cups
.if defined(ALL_LOCALIZED_LANGS)
CONFIGURE_ARGS+= --with-lang="en-US ar ca cs da de el es et fi fr he hi-IN hu it ja ko pl pt pt-BR ru sk sl sv th tr zh-CN zh-TW"
#following langs still seem to be under development
#following langs still seem to be under development
#af bg cy eo eu gl kn-IN lt nb nl nn ns tn zu
#CONFIGURE_ARGS+= --with-lang=ALL
.else

25
editors/openoffice-3/files/patch-config_office+set_soenv.in
View File

@ -1,25 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=37731
o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=2030&Path=SRC680%2Fpj16
o pj16
Description
Do not export LINK to environment
Index: config_office/set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.31
diff -u -r1.31 set_soenv.in
--- config_office/set_soenv.in 5 Jan 2005 12:10:00 -0000 1.31
+++ config_office/set_soenv.in 9 Jan 2005 18:51:24 -0000
@@ -1684,9 +1684,6 @@
ToFile( "CC", $CC, "e" );
ToFile( "CXX", $CXX, "e" );
ToFile( "USE_SYSTEM_STL", "@USE_SYSTEM_STL@", "e" );
-if ( $COM ne "MSC" ) {
- ToFile( "LINK", $CC, "e" );
-}
ToFile( "ENABLE_SYMBOLS", "@ENABLE_SYMBOLS@", "e" );
ToFile( "ENABLE_CRASHDUMP", "@ENABLE_CRASHDUMP@", "e" );
ToFile( "ENABLE_CUPS", "@ENABLE_CUPS@", "e" );

1004
editors/openoffice-3/files/patch-project-bridges
View File

File diff suppressed because it is too large Load Diff

65
editors/openoffice-3/files/patch-project-extentions
View File

@ -1,65 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=40179
o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=2030&Path=SRC680%2Fpj16
o pj16
Description
o source/config/ldap/makefile.mk needs -lcompat since re_comp is defined here.
o FreeBSD doesn't have -ldl
o INC+= -DNP_LINUX is also requried for FreeBSD
Index: source/config/ldap/makefile.mk
===================================================================
RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
retrieving revision 1.4
diff -u -r1.4 makefile.mk
--- extensions/source/config/ldap/makefile.mk 15 Nov 2004 14:14:22 -0000 1.4
+++ extensions/source/config/ldap/makefile.mk 8 Jan 2005 02:48:29 -0000
@@ -116,6 +116,9 @@
$(CPPULIB) \
$(SALHELPERLIB) \
$(SALLIB)
+.IF "$(OS)"=="FREEBSD"
+SHL1STDLIBS+=-lcompat
+.ENDIF
DEF1NAME=$(SHL1TARGET)
DEF1EXPORTFILE=exports.dxp
Index: source/nsplugin/source/makefile.mk
===================================================================
RCS file: /cvs/util/extensions/source/nsplugin/source/makefile.mk,v
retrieving revision 1.8
diff -u -r1.8 makefile.mk
--- extensions/source/nsplugin/source/makefile.mk 3 Jan 2005 09:04:51 -0000 1.8
+++ extensions/source/nsplugin/source/makefile.mk 8 Jan 2005 02:48:30 -0000
@@ -78,7 +78,7 @@
@echo GTK disabled - nothing to build
.ELSE # "$(ENABLE_GTK)"==""
-.IF "$(OS)"=="LINUX"
+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
INC+= -DNP_LINUX
.ENDIF
PKGCONFIG_MODULES=gtk+-2.0
@@ -99,8 +99,10 @@
.IF "$(GUI)"=="UNX"
SHL1OBJS+=$(SLO)$/npunix.obj
SLOFILES+=$(SLO)$/npunix.obj
+.IF "$(OS)"!="FREEBSD"
SHL1STDLIBS+= -ldl -lnsl
-.ENDIF
+.ENDIF #FREEBSD
+.ENDIF #UNX
.IF "$(GUI)"=="WNT"
SHL1OBJS+=$(SLO)$/npwin.obj
SLOFILES+=$(SLO)$/npwin.obj
@@ -131,7 +133,7 @@
.IF "$(GUI)"=="UNX"
APP1STDLIBS+=$(PKGCONFIG_LIBS:s/-lpangoxft-1.0//)
-.IF "$(OS)"=="LINUX"
+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
.ELSE
APP1STDLIBS+= -ldl -lnsl -lnls -lsocket
.ENDIF

262
editors/openoffice-3/files/patch-solenv+inc+unxfbsdi.mk
View File

@ -1,262 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=40182
Description
o catch up recent unxlngi6.mk
o -Wl,-z,defs -> comment out
Index: solenv/inc/unxfbsdi.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
retrieving revision 1.11
diff -u -r1.11 unxfbsdi.mk
--- solenv/inc/unxfbsdi.mk 20 Sep 2004 08:37:13 -0000 1.11
+++ solenv/inc/unxfbsdi.mk 10 Jan 2005 07:44:44 -0000
@@ -60,16 +60,26 @@
#
#*************************************************************************
-# mak file for unxfbsdi
-ASM=$(CC)
-AFLAGS=-x assembler-with-cpp -c $(CDEFS)
+# mk file for unxfbsdi
+ASM=
+AFLAGS=
+
+SOLAR_JAVA*=TRUE
+JAVAFLAGSDEBUG=-g
# filter for supressing verbose messages from linker
#not needed at the moment
#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+# _PTHREADS is needed for the stl
+CDEFS+=$(PTHREAD_CFLAGS) -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
+
+# enable visibility define in "sal/types.h"
+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+
# this is a platform with JAVA support
-SOLAR_JAVA*=TRUE
.IF "$(SOLAR_JAVA)"!=""
JAVADEF=-DSOLAR_JAVA
.IF "$(debug)"==""
@@ -83,90 +93,82 @@
CXX*=g++
# name of C Compiler
CC*=gcc
+.IF "$(SYSBASE)"!=""
+CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
+CXX+:=$(CFLAGS_SYSBASE)
+CC+:=$(CFLAGS_SYSBASE)
+.ENDIF # "$(SYSBASE)"!=""
+CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
+.IF "$(PRODUCT)"!=""
+CFLAGS+=-Wuninitialized
+.ENDIF
-# filter for supressing verbose messages from linker
-# not needed at the moment
-LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+# flags to enable build with symbols; required for crashdump feature
+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
+CFLAGSENABLESYMBOLS=-g1
+.ELSE
+CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
-# options for C and C++ Compiler
-CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=450 -DOSVERSION=$(OSVERSION)
-CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT
-
-# flags for C and C++ Compile
-CFLAGS+= -w -c $(INCLUDE)
-CFLAGS+= -I/usr/X11R6/include
+.ENDIF
# flags for the C++ Compiler
-CFLAGSCC= -pipe -fno-rtti
-CFLAGSCXX= -pipe -fno-rtti
-CFLAGSCXX+= -Wno-ctor-dtor-privacy
-
+CFLAGSCC= -pipe -mtune=pentiumpro
# Flags for enabling exception handling
-CFLAGSEXCEPTIONS= -fexceptions
-CFLAGS_NO_EXCEPTIONS= -fno-exceptions
-
-# Compiler flags for compiling static object in single threaded
-# environment with graphical user interface
-CFLAGSOBJGUIST= -fPIC
-
-# Compiler flags for compiling static object in single threaded
-# environment with character user interface
-CFLAGSOBJCUIST= -fPIC
-
-# Compiler flags for compiling static object in multi threaded
-# environment with graphical user interface
-CFLAGSOBJGUIMT= -fPIC
-
-# Compiler flags for compiling static object in multi threaded
-# environment with character user interface
-CFLAGSOBJCUIMT= -fPIC
-
-# Compiler flags for compiling shared object in multi threaded
-# environment with graphical user interface
-CFLAGSSLOGUIMT= -fPIC
-
-# Compiler flags for compiling shared object in multi threaded
-# environment with character user interface
-CFLAGSSLOCUIMT= -fPIC
+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
+# Flags for disabling exception handling
+CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-# Compiler flags for profilin
-CFLAGSPROF= -pg
+# -fpermissive should be removed as soon as possible
+CFLAGSCXX= -pipe -mtune=pentiumpro
+CFLAGSCXX+= -Wno-ctor-dtor-privacy
+# Compiler flags for compiling static object in single threaded environment with graphical user interface
+CFLAGSOBJGUIST=
+# Compiler flags for compiling static object in single threaded environment with character user interface
+CFLAGSOBJCUIST=
+# Compiler flags for compiling static object in multi threaded environment with graphical user interface
+CFLAGSOBJGUIMT=
+# Compiler flags for compiling static object in multi threaded environment with character user interface
+CFLAGSOBJCUIMT=
+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
+CFLAGSSLOGUIMT=-fPIC
+# Compiler flags for compiling shared object in multi threaded environment with character user interface
+CFLAGSSLOCUIMT=-fPIC
+# Compiler flags for profiling
+CFLAGSPROF=
# Compiler flags for debugging
-CFLAGSDEBUG= -g
+CFLAGSDEBUG=-g
CFLAGSDBGUTIL=
-
-# Compiler flags to enable optimizations
-# -02 is broken for FreeBSD
-CFLAGSOPT= -O
-
-# Compiler flags to disable optimizations
-# -0 is broken for STLport for FreeBSD
-CFLAGSNOOPT= -O0
-
-# Compiler flags for the output path
-CFLAGSOUTOBJ= -o
-
+# Compiler flags for enabling optimazations
+.IF "$(PRODUCT)"!=""
+CFLAGSOPT=-Os -fno-strict-aliasing # optimizing for products
+.ELSE # "$(PRODUCT)"!=""
+CFLAGSOPT= # no optimizing for non products
+.ENDIF # "$(PRODUCT)"!=""
+# Compiler flags for disabling optimazations
+CFLAGSNOOPT=-O0
+# Compiler flags for discibing the output path
+CFLAGSOUTOBJ=-o
# Enable all warnings
CFLAGSWALL=-Wall
-
# Set default warn level
-CFLAGSDFLTWARN=-w
+CFLAGSDFLTWARN=
# switches for dynamic and static linking
-STATIC= -Wl,-Bstatic
-DYNAMIC= -Wl,-Bdynamic
+STATIC = -Wl,-Bstatic
+DYNAMIC = -Wl,-Bdynamic
# name of linker
-LINK=$(CC)
+LINK*=$(CXX)
# default linker flags
-# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-LINKFLAGS=$(LINKFLAGSRUNPATH)
+LINKFLAGSDEFS*=#-Wl,-z,defs
+LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
+LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
# linker flags for linking applications
-LINKFLAGSAPPGUI= -Wl,--noinhibit-exec
-LINKFLAGSAPPCUI= -Wl,--noinhibit-exec
+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
# linker flags for linking shared libraries
LINKFLAGSSHLGUI= -shared
@@ -177,23 +179,19 @@
LINKFLAGSDEBUG=-g
LINKFLAGSOPT=
-.IF "$(NO_BSYMBOLIC)"==""
-.IF "$(PRJNAME)" != "envtest"
-LINKFLAGSSHLGUI+= -Wl,-Bsymbolic
-LINKFLAGSSHLCUI+= -Wl,-Bsymbolic
-.ENDIF
-.ENDIF
+# linker flags for optimization (symbol hashtable)
+# for now, applied to symbol scoped libraries, only
+LINKFLAGSOPTIMIZE*=-Wl,-O1
+LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
-LINKVERSIONMAPFLAG=-Wl,--version-script
+SONAME_SWITCH=-Wl,-h
# Sequence of libs does matter !
-STDLIBCPP=-lstdc++
-# _SYSLIBS= -L/usr/lib -lm
-# _X11LIBS= -L/usr/X11R6/lib -lXext -lX11
-# _CXXLIBS= -L/usr/lib -lstdc++ -L/usr/local/lib
+STDLIBCPP=-lstdc++
# default objectfilenames to link
+STDOBJVCL=$(L)$/salmain.o
STDOBJGUI=
STDSLOGUI=
STDOBJCUI=
@@ -201,24 +199,25 @@
# libraries for linking applications
STDLIBCUIST=-lm
-STDLIBGUIST=-lXaw -lXt -lX11 -lm
-STDLIBGUIMT=-lXaw -lXt -lX11 $(PTHREAD_LIBS) -lm
+STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
STDLIBCUIMT=$(PTHREAD_LIBS) -lm
-
+STDLIBGUIST=-lX11 -lm
# libraries for linking shared libraries
-STDSHLGUIMT=-lXaw -lXt -lX11 -lXext $(PTHREAD_LIBS) -lm
+STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
STDSHLCUIMT=$(PTHREAD_LIBS) -lm
+STDSHLGUIST=-lX11 -lXext -lm
+STDSHLCUIST=-lm
LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-# STLport always needs pthread.
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(STDLIBCPP) $(PTHREAD_LIBS)
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) $(PTHREAD_LIBS)
+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
+
+#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
# name of library manager
LIBMGR=ar
LIBFLAGS=-r
-LIBEXT= .a
# tool for generating import libraries
IMPLIB=
@@ -237,3 +236,4 @@
DLLPOSTFIX=fi
DLLPRE=lib
DLLPOST=.so
+

24
editors/openoffice-3/files/patch-transex3+source+xmlparse.cxx
View File

@ -1,24 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=40184
o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=2030&Path=SRC680%2Fpj16
o pj16
Description
FreeBSD doesn't have alloca.h
Index: source/xmlparse.cxx
===================================================================
RCS file: /cvs/l10n/transex3/source/xmlparse.cxx,v
retrieving revision 1.5
diff -u -r1.5 xmlparse.cxx
--- transex3/source/xmlparse.cxx 18 Nov 2004 08:17:50 -0000 1.5
+++ transex3/source/xmlparse.cxx 8 Jan 2005 02:56:14 -0000
@@ -67,7 +67,7 @@
#ifdef WIN32
#include <malloc.h>
#else
-#ifndef MACOSX
+#if !(defined(MACOSX) || defined(FREEBSD))
#include <alloca.h>
#endif
#endif

4
editors/openoffice.org-2-RC/Makefile
View File

@ -19,7 +19,7 @@ EXTRACT_ONLY= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
SNAPDATE= 20050119
SNAPDATE= 20050123
NO_LATEST_LINK= yes
USE_GNOME= gtk20
MOZILLA_PROJECT= cws_srx645_mozooo.20041016.tar.gz
@ -49,7 +49,7 @@ BROKEN= "rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
CODELINE= 680
RELEASE_NR= 1.9
MILESTONE= 72
MILESTONE= 73
INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE}
EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
DIST_SUBDIR= openoffice.org2.0

4
editors/openoffice.org-2-RC/distinfo
View File

@ -1,5 +1,5 @@
MD5 (openoffice.org2.0/OOo_1.9m72_source.tar.bz2) = c51fa9d749f1e5eb3733d50b91f97fe8
SIZE (openoffice.org2.0/OOo_1.9m72_source.tar.bz2) = 233690890
MD5 (openoffice.org2.0/OOo_1.9m73_source.tar.bz2) = 0885bb45bd204b03b16f8276cbd922e0
SIZE (openoffice.org2.0/OOo_1.9m73_source.tar.bz2) = 233756500
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
MD5 (openoffice.org2.0/cws_srx645_mozooo.20041016.tar.gz) = eda0ab73b24c45890ae08bdfe04049bd

2
editors/openoffice.org-2-RC/files/Makefile.knobs
View File

@ -19,7 +19,7 @@ CONFIGURE_ARGS+= --enable-cups
.if defined(ALL_LOCALIZED_LANGS)
CONFIGURE_ARGS+= --with-lang="en-US ar ca cs da de el es et fi fr he hi-IN hu it ja ko pl pt pt-BR ru sk sl sv th tr zh-CN zh-TW"
#following langs still seem to be under development
#following langs still seem to be under development
#af bg cy eo eu gl kn-IN lt nb nl nn ns tn zu
#CONFIGURE_ARGS+= --with-lang=ALL
.else

25
editors/openoffice.org-2-RC/files/patch-config_office+set_soenv.in
View File

@ -1,25 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=37731
o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=2030&Path=SRC680%2Fpj16
o pj16
Description
Do not export LINK to environment
Index: config_office/set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.31
diff -u -r1.31 set_soenv.in
--- config_office/set_soenv.in 5 Jan 2005 12:10:00 -0000 1.31
+++ config_office/set_soenv.in 9 Jan 2005 18:51:24 -0000
@@ -1684,9 +1684,6 @@
ToFile( "CC", $CC, "e" );
ToFile( "CXX", $CXX, "e" );
ToFile( "USE_SYSTEM_STL", "@USE_SYSTEM_STL@", "e" );
-if ( $COM ne "MSC" ) {
- ToFile( "LINK", $CC, "e" );
-}
ToFile( "ENABLE_SYMBOLS", "@ENABLE_SYMBOLS@", "e" );
ToFile( "ENABLE_CRASHDUMP", "@ENABLE_CRASHDUMP@", "e" );
ToFile( "ENABLE_CUPS", "@ENABLE_CUPS@", "e" );

1004
editors/openoffice.org-2-RC/files/patch-project-bridges
View File

File diff suppressed because it is too large Load Diff

65
editors/openoffice.org-2-RC/files/patch-project-extentions
View File

@ -1,65 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=40179
o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=2030&Path=SRC680%2Fpj16
o pj16
Description
o source/config/ldap/makefile.mk needs -lcompat since re_comp is defined here.
o FreeBSD doesn't have -ldl
o INC+= -DNP_LINUX is also requried for FreeBSD
Index: source/config/ldap/makefile.mk
===================================================================
RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
retrieving revision 1.4
diff -u -r1.4 makefile.mk
--- extensions/source/config/ldap/makefile.mk 15 Nov 2004 14:14:22 -0000 1.4
+++ extensions/source/config/ldap/makefile.mk 8 Jan 2005 02:48:29 -0000
@@ -116,6 +116,9 @@
$(CPPULIB) \
$(SALHELPERLIB) \
$(SALLIB)
+.IF "$(OS)"=="FREEBSD"
+SHL1STDLIBS+=-lcompat
+.ENDIF
DEF1NAME=$(SHL1TARGET)
DEF1EXPORTFILE=exports.dxp
Index: source/nsplugin/source/makefile.mk
===================================================================
RCS file: /cvs/util/extensions/source/nsplugin/source/makefile.mk,v
retrieving revision 1.8
diff -u -r1.8 makefile.mk
--- extensions/source/nsplugin/source/makefile.mk 3 Jan 2005 09:04:51 -0000 1.8
+++ extensions/source/nsplugin/source/makefile.mk 8 Jan 2005 02:48:30 -0000
@@ -78,7 +78,7 @@
@echo GTK disabled - nothing to build
.ELSE # "$(ENABLE_GTK)"==""
-.IF "$(OS)"=="LINUX"
+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
INC+= -DNP_LINUX
.ENDIF
PKGCONFIG_MODULES=gtk+-2.0
@@ -99,8 +99,10 @@
.IF "$(GUI)"=="UNX"
SHL1OBJS+=$(SLO)$/npunix.obj
SLOFILES+=$(SLO)$/npunix.obj
+.IF "$(OS)"!="FREEBSD"
SHL1STDLIBS+= -ldl -lnsl
-.ENDIF
+.ENDIF #FREEBSD
+.ENDIF #UNX
.IF "$(GUI)"=="WNT"
SHL1OBJS+=$(SLO)$/npwin.obj
SLOFILES+=$(SLO)$/npwin.obj
@@ -131,7 +133,7 @@
.IF "$(GUI)"=="UNX"
APP1STDLIBS+=$(PKGCONFIG_LIBS:s/-lpangoxft-1.0//)
-.IF "$(OS)"=="LINUX"
+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
.ELSE
APP1STDLIBS+= -ldl -lnsl -lnls -lsocket
.ENDIF

262
editors/openoffice.org-2-RC/files/patch-solenv+inc+unxfbsdi.mk
View File

@ -1,262 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=40182
Description
o catch up recent unxlngi6.mk
o -Wl,-z,defs -> comment out
Index: solenv/inc/unxfbsdi.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
retrieving revision 1.11
diff -u -r1.11 unxfbsdi.mk
--- solenv/inc/unxfbsdi.mk 20 Sep 2004 08:37:13 -0000 1.11
+++ solenv/inc/unxfbsdi.mk 10 Jan 2005 07:44:44 -0000
@@ -60,16 +60,26 @@
#
#*************************************************************************
-# mak file for unxfbsdi
-ASM=$(CC)
-AFLAGS=-x assembler-with-cpp -c $(CDEFS)
+# mk file for unxfbsdi
+ASM=
+AFLAGS=
+
+SOLAR_JAVA*=TRUE
+JAVAFLAGSDEBUG=-g
# filter for supressing verbose messages from linker
#not needed at the moment
#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+# _PTHREADS is needed for the stl
+CDEFS+=$(PTHREAD_CFLAGS) -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
+
+# enable visibility define in "sal/types.h"
+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+
# this is a platform with JAVA support
-SOLAR_JAVA*=TRUE
.IF "$(SOLAR_JAVA)"!=""
JAVADEF=-DSOLAR_JAVA
.IF "$(debug)"==""
@@ -83,90 +93,82 @@
CXX*=g++
# name of C Compiler
CC*=gcc
+.IF "$(SYSBASE)"!=""
+CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
+CXX+:=$(CFLAGS_SYSBASE)
+CC+:=$(CFLAGS_SYSBASE)
+.ENDIF # "$(SYSBASE)"!=""
+CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
+.IF "$(PRODUCT)"!=""
+CFLAGS+=-Wuninitialized
+.ENDIF
-# filter for supressing verbose messages from linker
-# not needed at the moment
-LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+# flags to enable build with symbols; required for crashdump feature
+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
+CFLAGSENABLESYMBOLS=-g1
+.ELSE
+CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
-# options for C and C++ Compiler
-CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=450 -DOSVERSION=$(OSVERSION)
-CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT
-
-# flags for C and C++ Compile
-CFLAGS+= -w -c $(INCLUDE)
-CFLAGS+= -I/usr/X11R6/include
+.ENDIF
# flags for the C++ Compiler
-CFLAGSCC= -pipe -fno-rtti
-CFLAGSCXX= -pipe -fno-rtti
-CFLAGSCXX+= -Wno-ctor-dtor-privacy
-
+CFLAGSCC= -pipe -mtune=pentiumpro
# Flags for enabling exception handling
-CFLAGSEXCEPTIONS= -fexceptions
-CFLAGS_NO_EXCEPTIONS= -fno-exceptions
-
-# Compiler flags for compiling static object in single threaded
-# environment with graphical user interface
-CFLAGSOBJGUIST= -fPIC
-
-# Compiler flags for compiling static object in single threaded
-# environment with character user interface
-CFLAGSOBJCUIST= -fPIC
-
-# Compiler flags for compiling static object in multi threaded
-# environment with graphical user interface
-CFLAGSOBJGUIMT= -fPIC
-
-# Compiler flags for compiling static object in multi threaded
-# environment with character user interface
-CFLAGSOBJCUIMT= -fPIC
-
-# Compiler flags for compiling shared object in multi threaded
-# environment with graphical user interface
-CFLAGSSLOGUIMT= -fPIC
-
-# Compiler flags for compiling shared object in multi threaded
-# environment with character user interface
-CFLAGSSLOCUIMT= -fPIC
+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
+# Flags for disabling exception handling
+CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-# Compiler flags for profilin
-CFLAGSPROF= -pg
+# -fpermissive should be removed as soon as possible
+CFLAGSCXX= -pipe -mtune=pentiumpro
+CFLAGSCXX+= -Wno-ctor-dtor-privacy
+# Compiler flags for compiling static object in single threaded environment with graphical user interface
+CFLAGSOBJGUIST=
+# Compiler flags for compiling static object in single threaded environment with character user interface
+CFLAGSOBJCUIST=
+# Compiler flags for compiling static object in multi threaded environment with graphical user interface
+CFLAGSOBJGUIMT=
+# Compiler flags for compiling static object in multi threaded environment with character user interface
+CFLAGSOBJCUIMT=
+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
+CFLAGSSLOGUIMT=-fPIC
+# Compiler flags for compiling shared object in multi threaded environment with character user interface
+CFLAGSSLOCUIMT=-fPIC
+# Compiler flags for profiling
+CFLAGSPROF=
# Compiler flags for debugging
-CFLAGSDEBUG= -g
+CFLAGSDEBUG=-g
CFLAGSDBGUTIL=
-
-# Compiler flags to enable optimizations
-# -02 is broken for FreeBSD
-CFLAGSOPT= -O
-
-# Compiler flags to disable optimizations
-# -0 is broken for STLport for FreeBSD
-CFLAGSNOOPT= -O0
-
-# Compiler flags for the output path
-CFLAGSOUTOBJ= -o
-
+# Compiler flags for enabling optimazations
+.IF "$(PRODUCT)"!=""
+CFLAGSOPT=-Os -fno-strict-aliasing # optimizing for products
+.ELSE # "$(PRODUCT)"!=""
+CFLAGSOPT= # no optimizing for non products
+.ENDIF # "$(PRODUCT)"!=""
+# Compiler flags for disabling optimazations
+CFLAGSNOOPT=-O0
+# Compiler flags for discibing the output path
+CFLAGSOUTOBJ=-o
# Enable all warnings
CFLAGSWALL=-Wall
-
# Set default warn level
-CFLAGSDFLTWARN=-w
+CFLAGSDFLTWARN=
# switches for dynamic and static linking
-STATIC= -Wl,-Bstatic
-DYNAMIC= -Wl,-Bdynamic
+STATIC = -Wl,-Bstatic
+DYNAMIC = -Wl,-Bdynamic
# name of linker
-LINK=$(CC)
+LINK*=$(CXX)
# default linker flags
-# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-LINKFLAGS=$(LINKFLAGSRUNPATH)
+LINKFLAGSDEFS*=#-Wl,-z,defs
+LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
+LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
# linker flags for linking applications
-LINKFLAGSAPPGUI= -Wl,--noinhibit-exec
-LINKFLAGSAPPCUI= -Wl,--noinhibit-exec
+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
# linker flags for linking shared libraries
LINKFLAGSSHLGUI= -shared
@@ -177,23 +179,19 @@
LINKFLAGSDEBUG=-g
LINKFLAGSOPT=
-.IF "$(NO_BSYMBOLIC)"==""
-.IF "$(PRJNAME)" != "envtest"
-LINKFLAGSSHLGUI+= -Wl,-Bsymbolic
-LINKFLAGSSHLCUI+= -Wl,-Bsymbolic
-.ENDIF
-.ENDIF
+# linker flags for optimization (symbol hashtable)
+# for now, applied to symbol scoped libraries, only
+LINKFLAGSOPTIMIZE*=-Wl,-O1
+LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
-LINKVERSIONMAPFLAG=-Wl,--version-script
+SONAME_SWITCH=-Wl,-h
# Sequence of libs does matter !
-STDLIBCPP=-lstdc++
-# _SYSLIBS= -L/usr/lib -lm
-# _X11LIBS= -L/usr/X11R6/lib -lXext -lX11
-# _CXXLIBS= -L/usr/lib -lstdc++ -L/usr/local/lib
+STDLIBCPP=-lstdc++
# default objectfilenames to link
+STDOBJVCL=$(L)$/salmain.o
STDOBJGUI=
STDSLOGUI=
STDOBJCUI=
@@ -201,24 +199,25 @@
# libraries for linking applications
STDLIBCUIST=-lm
-STDLIBGUIST=-lXaw -lXt -lX11 -lm
-STDLIBGUIMT=-lXaw -lXt -lX11 $(PTHREAD_LIBS) -lm
+STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
STDLIBCUIMT=$(PTHREAD_LIBS) -lm
-
+STDLIBGUIST=-lX11 -lm
# libraries for linking shared libraries
-STDSHLGUIMT=-lXaw -lXt -lX11 -lXext $(PTHREAD_LIBS) -lm
+STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
STDSHLCUIMT=$(PTHREAD_LIBS) -lm
+STDSHLGUIST=-lX11 -lXext -lm
+STDSHLCUIST=-lm
LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-# STLport always needs pthread.
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(STDLIBCPP) $(PTHREAD_LIBS)
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) $(PTHREAD_LIBS)
+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
+
+#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
# name of library manager
LIBMGR=ar
LIBFLAGS=-r
-LIBEXT= .a
# tool for generating import libraries
IMPLIB=
@@ -237,3 +236,4 @@
DLLPOSTFIX=fi
DLLPRE=lib
DLLPOST=.so
+

24
editors/openoffice.org-2-RC/files/patch-transex3+source+xmlparse.cxx
View File

@ -1,24 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=40184
o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=2030&Path=SRC680%2Fpj16
o pj16
Description
FreeBSD doesn't have alloca.h
Index: source/xmlparse.cxx
===================================================================
RCS file: /cvs/l10n/transex3/source/xmlparse.cxx,v
retrieving revision 1.5
diff -u -r1.5 xmlparse.cxx
--- transex3/source/xmlparse.cxx 18 Nov 2004 08:17:50 -0000 1.5
+++ transex3/source/xmlparse.cxx 8 Jan 2005 02:56:14 -0000
@@ -67,7 +67,7 @@
#ifdef WIN32
#include <malloc.h>
#else
-#ifndef MACOSX
+#if !(defined(MACOSX) || defined(FREEBSD))
#include <alloca.h>
#endif
#endif

4
editors/openoffice.org-2-devel/Makefile
View File

@ -19,7 +19,7 @@ EXTRACT_ONLY= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
SNAPDATE= 20050119
SNAPDATE= 20050123
NO_LATEST_LINK= yes
USE_GNOME= gtk20
MOZILLA_PROJECT= cws_srx645_mozooo.20041016.tar.gz
@ -49,7 +49,7 @@ BROKEN= "rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
CODELINE= 680
RELEASE_NR= 1.9
MILESTONE= 72
MILESTONE= 73
INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE}
EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
DIST_SUBDIR= openoffice.org2.0

4
editors/openoffice.org-2-devel/distinfo
View File

@ -1,5 +1,5 @@
MD5 (openoffice.org2.0/OOo_1.9m72_source.tar.bz2) = c51fa9d749f1e5eb3733d50b91f97fe8
SIZE (openoffice.org2.0/OOo_1.9m72_source.tar.bz2) = 233690890
MD5 (openoffice.org2.0/OOo_1.9m73_source.tar.bz2) = 0885bb45bd204b03b16f8276cbd922e0
SIZE (openoffice.org2.0/OOo_1.9m73_source.tar.bz2) = 233756500
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
MD5 (openoffice.org2.0/cws_srx645_mozooo.20041016.tar.gz) = eda0ab73b24c45890ae08bdfe04049bd

2
editors/openoffice.org-2-devel/files/Makefile.knobs
View File

@ -19,7 +19,7 @@ CONFIGURE_ARGS+= --enable-cups
.if defined(ALL_LOCALIZED_LANGS)
CONFIGURE_ARGS+= --with-lang="en-US ar ca cs da de el es et fi fr he hi-IN hu it ja ko pl pt pt-BR ru sk sl sv th tr zh-CN zh-TW"
#following langs still seem to be under development
#following langs still seem to be under development
#af bg cy eo eu gl kn-IN lt nb nl nn ns tn zu
#CONFIGURE_ARGS+= --with-lang=ALL
.else

25
editors/openoffice.org-2-devel/files/patch-config_office+set_soenv.in
View File

@ -1,25 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=37731
o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=2030&Path=SRC680%2Fpj16
o pj16
Description
Do not export LINK to environment
Index: config_office/set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.31
diff -u -r1.31 set_soenv.in
--- config_office/set_soenv.in 5 Jan 2005 12:10:00 -0000 1.31
+++ config_office/set_soenv.in 9 Jan 2005 18:51:24 -0000
@@ -1684,9 +1684,6 @@
ToFile( "CC", $CC, "e" );
ToFile( "CXX", $CXX, "e" );
ToFile( "USE_SYSTEM_STL", "@USE_SYSTEM_STL@", "e" );
-if ( $COM ne "MSC" ) {
- ToFile( "LINK", $CC, "e" );
-}
ToFile( "ENABLE_SYMBOLS", "@ENABLE_SYMBOLS@", "e" );
ToFile( "ENABLE_CRASHDUMP", "@ENABLE_CRASHDUMP@", "e" );
ToFile( "ENABLE_CUPS", "@ENABLE_CUPS@", "e" );

1004
editors/openoffice.org-2-devel/files/patch-project-bridges
View File

File diff suppressed because it is too large Load Diff

65
editors/openoffice.org-2-devel/files/patch-project-extentions
View File

@ -1,65 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=40179
o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=2030&Path=SRC680%2Fpj16
o pj16
Description
o source/config/ldap/makefile.mk needs -lcompat since re_comp is defined here.
o FreeBSD doesn't have -ldl
o INC+= -DNP_LINUX is also requried for FreeBSD
Index: source/config/ldap/makefile.mk
===================================================================
RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
retrieving revision 1.4
diff -u -r1.4 makefile.mk
--- extensions/source/config/ldap/makefile.mk 15 Nov 2004 14:14:22 -0000 1.4
+++ extensions/source/config/ldap/makefile.mk 8 Jan 2005 02:48:29 -0000
@@ -116,6 +116,9 @@
$(CPPULIB) \
$(SALHELPERLIB) \
$(SALLIB)
+.IF "$(OS)"=="FREEBSD"
+SHL1STDLIBS+=-lcompat
+.ENDIF
DEF1NAME=$(SHL1TARGET)
DEF1EXPORTFILE=exports.dxp
Index: source/nsplugin/source/makefile.mk
===================================================================
RCS file: /cvs/util/extensions/source/nsplugin/source/makefile.mk,v
retrieving revision 1.8
diff -u -r1.8 makefile.mk
--- extensions/source/nsplugin/source/makefile.mk 3 Jan 2005 09:04:51 -0000 1.8
+++ extensions/source/nsplugin/source/makefile.mk 8 Jan 2005 02:48:30 -0000
@@ -78,7 +78,7 @@
@echo GTK disabled - nothing to build
.ELSE # "$(ENABLE_GTK)"==""
-.IF "$(OS)"=="LINUX"
+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
INC+= -DNP_LINUX
.ENDIF
PKGCONFIG_MODULES=gtk+-2.0
@@ -99,8 +99,10 @@
.IF "$(GUI)"=="UNX"
SHL1OBJS+=$(SLO)$/npunix.obj
SLOFILES+=$(SLO)$/npunix.obj
+.IF "$(OS)"!="FREEBSD"
SHL1STDLIBS+= -ldl -lnsl
-.ENDIF
+.ENDIF #FREEBSD
+.ENDIF #UNX
.IF "$(GUI)"=="WNT"
SHL1OBJS+=$(SLO)$/npwin.obj
SLOFILES+=$(SLO)$/npwin.obj
@@ -131,7 +133,7 @@
.IF "$(GUI)"=="UNX"
APP1STDLIBS+=$(PKGCONFIG_LIBS:s/-lpangoxft-1.0//)
-.IF "$(OS)"=="LINUX"
+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
.ELSE
APP1STDLIBS+= -ldl -lnsl -lnls -lsocket
.ENDIF

262
editors/openoffice.org-2-devel/files/patch-solenv+inc+unxfbsdi.mk
View File

@ -1,262 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=40182
Description
o catch up recent unxlngi6.mk
o -Wl,-z,defs -> comment out
Index: solenv/inc/unxfbsdi.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
retrieving revision 1.11
diff -u -r1.11 unxfbsdi.mk
--- solenv/inc/unxfbsdi.mk 20 Sep 2004 08:37:13 -0000 1.11
+++ solenv/inc/unxfbsdi.mk 10 Jan 2005 07:44:44 -0000
@@ -60,16 +60,26 @@
#
#*************************************************************************
-# mak file for unxfbsdi
-ASM=$(CC)
-AFLAGS=-x assembler-with-cpp -c $(CDEFS)
+# mk file for unxfbsdi
+ASM=
+AFLAGS=
+
+SOLAR_JAVA*=TRUE
+JAVAFLAGSDEBUG=-g
# filter for supressing verbose messages from linker
#not needed at the moment
#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+# _PTHREADS is needed for the stl
+CDEFS+=$(PTHREAD_CFLAGS) -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
+
+# enable visibility define in "sal/types.h"
+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+
# this is a platform with JAVA support
-SOLAR_JAVA*=TRUE
.IF "$(SOLAR_JAVA)"!=""
JAVADEF=-DSOLAR_JAVA
.IF "$(debug)"==""
@@ -83,90 +93,82 @@
CXX*=g++
# name of C Compiler
CC*=gcc
+.IF "$(SYSBASE)"!=""
+CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
+CXX+:=$(CFLAGS_SYSBASE)
+CC+:=$(CFLAGS_SYSBASE)
+.ENDIF # "$(SYSBASE)"!=""
+CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
+.IF "$(PRODUCT)"!=""
+CFLAGS+=-Wuninitialized
+.ENDIF
-# filter for supressing verbose messages from linker
-# not needed at the moment
-LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+# flags to enable build with symbols; required for crashdump feature
+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
+CFLAGSENABLESYMBOLS=-g1
+.ELSE
+CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
-# options for C and C++ Compiler
-CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=450 -DOSVERSION=$(OSVERSION)
-CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT
-
-# flags for C and C++ Compile
-CFLAGS+= -w -c $(INCLUDE)
-CFLAGS+= -I/usr/X11R6/include
+.ENDIF
# flags for the C++ Compiler
-CFLAGSCC= -pipe -fno-rtti
-CFLAGSCXX= -pipe -fno-rtti
-CFLAGSCXX+= -Wno-ctor-dtor-privacy
-
+CFLAGSCC= -pipe -mtune=pentiumpro
# Flags for enabling exception handling
-CFLAGSEXCEPTIONS= -fexceptions
-CFLAGS_NO_EXCEPTIONS= -fno-exceptions
-
-# Compiler flags for compiling static object in single threaded
-# environment with graphical user interface
-CFLAGSOBJGUIST= -fPIC
-
-# Compiler flags for compiling static object in single threaded
-# environment with character user interface
-CFLAGSOBJCUIST= -fPIC
-
-# Compiler flags for compiling static object in multi threaded
-# environment with graphical user interface
-CFLAGSOBJGUIMT= -fPIC
-
-# Compiler flags for compiling static object in multi threaded
-# environment with character user interface
-CFLAGSOBJCUIMT= -fPIC
-
-# Compiler flags for compiling shared object in multi threaded
-# environment with graphical user interface
-CFLAGSSLOGUIMT= -fPIC
-
-# Compiler flags for compiling shared object in multi threaded
-# environment with character user interface
-CFLAGSSLOCUIMT= -fPIC
+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
+# Flags for disabling exception handling
+CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-# Compiler flags for profilin
-CFLAGSPROF= -pg
+# -fpermissive should be removed as soon as possible
+CFLAGSCXX= -pipe -mtune=pentiumpro
+CFLAGSCXX+= -Wno-ctor-dtor-privacy
+# Compiler flags for compiling static object in single threaded environment with graphical user interface
+CFLAGSOBJGUIST=
+# Compiler flags for compiling static object in single threaded environment with character user interface
+CFLAGSOBJCUIST=
+# Compiler flags for compiling static object in multi threaded environment with graphical user interface
+CFLAGSOBJGUIMT=
+# Compiler flags for compiling static object in multi threaded environment with character user interface
+CFLAGSOBJCUIMT=
+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
+CFLAGSSLOGUIMT=-fPIC
+# Compiler flags for compiling shared object in multi threaded environment with character user interface
+CFLAGSSLOCUIMT=-fPIC
+# Compiler flags for profiling
+CFLAGSPROF=
# Compiler flags for debugging
-CFLAGSDEBUG= -g
+CFLAGSDEBUG=-g
CFLAGSDBGUTIL=
-
-# Compiler flags to enable optimizations
-# -02 is broken for FreeBSD
-CFLAGSOPT= -O
-
-# Compiler flags to disable optimizations
-# -0 is broken for STLport for FreeBSD
-CFLAGSNOOPT= -O0
-
-# Compiler flags for the output path
-CFLAGSOUTOBJ= -o
-
+# Compiler flags for enabling optimazations
+.IF "$(PRODUCT)"!=""
+CFLAGSOPT=-Os -fno-strict-aliasing # optimizing for products
+.ELSE # "$(PRODUCT)"!=""
+CFLAGSOPT= # no optimizing for non products
+.ENDIF # "$(PRODUCT)"!=""
+# Compiler flags for disabling optimazations
+CFLAGSNOOPT=-O0
+# Compiler flags for discibing the output path
+CFLAGSOUTOBJ=-o
# Enable all warnings
CFLAGSWALL=-Wall
-
# Set default warn level
-CFLAGSDFLTWARN=-w
+CFLAGSDFLTWARN=
# switches for dynamic and static linking
-STATIC= -Wl,-Bstatic
-DYNAMIC= -Wl,-Bdynamic
+STATIC = -Wl,-Bstatic
+DYNAMIC = -Wl,-Bdynamic
# name of linker
-LINK=$(CC)
+LINK*=$(CXX)
# default linker flags
-# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-LINKFLAGS=$(LINKFLAGSRUNPATH)
+LINKFLAGSDEFS*=#-Wl,-z,defs
+LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
+LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
# linker flags for linking applications
-LINKFLAGSAPPGUI= -Wl,--noinhibit-exec
-LINKFLAGSAPPCUI= -Wl,--noinhibit-exec
+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
# linker flags for linking shared libraries
LINKFLAGSSHLGUI= -shared
@@ -177,23 +179,19 @@
LINKFLAGSDEBUG=-g
LINKFLAGSOPT=
-.IF "$(NO_BSYMBOLIC)"==""
-.IF "$(PRJNAME)" != "envtest"
-LINKFLAGSSHLGUI+= -Wl,-Bsymbolic
-LINKFLAGSSHLCUI+= -Wl,-Bsymbolic
-.ENDIF
-.ENDIF
+# linker flags for optimization (symbol hashtable)
+# for now, applied to symbol scoped libraries, only
+LINKFLAGSOPTIMIZE*=-Wl,-O1
+LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
-LINKVERSIONMAPFLAG=-Wl,--version-script
+SONAME_SWITCH=-Wl,-h
# Sequence of libs does matter !
-STDLIBCPP=-lstdc++
-# _SYSLIBS= -L/usr/lib -lm
-# _X11LIBS= -L/usr/X11R6/lib -lXext -lX11
-# _CXXLIBS= -L/usr/lib -lstdc++ -L/usr/local/lib
+STDLIBCPP=-lstdc++
# default objectfilenames to link
+STDOBJVCL=$(L)$/salmain.o
STDOBJGUI=
STDSLOGUI=
STDOBJCUI=
@@ -201,24 +199,25 @@
# libraries for linking applications
STDLIBCUIST=-lm
-STDLIBGUIST=-lXaw -lXt -lX11 -lm
-STDLIBGUIMT=-lXaw -lXt -lX11 $(PTHREAD_LIBS) -lm
+STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
STDLIBCUIMT=$(PTHREAD_LIBS) -lm
-
+STDLIBGUIST=-lX11 -lm
# libraries for linking shared libraries
-STDSHLGUIMT=-lXaw -lXt -lX11 -lXext $(PTHREAD_LIBS) -lm
+STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
STDSHLCUIMT=$(PTHREAD_LIBS) -lm
+STDSHLGUIST=-lX11 -lXext -lm
+STDSHLCUIST=-lm
LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-# STLport always needs pthread.
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(STDLIBCPP) $(PTHREAD_LIBS)
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) $(PTHREAD_LIBS)
+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
+
+#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
# name of library manager
LIBMGR=ar
LIBFLAGS=-r
-LIBEXT= .a
# tool for generating import libraries
IMPLIB=
@@ -237,3 +236,4 @@
DLLPOSTFIX=fi
DLLPRE=lib
DLLPOST=.so
+

24
editors/openoffice.org-2-devel/files/patch-transex3+source+xmlparse.cxx
View File

@ -1,24 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=40184
o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=2030&Path=SRC680%2Fpj16
o pj16
Description
FreeBSD doesn't have alloca.h
Index: source/xmlparse.cxx
===================================================================
RCS file: /cvs/l10n/transex3/source/xmlparse.cxx,v
retrieving revision 1.5
diff -u -r1.5 xmlparse.cxx
--- transex3/source/xmlparse.cxx 18 Nov 2004 08:17:50 -0000 1.5
+++ transex3/source/xmlparse.cxx 8 Jan 2005 02:56:14 -0000
@@ -67,7 +67,7 @@
#ifdef WIN32
#include <malloc.h>
#else
-#ifndef MACOSX
+#if !(defined(MACOSX) || defined(FREEBSD))
#include <alloca.h>
#endif
#endif

4
editors/openoffice.org-2.0-devel/Makefile
View File

@ -19,7 +19,7 @@ EXTRACT_ONLY= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
SNAPDATE= 20050119
SNAPDATE= 20050123
NO_LATEST_LINK= yes
USE_GNOME= gtk20
MOZILLA_PROJECT= cws_srx645_mozooo.20041016.tar.gz
@ -49,7 +49,7 @@ BROKEN= "rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
CODELINE= 680
RELEASE_NR= 1.9
MILESTONE= 72
MILESTONE= 73
INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE}
EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
DIST_SUBDIR= openoffice.org2.0

4
editors/openoffice.org-2.0-devel/distinfo
View File

@ -1,5 +1,5 @@
MD5 (openoffice.org2.0/OOo_1.9m72_source.tar.bz2) = c51fa9d749f1e5eb3733d50b91f97fe8
SIZE (openoffice.org2.0/OOo_1.9m72_source.tar.bz2) = 233690890
MD5 (openoffice.org2.0/OOo_1.9m73_source.tar.bz2) = 0885bb45bd204b03b16f8276cbd922e0
SIZE (openoffice.org2.0/OOo_1.9m73_source.tar.bz2) = 233756500
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
MD5 (openoffice.org2.0/cws_srx645_mozooo.20041016.tar.gz) = eda0ab73b24c45890ae08bdfe04049bd

2
editors/openoffice.org-2.0-devel/files/Makefile.knobs
View File

@ -19,7 +19,7 @@ CONFIGURE_ARGS+= --enable-cups
.if defined(ALL_LOCALIZED_LANGS)
CONFIGURE_ARGS+= --with-lang="en-US ar ca cs da de el es et fi fr he hi-IN hu it ja ko pl pt pt-BR ru sk sl sv th tr zh-CN zh-TW"
#following langs still seem to be under development
#following langs still seem to be under development
#af bg cy eo eu gl kn-IN lt nb nl nn ns tn zu
#CONFIGURE_ARGS+= --with-lang=ALL
.else

25
editors/openoffice.org-2.0-devel/files/patch-config_office+set_soenv.in
View File

@ -1,25 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=37731
o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=2030&Path=SRC680%2Fpj16
o pj16
Description
Do not export LINK to environment
Index: config_office/set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.31
diff -u -r1.31 set_soenv.in
--- config_office/set_soenv.in 5 Jan 2005 12:10:00 -0000 1.31
+++ config_office/set_soenv.in 9 Jan 2005 18:51:24 -0000
@@ -1684,9 +1684,6 @@
ToFile( "CC", $CC, "e" );
ToFile( "CXX", $CXX, "e" );
ToFile( "USE_SYSTEM_STL", "@USE_SYSTEM_STL@", "e" );
-if ( $COM ne "MSC" ) {
- ToFile( "LINK", $CC, "e" );
-}
ToFile( "ENABLE_SYMBOLS", "@ENABLE_SYMBOLS@", "e" );
ToFile( "ENABLE_CRASHDUMP", "@ENABLE_CRASHDUMP@", "e" );
ToFile( "ENABLE_CUPS", "@ENABLE_CUPS@", "e" );

1004
editors/openoffice.org-2.0-devel/files/patch-project-bridges
View File

File diff suppressed because it is too large Load Diff

65
editors/openoffice.org-2.0-devel/files/patch-project-extentions
View File

@ -1,65 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=40179
o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=2030&Path=SRC680%2Fpj16
o pj16
Description
o source/config/ldap/makefile.mk needs -lcompat since re_comp is defined here.
o FreeBSD doesn't have -ldl
o INC+= -DNP_LINUX is also requried for FreeBSD
Index: source/config/ldap/makefile.mk
===================================================================
RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
retrieving revision 1.4
diff -u -r1.4 makefile.mk
--- extensions/source/config/ldap/makefile.mk 15 Nov 2004 14:14:22 -0000 1.4
+++ extensions/source/config/ldap/makefile.mk 8 Jan 2005 02:48:29 -0000
@@ -116,6 +116,9 @@
$(CPPULIB) \
$(SALHELPERLIB) \
$(SALLIB)
+.IF "$(OS)"=="FREEBSD"
+SHL1STDLIBS+=-lcompat
+.ENDIF
DEF1NAME=$(SHL1TARGET)
DEF1EXPORTFILE=exports.dxp
Index: source/nsplugin/source/makefile.mk
===================================================================
RCS file: /cvs/util/extensions/source/nsplugin/source/makefile.mk,v
retrieving revision 1.8
diff -u -r1.8 makefile.mk
--- extensions/source/nsplugin/source/makefile.mk 3 Jan 2005 09:04:51 -0000 1.8
+++ extensions/source/nsplugin/source/makefile.mk 8 Jan 2005 02:48:30 -0000
@@ -78,7 +78,7 @@
@echo GTK disabled - nothing to build
.ELSE # "$(ENABLE_GTK)"==""
-.IF "$(OS)"=="LINUX"
+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
INC+= -DNP_LINUX
.ENDIF
PKGCONFIG_MODULES=gtk+-2.0
@@ -99,8 +99,10 @@
.IF "$(GUI)"=="UNX"
SHL1OBJS+=$(SLO)$/npunix.obj
SLOFILES+=$(SLO)$/npunix.obj
+.IF "$(OS)"!="FREEBSD"
SHL1STDLIBS+= -ldl -lnsl
-.ENDIF
+.ENDIF #FREEBSD
+.ENDIF #UNX
.IF "$(GUI)"=="WNT"
SHL1OBJS+=$(SLO)$/npwin.obj
SLOFILES+=$(SLO)$/npwin.obj
@@ -131,7 +133,7 @@
.IF "$(GUI)"=="UNX"
APP1STDLIBS+=$(PKGCONFIG_LIBS:s/-lpangoxft-1.0//)
-.IF "$(OS)"=="LINUX"
+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
.ELSE
APP1STDLIBS+= -ldl -lnsl -lnls -lsocket
.ENDIF

262
editors/openoffice.org-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk
View File

@ -1,262 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=40182
Description
o catch up recent unxlngi6.mk
o -Wl,-z,defs -> comment out
Index: solenv/inc/unxfbsdi.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
retrieving revision 1.11
diff -u -r1.11 unxfbsdi.mk
--- solenv/inc/unxfbsdi.mk 20 Sep 2004 08:37:13 -0000 1.11
+++ solenv/inc/unxfbsdi.mk 10 Jan 2005 07:44:44 -0000
@@ -60,16 +60,26 @@
#
#*************************************************************************
-# mak file for unxfbsdi
-ASM=$(CC)
-AFLAGS=-x assembler-with-cpp -c $(CDEFS)
+# mk file for unxfbsdi
+ASM=
+AFLAGS=
+
+SOLAR_JAVA*=TRUE
+JAVAFLAGSDEBUG=-g
# filter for supressing verbose messages from linker
#not needed at the moment
#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+# _PTHREADS is needed for the stl
+CDEFS+=$(PTHREAD_CFLAGS) -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
+
+# enable visibility define in "sal/types.h"
+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+
# this is a platform with JAVA support
-SOLAR_JAVA*=TRUE
.IF "$(SOLAR_JAVA)"!=""
JAVADEF=-DSOLAR_JAVA
.IF "$(debug)"==""
@@ -83,90 +93,82 @@
CXX*=g++
# name of C Compiler
CC*=gcc
+.IF "$(SYSBASE)"!=""
+CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
+CXX+:=$(CFLAGS_SYSBASE)
+CC+:=$(CFLAGS_SYSBASE)
+.ENDIF # "$(SYSBASE)"!=""
+CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
+.IF "$(PRODUCT)"!=""
+CFLAGS+=-Wuninitialized
+.ENDIF
-# filter for supressing verbose messages from linker
-# not needed at the moment
-LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+# flags to enable build with symbols; required for crashdump feature
+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
+CFLAGSENABLESYMBOLS=-g1
+.ELSE
+CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
-# options for C and C++ Compiler
-CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=450 -DOSVERSION=$(OSVERSION)
-CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT
-
-# flags for C and C++ Compile
-CFLAGS+= -w -c $(INCLUDE)
-CFLAGS+= -I/usr/X11R6/include
+.ENDIF
# flags for the C++ Compiler
-CFLAGSCC= -pipe -fno-rtti
-CFLAGSCXX= -pipe -fno-rtti
-CFLAGSCXX+= -Wno-ctor-dtor-privacy
-
+CFLAGSCC= -pipe -mtune=pentiumpro
# Flags for enabling exception handling
-CFLAGSEXCEPTIONS= -fexceptions
-CFLAGS_NO_EXCEPTIONS= -fno-exceptions
-
-# Compiler flags for compiling static object in single threaded
-# environment with graphical user interface
-CFLAGSOBJGUIST= -fPIC
-
-# Compiler flags for compiling static object in single threaded
-# environment with character user interface
-CFLAGSOBJCUIST= -fPIC
-
-# Compiler flags for compiling static object in multi threaded
-# environment with graphical user interface
-CFLAGSOBJGUIMT= -fPIC
-
-# Compiler flags for compiling static object in multi threaded
-# environment with character user interface
-CFLAGSOBJCUIMT= -fPIC
-
-# Compiler flags for compiling shared object in multi threaded
-# environment with graphical user interface
-CFLAGSSLOGUIMT= -fPIC
-
-# Compiler flags for compiling shared object in multi threaded
-# environment with character user interface
-CFLAGSSLOCUIMT= -fPIC
+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
+# Flags for disabling exception handling
+CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-# Compiler flags for profilin
-CFLAGSPROF= -pg
+# -fpermissive should be removed as soon as possible
+CFLAGSCXX= -pipe -mtune=pentiumpro
+CFLAGSCXX+= -Wno-ctor-dtor-privacy
+# Compiler flags for compiling static object in single threaded environment with graphical user interface
+CFLAGSOBJGUIST=
+# Compiler flags for compiling static object in single threaded environment with character user interface
+CFLAGSOBJCUIST=
+# Compiler flags for compiling static object in multi threaded environment with graphical user interface
+CFLAGSOBJGUIMT=
+# Compiler flags for compiling static object in multi threaded environment with character user interface
+CFLAGSOBJCUIMT=
+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
+CFLAGSSLOGUIMT=-fPIC
+# Compiler flags for compiling shared object in multi threaded environment with character user interface
+CFLAGSSLOCUIMT=-fPIC
+# Compiler flags for profiling
+CFLAGSPROF=
# Compiler flags for debugging
-CFLAGSDEBUG= -g
+CFLAGSDEBUG=-g
CFLAGSDBGUTIL=
-
-# Compiler flags to enable optimizations
-# -02 is broken for FreeBSD
-CFLAGSOPT= -O
-
-# Compiler flags to disable optimizations
-# -0 is broken for STLport for FreeBSD
-CFLAGSNOOPT= -O0
-
-# Compiler flags for the output path
-CFLAGSOUTOBJ= -o
-
+# Compiler flags for enabling optimazations
+.IF "$(PRODUCT)"!=""
+CFLAGSOPT=-Os -fno-strict-aliasing # optimizing for products
+.ELSE # "$(PRODUCT)"!=""
+CFLAGSOPT= # no optimizing for non products
+.ENDIF # "$(PRODUCT)"!=""
+# Compiler flags for disabling optimazations
+CFLAGSNOOPT=-O0
+# Compiler flags for discibing the output path
+CFLAGSOUTOBJ=-o
# Enable all warnings
CFLAGSWALL=-Wall
-
# Set default warn level
-CFLAGSDFLTWARN=-w
+CFLAGSDFLTWARN=
# switches for dynamic and static linking
-STATIC= -Wl,-Bstatic
-DYNAMIC= -Wl,-Bdynamic
+STATIC = -Wl,-Bstatic
+DYNAMIC = -Wl,-Bdynamic
# name of linker
-LINK=$(CC)
+LINK*=$(CXX)
# default linker flags
-# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-LINKFLAGS=$(LINKFLAGSRUNPATH)
+LINKFLAGSDEFS*=#-Wl,-z,defs
+LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
+LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
# linker flags for linking applications
-LINKFLAGSAPPGUI= -Wl,--noinhibit-exec
-LINKFLAGSAPPCUI= -Wl,--noinhibit-exec
+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
# linker flags for linking shared libraries
LINKFLAGSSHLGUI= -shared
@@ -177,23 +179,19 @@
LINKFLAGSDEBUG=-g
LINKFLAGSOPT=
-.IF "$(NO_BSYMBOLIC)"==""
-.IF "$(PRJNAME)" != "envtest"
-LINKFLAGSSHLGUI+= -Wl,-Bsymbolic
-LINKFLAGSSHLCUI+= -Wl,-Bsymbolic
-.ENDIF
-.ENDIF
+# linker flags for optimization (symbol hashtable)
+# for now, applied to symbol scoped libraries, only
+LINKFLAGSOPTIMIZE*=-Wl,-O1
+LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
-LINKVERSIONMAPFLAG=-Wl,--version-script
+SONAME_SWITCH=-Wl,-h
# Sequence of libs does matter !
-STDLIBCPP=-lstdc++
-# _SYSLIBS= -L/usr/lib -lm
-# _X11LIBS= -L/usr/X11R6/lib -lXext -lX11
-# _CXXLIBS= -L/usr/lib -lstdc++ -L/usr/local/lib
+STDLIBCPP=-lstdc++
# default objectfilenames to link
+STDOBJVCL=$(L)$/salmain.o
STDOBJGUI=
STDSLOGUI=
STDOBJCUI=
@@ -201,24 +199,25 @@
# libraries for linking applications
STDLIBCUIST=-lm
-STDLIBGUIST=-lXaw -lXt -lX11 -lm
-STDLIBGUIMT=-lXaw -lXt -lX11 $(PTHREAD_LIBS) -lm
+STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
STDLIBCUIMT=$(PTHREAD_LIBS) -lm
-
+STDLIBGUIST=-lX11 -lm
# libraries for linking shared libraries
-STDSHLGUIMT=-lXaw -lXt -lX11 -lXext $(PTHREAD_LIBS) -lm
+STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
STDSHLCUIMT=$(PTHREAD_LIBS) -lm
+STDSHLGUIST=-lX11 -lXext -lm
+STDSHLCUIST=-lm
LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-# STLport always needs pthread.
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(STDLIBCPP) $(PTHREAD_LIBS)
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) $(PTHREAD_LIBS)
+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
+
+#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
# name of library manager
LIBMGR=ar
LIBFLAGS=-r
-LIBEXT= .a
# tool for generating import libraries
IMPLIB=
@@ -237,3 +236,4 @@
DLLPOSTFIX=fi
DLLPRE=lib
DLLPOST=.so
+

24
editors/openoffice.org-2.0-devel/files/patch-transex3+source+xmlparse.cxx
View File

@ -1,24 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=40184
o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=2030&Path=SRC680%2Fpj16
o pj16
Description
FreeBSD doesn't have alloca.h
Index: source/xmlparse.cxx
===================================================================
RCS file: /cvs/l10n/transex3/source/xmlparse.cxx,v
retrieving revision 1.5
diff -u -r1.5 xmlparse.cxx
--- transex3/source/xmlparse.cxx 18 Nov 2004 08:17:50 -0000 1.5
+++ transex3/source/xmlparse.cxx 8 Jan 2005 02:56:14 -0000
@@ -67,7 +67,7 @@
#ifdef WIN32
#include <malloc.h>
#else
-#ifndef MACOSX
+#if !(defined(MACOSX) || defined(FREEBSD))
#include <alloca.h>
#endif
#endif

4
editors/openoffice.org-2.0/Makefile
View File

@ -19,7 +19,7 @@ EXTRACT_ONLY= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
SNAPDATE= 20050119
SNAPDATE= 20050123
NO_LATEST_LINK= yes
USE_GNOME= gtk20
MOZILLA_PROJECT= cws_srx645_mozooo.20041016.tar.gz
@ -49,7 +49,7 @@ BROKEN= "rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
CODELINE= 680
RELEASE_NR= 1.9
MILESTONE= 72
MILESTONE= 73
INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE}
EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
DIST_SUBDIR= openoffice.org2.0

4
editors/openoffice.org-2.0/distinfo
View File

@ -1,5 +1,5 @@
MD5 (openoffice.org2.0/OOo_1.9m72_source.tar.bz2) = c51fa9d749f1e5eb3733d50b91f97fe8
SIZE (openoffice.org2.0/OOo_1.9m72_source.tar.bz2) = 233690890
MD5 (openoffice.org2.0/OOo_1.9m73_source.tar.bz2) = 0885bb45bd204b03b16f8276cbd922e0
SIZE (openoffice.org2.0/OOo_1.9m73_source.tar.bz2) = 233756500
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
MD5 (openoffice.org2.0/cws_srx645_mozooo.20041016.tar.gz) = eda0ab73b24c45890ae08bdfe04049bd

2
editors/openoffice.org-2.0/files/Makefile.knobs
View File

@ -19,7 +19,7 @@ CONFIGURE_ARGS+= --enable-cups
.if defined(ALL_LOCALIZED_LANGS)
CONFIGURE_ARGS+= --with-lang="en-US ar ca cs da de el es et fi fr he hi-IN hu it ja ko pl pt pt-BR ru sk sl sv th tr zh-CN zh-TW"
#following langs still seem to be under development
#following langs still seem to be under development
#af bg cy eo eu gl kn-IN lt nb nl nn ns tn zu
#CONFIGURE_ARGS+= --with-lang=ALL
.else

25
editors/openoffice.org-2.0/files/patch-config_office+set_soenv.in
View File

@ -1,25 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=37731
o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=2030&Path=SRC680%2Fpj16
o pj16
Description
Do not export LINK to environment
Index: config_office/set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.31
diff -u -r1.31 set_soenv.in
--- config_office/set_soenv.in 5 Jan 2005 12:10:00 -0000 1.31
+++ config_office/set_soenv.in 9 Jan 2005 18:51:24 -0000
@@ -1684,9 +1684,6 @@
ToFile( "CC", $CC, "e" );
ToFile( "CXX", $CXX, "e" );
ToFile( "USE_SYSTEM_STL", "@USE_SYSTEM_STL@", "e" );
-if ( $COM ne "MSC" ) {
- ToFile( "LINK", $CC, "e" );
-}
ToFile( "ENABLE_SYMBOLS", "@ENABLE_SYMBOLS@", "e" );
ToFile( "ENABLE_CRASHDUMP", "@ENABLE_CRASHDUMP@", "e" );
ToFile( "ENABLE_CUPS", "@ENABLE_CUPS@", "e" );

1004
editors/openoffice.org-2.0/files/patch-project-bridges
View File

File diff suppressed because it is too large Load Diff

65
editors/openoffice.org-2.0/files/patch-project-extentions
View File

@ -1,65 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=40179
o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=2030&Path=SRC680%2Fpj16
o pj16
Description
o source/config/ldap/makefile.mk needs -lcompat since re_comp is defined here.
o FreeBSD doesn't have -ldl
o INC+= -DNP_LINUX is also requried for FreeBSD
Index: source/config/ldap/makefile.mk
===================================================================
RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
retrieving revision 1.4
diff -u -r1.4 makefile.mk
--- extensions/source/config/ldap/makefile.mk 15 Nov 2004 14:14:22 -0000 1.4
+++ extensions/source/config/ldap/makefile.mk 8 Jan 2005 02:48:29 -0000
@@ -116,6 +116,9 @@
$(CPPULIB) \
$(SALHELPERLIB) \
$(SALLIB)
+.IF "$(OS)"=="FREEBSD"
+SHL1STDLIBS+=-lcompat
+.ENDIF
DEF1NAME=$(SHL1TARGET)
DEF1EXPORTFILE=exports.dxp
Index: source/nsplugin/source/makefile.mk
===================================================================
RCS file: /cvs/util/extensions/source/nsplugin/source/makefile.mk,v
retrieving revision 1.8
diff -u -r1.8 makefile.mk
--- extensions/source/nsplugin/source/makefile.mk 3 Jan 2005 09:04:51 -0000 1.8
+++ extensions/source/nsplugin/source/makefile.mk 8 Jan 2005 02:48:30 -0000
@@ -78,7 +78,7 @@
@echo GTK disabled - nothing to build
.ELSE # "$(ENABLE_GTK)"==""
-.IF "$(OS)"=="LINUX"
+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
INC+= -DNP_LINUX
.ENDIF
PKGCONFIG_MODULES=gtk+-2.0
@@ -99,8 +99,10 @@
.IF "$(GUI)"=="UNX"
SHL1OBJS+=$(SLO)$/npunix.obj
SLOFILES+=$(SLO)$/npunix.obj
+.IF "$(OS)"!="FREEBSD"
SHL1STDLIBS+= -ldl -lnsl
-.ENDIF
+.ENDIF #FREEBSD
+.ENDIF #UNX
.IF "$(GUI)"=="WNT"
SHL1OBJS+=$(SLO)$/npwin.obj
SLOFILES+=$(SLO)$/npwin.obj
@@ -131,7 +133,7 @@
.IF "$(GUI)"=="UNX"
APP1STDLIBS+=$(PKGCONFIG_LIBS:s/-lpangoxft-1.0//)
-.IF "$(OS)"=="LINUX"
+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
.ELSE
APP1STDLIBS+= -ldl -lnsl -lnls -lsocket
.ENDIF

262
editors/openoffice.org-2.0/files/patch-solenv+inc+unxfbsdi.mk
View File

@ -1,262 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=40182
Description
o catch up recent unxlngi6.mk
o -Wl,-z,defs -> comment out
Index: solenv/inc/unxfbsdi.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
retrieving revision 1.11
diff -u -r1.11 unxfbsdi.mk
--- solenv/inc/unxfbsdi.mk 20 Sep 2004 08:37:13 -0000 1.11
+++ solenv/inc/unxfbsdi.mk 10 Jan 2005 07:44:44 -0000
@@ -60,16 +60,26 @@
#
#*************************************************************************
-# mak file for unxfbsdi
-ASM=$(CC)
-AFLAGS=-x assembler-with-cpp -c $(CDEFS)
+# mk file for unxfbsdi
+ASM=
+AFLAGS=
+
+SOLAR_JAVA*=TRUE
+JAVAFLAGSDEBUG=-g
# filter for supressing verbose messages from linker
#not needed at the moment
#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+# _PTHREADS is needed for the stl
+CDEFS+=$(PTHREAD_CFLAGS) -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
+
+# enable visibility define in "sal/types.h"
+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+
# this is a platform with JAVA support
-SOLAR_JAVA*=TRUE
.IF "$(SOLAR_JAVA)"!=""
JAVADEF=-DSOLAR_JAVA
.IF "$(debug)"==""
@@ -83,90 +93,82 @@
CXX*=g++
# name of C Compiler
CC*=gcc
+.IF "$(SYSBASE)"!=""
+CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
+CXX+:=$(CFLAGS_SYSBASE)
+CC+:=$(CFLAGS_SYSBASE)
+.ENDIF # "$(SYSBASE)"!=""
+CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
+.IF "$(PRODUCT)"!=""
+CFLAGS+=-Wuninitialized
+.ENDIF
-# filter for supressing verbose messages from linker
-# not needed at the moment
-LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+# flags to enable build with symbols; required for crashdump feature
+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
+CFLAGSENABLESYMBOLS=-g1
+.ELSE
+CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
-# options for C and C++ Compiler
-CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=450 -DOSVERSION=$(OSVERSION)
-CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT
-
-# flags for C and C++ Compile
-CFLAGS+= -w -c $(INCLUDE)
-CFLAGS+= -I/usr/X11R6/include
+.ENDIF
# flags for the C++ Compiler
-CFLAGSCC= -pipe -fno-rtti
-CFLAGSCXX= -pipe -fno-rtti
-CFLAGSCXX+= -Wno-ctor-dtor-privacy
-
+CFLAGSCC= -pipe -mtune=pentiumpro
# Flags for enabling exception handling
-CFLAGSEXCEPTIONS= -fexceptions
-CFLAGS_NO_EXCEPTIONS= -fno-exceptions
-
-# Compiler flags for compiling static object in single threaded
-# environment with graphical user interface
-CFLAGSOBJGUIST= -fPIC
-
-# Compiler flags for compiling static object in single threaded
-# environment with character user interface
-CFLAGSOBJCUIST= -fPIC
-
-# Compiler flags for compiling static object in multi threaded
-# environment with graphical user interface
-CFLAGSOBJGUIMT= -fPIC
-
-# Compiler flags for compiling static object in multi threaded
-# environment with character user interface
-CFLAGSOBJCUIMT= -fPIC
-
-# Compiler flags for compiling shared object in multi threaded
-# environment with graphical user interface
-CFLAGSSLOGUIMT= -fPIC
-
-# Compiler flags for compiling shared object in multi threaded
-# environment with character user interface
-CFLAGSSLOCUIMT= -fPIC
+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
+# Flags for disabling exception handling
+CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-# Compiler flags for profilin
-CFLAGSPROF= -pg
+# -fpermissive should be removed as soon as possible
+CFLAGSCXX= -pipe -mtune=pentiumpro
+CFLAGSCXX+= -Wno-ctor-dtor-privacy
+# Compiler flags for compiling static object in single threaded environment with graphical user interface
+CFLAGSOBJGUIST=
+# Compiler flags for compiling static object in single threaded environment with character user interface
+CFLAGSOBJCUIST=
+# Compiler flags for compiling static object in multi threaded environment with graphical user interface
+CFLAGSOBJGUIMT=
+# Compiler flags for compiling static object in multi threaded environment with character user interface
+CFLAGSOBJCUIMT=
+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
+CFLAGSSLOGUIMT=-fPIC
+# Compiler flags for compiling shared object in multi threaded environment with character user interface
+CFLAGSSLOCUIMT=-fPIC
+# Compiler flags for profiling
+CFLAGSPROF=
# Compiler flags for debugging
-CFLAGSDEBUG= -g
+CFLAGSDEBUG=-g
CFLAGSDBGUTIL=
-
-# Compiler flags to enable optimizations
-# -02 is broken for FreeBSD
-CFLAGSOPT= -O
-
-# Compiler flags to disable optimizations
-# -0 is broken for STLport for FreeBSD
-CFLAGSNOOPT= -O0
-
-# Compiler flags for the output path
-CFLAGSOUTOBJ= -o
-
+# Compiler flags for enabling optimazations
+.IF "$(PRODUCT)"!=""
+CFLAGSOPT=-Os -fno-strict-aliasing # optimizing for products
+.ELSE # "$(PRODUCT)"!=""
+CFLAGSOPT= # no optimizing for non products
+.ENDIF # "$(PRODUCT)"!=""
+# Compiler flags for disabling optimazations
+CFLAGSNOOPT=-O0
+# Compiler flags for discibing the output path
+CFLAGSOUTOBJ=-o
# Enable all warnings
CFLAGSWALL=-Wall
-
# Set default warn level
-CFLAGSDFLTWARN=-w
+CFLAGSDFLTWARN=
# switches for dynamic and static linking
-STATIC= -Wl,-Bstatic
-DYNAMIC= -Wl,-Bdynamic
+STATIC = -Wl,-Bstatic
+DYNAMIC = -Wl,-Bdynamic
# name of linker
-LINK=$(CC)
+LINK*=$(CXX)
# default linker flags
-# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-LINKFLAGS=$(LINKFLAGSRUNPATH)
+LINKFLAGSDEFS*=#-Wl,-z,defs
+LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
+LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
# linker flags for linking applications
-LINKFLAGSAPPGUI= -Wl,--noinhibit-exec
-LINKFLAGSAPPCUI= -Wl,--noinhibit-exec
+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
# linker flags for linking shared libraries
LINKFLAGSSHLGUI= -shared
@@ -177,23 +179,19 @@
LINKFLAGSDEBUG=-g
LINKFLAGSOPT=
-.IF "$(NO_BSYMBOLIC)"==""
-.IF "$(PRJNAME)" != "envtest"
-LINKFLAGSSHLGUI+= -Wl,-Bsymbolic
-LINKFLAGSSHLCUI+= -Wl,-Bsymbolic
-.ENDIF
-.ENDIF
+# linker flags for optimization (symbol hashtable)
+# for now, applied to symbol scoped libraries, only
+LINKFLAGSOPTIMIZE*=-Wl,-O1
+LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
-LINKVERSIONMAPFLAG=-Wl,--version-script
+SONAME_SWITCH=-Wl,-h
# Sequence of libs does matter !
-STDLIBCPP=-lstdc++
-# _SYSLIBS= -L/usr/lib -lm
-# _X11LIBS= -L/usr/X11R6/lib -lXext -lX11
-# _CXXLIBS= -L/usr/lib -lstdc++ -L/usr/local/lib
+STDLIBCPP=-lstdc++
# default objectfilenames to link
+STDOBJVCL=$(L)$/salmain.o
STDOBJGUI=
STDSLOGUI=
STDOBJCUI=
@@ -201,24 +199,25 @@
# libraries for linking applications
STDLIBCUIST=-lm
-STDLIBGUIST=-lXaw -lXt -lX11 -lm
-STDLIBGUIMT=-lXaw -lXt -lX11 $(PTHREAD_LIBS) -lm
+STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
STDLIBCUIMT=$(PTHREAD_LIBS) -lm
-
+STDLIBGUIST=-lX11 -lm
# libraries for linking shared libraries
-STDSHLGUIMT=-lXaw -lXt -lX11 -lXext $(PTHREAD_LIBS) -lm
+STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
STDSHLCUIMT=$(PTHREAD_LIBS) -lm
+STDSHLGUIST=-lX11 -lXext -lm
+STDSHLCUIST=-lm
LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-# STLport always needs pthread.
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(STDLIBCPP) $(PTHREAD_LIBS)
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) $(PTHREAD_LIBS)
+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
+
+#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
# name of library manager
LIBMGR=ar
LIBFLAGS=-r
-LIBEXT= .a
# tool for generating import libraries
IMPLIB=
@@ -237,3 +236,4 @@
DLLPOSTFIX=fi
DLLPRE=lib
DLLPOST=.so
+

24
editors/openoffice.org-2.0/files/patch-transex3+source+xmlparse.cxx
View File

@ -1,24 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=40184
o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=2030&Path=SRC680%2Fpj16
o pj16
Description
FreeBSD doesn't have alloca.h
Index: source/xmlparse.cxx
===================================================================
RCS file: /cvs/l10n/transex3/source/xmlparse.cxx,v
retrieving revision 1.5
diff -u -r1.5 xmlparse.cxx
--- transex3/source/xmlparse.cxx 18 Nov 2004 08:17:50 -0000 1.5
+++ transex3/source/xmlparse.cxx 8 Jan 2005 02:56:14 -0000
@@ -67,7 +67,7 @@
#ifdef WIN32
#include <malloc.h>
#else
-#ifndef MACOSX
+#if !(defined(MACOSX) || defined(FREEBSD))
#include <alloca.h>
#endif
#endif

4
editors/openoffice.org-2/Makefile
View File

@ -19,7 +19,7 @@ EXTRACT_ONLY= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
SNAPDATE= 20050119
SNAPDATE= 20050123
NO_LATEST_LINK= yes
USE_GNOME= gtk20
MOZILLA_PROJECT= cws_srx645_mozooo.20041016.tar.gz
@ -49,7 +49,7 @@ BROKEN= "rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
CODELINE= 680
RELEASE_NR= 1.9
MILESTONE= 72
MILESTONE= 73
INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE}
EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
DIST_SUBDIR= openoffice.org2.0

4
editors/openoffice.org-2/distinfo
View File

@ -1,5 +1,5 @@
MD5 (openoffice.org2.0/OOo_1.9m72_source.tar.bz2) = c51fa9d749f1e5eb3733d50b91f97fe8
SIZE (openoffice.org2.0/OOo_1.9m72_source.tar.bz2) = 233690890
MD5 (openoffice.org2.0/OOo_1.9m73_source.tar.bz2) = 0885bb45bd204b03b16f8276cbd922e0
SIZE (openoffice.org2.0/OOo_1.9m73_source.tar.bz2) = 233756500
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
MD5 (openoffice.org2.0/cws_srx645_mozooo.20041016.tar.gz) = eda0ab73b24c45890ae08bdfe04049bd

2
editors/openoffice.org-2/files/Makefile.knobs
View File

@ -19,7 +19,7 @@ CONFIGURE_ARGS+= --enable-cups
.if defined(ALL_LOCALIZED_LANGS)
CONFIGURE_ARGS+= --with-lang="en-US ar ca cs da de el es et fi fr he hi-IN hu it ja ko pl pt pt-BR ru sk sl sv th tr zh-CN zh-TW"
#following langs still seem to be under development
#following langs still seem to be under development
#af bg cy eo eu gl kn-IN lt nb nl nn ns tn zu
#CONFIGURE_ARGS+= --with-lang=ALL
.else

25
editors/openoffice.org-2/files/patch-config_office+set_soenv.in
View File

@ -1,25 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=37731
o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=2030&Path=SRC680%2Fpj16
o pj16
Description
Do not export LINK to environment
Index: config_office/set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.31
diff -u -r1.31 set_soenv.in
--- config_office/set_soenv.in 5 Jan 2005 12:10:00 -0000 1.31
+++ config_office/set_soenv.in 9 Jan 2005 18:51:24 -0000
@@ -1684,9 +1684,6 @@
ToFile( "CC", $CC, "e" );
ToFile( "CXX", $CXX, "e" );
ToFile( "USE_SYSTEM_STL", "@USE_SYSTEM_STL@", "e" );
-if ( $COM ne "MSC" ) {
- ToFile( "LINK", $CC, "e" );
-}
ToFile( "ENABLE_SYMBOLS", "@ENABLE_SYMBOLS@", "e" );
ToFile( "ENABLE_CRASHDUMP", "@ENABLE_CRASHDUMP@", "e" );
ToFile( "ENABLE_CUPS", "@ENABLE_CUPS@", "e" );

1004
editors/openoffice.org-2/files/patch-project-bridges
View File

File diff suppressed because it is too large Load Diff

65
editors/openoffice.org-2/files/patch-project-extentions
View File

@ -1,65 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=40179
o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=2030&Path=SRC680%2Fpj16
o pj16
Description
o source/config/ldap/makefile.mk needs -lcompat since re_comp is defined here.
o FreeBSD doesn't have -ldl
o INC+= -DNP_LINUX is also requried for FreeBSD
Index: source/config/ldap/makefile.mk
===================================================================
RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
retrieving revision 1.4
diff -u -r1.4 makefile.mk
--- extensions/source/config/ldap/makefile.mk 15 Nov 2004 14:14:22 -0000 1.4
+++ extensions/source/config/ldap/makefile.mk 8 Jan 2005 02:48:29 -0000
@@ -116,6 +116,9 @@
$(CPPULIB) \
$(SALHELPERLIB) \
$(SALLIB)
+.IF "$(OS)"=="FREEBSD"
+SHL1STDLIBS+=-lcompat
+.ENDIF
DEF1NAME=$(SHL1TARGET)
DEF1EXPORTFILE=exports.dxp
Index: source/nsplugin/source/makefile.mk
===================================================================
RCS file: /cvs/util/extensions/source/nsplugin/source/makefile.mk,v
retrieving revision 1.8
diff -u -r1.8 makefile.mk
--- extensions/source/nsplugin/source/makefile.mk 3 Jan 2005 09:04:51 -0000 1.8
+++ extensions/source/nsplugin/source/makefile.mk 8 Jan 2005 02:48:30 -0000
@@ -78,7 +78,7 @@
@echo GTK disabled - nothing to build
.ELSE # "$(ENABLE_GTK)"==""
-.IF "$(OS)"=="LINUX"
+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
INC+= -DNP_LINUX
.ENDIF
PKGCONFIG_MODULES=gtk+-2.0
@@ -99,8 +99,10 @@
.IF "$(GUI)"=="UNX"
SHL1OBJS+=$(SLO)$/npunix.obj
SLOFILES+=$(SLO)$/npunix.obj
+.IF "$(OS)"!="FREEBSD"
SHL1STDLIBS+= -ldl -lnsl
-.ENDIF
+.ENDIF #FREEBSD
+.ENDIF #UNX
.IF "$(GUI)"=="WNT"
SHL1OBJS+=$(SLO)$/npwin.obj
SLOFILES+=$(SLO)$/npwin.obj
@@ -131,7 +133,7 @@
.IF "$(GUI)"=="UNX"
APP1STDLIBS+=$(PKGCONFIG_LIBS:s/-lpangoxft-1.0//)
-.IF "$(OS)"=="LINUX"
+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
.ELSE
APP1STDLIBS+= -ldl -lnsl -lnls -lsocket
.ENDIF

262
editors/openoffice.org-2/files/patch-solenv+inc+unxfbsdi.mk
View File

@ -1,262 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=40182
Description
o catch up recent unxlngi6.mk
o -Wl,-z,defs -> comment out
Index: solenv/inc/unxfbsdi.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
retrieving revision 1.11
diff -u -r1.11 unxfbsdi.mk
--- solenv/inc/unxfbsdi.mk 20 Sep 2004 08:37:13 -0000 1.11
+++ solenv/inc/unxfbsdi.mk 10 Jan 2005 07:44:44 -0000
@@ -60,16 +60,26 @@
#
#*************************************************************************
-# mak file for unxfbsdi
-ASM=$(CC)
-AFLAGS=-x assembler-with-cpp -c $(CDEFS)
+# mk file for unxfbsdi
+ASM=
+AFLAGS=
+
+SOLAR_JAVA*=TRUE
+JAVAFLAGSDEBUG=-g
# filter for supressing verbose messages from linker
#not needed at the moment
#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+# _PTHREADS is needed for the stl
+CDEFS+=$(PTHREAD_CFLAGS) -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
+
+# enable visibility define in "sal/types.h"
+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+
# this is a platform with JAVA support
-SOLAR_JAVA*=TRUE
.IF "$(SOLAR_JAVA)"!=""
JAVADEF=-DSOLAR_JAVA
.IF "$(debug)"==""
@@ -83,90 +93,82 @@
CXX*=g++
# name of C Compiler
CC*=gcc
+.IF "$(SYSBASE)"!=""
+CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
+CXX+:=$(CFLAGS_SYSBASE)
+CC+:=$(CFLAGS_SYSBASE)
+.ENDIF # "$(SYSBASE)"!=""
+CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
+.IF "$(PRODUCT)"!=""
+CFLAGS+=-Wuninitialized
+.ENDIF
-# filter for supressing verbose messages from linker
-# not needed at the moment
-LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+# flags to enable build with symbols; required for crashdump feature
+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
+CFLAGSENABLESYMBOLS=-g1
+.ELSE
+CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
-# options for C and C++ Compiler
-CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=450 -DOSVERSION=$(OSVERSION)
-CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT
-
-# flags for C and C++ Compile
-CFLAGS+= -w -c $(INCLUDE)
-CFLAGS+= -I/usr/X11R6/include
+.ENDIF
# flags for the C++ Compiler
-CFLAGSCC= -pipe -fno-rtti
-CFLAGSCXX= -pipe -fno-rtti
-CFLAGSCXX+= -Wno-ctor-dtor-privacy
-
+CFLAGSCC= -pipe -mtune=pentiumpro
# Flags for enabling exception handling
-CFLAGSEXCEPTIONS= -fexceptions
-CFLAGS_NO_EXCEPTIONS= -fno-exceptions
-
-# Compiler flags for compiling static object in single threaded
-# environment with graphical user interface
-CFLAGSOBJGUIST= -fPIC
-
-# Compiler flags for compiling static object in single threaded
-# environment with character user interface
-CFLAGSOBJCUIST= -fPIC
-
-# Compiler flags for compiling static object in multi threaded
-# environment with graphical user interface
-CFLAGSOBJGUIMT= -fPIC
-
-# Compiler flags for compiling static object in multi threaded
-# environment with character user interface
-CFLAGSOBJCUIMT= -fPIC
-
-# Compiler flags for compiling shared object in multi threaded
-# environment with graphical user interface
-CFLAGSSLOGUIMT= -fPIC
-
-# Compiler flags for compiling shared object in multi threaded
-# environment with character user interface
-CFLAGSSLOCUIMT= -fPIC
+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
+# Flags for disabling exception handling
+CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-# Compiler flags for profilin
-CFLAGSPROF= -pg
+# -fpermissive should be removed as soon as possible
+CFLAGSCXX= -pipe -mtune=pentiumpro
+CFLAGSCXX+= -Wno-ctor-dtor-privacy
+# Compiler flags for compiling static object in single threaded environment with graphical user interface
+CFLAGSOBJGUIST=
+# Compiler flags for compiling static object in single threaded environment with character user interface
+CFLAGSOBJCUIST=
+# Compiler flags for compiling static object in multi threaded environment with graphical user interface
+CFLAGSOBJGUIMT=
+# Compiler flags for compiling static object in multi threaded environment with character user interface
+CFLAGSOBJCUIMT=
+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
+CFLAGSSLOGUIMT=-fPIC
+# Compiler flags for compiling shared object in multi threaded environment with character user interface
+CFLAGSSLOCUIMT=-fPIC
+# Compiler flags for profiling
+CFLAGSPROF=
# Compiler flags for debugging
-CFLAGSDEBUG= -g
+CFLAGSDEBUG=-g
CFLAGSDBGUTIL=
-
-# Compiler flags to enable optimizations
-# -02 is broken for FreeBSD
-CFLAGSOPT= -O
-
-# Compiler flags to disable optimizations
-# -0 is broken for STLport for FreeBSD
-CFLAGSNOOPT= -O0
-
-# Compiler flags for the output path
-CFLAGSOUTOBJ= -o
-
+# Compiler flags for enabling optimazations
+.IF "$(PRODUCT)"!=""
+CFLAGSOPT=-Os -fno-strict-aliasing # optimizing for products
+.ELSE # "$(PRODUCT)"!=""
+CFLAGSOPT= # no optimizing for non products
+.ENDIF # "$(PRODUCT)"!=""
+# Compiler flags for disabling optimazations
+CFLAGSNOOPT=-O0
+# Compiler flags for discibing the output path
+CFLAGSOUTOBJ=-o
# Enable all warnings
CFLAGSWALL=-Wall
-
# Set default warn level
-CFLAGSDFLTWARN=-w
+CFLAGSDFLTWARN=
# switches for dynamic and static linking
-STATIC= -Wl,-Bstatic
-DYNAMIC= -Wl,-Bdynamic
+STATIC = -Wl,-Bstatic
+DYNAMIC = -Wl,-Bdynamic
# name of linker
-LINK=$(CC)
+LINK*=$(CXX)
# default linker flags
-# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-LINKFLAGS=$(LINKFLAGSRUNPATH)
+LINKFLAGSDEFS*=#-Wl,-z,defs
+LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
+LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
# linker flags for linking applications
-LINKFLAGSAPPGUI= -Wl,--noinhibit-exec
-LINKFLAGSAPPCUI= -Wl,--noinhibit-exec
+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
# linker flags for linking shared libraries
LINKFLAGSSHLGUI= -shared
@@ -177,23 +179,19 @@
LINKFLAGSDEBUG=-g
LINKFLAGSOPT=
-.IF "$(NO_BSYMBOLIC)"==""
-.IF "$(PRJNAME)" != "envtest"
-LINKFLAGSSHLGUI+= -Wl,-Bsymbolic
-LINKFLAGSSHLCUI+= -Wl,-Bsymbolic
-.ENDIF
-.ENDIF
+# linker flags for optimization (symbol hashtable)
+# for now, applied to symbol scoped libraries, only
+LINKFLAGSOPTIMIZE*=-Wl,-O1
+LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
-LINKVERSIONMAPFLAG=-Wl,--version-script
+SONAME_SWITCH=-Wl,-h
# Sequence of libs does matter !
-STDLIBCPP=-lstdc++
-# _SYSLIBS= -L/usr/lib -lm
-# _X11LIBS= -L/usr/X11R6/lib -lXext -lX11
-# _CXXLIBS= -L/usr/lib -lstdc++ -L/usr/local/lib
+STDLIBCPP=-lstdc++
# default objectfilenames to link
+STDOBJVCL=$(L)$/salmain.o
STDOBJGUI=
STDSLOGUI=
STDOBJCUI=
@@ -201,24 +199,25 @@
# libraries for linking applications
STDLIBCUIST=-lm
-STDLIBGUIST=-lXaw -lXt -lX11 -lm
-STDLIBGUIMT=-lXaw -lXt -lX11 $(PTHREAD_LIBS) -lm
+STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
STDLIBCUIMT=$(PTHREAD_LIBS) -lm
-
+STDLIBGUIST=-lX11 -lm
# libraries for linking shared libraries
-STDSHLGUIMT=-lXaw -lXt -lX11 -lXext $(PTHREAD_LIBS) -lm
+STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
STDSHLCUIMT=$(PTHREAD_LIBS) -lm
+STDSHLGUIST=-lX11 -lXext -lm
+STDSHLCUIST=-lm
LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-# STLport always needs pthread.
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(STDLIBCPP) $(PTHREAD_LIBS)
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) $(PTHREAD_LIBS)
+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
+
+#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
# name of library manager
LIBMGR=ar
LIBFLAGS=-r
-LIBEXT= .a
# tool for generating import libraries
IMPLIB=
@@ -237,3 +236,4 @@
DLLPOSTFIX=fi
DLLPRE=lib
DLLPOST=.so
+

24
editors/openoffice.org-2/files/patch-transex3+source+xmlparse.cxx
View File

@ -1,24 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=40184
o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=2030&Path=SRC680%2Fpj16
o pj16
Description
FreeBSD doesn't have alloca.h
Index: source/xmlparse.cxx
===================================================================
RCS file: /cvs/l10n/transex3/source/xmlparse.cxx,v
retrieving revision 1.5
diff -u -r1.5 xmlparse.cxx
--- transex3/source/xmlparse.cxx 18 Nov 2004 08:17:50 -0000 1.5
+++ transex3/source/xmlparse.cxx 8 Jan 2005 02:56:14 -0000
@@ -67,7 +67,7 @@
#ifdef WIN32
#include <malloc.h>
#else
-#ifndef MACOSX
+#if !(defined(MACOSX) || defined(FREEBSD))
#include <alloca.h>
#endif
#endif

4
editors/openoffice.org-3-RC/Makefile
View File

@ -19,7 +19,7 @@ EXTRACT_ONLY= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
SNAPDATE= 20050119
SNAPDATE= 20050123
NO_LATEST_LINK= yes
USE_GNOME= gtk20
MOZILLA_PROJECT= cws_srx645_mozooo.20041016.tar.gz
@ -49,7 +49,7 @@ BROKEN= "rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
CODELINE= 680
RELEASE_NR= 1.9
MILESTONE= 72
MILESTONE= 73
INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE}
EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
DIST_SUBDIR= openoffice.org2.0

4
editors/openoffice.org-3-RC/distinfo
View File

@ -1,5 +1,5 @@
MD5 (openoffice.org2.0/OOo_1.9m72_source.tar.bz2) = c51fa9d749f1e5eb3733d50b91f97fe8
SIZE (openoffice.org2.0/OOo_1.9m72_source.tar.bz2) = 233690890
MD5 (openoffice.org2.0/OOo_1.9m73_source.tar.bz2) = 0885bb45bd204b03b16f8276cbd922e0
SIZE (openoffice.org2.0/OOo_1.9m73_source.tar.bz2) = 233756500
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
MD5 (openoffice.org2.0/cws_srx645_mozooo.20041016.tar.gz) = eda0ab73b24c45890ae08bdfe04049bd

2
editors/openoffice.org-3-RC/files/Makefile.knobs
View File

@ -19,7 +19,7 @@ CONFIGURE_ARGS+= --enable-cups
.if defined(ALL_LOCALIZED_LANGS)
CONFIGURE_ARGS+= --with-lang="en-US ar ca cs da de el es et fi fr he hi-IN hu it ja ko pl pt pt-BR ru sk sl sv th tr zh-CN zh-TW"
#following langs still seem to be under development
#following langs still seem to be under development
#af bg cy eo eu gl kn-IN lt nb nl nn ns tn zu
#CONFIGURE_ARGS+= --with-lang=ALL
.else

25
editors/openoffice.org-3-RC/files/patch-config_office+set_soenv.in
View File

@ -1,25 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=37731
o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=2030&Path=SRC680%2Fpj16
o pj16
Description
Do not export LINK to environment
Index: config_office/set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.31
diff -u -r1.31 set_soenv.in
--- config_office/set_soenv.in 5 Jan 2005 12:10:00 -0000 1.31
+++ config_office/set_soenv.in 9 Jan 2005 18:51:24 -0000
@@ -1684,9 +1684,6 @@
ToFile( "CC", $CC, "e" );
ToFile( "CXX", $CXX, "e" );
ToFile( "USE_SYSTEM_STL", "@USE_SYSTEM_STL@", "e" );
-if ( $COM ne "MSC" ) {
- ToFile( "LINK", $CC, "e" );
-}
ToFile( "ENABLE_SYMBOLS", "@ENABLE_SYMBOLS@", "e" );
ToFile( "ENABLE_CRASHDUMP", "@ENABLE_CRASHDUMP@", "e" );
ToFile( "ENABLE_CUPS", "@ENABLE_CUPS@", "e" );

1004
editors/openoffice.org-3-RC/files/patch-project-bridges
View File

File diff suppressed because it is too large Load Diff

65
editors/openoffice.org-3-RC/files/patch-project-extentions
View File

@ -1,65 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=40179
o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=2030&Path=SRC680%2Fpj16
o pj16
Description
o source/config/ldap/makefile.mk needs -lcompat since re_comp is defined here.
o FreeBSD doesn't have -ldl
o INC+= -DNP_LINUX is also requried for FreeBSD
Index: source/config/ldap/makefile.mk
===================================================================
RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
retrieving revision 1.4
diff -u -r1.4 makefile.mk
--- extensions/source/config/ldap/makefile.mk 15 Nov 2004 14:14:22 -0000 1.4
+++ extensions/source/config/ldap/makefile.mk 8 Jan 2005 02:48:29 -0000
@@ -116,6 +116,9 @@
$(CPPULIB) \
$(SALHELPERLIB) \
$(SALLIB)
+.IF "$(OS)"=="FREEBSD"
+SHL1STDLIBS+=-lcompat
+.ENDIF
DEF1NAME=$(SHL1TARGET)
DEF1EXPORTFILE=exports.dxp
Index: source/nsplugin/source/makefile.mk
===================================================================
RCS file: /cvs/util/extensions/source/nsplugin/source/makefile.mk,v
retrieving revision 1.8
diff -u -r1.8 makefile.mk
--- extensions/source/nsplugin/source/makefile.mk 3 Jan 2005 09:04:51 -0000 1.8
+++ extensions/source/nsplugin/source/makefile.mk 8 Jan 2005 02:48:30 -0000
@@ -78,7 +78,7 @@
@echo GTK disabled - nothing to build
.ELSE # "$(ENABLE_GTK)"==""
-.IF "$(OS)"=="LINUX"
+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
INC+= -DNP_LINUX
.ENDIF
PKGCONFIG_MODULES=gtk+-2.0
@@ -99,8 +99,10 @@
.IF "$(GUI)"=="UNX"
SHL1OBJS+=$(SLO)$/npunix.obj
SLOFILES+=$(SLO)$/npunix.obj
+.IF "$(OS)"!="FREEBSD"
SHL1STDLIBS+= -ldl -lnsl
-.ENDIF
+.ENDIF #FREEBSD
+.ENDIF #UNX
.IF "$(GUI)"=="WNT"
SHL1OBJS+=$(SLO)$/npwin.obj
SLOFILES+=$(SLO)$/npwin.obj
@@ -131,7 +133,7 @@
.IF "$(GUI)"=="UNX"
APP1STDLIBS+=$(PKGCONFIG_LIBS:s/-lpangoxft-1.0//)
-.IF "$(OS)"=="LINUX"
+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
.ELSE
APP1STDLIBS+= -ldl -lnsl -lnls -lsocket
.ENDIF

262
editors/openoffice.org-3-RC/files/patch-solenv+inc+unxfbsdi.mk
View File

@ -1,262 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=40182
Description
o catch up recent unxlngi6.mk
o -Wl,-z,defs -> comment out
Index: solenv/inc/unxfbsdi.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
retrieving revision 1.11
diff -u -r1.11 unxfbsdi.mk
--- solenv/inc/unxfbsdi.mk 20 Sep 2004 08:37:13 -0000 1.11
+++ solenv/inc/unxfbsdi.mk 10 Jan 2005 07:44:44 -0000
@@ -60,16 +60,26 @@
#
#*************************************************************************
-# mak file for unxfbsdi
-ASM=$(CC)
-AFLAGS=-x assembler-with-cpp -c $(CDEFS)
+# mk file for unxfbsdi
+ASM=
+AFLAGS=
+
+SOLAR_JAVA*=TRUE
+JAVAFLAGSDEBUG=-g
# filter for supressing verbose messages from linker
#not needed at the moment
#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+# _PTHREADS is needed for the stl
+CDEFS+=$(PTHREAD_CFLAGS) -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
+
+# enable visibility define in "sal/types.h"
+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+
# this is a platform with JAVA support
-SOLAR_JAVA*=TRUE
.IF "$(SOLAR_JAVA)"!=""
JAVADEF=-DSOLAR_JAVA
.IF "$(debug)"==""
@@ -83,90 +93,82 @@
CXX*=g++
# name of C Compiler
CC*=gcc
+.IF "$(SYSBASE)"!=""
+CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
+CXX+:=$(CFLAGS_SYSBASE)
+CC+:=$(CFLAGS_SYSBASE)
+.ENDIF # "$(SYSBASE)"!=""
+CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
+.IF "$(PRODUCT)"!=""
+CFLAGS+=-Wuninitialized
+.ENDIF
-# filter for supressing verbose messages from linker
-# not needed at the moment
-LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+# flags to enable build with symbols; required for crashdump feature
+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
+CFLAGSENABLESYMBOLS=-g1
+.ELSE
+CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
-# options for C and C++ Compiler
-CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=450 -DOSVERSION=$(OSVERSION)
-CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT
-
-# flags for C and C++ Compile
-CFLAGS+= -w -c $(INCLUDE)
-CFLAGS+= -I/usr/X11R6/include
+.ENDIF
# flags for the C++ Compiler
-CFLAGSCC= -pipe -fno-rtti
-CFLAGSCXX= -pipe -fno-rtti
-CFLAGSCXX+= -Wno-ctor-dtor-privacy
-
+CFLAGSCC= -pipe -mtune=pentiumpro
# Flags for enabling exception handling
-CFLAGSEXCEPTIONS= -fexceptions
-CFLAGS_NO_EXCEPTIONS= -fno-exceptions
-
-# Compiler flags for compiling static object in single threaded
-# environment with graphical user interface
-CFLAGSOBJGUIST= -fPIC
-
-# Compiler flags for compiling static object in single threaded
-# environment with character user interface
-CFLAGSOBJCUIST= -fPIC
-
-# Compiler flags for compiling static object in multi threaded
-# environment with graphical user interface
-CFLAGSOBJGUIMT= -fPIC
-
-# Compiler flags for compiling static object in multi threaded
-# environment with character user interface
-CFLAGSOBJCUIMT= -fPIC
-
-# Compiler flags for compiling shared object in multi threaded
-# environment with graphical user interface
-CFLAGSSLOGUIMT= -fPIC
-
-# Compiler flags for compiling shared object in multi threaded
-# environment with character user interface
-CFLAGSSLOCUIMT= -fPIC
+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
+# Flags for disabling exception handling
+CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-# Compiler flags for profilin
-CFLAGSPROF= -pg
+# -fpermissive should be removed as soon as possible
+CFLAGSCXX= -pipe -mtune=pentiumpro
+CFLAGSCXX+= -Wno-ctor-dtor-privacy
+# Compiler flags for compiling static object in single threaded environment with graphical user interface
+CFLAGSOBJGUIST=
+# Compiler flags for compiling static object in single threaded environment with character user interface
+CFLAGSOBJCUIST=
+# Compiler flags for compiling static object in multi threaded environment with graphical user interface
+CFLAGSOBJGUIMT=
+# Compiler flags for compiling static object in multi threaded environment with character user interface
+CFLAGSOBJCUIMT=
+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
+CFLAGSSLOGUIMT=-fPIC
+# Compiler flags for compiling shared object in multi threaded environment with character user interface
+CFLAGSSLOCUIMT=-fPIC
+# Compiler flags for profiling
+CFLAGSPROF=
# Compiler flags for debugging
-CFLAGSDEBUG= -g
+CFLAGSDEBUG=-g
CFLAGSDBGUTIL=
-
-# Compiler flags to enable optimizations
-# -02 is broken for FreeBSD
-CFLAGSOPT= -O
-
-# Compiler flags to disable optimizations
-# -0 is broken for STLport for FreeBSD
-CFLAGSNOOPT= -O0
-
-# Compiler flags for the output path
-CFLAGSOUTOBJ= -o
-
+# Compiler flags for enabling optimazations
+.IF "$(PRODUCT)"!=""
+CFLAGSOPT=-Os -fno-strict-aliasing # optimizing for products
+.ELSE # "$(PRODUCT)"!=""
+CFLAGSOPT= # no optimizing for non products
+.ENDIF # "$(PRODUCT)"!=""
+# Compiler flags for disabling optimazations
+CFLAGSNOOPT=-O0
+# Compiler flags for discibing the output path
+CFLAGSOUTOBJ=-o
# Enable all warnings
CFLAGSWALL=-Wall
-
# Set default warn level
-CFLAGSDFLTWARN=-w
+CFLAGSDFLTWARN=
# switches for dynamic and static linking
-STATIC= -Wl,-Bstatic
-DYNAMIC= -Wl,-Bdynamic
+STATIC = -Wl,-Bstatic
+DYNAMIC = -Wl,-Bdynamic
# name of linker
-LINK=$(CC)
+LINK*=$(CXX)
# default linker flags
-# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-LINKFLAGS=$(LINKFLAGSRUNPATH)
+LINKFLAGSDEFS*=#-Wl,-z,defs
+LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
+LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
# linker flags for linking applications
-LINKFLAGSAPPGUI= -Wl,--noinhibit-exec
-LINKFLAGSAPPCUI= -Wl,--noinhibit-exec
+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
# linker flags for linking shared libraries
LINKFLAGSSHLGUI= -shared
@@ -177,23 +179,19 @@
LINKFLAGSDEBUG=-g
LINKFLAGSOPT=
-.IF "$(NO_BSYMBOLIC)"==""
-.IF "$(PRJNAME)" != "envtest"
-LINKFLAGSSHLGUI+= -Wl,-Bsymbolic
-LINKFLAGSSHLCUI+= -Wl,-Bsymbolic
-.ENDIF
-.ENDIF
+# linker flags for optimization (symbol hashtable)
+# for now, applied to symbol scoped libraries, only
+LINKFLAGSOPTIMIZE*=-Wl,-O1
+LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
-LINKVERSIONMAPFLAG=-Wl,--version-script
+SONAME_SWITCH=-Wl,-h
# Sequence of libs does matter !
-STDLIBCPP=-lstdc++
-# _SYSLIBS= -L/usr/lib -lm
-# _X11LIBS= -L/usr/X11R6/lib -lXext -lX11
-# _CXXLIBS= -L/usr/lib -lstdc++ -L/usr/local/lib
+STDLIBCPP=-lstdc++
# default objectfilenames to link
+STDOBJVCL=$(L)$/salmain.o
STDOBJGUI=
STDSLOGUI=
STDOBJCUI=
@@ -201,24 +199,25 @@
# libraries for linking applications
STDLIBCUIST=-lm
-STDLIBGUIST=-lXaw -lXt -lX11 -lm
-STDLIBGUIMT=-lXaw -lXt -lX11 $(PTHREAD_LIBS) -lm
+STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
STDLIBCUIMT=$(PTHREAD_LIBS) -lm
-
+STDLIBGUIST=-lX11 -lm
# libraries for linking shared libraries
-STDSHLGUIMT=-lXaw -lXt -lX11 -lXext $(PTHREAD_LIBS) -lm
+STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
STDSHLCUIMT=$(PTHREAD_LIBS) -lm
+STDSHLGUIST=-lX11 -lXext -lm
+STDSHLCUIST=-lm
LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-# STLport always needs pthread.
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(STDLIBCPP) $(PTHREAD_LIBS)
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) $(PTHREAD_LIBS)
+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
+
+#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
# name of library manager
LIBMGR=ar
LIBFLAGS=-r
-LIBEXT= .a
# tool for generating import libraries
IMPLIB=
@@ -237,3 +236,4 @@
DLLPOSTFIX=fi
DLLPRE=lib
DLLPOST=.so
+

24
editors/openoffice.org-3-RC/files/patch-transex3+source+xmlparse.cxx
View File

@ -1,24 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=40184
o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=2030&Path=SRC680%2Fpj16
o pj16
Description
FreeBSD doesn't have alloca.h
Index: source/xmlparse.cxx
===================================================================
RCS file: /cvs/l10n/transex3/source/xmlparse.cxx,v
retrieving revision 1.5
diff -u -r1.5 xmlparse.cxx
--- transex3/source/xmlparse.cxx 18 Nov 2004 08:17:50 -0000 1.5
+++ transex3/source/xmlparse.cxx 8 Jan 2005 02:56:14 -0000
@@ -67,7 +67,7 @@
#ifdef WIN32
#include <malloc.h>
#else
-#ifndef MACOSX
+#if !(defined(MACOSX) || defined(FREEBSD))
#include <alloca.h>
#endif
#endif

4
editors/openoffice.org-3-devel/Makefile
View File

@ -19,7 +19,7 @@ EXTRACT_ONLY= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
SNAPDATE= 20050119
SNAPDATE= 20050123
NO_LATEST_LINK= yes
USE_GNOME= gtk20
MOZILLA_PROJECT= cws_srx645_mozooo.20041016.tar.gz
@ -49,7 +49,7 @@ BROKEN= "rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
CODELINE= 680
RELEASE_NR= 1.9
MILESTONE= 72
MILESTONE= 73
INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE}
EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
DIST_SUBDIR= openoffice.org2.0

4
editors/openoffice.org-3-devel/distinfo
View File

@ -1,5 +1,5 @@
MD5 (openoffice.org2.0/OOo_1.9m72_source.tar.bz2) = c51fa9d749f1e5eb3733d50b91f97fe8
SIZE (openoffice.org2.0/OOo_1.9m72_source.tar.bz2) = 233690890
MD5 (openoffice.org2.0/OOo_1.9m73_source.tar.bz2) = 0885bb45bd204b03b16f8276cbd922e0
SIZE (openoffice.org2.0/OOo_1.9m73_source.tar.bz2) = 233756500
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
MD5 (openoffice.org2.0/cws_srx645_mozooo.20041016.tar.gz) = eda0ab73b24c45890ae08bdfe04049bd

2
editors/openoffice.org-3-devel/files/Makefile.knobs
View File

@ -19,7 +19,7 @@ CONFIGURE_ARGS+= --enable-cups
.if defined(ALL_LOCALIZED_LANGS)
CONFIGURE_ARGS+= --with-lang="en-US ar ca cs da de el es et fi fr he hi-IN hu it ja ko pl pt pt-BR ru sk sl sv th tr zh-CN zh-TW"
#following langs still seem to be under development
#following langs still seem to be under development
#af bg cy eo eu gl kn-IN lt nb nl nn ns tn zu
#CONFIGURE_ARGS+= --with-lang=ALL
.else

25
editors/openoffice.org-3-devel/files/patch-config_office+set_soenv.in
View File

@ -1,25 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=37731
o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=2030&Path=SRC680%2Fpj16
o pj16
Description
Do not export LINK to environment
Index: config_office/set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.31
diff -u -r1.31 set_soenv.in
--- config_office/set_soenv.in 5 Jan 2005 12:10:00 -0000 1.31
+++ config_office/set_soenv.in 9 Jan 2005 18:51:24 -0000
@@ -1684,9 +1684,6 @@
ToFile( "CC", $CC, "e" );
ToFile( "CXX", $CXX, "e" );
ToFile( "USE_SYSTEM_STL", "@USE_SYSTEM_STL@", "e" );
-if ( $COM ne "MSC" ) {
- ToFile( "LINK", $CC, "e" );
-}
ToFile( "ENABLE_SYMBOLS", "@ENABLE_SYMBOLS@", "e" );
ToFile( "ENABLE_CRASHDUMP", "@ENABLE_CRASHDUMP@", "e" );
ToFile( "ENABLE_CUPS", "@ENABLE_CUPS@", "e" );

1004
editors/openoffice.org-3-devel/files/patch-project-bridges
View File

File diff suppressed because it is too large Load Diff

65
editors/openoffice.org-3-devel/files/patch-project-extentions
View File

@ -1,65 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=40179
o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=2030&Path=SRC680%2Fpj16
o pj16
Description
o source/config/ldap/makefile.mk needs -lcompat since re_comp is defined here.
o FreeBSD doesn't have -ldl
o INC+= -DNP_LINUX is also requried for FreeBSD
Index: source/config/ldap/makefile.mk
===================================================================
RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
retrieving revision 1.4
diff -u -r1.4 makefile.mk
--- extensions/source/config/ldap/makefile.mk 15 Nov 2004 14:14:22 -0000 1.4
+++ extensions/source/config/ldap/makefile.mk 8 Jan 2005 02:48:29 -0000
@@ -116,6 +116,9 @@
$(CPPULIB) \
$(SALHELPERLIB) \
$(SALLIB)
+.IF "$(OS)"=="FREEBSD"
+SHL1STDLIBS+=-lcompat
+.ENDIF
DEF1NAME=$(SHL1TARGET)
DEF1EXPORTFILE=exports.dxp
Index: source/nsplugin/source/makefile.mk
===================================================================
RCS file: /cvs/util/extensions/source/nsplugin/source/makefile.mk,v
retrieving revision 1.8
diff -u -r1.8 makefile.mk
--- extensions/source/nsplugin/source/makefile.mk 3 Jan 2005 09:04:51 -0000 1.8
+++ extensions/source/nsplugin/source/makefile.mk 8 Jan 2005 02:48:30 -0000
@@ -78,7 +78,7 @@
@echo GTK disabled - nothing to build
.ELSE # "$(ENABLE_GTK)"==""
-.IF "$(OS)"=="LINUX"
+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
INC+= -DNP_LINUX
.ENDIF
PKGCONFIG_MODULES=gtk+-2.0
@@ -99,8 +99,10 @@
.IF "$(GUI)"=="UNX"
SHL1OBJS+=$(SLO)$/npunix.obj
SLOFILES+=$(SLO)$/npunix.obj
+.IF "$(OS)"!="FREEBSD"
SHL1STDLIBS+= -ldl -lnsl
-.ENDIF
+.ENDIF #FREEBSD
+.ENDIF #UNX
.IF "$(GUI)"=="WNT"
SHL1OBJS+=$(SLO)$/npwin.obj
SLOFILES+=$(SLO)$/npwin.obj
@@ -131,7 +133,7 @@
.IF "$(GUI)"=="UNX"
APP1STDLIBS+=$(PKGCONFIG_LIBS:s/-lpangoxft-1.0//)
-.IF "$(OS)"=="LINUX"
+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
.ELSE
APP1STDLIBS+= -ldl -lnsl -lnls -lsocket
.ENDIF

262
editors/openoffice.org-3-devel/files/patch-solenv+inc+unxfbsdi.mk
View File

@ -1,262 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=40182
Description
o catch up recent unxlngi6.mk
o -Wl,-z,defs -> comment out
Index: solenv/inc/unxfbsdi.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
retrieving revision 1.11
diff -u -r1.11 unxfbsdi.mk
--- solenv/inc/unxfbsdi.mk 20 Sep 2004 08:37:13 -0000 1.11
+++ solenv/inc/unxfbsdi.mk 10 Jan 2005 07:44:44 -0000
@@ -60,16 +60,26 @@
#
#*************************************************************************
-# mak file for unxfbsdi
-ASM=$(CC)
-AFLAGS=-x assembler-with-cpp -c $(CDEFS)
+# mk file for unxfbsdi
+ASM=
+AFLAGS=
+
+SOLAR_JAVA*=TRUE
+JAVAFLAGSDEBUG=-g
# filter for supressing verbose messages from linker
#not needed at the moment
#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+# _PTHREADS is needed for the stl
+CDEFS+=$(PTHREAD_CFLAGS) -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
+
+# enable visibility define in "sal/types.h"
+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+
# this is a platform with JAVA support
-SOLAR_JAVA*=TRUE
.IF "$(SOLAR_JAVA)"!=""
JAVADEF=-DSOLAR_JAVA
.IF "$(debug)"==""
@@ -83,90 +93,82 @@
CXX*=g++
# name of C Compiler
CC*=gcc
+.IF "$(SYSBASE)"!=""
+CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
+CXX+:=$(CFLAGS_SYSBASE)
+CC+:=$(CFLAGS_SYSBASE)
+.ENDIF # "$(SYSBASE)"!=""
+CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
+.IF "$(PRODUCT)"!=""
+CFLAGS+=-Wuninitialized
+.ENDIF
-# filter for supressing verbose messages from linker
-# not needed at the moment
-LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+# flags to enable build with symbols; required for crashdump feature
+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
+CFLAGSENABLESYMBOLS=-g1
+.ELSE
+CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
-# options for C and C++ Compiler
-CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=450 -DOSVERSION=$(OSVERSION)
-CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT
-
-# flags for C and C++ Compile
-CFLAGS+= -w -c $(INCLUDE)
-CFLAGS+= -I/usr/X11R6/include
+.ENDIF
# flags for the C++ Compiler
-CFLAGSCC= -pipe -fno-rtti
-CFLAGSCXX= -pipe -fno-rtti
-CFLAGSCXX+= -Wno-ctor-dtor-privacy
-
+CFLAGSCC= -pipe -mtune=pentiumpro
# Flags for enabling exception handling
-CFLAGSEXCEPTIONS= -fexceptions
-CFLAGS_NO_EXCEPTIONS= -fno-exceptions
-
-# Compiler flags for compiling static object in single threaded
-# environment with graphical user interface
-CFLAGSOBJGUIST= -fPIC
-
-# Compiler flags for compiling static object in single threaded
-# environment with character user interface
-CFLAGSOBJCUIST= -fPIC
-
-# Compiler flags for compiling static object in multi threaded
-# environment with graphical user interface
-CFLAGSOBJGUIMT= -fPIC
-
-# Compiler flags for compiling static object in multi threaded
-# environment with character user interface
-CFLAGSOBJCUIMT= -fPIC
-
-# Compiler flags for compiling shared object in multi threaded
-# environment with graphical user interface
-CFLAGSSLOGUIMT= -fPIC
-
-# Compiler flags for compiling shared object in multi threaded
-# environment with character user interface
-CFLAGSSLOCUIMT= -fPIC
+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
+# Flags for disabling exception handling
+CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-# Compiler flags for profilin
-CFLAGSPROF= -pg
+# -fpermissive should be removed as soon as possible
+CFLAGSCXX= -pipe -mtune=pentiumpro
+CFLAGSCXX+= -Wno-ctor-dtor-privacy
+# Compiler flags for compiling static object in single threaded environment with graphical user interface
+CFLAGSOBJGUIST=
+# Compiler flags for compiling static object in single threaded environment with character user interface
+CFLAGSOBJCUIST=
+# Compiler flags for compiling static object in multi threaded environment with graphical user interface
+CFLAGSOBJGUIMT=
+# Compiler flags for compiling static object in multi threaded environment with character user interface
+CFLAGSOBJCUIMT=
+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
+CFLAGSSLOGUIMT=-fPIC
+# Compiler flags for compiling shared object in multi threaded environment with character user interface
+CFLAGSSLOCUIMT=-fPIC
+# Compiler flags for profiling
+CFLAGSPROF=
# Compiler flags for debugging
-CFLAGSDEBUG= -g
+CFLAGSDEBUG=-g
CFLAGSDBGUTIL=
-
-# Compiler flags to enable optimizations
-# -02 is broken for FreeBSD
-CFLAGSOPT= -O
-
-# Compiler flags to disable optimizations
-# -0 is broken for STLport for FreeBSD
-CFLAGSNOOPT= -O0
-
-# Compiler flags for the output path
-CFLAGSOUTOBJ= -o
-
+# Compiler flags for enabling optimazations
+.IF "$(PRODUCT)"!=""
+CFLAGSOPT=-Os -fno-strict-aliasing # optimizing for products
+.ELSE # "$(PRODUCT)"!=""
+CFLAGSOPT= # no optimizing for non products
+.ENDIF # "$(PRODUCT)"!=""
+# Compiler flags for disabling optimazations
+CFLAGSNOOPT=-O0
+# Compiler flags for discibing the output path
+CFLAGSOUTOBJ=-o
# Enable all warnings
CFLAGSWALL=-Wall
-
# Set default warn level
-CFLAGSDFLTWARN=-w
+CFLAGSDFLTWARN=
# switches for dynamic and static linking
-STATIC= -Wl,-Bstatic
-DYNAMIC= -Wl,-Bdynamic
+STATIC = -Wl,-Bstatic
+DYNAMIC = -Wl,-Bdynamic
# name of linker
-LINK=$(CC)
+LINK*=$(CXX)
# default linker flags
-# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-LINKFLAGS=$(LINKFLAGSRUNPATH)
+LINKFLAGSDEFS*=#-Wl,-z,defs
+LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
+LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
# linker flags for linking applications
-LINKFLAGSAPPGUI= -Wl,--noinhibit-exec
-LINKFLAGSAPPCUI= -Wl,--noinhibit-exec
+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
# linker flags for linking shared libraries
LINKFLAGSSHLGUI= -shared
@@ -177,23 +179,19 @@
LINKFLAGSDEBUG=-g
LINKFLAGSOPT=
-.IF "$(NO_BSYMBOLIC)"==""
-.IF "$(PRJNAME)" != "envtest"
-LINKFLAGSSHLGUI+= -Wl,-Bsymbolic
-LINKFLAGSSHLCUI+= -Wl,-Bsymbolic
-.ENDIF
-.ENDIF
+# linker flags for optimization (symbol hashtable)
+# for now, applied to symbol scoped libraries, only
+LINKFLAGSOPTIMIZE*=-Wl,-O1
+LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
-LINKVERSIONMAPFLAG=-Wl,--version-script
+SONAME_SWITCH=-Wl,-h
# Sequence of libs does matter !
-STDLIBCPP=-lstdc++
-# _SYSLIBS= -L/usr/lib -lm
-# _X11LIBS= -L/usr/X11R6/lib -lXext -lX11
-# _CXXLIBS= -L/usr/lib -lstdc++ -L/usr/local/lib
+STDLIBCPP=-lstdc++
# default objectfilenames to link
+STDOBJVCL=$(L)$/salmain.o
STDOBJGUI=
STDSLOGUI=
STDOBJCUI=
@@ -201,24 +199,25 @@
# libraries for linking applications
STDLIBCUIST=-lm
-STDLIBGUIST=-lXaw -lXt -lX11 -lm
-STDLIBGUIMT=-lXaw -lXt -lX11 $(PTHREAD_LIBS) -lm
+STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
STDLIBCUIMT=$(PTHREAD_LIBS) -lm
-
+STDLIBGUIST=-lX11 -lm
# libraries for linking shared libraries
-STDSHLGUIMT=-lXaw -lXt -lX11 -lXext $(PTHREAD_LIBS) -lm
+STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
STDSHLCUIMT=$(PTHREAD_LIBS) -lm
+STDSHLGUIST=-lX11 -lXext -lm
+STDSHLCUIST=-lm
LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-# STLport always needs pthread.
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(STDLIBCPP) $(PTHREAD_LIBS)
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) $(PTHREAD_LIBS)
+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
+
+#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
# name of library manager
LIBMGR=ar
LIBFLAGS=-r
-LIBEXT= .a
# tool for generating import libraries
IMPLIB=
@@ -237,3 +236,4 @@
DLLPOSTFIX=fi
DLLPRE=lib
DLLPOST=.so
+

24
editors/openoffice.org-3-devel/files/patch-transex3+source+xmlparse.cxx
View File

@ -1,24 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=40184
o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=2030&Path=SRC680%2Fpj16
o pj16
Description
FreeBSD doesn't have alloca.h
Index: source/xmlparse.cxx
===================================================================
RCS file: /cvs/l10n/transex3/source/xmlparse.cxx,v
retrieving revision 1.5
diff -u -r1.5 xmlparse.cxx
--- transex3/source/xmlparse.cxx 18 Nov 2004 08:17:50 -0000 1.5
+++ transex3/source/xmlparse.cxx 8 Jan 2005 02:56:14 -0000
@@ -67,7 +67,7 @@
#ifdef WIN32
#include <malloc.h>
#else
-#ifndef MACOSX
+#if !(defined(MACOSX) || defined(FREEBSD))
#include <alloca.h>
#endif
#endif

4
editors/openoffice.org-3/Makefile
View File

@ -19,7 +19,7 @@ EXTRACT_ONLY= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
SNAPDATE= 20050119
SNAPDATE= 20050123
NO_LATEST_LINK= yes
USE_GNOME= gtk20
MOZILLA_PROJECT= cws_srx645_mozooo.20041016.tar.gz
@ -49,7 +49,7 @@ BROKEN= "rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
CODELINE= 680
RELEASE_NR= 1.9
MILESTONE= 72
MILESTONE= 73
INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE}
EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
DIST_SUBDIR= openoffice.org2.0

4
editors/openoffice.org-3/distinfo
View File

@ -1,5 +1,5 @@
MD5 (openoffice.org2.0/OOo_1.9m72_source.tar.bz2) = c51fa9d749f1e5eb3733d50b91f97fe8
SIZE (openoffice.org2.0/OOo_1.9m72_source.tar.bz2) = 233690890
MD5 (openoffice.org2.0/OOo_1.9m73_source.tar.bz2) = 0885bb45bd204b03b16f8276cbd922e0
SIZE (openoffice.org2.0/OOo_1.9m73_source.tar.bz2) = 233756500
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
MD5 (openoffice.org2.0/cws_srx645_mozooo.20041016.tar.gz) = eda0ab73b24c45890ae08bdfe04049bd

2
editors/openoffice.org-3/files/Makefile.knobs
View File

@ -19,7 +19,7 @@ CONFIGURE_ARGS+= --enable-cups
.if defined(ALL_LOCALIZED_LANGS)
CONFIGURE_ARGS+= --with-lang="en-US ar ca cs da de el es et fi fr he hi-IN hu it ja ko pl pt pt-BR ru sk sl sv th tr zh-CN zh-TW"
#following langs still seem to be under development
#following langs still seem to be under development
#af bg cy eo eu gl kn-IN lt nb nl nn ns tn zu
#CONFIGURE_ARGS+= --with-lang=ALL
.else

25
editors/openoffice.org-3/files/patch-config_office+set_soenv.in
View File

@ -1,25 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=37731
o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=2030&Path=SRC680%2Fpj16
o pj16
Description
Do not export LINK to environment
Index: config_office/set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.31
diff -u -r1.31 set_soenv.in
--- config_office/set_soenv.in 5 Jan 2005 12:10:00 -0000 1.31
+++ config_office/set_soenv.in 9 Jan 2005 18:51:24 -0000
@@ -1684,9 +1684,6 @@
ToFile( "CC", $CC, "e" );
ToFile( "CXX", $CXX, "e" );
ToFile( "USE_SYSTEM_STL", "@USE_SYSTEM_STL@", "e" );
-if ( $COM ne "MSC" ) {
- ToFile( "LINK", $CC, "e" );
-}
ToFile( "ENABLE_SYMBOLS", "@ENABLE_SYMBOLS@", "e" );
ToFile( "ENABLE_CRASHDUMP", "@ENABLE_CRASHDUMP@", "e" );
ToFile( "ENABLE_CUPS", "@ENABLE_CUPS@", "e" );

1004
editors/openoffice.org-3/files/patch-project-bridges
View File

File diff suppressed because it is too large Load Diff

65
editors/openoffice.org-3/files/patch-project-extentions
View File

@ -1,65 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=40179
o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=2030&Path=SRC680%2Fpj16
o pj16
Description
o source/config/ldap/makefile.mk needs -lcompat since re_comp is defined here.
o FreeBSD doesn't have -ldl
o INC+= -DNP_LINUX is also requried for FreeBSD
Index: source/config/ldap/makefile.mk
===================================================================
RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
retrieving revision 1.4
diff -u -r1.4 makefile.mk
--- extensions/source/config/ldap/makefile.mk 15 Nov 2004 14:14:22 -0000 1.4
+++ extensions/source/config/ldap/makefile.mk 8 Jan 2005 02:48:29 -0000
@@ -116,6 +116,9 @@
$(CPPULIB) \
$(SALHELPERLIB) \
$(SALLIB)
+.IF "$(OS)"=="FREEBSD"
+SHL1STDLIBS+=-lcompat
+.ENDIF
DEF1NAME=$(SHL1TARGET)
DEF1EXPORTFILE=exports.dxp
Index: source/nsplugin/source/makefile.mk
===================================================================
RCS file: /cvs/util/extensions/source/nsplugin/source/makefile.mk,v
retrieving revision 1.8
diff -u -r1.8 makefile.mk
--- extensions/source/nsplugin/source/makefile.mk 3 Jan 2005 09:04:51 -0000 1.8
+++ extensions/source/nsplugin/source/makefile.mk 8 Jan 2005 02:48:30 -0000
@@ -78,7 +78,7 @@
@echo GTK disabled - nothing to build
.ELSE # "$(ENABLE_GTK)"==""
-.IF "$(OS)"=="LINUX"
+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
INC+= -DNP_LINUX
.ENDIF
PKGCONFIG_MODULES=gtk+-2.0
@@ -99,8 +99,10 @@
.IF "$(GUI)"=="UNX"
SHL1OBJS+=$(SLO)$/npunix.obj
SLOFILES+=$(SLO)$/npunix.obj
+.IF "$(OS)"!="FREEBSD"
SHL1STDLIBS+= -ldl -lnsl
-.ENDIF
+.ENDIF #FREEBSD
+.ENDIF #UNX
.IF "$(GUI)"=="WNT"
SHL1OBJS+=$(SLO)$/npwin.obj
SLOFILES+=$(SLO)$/npwin.obj
@@ -131,7 +133,7 @@
.IF "$(GUI)"=="UNX"
APP1STDLIBS+=$(PKGCONFIG_LIBS:s/-lpangoxft-1.0//)
-.IF "$(OS)"=="LINUX"
+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
.ELSE
APP1STDLIBS+= -ldl -lnsl -lnls -lsocket
.ENDIF

262
editors/openoffice.org-3/files/patch-solenv+inc+unxfbsdi.mk
View File

@ -1,262 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=40182
Description
o catch up recent unxlngi6.mk
o -Wl,-z,defs -> comment out
Index: solenv/inc/unxfbsdi.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
retrieving revision 1.11
diff -u -r1.11 unxfbsdi.mk
--- solenv/inc/unxfbsdi.mk 20 Sep 2004 08:37:13 -0000 1.11
+++ solenv/inc/unxfbsdi.mk 10 Jan 2005 07:44:44 -0000
@@ -60,16 +60,26 @@
#
#*************************************************************************
-# mak file for unxfbsdi
-ASM=$(CC)
-AFLAGS=-x assembler-with-cpp -c $(CDEFS)
+# mk file for unxfbsdi
+ASM=
+AFLAGS=
+
+SOLAR_JAVA*=TRUE
+JAVAFLAGSDEBUG=-g
# filter for supressing verbose messages from linker
#not needed at the moment
#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+# _PTHREADS is needed for the stl
+CDEFS+=$(PTHREAD_CFLAGS) -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
+
+# enable visibility define in "sal/types.h"
+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+
# this is a platform with JAVA support
-SOLAR_JAVA*=TRUE
.IF "$(SOLAR_JAVA)"!=""
JAVADEF=-DSOLAR_JAVA
.IF "$(debug)"==""
@@ -83,90 +93,82 @@
CXX*=g++
# name of C Compiler
CC*=gcc
+.IF "$(SYSBASE)"!=""
+CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
+CXX+:=$(CFLAGS_SYSBASE)
+CC+:=$(CFLAGS_SYSBASE)
+.ENDIF # "$(SYSBASE)"!=""
+CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
+.IF "$(PRODUCT)"!=""
+CFLAGS+=-Wuninitialized
+.ENDIF
-# filter for supressing verbose messages from linker
-# not needed at the moment
-LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+# flags to enable build with symbols; required for crashdump feature
+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
+CFLAGSENABLESYMBOLS=-g1
+.ELSE
+CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
-# options for C and C++ Compiler
-CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=450 -DOSVERSION=$(OSVERSION)
-CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT
-
-# flags for C and C++ Compile
-CFLAGS+= -w -c $(INCLUDE)
-CFLAGS+= -I/usr/X11R6/include
+.ENDIF
# flags for the C++ Compiler
-CFLAGSCC= -pipe -fno-rtti
-CFLAGSCXX= -pipe -fno-rtti
-CFLAGSCXX+= -Wno-ctor-dtor-privacy
-
+CFLAGSCC= -pipe -mtune=pentiumpro
# Flags for enabling exception handling
-CFLAGSEXCEPTIONS= -fexceptions
-CFLAGS_NO_EXCEPTIONS= -fno-exceptions
-
-# Compiler flags for compiling static object in single threaded
-# environment with graphical user interface
-CFLAGSOBJGUIST= -fPIC
-
-# Compiler flags for compiling static object in single threaded
-# environment with character user interface
-CFLAGSOBJCUIST= -fPIC
-
-# Compiler flags for compiling static object in multi threaded
-# environment with graphical user interface
-CFLAGSOBJGUIMT= -fPIC
-
-# Compiler flags for compiling static object in multi threaded
-# environment with character user interface
-CFLAGSOBJCUIMT= -fPIC
-
-# Compiler flags for compiling shared object in multi threaded
-# environment with graphical user interface
-CFLAGSSLOGUIMT= -fPIC
-
-# Compiler flags for compiling shared object in multi threaded
-# environment with character user interface
-CFLAGSSLOCUIMT= -fPIC
+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
+# Flags for disabling exception handling
+CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-# Compiler flags for profilin
-CFLAGSPROF= -pg
+# -fpermissive should be removed as soon as possible
+CFLAGSCXX= -pipe -mtune=pentiumpro
+CFLAGSCXX+= -Wno-ctor-dtor-privacy
+# Compiler flags for compiling static object in single threaded environment with graphical user interface
+CFLAGSOBJGUIST=
+# Compiler flags for compiling static object in single threaded environment with character user interface
+CFLAGSOBJCUIST=
+# Compiler flags for compiling static object in multi threaded environment with graphical user interface
+CFLAGSOBJGUIMT=
+# Compiler flags for compiling static object in multi threaded environment with character user interface
+CFLAGSOBJCUIMT=
+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
+CFLAGSSLOGUIMT=-fPIC
+# Compiler flags for compiling shared object in multi threaded environment with character user interface
+CFLAGSSLOCUIMT=-fPIC
+# Compiler flags for profiling
+CFLAGSPROF=
# Compiler flags for debugging
-CFLAGSDEBUG= -g
+CFLAGSDEBUG=-g
CFLAGSDBGUTIL=
-
-# Compiler flags to enable optimizations
-# -02 is broken for FreeBSD
-CFLAGSOPT= -O
-
-# Compiler flags to disable optimizations
-# -0 is broken for STLport for FreeBSD
-CFLAGSNOOPT= -O0
-
-# Compiler flags for the output path
-CFLAGSOUTOBJ= -o
-
+# Compiler flags for enabling optimazations
+.IF "$(PRODUCT)"!=""
+CFLAGSOPT=-Os -fno-strict-aliasing # optimizing for products
+.ELSE # "$(PRODUCT)"!=""
+CFLAGSOPT= # no optimizing for non products
+.ENDIF # "$(PRODUCT)"!=""
+# Compiler flags for disabling optimazations
+CFLAGSNOOPT=-O0
+# Compiler flags for discibing the output path
+CFLAGSOUTOBJ=-o
# Enable all warnings
CFLAGSWALL=-Wall
-
# Set default warn level
-CFLAGSDFLTWARN=-w
+CFLAGSDFLTWARN=
# switches for dynamic and static linking
-STATIC= -Wl,-Bstatic
-DYNAMIC= -Wl,-Bdynamic
+STATIC = -Wl,-Bstatic
+DYNAMIC = -Wl,-Bdynamic
# name of linker
-LINK=$(CC)
+LINK*=$(CXX)
# default linker flags
-# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-LINKFLAGS=$(LINKFLAGSRUNPATH)
+LINKFLAGSDEFS*=#-Wl,-z,defs
+LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
+LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
# linker flags for linking applications
-LINKFLAGSAPPGUI= -Wl,--noinhibit-exec
-LINKFLAGSAPPCUI= -Wl,--noinhibit-exec
+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
# linker flags for linking shared libraries
LINKFLAGSSHLGUI= -shared
@@ -177,23 +179,19 @@
LINKFLAGSDEBUG=-g
LINKFLAGSOPT=
-.IF "$(NO_BSYMBOLIC)"==""
-.IF "$(PRJNAME)" != "envtest"
-LINKFLAGSSHLGUI+= -Wl,-Bsymbolic
-LINKFLAGSSHLCUI+= -Wl,-Bsymbolic
-.ENDIF
-.ENDIF
+# linker flags for optimization (symbol hashtable)
+# for now, applied to symbol scoped libraries, only
+LINKFLAGSOPTIMIZE*=-Wl,-O1
+LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
-LINKVERSIONMAPFLAG=-Wl,--version-script
+SONAME_SWITCH=-Wl,-h
# Sequence of libs does matter !
-STDLIBCPP=-lstdc++
-# _SYSLIBS= -L/usr/lib -lm
-# _X11LIBS= -L/usr/X11R6/lib -lXext -lX11
-# _CXXLIBS= -L/usr/lib -lstdc++ -L/usr/local/lib
+STDLIBCPP=-lstdc++
# default objectfilenames to link
+STDOBJVCL=$(L)$/salmain.o
STDOBJGUI=
STDSLOGUI=
STDOBJCUI=
@@ -201,24 +199,25 @@
# libraries for linking applications
STDLIBCUIST=-lm
-STDLIBGUIST=-lXaw -lXt -lX11 -lm
-STDLIBGUIMT=-lXaw -lXt -lX11 $(PTHREAD_LIBS) -lm
+STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
STDLIBCUIMT=$(PTHREAD_LIBS) -lm
-
+STDLIBGUIST=-lX11 -lm
# libraries for linking shared libraries
-STDSHLGUIMT=-lXaw -lXt -lX11 -lXext $(PTHREAD_LIBS) -lm
+STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
STDSHLCUIMT=$(PTHREAD_LIBS) -lm
+STDSHLGUIST=-lX11 -lXext -lm
+STDSHLCUIST=-lm
LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-# STLport always needs pthread.
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(STDLIBCPP) $(PTHREAD_LIBS)
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) $(PTHREAD_LIBS)
+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
+
+#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
# name of library manager
LIBMGR=ar
LIBFLAGS=-r
-LIBEXT= .a
# tool for generating import libraries
IMPLIB=
@@ -237,3 +236,4 @@
DLLPOSTFIX=fi
DLLPRE=lib
DLLPOST=.so
+

24
editors/openoffice.org-3/files/patch-transex3+source+xmlparse.cxx
View File

@ -1,24 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=40184
o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=2030&Path=SRC680%2Fpj16
o pj16
Description
FreeBSD doesn't have alloca.h
Index: source/xmlparse.cxx
===================================================================
RCS file: /cvs/l10n/transex3/source/xmlparse.cxx,v
retrieving revision 1.5
diff -u -r1.5 xmlparse.cxx
--- transex3/source/xmlparse.cxx 18 Nov 2004 08:17:50 -0000 1.5
+++ transex3/source/xmlparse.cxx 8 Jan 2005 02:56:14 -0000
@@ -67,7 +67,7 @@
#ifdef WIN32
#include <malloc.h>
#else
-#ifndef MACOSX
+#if !(defined(MACOSX) || defined(FREEBSD))
#include <alloca.h>
#endif
#endif

4
editors/openoffice.org-vcltesttool/Makefile
View File

@ -19,7 +19,7 @@ EXTRACT_ONLY= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
SNAPDATE= 20050119
SNAPDATE= 20050123
NO_LATEST_LINK= yes
USE_GNOME= gtk20
MOZILLA_PROJECT= cws_srx645_mozooo.20041016.tar.gz
@ -49,7 +49,7 @@ BROKEN= "rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
CODELINE= 680
RELEASE_NR= 1.9
MILESTONE= 72
MILESTONE= 73
INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE}
EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
DIST_SUBDIR= openoffice.org2.0

4
editors/openoffice.org-vcltesttool/distinfo
View File

@ -1,5 +1,5 @@
MD5 (openoffice.org2.0/OOo_1.9m72_source.tar.bz2) = c51fa9d749f1e5eb3733d50b91f97fe8
SIZE (openoffice.org2.0/OOo_1.9m72_source.tar.bz2) = 233690890
MD5 (openoffice.org2.0/OOo_1.9m73_source.tar.bz2) = 0885bb45bd204b03b16f8276cbd922e0
SIZE (openoffice.org2.0/OOo_1.9m73_source.tar.bz2) = 233756500
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
MD5 (openoffice.org2.0/cws_srx645_mozooo.20041016.tar.gz) = eda0ab73b24c45890ae08bdfe04049bd

2
editors/openoffice.org-vcltesttool/files/Makefile.knobs
View File

@ -19,7 +19,7 @@ CONFIGURE_ARGS+= --enable-cups
.if defined(ALL_LOCALIZED_LANGS)
CONFIGURE_ARGS+= --with-lang="en-US ar ca cs da de el es et fi fr he hi-IN hu it ja ko pl pt pt-BR ru sk sl sv th tr zh-CN zh-TW"
#following langs still seem to be under development
#following langs still seem to be under development
#af bg cy eo eu gl kn-IN lt nb nl nn ns tn zu
#CONFIGURE_ARGS+= --with-lang=ALL
.else

25
editors/openoffice.org-vcltesttool/files/patch-config_office+set_soenv.in
View File

@ -1,25 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=37731
o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=2030&Path=SRC680%2Fpj16
o pj16
Description
Do not export LINK to environment
Index: config_office/set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.31
diff -u -r1.31 set_soenv.in
--- config_office/set_soenv.in 5 Jan 2005 12:10:00 -0000 1.31
+++ config_office/set_soenv.in 9 Jan 2005 18:51:24 -0000
@@ -1684,9 +1684,6 @@
ToFile( "CC", $CC, "e" );
ToFile( "CXX", $CXX, "e" );
ToFile( "USE_SYSTEM_STL", "@USE_SYSTEM_STL@", "e" );
-if ( $COM ne "MSC" ) {
- ToFile( "LINK", $CC, "e" );
-}
ToFile( "ENABLE_SYMBOLS", "@ENABLE_SYMBOLS@", "e" );
ToFile( "ENABLE_CRASHDUMP", "@ENABLE_CRASHDUMP@", "e" );
ToFile( "ENABLE_CUPS", "@ENABLE_CUPS@", "e" );

1004
editors/openoffice.org-vcltesttool/files/patch-project-bridges
View File

File diff suppressed because it is too large Load Diff

65
editors/openoffice.org-vcltesttool/files/patch-project-extentions
View File

@ -1,65 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=40179
o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=2030&Path=SRC680%2Fpj16
o pj16
Description
o source/config/ldap/makefile.mk needs -lcompat since re_comp is defined here.
o FreeBSD doesn't have -ldl
o INC+= -DNP_LINUX is also requried for FreeBSD
Index: source/config/ldap/makefile.mk
===================================================================
RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
retrieving revision 1.4
diff -u -r1.4 makefile.mk
--- extensions/source/config/ldap/makefile.mk 15 Nov 2004 14:14:22 -0000 1.4
+++ extensions/source/config/ldap/makefile.mk 8 Jan 2005 02:48:29 -0000
@@ -116,6 +116,9 @@
$(CPPULIB) \
$(SALHELPERLIB) \
$(SALLIB)
+.IF "$(OS)"=="FREEBSD"
+SHL1STDLIBS+=-lcompat
+.ENDIF
DEF1NAME=$(SHL1TARGET)
DEF1EXPORTFILE=exports.dxp
Index: source/nsplugin/source/makefile.mk
===================================================================
RCS file: /cvs/util/extensions/source/nsplugin/source/makefile.mk,v
retrieving revision 1.8
diff -u -r1.8 makefile.mk
--- extensions/source/nsplugin/source/makefile.mk 3 Jan 2005 09:04:51 -0000 1.8
+++ extensions/source/nsplugin/source/makefile.mk 8 Jan 2005 02:48:30 -0000
@@ -78,7 +78,7 @@
@echo GTK disabled - nothing to build
.ELSE # "$(ENABLE_GTK)"==""
-.IF "$(OS)"=="LINUX"
+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
INC+= -DNP_LINUX
.ENDIF
PKGCONFIG_MODULES=gtk+-2.0
@@ -99,8 +99,10 @@
.IF "$(GUI)"=="UNX"
SHL1OBJS+=$(SLO)$/npunix.obj
SLOFILES+=$(SLO)$/npunix.obj
+.IF "$(OS)"!="FREEBSD"
SHL1STDLIBS+= -ldl -lnsl
-.ENDIF
+.ENDIF #FREEBSD
+.ENDIF #UNX
.IF "$(GUI)"=="WNT"
SHL1OBJS+=$(SLO)$/npwin.obj
SLOFILES+=$(SLO)$/npwin.obj
@@ -131,7 +133,7 @@
.IF "$(GUI)"=="UNX"
APP1STDLIBS+=$(PKGCONFIG_LIBS:s/-lpangoxft-1.0//)
-.IF "$(OS)"=="LINUX"
+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
.ELSE
APP1STDLIBS+= -ldl -lnsl -lnls -lsocket
.ENDIF

262
editors/openoffice.org-vcltesttool/files/patch-solenv+inc+unxfbsdi.mk
View File

@ -1,262 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=40182
Description
o catch up recent unxlngi6.mk
o -Wl,-z,defs -> comment out
Index: solenv/inc/unxfbsdi.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
retrieving revision 1.11
diff -u -r1.11 unxfbsdi.mk
--- solenv/inc/unxfbsdi.mk 20 Sep 2004 08:37:13 -0000 1.11
+++ solenv/inc/unxfbsdi.mk 10 Jan 2005 07:44:44 -0000
@@ -60,16 +60,26 @@
#
#*************************************************************************
-# mak file for unxfbsdi
-ASM=$(CC)
-AFLAGS=-x assembler-with-cpp -c $(CDEFS)
+# mk file for unxfbsdi
+ASM=
+AFLAGS=
+
+SOLAR_JAVA*=TRUE
+JAVAFLAGSDEBUG=-g
# filter for supressing verbose messages from linker
#not needed at the moment
#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+# _PTHREADS is needed for the stl
+CDEFS+=$(PTHREAD_CFLAGS) -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
+
+# enable visibility define in "sal/types.h"
+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+
# this is a platform with JAVA support
-SOLAR_JAVA*=TRUE
.IF "$(SOLAR_JAVA)"!=""
JAVADEF=-DSOLAR_JAVA
.IF "$(debug)"==""
@@ -83,90 +93,82 @@
CXX*=g++
# name of C Compiler
CC*=gcc
+.IF "$(SYSBASE)"!=""
+CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
+CXX+:=$(CFLAGS_SYSBASE)
+CC+:=$(CFLAGS_SYSBASE)
+.ENDIF # "$(SYSBASE)"!=""
+CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
+.IF "$(PRODUCT)"!=""
+CFLAGS+=-Wuninitialized
+.ENDIF
-# filter for supressing verbose messages from linker
-# not needed at the moment
-LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+# flags to enable build with symbols; required for crashdump feature
+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
+CFLAGSENABLESYMBOLS=-g1
+.ELSE
+CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
-# options for C and C++ Compiler
-CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=450 -DOSVERSION=$(OSVERSION)
-CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT
-
-# flags for C and C++ Compile
-CFLAGS+= -w -c $(INCLUDE)
-CFLAGS+= -I/usr/X11R6/include
+.ENDIF
# flags for the C++ Compiler
-CFLAGSCC= -pipe -fno-rtti
-CFLAGSCXX= -pipe -fno-rtti
-CFLAGSCXX+= -Wno-ctor-dtor-privacy
-
+CFLAGSCC= -pipe -mtune=pentiumpro
# Flags for enabling exception handling
-CFLAGSEXCEPTIONS= -fexceptions
-CFLAGS_NO_EXCEPTIONS= -fno-exceptions
-
-# Compiler flags for compiling static object in single threaded
-# environment with graphical user interface
-CFLAGSOBJGUIST= -fPIC
-
-# Compiler flags for compiling static object in single threaded
-# environment with character user interface
-CFLAGSOBJCUIST= -fPIC
-
-# Compiler flags for compiling static object in multi threaded
-# environment with graphical user interface
-CFLAGSOBJGUIMT= -fPIC
-
-# Compiler flags for compiling static object in multi threaded
-# environment with character user interface
-CFLAGSOBJCUIMT= -fPIC
-
-# Compiler flags for compiling shared object in multi threaded
-# environment with graphical user interface
-CFLAGSSLOGUIMT= -fPIC
-
-# Compiler flags for compiling shared object in multi threaded
-# environment with character user interface
-CFLAGSSLOCUIMT= -fPIC
+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
+# Flags for disabling exception handling
+CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-# Compiler flags for profilin
-CFLAGSPROF= -pg
+# -fpermissive should be removed as soon as possible
+CFLAGSCXX= -pipe -mtune=pentiumpro
+CFLAGSCXX+= -Wno-ctor-dtor-privacy
+# Compiler flags for compiling static object in single threaded environment with graphical user interface
+CFLAGSOBJGUIST=
+# Compiler flags for compiling static object in single threaded environment with character user interface
+CFLAGSOBJCUIST=
+# Compiler flags for compiling static object in multi threaded environment with graphical user interface
+CFLAGSOBJGUIMT=
+# Compiler flags for compiling static object in multi threaded environment with character user interface
+CFLAGSOBJCUIMT=
+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
+CFLAGSSLOGUIMT=-fPIC
+# Compiler flags for compiling shared object in multi threaded environment with character user interface
+CFLAGSSLOCUIMT=-fPIC
+# Compiler flags for profiling
+CFLAGSPROF=
# Compiler flags for debugging
-CFLAGSDEBUG= -g
+CFLAGSDEBUG=-g
CFLAGSDBGUTIL=
-
-# Compiler flags to enable optimizations
-# -02 is broken for FreeBSD
-CFLAGSOPT= -O
-
-# Compiler flags to disable optimizations
-# -0 is broken for STLport for FreeBSD
-CFLAGSNOOPT= -O0
-
-# Compiler flags for the output path
-CFLAGSOUTOBJ= -o
-
+# Compiler flags for enabling optimazations
+.IF "$(PRODUCT)"!=""
+CFLAGSOPT=-Os -fno-strict-aliasing # optimizing for products
+.ELSE # "$(PRODUCT)"!=""
+CFLAGSOPT= # no optimizing for non products
+.ENDIF # "$(PRODUCT)"!=""
+# Compiler flags for disabling optimazations
+CFLAGSNOOPT=-O0
+# Compiler flags for discibing the output path
+CFLAGSOUTOBJ=-o
# Enable all warnings
CFLAGSWALL=-Wall
-
# Set default warn level
-CFLAGSDFLTWARN=-w
+CFLAGSDFLTWARN=
# switches for dynamic and static linking
-STATIC= -Wl,-Bstatic
-DYNAMIC= -Wl,-Bdynamic
+STATIC = -Wl,-Bstatic
+DYNAMIC = -Wl,-Bdynamic
# name of linker
-LINK=$(CC)
+LINK*=$(CXX)
# default linker flags
-# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-LINKFLAGS=$(LINKFLAGSRUNPATH)
+LINKFLAGSDEFS*=#-Wl,-z,defs
+LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
+LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
# linker flags for linking applications
-LINKFLAGSAPPGUI= -Wl,--noinhibit-exec
-LINKFLAGSAPPCUI= -Wl,--noinhibit-exec
+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
# linker flags for linking shared libraries
LINKFLAGSSHLGUI= -shared
@@ -177,23 +179,19 @@
LINKFLAGSDEBUG=-g
LINKFLAGSOPT=
-.IF "$(NO_BSYMBOLIC)"==""
-.IF "$(PRJNAME)" != "envtest"
-LINKFLAGSSHLGUI+= -Wl,-Bsymbolic
-LINKFLAGSSHLCUI+= -Wl,-Bsymbolic
-.ENDIF
-.ENDIF
+# linker flags for optimization (symbol hashtable)
+# for now, applied to symbol scoped libraries, only
+LINKFLAGSOPTIMIZE*=-Wl,-O1
+LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
-LINKVERSIONMAPFLAG=-Wl,--version-script
+SONAME_SWITCH=-Wl,-h
# Sequence of libs does matter !
-STDLIBCPP=-lstdc++
-# _SYSLIBS= -L/usr/lib -lm
-# _X11LIBS= -L/usr/X11R6/lib -lXext -lX11
-# _CXXLIBS= -L/usr/lib -lstdc++ -L/usr/local/lib
+STDLIBCPP=-lstdc++
# default objectfilenames to link
+STDOBJVCL=$(L)$/salmain.o
STDOBJGUI=
STDSLOGUI=
STDOBJCUI=
@@ -201,24 +199,25 @@
# libraries for linking applications
STDLIBCUIST=-lm
-STDLIBGUIST=-lXaw -lXt -lX11 -lm
-STDLIBGUIMT=-lXaw -lXt -lX11 $(PTHREAD_LIBS) -lm
+STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
STDLIBCUIMT=$(PTHREAD_LIBS) -lm
-
+STDLIBGUIST=-lX11 -lm
# libraries for linking shared libraries
-STDSHLGUIMT=-lXaw -lXt -lX11 -lXext $(PTHREAD_LIBS) -lm
+STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
STDSHLCUIMT=$(PTHREAD_LIBS) -lm
+STDSHLGUIST=-lX11 -lXext -lm
+STDSHLCUIST=-lm
LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-# STLport always needs pthread.
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(STDLIBCPP) $(PTHREAD_LIBS)
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) $(PTHREAD_LIBS)
+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
+
+#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
# name of library manager
LIBMGR=ar
LIBFLAGS=-r
-LIBEXT= .a
# tool for generating import libraries
IMPLIB=
@@ -237,3 +236,4 @@
DLLPOSTFIX=fi
DLLPRE=lib
DLLPOST=.so
+

24
editors/openoffice.org-vcltesttool/files/patch-transex3+source+xmlparse.cxx
View File

@ -1,24 +0,0 @@
#iZ and CWS
o http://www.openoffice.org/issues/show_bug.cgi?id=40184
o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=2030&Path=SRC680%2Fpj16
o pj16
Description
FreeBSD doesn't have alloca.h
Index: source/xmlparse.cxx
===================================================================
RCS file: /cvs/l10n/transex3/source/xmlparse.cxx,v
retrieving revision 1.5
diff -u -r1.5 xmlparse.cxx
--- transex3/source/xmlparse.cxx 18 Nov 2004 08:17:50 -0000 1.5
+++ transex3/source/xmlparse.cxx 8 Jan 2005 02:56:14 -0000
@@ -67,7 +67,7 @@
#ifdef WIN32
#include <malloc.h>
#else
-#ifndef MACOSX
+#if !(defined(MACOSX) || defined(FREEBSD))
#include <alloca.h>
#endif
#endif