From 8400e4cf7082edf7edb6c8a3eab49830974eb941 Mon Sep 17 00:00:00 2001 From: Maho Nakata Date: Sun, 30 Jan 2011 11:10:32 +0000 Subject: Update to 3.3.0. Funded by: OpenOffice.org community Feature safe: yes --- editors/openoffice-3/Makefile | 52 +++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 29 deletions(-) (limited to 'editors/openoffice-3/Makefile') diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile index c63d0ed7143d..318c1705d519 100644 --- a/editors/openoffice-3/Makefile +++ b/editors/openoffice-3/Makefile @@ -9,12 +9,9 @@ PORTNAME?= openoffice.org PORTVERSION?= ${OOOVERSION} CATEGORIES+= editors java MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ - http://ooopackages.good-day.net/pub/OpenOffice.org/misc/moz/:mozsrc \ - ${MASTER_SITE_MOZILLA_EXTENDED:S/$/:mozsrc/} \ + http://ooopackages.good-day.net/pub/OpenOffice.org/sources/:extsrc \ http://tools.openoffice.org/unowinreg_prebuild/680/:unowinreg -MASTER_SITE_SUBDIR+= mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc -DISTFILES+= ${OOOSRC} unowinreg.dll:unowinreg -EXTRACT_ONLY= ${OOOSRC} +DISTFILES+= ${OOOSRC} ${OOOEXTSRC} unowinreg.dll:unowinreg #de facto maintainer is maho@FreeBSD.org #patch submitters must sign SCA; see http://porting.openoffice.org/freebsd/#policy @@ -23,13 +20,14 @@ COMMENT= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(releas CONFLICTS= cppunit* -OOOVERSION= 3.2.1 +OOOVERSION= 3.3.0 +EXTRATC_ONLY?= ${OOOSRC} ${OOOEXTSRC} + +OOOEXTSRC= ext_sources.20110129.tar.bz2:extsrc + NO_LATEST_LINK= yes .if !defined(WITHOUT_MOZILLA) -SEAMONKEY_VERSION= 1.1.14 -SEAMONKEY_SOURCE= seamonkey-${SEAMONKEY_VERSION}.source.tar.bz2 -DISTFILES+= ${SEAMONKEY_SOURCE}:mozsrc USE_GNOME+= libidl .endif @@ -58,7 +56,7 @@ MAKE_JOBS_SAFE= yes USE_JAVA= yes JAVA_BUILD= jdk -JAVA_VENDOR?= freebsd bsdjava openjdk +JAVA_VENDOR= freebsd bsdjava openjdk .if (${OSVERSION} >= 700000) JAVA_VERSION= 1.5 1.6 .else @@ -70,13 +68,13 @@ JAVA_VERSION= 1.4 1.5 1.6 ONLY_FOR_ARCHS= i386 amd64 .if ${ARCH} == amd64 -FREEBSD_ENV_SET= FreeBSDAMDEnv.Set +FREEBSD_ENV_SET= FreeBSDAMDEnv.Set.sh .else -FREEBSD_ENV_SET= FreeBSDX86Env.Set +FREEBSD_ENV_SET= FreeBSDX86Env.Set.sh .endif -MILESTONE?= 19 -OOOTAG?= OOO320_m${MILESTONE} +MILESTONE?= 20 +OOOTAG?= OOO330_m${MILESTONE} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} OOODIR= openoffice.org3 INSTALLATION_BASEDIR?= openoffice.org-${OOOVERSION} @@ -123,13 +121,14 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ imake:${PORTSDIR}/devel/imake \ gtar:${PORTSDIR}/archivers/gtar \ ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \ - ant:${PORTSDIR}/devel/apache-ant + ant:${PORTSDIR}/devel/apache-ant \ + ${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit #see #i85469# for gperf USE_BISON= build GNU_CONFIGURE= yes -WRKSRC?= ${WRKDIR}/${OOOTAG} -TCSH?= /bin/tcsh +WRKSRC?= ${WRKDIR}/${OOOTAG} +BASH?= ${PREFIX}/bin/bash SUB_FILES= pkg-message SUB_LIST= EXECBASE=${EXECBASE} OOOTAG=${OOOTAG} OOODIR=${OOODIR} @@ -140,16 +139,18 @@ MAKE_JOBS_NUMBER= 1 CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp \ --with-gnu-patch=${LOCALBASE}/bin/gpatch \ --enable-crashdump=yes \ + --with-junit=${LOCALBASE}/share/java/classes/junit.jar \ --with-system-zlib \ --with-system-stdlibs \ --with-epm=internal \ - --with-vendor=FreeBSD-port \ --enable-hids \ --enable-minimizer \ --enable-presenter-console \ --enable-pdfimport \ --enable-wiki-publisher \ - --enable-report-builder + --enable-report-builder \ + --with-use-shell=bash \ + --with-vendor="FreeBSD ports system" OOOEXTENSIONS+= minimizer/presentation-minimizer.oxt OOOEXTENSIONS+= presenter/presenter-screen.oxt @@ -184,16 +185,9 @@ pre-everything:: .endif #issue XXXXXX not raised yet... -CRLFFILES=curl/curl*patch neon/neon*patch jfreereport/patches/*.patch - +DOS2UNIX_REGEX=curl/curl*patch neon/neon*patch jfreereport/patches/*.patch post-extract: - for i in ${CRLFFILES}; do \ - cd ${WRKSRC} ; ${REINPLACE_CMD} -e 's# ##g' $$i ; \ - done @${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/ -.if !defined(WITHOUT_MOZILLA) - @${CP} ${DISTDIR}/${DIST_SUBDIR}/${SEAMONKEY_SOURCE} ${WRKSRC}/moz/download -.endif pre-configure: #Workaround for gperf. #i85469# @@ -205,7 +199,7 @@ pre-configure: do-build: @cd ${WRKSRC} ; ./bootstrap - @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" "TMP=${WRKSRC}" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAKE_JOBS_NUMBER} --all --html --dontgraboutput" + @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" "LIBINTL_PREFIX=${PREFIX}" ${BASH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAKE_JOBS_NUMBER} --all --html" .if ${LOCALIZED_LANG} == "alllangs" @${MAKE} languagepack @@ -228,7 +222,7 @@ do-install: @${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR} @cd ${WRKDIR}/tmp/opt/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR} @${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ - @cd ${WRKSRC}/solver/320/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ + @cd ${WRKSRC}/solver/3?0/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ @${INSTALL_DATA} ${WRKSRC}/instsetoo_native/unxfbsd?.pro/bin/hid.lst ${PREFIX}/${INSTALLATION_BASEDIR} .else @cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES -- cgit v1.2.3