mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-23 09:10:43 +00:00
Code Issues Releases Activity

Update to DEV300_m54.

Browse Source 
(Partial support of $ORIGIN for FBSD 8.)

Funded by OpenOffice.org community.
This commit is contained in:
Maho Nakata 2009-08-05 05:48:42 +00:00
parent bdeceb8139
commit f94cb9bc27
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=238948
14 changed files with 328 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,11 +74,11 @@ FREEBSD_ENV_SET= FreeBSDAMDEnv.Set
FREEBSD_ENV_SET= FreeBSDX86Env.Set
.endif
MILESTONE?= 53
MILESTONE?= 54
OOOTAG?= DEV300_m${MILESTONE}
OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX}
OOODIR= openoffice.org3
SNAPDATE= 20090723
SNAPDATE= 20090805
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
EXECBASE?= openoffice.org-${OOOTAG}
DIST_SUBDIR= openoffice.org3

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

@ -1,6 +1,6 @@
MD5 (openoffice.org3/OOo_DEV300_m53_source.tar.bz2) = 25277c1c6ec46503704075d04252c942
SHA256 (openoffice.org3/OOo_DEV300_m53_source.tar.bz2) = 2307a9edb7139f50d40f97e4d47fdf9ce0bdf80e3ff5a406904b5499f09a493f
SIZE (openoffice.org3/OOo_DEV300_m53_source.tar.bz2) = 419914457
MD5 (openoffice.org3/OOo_DEV300_m54_source.tar.bz2) = 1b2fb2ac3626ca0ca85efb536c51e18b
SHA256 (openoffice.org3/OOo_DEV300_m54_source.tar.bz2) = e96e1058bb2f09b212ac5b227984d28846c6551b69e597d1e6433487bfbeae41
SIZE (openoffice.org3/OOo_DEV300_m54_source.tar.bz2) = 419800003
MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice.org3/unowinreg.dll) = 6144

36
editors/openoffice-3-devel/files/patch-i103736
View File

@ -1,36 +0,0 @@
--- solenv/inc/_tg_srs.mk.orig 2009-07-23 09:51:27.000000000 +0900
+++ solenv/inc/_tg_srs.mk 2009-07-25 06:59:51.000000000 +0900
@@ -41,7 +41,7 @@
$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-fp=$@.$(INPATH) \
- $< \
+ $(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i) \
)
-$(RM) $@
$(RENAME) $@.$(INPATH) $@
--- starmath/source/makefile.mk 2009-07-23 09:48:08.000000000 +0900
+++ starmath/source/makefile.mk 2009-07-25 07:27:40.000000000 +0900
@@ -113,9 +113,6 @@
# --- Targets -------------------------------------------------------
-LOCALIZE_ME = menu_tmpl.src
-
-
.INCLUDE : target.mk
$(INCCOM)$/dllname.hxx: makefile.mk
--- starmath/source/smres.src 2009-07-23 09:48:08.000000000 +0900
+++ starmath/source/smres.src 2009-07-25 07:26:49.000000000 +0900
@@ -3501,8 +3501,6 @@
Text [ en-US ] = "'RIGHT' expected" ;
};
-#include "menu.src"
-
ToolBox RID_MATH_TOOLBOX
{
HelpId = RID_MATH_TOOLBOX ;

49
editors/openoffice-3-devel/files/patch-i103772 Normal file
View File

@ -0,0 +1,49 @@
Index: makefile.mk
===================================================================
--- moz/makefile.mk (revision 274452)
+++ moz/makefile.mk (working copy)
@@ -57,11 +57,13 @@
.EXPORT : DISABLE_MOZ_EXECUTABLE
.IF "$(SYSBASE)"!="" && "$(OS)" == "LINUX"
-# hmm... rather gcc specific switches...
+## hmm... rather gcc specific switches...
CFLAGS:=-isystem $(SYSBASE)/usr/include -B$(SYSBASE)/usr/lib
-LDFLAGS:=-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -L$(SYSBASE)/usr/X11R6/lib
+LDFLAGS:= -Wl,--unresolved-symbols=ignore-in-shared-libs -L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -L$(SYSBASE)/usr/X11R6/lib
SYSBASE_X11:=--x-includes=$(SYSBASE)/usr/include/X11 --x-libraries=$(SYSBASE)/usr/X11R6/lib
-.EXPORT : CFLAGS LDFLAGS
+MOZ_ENABLE_COREXFONTS=1
+MOZILLA_CONFIGURE_FLAGS +=--disable-xft
+.EXPORT : CFLAGS LDFLAGS MOZ_ENABLE_COREXFONTS
.ENDIF # "$(SYSBASE)"!="" && "$(OS)" == "LINUX"
.IF "$(SYSBASE)"!="" && "$(OS)" == "MACOSX"
@@ -124,7 +126,6 @@
--disable-boehm \
--disable-jsloader \
--disable-canvas \
- --disable-xft \
--disable-freetype2 \
--disable-gnomeui \
--disable-image-encoders \
Index: seamonkey-source-1.1.14.patch
===================================================================
--- moz/seamonkey-source-1.1.14.patch (revision 274452)
+++ moz/seamonkey-source-1.1.14.patch (working copy)
@@ -328,15 +328,6 @@
*)
echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6
echo "configure:8620: checking for gethostbyname_r in -lc_r" >&5
-@@ -12259,7 +12283,7 @@
- gtk2)
- MOZ_ENABLE_GTK2=1
- MOZ_ENABLE_XREMOTE=1
-- MOZ_ENABLE_COREXFONTS=${MOZ_ENABLE_COREXFONTS-}
-+ MOZ_ENABLE_COREXFONTS=${MOZ_ENABLE_COREXFONTS-1}
- TK_CFLAGS='$(MOZ_GTK2_CFLAGS)'
- TK_LIBS='$(MOZ_GTK2_LIBS)'
- cat >> confdefs.h <<\EOF
@@ -19233,7 +19257,8 @@
MOZ_CAIRO_LIBS="-lmozcairo -lmozlibpixman $CAIRO_FT_LIBS"

138
editors/openoffice-3-devel/files/patch-i103792
View File

@ -1,74 +1,88 @@
adding -lpangox-1.0 see http://www.openoffice.org/issues/show_bug.cgi?id=103772
--- moz/seamonkey-source-1.1.14.patch 2009-06-27 09:39:41.000000000 +0900
+++ moz/seamonkey-source-1.1.14.patch 2009-07-27 18:07:12.000000000 -0400
@@ -6353,3 +6353,173 @@
--- moz/seamonkey-source-1.1.14.patch.orig 2009-08-05 06:24:32.000000000 +0900
+++ moz/seamonkey-source-1.1.14.patch 2009-08-05 12:23:12.000000000 +0900
@@ -12,6 +12,7 @@
do
if test -f "$_config"; then
echo "$_config";
+
--- misc/mozilla/build/cygwin-wrapper 2004-08-19 01:18:55.000000000 +0200
+++ misc/build/mozilla/build/cygwin-wrapper 2008-08-14 16:22:21.000000000 +0200
@@ -1,4 +1,4 @@
@@ -86,7 +87,7 @@
PYTHON = @MOZ_PYTHON@
--- misc/mozilla/config/config.mk 2008-01-29 20:30:22.000000000 +0100
+++ misc/build/mozilla/config/config.mk 2008-08-14 16:22:21.000000000 +0200
-@@ -758,6 +758,23 @@
+@@ -758,6 +758,30 @@
endif
#
@@ -106,6 +107,13 @@
+endif # IS_COMPONENT
+endif # SunOS
+
++ifeq ($(OS_ARCH),FreeBSD)
++EXTRA_DSO_LDOPTS += -Wl,-z,origin -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
++ifdef IS_COMPONENT
++EXTRA_DSO_LDOPTS += -Wl,-z,origin -Wl,-rpath,\$$ORIGIN/..:\$$ORIGIN/../../ure-link/lib
++endif # IS_COMPONENT
++endif # FreeBSD
++
+#
# Include any personal overrides the user might think are needed.
#
@@ -5810,7 +5818,7 @@
else
--- misc/mozilla/nsprpub/lib/ds/Makefile.in 2006-12-22 14:47:17.000000000 +0100
+++ misc/build/mozilla/nsprpub/lib/ds/Makefile.in 2008-08-14 16:22:21.000000000 +0200
-@@ -79,18 +79,22 @@
+@@ -79,18 +79,26 @@
OS_LIBS = -lc
endif
@@ -5818,6 +5826,10 @@
+MKSHLIB += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
+endif
+
++ifeq ($(OS_ARCH),FreeBSD)
++MKSHLIB += -Wl,-z,origin -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
++endif
++
ifeq ($(OS_ARCH),SunOS)
OS_LIBS = -lc
MAPFILE = $(OBJDIR)/pldsmap.sun
@@ -5838,7 +5850,7 @@
# dependencies in the same directory where it resides.
--- misc/mozilla/nsprpub/lib/libc/src/Makefile.in 2006-12-22 14:47:17.000000000 +0100
+++ misc/build/mozilla/nsprpub/lib/libc/src/Makefile.in 2008-08-14 16:22:21.000000000 +0200
-@@ -89,18 +89,22 @@
+@@ -89,18 +89,26 @@
OS_LIBS = -lc
endif
@@ -5846,6 +5858,10 @@
+MKSHLIB += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
+endif
+
++ifeq ($(OS_ARCH),FreeBSD)
++MKSHLIB += -Wl,-z,origin -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
++endif
++
ifeq ($(OS_ARCH),SunOS)
OS_LIBS = -lc
MAPFILE = $(OBJDIR)/plcmap.sun
@@ -6353,3 +6369,120 @@
clean clobber::
rm -rf $(DIST)/$(APP_NAME).app
+
+
+###################MAHO's FREEBSD PART###################
+--- misc/mozilla/gfx/src/gtk/Makefile.in 2007-10-08 21:09:58.000000000 +0200
++++ misc/build/mozilla/gfx/src/gtk/Makefile.in 2008-08-18 14:10:04.000000000 +0200
+@@ -207,7 +207,7 @@
+ EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS)
+ endif
+
+-EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_GTK_LDFLAGS) $(MOZ_XFT_LIBS) $(MOZ_GTK2_LIBS)
++EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_GTK_LDFLAGS) $(MOZ_XFT_LIBS) $(MOZ_GTK2_LIBS) -lpangox-1.0
+ CXXFLAGS += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS)
+ CFLAGS += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS)
+
+--- misc/mozilla/config/config.mk 2009-06-28 16:28:27.000000000 +0900
++++ misc/build/mozilla/config/config.mk 2009-06-28 16:18:04.000000000 +0900
+@@ -774,6 +774,13 @@
+ endif # IS_COMPONENT
+ endif # SunOS
+
++ifeq ($(OS_ARCH),FreeBSD)
++EXTRA_DSO_LDOPTS += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
++ifdef IS_COMPONENT
++EXTRA_DSO_LDOPTS += -Wl,-rpath,\$$ORIGIN/..:\$$ORIGIN/../../ure-link/lib
++endif # IS_COMPONENT
++endif # FreeBSD
++
+ #
+ # Include any personal overrides the user might think are needed.
+ #
+--- misc/mozilla/nsprpub/lib/ds/Makefile.in 2009-06-28 16:28:27.000000000 +0900
++++ misc/build/mozilla/nsprpub/lib/ds/Makefile.in 2009-06-28 16:22:16.000000000 +0900
+@@ -83,6 +83,10 @@
+ MKSHLIB += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
+ endif
+
++ifeq ($(OS_ARCH),FreeBSD)
++MKSHLIB += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
++endif
++
+ ifeq ($(OS_ARCH),SunOS)
+ OS_LIBS = -lc
+ MAPFILE = $(OBJDIR)/pldsmap.sun
+--- misc/mozilla/nsprpub/lib/libc/src/Makefile.in 2009-06-28 16:28:27.000000000 +0900
++++ misc/build/mozilla/nsprpub/lib/libc/src/Makefile.in 2009-06-28 16:23:31.000000000 +0900
+@@ -93,6 +93,10 @@
+ MKSHLIB += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
+ endif
+
++ifeq ($(OS_ARCH),FreeBSD)
++MKSHLIB += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
++endif
++
+ ifeq ($(OS_ARCH),SunOS)
+ OS_LIBS = -lc
+ MAPFILE = $(OBJDIR)/plcmap.sun
+--- misc/mozilla/security/coreconf/FreeBSD.mk 2009-06-28 16:28:27.000000000 +0900
++++ misc/build/mozilla/security/coreconf/FreeBSD.mk 2009-06-28 16:25:10.000000000 +0900
+@@ -52,6 +52,7 @@
+
+ DSO_CFLAGS = -fPIC
+ DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@)
++DSO_LDOPTS += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
++DSO_LDOPTS += -Wl,-z,origin -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
+
+ #
+ # The default implementation strategy for FreeBSD is pthreads.
@ -176,3 +190,5 @@ adding -lpangox-1.0 see http://www.openoffice.org/issues/show_bug.cgi?id=103772
+ void LDAP_CALL re_modw( char *s );
+ int LDAP_CALL re_subs( char *src, char *dst );
+ #else /* NEEDPROTOS */
+
+

20
editors/openoffice-3-devel/files/patch-i104014 Normal file
View File

@ -0,0 +1,20 @@
--- solenv/inc/unxfbsd.mk 2009-08-05 06:24:36.000000000 +0900
+++ solenv/inc/unxfbsd.mk 2009-08-05 09:20:06.000000000 +0900
@@ -141,12 +141,12 @@
# default linker flags
LINKFLAGSDEFS*=#-Wl,-z,defs
-LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\'
-LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
+LINKFLAGSRUNPATH_URELIB=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN'\'
+LINKFLAGSRUNPATH_UREBIN=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
#TODO: drop $ORIGIN once no URE executable is also shipped in OOo
-LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
-LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\'
-LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
+LINKFLAGSRUNPATH_OOO=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
+LINKFLAGSRUNPATH_SDK=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\'
+LINKFLAGSRUNPATH_BRAND=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
LINKFLAGSRUNPATH_OXT=
LINKFLAGSRUNPATH_NONE=
LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)

13
editors/openoffice-3-devel/files/patch-i104015 Normal file
View File

@ -0,0 +1,13 @@
origin support
--- stlport/STLport-4.5.patch~ 2009-07-23 10:00:59.000000000 +0900
+++ stlport/STLport-4.5.patch 2009-08-03 01:33:01.000000000 +0900
@@ -137,7 +137,7 @@
+#
+#
+LINK=ar cr
-+DYN_LINK=${CXX} -Wl,-rpath,'$$ORIGIN' ${PTHREAD_LIBS} --fexceptions -shared -o
++DYN_LINK=${CXX} -Wl,-z,origin -Wl,-rpath,'$$ORIGIN' ${PTHREAD_LIBS} --fexceptions -shared -o
+
+OBJEXT=o
+DYNEXT=so

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

@ -74,11 +74,11 @@ FREEBSD_ENV_SET= FreeBSDAMDEnv.Set
FREEBSD_ENV_SET= FreeBSDX86Env.Set
.endif
MILESTONE?= 53
MILESTONE?= 54
OOOTAG?= DEV300_m${MILESTONE}
OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX}
OOODIR= openoffice.org3
SNAPDATE= 20090723
SNAPDATE= 20090805
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
EXECBASE?= openoffice.org-${OOOTAG}
DIST_SUBDIR= openoffice.org3

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

@ -1,6 +1,6 @@
MD5 (openoffice.org3/OOo_DEV300_m53_source.tar.bz2) = 25277c1c6ec46503704075d04252c942
SHA256 (openoffice.org3/OOo_DEV300_m53_source.tar.bz2) = 2307a9edb7139f50d40f97e4d47fdf9ce0bdf80e3ff5a406904b5499f09a493f
SIZE (openoffice.org3/OOo_DEV300_m53_source.tar.bz2) = 419914457
MD5 (openoffice.org3/OOo_DEV300_m54_source.tar.bz2) = 1b2fb2ac3626ca0ca85efb536c51e18b
SHA256 (openoffice.org3/OOo_DEV300_m54_source.tar.bz2) = e96e1058bb2f09b212ac5b227984d28846c6551b69e597d1e6433487bfbeae41
SIZE (openoffice.org3/OOo_DEV300_m54_source.tar.bz2) = 419800003
MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice.org3/unowinreg.dll) = 6144

36
editors/openoffice.org-3-devel/files/patch-i103736
View File

@ -1,36 +0,0 @@
--- solenv/inc/_tg_srs.mk.orig 2009-07-23 09:51:27.000000000 +0900
+++ solenv/inc/_tg_srs.mk 2009-07-25 06:59:51.000000000 +0900
@@ -41,7 +41,7 @@
$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-fp=$@.$(INPATH) \
- $< \
+ $(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i) \
)
-$(RM) $@
$(RENAME) $@.$(INPATH) $@
--- starmath/source/makefile.mk 2009-07-23 09:48:08.000000000 +0900
+++ starmath/source/makefile.mk 2009-07-25 07:27:40.000000000 +0900
@@ -113,9 +113,6 @@
# --- Targets -------------------------------------------------------
-LOCALIZE_ME = menu_tmpl.src
-
-
.INCLUDE : target.mk
$(INCCOM)$/dllname.hxx: makefile.mk
--- starmath/source/smres.src 2009-07-23 09:48:08.000000000 +0900
+++ starmath/source/smres.src 2009-07-25 07:26:49.000000000 +0900
@@ -3501,8 +3501,6 @@
Text [ en-US ] = "'RIGHT' expected" ;
};
-#include "menu.src"
-
ToolBox RID_MATH_TOOLBOX
{
HelpId = RID_MATH_TOOLBOX ;

49
editors/openoffice.org-3-devel/files/patch-i103772 Normal file
View File

@ -0,0 +1,49 @@
Index: makefile.mk
===================================================================
--- moz/makefile.mk (revision 274452)
+++ moz/makefile.mk (working copy)
@@ -57,11 +57,13 @@
.EXPORT : DISABLE_MOZ_EXECUTABLE
.IF "$(SYSBASE)"!="" && "$(OS)" == "LINUX"
-# hmm... rather gcc specific switches...
+## hmm... rather gcc specific switches...
CFLAGS:=-isystem $(SYSBASE)/usr/include -B$(SYSBASE)/usr/lib
-LDFLAGS:=-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -L$(SYSBASE)/usr/X11R6/lib
+LDFLAGS:= -Wl,--unresolved-symbols=ignore-in-shared-libs -L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -L$(SYSBASE)/usr/X11R6/lib
SYSBASE_X11:=--x-includes=$(SYSBASE)/usr/include/X11 --x-libraries=$(SYSBASE)/usr/X11R6/lib
-.EXPORT : CFLAGS LDFLAGS
+MOZ_ENABLE_COREXFONTS=1
+MOZILLA_CONFIGURE_FLAGS +=--disable-xft
+.EXPORT : CFLAGS LDFLAGS MOZ_ENABLE_COREXFONTS
.ENDIF # "$(SYSBASE)"!="" && "$(OS)" == "LINUX"
.IF "$(SYSBASE)"!="" && "$(OS)" == "MACOSX"
@@ -124,7 +126,6 @@
--disable-boehm \
--disable-jsloader \
--disable-canvas \
- --disable-xft \
--disable-freetype2 \
--disable-gnomeui \
--disable-image-encoders \
Index: seamonkey-source-1.1.14.patch
===================================================================
--- moz/seamonkey-source-1.1.14.patch (revision 274452)
+++ moz/seamonkey-source-1.1.14.patch (working copy)
@@ -328,15 +328,6 @@
*)
echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6
echo "configure:8620: checking for gethostbyname_r in -lc_r" >&5
-@@ -12259,7 +12283,7 @@
- gtk2)
- MOZ_ENABLE_GTK2=1
- MOZ_ENABLE_XREMOTE=1
-- MOZ_ENABLE_COREXFONTS=${MOZ_ENABLE_COREXFONTS-}
-+ MOZ_ENABLE_COREXFONTS=${MOZ_ENABLE_COREXFONTS-1}
- TK_CFLAGS='$(MOZ_GTK2_CFLAGS)'
- TK_LIBS='$(MOZ_GTK2_LIBS)'
- cat >> confdefs.h <<\EOF
@@ -19233,7 +19257,8 @@
MOZ_CAIRO_LIBS="-lmozcairo -lmozlibpixman $CAIRO_FT_LIBS"

138
editors/openoffice.org-3-devel/files/patch-i103792
View File

@ -1,74 +1,88 @@
adding -lpangox-1.0 see http://www.openoffice.org/issues/show_bug.cgi?id=103772
--- moz/seamonkey-source-1.1.14.patch 2009-06-27 09:39:41.000000000 +0900
+++ moz/seamonkey-source-1.1.14.patch 2009-07-27 18:07:12.000000000 -0400
@@ -6353,3 +6353,173 @@
--- moz/seamonkey-source-1.1.14.patch.orig 2009-08-05 06:24:32.000000000 +0900
+++ moz/seamonkey-source-1.1.14.patch 2009-08-05 12:23:12.000000000 +0900
@@ -12,6 +12,7 @@
do
if test -f "$_config"; then
echo "$_config";
+
--- misc/mozilla/build/cygwin-wrapper 2004-08-19 01:18:55.000000000 +0200
+++ misc/build/mozilla/build/cygwin-wrapper 2008-08-14 16:22:21.000000000 +0200
@@ -1,4 +1,4 @@
@@ -86,7 +87,7 @@
PYTHON = @MOZ_PYTHON@
--- misc/mozilla/config/config.mk 2008-01-29 20:30:22.000000000 +0100
+++ misc/build/mozilla/config/config.mk 2008-08-14 16:22:21.000000000 +0200
-@@ -758,6 +758,23 @@
+@@ -758,6 +758,30 @@
endif
#
@@ -106,6 +107,13 @@
+endif # IS_COMPONENT
+endif # SunOS
+
++ifeq ($(OS_ARCH),FreeBSD)
++EXTRA_DSO_LDOPTS += -Wl,-z,origin -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
++ifdef IS_COMPONENT
++EXTRA_DSO_LDOPTS += -Wl,-z,origin -Wl,-rpath,\$$ORIGIN/..:\$$ORIGIN/../../ure-link/lib
++endif # IS_COMPONENT
++endif # FreeBSD
++
+#
# Include any personal overrides the user might think are needed.
#
@@ -5810,7 +5818,7 @@
else
--- misc/mozilla/nsprpub/lib/ds/Makefile.in 2006-12-22 14:47:17.000000000 +0100
+++ misc/build/mozilla/nsprpub/lib/ds/Makefile.in 2008-08-14 16:22:21.000000000 +0200
-@@ -79,18 +79,22 @@
+@@ -79,18 +79,26 @@
OS_LIBS = -lc
endif
@@ -5818,6 +5826,10 @@
+MKSHLIB += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
+endif
+
++ifeq ($(OS_ARCH),FreeBSD)
++MKSHLIB += -Wl,-z,origin -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
++endif
++
ifeq ($(OS_ARCH),SunOS)
OS_LIBS = -lc
MAPFILE = $(OBJDIR)/pldsmap.sun
@@ -5838,7 +5850,7 @@
# dependencies in the same directory where it resides.
--- misc/mozilla/nsprpub/lib/libc/src/Makefile.in 2006-12-22 14:47:17.000000000 +0100
+++ misc/build/mozilla/nsprpub/lib/libc/src/Makefile.in 2008-08-14 16:22:21.000000000 +0200
-@@ -89,18 +89,22 @@
+@@ -89,18 +89,26 @@
OS_LIBS = -lc
endif
@@ -5846,6 +5858,10 @@
+MKSHLIB += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
+endif
+
++ifeq ($(OS_ARCH),FreeBSD)
++MKSHLIB += -Wl,-z,origin -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
++endif
++
ifeq ($(OS_ARCH),SunOS)
OS_LIBS = -lc
MAPFILE = $(OBJDIR)/plcmap.sun
@@ -6353,3 +6369,120 @@
clean clobber::
rm -rf $(DIST)/$(APP_NAME).app
+
+
+###################MAHO's FREEBSD PART###################
+--- misc/mozilla/gfx/src/gtk/Makefile.in 2007-10-08 21:09:58.000000000 +0200
++++ misc/build/mozilla/gfx/src/gtk/Makefile.in 2008-08-18 14:10:04.000000000 +0200
+@@ -207,7 +207,7 @@
+ EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS)
+ endif
+
+-EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_GTK_LDFLAGS) $(MOZ_XFT_LIBS) $(MOZ_GTK2_LIBS)
++EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_GTK_LDFLAGS) $(MOZ_XFT_LIBS) $(MOZ_GTK2_LIBS) -lpangox-1.0
+ CXXFLAGS += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS)
+ CFLAGS += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS)
+
+--- misc/mozilla/config/config.mk 2009-06-28 16:28:27.000000000 +0900
++++ misc/build/mozilla/config/config.mk 2009-06-28 16:18:04.000000000 +0900
+@@ -774,6 +774,13 @@
+ endif # IS_COMPONENT
+ endif # SunOS
+
++ifeq ($(OS_ARCH),FreeBSD)
++EXTRA_DSO_LDOPTS += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
++ifdef IS_COMPONENT
++EXTRA_DSO_LDOPTS += -Wl,-rpath,\$$ORIGIN/..:\$$ORIGIN/../../ure-link/lib
++endif # IS_COMPONENT
++endif # FreeBSD
++
+ #
+ # Include any personal overrides the user might think are needed.
+ #
+--- misc/mozilla/nsprpub/lib/ds/Makefile.in 2009-06-28 16:28:27.000000000 +0900
++++ misc/build/mozilla/nsprpub/lib/ds/Makefile.in 2009-06-28 16:22:16.000000000 +0900
+@@ -83,6 +83,10 @@
+ MKSHLIB += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
+ endif
+
++ifeq ($(OS_ARCH),FreeBSD)
++MKSHLIB += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
++endif
++
+ ifeq ($(OS_ARCH),SunOS)
+ OS_LIBS = -lc
+ MAPFILE = $(OBJDIR)/pldsmap.sun
+--- misc/mozilla/nsprpub/lib/libc/src/Makefile.in 2009-06-28 16:28:27.000000000 +0900
++++ misc/build/mozilla/nsprpub/lib/libc/src/Makefile.in 2009-06-28 16:23:31.000000000 +0900
+@@ -93,6 +93,10 @@
+ MKSHLIB += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
+ endif
+
++ifeq ($(OS_ARCH),FreeBSD)
++MKSHLIB += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
++endif
++
+ ifeq ($(OS_ARCH),SunOS)
+ OS_LIBS = -lc
+ MAPFILE = $(OBJDIR)/plcmap.sun
+--- misc/mozilla/security/coreconf/FreeBSD.mk 2009-06-28 16:28:27.000000000 +0900
++++ misc/build/mozilla/security/coreconf/FreeBSD.mk 2009-06-28 16:25:10.000000000 +0900
+@@ -52,6 +52,7 @@
+
+ DSO_CFLAGS = -fPIC
+ DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@)
++DSO_LDOPTS += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
++DSO_LDOPTS += -Wl,-z,origin -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
+
+ #
+ # The default implementation strategy for FreeBSD is pthreads.
@ -176,3 +190,5 @@ adding -lpangox-1.0 see http://www.openoffice.org/issues/show_bug.cgi?id=103772
+ void LDAP_CALL re_modw( char *s );
+ int LDAP_CALL re_subs( char *src, char *dst );
+ #else /* NEEDPROTOS */
+
+

20
editors/openoffice.org-3-devel/files/patch-i104014 Normal file
View File

@ -0,0 +1,20 @@
--- solenv/inc/unxfbsd.mk 2009-08-05 06:24:36.000000000 +0900
+++ solenv/inc/unxfbsd.mk 2009-08-05 09:20:06.000000000 +0900
@@ -141,12 +141,12 @@
# default linker flags
LINKFLAGSDEFS*=#-Wl,-z,defs
-LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\'
-LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
+LINKFLAGSRUNPATH_URELIB=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN'\'
+LINKFLAGSRUNPATH_UREBIN=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
#TODO: drop $ORIGIN once no URE executable is also shipped in OOo
-LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
-LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\'
-LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
+LINKFLAGSRUNPATH_OOO=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
+LINKFLAGSRUNPATH_SDK=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\'
+LINKFLAGSRUNPATH_BRAND=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
LINKFLAGSRUNPATH_OXT=
LINKFLAGSRUNPATH_NONE=
LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)

13
editors/openoffice.org-3-devel/files/patch-i104015 Normal file
View File

@ -0,0 +1,13 @@
origin support
--- stlport/STLport-4.5.patch~ 2009-07-23 10:00:59.000000000 +0900
+++ stlport/STLport-4.5.patch 2009-08-03 01:33:01.000000000 +0900
@@ -137,7 +137,7 @@
+#
+#
+LINK=ar cr
-+DYN_LINK=${CXX} -Wl,-rpath,'$$ORIGIN' ${PTHREAD_LIBS} --fexceptions -shared -o
++DYN_LINK=${CXX} -Wl,-z,origin -Wl,-rpath,'$$ORIGIN' ${PTHREAD_LIBS} --fexceptions -shared -o
+
+OBJEXT=o
+DYNEXT=so