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

Update to DEV300_m55.

Browse Source 
Funded by: OpenOffice.org community
This commit is contained in:
Maho Nakata 2009-08-20 11:58:48 +00:00
parent ade29b187e
commit 5b4eec4046
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=239988
8 changed files with 10 additions and 128 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?= 54
MILESTONE?= 55
OOOTAG?= DEV300_m${MILESTONE}
OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX}
OOODIR= openoffice.org3
SNAPDATE= 20090805
SNAPDATE= 20090820
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_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/OOo_DEV300_m55_source.tar.bz2) = aeeb305253c19263a69a5f4485082704
SHA256 (openoffice.org3/OOo_DEV300_m55_source.tar.bz2) = c4592fd512ad8951b25cc3e6c90a62c0a216e9caf31280a317c38977d1248647
SIZE (openoffice.org3/OOo_DEV300_m55_source.tar.bz2) = 420122268
MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice.org3/unowinreg.dll) = 6144

10
editors/openoffice-3-devel/files/patch-i100443
View File

@ -1,10 +0,0 @@
--- solenv.org/bin/modules/installer/parameter.pm 2009-03-21 12:59:38.000000000 +0900
+++ solenv/bin/modules/installer/parameter.pm 2009-03-21 14:32:31.000000000 +0900
@@ -297,6 +297,7 @@
{
if ( $installer::globals::packageformat eq "bsd" )
{
+ $installer::globals::epmoutpath = "freebsd";
$installer::globals::isfreebsdpkgbuild = 1;
}
}

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

@ -1,49 +0,0 @@
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"

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?= 54
MILESTONE?= 55
OOOTAG?= DEV300_m${MILESTONE}
OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX}
OOODIR= openoffice.org3
SNAPDATE= 20090805
SNAPDATE= 20090820
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_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/OOo_DEV300_m55_source.tar.bz2) = aeeb305253c19263a69a5f4485082704
SHA256 (openoffice.org3/OOo_DEV300_m55_source.tar.bz2) = c4592fd512ad8951b25cc3e6c90a62c0a216e9caf31280a317c38977d1248647
SIZE (openoffice.org3/OOo_DEV300_m55_source.tar.bz2) = 420122268
MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice.org3/unowinreg.dll) = 6144

10
editors/openoffice.org-3-devel/files/patch-i100443
View File

@ -1,10 +0,0 @@
--- solenv.org/bin/modules/installer/parameter.pm 2009-03-21 12:59:38.000000000 +0900
+++ solenv/bin/modules/installer/parameter.pm 2009-03-21 14:32:31.000000000 +0900
@@ -297,6 +297,7 @@
{
if ( $installer::globals::packageformat eq "bsd" )
{
+ $installer::globals::epmoutpath = "freebsd";
$installer::globals::isfreebsdpkgbuild = 1;
}
}

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

@ -1,49 +0,0 @@
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"