From 9ca44e7f2fe73c4c7c900f35202e85b5a65dff70 Mon Sep 17 00:00:00 2001 From: Maho Nakata Date: Sun, 28 Aug 2005 08:25:09 +0000 Subject: 1. remove duplicated helpcontent_01.tgz in DISTFILES section 2. LC_ALL and LANG are C for building[1] 3. do not pass CPUTYPE, as in some environment build fails and basically ignores (this port doesn't honor CFLAGS etc) 4. adding memo for localized languages [2] 5. SDK is now buildable 6. change russian translation patch so as to apply much easier 7. helpcontent_31_unix.tgz does not exist, but 30. PR: 84786 [1] 83502 [2] Submitted by : achix mantzix[1] and Harald Schmalzbauer[2] --- editors/openoffice-1.0/Makefile | 70 ++++++++++++-------- editors/openoffice-1.0/distinfo | 4 +- editors/openoffice-1.0/files/Makefile.knobs | 14 ++++ editors/openoffice-1.0/files/Makefile.localized | 1 - editors/openoffice-1.0/files/generate.pl | 12 ++-- .../files/patch-config_office+setsoenv.in | 77 +++++++++++++++++++++- .../files/patch-odk+pack+copying+makefile.mk | 15 +++++ .../files/patch-odk+source+OOSupport+makefile.mk | 14 ++++ .../patch-odk+source+bean+native+unix+makefile.mk | 21 ++++++ .../files/patch-odk+util+makefile.pmk | 31 +++++++++ .../files/patch-product+settings+settings.mk | 4 +- .../files/patch-solenv+inc+unitools.mk | 16 +++++ editors/openoffice-1.0/files/pkg-message.in | 25 ++++--- 13 files changed, 250 insertions(+), 54 deletions(-) create mode 100644 editors/openoffice-1.0/files/patch-odk+pack+copying+makefile.mk create mode 100644 editors/openoffice-1.0/files/patch-odk+source+OOSupport+makefile.mk create mode 100644 editors/openoffice-1.0/files/patch-odk+source+bean+native+unix+makefile.mk create mode 100644 editors/openoffice-1.0/files/patch-odk+util+makefile.pmk create mode 100644 editors/openoffice-1.0/files/patch-solenv+inc+unitools.mk (limited to 'editors/openoffice-1.0') diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile index 5c0aa3923496..0695522d7369 100644 --- a/editors/openoffice-1.0/Makefile +++ b/editors/openoffice-1.0/Makefile @@ -7,7 +7,7 @@ PORTNAME= openoffice PORTVERSION= 1.0.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES+= editors MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/${PORTVERSION}/&,} \ ${MASTER_SITE_LOCAL:S,%SUBDIR%,maho/openoffice.org/&,}:moz \ @@ -16,8 +16,8 @@ MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/${POR ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/contrib/helpcontent-1.0/&,}:help \ ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/contrib/helpcontent-1.0/:help \ http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent-1.0/:help \ - http://people.freebsd.org/~mbr/ooo/:mbr -DISTFILES+= OOo_${RELEASE_NR}_source.tar.gz gpc231.tar.Z:gpc patch-translation-ru-1.0.3.bz2:mbr + ${MASTER_SITE_LOCAL:S,%SUBDIR%,maho/openoffice.org/&,}:ru +DISTFILES+= OOo_${RELEASE_NR}_source.tar.gz gpc231.tar.Z:gpc patch-translation-ru-1.0.3.bz2:ru EXTRACT_ONLY= OOo_${RELEASE_NR}_source.tar.gz MAINTAINER= openoffice@FreeBSD.org @@ -37,6 +37,7 @@ USE_JAVA= yes JAVA_VERSION= 1.3 JAVA_BUILD= jdk NO_LATEST_LINK= yes +WITHOUT_CPU_CFLAGS= true .include .include <${FILESDIR}/Makefile.localized> @@ -47,15 +48,15 @@ L10NHELP?= helpcontent_01_unix.tgz DISTFILES+= ${L10NHELP}:help .if defined(ALL_LOCALIZED_LANGS) -DISTFILES+= helpcontent_01_unix.tgz:help helpcontent_07_unix.tgz:help \ - helpcontent_31_unix.tgz:help helpcontent_33_unix.tgz:help \ +DISTFILES+= helpcontent_07_unix.tgz:help \ + helpcontent_30_unix.tgz:help helpcontent_33_unix.tgz:help \ helpcontent_34_unix.tgz:help helpcontent_35_unix.tgz:help \ helpcontent_39_unix.tgz:help helpcontent_42_unix.tgz:help \ helpcontent_46_unix.tgz:help helpcontent_49_unix.tgz:help \ helpcontent_81_unix.tgz:help helpcontent_82_unix.tgz:help \ helpcontent_86_unix.tgz:help helpcontent_88_unix.tgz:help L10NHELPS= helpcontent_01_unix.tgz helpcontent_07_unix.tgz \ - helpcontent_31_unix.tgz helpcontent_33_unix.tgz \ + helpcontent_30_unix.tgz helpcontent_33_unix.tgz \ helpcontent_34_unix.tgz helpcontent_35_unix.tgz \ helpcontent_39_unix.tgz helpcontent_42_unix.tgz \ helpcontent_46_unix.tgz helpcontent_49_unix.tgz \ @@ -69,7 +70,7 @@ INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR} EXECBASE= openoffice.org-${RELEASE_NR} DIST_SUBDIR= openoffice.org1.0 SIMPLEOSVER= ${OSREL:C/\.//g} -PACKAGE_BASENAME= OOo_${RELEASE_NR}m${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel +PACKAGE_BASENAME= OOo_${RELEASE_NR}_${OPSYS}${SIMPLEOSVER}Intel DICT_DIR= ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/ # FIXME (Somehow INDEX build fails) @@ -94,7 +95,9 @@ CXX= g++32 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip \ imake:${X_IMAKE_PORT} \ - Xvfb:${X_VFBSERVER_PORT} + gcp:${PORTSDIR}/sysutils/coreutils \ + Xvfb:${X_VFBSERVER_PORT} \ + ${X11BASE}/lib/X11/fonts/misc/cursor.pcf.gz:${X_FONTS_MISC_PORT} GNU_CONFIGURE= yes USE_AUTOCONF_VER= 253 WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src @@ -129,12 +132,10 @@ post-extract: .if defined(WITH_TTF_BYTECODE_ENABLED) @cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/optpatch-freetype .endif -#fix for gnome/kde wrapper - #${REINPLACE_CMD} -e 's|"Exec", "\\"\/program/|"Exec", "\\"${PREFIX}/bin/openoffice.org-|' ${WRKSRC}/sysui/oounix/office/kde2/kdeint - #${REINPLACE_CMD} -e 's|"Exec", "/program/|"Exec", "${PREFIX}/bin/openoffice.org-|' ${WRKSRC}/sysui/oounix/office/gnome/gnomeint -#Russian and Ukrainian support - #cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/patch-support-RU-1.0.3.bz2 | ${BUNZIP2} - #cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/patch-support-UA-1.0.3.bz2 | ${BUNZIP2} +#XXX not yet: fix for gnome/kde wrapper + @#${REINPLACE_CMD} -e 's|"Exec", "\\"\/program/|"Exec", "\\"${PREFIX}/bin/openoffice.org-|' ${WRKSRC}/sysui/oounix/office/kde2/kdeint + @#${REINPLACE_CMD} -e 's|"Exec", "/program/|"Exec", "${PREFIX}/bin/openoffice.org-|' ${WRKSRC}/sysui/oounix/office/gnome/gnomeint + @cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/patch-translation-ru-1.0.3.bz2 | ${BZIP2_CMD} | ${PATCH} @cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz - @${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/external/gpc/ @${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/external/gpc/ @@ -153,9 +154,16 @@ post-extract: @${MKDIR} ${WRKSRC}/moz/download @${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download +post-patch: +#patch for SDK + @${REINPLACE_CMD} 's|%%GNUTR%%|${LOCALBASE}/bin/gtr|g' ${WRKSRC}/odk/util/makefile.pmk + @${REINPLACE_CMD} 's|%%GNUCOPY%%|${LOCALBASE}/bin/gcp|g' ${WRKSRC}/solenv/inc/unitools.mk + ${REINPLACE_CMD} -e 's|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|g' \ + -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' \ + ${WRKSRC}/product/settings/settings.mk do-build: - cd ${WRKSRC} ; ./bootstrap - cd ${WRKSRC}/moz ; ${SETENV} "BUILD_MOZAB=TRUE" ${TCSH} -c 'source ../FreeBSDEnv.Set ; build.pl ; dmake zip' ; ${CP} unxfbsd.pro/zipped/FREEBSD*.zip ../moz/zipped + @cd ${WRKSRC} ; ./bootstrap + @cd ${WRKSRC}/moz ; ${SETENV} "BUILD_MOZAB=TRUE" ${TCSH} -c 'source ../FreeBSDEnv.Set ; build.pl ; dmake zip' ; ${CP} unxfbsd.pro/zipped/FREEBSD*.zip ../moz/zipped @${MKDIR} ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/pck @${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/pck .if exists(${WRKDIR}/.Xvfb.pid) @@ -164,21 +172,21 @@ do-build: .endif ${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid @sleep 5 - cd ${WRKSRC} && DISPLAY=${DISPLAYHACK} ${TCSH} -c 'source FreeBSDEnv.Set ; ${BUILD}' - -${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill - ${RM} -f ${WRKDIR}/.Xvfb.pid + @cd ${WRKSRC} ; ${SETENV} "LC_ALL=C" "LANG=C" DISPLAY=${DISPLAYHACK} ${TCSH} -c 'source FreeBSDEnv.Set ; ${BUILD}' + @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill + @${RM} -f ${WRKDIR}/.Xvfb.pid do-install: .if exists(${WRKDIR}/.Xvfb.pid) @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill @${RM} -f ${WRKDIR}/.Xvfb.pid .endif - ${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid + @${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid @sleep 5 - ${SETENV} DISPLAY=${DISPLAYHACK} ${TCSH} -c "cd ${WRKSRC}/instsetoo/*.pro/${LANG_EXT}/normal ; ./install --prefix=${PREFIX}" + @${SETENV} "LC_ALL=C" "LANG=C" DISPLAY=${DISPLAYHACK} ${TCSH} -c "cd ${WRKSRC}/instsetoo/*.pro/${LANG_EXT}/normal ; ./install --prefix=${PREFIX}" @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill @${RM} -f ${WRKDIR}/.Xvfb.pid -#temporary hack (contains space in dir name) +#XXX temporary hack (contains space in dir name) @${RM} -rf ${PREFIX}/${INSTALLATION_BASEDIR}/share/kde/net/applnk install-user: @@ -228,17 +236,23 @@ package-rename: @${MV} ${PKGFILE} \ ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}${PKG_SUFX} .elif defined(LANG_PKGNAME) - @${MV} ${PKGFILE} \ - ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_install_${LANG_PKGNAME}${PKG_SUFX} + @${MV} ${PKGFILE} ${WRKDIR}/../${PACKAGE_BASENAME}_install_${LANG_PKGNAME}${PKG_SUFX} .else - @${MV} ${PKGFILE} \ - ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_install${PKG_SUFX} + @${MV} ${PKGFILE} ${WRKDIR}/../${PACKAGE_BASENAME}_install${PKG_SUFX} .endif sdk: @${ECHO_MSG} "===> Make SDK of OpenOffice.org" - @cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd sdk_oo ; build.pl ; deliver.pl' - @${MV} ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/bin/OpenOffice.org${RELEASE_NR}_SDK.tar.gz ${WRKDIR}/../${PACKAGE_BASENAME}_sdk.tar.gz + @cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd odk/source/bean/native/unix ; dmake ; deliver.pl' + @cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd odk/source/bean/com/sun/star/beans ; dmake ; deliver.pl' + @cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd netbeans_integration ; build.pl ; deliver.pl' + @cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd odk/source/OOSupport ; dmake ; deliver.pl' + @${MKDIR} -p ${WRKSRC}/odk/unxfbsd.pro/bin/OpenOffice.org1.0.2SDK/freebsd/lib + @${TOUCH} ${WRKSRC}/odk/unxfbsd.pro/misc/deltree.txt + @cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd odk/pack/copying ; dmake ; deliver.pl' + @cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd odk/util ; dmake ; deliver.pl' +#somehow SDK's version is 1.0.2 and not 1.0.3 + ${MV} ${WRKSRC}/odk/unxfbsd.pro/bin/OpenOffice.org1.0.2SDK.tar.gz ${WRKDIR}/../${PACKAGE_BASENAME}_sdk.tar.gz solver: @${ECHO_MSG} "===> Make Solver of OpenOffice.org" diff --git a/editors/openoffice-1.0/distinfo b/editors/openoffice-1.0/distinfo index c3447d1583f4..8eba392fe967 100644 --- a/editors/openoffice-1.0/distinfo +++ b/editors/openoffice-1.0/distinfo @@ -2,8 +2,8 @@ MD5 (openoffice.org1.0/OOo_1.0.3_source.tar.gz) = e85acb04b2906a460dfdd19a309c1a SIZE (openoffice.org1.0/OOo_1.0.3_source.tar.gz) = 184856160 MD5 (openoffice.org1.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SIZE (openoffice.org1.0/gpc231.tar.Z) = 27917 -MD5 (openoffice.org1.0/patch-translation-ru-1.0.3.bz2) = 696b55641c353b995922fba7da160f14 -SIZE (openoffice.org1.0/patch-translation-ru-1.0.3.bz2) = 10628 +MD5 (openoffice.org1.0/patch-translation-ru-1.0.3.bz2) = 2b8091f8fe3201c6763715f6eb3872f4 +SIZE (openoffice.org1.0/patch-translation-ru-1.0.3.bz2) = 11247 MD5 (openoffice.org1.0/cws_srx645_mozooo.20040203.tar.gz) = 1239aad43c65d6808b6261ea9d60fb67 SIZE (openoffice.org1.0/cws_srx645_mozooo.20040203.tar.gz) = 39708 MD5 (openoffice.org1.0/mozilla-source-1.0.tar.gz) = 35a7524c2fbb773e23449179c5cb1f20 diff --git a/editors/openoffice-1.0/files/Makefile.knobs b/editors/openoffice-1.0/files/Makefile.knobs index fd0e3da1125f..a62166a46a40 100644 --- a/editors/openoffice-1.0/files/Makefile.knobs +++ b/editors/openoffice-1.0/files/Makefile.knobs @@ -13,6 +13,12 @@ BUILD= dmake strip="true" CONFIGURE_ARGS+= --enable-debug .endif +.if defined(ALL_LOCALIZED_LANGS) +CONFIGURE_ARGS+= --with-lang=ALL +.else +CONFIGURE_ARGS+= --with-lang=${LANG_CONFIGURE_ARG} +.endif + pre-fetch: @${ECHO} @${ECHO} "OPTIONS:" @@ -25,6 +31,14 @@ pre-fetch: @${ECHO} "OO.org debug support." @${ECHO} .endif +.if !defined(LOCALIZED_LANG) + @${ECHO} + @${ECHO} "You can select the language for OOo by making it with 'make LOCALIZED_LANG=xx'" + @${ECHO} "while xx can be one of the following:" + @${ECHO} "ar de dk el es fr it ja ko nl pl pt ru" + @${ECHO} "sv tr zh-CN zh-TW" + @${ECHO} +.endif .if !defined(WITH_TTF_BYTECODE_ENABLED) @${ECHO} @${ECHO} "You may set WITH_TTF_BYTECODE_ENABLED=YES" diff --git a/editors/openoffice-1.0/files/Makefile.localized b/editors/openoffice-1.0/files/Makefile.localized index 7fe0ac466b66..1a267d20aaf2 100644 --- a/editors/openoffice-1.0/files/Makefile.localized +++ b/editors/openoffice-1.0/files/Makefile.localized @@ -44,7 +44,6 @@ LANG_CONFIGURE_ARG= DAN .if ${LOCALIZED_LANG} == "nl" LANG_PKGNAME= nl LANG_EXT= 31 -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz LANG_CONFIGURE_ARG= DTCH .endif ################################################################ diff --git a/editors/openoffice-1.0/files/generate.pl b/editors/openoffice-1.0/files/generate.pl index 650fdc42b9ae..b9edd8f6fedd 100644 --- a/editors/openoffice-1.0/files/generate.pl +++ b/editors/openoffice-1.0/files/generate.pl @@ -1,12 +1,13 @@ #!/usr/bin/perl - # generate full build shell script for OpenOffice.org # Whom: Maho Nakata -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-1.0/files/Attic/generate.pl,v 1.2 2005-07-29 03:06:51 maho Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-1.0/files/Attic/generate.pl,v 1.3 2005-08-28 08:25:09 maho Exp $ 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(){ @@ -14,8 +15,7 @@ while(){ @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.0/files/patch-config_office+setsoenv.in b/editors/openoffice-1.0/files/patch-config_office+setsoenv.in index 0eab61ef13ae..5c894af6e1e2 100644 --- a/editors/openoffice-1.0/files/patch-config_office+setsoenv.in +++ b/editors/openoffice-1.0/files/patch-config_office+setsoenv.in @@ -4,7 +4,7 @@ RCS file: /cvs/tools/config_office/set_soenv.in,v retrieving revision 1.3.2.2.2.8.2.2.2.3 diff -u -r1.3.2.2.2.8.2.2.2.3 set_soenv.in --- config_office/set_soenv.in 3 Apr 2003 04:52:43 -0000 1.3.2.2.2.8.2.2.2.3 -+++ config_office/set_soenv.in 10 Jul 2005 03:39:39 -0000 ++++ config_office/set_soenv.in 3 Aug 2005 22:14:14 -0000 @@ -52,8 +52,8 @@ #------------------------------------------------- # @@ -16,7 +16,80 @@ diff -u -r1.3.2.2.2.8.2.2.2.3 set_soenv.in my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $PRODUCT, $PROFULLSWITCH, $BIG_GOODIES, $BMP_WRITES_FLAG, $common_build, $MK_UNROLL, $NO_REC_RES, $PROEXT, $SO3, $SOLAR_JAVA, $SOLAR_PLUGIN, $TF_PACKAGES, $TF_SDBAPI, $TF_FILEURL, $UPDATER, $BUILD_DELIVER, $USE_NEWCHARSET, $USE_NEW_RSC, $VCL, -@@ -1251,7 +1251,9 @@ +@@ -65,7 +65,7 @@ + my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV, + $GVER, $GVERDIR, $OS, $OSVERSION, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH, + $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $JRELIBDIR, +- $JRETOOLKITDIR, $JRETHREADDIR, $PTHREAD_CFLAGS, $PTHREAD_LIBS, $EXCEPTIONS, $WRAPCMD ); ++ $JRETOOLKITDIR, $JRETHREADDIR, $JRETHREADDIR2, $PTHREAD_CFLAGS, $PTHREAD_LIBS, $EXCEPTIONS, $WRAPCMD ); + # + #------------------------------------------- + # IIc. Declaring the environment variables. +@@ -335,6 +335,7 @@ + $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386"; + $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client"; + $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."green_threads"; ++ $JRETHREADDIR2 = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."classic"; + } + elsif ( $platform eq "$Linux" ) + { +@@ -875,24 +876,18 @@ + $ps.$JRETHREADDIR. + $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB; + } +-elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64")) ++elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$FreeBSD") || ($platform eq "$Tru64")) + { $LD_LIBRARY_PATH = $cur_dir. + $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB. + $ps.$JRELIBDIR. + $ps.$JRETOOLKITDIR. + $ps.$JRETHREADDIR. ++ $ps.$JRETHREADDIR2. + $ps.$par_dir.$LIB. + $ps_STLPORT_LIB. + $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. + $ps.$ENV{'LD_LIBRARY_PATH'}; + } +-elsif ($platform eq "$FreeBSD") +-{ $LD_LIBRARY_PATH = $cur_dir. +- $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB. +- $ps.$par_dir.$LIB. +- $ps_STLPORT_LIB. +- $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB; +-} + elsif ($platform eq "$Irix" || $platform eq "$Irix64") + { $LD_LIBRARY_PATH = $cur_dir. + $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB. +@@ -1165,7 +1160,7 @@ + $L_STLPORT_LIB. + $L.$XLIB; + } +-elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) ++elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64") || ($platform eq "$FreeBSD")) + { $SOLARLIB = $L.$par_dir.$LIB. + $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. + $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. +@@ -1174,18 +1169,10 @@ + $L.$JRELIBDIR. + $L.$JRETOOLKITDIR. + $L.$JRETHREADDIR. ++ $L.$JRETHREADDIR2. + $L_STLPORT_LIB. + $L.$XLIB; + } +-elsif ($platform eq "$FreeBSD") +-{ $SOLARLIB = $L.$par_dir.$LIB. +- $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. +- $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. +- $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. +- $L.'$JAVA_HOME'.$LIB. +- $L_STLPORT_LIB. +- $L.$XLIB; +-} + elsif ($platform eq "$Winnt") + { $SOLARLIB = $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. + $L.$par_dir.$LIB. +@@ -1251,7 +1238,9 @@ { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; } elsif ($platform eq "$FreeBSD") diff --git a/editors/openoffice-1.0/files/patch-odk+pack+copying+makefile.mk b/editors/openoffice-1.0/files/patch-odk+pack+copying+makefile.mk new file mode 100644 index 000000000000..13512504fa1c --- /dev/null +++ b/editors/openoffice-1.0/files/patch-odk+pack+copying+makefile.mk @@ -0,0 +1,15 @@ +Index: odk/pack/copying/makefile.mk +=================================================================== +RCS file: /cvs/api/odk/pack/copying/makefile.mk,v +retrieving revision 1.46.2.9 +diff -u -r1.46.2.9 makefile.mk +--- odk/pack/copying/makefile.mk 24 Feb 2003 16:48:59 -0000 1.46.2.9 ++++ odk/pack/copying/makefile.mk 4 Aug 2005 03:03:48 -0000 +@@ -16,6 +16,7 @@ + + DIRLIST = \ + $(DESTDIRDOCU) \ ++ $(DESTDIR)$/settings \ + $(DESTDIRDOCUIMAGES) \ + $(DESTDIRDOCU)$/DevStudioWizards \ + $(DESTDIRDOCU)$/DevStudioWizards$/images \ diff --git a/editors/openoffice-1.0/files/patch-odk+source+OOSupport+makefile.mk b/editors/openoffice-1.0/files/patch-odk+source+OOSupport+makefile.mk new file mode 100644 index 000000000000..d29cebfd753d --- /dev/null +++ b/editors/openoffice-1.0/files/patch-odk+source+OOSupport+makefile.mk @@ -0,0 +1,14 @@ +Index: odk/source/OOSupport/makefile.mk +=================================================================== +RCS file: /cvs/api/odk/source/OOSupport/makefile.mk,v +retrieving revision 1.1.2.1 +diff -u -r1.1.2.1 makefile.mk +--- odk/source/OOSupport/makefile.mk 13 Jan 2003 10:58:17 -0000 1.1.2.1 ++++ odk/source/OOSupport/makefile.mk 4 Aug 2005 03:44:04 -0000 +@@ -336,5 +336,5 @@ + +cp -R ParserDB $(CLASSDIR)$/netbeans$/system + +cp openoffice-nbm-license.txt $(CLASSDIR) + +-mkdir $(CLASSDIR)$/netbeans$/modules +- +cd $(CLASSDIR) && cp oosupport.jar netbeans$/modules && java MakeModule ++ +cd $(CLASSDIR) && cp oosupport.jar netbeans$/modules && java -classpath $(CLASSDIR) MakeModule + +cd $(CLASSDIR) && jar -uvf $(TARGETNETBEANSMODULEFILE) netbeans diff --git a/editors/openoffice-1.0/files/patch-odk+source+bean+native+unix+makefile.mk b/editors/openoffice-1.0/files/patch-odk+source+bean+native+unix+makefile.mk new file mode 100644 index 000000000000..459335c2a3b1 --- /dev/null +++ b/editors/openoffice-1.0/files/patch-odk+source+bean+native+unix+makefile.mk @@ -0,0 +1,21 @@ +Index: odk/source/bean/native/unix/makefile.mk +=================================================================== +RCS file: /cvs/api/odk/source/bean/native/unix/Attic/makefile.mk,v +retrieving revision 1.4 +diff -u -r1.4 makefile.mk +--- odk/source/bean/native/unix/makefile.mk 6 May 2002 18:56:38 -0000 1.4 ++++ odk/source/bean/native/unix/makefile.mk 3 Aug 2005 07:10:36 -0000 +@@ -20,9 +20,12 @@ + SHL1LIBS= $(SLB)$/$(TARGET).lib + SHL1STDLIBS=-ljawt -lsal + +-.IF "$(OS)" == "LINUX" ++.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" + SHL1STDLIBS+=-lstdc++ + .ENDIF ++.IF "$(OS)" == "FREEBSD" ++SHL1STDLIBS+=-ljvm -lhpi ++.ENDIF + + NO_SHL1DESCRIPTION=TRUE + diff --git a/editors/openoffice-1.0/files/patch-odk+util+makefile.pmk b/editors/openoffice-1.0/files/patch-odk+util+makefile.pmk new file mode 100644 index 000000000000..f3056308a682 --- /dev/null +++ b/editors/openoffice-1.0/files/patch-odk+util+makefile.pmk @@ -0,0 +1,31 @@ +Index: odk/util/makefile.pmk +=================================================================== +RCS file: /cvs/api/odk/util/makefile.pmk,v +retrieving revision 1.26.2.4 +diff -u -r1.26.2.4 makefile.pmk +--- odk/util/makefile.pmk 17 Feb 2003 15:51:33 -0000 1.26.2.4 ++++ odk/util/makefile.pmk 29 Jul 2005 13:57:12 -0000 +@@ -76,7 +76,7 @@ + #-------------------- + MY_DELETE_RECURSIVE=rm -rf + MY_DIRCMP=dircmp +-MY_TEXTCOPY= tr -d "\015" ++MY_TEXTCOPY=%%GNUTR%% -d "\015" + #MY_COPY=cat + + MY_DLLPREFIX=lib +@@ -116,6 +116,14 @@ + DESTDIRLIB=$(DESTDIR)$/netbsd$/lib + DESTDIRDLL=$(DESTDIRLIB) + ++.ELIF "$(OS)"=="FREEBSD" ++########### ++# FREEBSD ++########### ++DESTDIRBIN=$(DESTDIR)$/freebsd$/bin ++DESTDIRLIB=$(DESTDIR)$/freebsd$/lib ++DESTDIRDLL=$(DESTDIRLIB) ++ + .ELIF "$(OS)"=="IRIX " + ########### + # IRIX diff --git a/editors/openoffice-1.0/files/patch-product+settings+settings.mk b/editors/openoffice-1.0/files/patch-product+settings+settings.mk index fe1093e1e772..c7824cec2938 100644 --- a/editors/openoffice-1.0/files/patch-product+settings+settings.mk +++ b/editors/openoffice-1.0/files/patch-product+settings+settings.mk @@ -60,7 +60,7 @@ +SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include -I$(OO_SDK_JAVA_HOME)/include/freebsd -I$(OO_SDK_JAVA_HOME)/include/linux +CC_INCLUDES=-I. -I/usr/include -I$(OUT)/inc/examples -I$(PRJ)/include +STL_INCLUDES=-I$(OO_STLPORT_HOME)/stlport -+CC_DEFINES=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) ++CC_DEFINES=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) %%PTHREAD_CFLAGS%% + +# define for used compiler necessary for UNO +#-DCPPU_ENV=gcc2 -- gcc 2.91/2.95 @@ -70,6 +70,6 @@ + +LIBRARY_LINK_FLAGS=-shared +EXE_LINK_FLAGS=-Wl -export-dynamic -+LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L$(OFFICE_PROGRAM_PATH) -pthread ++LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L$(OFFICE_PROGRAM_PATH) %%PTHREAD_LIBS%% + +endif diff --git a/editors/openoffice-1.0/files/patch-solenv+inc+unitools.mk b/editors/openoffice-1.0/files/patch-solenv+inc+unitools.mk new file mode 100644 index 000000000000..983adcf1cf4f --- /dev/null +++ b/editors/openoffice-1.0/files/patch-solenv+inc+unitools.mk @@ -0,0 +1,16 @@ +Index: solenv/inc/unitools.mk +=================================================================== +RCS file: /cvs/tools/solenv/inc/unitools.mk,v +retrieving revision 1.12.4.2 +diff -u -r1.12.4.2 unitools.mk +--- solenv/inc/unitools.mk 7 Jan 2003 15:22:16 -0000 1.12.4.2 ++++ solenv/inc/unitools.mk 4 Aug 2005 01:42:23 -0000 +@@ -147,7 +147,7 @@ + GNUPATCH=gnupatch + .ELSE # "$(OS)"=="SOLARIS" + AWK=awk +-GNUCOPY=cp ++GNUCOPY=%%GNUCOPY%% + GNUPATCH=patch + .ENDIF # "$(OS)"=="SOLARIS" + .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" diff --git a/editors/openoffice-1.0/files/pkg-message.in b/editors/openoffice-1.0/files/pkg-message.in index 5cdb0eeb5156..4e72dc891b04 100644 --- a/editors/openoffice-1.0/files/pkg-message.in +++ b/editors/openoffice-1.0/files/pkg-message.in @@ -3,7 +3,7 @@ OpenOffice.org Build 1.0.3 Personal Install How-To Written by: Martin Blapp OpenOffice.org will soon been installed in -${PREFIX}/OpenOffice.org1.0/ +${PREFIX}/OpenOffice.org1.0.3/ 1 User installation ------------------- @@ -17,7 +17,7 @@ in your homedir. If the setup tells you there is already an installed version, you may look at the file ".sversionrc" in -your homedir. In this file OpenOffice and StarOffice +your homedir. In this file OpenOffice.org and StarOffice have both a line for each version which is installed. After removing the problematic line you should be able to install again. @@ -29,19 +29,18 @@ There are some wrappers installed for fast startup. Add "${PREFIX}/bin/" to your PATH and you will be able to use them. -${PREFIX}/bin/openoffice.org-1.0 -${PREFIX}/bin/openoffice.org-1.0-sagenda -${PREFIX}/bin/openoffice.org-1.0-scalc -${PREFIX}/bin/openoffice.org-1.0-sdraw -${PREFIX}/bin/openoffice.org-1.0-setup -${PREFIX}/bin/openoffice.org-1.0-sfax -${PREFIX}/bin/openoffice.org-1.0-simpress -${PREFIX}/bin/openoffice.org-1.0-spadmin -${PREFIX}/bin/openoffice.org-1.0-sweb -${PREFIX}/bin/openoffice.org-1.0-swriter +${PREFIX}/bin/openoffice.org-1.0.3 +${PREFIX}/bin/openoffice.org-1.0.3-sagenda +${PREFIX}/bin/openoffice.org-1.0.3-scalc +${PREFIX}/bin/openoffice.org-1.0.3-sdraw +${PREFIX}/bin/openoffice.org-1.0.3-setup +${PREFIX}/bin/openoffice.org-1.0.3-sfax +${PREFIX}/bin/openoffice.org-1.0.3-simpress +${PREFIX}/bin/openoffice.org-1.0.3-spadmin +${PREFIX}/bin/openoffice.org-1.0.3-sweb +${PREFIX}/bin/openoffice.org-1.0.3-swriter OO.org does need $LANG to be set to a suitable value. -If it is not already set, a default value is chosen. Some old X-Servers before XFree86 4.2 do not like the western locale with Euro symbol (ISO_8859-15). You should ignore the warning message then or upgrade to -- cgit v1.2.3