From owner-freebsd-openoffice@FreeBSD.ORG Sat Aug 13 00:28:44 2005 Return-Path: X-Original-To: openoffice@freebsd.org Delivered-To: freebsd-openoffice@FreeBSD.ORG Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2350A16A41F for ; Sat, 13 Aug 2005 00:28:44 +0000 (GMT) (envelope-from chat95@mac.com) Received: from smtpout.mac.com (smtpout.mac.com [17.250.248.89]) by mx1.FreeBSD.org (Postfix) with ESMTP id A744043D60 for ; Sat, 13 Aug 2005 00:28:39 +0000 (GMT) (envelope-from chat95@mac.com) Received: from mac.com (smtpin08-en2 [10.13.10.153]) by smtpout.mac.com (Xserve/8.12.11/smtpout02/MantshX 4.0) with ESMTP id j7D0SdRf019657; Fri, 12 Aug 2005 17:28:39 -0700 (PDT) Received: from localhost ([133.11.172.102]) (authenticated bits=0) by mac.com (Xserve/smtpin08/MantshX 4.0) with ESMTP id j7D0SZXD008026; Fri, 12 Aug 2005 17:28:38 -0700 (PDT) Date: Sat, 13 Aug 2005 09:28:22 +0900 (JST) Message-Id: <20050813.092822.74692611.chat95@mac.com> To: openoffice@freebsd.org From: NAKATA Maho Organization: private X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Multipart/Mixed; boundary="--Next_Part(Sat_Aug_13_09:28:22_2005_697)--" Content-Transfer-Encoding: 7bit Cc: yury_t@openoffice.org Subject: OOo1.9m121 and 4.11 X-BeenThere: freebsd-openoffice@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting OpenOffice to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Aug 2005 00:28:44 -0000 ----Next_Part(Sat_Aug_13_09:28:22_2005_697)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Hi, attached patch is building OOo 1.9m121 for 4.11-RELEASE with rtld patch. you need perl5.8 from ports. -- NAKATA, Maho (maho@FreeBSD.org) ----Next_Part(Sat_Aug_13_09:28:22_2005_697)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="OOo-1.9m121.411-RELEASE.diff" ? diff ? patches ? files/patch-binfilter+bf_svx+util ? files/patch-rsc+source+rscpp+makefile.mk Index: Makefile =================================================================== RCS file: /home/pcvs/ports/editors/openoffice-2.0-devel/Makefile,v retrieving revision 1.195 diff -u -r1.195 Makefile --- Makefile 11 Aug 2005 03:14:41 -0000 1.195 +++ Makefile 13 Aug 2005 00:24:03 -0000 @@ -45,7 +45,10 @@ .include <${FILESDIR}/Makefile.localized> .if (${OSVERSION} < 503001 && ${OSVERSION} >= 500000) || (${OSVERSION} <= 492000) -BROKEN= "rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgrade your rtld" +#BROKEN= "rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgrade your rtld" +.endif +.if ${PERL_LEVEL} < 500600 +IGNORE= Port requires perl 5.6.x or later. Install lang/perl5.8 then try again .endif CODELINE= 680 @@ -163,7 +166,7 @@ @${MKDIR} ${WRKDIR}/tmp @for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \ ${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \ - cd ${WRKDIR}/tmp ; ${TAR} xf ${WRKDIR}/tmp/$$i ; \ + cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKDIR}/tmp/$$i ; \ done @${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR} @cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR} Index: files/Makefile.others =================================================================== RCS file: /home/pcvs/ports/editors/openoffice-2.0-devel/files/Makefile.others,v retrieving revision 1.1 diff -u -r1.1 Makefile.others --- files/Makefile.others 2 Jul 2005 11:26:09 -0000 1.1 +++ files/Makefile.others 13 Aug 2005 00:24:03 -0000 @@ -30,7 +30,7 @@ @${RM} -fr ${WRKDIR}/ure_tmp @${MKDIR} ${WRKDIR}/ure_tmp @cd ${WRKDIR}/ure_tmp ; \ - ${TAR} xf ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_ure/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.tgz + ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/URE/install/${LOCALIZED_LANG}/freebsd-*/openoffice*org-*.tgz @cd ${WRKDIR}/ure_tmp/opt/openoffice* ; \ ${MKDIR} ../${INSTALLATION_BASEDIR} ; \ ${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \ @@ -53,7 +53,7 @@ @${MKDIR} ${WRKDIR}/langpack_tmp .if defined (LOCALIZED_LANG) @cd ${WRKDIR}/langpack_tmp ; \ - ${TAR} xf ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.tgz + ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openoffice*org-*.tgz @cd ${WRKDIR}/langpack_tmp/opt/openoffice* ; \ ${MKDIR} ../${INSTALLATION_BASEDIR} ; \ ${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \ --- /dev/null Sat Aug 13 09:22:24 2005 +++ files/patch-rsc+source+rscpp+makefile.mk Fri Aug 12 13:32:25 2005 @@ -0,0 +1,36 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author: : (JCA) +Description : +rsc/rscpp should link against -lc_r for FreeBSD 4. otherwise, +libstlport_gcc.so which claims `Undefined symbol "pthread_mutex_lock"'. +rsc indirectly should link against -pthread via libstlport_gcc.so. + +rsc -presponse @/tmp/mkdT8IKc +/usr/libexec/ld-elf.so.1: /work/ports/editors/openoffice-2.0-devel/work/solver/680/unxfbsd.pro/lib/libstlport_gcc.so: Undefined symbol "pthread_mutex_lock" +VCL Resource Compiler 3.0 +Preprocessor commandline: -I. -I. -I. -I../inc -I../../inc -I../../unx/inc -I../../unxfbsd.pro/inc -I. -I/work/ports/editors/openoffice-2.0-devel/work/solver/680/unxfbsd.pro/inc/stl -I/work/ports/editors/openoffice-2.0-devel/work/solver/680/unxfbsd.pro/inc/external -I/work/ports/editors/openoffice-2.0-devel/work/solver/680/unxfbsd.pro/inc -I/work/ports/editors/openoffice-2.0-devel/work/solenv/unxfbsd/inc -I/work/ports/editors/openoffice-2.0-devel/work/solenv/inc -I/work/ports/editors/openoffice-2.0-devel/work/res -I/work/ports/editors/openoffice-2.0-devel/work/solver/680/unxfbsd.pro/inc/stl -I/work/ports/editors/openoffice-2.0-devel/work/solenv/inc/Xp31 -I/usr/local/jdk1.4.2/include -I/usr/local/jdk1.4.2/include/freebsd -I/usr/local/jdk1.4.2/include/bsd -I/usr/local/jdk1.4.2/include/native_threads/include -I/usr/X11R6/include -I. -I../../res -I. -DUNX -DVCL -DGCC -DC300 -DSUPD=680 -DSOLAR_JAVA -DPRODUCT -DPRODUCT_FULL -DNDEBUG -DOSL_DEBUG_LEVEL=0 -DUPDVER="680m121(Build:89! 39)" .! ./../unxfbsd.pro/misc/svsrc/images.src /var/tmp/8yqh5S +Preprocessor startline: rscpp @/var/tmp/7I3r5B +Error starting preprocessor +dmake: Error code 1, while making '../../unxfbsd.pro/srs/svsrc.srs' +'---* tg_merge.mk *---' + +ERROR: Error 65280 occurred while making /work/ports/editors/openoffice-2.0-devel/work/vcl/source/src +s/editors/openoffice-2.0-devel/work/ucb/source/ucp/file + +Index: rsc/source/rscpp/makefile.mk +=================================================================== +RCS file: /cvs/gsl/rsc/source/rscpp/makefile.mk,v +retrieving revision 1.4 +diff -u -r1.4 makefile.mk +--- rsc/source/rscpp/makefile.mk 14 Dec 2004 14:36:47 -0000 1.4 ++++ rsc/source/rscpp/makefile.mk 11 Aug 2005 13:20:46 -0000 +@@ -62,7 +62,7 @@ + PRJ=..$/.. + + TARGETTYPE=CUI +-TARGETTHREAD=ST ++TARGETTHREAD=MT + + PRJNAME=rsc + TARGET=rscpp ----Next_Part(Sat_Aug_13_09:28:22_2005_697)----