summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorMaho Nakata <maho@FreeBSD.org>2005-08-28 08:29:56 +0000
committerMaho Nakata <maho@FreeBSD.org>2005-08-28 08:29:56 +0000
commit7756c4ae4af8b8a5c430bc82a252954ffda2801f (patch)
treec6f900223b8c51f80d6c5bca2e31032f072cfa0b /editors
parentUpdate to 2.2.6.1. (diff)
1. remove duplicated helpcontent_01.tgz in DISTFILES
section 2. update to SRX645_m75 of 20050816 version (base of rc3) 3. add #i22253# (bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx) patch to make it work 4. No longer needs DISPLAYHACK 5. better generate.pl
Notes
Notes: svn path=/head/; revision=141050
Diffstat (limited to 'editors')
-rw-r--r--editors/openoffice-1.1-devel/Makefile15
-rw-r--r--editors/openoffice-1.1-devel/distinfo4
-rw-r--r--editors/openoffice-1.1-devel/files/generate.pl10
-rw-r--r--editors/openoffice-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+except.cxx21
-rw-r--r--editors/openoffice.org-1.1-devel/Makefile15
-rw-r--r--editors/openoffice.org-1.1-devel/distinfo4
-rw-r--r--editors/openoffice.org-1.1-devel/files/generate.pl10
-rw-r--r--editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+except.cxx21
8 files changed, 72 insertions, 28 deletions
diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile
index 44e904a93e85..65586ccf635c 100644
--- a/editors/openoffice-1.1-devel/Makefile
+++ b/editors/openoffice-1.1-devel/Makefile
@@ -18,8 +18,8 @@ MASTER_SITES+= ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/contrib/helpcontent/:help \
http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \
ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/Files/:help2
-DISTFILES+= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 gpc231.tar.Z:gpc
-EXTRACT_ONLY= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
+DISTFILES+= OOo_${RELEASE_NR}m${MILESTONE}.${SNAPDATE}_source.tar.bz2 gpc231.tar.Z:gpc
+EXTRACT_ONLY= OOo_${RELEASE_NR}m${MILESTONE}.${SNAPDATE}_source.tar.bz2
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
@@ -40,6 +40,7 @@ USE_BISON= yes
USE_GMAKE= yes
USE_REINPLACE= yes
USE_BZIP2= yes
+WITHOUT_CPU_CFLAGS= true
.if !defined(WITHOUT_JAVA)
USE_JAVA= yes
@@ -60,7 +61,7 @@ L10NHELP?= helpcontent_01_unix.tgz
DISTFILES+= ${L10NHELP}:help
.if defined(ALL_LOCALIZED_LANGS)
-DISTFILES+= helpcontent_01_unix.tgz:help helpcontent_07_unix.tgz:help3 \
+DISTFILES+= helpcontent_07_unix.tgz:help3 \
helpcontent_31_unix.tgz:help helpcontent_33_unix.tgz:help \
helpcontent_34_unix.tgz:help helpcontent_39_unix.tgz:help \
helpcontent_42_unix.tgz:help2 helpcontent_43_unix.tgz:help2 \
@@ -83,7 +84,7 @@ L10NHELPS= helpcontent_01_unix.tgz helpcontent_07_unix.tgz \
CODELINE= 645
RELEASE_NR= 1.1.5
MILESTONE= 57
-SNAPDATE= 20050705
+SNAPDATE= 20050816
INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR}
EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
DIST_SUBDIR= openoffice.org1.1
@@ -122,7 +123,6 @@ TCSH?= /bin/tcsh
PKGMESSAGE= ${WRKDIR}/pkg-message
NUMOFPROCESSES?= 1
-DISPLAYHACK=localhost:1001
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --enable-pasf
.include <${FILESDIR}/Makefile.knobs>
@@ -174,10 +174,11 @@ do-build:
.endif
@${MKDIR} ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/pck
@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/pck
+# PR:84786
.if (${NUMOFPROCESSES}>1)
- @cd ${WRKSRC} ; DISPLAY=${DISPLAYHACK} ; ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo ; build.pl -P${NUMOFPROCESSES} --all"
+ @cd ${WRKSRC} ; ${SETENV} "LC_ALL=C" "LANG=C" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo ; build.pl -P${NUMOFPROCESSES} --all"
.else
- @cd ${WRKSRC} ; DISPLAY=${DISPLAYHACK} ; ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
+ @cd ${WRKSRC} ; ${SETENV} "LC_ALL=C" "LANG=C" ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
.endif
do-install:
diff --git a/editors/openoffice-1.1-devel/distinfo b/editors/openoffice-1.1-devel/distinfo
index 1e663c90bc42..db07b01e53d1 100644
--- a/editors/openoffice-1.1-devel/distinfo
+++ b/editors/openoffice-1.1-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org1.1/OOo_1.1.5m57_source.tar.bz2) = 9ee08dcf31fbbc6623b89769cdcad561
-SIZE (openoffice.org1.1/OOo_1.1.5m57_source.tar.bz2) = 200468084
+MD5 (openoffice.org1.1/OOo_1.1.5m57.20050816_source.tar.bz2) = 7a53ddcb6f4826a86992a0d23f1bb31b
+SIZE (openoffice.org1.1/OOo_1.1.5m57.20050816_source.tar.bz2) = 200486546
MD5 (openoffice.org1.1/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice.org1.1/gpc231.tar.Z) = 27917
MD5 (openoffice.org1.1/cws_srx645_mozooo.20040203.tar.gz) = 1239aad43c65d6808b6261ea9d60fb67
diff --git a/editors/openoffice-1.1-devel/files/generate.pl b/editors/openoffice-1.1-devel/files/generate.pl
index fefeb8158d98..9c958192fc6c 100644
--- a/editors/openoffice-1.1-devel/files/generate.pl
+++ b/editors/openoffice-1.1-devel/files/generate.pl
@@ -1,12 +1,13 @@
#!/usr/bin/perl
-
# generate full build shell script for OpenOffice.org
# Whom: Maho Nakata <maho@FreeBSD.org>
# $FreeBSD$
print "#!/bin/csh\n";
-print "/usr/bin/time make WITH_CCACHE=yes deinstall clean package package-rename solver sdk deinstall clean >& log.en\n";
-print "/usr/bin/time make ALL_LOCALIZED_LANGS=yes >& log.all\n";
+print "make deinstall clean\n";
+print "/usr/bin/time -h make WITH_CCACHE=yes install package package-rename solver sdk deinstall clean >& log.en\n";
+print "rm work/.configure* work/.build* \n";
+print "/usr/bin/time -h make ALL_LOCALIZED_LANGS=yes >& log.all\n";
open ( FILE, "< Makefile.localized") ;
while(<FILE>){
@@ -14,8 +15,7 @@ while(<FILE>){
@tmp2=split ('"',$tmp[3]);
if ( $tmp[1] eq "\${LOCALIZED_LANG}") { $LANG=$tmp2[1];
print "make TWEAK_L10N=yes LOCALIZED_LANG=$LANG pre-everything\n";
- print "/usr/bin/time make LOCALIZED_LANG=$LANG WITH_CCACHE=yes deinstall package package-rename deinstall >& log.$LANG\n";
+ print "/usr/bin/time -h make LOCALIZED_LANG=$LANG WITH_CCACHE=yes package package-rename deinstall >& log.$LANG\n";
}
}
close FILE;
-
diff --git a/editors/openoffice-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+except.cxx b/editors/openoffice-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+except.cxx
new file mode 100644
index 000000000000..11088e05cd62
--- /dev/null
+++ b/editors/openoffice-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+except.cxx
@@ -0,0 +1,21 @@
+Issutracker : #i22253#
+CWS : N/A
+Author : <mrauch@openoffice.org> (JCA)
+Description :
+
+Index: bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx
+===================================================================
+RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx,v
+retrieving revision 1.4
+diff -u -r1.4 except.cxx
+--- bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 28 Apr 2003 16:41:25 -0000 1.4
++++ bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 13 Aug 2005 04:40:14 -0000
+@@ -182,7 +182,7 @@
+ buf.append( 'E' );
+
+ OString symName( buf.makeStringAndClear() );
+- rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
++ rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
+
+ if (rtti)
+ {
diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile
index 44e904a93e85..65586ccf635c 100644
--- a/editors/openoffice.org-1.1-devel/Makefile
+++ b/editors/openoffice.org-1.1-devel/Makefile
@@ -18,8 +18,8 @@ MASTER_SITES+= ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/contrib/helpcontent/:help \
http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \
ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/Files/:help2
-DISTFILES+= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 gpc231.tar.Z:gpc
-EXTRACT_ONLY= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
+DISTFILES+= OOo_${RELEASE_NR}m${MILESTONE}.${SNAPDATE}_source.tar.bz2 gpc231.tar.Z:gpc
+EXTRACT_ONLY= OOo_${RELEASE_NR}m${MILESTONE}.${SNAPDATE}_source.tar.bz2
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
@@ -40,6 +40,7 @@ USE_BISON= yes
USE_GMAKE= yes
USE_REINPLACE= yes
USE_BZIP2= yes
+WITHOUT_CPU_CFLAGS= true
.if !defined(WITHOUT_JAVA)
USE_JAVA= yes
@@ -60,7 +61,7 @@ L10NHELP?= helpcontent_01_unix.tgz
DISTFILES+= ${L10NHELP}:help
.if defined(ALL_LOCALIZED_LANGS)
-DISTFILES+= helpcontent_01_unix.tgz:help helpcontent_07_unix.tgz:help3 \
+DISTFILES+= helpcontent_07_unix.tgz:help3 \
helpcontent_31_unix.tgz:help helpcontent_33_unix.tgz:help \
helpcontent_34_unix.tgz:help helpcontent_39_unix.tgz:help \
helpcontent_42_unix.tgz:help2 helpcontent_43_unix.tgz:help2 \
@@ -83,7 +84,7 @@ L10NHELPS= helpcontent_01_unix.tgz helpcontent_07_unix.tgz \
CODELINE= 645
RELEASE_NR= 1.1.5
MILESTONE= 57
-SNAPDATE= 20050705
+SNAPDATE= 20050816
INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR}
EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
DIST_SUBDIR= openoffice.org1.1
@@ -122,7 +123,6 @@ TCSH?= /bin/tcsh
PKGMESSAGE= ${WRKDIR}/pkg-message
NUMOFPROCESSES?= 1
-DISPLAYHACK=localhost:1001
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --enable-pasf
.include <${FILESDIR}/Makefile.knobs>
@@ -174,10 +174,11 @@ do-build:
.endif
@${MKDIR} ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/pck
@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/pck
+# PR:84786
.if (${NUMOFPROCESSES}>1)
- @cd ${WRKSRC} ; DISPLAY=${DISPLAYHACK} ; ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo ; build.pl -P${NUMOFPROCESSES} --all"
+ @cd ${WRKSRC} ; ${SETENV} "LC_ALL=C" "LANG=C" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo ; build.pl -P${NUMOFPROCESSES} --all"
.else
- @cd ${WRKSRC} ; DISPLAY=${DISPLAYHACK} ; ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
+ @cd ${WRKSRC} ; ${SETENV} "LC_ALL=C" "LANG=C" ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
.endif
do-install:
diff --git a/editors/openoffice.org-1.1-devel/distinfo b/editors/openoffice.org-1.1-devel/distinfo
index 1e663c90bc42..db07b01e53d1 100644
--- a/editors/openoffice.org-1.1-devel/distinfo
+++ b/editors/openoffice.org-1.1-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org1.1/OOo_1.1.5m57_source.tar.bz2) = 9ee08dcf31fbbc6623b89769cdcad561
-SIZE (openoffice.org1.1/OOo_1.1.5m57_source.tar.bz2) = 200468084
+MD5 (openoffice.org1.1/OOo_1.1.5m57.20050816_source.tar.bz2) = 7a53ddcb6f4826a86992a0d23f1bb31b
+SIZE (openoffice.org1.1/OOo_1.1.5m57.20050816_source.tar.bz2) = 200486546
MD5 (openoffice.org1.1/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice.org1.1/gpc231.tar.Z) = 27917
MD5 (openoffice.org1.1/cws_srx645_mozooo.20040203.tar.gz) = 1239aad43c65d6808b6261ea9d60fb67
diff --git a/editors/openoffice.org-1.1-devel/files/generate.pl b/editors/openoffice.org-1.1-devel/files/generate.pl
index fefeb8158d98..9c958192fc6c 100644
--- a/editors/openoffice.org-1.1-devel/files/generate.pl
+++ b/editors/openoffice.org-1.1-devel/files/generate.pl
@@ -1,12 +1,13 @@
#!/usr/bin/perl
-
# generate full build shell script for OpenOffice.org
# Whom: Maho Nakata <maho@FreeBSD.org>
# $FreeBSD$
print "#!/bin/csh\n";
-print "/usr/bin/time make WITH_CCACHE=yes deinstall clean package package-rename solver sdk deinstall clean >& log.en\n";
-print "/usr/bin/time make ALL_LOCALIZED_LANGS=yes >& log.all\n";
+print "make deinstall clean\n";
+print "/usr/bin/time -h make WITH_CCACHE=yes install package package-rename solver sdk deinstall clean >& log.en\n";
+print "rm work/.configure* work/.build* \n";
+print "/usr/bin/time -h make ALL_LOCALIZED_LANGS=yes >& log.all\n";
open ( FILE, "< Makefile.localized") ;
while(<FILE>){
@@ -14,8 +15,7 @@ while(<FILE>){
@tmp2=split ('"',$tmp[3]);
if ( $tmp[1] eq "\${LOCALIZED_LANG}") { $LANG=$tmp2[1];
print "make TWEAK_L10N=yes LOCALIZED_LANG=$LANG pre-everything\n";
- print "/usr/bin/time make LOCALIZED_LANG=$LANG WITH_CCACHE=yes deinstall package package-rename deinstall >& log.$LANG\n";
+ print "/usr/bin/time -h make LOCALIZED_LANG=$LANG WITH_CCACHE=yes package package-rename deinstall >& log.$LANG\n";
}
}
close FILE;
-
diff --git a/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+except.cxx b/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+except.cxx
new file mode 100644
index 000000000000..11088e05cd62
--- /dev/null
+++ b/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+except.cxx
@@ -0,0 +1,21 @@
+Issutracker : #i22253#
+CWS : N/A
+Author : <mrauch@openoffice.org> (JCA)
+Description :
+
+Index: bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx
+===================================================================
+RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx,v
+retrieving revision 1.4
+diff -u -r1.4 except.cxx
+--- bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 28 Apr 2003 16:41:25 -0000 1.4
++++ bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 13 Aug 2005 04:40:14 -0000
+@@ -182,7 +182,7 @@
+ buf.append( 'E' );
+
+ OString symName( buf.makeStringAndClear() );
+- rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
++ rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
+
+ if (rtti)
+ {
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-04 13:04:50 +0000