Index: head/editors/openoffice-2.0-devel/Makefile
===================================================================
--- head/editors/openoffice-2.0-devel/Makefile	(revision 139878)
+++ head/editors/openoffice-2.0-devel/Makefile	(revision 139879)
@@ -1,193 +1,209 @@
 # New ports collection makefile for: OpenOffice.org
 # Date created:		28 February 2002
 # Whom:                 Martin Blapp
 #
 # $FreeBSD$
 #
 
 PORTNAME=	openoffice
 PORTVERSION=	2.0.${SNAPDATE}
 CATEGORIES+=	editors
 MASTER_SITES+=	ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
 DISTFILES+=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 gpc231.tar.Z:gpc
 EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
 
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
 USE_GNOME+=	libidl
 .endif
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=        3
 .endif
 USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 
-.if !defined(WITHOUT_JAVA)
+.if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
 JAVA_VERSION=	1.4
 JAVA_BUILD=	jdk
 .endif
 
 .include <bsd.port.pre.mk>
 .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"
 .endif
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		117
-SNAPDATE=		20050713
+MILESTONE=		120
+SNAPDATE=		20050722
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
 PACKAGE_BASENAME=	OOo_${RELEASE_NR}m${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
 .if defined(LANG_PKGNAME)
 PKGNAMEPREFIX=          ${LANG_PKGNAME}-
 .endif
 .if defined(LANG_SUFFIX)
 PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
+.if defined(WITH_GNUGCJ)
+BUILD_DEPENDS+=	gcc41:${PORTSDIR}/lang/gcc41
+BROKEN=	"still work in progress"
+.else
 BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
+.endif
+
 # FIXME (correctly add ccache before gcc and g++)
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
+.if defined(WITH_GNUGCJ)
+CC=	ccache gcc41
+CXX=	ccache g++41
+.else
 CC=	ccache gcc-ooo
 CXX=	ccache g++-ooo
+.endif #WITH_GNUGCJ
+.endif #WITH_CCACHE
+.if !defined(WITH_CCACHE)
+.if defined(WITH_GNUGCJ)
+CC=	gcc41
+CXX=	g++41
 .else
 CC=	gcc-ooo
 CXX=	g++-ooo
-.endif
+.endif #WITH_GNUGCJ
+.endif #!WITH_CCACHE
+
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison-devel:${PORTSDIR}/devel/bison-devel \
 		imake:${X_IMAKE_PORT}
-.if defined(WITHOUT_JAVA)
-LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
-.else
+.if !defined(WITHOUT_JAVA)
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 .endif
 
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 ANT?=		${LOCALBASE}/bin/ant
 ZIP?=		${PREFIX}/bin/zip
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal
 
 .include <${FILESDIR}/Makefile.knobs>
 
 pre-everything::
 # really tweak, extremely useful when you build all localized language versions
 # needed after when you build with ALL_LOCALIZED_LANGS.
 .if defined(TWEAK_L10N)
 	@${RM} -f ${WRKDIR}/.PLIST*
 	@${RM} -f ${WRKDIR}/.install_done.*
 	@${RM} -f ${WRKDIR}/.package_done.*
 	@${RM} -f ${WRKDIR}/.extract_done.*
 	@${RM} -f ${WRKDIR}/.patch_done.*
 	@${RM} -f ${WRKDIR}/.configure_done.*
 	@${RM} -f ${WRKDIR}/.build_done.*
 	@${TOUCH} ${EXTRACT_COOKIE}
 	@${TOUCH} ${PATCH_COOKIE}
 	@${TOUCH} ${CONFIGURE_COOKIE}
 	@${TOUCH} ${BUILD_COOKIE}
 .endif
 
 post-extract:
 .if defined(WITH_TTF_BYTECODE_ENABLED)
 	@cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/optpatch-freetype
 .endif
 	@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/
 .if !defined(WITHOUT_MOZILLA)
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
 .endif
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 .if (${NUMOFPROCESSES}>1)
 	@cd ${WRKSRC} ;	${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
 .else
 	@cd ${WRKSRC} ;	${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes"  ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
 .endif
 
 do-install:
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${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 ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
 		${PREFIX}/bin/${EXECBASE}
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sagenda
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setup
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sfax
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sweb
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
 	@${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 	@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
 			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${PKGMESSAGE}
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
 .include <${FILESDIR}/Makefile.others>
 .include <bsd.port.post.mk>

Property changes on: head/editors/openoffice-2.0-devel/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.190
\ No newline at end of property
+1.191
\ No newline at end of property
Index: head/editors/openoffice-2.0-devel/distinfo
===================================================================
--- head/editors/openoffice-2.0-devel/distinfo	(revision 139878)
+++ head/editors/openoffice-2.0-devel/distinfo	(revision 139879)
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_1.9m117_source.tar.bz2) = 95630bc570e10a30b8cfd840c321e00b
-SIZE (openoffice.org2.0/OOo_1.9m117_source.tar.bz2) = 227975719
+MD5 (openoffice.org2.0/OOo_1.9m120_source.tar.bz2) = 9230e6cd7e824a3e3846ccf4a04b92af
+SIZE (openoffice.org2.0/OOo_1.9m120_source.tar.bz2) = 228290473
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
 SIZE (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 38721366

Property changes on: head/editors/openoffice-2.0-devel/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.72
\ No newline at end of property
+1.73
\ No newline at end of property
Index: head/editors/openoffice-2.0-devel/files/Makefile.knobs
===================================================================
--- head/editors/openoffice-2.0-devel/files/Makefile.knobs	(revision 139878)
+++ head/editors/openoffice-2.0-devel/files/Makefile.knobs	(revision 139879)
@@ -1,107 +1,125 @@
 # Makefile for knobs
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 
+.if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
+CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
+.endif
+.if !defined(WITHOUT_JAVA) && defined(WITH_GNUGCJ)
+CONFIGURE_ARGS+=	--with-java=gij --with-ant-home=${LOCALBASE}/ant
+.endif
 .if defined(WITHOUT_JAVA)
 CONFIGURE_ARGS+=	--without-java
-.else
-CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
 .endif
 
 .if defined(WITH_KDE)
 CONFIGURE_ARGS+=	--enable-kde QTDIR="${QT_PREFIX}"
 .endif
 
 .if defined(WITH_CUPS)
 LIB_DEPENDS+=		cups.2:${PORTSDIR}/print/cups-base
 CONFIGURE_ARGS+=	--enable-cups=yes
 .else
 CONFIGURE_ARGS+=	--enable-cups=no
 .endif
 
 .if defined(WITHOUT_MOZILLA)
 CONFIGURE_ARGS+=	--disable-mozilla
 .else
 CONFIGURE_ARGS+=	--enable-build-mozilla
 .endif
 
 .if defined(ALL_LOCALIZED_LANGS)
 CONFIGURE_ARGS+=	--with-lang=ALL
 .else
 CONFIGURE_ARGS+=	--with-lang=${LOCALIZED_LANG}
 .endif
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
 CONFIGURE_ARGS+=	--enable-debug
 .else
 CONFIGURE_ARGS+=	--enable-symbols
 .endif
 .endif
 
 pre-fetch:
 .if (${OSVERSION} < 503001 && ${OSVERSION} >= 500000) || (${OSVERSION} < 492000)
 	@${ECHO}
 	@${ECHO} "WARNING"
 	@${ECHO} "Your rtld seems to be old."
 	@${ECHO} "Please remake your rtld by:"
 	@${ECHO} "[1] if you use 4-series:"
 	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4"
 	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4"
 	@${ECHO} "# make ; make depend ; make install"
 	@${ECHO} "[2] if you use 5-series:"
 	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5"
 	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5"
 	@${ECHO} "# make ; make depend ; make install"
 	@${ECHO} "AT YOUR OWN RISK!"
 .endif
 	@${ECHO} "OPTIONS:"
 .if !defined(WITH_DEBUG)
 	@${ECHO}
 	@${ECHO} "You can compile OOo with debug symbols with WITH_DEBUG=1"
 	@${ECHO}
 	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
 	@${ECHO} "OOo debug support."
 .endif
-#XXX currently broken
-#.if !defined(WITHOUT_MOZILLA)
-#	@${ECHO}
-#	@${ECHO} "You can compile OOo without Mozilla connectivity by"
-#	@${ECHO} "make -DWITHOUT_MOZILLA"
-#.endif
+.if !defined(WITHOUT_MOZILLA)
+	@${ECHO}
+	@${ECHO} "You can compile OOo without Mozilla connectivity with"
+	@${ECHO} "make -DWITHOUT_MOZILLA"
+.endif
 .if !defined(WITH_TTF_BYTECODE_ENABLED)
 	@${ECHO}
 	@${ECHO} "You may get better quality of glyphs"
-	@${ECHO} "at small bitmap sizes, If you have"
+	@${ECHO} "at small bitmap sizes if you have"
 	@${ECHO} "licensed the Apple patents"
-	@${ECHO} "US05155805 US05159668 and US05325479, by"
+	@${ECHO} "US05155805 US05159668 and US05325479, with"
 	@${ECHO} "make -DWITH_TTF_BYTECODE_ENABLED"
 	@${ECHO} "See http://www.freetype.org/patents.html for details"
 .endif
+	@${ECHO}
+	@${ECHO} "You can select the language for OOo by making it with:"
+	@${ECHO} "make LOCALIZED_LANG=xx" 
+	@${ECHO} "while xx can be one of the following"
+	@${ECHO} "af ar bn be-BY bg ca cs cy da de el en-GB eo es"
+	@${ECHO} "et eu fi fr gl gu-IN he hi-IN hr hu it ja km kn-IN"
+	@${ECHO} "ko lt ms nb nl nn ns pa-IN pl pt pt-BR ru rw sk"
+	@${ECHO} "sl sv ta-IN th tn tr vi xh zh-CN zh-TW zu"
+	@${ECHO}
 #XXX currently broken
 #.if !defined(WITHOUT_JAVA)
 #	@${ECHO}
-#	@${ECHO} "You can compile OOo without Java support by"
+#	@${ECHO} "You can compile OOo without Java support with"
 #	@${ECHO} "make -DWITHOUT_JAVA"
 #.endif
 #XXX currently broken
+#.if !defined(WITH_GNUGCJ)
+#	@${ECHO}
+#	@${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with"
+#	@${ECHO} "make -DWITH_GNUGCJ"
+#.endif
+#XXX currently broken
 #.if !defined(WITH_CUPS)
 #	@${ECHO}
-#	@${ECHO} "You can compile OOo with CUPS support by"
+#	@${ECHO} "You can compile OOo with CUPS support with"
 #	@${ECHO} "make -DWITH_CUPS"
 #.endif
 .if !defined(WITH_KDE)
 	@${ECHO}
-	@${ECHO} "You can compile OOo to use Qt/KDE vclplug"
+	@${ECHO} "You can compile OOo to use Qt/KDE vclplug with"
 	@${ECHO} "make -DWITH_KDE"
 .endif
 	@${ECHO}
 	@${ECHO} "NOTICE:"
 	@${ECHO}
 	@${ECHO} "To build OOo, you should have a lot"
 .if defined(WITH_DEBUG)
 	@${ECHO} "of free diskspace (~ 18GB)."
 .else
-	@${ECHO} "of free diskspace (~ 8.5GB)."
+	@${ECHO} "of free diskspace (~ 9GB)."
 .endif
 	@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"

Property changes on: head/editors/openoffice-2.0-devel/files/Makefile.knobs
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.16
\ No newline at end of property
+1.17
\ No newline at end of property
Index: head/editors/openoffice-2.0-devel/files/Makefile.localized
===================================================================
--- head/editors/openoffice-2.0-devel/files/Makefile.localized	(revision 139878)
+++ head/editors/openoffice-2.0-devel/files/Makefile.localized	(revision 139879)
@@ -1,212 +1,245 @@
 # localized makefile
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 ################################################################
 #See solenv/inc/postset.mk for details	
 ################################################################
 .if defined(LOCALIZED_LANG)
 .if ${LOCALIZED_LANG} == "af"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ar"
 CATEGORIES=	arabic
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "bn"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "be-BY"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "bg"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ca"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "cs"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "cy"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "da"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "de"
 CATEGORIES=	german
 LANG_PKGNAME=	${LOCALIZED_LANG}
 COMMENT=	Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und Praesentationsprogramm
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "el"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "en-GB"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "eo"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "es"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "et"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "eu"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "fi"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "fr"
 CATEGORIES=	french
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "gl"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "gu-IN"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "he"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "hi-IN"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "hr"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "hu"
 CATEGORIES=     hungarian
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "it"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ja"
 CATEGORIES=	japanese
 LANG_PKGNAME=	${LOCALIZED_LANG}
 RUN_DEPENDS+=   ${X11BASE}/lib/X11/fonts/TrueType/sazanami-mincho.ttf:${PORTSDIR}/japanese/sazanami-ttf
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "km"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "kn-IN"
 LANG_PKGNAME=	kn
 LANG_SUFFIX=	IN
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ko"
 CATEGORIES=     korean
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "lt"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ms"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "nb"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "nl"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "nn"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ns"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "pa-IN"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "pl"
 CATEGORIES=	polish
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "pt"
 COMMENT=	Editor texto/grBaGico, banco de dados/planilha/navegador integrado
 CATEGORIES=	portuguese
 LANG_PKGNAME=	${LOCALIZED_LANG}
 LANG_EXT=	03
 LANG_CONFIGURE_ARG=	PORT
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "pt-BR"
 COMMENT=        Editor texto/grBaGico, banco de dados/planilha/navegador integrado
 CATEGORIES=     portuguese
 LANG_PKGNAME=	pt
 LANG_SUFFIX=	BR
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ru"
 CATEGORIES=	russian
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "rw"
+CATEGORIES=	russian
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "sk"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "sl"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "sv"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "ta-IN"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "th"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 #.if ${LOCALIZED_LANG} == "tn"
 #LANG_PKGNAME=	${LOCALIZED_LANG}
 #.endif
 ################################################################
 .if ${LOCALIZED_LANG} == "tr"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "vi"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "xh"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "zh-CN"
 CATEGORIES=	chinese
 LANG_PKGNAME=	zh
 LANG_SUFFIX=	CN
 BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "zh-TW"
 CATEGORIES=	chinese
 LANG_PKGNAME=	zh
 LANG_SUFFIX=	TW
 BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "zu"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .endif

Property changes on: head/editors/openoffice-2.0-devel/files/Makefile.localized
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.7
\ No newline at end of property
Index: head/editors/openoffice-2.0-devel/files/pkg-message.in
===================================================================
--- head/editors/openoffice-2.0-devel/files/pkg-message.in	(revision 139878)
+++ head/editors/openoffice-2.0-devel/files/pkg-message.in	(revision 139879)
@@ -1,53 +1,51 @@
 OpenOffice.org Build %%RELEASE_NR%%m%%MILESTONE%% Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
 		and Maho Nakata <maho@FreeBSD.org>
 
 OpenOffice.org %%RELEASE_NR%%m%%MILESTONE%% will soon been installed in
 %%PREFIX%%/%%EXECBASE%%
 
-1 User installation
--------------------
+1. User installation
+--------------------
 
 Just type "%%EXECBASE%%" after you have successfully
 installed the package. If there is no installed
 OO.org dir in your homedir, you'll be prompted to
-install some files and choose a installed JDK.
+install some files and choose an installed JDK.
 The setup installs a ".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" folder
 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
-have both a line for each version which is installed.
+version, you may look in the file ".sversionrc" located
+in your homedir. In this file, OpenOffice and StarOffice
+will have a line for each version that is installed.
 After removing the problematic line you should be able to
-install again.
+install the package again.
 
-2 Start OO.org
---------------
+2. Starting OO.org
+------------------
 
-There are some wrappers installed for fast startup.
+There are some wrappers installed for faster startup.
 Add "%%PREFIX%%/bin/" to your PATH and you will be able
 to use them.
 
 %%PREFIX%%/bin/%%EXECBASE%%
 %%PREFIX%%/bin/%%EXECBASE%%-sagenda
 %%PREFIX%%/bin/%%EXECBASE%%-scalc
 %%PREFIX%%/bin/%%EXECBASE%%-sdraw
 %%PREFIX%%/bin/%%EXECBASE%%-setup
 %%PREFIX%%/bin/%%EXECBASE%%-sfax
 %%PREFIX%%/bin/%%EXECBASE%%-simpress
 %%PREFIX%%/bin/%%EXECBASE%%-spadmin
 %%PREFIX%%/bin/%%EXECBASE%%-sweb
 %%PREFIX%%/bin/%%EXECBASE%%-swriter
 
 OO.org does need $LANG to be set to a suitable value.
 
-3 If you stuck into a trouble
+3. If you run into problems
 --------------------------------------------------
-Somehow you can stuck into a trouble. 
-To solve this issue, please remove the already installed
-".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" dir in your homedir and remove the
-appropriate entry from ".sversionrc". After you have done
-this, redo the user installation and the problem will
-go away.
+If you somehow run into problems, please remove the already installed
+".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" dir in your homedir
+along with the appropriate entry in ".sversionrc". Redo the user
+installation and the problems should go away.

Property changes on: head/editors/openoffice-2.0-devel/files/pkg-message.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/editors/openoffice-3/Makefile
===================================================================
--- head/editors/openoffice-3/Makefile	(revision 139878)
+++ head/editors/openoffice-3/Makefile	(revision 139879)
@@ -1,193 +1,209 @@
 # New ports collection makefile for: OpenOffice.org
 # Date created:		28 February 2002
 # Whom:                 Martin Blapp
 #
 # $FreeBSD$
 #
 
 PORTNAME=	openoffice
 PORTVERSION=	2.0.${SNAPDATE}
 CATEGORIES+=	editors
 MASTER_SITES+=	ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
 DISTFILES+=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 gpc231.tar.Z:gpc
 EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
 
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
 USE_GNOME+=	libidl
 .endif
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=        3
 .endif
 USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 
-.if !defined(WITHOUT_JAVA)
+.if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
 JAVA_VERSION=	1.4
 JAVA_BUILD=	jdk
 .endif
 
 .include <bsd.port.pre.mk>
 .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"
 .endif
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		117
-SNAPDATE=		20050713
+MILESTONE=		120
+SNAPDATE=		20050722
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
 PACKAGE_BASENAME=	OOo_${RELEASE_NR}m${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
 .if defined(LANG_PKGNAME)
 PKGNAMEPREFIX=          ${LANG_PKGNAME}-
 .endif
 .if defined(LANG_SUFFIX)
 PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
+.if defined(WITH_GNUGCJ)
+BUILD_DEPENDS+=	gcc41:${PORTSDIR}/lang/gcc41
+BROKEN=	"still work in progress"
+.else
 BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
+.endif
+
 # FIXME (correctly add ccache before gcc and g++)
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
+.if defined(WITH_GNUGCJ)
+CC=	ccache gcc41
+CXX=	ccache g++41
+.else
 CC=	ccache gcc-ooo
 CXX=	ccache g++-ooo
+.endif #WITH_GNUGCJ
+.endif #WITH_CCACHE
+.if !defined(WITH_CCACHE)
+.if defined(WITH_GNUGCJ)
+CC=	gcc41
+CXX=	g++41
 .else
 CC=	gcc-ooo
 CXX=	g++-ooo
-.endif
+.endif #WITH_GNUGCJ
+.endif #!WITH_CCACHE
+
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison-devel:${PORTSDIR}/devel/bison-devel \
 		imake:${X_IMAKE_PORT}
-.if defined(WITHOUT_JAVA)
-LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
-.else
+.if !defined(WITHOUT_JAVA)
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 .endif
 
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 ANT?=		${LOCALBASE}/bin/ant
 ZIP?=		${PREFIX}/bin/zip
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal
 
 .include <${FILESDIR}/Makefile.knobs>
 
 pre-everything::
 # really tweak, extremely useful when you build all localized language versions
 # needed after when you build with ALL_LOCALIZED_LANGS.
 .if defined(TWEAK_L10N)
 	@${RM} -f ${WRKDIR}/.PLIST*
 	@${RM} -f ${WRKDIR}/.install_done.*
 	@${RM} -f ${WRKDIR}/.package_done.*
 	@${RM} -f ${WRKDIR}/.extract_done.*
 	@${RM} -f ${WRKDIR}/.patch_done.*
 	@${RM} -f ${WRKDIR}/.configure_done.*
 	@${RM} -f ${WRKDIR}/.build_done.*
 	@${TOUCH} ${EXTRACT_COOKIE}
 	@${TOUCH} ${PATCH_COOKIE}
 	@${TOUCH} ${CONFIGURE_COOKIE}
 	@${TOUCH} ${BUILD_COOKIE}
 .endif
 
 post-extract:
 .if defined(WITH_TTF_BYTECODE_ENABLED)
 	@cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/optpatch-freetype
 .endif
 	@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/
 .if !defined(WITHOUT_MOZILLA)
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
 .endif
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 .if (${NUMOFPROCESSES}>1)
 	@cd ${WRKSRC} ;	${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
 .else
 	@cd ${WRKSRC} ;	${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes"  ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
 .endif
 
 do-install:
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${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 ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
 		${PREFIX}/bin/${EXECBASE}
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sagenda
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setup
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sfax
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sweb
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
 	@${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 	@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
 			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${PKGMESSAGE}
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
 .include <${FILESDIR}/Makefile.others>
 .include <bsd.port.post.mk>

Property changes on: head/editors/openoffice-3/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.190
\ No newline at end of property
+1.191
\ No newline at end of property
Index: head/editors/openoffice-3/distinfo
===================================================================
--- head/editors/openoffice-3/distinfo	(revision 139878)
+++ head/editors/openoffice-3/distinfo	(revision 139879)
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_1.9m117_source.tar.bz2) = 95630bc570e10a30b8cfd840c321e00b
-SIZE (openoffice.org2.0/OOo_1.9m117_source.tar.bz2) = 227975719
+MD5 (openoffice.org2.0/OOo_1.9m120_source.tar.bz2) = 9230e6cd7e824a3e3846ccf4a04b92af
+SIZE (openoffice.org2.0/OOo_1.9m120_source.tar.bz2) = 228290473
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
 SIZE (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 38721366

Property changes on: head/editors/openoffice-3/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.72
\ No newline at end of property
+1.73
\ No newline at end of property
Index: head/editors/openoffice-3/files/Makefile.knobs
===================================================================
--- head/editors/openoffice-3/files/Makefile.knobs	(revision 139878)
+++ head/editors/openoffice-3/files/Makefile.knobs	(revision 139879)
@@ -1,107 +1,125 @@
 # Makefile for knobs
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 
+.if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
+CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
+.endif
+.if !defined(WITHOUT_JAVA) && defined(WITH_GNUGCJ)
+CONFIGURE_ARGS+=	--with-java=gij --with-ant-home=${LOCALBASE}/ant
+.endif
 .if defined(WITHOUT_JAVA)
 CONFIGURE_ARGS+=	--without-java
-.else
-CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
 .endif
 
 .if defined(WITH_KDE)
 CONFIGURE_ARGS+=	--enable-kde QTDIR="${QT_PREFIX}"
 .endif
 
 .if defined(WITH_CUPS)
 LIB_DEPENDS+=		cups.2:${PORTSDIR}/print/cups-base
 CONFIGURE_ARGS+=	--enable-cups=yes
 .else
 CONFIGURE_ARGS+=	--enable-cups=no
 .endif
 
 .if defined(WITHOUT_MOZILLA)
 CONFIGURE_ARGS+=	--disable-mozilla
 .else
 CONFIGURE_ARGS+=	--enable-build-mozilla
 .endif
 
 .if defined(ALL_LOCALIZED_LANGS)
 CONFIGURE_ARGS+=	--with-lang=ALL
 .else
 CONFIGURE_ARGS+=	--with-lang=${LOCALIZED_LANG}
 .endif
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
 CONFIGURE_ARGS+=	--enable-debug
 .else
 CONFIGURE_ARGS+=	--enable-symbols
 .endif
 .endif
 
 pre-fetch:
 .if (${OSVERSION} < 503001 && ${OSVERSION} >= 500000) || (${OSVERSION} < 492000)
 	@${ECHO}
 	@${ECHO} "WARNING"
 	@${ECHO} "Your rtld seems to be old."
 	@${ECHO} "Please remake your rtld by:"
 	@${ECHO} "[1] if you use 4-series:"
 	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4"
 	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4"
 	@${ECHO} "# make ; make depend ; make install"
 	@${ECHO} "[2] if you use 5-series:"
 	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5"
 	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5"
 	@${ECHO} "# make ; make depend ; make install"
 	@${ECHO} "AT YOUR OWN RISK!"
 .endif
 	@${ECHO} "OPTIONS:"
 .if !defined(WITH_DEBUG)
 	@${ECHO}
 	@${ECHO} "You can compile OOo with debug symbols with WITH_DEBUG=1"
 	@${ECHO}
 	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
 	@${ECHO} "OOo debug support."
 .endif
-#XXX currently broken
-#.if !defined(WITHOUT_MOZILLA)
-#	@${ECHO}
-#	@${ECHO} "You can compile OOo without Mozilla connectivity by"
-#	@${ECHO} "make -DWITHOUT_MOZILLA"
-#.endif
+.if !defined(WITHOUT_MOZILLA)
+	@${ECHO}
+	@${ECHO} "You can compile OOo without Mozilla connectivity with"
+	@${ECHO} "make -DWITHOUT_MOZILLA"
+.endif
 .if !defined(WITH_TTF_BYTECODE_ENABLED)
 	@${ECHO}
 	@${ECHO} "You may get better quality of glyphs"
-	@${ECHO} "at small bitmap sizes, If you have"
+	@${ECHO} "at small bitmap sizes if you have"
 	@${ECHO} "licensed the Apple patents"
-	@${ECHO} "US05155805 US05159668 and US05325479, by"
+	@${ECHO} "US05155805 US05159668 and US05325479, with"
 	@${ECHO} "make -DWITH_TTF_BYTECODE_ENABLED"
 	@${ECHO} "See http://www.freetype.org/patents.html for details"
 .endif
+	@${ECHO}
+	@${ECHO} "You can select the language for OOo by making it with:"
+	@${ECHO} "make LOCALIZED_LANG=xx" 
+	@${ECHO} "while xx can be one of the following"
+	@${ECHO} "af ar bn be-BY bg ca cs cy da de el en-GB eo es"
+	@${ECHO} "et eu fi fr gl gu-IN he hi-IN hr hu it ja km kn-IN"
+	@${ECHO} "ko lt ms nb nl nn ns pa-IN pl pt pt-BR ru rw sk"
+	@${ECHO} "sl sv ta-IN th tn tr vi xh zh-CN zh-TW zu"
+	@${ECHO}
 #XXX currently broken
 #.if !defined(WITHOUT_JAVA)
 #	@${ECHO}
-#	@${ECHO} "You can compile OOo without Java support by"
+#	@${ECHO} "You can compile OOo without Java support with"
 #	@${ECHO} "make -DWITHOUT_JAVA"
 #.endif
 #XXX currently broken
+#.if !defined(WITH_GNUGCJ)
+#	@${ECHO}
+#	@${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with"
+#	@${ECHO} "make -DWITH_GNUGCJ"
+#.endif
+#XXX currently broken
 #.if !defined(WITH_CUPS)
 #	@${ECHO}
-#	@${ECHO} "You can compile OOo with CUPS support by"
+#	@${ECHO} "You can compile OOo with CUPS support with"
 #	@${ECHO} "make -DWITH_CUPS"
 #.endif
 .if !defined(WITH_KDE)
 	@${ECHO}
-	@${ECHO} "You can compile OOo to use Qt/KDE vclplug"
+	@${ECHO} "You can compile OOo to use Qt/KDE vclplug with"
 	@${ECHO} "make -DWITH_KDE"
 .endif
 	@${ECHO}
 	@${ECHO} "NOTICE:"
 	@${ECHO}
 	@${ECHO} "To build OOo, you should have a lot"
 .if defined(WITH_DEBUG)
 	@${ECHO} "of free diskspace (~ 18GB)."
 .else
-	@${ECHO} "of free diskspace (~ 8.5GB)."
+	@${ECHO} "of free diskspace (~ 9GB)."
 .endif
 	@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"

Property changes on: head/editors/openoffice-3/files/Makefile.knobs
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.16
\ No newline at end of property
+1.17
\ No newline at end of property
Index: head/editors/openoffice-3/files/Makefile.localized
===================================================================
--- head/editors/openoffice-3/files/Makefile.localized	(revision 139878)
+++ head/editors/openoffice-3/files/Makefile.localized	(revision 139879)
@@ -1,212 +1,245 @@
 # localized makefile
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 ################################################################
 #See solenv/inc/postset.mk for details	
 ################################################################
 .if defined(LOCALIZED_LANG)
 .if ${LOCALIZED_LANG} == "af"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ar"
 CATEGORIES=	arabic
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "bn"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "be-BY"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "bg"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ca"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "cs"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "cy"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "da"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "de"
 CATEGORIES=	german
 LANG_PKGNAME=	${LOCALIZED_LANG}
 COMMENT=	Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und Praesentationsprogramm
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "el"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "en-GB"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "eo"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "es"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "et"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "eu"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "fi"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "fr"
 CATEGORIES=	french
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "gl"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "gu-IN"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "he"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "hi-IN"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "hr"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "hu"
 CATEGORIES=     hungarian
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "it"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ja"
 CATEGORIES=	japanese
 LANG_PKGNAME=	${LOCALIZED_LANG}
 RUN_DEPENDS+=   ${X11BASE}/lib/X11/fonts/TrueType/sazanami-mincho.ttf:${PORTSDIR}/japanese/sazanami-ttf
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "km"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "kn-IN"
 LANG_PKGNAME=	kn
 LANG_SUFFIX=	IN
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ko"
 CATEGORIES=     korean
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "lt"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ms"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "nb"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "nl"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "nn"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ns"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "pa-IN"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "pl"
 CATEGORIES=	polish
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "pt"
 COMMENT=	Editor texto/grBaGico, banco de dados/planilha/navegador integrado
 CATEGORIES=	portuguese
 LANG_PKGNAME=	${LOCALIZED_LANG}
 LANG_EXT=	03
 LANG_CONFIGURE_ARG=	PORT
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "pt-BR"
 COMMENT=        Editor texto/grBaGico, banco de dados/planilha/navegador integrado
 CATEGORIES=     portuguese
 LANG_PKGNAME=	pt
 LANG_SUFFIX=	BR
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ru"
 CATEGORIES=	russian
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "rw"
+CATEGORIES=	russian
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "sk"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "sl"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "sv"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "ta-IN"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "th"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 #.if ${LOCALIZED_LANG} == "tn"
 #LANG_PKGNAME=	${LOCALIZED_LANG}
 #.endif
 ################################################################
 .if ${LOCALIZED_LANG} == "tr"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "vi"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "xh"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "zh-CN"
 CATEGORIES=	chinese
 LANG_PKGNAME=	zh
 LANG_SUFFIX=	CN
 BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "zh-TW"
 CATEGORIES=	chinese
 LANG_PKGNAME=	zh
 LANG_SUFFIX=	TW
 BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "zu"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .endif

Property changes on: head/editors/openoffice-3/files/Makefile.localized
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.7
\ No newline at end of property
Index: head/editors/openoffice-3/files/pkg-message.in
===================================================================
--- head/editors/openoffice-3/files/pkg-message.in	(revision 139878)
+++ head/editors/openoffice-3/files/pkg-message.in	(revision 139879)
@@ -1,53 +1,51 @@
 OpenOffice.org Build %%RELEASE_NR%%m%%MILESTONE%% Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
 		and Maho Nakata <maho@FreeBSD.org>
 
 OpenOffice.org %%RELEASE_NR%%m%%MILESTONE%% will soon been installed in
 %%PREFIX%%/%%EXECBASE%%
 
-1 User installation
--------------------
+1. User installation
+--------------------
 
 Just type "%%EXECBASE%%" after you have successfully
 installed the package. If there is no installed
 OO.org dir in your homedir, you'll be prompted to
-install some files and choose a installed JDK.
+install some files and choose an installed JDK.
 The setup installs a ".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" folder
 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
-have both a line for each version which is installed.
+version, you may look in the file ".sversionrc" located
+in your homedir. In this file, OpenOffice and StarOffice
+will have a line for each version that is installed.
 After removing the problematic line you should be able to
-install again.
+install the package again.
 
-2 Start OO.org
---------------
+2. Starting OO.org
+------------------
 
-There are some wrappers installed for fast startup.
+There are some wrappers installed for faster startup.
 Add "%%PREFIX%%/bin/" to your PATH and you will be able
 to use them.
 
 %%PREFIX%%/bin/%%EXECBASE%%
 %%PREFIX%%/bin/%%EXECBASE%%-sagenda
 %%PREFIX%%/bin/%%EXECBASE%%-scalc
 %%PREFIX%%/bin/%%EXECBASE%%-sdraw
 %%PREFIX%%/bin/%%EXECBASE%%-setup
 %%PREFIX%%/bin/%%EXECBASE%%-sfax
 %%PREFIX%%/bin/%%EXECBASE%%-simpress
 %%PREFIX%%/bin/%%EXECBASE%%-spadmin
 %%PREFIX%%/bin/%%EXECBASE%%-sweb
 %%PREFIX%%/bin/%%EXECBASE%%-swriter
 
 OO.org does need $LANG to be set to a suitable value.
 
-3 If you stuck into a trouble
+3. If you run into problems
 --------------------------------------------------
-Somehow you can stuck into a trouble. 
-To solve this issue, please remove the already installed
-".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" dir in your homedir and remove the
-appropriate entry from ".sversionrc". After you have done
-this, redo the user installation and the problem will
-go away.
+If you somehow run into problems, please remove the already installed
+".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" dir in your homedir
+along with the appropriate entry in ".sversionrc". Redo the user
+installation and the problems should go away.

Property changes on: head/editors/openoffice-3/files/pkg-message.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/editors/openoffice-3-devel/Makefile
===================================================================
--- head/editors/openoffice-3-devel/Makefile	(revision 139878)
+++ head/editors/openoffice-3-devel/Makefile	(revision 139879)
@@ -1,193 +1,209 @@
 # New ports collection makefile for: OpenOffice.org
 # Date created:		28 February 2002
 # Whom:                 Martin Blapp
 #
 # $FreeBSD$
 #
 
 PORTNAME=	openoffice
 PORTVERSION=	2.0.${SNAPDATE}
 CATEGORIES+=	editors
 MASTER_SITES+=	ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
 DISTFILES+=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 gpc231.tar.Z:gpc
 EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
 
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
 USE_GNOME+=	libidl
 .endif
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=        3
 .endif
 USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 
-.if !defined(WITHOUT_JAVA)
+.if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
 JAVA_VERSION=	1.4
 JAVA_BUILD=	jdk
 .endif
 
 .include <bsd.port.pre.mk>
 .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"
 .endif
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		117
-SNAPDATE=		20050713
+MILESTONE=		120
+SNAPDATE=		20050722
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
 PACKAGE_BASENAME=	OOo_${RELEASE_NR}m${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
 .if defined(LANG_PKGNAME)
 PKGNAMEPREFIX=          ${LANG_PKGNAME}-
 .endif
 .if defined(LANG_SUFFIX)
 PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
+.if defined(WITH_GNUGCJ)
+BUILD_DEPENDS+=	gcc41:${PORTSDIR}/lang/gcc41
+BROKEN=	"still work in progress"
+.else
 BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
+.endif
+
 # FIXME (correctly add ccache before gcc and g++)
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
+.if defined(WITH_GNUGCJ)
+CC=	ccache gcc41
+CXX=	ccache g++41
+.else
 CC=	ccache gcc-ooo
 CXX=	ccache g++-ooo
+.endif #WITH_GNUGCJ
+.endif #WITH_CCACHE
+.if !defined(WITH_CCACHE)
+.if defined(WITH_GNUGCJ)
+CC=	gcc41
+CXX=	g++41
 .else
 CC=	gcc-ooo
 CXX=	g++-ooo
-.endif
+.endif #WITH_GNUGCJ
+.endif #!WITH_CCACHE
+
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison-devel:${PORTSDIR}/devel/bison-devel \
 		imake:${X_IMAKE_PORT}
-.if defined(WITHOUT_JAVA)
-LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
-.else
+.if !defined(WITHOUT_JAVA)
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 .endif
 
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 ANT?=		${LOCALBASE}/bin/ant
 ZIP?=		${PREFIX}/bin/zip
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal
 
 .include <${FILESDIR}/Makefile.knobs>
 
 pre-everything::
 # really tweak, extremely useful when you build all localized language versions
 # needed after when you build with ALL_LOCALIZED_LANGS.
 .if defined(TWEAK_L10N)
 	@${RM} -f ${WRKDIR}/.PLIST*
 	@${RM} -f ${WRKDIR}/.install_done.*
 	@${RM} -f ${WRKDIR}/.package_done.*
 	@${RM} -f ${WRKDIR}/.extract_done.*
 	@${RM} -f ${WRKDIR}/.patch_done.*
 	@${RM} -f ${WRKDIR}/.configure_done.*
 	@${RM} -f ${WRKDIR}/.build_done.*
 	@${TOUCH} ${EXTRACT_COOKIE}
 	@${TOUCH} ${PATCH_COOKIE}
 	@${TOUCH} ${CONFIGURE_COOKIE}
 	@${TOUCH} ${BUILD_COOKIE}
 .endif
 
 post-extract:
 .if defined(WITH_TTF_BYTECODE_ENABLED)
 	@cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/optpatch-freetype
 .endif
 	@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/
 .if !defined(WITHOUT_MOZILLA)
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
 .endif
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 .if (${NUMOFPROCESSES}>1)
 	@cd ${WRKSRC} ;	${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
 .else
 	@cd ${WRKSRC} ;	${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes"  ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
 .endif
 
 do-install:
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${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 ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
 		${PREFIX}/bin/${EXECBASE}
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sagenda
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setup
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sfax
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sweb
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
 	@${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 	@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
 			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${PKGMESSAGE}
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
 .include <${FILESDIR}/Makefile.others>
 .include <bsd.port.post.mk>

Property changes on: head/editors/openoffice-3-devel/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.190
\ No newline at end of property
+1.191
\ No newline at end of property
Index: head/editors/openoffice-3-devel/distinfo
===================================================================
--- head/editors/openoffice-3-devel/distinfo	(revision 139878)
+++ head/editors/openoffice-3-devel/distinfo	(revision 139879)
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_1.9m117_source.tar.bz2) = 95630bc570e10a30b8cfd840c321e00b
-SIZE (openoffice.org2.0/OOo_1.9m117_source.tar.bz2) = 227975719
+MD5 (openoffice.org2.0/OOo_1.9m120_source.tar.bz2) = 9230e6cd7e824a3e3846ccf4a04b92af
+SIZE (openoffice.org2.0/OOo_1.9m120_source.tar.bz2) = 228290473
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
 SIZE (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 38721366

Property changes on: head/editors/openoffice-3-devel/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.72
\ No newline at end of property
+1.73
\ No newline at end of property
Index: head/editors/openoffice-3-devel/files/Makefile.knobs
===================================================================
--- head/editors/openoffice-3-devel/files/Makefile.knobs	(revision 139878)
+++ head/editors/openoffice-3-devel/files/Makefile.knobs	(revision 139879)
@@ -1,107 +1,125 @@
 # Makefile for knobs
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 
+.if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
+CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
+.endif
+.if !defined(WITHOUT_JAVA) && defined(WITH_GNUGCJ)
+CONFIGURE_ARGS+=	--with-java=gij --with-ant-home=${LOCALBASE}/ant
+.endif
 .if defined(WITHOUT_JAVA)
 CONFIGURE_ARGS+=	--without-java
-.else
-CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
 .endif
 
 .if defined(WITH_KDE)
 CONFIGURE_ARGS+=	--enable-kde QTDIR="${QT_PREFIX}"
 .endif
 
 .if defined(WITH_CUPS)
 LIB_DEPENDS+=		cups.2:${PORTSDIR}/print/cups-base
 CONFIGURE_ARGS+=	--enable-cups=yes
 .else
 CONFIGURE_ARGS+=	--enable-cups=no
 .endif
 
 .if defined(WITHOUT_MOZILLA)
 CONFIGURE_ARGS+=	--disable-mozilla
 .else
 CONFIGURE_ARGS+=	--enable-build-mozilla
 .endif
 
 .if defined(ALL_LOCALIZED_LANGS)
 CONFIGURE_ARGS+=	--with-lang=ALL
 .else
 CONFIGURE_ARGS+=	--with-lang=${LOCALIZED_LANG}
 .endif
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
 CONFIGURE_ARGS+=	--enable-debug
 .else
 CONFIGURE_ARGS+=	--enable-symbols
 .endif
 .endif
 
 pre-fetch:
 .if (${OSVERSION} < 503001 && ${OSVERSION} >= 500000) || (${OSVERSION} < 492000)
 	@${ECHO}
 	@${ECHO} "WARNING"
 	@${ECHO} "Your rtld seems to be old."
 	@${ECHO} "Please remake your rtld by:"
 	@${ECHO} "[1] if you use 4-series:"
 	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4"
 	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4"
 	@${ECHO} "# make ; make depend ; make install"
 	@${ECHO} "[2] if you use 5-series:"
 	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5"
 	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5"
 	@${ECHO} "# make ; make depend ; make install"
 	@${ECHO} "AT YOUR OWN RISK!"
 .endif
 	@${ECHO} "OPTIONS:"
 .if !defined(WITH_DEBUG)
 	@${ECHO}
 	@${ECHO} "You can compile OOo with debug symbols with WITH_DEBUG=1"
 	@${ECHO}
 	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
 	@${ECHO} "OOo debug support."
 .endif
-#XXX currently broken
-#.if !defined(WITHOUT_MOZILLA)
-#	@${ECHO}
-#	@${ECHO} "You can compile OOo without Mozilla connectivity by"
-#	@${ECHO} "make -DWITHOUT_MOZILLA"
-#.endif
+.if !defined(WITHOUT_MOZILLA)
+	@${ECHO}
+	@${ECHO} "You can compile OOo without Mozilla connectivity with"
+	@${ECHO} "make -DWITHOUT_MOZILLA"
+.endif
 .if !defined(WITH_TTF_BYTECODE_ENABLED)
 	@${ECHO}
 	@${ECHO} "You may get better quality of glyphs"
-	@${ECHO} "at small bitmap sizes, If you have"
+	@${ECHO} "at small bitmap sizes if you have"
 	@${ECHO} "licensed the Apple patents"
-	@${ECHO} "US05155805 US05159668 and US05325479, by"
+	@${ECHO} "US05155805 US05159668 and US05325479, with"
 	@${ECHO} "make -DWITH_TTF_BYTECODE_ENABLED"
 	@${ECHO} "See http://www.freetype.org/patents.html for details"
 .endif
+	@${ECHO}
+	@${ECHO} "You can select the language for OOo by making it with:"
+	@${ECHO} "make LOCALIZED_LANG=xx" 
+	@${ECHO} "while xx can be one of the following"
+	@${ECHO} "af ar bn be-BY bg ca cs cy da de el en-GB eo es"
+	@${ECHO} "et eu fi fr gl gu-IN he hi-IN hr hu it ja km kn-IN"
+	@${ECHO} "ko lt ms nb nl nn ns pa-IN pl pt pt-BR ru rw sk"
+	@${ECHO} "sl sv ta-IN th tn tr vi xh zh-CN zh-TW zu"
+	@${ECHO}
 #XXX currently broken
 #.if !defined(WITHOUT_JAVA)
 #	@${ECHO}
-#	@${ECHO} "You can compile OOo without Java support by"
+#	@${ECHO} "You can compile OOo without Java support with"
 #	@${ECHO} "make -DWITHOUT_JAVA"
 #.endif
 #XXX currently broken
+#.if !defined(WITH_GNUGCJ)
+#	@${ECHO}
+#	@${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with"
+#	@${ECHO} "make -DWITH_GNUGCJ"
+#.endif
+#XXX currently broken
 #.if !defined(WITH_CUPS)
 #	@${ECHO}
-#	@${ECHO} "You can compile OOo with CUPS support by"
+#	@${ECHO} "You can compile OOo with CUPS support with"
 #	@${ECHO} "make -DWITH_CUPS"
 #.endif
 .if !defined(WITH_KDE)
 	@${ECHO}
-	@${ECHO} "You can compile OOo to use Qt/KDE vclplug"
+	@${ECHO} "You can compile OOo to use Qt/KDE vclplug with"
 	@${ECHO} "make -DWITH_KDE"
 .endif
 	@${ECHO}
 	@${ECHO} "NOTICE:"
 	@${ECHO}
 	@${ECHO} "To build OOo, you should have a lot"
 .if defined(WITH_DEBUG)
 	@${ECHO} "of free diskspace (~ 18GB)."
 .else
-	@${ECHO} "of free diskspace (~ 8.5GB)."
+	@${ECHO} "of free diskspace (~ 9GB)."
 .endif
 	@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"

Property changes on: head/editors/openoffice-3-devel/files/Makefile.knobs
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.16
\ No newline at end of property
+1.17
\ No newline at end of property
Index: head/editors/openoffice-3-devel/files/Makefile.localized
===================================================================
--- head/editors/openoffice-3-devel/files/Makefile.localized	(revision 139878)
+++ head/editors/openoffice-3-devel/files/Makefile.localized	(revision 139879)
@@ -1,212 +1,245 @@
 # localized makefile
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 ################################################################
 #See solenv/inc/postset.mk for details	
 ################################################################
 .if defined(LOCALIZED_LANG)
 .if ${LOCALIZED_LANG} == "af"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ar"
 CATEGORIES=	arabic
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "bn"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "be-BY"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "bg"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ca"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "cs"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "cy"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "da"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "de"
 CATEGORIES=	german
 LANG_PKGNAME=	${LOCALIZED_LANG}
 COMMENT=	Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und Praesentationsprogramm
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "el"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "en-GB"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "eo"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "es"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "et"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "eu"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "fi"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "fr"
 CATEGORIES=	french
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "gl"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "gu-IN"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "he"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "hi-IN"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "hr"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "hu"
 CATEGORIES=     hungarian
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "it"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ja"
 CATEGORIES=	japanese
 LANG_PKGNAME=	${LOCALIZED_LANG}
 RUN_DEPENDS+=   ${X11BASE}/lib/X11/fonts/TrueType/sazanami-mincho.ttf:${PORTSDIR}/japanese/sazanami-ttf
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "km"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "kn-IN"
 LANG_PKGNAME=	kn
 LANG_SUFFIX=	IN
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ko"
 CATEGORIES=     korean
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "lt"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ms"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "nb"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "nl"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "nn"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ns"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "pa-IN"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "pl"
 CATEGORIES=	polish
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "pt"
 COMMENT=	Editor texto/grBaGico, banco de dados/planilha/navegador integrado
 CATEGORIES=	portuguese
 LANG_PKGNAME=	${LOCALIZED_LANG}
 LANG_EXT=	03
 LANG_CONFIGURE_ARG=	PORT
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "pt-BR"
 COMMENT=        Editor texto/grBaGico, banco de dados/planilha/navegador integrado
 CATEGORIES=     portuguese
 LANG_PKGNAME=	pt
 LANG_SUFFIX=	BR
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ru"
 CATEGORIES=	russian
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "rw"
+CATEGORIES=	russian
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "sk"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "sl"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "sv"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "ta-IN"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "th"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 #.if ${LOCALIZED_LANG} == "tn"
 #LANG_PKGNAME=	${LOCALIZED_LANG}
 #.endif
 ################################################################
 .if ${LOCALIZED_LANG} == "tr"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "vi"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "xh"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "zh-CN"
 CATEGORIES=	chinese
 LANG_PKGNAME=	zh
 LANG_SUFFIX=	CN
 BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "zh-TW"
 CATEGORIES=	chinese
 LANG_PKGNAME=	zh
 LANG_SUFFIX=	TW
 BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "zu"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .endif

Property changes on: head/editors/openoffice-3-devel/files/Makefile.localized
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.7
\ No newline at end of property
Index: head/editors/openoffice-3-devel/files/pkg-message.in
===================================================================
--- head/editors/openoffice-3-devel/files/pkg-message.in	(revision 139878)
+++ head/editors/openoffice-3-devel/files/pkg-message.in	(revision 139879)
@@ -1,53 +1,51 @@
 OpenOffice.org Build %%RELEASE_NR%%m%%MILESTONE%% Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
 		and Maho Nakata <maho@FreeBSD.org>
 
 OpenOffice.org %%RELEASE_NR%%m%%MILESTONE%% will soon been installed in
 %%PREFIX%%/%%EXECBASE%%
 
-1 User installation
--------------------
+1. User installation
+--------------------
 
 Just type "%%EXECBASE%%" after you have successfully
 installed the package. If there is no installed
 OO.org dir in your homedir, you'll be prompted to
-install some files and choose a installed JDK.
+install some files and choose an installed JDK.
 The setup installs a ".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" folder
 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
-have both a line for each version which is installed.
+version, you may look in the file ".sversionrc" located
+in your homedir. In this file, OpenOffice and StarOffice
+will have a line for each version that is installed.
 After removing the problematic line you should be able to
-install again.
+install the package again.
 
-2 Start OO.org
---------------
+2. Starting OO.org
+------------------
 
-There are some wrappers installed for fast startup.
+There are some wrappers installed for faster startup.
 Add "%%PREFIX%%/bin/" to your PATH and you will be able
 to use them.
 
 %%PREFIX%%/bin/%%EXECBASE%%
 %%PREFIX%%/bin/%%EXECBASE%%-sagenda
 %%PREFIX%%/bin/%%EXECBASE%%-scalc
 %%PREFIX%%/bin/%%EXECBASE%%-sdraw
 %%PREFIX%%/bin/%%EXECBASE%%-setup
 %%PREFIX%%/bin/%%EXECBASE%%-sfax
 %%PREFIX%%/bin/%%EXECBASE%%-simpress
 %%PREFIX%%/bin/%%EXECBASE%%-spadmin
 %%PREFIX%%/bin/%%EXECBASE%%-sweb
 %%PREFIX%%/bin/%%EXECBASE%%-swriter
 
 OO.org does need $LANG to be set to a suitable value.
 
-3 If you stuck into a trouble
+3. If you run into problems
 --------------------------------------------------
-Somehow you can stuck into a trouble. 
-To solve this issue, please remove the already installed
-".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" dir in your homedir and remove the
-appropriate entry from ".sversionrc". After you have done
-this, redo the user installation and the problem will
-go away.
+If you somehow run into problems, please remove the already installed
+".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" dir in your homedir
+along with the appropriate entry in ".sversionrc". Redo the user
+installation and the problems should go away.

Property changes on: head/editors/openoffice-3-devel/files/pkg-message.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/editors/openoffice.org-2/Makefile
===================================================================
--- head/editors/openoffice.org-2/Makefile	(revision 139878)
+++ head/editors/openoffice.org-2/Makefile	(revision 139879)
@@ -1,193 +1,209 @@
 # New ports collection makefile for: OpenOffice.org
 # Date created:		28 February 2002
 # Whom:                 Martin Blapp
 #
 # $FreeBSD$
 #
 
 PORTNAME=	openoffice
 PORTVERSION=	2.0.${SNAPDATE}
 CATEGORIES+=	editors
 MASTER_SITES+=	ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
 DISTFILES+=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 gpc231.tar.Z:gpc
 EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
 
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
 USE_GNOME+=	libidl
 .endif
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=        3
 .endif
 USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 
-.if !defined(WITHOUT_JAVA)
+.if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
 JAVA_VERSION=	1.4
 JAVA_BUILD=	jdk
 .endif
 
 .include <bsd.port.pre.mk>
 .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"
 .endif
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		117
-SNAPDATE=		20050713
+MILESTONE=		120
+SNAPDATE=		20050722
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
 PACKAGE_BASENAME=	OOo_${RELEASE_NR}m${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
 .if defined(LANG_PKGNAME)
 PKGNAMEPREFIX=          ${LANG_PKGNAME}-
 .endif
 .if defined(LANG_SUFFIX)
 PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
+.if defined(WITH_GNUGCJ)
+BUILD_DEPENDS+=	gcc41:${PORTSDIR}/lang/gcc41
+BROKEN=	"still work in progress"
+.else
 BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
+.endif
+
 # FIXME (correctly add ccache before gcc and g++)
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
+.if defined(WITH_GNUGCJ)
+CC=	ccache gcc41
+CXX=	ccache g++41
+.else
 CC=	ccache gcc-ooo
 CXX=	ccache g++-ooo
+.endif #WITH_GNUGCJ
+.endif #WITH_CCACHE
+.if !defined(WITH_CCACHE)
+.if defined(WITH_GNUGCJ)
+CC=	gcc41
+CXX=	g++41
 .else
 CC=	gcc-ooo
 CXX=	g++-ooo
-.endif
+.endif #WITH_GNUGCJ
+.endif #!WITH_CCACHE
+
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison-devel:${PORTSDIR}/devel/bison-devel \
 		imake:${X_IMAKE_PORT}
-.if defined(WITHOUT_JAVA)
-LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
-.else
+.if !defined(WITHOUT_JAVA)
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 .endif
 
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 ANT?=		${LOCALBASE}/bin/ant
 ZIP?=		${PREFIX}/bin/zip
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal
 
 .include <${FILESDIR}/Makefile.knobs>
 
 pre-everything::
 # really tweak, extremely useful when you build all localized language versions
 # needed after when you build with ALL_LOCALIZED_LANGS.
 .if defined(TWEAK_L10N)
 	@${RM} -f ${WRKDIR}/.PLIST*
 	@${RM} -f ${WRKDIR}/.install_done.*
 	@${RM} -f ${WRKDIR}/.package_done.*
 	@${RM} -f ${WRKDIR}/.extract_done.*
 	@${RM} -f ${WRKDIR}/.patch_done.*
 	@${RM} -f ${WRKDIR}/.configure_done.*
 	@${RM} -f ${WRKDIR}/.build_done.*
 	@${TOUCH} ${EXTRACT_COOKIE}
 	@${TOUCH} ${PATCH_COOKIE}
 	@${TOUCH} ${CONFIGURE_COOKIE}
 	@${TOUCH} ${BUILD_COOKIE}
 .endif
 
 post-extract:
 .if defined(WITH_TTF_BYTECODE_ENABLED)
 	@cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/optpatch-freetype
 .endif
 	@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/
 .if !defined(WITHOUT_MOZILLA)
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
 .endif
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 .if (${NUMOFPROCESSES}>1)
 	@cd ${WRKSRC} ;	${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
 .else
 	@cd ${WRKSRC} ;	${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes"  ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
 .endif
 
 do-install:
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${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 ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
 		${PREFIX}/bin/${EXECBASE}
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sagenda
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setup
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sfax
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sweb
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
 	@${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 	@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
 			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${PKGMESSAGE}
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
 .include <${FILESDIR}/Makefile.others>
 .include <bsd.port.post.mk>

Property changes on: head/editors/openoffice.org-2/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.190
\ No newline at end of property
+1.191
\ No newline at end of property
Index: head/editors/openoffice.org-2/distinfo
===================================================================
--- head/editors/openoffice.org-2/distinfo	(revision 139878)
+++ head/editors/openoffice.org-2/distinfo	(revision 139879)
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_1.9m117_source.tar.bz2) = 95630bc570e10a30b8cfd840c321e00b
-SIZE (openoffice.org2.0/OOo_1.9m117_source.tar.bz2) = 227975719
+MD5 (openoffice.org2.0/OOo_1.9m120_source.tar.bz2) = 9230e6cd7e824a3e3846ccf4a04b92af
+SIZE (openoffice.org2.0/OOo_1.9m120_source.tar.bz2) = 228290473
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
 SIZE (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 38721366

Property changes on: head/editors/openoffice.org-2/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.72
\ No newline at end of property
+1.73
\ No newline at end of property
Index: head/editors/openoffice.org-2/files/Makefile.knobs
===================================================================
--- head/editors/openoffice.org-2/files/Makefile.knobs	(revision 139878)
+++ head/editors/openoffice.org-2/files/Makefile.knobs	(revision 139879)
@@ -1,107 +1,125 @@
 # Makefile for knobs
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 
+.if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
+CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
+.endif
+.if !defined(WITHOUT_JAVA) && defined(WITH_GNUGCJ)
+CONFIGURE_ARGS+=	--with-java=gij --with-ant-home=${LOCALBASE}/ant
+.endif
 .if defined(WITHOUT_JAVA)
 CONFIGURE_ARGS+=	--without-java
-.else
-CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
 .endif
 
 .if defined(WITH_KDE)
 CONFIGURE_ARGS+=	--enable-kde QTDIR="${QT_PREFIX}"
 .endif
 
 .if defined(WITH_CUPS)
 LIB_DEPENDS+=		cups.2:${PORTSDIR}/print/cups-base
 CONFIGURE_ARGS+=	--enable-cups=yes
 .else
 CONFIGURE_ARGS+=	--enable-cups=no
 .endif
 
 .if defined(WITHOUT_MOZILLA)
 CONFIGURE_ARGS+=	--disable-mozilla
 .else
 CONFIGURE_ARGS+=	--enable-build-mozilla
 .endif
 
 .if defined(ALL_LOCALIZED_LANGS)
 CONFIGURE_ARGS+=	--with-lang=ALL
 .else
 CONFIGURE_ARGS+=	--with-lang=${LOCALIZED_LANG}
 .endif
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
 CONFIGURE_ARGS+=	--enable-debug
 .else
 CONFIGURE_ARGS+=	--enable-symbols
 .endif
 .endif
 
 pre-fetch:
 .if (${OSVERSION} < 503001 && ${OSVERSION} >= 500000) || (${OSVERSION} < 492000)
 	@${ECHO}
 	@${ECHO} "WARNING"
 	@${ECHO} "Your rtld seems to be old."
 	@${ECHO} "Please remake your rtld by:"
 	@${ECHO} "[1] if you use 4-series:"
 	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4"
 	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4"
 	@${ECHO} "# make ; make depend ; make install"
 	@${ECHO} "[2] if you use 5-series:"
 	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5"
 	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5"
 	@${ECHO} "# make ; make depend ; make install"
 	@${ECHO} "AT YOUR OWN RISK!"
 .endif
 	@${ECHO} "OPTIONS:"
 .if !defined(WITH_DEBUG)
 	@${ECHO}
 	@${ECHO} "You can compile OOo with debug symbols with WITH_DEBUG=1"
 	@${ECHO}
 	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
 	@${ECHO} "OOo debug support."
 .endif
-#XXX currently broken
-#.if !defined(WITHOUT_MOZILLA)
-#	@${ECHO}
-#	@${ECHO} "You can compile OOo without Mozilla connectivity by"
-#	@${ECHO} "make -DWITHOUT_MOZILLA"
-#.endif
+.if !defined(WITHOUT_MOZILLA)
+	@${ECHO}
+	@${ECHO} "You can compile OOo without Mozilla connectivity with"
+	@${ECHO} "make -DWITHOUT_MOZILLA"
+.endif
 .if !defined(WITH_TTF_BYTECODE_ENABLED)
 	@${ECHO}
 	@${ECHO} "You may get better quality of glyphs"
-	@${ECHO} "at small bitmap sizes, If you have"
+	@${ECHO} "at small bitmap sizes if you have"
 	@${ECHO} "licensed the Apple patents"
-	@${ECHO} "US05155805 US05159668 and US05325479, by"
+	@${ECHO} "US05155805 US05159668 and US05325479, with"
 	@${ECHO} "make -DWITH_TTF_BYTECODE_ENABLED"
 	@${ECHO} "See http://www.freetype.org/patents.html for details"
 .endif
+	@${ECHO}
+	@${ECHO} "You can select the language for OOo by making it with:"
+	@${ECHO} "make LOCALIZED_LANG=xx" 
+	@${ECHO} "while xx can be one of the following"
+	@${ECHO} "af ar bn be-BY bg ca cs cy da de el en-GB eo es"
+	@${ECHO} "et eu fi fr gl gu-IN he hi-IN hr hu it ja km kn-IN"
+	@${ECHO} "ko lt ms nb nl nn ns pa-IN pl pt pt-BR ru rw sk"
+	@${ECHO} "sl sv ta-IN th tn tr vi xh zh-CN zh-TW zu"
+	@${ECHO}
 #XXX currently broken
 #.if !defined(WITHOUT_JAVA)
 #	@${ECHO}
-#	@${ECHO} "You can compile OOo without Java support by"
+#	@${ECHO} "You can compile OOo without Java support with"
 #	@${ECHO} "make -DWITHOUT_JAVA"
 #.endif
 #XXX currently broken
+#.if !defined(WITH_GNUGCJ)
+#	@${ECHO}
+#	@${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with"
+#	@${ECHO} "make -DWITH_GNUGCJ"
+#.endif
+#XXX currently broken
 #.if !defined(WITH_CUPS)
 #	@${ECHO}
-#	@${ECHO} "You can compile OOo with CUPS support by"
+#	@${ECHO} "You can compile OOo with CUPS support with"
 #	@${ECHO} "make -DWITH_CUPS"
 #.endif
 .if !defined(WITH_KDE)
 	@${ECHO}
-	@${ECHO} "You can compile OOo to use Qt/KDE vclplug"
+	@${ECHO} "You can compile OOo to use Qt/KDE vclplug with"
 	@${ECHO} "make -DWITH_KDE"
 .endif
 	@${ECHO}
 	@${ECHO} "NOTICE:"
 	@${ECHO}
 	@${ECHO} "To build OOo, you should have a lot"
 .if defined(WITH_DEBUG)
 	@${ECHO} "of free diskspace (~ 18GB)."
 .else
-	@${ECHO} "of free diskspace (~ 8.5GB)."
+	@${ECHO} "of free diskspace (~ 9GB)."
 .endif
 	@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"

Property changes on: head/editors/openoffice.org-2/files/Makefile.knobs
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.16
\ No newline at end of property
+1.17
\ No newline at end of property
Index: head/editors/openoffice.org-2/files/Makefile.localized
===================================================================
--- head/editors/openoffice.org-2/files/Makefile.localized	(revision 139878)
+++ head/editors/openoffice.org-2/files/Makefile.localized	(revision 139879)
@@ -1,212 +1,245 @@
 # localized makefile
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 ################################################################
 #See solenv/inc/postset.mk for details	
 ################################################################
 .if defined(LOCALIZED_LANG)
 .if ${LOCALIZED_LANG} == "af"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ar"
 CATEGORIES=	arabic
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "bn"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "be-BY"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "bg"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ca"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "cs"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "cy"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "da"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "de"
 CATEGORIES=	german
 LANG_PKGNAME=	${LOCALIZED_LANG}
 COMMENT=	Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und Praesentationsprogramm
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "el"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "en-GB"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "eo"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "es"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "et"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "eu"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "fi"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "fr"
 CATEGORIES=	french
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "gl"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "gu-IN"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "he"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "hi-IN"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "hr"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "hu"
 CATEGORIES=     hungarian
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "it"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ja"
 CATEGORIES=	japanese
 LANG_PKGNAME=	${LOCALIZED_LANG}
 RUN_DEPENDS+=   ${X11BASE}/lib/X11/fonts/TrueType/sazanami-mincho.ttf:${PORTSDIR}/japanese/sazanami-ttf
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "km"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "kn-IN"
 LANG_PKGNAME=	kn
 LANG_SUFFIX=	IN
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ko"
 CATEGORIES=     korean
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "lt"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ms"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "nb"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "nl"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "nn"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ns"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "pa-IN"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "pl"
 CATEGORIES=	polish
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "pt"
 COMMENT=	Editor texto/grBaGico, banco de dados/planilha/navegador integrado
 CATEGORIES=	portuguese
 LANG_PKGNAME=	${LOCALIZED_LANG}
 LANG_EXT=	03
 LANG_CONFIGURE_ARG=	PORT
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "pt-BR"
 COMMENT=        Editor texto/grBaGico, banco de dados/planilha/navegador integrado
 CATEGORIES=     portuguese
 LANG_PKGNAME=	pt
 LANG_SUFFIX=	BR
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ru"
 CATEGORIES=	russian
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "rw"
+CATEGORIES=	russian
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "sk"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "sl"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "sv"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "ta-IN"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "th"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 #.if ${LOCALIZED_LANG} == "tn"
 #LANG_PKGNAME=	${LOCALIZED_LANG}
 #.endif
 ################################################################
 .if ${LOCALIZED_LANG} == "tr"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "vi"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "xh"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "zh-CN"
 CATEGORIES=	chinese
 LANG_PKGNAME=	zh
 LANG_SUFFIX=	CN
 BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "zh-TW"
 CATEGORIES=	chinese
 LANG_PKGNAME=	zh
 LANG_SUFFIX=	TW
 BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "zu"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .endif

Property changes on: head/editors/openoffice.org-2/files/Makefile.localized
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.7
\ No newline at end of property
Index: head/editors/openoffice.org-2/files/pkg-message.in
===================================================================
--- head/editors/openoffice.org-2/files/pkg-message.in	(revision 139878)
+++ head/editors/openoffice.org-2/files/pkg-message.in	(revision 139879)
@@ -1,53 +1,51 @@
 OpenOffice.org Build %%RELEASE_NR%%m%%MILESTONE%% Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
 		and Maho Nakata <maho@FreeBSD.org>
 
 OpenOffice.org %%RELEASE_NR%%m%%MILESTONE%% will soon been installed in
 %%PREFIX%%/%%EXECBASE%%
 
-1 User installation
--------------------
+1. User installation
+--------------------
 
 Just type "%%EXECBASE%%" after you have successfully
 installed the package. If there is no installed
 OO.org dir in your homedir, you'll be prompted to
-install some files and choose a installed JDK.
+install some files and choose an installed JDK.
 The setup installs a ".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" folder
 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
-have both a line for each version which is installed.
+version, you may look in the file ".sversionrc" located
+in your homedir. In this file, OpenOffice and StarOffice
+will have a line for each version that is installed.
 After removing the problematic line you should be able to
-install again.
+install the package again.
 
-2 Start OO.org
---------------
+2. Starting OO.org
+------------------
 
-There are some wrappers installed for fast startup.
+There are some wrappers installed for faster startup.
 Add "%%PREFIX%%/bin/" to your PATH and you will be able
 to use them.
 
 %%PREFIX%%/bin/%%EXECBASE%%
 %%PREFIX%%/bin/%%EXECBASE%%-sagenda
 %%PREFIX%%/bin/%%EXECBASE%%-scalc
 %%PREFIX%%/bin/%%EXECBASE%%-sdraw
 %%PREFIX%%/bin/%%EXECBASE%%-setup
 %%PREFIX%%/bin/%%EXECBASE%%-sfax
 %%PREFIX%%/bin/%%EXECBASE%%-simpress
 %%PREFIX%%/bin/%%EXECBASE%%-spadmin
 %%PREFIX%%/bin/%%EXECBASE%%-sweb
 %%PREFIX%%/bin/%%EXECBASE%%-swriter
 
 OO.org does need $LANG to be set to a suitable value.
 
-3 If you stuck into a trouble
+3. If you run into problems
 --------------------------------------------------
-Somehow you can stuck into a trouble. 
-To solve this issue, please remove the already installed
-".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" dir in your homedir and remove the
-appropriate entry from ".sversionrc". After you have done
-this, redo the user installation and the problem will
-go away.
+If you somehow run into problems, please remove the already installed
+".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" dir in your homedir
+along with the appropriate entry in ".sversionrc". Redo the user
+installation and the problems should go away.

Property changes on: head/editors/openoffice.org-2/files/pkg-message.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/editors/openoffice.org-2-RC/Makefile
===================================================================
--- head/editors/openoffice.org-2-RC/Makefile	(revision 139878)
+++ head/editors/openoffice.org-2-RC/Makefile	(revision 139879)
@@ -1,193 +1,209 @@
 # New ports collection makefile for: OpenOffice.org
 # Date created:		28 February 2002
 # Whom:                 Martin Blapp
 #
 # $FreeBSD$
 #
 
 PORTNAME=	openoffice
 PORTVERSION=	2.0.${SNAPDATE}
 CATEGORIES+=	editors
 MASTER_SITES+=	ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
 DISTFILES+=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 gpc231.tar.Z:gpc
 EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
 
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
 USE_GNOME+=	libidl
 .endif
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=        3
 .endif
 USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 
-.if !defined(WITHOUT_JAVA)
+.if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
 JAVA_VERSION=	1.4
 JAVA_BUILD=	jdk
 .endif
 
 .include <bsd.port.pre.mk>
 .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"
 .endif
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		117
-SNAPDATE=		20050713
+MILESTONE=		120
+SNAPDATE=		20050722
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
 PACKAGE_BASENAME=	OOo_${RELEASE_NR}m${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
 .if defined(LANG_PKGNAME)
 PKGNAMEPREFIX=          ${LANG_PKGNAME}-
 .endif
 .if defined(LANG_SUFFIX)
 PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
+.if defined(WITH_GNUGCJ)
+BUILD_DEPENDS+=	gcc41:${PORTSDIR}/lang/gcc41
+BROKEN=	"still work in progress"
+.else
 BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
+.endif
+
 # FIXME (correctly add ccache before gcc and g++)
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
+.if defined(WITH_GNUGCJ)
+CC=	ccache gcc41
+CXX=	ccache g++41
+.else
 CC=	ccache gcc-ooo
 CXX=	ccache g++-ooo
+.endif #WITH_GNUGCJ
+.endif #WITH_CCACHE
+.if !defined(WITH_CCACHE)
+.if defined(WITH_GNUGCJ)
+CC=	gcc41
+CXX=	g++41
 .else
 CC=	gcc-ooo
 CXX=	g++-ooo
-.endif
+.endif #WITH_GNUGCJ
+.endif #!WITH_CCACHE
+
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison-devel:${PORTSDIR}/devel/bison-devel \
 		imake:${X_IMAKE_PORT}
-.if defined(WITHOUT_JAVA)
-LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
-.else
+.if !defined(WITHOUT_JAVA)
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 .endif
 
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 ANT?=		${LOCALBASE}/bin/ant
 ZIP?=		${PREFIX}/bin/zip
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal
 
 .include <${FILESDIR}/Makefile.knobs>
 
 pre-everything::
 # really tweak, extremely useful when you build all localized language versions
 # needed after when you build with ALL_LOCALIZED_LANGS.
 .if defined(TWEAK_L10N)
 	@${RM} -f ${WRKDIR}/.PLIST*
 	@${RM} -f ${WRKDIR}/.install_done.*
 	@${RM} -f ${WRKDIR}/.package_done.*
 	@${RM} -f ${WRKDIR}/.extract_done.*
 	@${RM} -f ${WRKDIR}/.patch_done.*
 	@${RM} -f ${WRKDIR}/.configure_done.*
 	@${RM} -f ${WRKDIR}/.build_done.*
 	@${TOUCH} ${EXTRACT_COOKIE}
 	@${TOUCH} ${PATCH_COOKIE}
 	@${TOUCH} ${CONFIGURE_COOKIE}
 	@${TOUCH} ${BUILD_COOKIE}
 .endif
 
 post-extract:
 .if defined(WITH_TTF_BYTECODE_ENABLED)
 	@cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/optpatch-freetype
 .endif
 	@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/
 .if !defined(WITHOUT_MOZILLA)
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
 .endif
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 .if (${NUMOFPROCESSES}>1)
 	@cd ${WRKSRC} ;	${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
 .else
 	@cd ${WRKSRC} ;	${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes"  ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
 .endif
 
 do-install:
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${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 ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
 		${PREFIX}/bin/${EXECBASE}
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sagenda
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setup
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sfax
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sweb
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
 	@${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 	@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
 			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${PKGMESSAGE}
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
 .include <${FILESDIR}/Makefile.others>
 .include <bsd.port.post.mk>

Property changes on: head/editors/openoffice.org-2-RC/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.190
\ No newline at end of property
+1.191
\ No newline at end of property
Index: head/editors/openoffice.org-2-RC/distinfo
===================================================================
--- head/editors/openoffice.org-2-RC/distinfo	(revision 139878)
+++ head/editors/openoffice.org-2-RC/distinfo	(revision 139879)
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_1.9m117_source.tar.bz2) = 95630bc570e10a30b8cfd840c321e00b
-SIZE (openoffice.org2.0/OOo_1.9m117_source.tar.bz2) = 227975719
+MD5 (openoffice.org2.0/OOo_1.9m120_source.tar.bz2) = 9230e6cd7e824a3e3846ccf4a04b92af
+SIZE (openoffice.org2.0/OOo_1.9m120_source.tar.bz2) = 228290473
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
 SIZE (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 38721366

Property changes on: head/editors/openoffice.org-2-RC/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.72
\ No newline at end of property
+1.73
\ No newline at end of property
Index: head/editors/openoffice.org-2-RC/files/Makefile.knobs
===================================================================
--- head/editors/openoffice.org-2-RC/files/Makefile.knobs	(revision 139878)
+++ head/editors/openoffice.org-2-RC/files/Makefile.knobs	(revision 139879)
@@ -1,107 +1,125 @@
 # Makefile for knobs
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 
+.if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
+CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
+.endif
+.if !defined(WITHOUT_JAVA) && defined(WITH_GNUGCJ)
+CONFIGURE_ARGS+=	--with-java=gij --with-ant-home=${LOCALBASE}/ant
+.endif
 .if defined(WITHOUT_JAVA)
 CONFIGURE_ARGS+=	--without-java
-.else
-CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
 .endif
 
 .if defined(WITH_KDE)
 CONFIGURE_ARGS+=	--enable-kde QTDIR="${QT_PREFIX}"
 .endif
 
 .if defined(WITH_CUPS)
 LIB_DEPENDS+=		cups.2:${PORTSDIR}/print/cups-base
 CONFIGURE_ARGS+=	--enable-cups=yes
 .else
 CONFIGURE_ARGS+=	--enable-cups=no
 .endif
 
 .if defined(WITHOUT_MOZILLA)
 CONFIGURE_ARGS+=	--disable-mozilla
 .else
 CONFIGURE_ARGS+=	--enable-build-mozilla
 .endif
 
 .if defined(ALL_LOCALIZED_LANGS)
 CONFIGURE_ARGS+=	--with-lang=ALL
 .else
 CONFIGURE_ARGS+=	--with-lang=${LOCALIZED_LANG}
 .endif
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
 CONFIGURE_ARGS+=	--enable-debug
 .else
 CONFIGURE_ARGS+=	--enable-symbols
 .endif
 .endif
 
 pre-fetch:
 .if (${OSVERSION} < 503001 && ${OSVERSION} >= 500000) || (${OSVERSION} < 492000)
 	@${ECHO}
 	@${ECHO} "WARNING"
 	@${ECHO} "Your rtld seems to be old."
 	@${ECHO} "Please remake your rtld by:"
 	@${ECHO} "[1] if you use 4-series:"
 	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4"
 	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4"
 	@${ECHO} "# make ; make depend ; make install"
 	@${ECHO} "[2] if you use 5-series:"
 	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5"
 	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5"
 	@${ECHO} "# make ; make depend ; make install"
 	@${ECHO} "AT YOUR OWN RISK!"
 .endif
 	@${ECHO} "OPTIONS:"
 .if !defined(WITH_DEBUG)
 	@${ECHO}
 	@${ECHO} "You can compile OOo with debug symbols with WITH_DEBUG=1"
 	@${ECHO}
 	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
 	@${ECHO} "OOo debug support."
 .endif
-#XXX currently broken
-#.if !defined(WITHOUT_MOZILLA)
-#	@${ECHO}
-#	@${ECHO} "You can compile OOo without Mozilla connectivity by"
-#	@${ECHO} "make -DWITHOUT_MOZILLA"
-#.endif
+.if !defined(WITHOUT_MOZILLA)
+	@${ECHO}
+	@${ECHO} "You can compile OOo without Mozilla connectivity with"
+	@${ECHO} "make -DWITHOUT_MOZILLA"
+.endif
 .if !defined(WITH_TTF_BYTECODE_ENABLED)
 	@${ECHO}
 	@${ECHO} "You may get better quality of glyphs"
-	@${ECHO} "at small bitmap sizes, If you have"
+	@${ECHO} "at small bitmap sizes if you have"
 	@${ECHO} "licensed the Apple patents"
-	@${ECHO} "US05155805 US05159668 and US05325479, by"
+	@${ECHO} "US05155805 US05159668 and US05325479, with"
 	@${ECHO} "make -DWITH_TTF_BYTECODE_ENABLED"
 	@${ECHO} "See http://www.freetype.org/patents.html for details"
 .endif
+	@${ECHO}
+	@${ECHO} "You can select the language for OOo by making it with:"
+	@${ECHO} "make LOCALIZED_LANG=xx" 
+	@${ECHO} "while xx can be one of the following"
+	@${ECHO} "af ar bn be-BY bg ca cs cy da de el en-GB eo es"
+	@${ECHO} "et eu fi fr gl gu-IN he hi-IN hr hu it ja km kn-IN"
+	@${ECHO} "ko lt ms nb nl nn ns pa-IN pl pt pt-BR ru rw sk"
+	@${ECHO} "sl sv ta-IN th tn tr vi xh zh-CN zh-TW zu"
+	@${ECHO}
 #XXX currently broken
 #.if !defined(WITHOUT_JAVA)
 #	@${ECHO}
-#	@${ECHO} "You can compile OOo without Java support by"
+#	@${ECHO} "You can compile OOo without Java support with"
 #	@${ECHO} "make -DWITHOUT_JAVA"
 #.endif
 #XXX currently broken
+#.if !defined(WITH_GNUGCJ)
+#	@${ECHO}
+#	@${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with"
+#	@${ECHO} "make -DWITH_GNUGCJ"
+#.endif
+#XXX currently broken
 #.if !defined(WITH_CUPS)
 #	@${ECHO}
-#	@${ECHO} "You can compile OOo with CUPS support by"
+#	@${ECHO} "You can compile OOo with CUPS support with"
 #	@${ECHO} "make -DWITH_CUPS"
 #.endif
 .if !defined(WITH_KDE)
 	@${ECHO}
-	@${ECHO} "You can compile OOo to use Qt/KDE vclplug"
+	@${ECHO} "You can compile OOo to use Qt/KDE vclplug with"
 	@${ECHO} "make -DWITH_KDE"
 .endif
 	@${ECHO}
 	@${ECHO} "NOTICE:"
 	@${ECHO}
 	@${ECHO} "To build OOo, you should have a lot"
 .if defined(WITH_DEBUG)
 	@${ECHO} "of free diskspace (~ 18GB)."
 .else
-	@${ECHO} "of free diskspace (~ 8.5GB)."
+	@${ECHO} "of free diskspace (~ 9GB)."
 .endif
 	@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"

Property changes on: head/editors/openoffice.org-2-RC/files/Makefile.knobs
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.16
\ No newline at end of property
+1.17
\ No newline at end of property
Index: head/editors/openoffice.org-2-RC/files/Makefile.localized
===================================================================
--- head/editors/openoffice.org-2-RC/files/Makefile.localized	(revision 139878)
+++ head/editors/openoffice.org-2-RC/files/Makefile.localized	(revision 139879)
@@ -1,212 +1,245 @@
 # localized makefile
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 ################################################################
 #See solenv/inc/postset.mk for details	
 ################################################################
 .if defined(LOCALIZED_LANG)
 .if ${LOCALIZED_LANG} == "af"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ar"
 CATEGORIES=	arabic
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "bn"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "be-BY"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "bg"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ca"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "cs"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "cy"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "da"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "de"
 CATEGORIES=	german
 LANG_PKGNAME=	${LOCALIZED_LANG}
 COMMENT=	Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und Praesentationsprogramm
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "el"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "en-GB"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "eo"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "es"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "et"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "eu"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "fi"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "fr"
 CATEGORIES=	french
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "gl"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "gu-IN"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "he"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "hi-IN"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "hr"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "hu"
 CATEGORIES=     hungarian
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "it"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ja"
 CATEGORIES=	japanese
 LANG_PKGNAME=	${LOCALIZED_LANG}
 RUN_DEPENDS+=   ${X11BASE}/lib/X11/fonts/TrueType/sazanami-mincho.ttf:${PORTSDIR}/japanese/sazanami-ttf
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "km"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "kn-IN"
 LANG_PKGNAME=	kn
 LANG_SUFFIX=	IN
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ko"
 CATEGORIES=     korean
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "lt"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ms"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "nb"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "nl"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "nn"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ns"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "pa-IN"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "pl"
 CATEGORIES=	polish
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "pt"
 COMMENT=	Editor texto/grBaGico, banco de dados/planilha/navegador integrado
 CATEGORIES=	portuguese
 LANG_PKGNAME=	${LOCALIZED_LANG}
 LANG_EXT=	03
 LANG_CONFIGURE_ARG=	PORT
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "pt-BR"
 COMMENT=        Editor texto/grBaGico, banco de dados/planilha/navegador integrado
 CATEGORIES=     portuguese
 LANG_PKGNAME=	pt
 LANG_SUFFIX=	BR
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ru"
 CATEGORIES=	russian
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "rw"
+CATEGORIES=	russian
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "sk"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "sl"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "sv"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "ta-IN"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "th"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 #.if ${LOCALIZED_LANG} == "tn"
 #LANG_PKGNAME=	${LOCALIZED_LANG}
 #.endif
 ################################################################
 .if ${LOCALIZED_LANG} == "tr"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "vi"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "xh"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "zh-CN"
 CATEGORIES=	chinese
 LANG_PKGNAME=	zh
 LANG_SUFFIX=	CN
 BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "zh-TW"
 CATEGORIES=	chinese
 LANG_PKGNAME=	zh
 LANG_SUFFIX=	TW
 BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "zu"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .endif

Property changes on: head/editors/openoffice.org-2-RC/files/Makefile.localized
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.7
\ No newline at end of property
Index: head/editors/openoffice.org-2-RC/files/pkg-message.in
===================================================================
--- head/editors/openoffice.org-2-RC/files/pkg-message.in	(revision 139878)
+++ head/editors/openoffice.org-2-RC/files/pkg-message.in	(revision 139879)
@@ -1,53 +1,51 @@
 OpenOffice.org Build %%RELEASE_NR%%m%%MILESTONE%% Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
 		and Maho Nakata <maho@FreeBSD.org>
 
 OpenOffice.org %%RELEASE_NR%%m%%MILESTONE%% will soon been installed in
 %%PREFIX%%/%%EXECBASE%%
 
-1 User installation
--------------------
+1. User installation
+--------------------
 
 Just type "%%EXECBASE%%" after you have successfully
 installed the package. If there is no installed
 OO.org dir in your homedir, you'll be prompted to
-install some files and choose a installed JDK.
+install some files and choose an installed JDK.
 The setup installs a ".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" folder
 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
-have both a line for each version which is installed.
+version, you may look in the file ".sversionrc" located
+in your homedir. In this file, OpenOffice and StarOffice
+will have a line for each version that is installed.
 After removing the problematic line you should be able to
-install again.
+install the package again.
 
-2 Start OO.org
---------------
+2. Starting OO.org
+------------------
 
-There are some wrappers installed for fast startup.
+There are some wrappers installed for faster startup.
 Add "%%PREFIX%%/bin/" to your PATH and you will be able
 to use them.
 
 %%PREFIX%%/bin/%%EXECBASE%%
 %%PREFIX%%/bin/%%EXECBASE%%-sagenda
 %%PREFIX%%/bin/%%EXECBASE%%-scalc
 %%PREFIX%%/bin/%%EXECBASE%%-sdraw
 %%PREFIX%%/bin/%%EXECBASE%%-setup
 %%PREFIX%%/bin/%%EXECBASE%%-sfax
 %%PREFIX%%/bin/%%EXECBASE%%-simpress
 %%PREFIX%%/bin/%%EXECBASE%%-spadmin
 %%PREFIX%%/bin/%%EXECBASE%%-sweb
 %%PREFIX%%/bin/%%EXECBASE%%-swriter
 
 OO.org does need $LANG to be set to a suitable value.
 
-3 If you stuck into a trouble
+3. If you run into problems
 --------------------------------------------------
-Somehow you can stuck into a trouble. 
-To solve this issue, please remove the already installed
-".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" dir in your homedir and remove the
-appropriate entry from ".sversionrc". After you have done
-this, redo the user installation and the problem will
-go away.
+If you somehow run into problems, please remove the already installed
+".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" dir in your homedir
+along with the appropriate entry in ".sversionrc". Redo the user
+installation and the problems should go away.

Property changes on: head/editors/openoffice.org-2-RC/files/pkg-message.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/editors/openoffice.org-2-devel/Makefile
===================================================================
--- head/editors/openoffice.org-2-devel/Makefile	(revision 139878)
+++ head/editors/openoffice.org-2-devel/Makefile	(revision 139879)
@@ -1,193 +1,209 @@
 # New ports collection makefile for: OpenOffice.org
 # Date created:		28 February 2002
 # Whom:                 Martin Blapp
 #
 # $FreeBSD$
 #
 
 PORTNAME=	openoffice
 PORTVERSION=	2.0.${SNAPDATE}
 CATEGORIES+=	editors
 MASTER_SITES+=	ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
 DISTFILES+=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 gpc231.tar.Z:gpc
 EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
 
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
 USE_GNOME+=	libidl
 .endif
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=        3
 .endif
 USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 
-.if !defined(WITHOUT_JAVA)
+.if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
 JAVA_VERSION=	1.4
 JAVA_BUILD=	jdk
 .endif
 
 .include <bsd.port.pre.mk>
 .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"
 .endif
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		117
-SNAPDATE=		20050713
+MILESTONE=		120
+SNAPDATE=		20050722
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
 PACKAGE_BASENAME=	OOo_${RELEASE_NR}m${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
 .if defined(LANG_PKGNAME)
 PKGNAMEPREFIX=          ${LANG_PKGNAME}-
 .endif
 .if defined(LANG_SUFFIX)
 PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
+.if defined(WITH_GNUGCJ)
+BUILD_DEPENDS+=	gcc41:${PORTSDIR}/lang/gcc41
+BROKEN=	"still work in progress"
+.else
 BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
+.endif
+
 # FIXME (correctly add ccache before gcc and g++)
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
+.if defined(WITH_GNUGCJ)
+CC=	ccache gcc41
+CXX=	ccache g++41
+.else
 CC=	ccache gcc-ooo
 CXX=	ccache g++-ooo
+.endif #WITH_GNUGCJ
+.endif #WITH_CCACHE
+.if !defined(WITH_CCACHE)
+.if defined(WITH_GNUGCJ)
+CC=	gcc41
+CXX=	g++41
 .else
 CC=	gcc-ooo
 CXX=	g++-ooo
-.endif
+.endif #WITH_GNUGCJ
+.endif #!WITH_CCACHE
+
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison-devel:${PORTSDIR}/devel/bison-devel \
 		imake:${X_IMAKE_PORT}
-.if defined(WITHOUT_JAVA)
-LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
-.else
+.if !defined(WITHOUT_JAVA)
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 .endif
 
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 ANT?=		${LOCALBASE}/bin/ant
 ZIP?=		${PREFIX}/bin/zip
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal
 
 .include <${FILESDIR}/Makefile.knobs>
 
 pre-everything::
 # really tweak, extremely useful when you build all localized language versions
 # needed after when you build with ALL_LOCALIZED_LANGS.
 .if defined(TWEAK_L10N)
 	@${RM} -f ${WRKDIR}/.PLIST*
 	@${RM} -f ${WRKDIR}/.install_done.*
 	@${RM} -f ${WRKDIR}/.package_done.*
 	@${RM} -f ${WRKDIR}/.extract_done.*
 	@${RM} -f ${WRKDIR}/.patch_done.*
 	@${RM} -f ${WRKDIR}/.configure_done.*
 	@${RM} -f ${WRKDIR}/.build_done.*
 	@${TOUCH} ${EXTRACT_COOKIE}
 	@${TOUCH} ${PATCH_COOKIE}
 	@${TOUCH} ${CONFIGURE_COOKIE}
 	@${TOUCH} ${BUILD_COOKIE}
 .endif
 
 post-extract:
 .if defined(WITH_TTF_BYTECODE_ENABLED)
 	@cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/optpatch-freetype
 .endif
 	@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/
 .if !defined(WITHOUT_MOZILLA)
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
 .endif
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 .if (${NUMOFPROCESSES}>1)
 	@cd ${WRKSRC} ;	${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
 .else
 	@cd ${WRKSRC} ;	${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes"  ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
 .endif
 
 do-install:
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${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 ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
 		${PREFIX}/bin/${EXECBASE}
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sagenda
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setup
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sfax
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sweb
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
 	@${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 	@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
 			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${PKGMESSAGE}
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
 .include <${FILESDIR}/Makefile.others>
 .include <bsd.port.post.mk>

Property changes on: head/editors/openoffice.org-2-devel/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.190
\ No newline at end of property
+1.191
\ No newline at end of property
Index: head/editors/openoffice.org-2-devel/distinfo
===================================================================
--- head/editors/openoffice.org-2-devel/distinfo	(revision 139878)
+++ head/editors/openoffice.org-2-devel/distinfo	(revision 139879)
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_1.9m117_source.tar.bz2) = 95630bc570e10a30b8cfd840c321e00b
-SIZE (openoffice.org2.0/OOo_1.9m117_source.tar.bz2) = 227975719
+MD5 (openoffice.org2.0/OOo_1.9m120_source.tar.bz2) = 9230e6cd7e824a3e3846ccf4a04b92af
+SIZE (openoffice.org2.0/OOo_1.9m120_source.tar.bz2) = 228290473
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
 SIZE (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 38721366

Property changes on: head/editors/openoffice.org-2-devel/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.72
\ No newline at end of property
+1.73
\ No newline at end of property
Index: head/editors/openoffice.org-2-devel/files/Makefile.knobs
===================================================================
--- head/editors/openoffice.org-2-devel/files/Makefile.knobs	(revision 139878)
+++ head/editors/openoffice.org-2-devel/files/Makefile.knobs	(revision 139879)
@@ -1,107 +1,125 @@
 # Makefile for knobs
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 
+.if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
+CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
+.endif
+.if !defined(WITHOUT_JAVA) && defined(WITH_GNUGCJ)
+CONFIGURE_ARGS+=	--with-java=gij --with-ant-home=${LOCALBASE}/ant
+.endif
 .if defined(WITHOUT_JAVA)
 CONFIGURE_ARGS+=	--without-java
-.else
-CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
 .endif
 
 .if defined(WITH_KDE)
 CONFIGURE_ARGS+=	--enable-kde QTDIR="${QT_PREFIX}"
 .endif
 
 .if defined(WITH_CUPS)
 LIB_DEPENDS+=		cups.2:${PORTSDIR}/print/cups-base
 CONFIGURE_ARGS+=	--enable-cups=yes
 .else
 CONFIGURE_ARGS+=	--enable-cups=no
 .endif
 
 .if defined(WITHOUT_MOZILLA)
 CONFIGURE_ARGS+=	--disable-mozilla
 .else
 CONFIGURE_ARGS+=	--enable-build-mozilla
 .endif
 
 .if defined(ALL_LOCALIZED_LANGS)
 CONFIGURE_ARGS+=	--with-lang=ALL
 .else
 CONFIGURE_ARGS+=	--with-lang=${LOCALIZED_LANG}
 .endif
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
 CONFIGURE_ARGS+=	--enable-debug
 .else
 CONFIGURE_ARGS+=	--enable-symbols
 .endif
 .endif
 
 pre-fetch:
 .if (${OSVERSION} < 503001 && ${OSVERSION} >= 500000) || (${OSVERSION} < 492000)
 	@${ECHO}
 	@${ECHO} "WARNING"
 	@${ECHO} "Your rtld seems to be old."
 	@${ECHO} "Please remake your rtld by:"
 	@${ECHO} "[1] if you use 4-series:"
 	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4"
 	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4"
 	@${ECHO} "# make ; make depend ; make install"
 	@${ECHO} "[2] if you use 5-series:"
 	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5"
 	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5"
 	@${ECHO} "# make ; make depend ; make install"
 	@${ECHO} "AT YOUR OWN RISK!"
 .endif
 	@${ECHO} "OPTIONS:"
 .if !defined(WITH_DEBUG)
 	@${ECHO}
 	@${ECHO} "You can compile OOo with debug symbols with WITH_DEBUG=1"
 	@${ECHO}
 	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
 	@${ECHO} "OOo debug support."
 .endif
-#XXX currently broken
-#.if !defined(WITHOUT_MOZILLA)
-#	@${ECHO}
-#	@${ECHO} "You can compile OOo without Mozilla connectivity by"
-#	@${ECHO} "make -DWITHOUT_MOZILLA"
-#.endif
+.if !defined(WITHOUT_MOZILLA)
+	@${ECHO}
+	@${ECHO} "You can compile OOo without Mozilla connectivity with"
+	@${ECHO} "make -DWITHOUT_MOZILLA"
+.endif
 .if !defined(WITH_TTF_BYTECODE_ENABLED)
 	@${ECHO}
 	@${ECHO} "You may get better quality of glyphs"
-	@${ECHO} "at small bitmap sizes, If you have"
+	@${ECHO} "at small bitmap sizes if you have"
 	@${ECHO} "licensed the Apple patents"
-	@${ECHO} "US05155805 US05159668 and US05325479, by"
+	@${ECHO} "US05155805 US05159668 and US05325479, with"
 	@${ECHO} "make -DWITH_TTF_BYTECODE_ENABLED"
 	@${ECHO} "See http://www.freetype.org/patents.html for details"
 .endif
+	@${ECHO}
+	@${ECHO} "You can select the language for OOo by making it with:"
+	@${ECHO} "make LOCALIZED_LANG=xx" 
+	@${ECHO} "while xx can be one of the following"
+	@${ECHO} "af ar bn be-BY bg ca cs cy da de el en-GB eo es"
+	@${ECHO} "et eu fi fr gl gu-IN he hi-IN hr hu it ja km kn-IN"
+	@${ECHO} "ko lt ms nb nl nn ns pa-IN pl pt pt-BR ru rw sk"
+	@${ECHO} "sl sv ta-IN th tn tr vi xh zh-CN zh-TW zu"
+	@${ECHO}
 #XXX currently broken
 #.if !defined(WITHOUT_JAVA)
 #	@${ECHO}
-#	@${ECHO} "You can compile OOo without Java support by"
+#	@${ECHO} "You can compile OOo without Java support with"
 #	@${ECHO} "make -DWITHOUT_JAVA"
 #.endif
 #XXX currently broken
+#.if !defined(WITH_GNUGCJ)
+#	@${ECHO}
+#	@${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with"
+#	@${ECHO} "make -DWITH_GNUGCJ"
+#.endif
+#XXX currently broken
 #.if !defined(WITH_CUPS)
 #	@${ECHO}
-#	@${ECHO} "You can compile OOo with CUPS support by"
+#	@${ECHO} "You can compile OOo with CUPS support with"
 #	@${ECHO} "make -DWITH_CUPS"
 #.endif
 .if !defined(WITH_KDE)
 	@${ECHO}
-	@${ECHO} "You can compile OOo to use Qt/KDE vclplug"
+	@${ECHO} "You can compile OOo to use Qt/KDE vclplug with"
 	@${ECHO} "make -DWITH_KDE"
 .endif
 	@${ECHO}
 	@${ECHO} "NOTICE:"
 	@${ECHO}
 	@${ECHO} "To build OOo, you should have a lot"
 .if defined(WITH_DEBUG)
 	@${ECHO} "of free diskspace (~ 18GB)."
 .else
-	@${ECHO} "of free diskspace (~ 8.5GB)."
+	@${ECHO} "of free diskspace (~ 9GB)."
 .endif
 	@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"

Property changes on: head/editors/openoffice.org-2-devel/files/Makefile.knobs
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.16
\ No newline at end of property
+1.17
\ No newline at end of property
Index: head/editors/openoffice.org-2-devel/files/Makefile.localized
===================================================================
--- head/editors/openoffice.org-2-devel/files/Makefile.localized	(revision 139878)
+++ head/editors/openoffice.org-2-devel/files/Makefile.localized	(revision 139879)
@@ -1,212 +1,245 @@
 # localized makefile
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 ################################################################
 #See solenv/inc/postset.mk for details	
 ################################################################
 .if defined(LOCALIZED_LANG)
 .if ${LOCALIZED_LANG} == "af"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ar"
 CATEGORIES=	arabic
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "bn"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "be-BY"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "bg"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ca"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "cs"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "cy"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "da"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "de"
 CATEGORIES=	german
 LANG_PKGNAME=	${LOCALIZED_LANG}
 COMMENT=	Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und Praesentationsprogramm
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "el"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "en-GB"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "eo"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "es"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "et"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "eu"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "fi"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "fr"
 CATEGORIES=	french
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "gl"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "gu-IN"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "he"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "hi-IN"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "hr"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "hu"
 CATEGORIES=     hungarian
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "it"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ja"
 CATEGORIES=	japanese
 LANG_PKGNAME=	${LOCALIZED_LANG}
 RUN_DEPENDS+=   ${X11BASE}/lib/X11/fonts/TrueType/sazanami-mincho.ttf:${PORTSDIR}/japanese/sazanami-ttf
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "km"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "kn-IN"
 LANG_PKGNAME=	kn
 LANG_SUFFIX=	IN
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ko"
 CATEGORIES=     korean
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "lt"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ms"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "nb"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "nl"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "nn"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ns"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "pa-IN"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "pl"
 CATEGORIES=	polish
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "pt"
 COMMENT=	Editor texto/grBaGico, banco de dados/planilha/navegador integrado
 CATEGORIES=	portuguese
 LANG_PKGNAME=	${LOCALIZED_LANG}
 LANG_EXT=	03
 LANG_CONFIGURE_ARG=	PORT
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "pt-BR"
 COMMENT=        Editor texto/grBaGico, banco de dados/planilha/navegador integrado
 CATEGORIES=     portuguese
 LANG_PKGNAME=	pt
 LANG_SUFFIX=	BR
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ru"
 CATEGORIES=	russian
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "rw"
+CATEGORIES=	russian
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "sk"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "sl"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "sv"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "ta-IN"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "th"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 #.if ${LOCALIZED_LANG} == "tn"
 #LANG_PKGNAME=	${LOCALIZED_LANG}
 #.endif
 ################################################################
 .if ${LOCALIZED_LANG} == "tr"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "vi"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "xh"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "zh-CN"
 CATEGORIES=	chinese
 LANG_PKGNAME=	zh
 LANG_SUFFIX=	CN
 BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "zh-TW"
 CATEGORIES=	chinese
 LANG_PKGNAME=	zh
 LANG_SUFFIX=	TW
 BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "zu"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .endif

Property changes on: head/editors/openoffice.org-2-devel/files/Makefile.localized
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.7
\ No newline at end of property
Index: head/editors/openoffice.org-2-devel/files/pkg-message.in
===================================================================
--- head/editors/openoffice.org-2-devel/files/pkg-message.in	(revision 139878)
+++ head/editors/openoffice.org-2-devel/files/pkg-message.in	(revision 139879)
@@ -1,53 +1,51 @@
 OpenOffice.org Build %%RELEASE_NR%%m%%MILESTONE%% Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
 		and Maho Nakata <maho@FreeBSD.org>
 
 OpenOffice.org %%RELEASE_NR%%m%%MILESTONE%% will soon been installed in
 %%PREFIX%%/%%EXECBASE%%
 
-1 User installation
--------------------
+1. User installation
+--------------------
 
 Just type "%%EXECBASE%%" after you have successfully
 installed the package. If there is no installed
 OO.org dir in your homedir, you'll be prompted to
-install some files and choose a installed JDK.
+install some files and choose an installed JDK.
 The setup installs a ".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" folder
 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
-have both a line for each version which is installed.
+version, you may look in the file ".sversionrc" located
+in your homedir. In this file, OpenOffice and StarOffice
+will have a line for each version that is installed.
 After removing the problematic line you should be able to
-install again.
+install the package again.
 
-2 Start OO.org
---------------
+2. Starting OO.org
+------------------
 
-There are some wrappers installed for fast startup.
+There are some wrappers installed for faster startup.
 Add "%%PREFIX%%/bin/" to your PATH and you will be able
 to use them.
 
 %%PREFIX%%/bin/%%EXECBASE%%
 %%PREFIX%%/bin/%%EXECBASE%%-sagenda
 %%PREFIX%%/bin/%%EXECBASE%%-scalc
 %%PREFIX%%/bin/%%EXECBASE%%-sdraw
 %%PREFIX%%/bin/%%EXECBASE%%-setup
 %%PREFIX%%/bin/%%EXECBASE%%-sfax
 %%PREFIX%%/bin/%%EXECBASE%%-simpress
 %%PREFIX%%/bin/%%EXECBASE%%-spadmin
 %%PREFIX%%/bin/%%EXECBASE%%-sweb
 %%PREFIX%%/bin/%%EXECBASE%%-swriter
 
 OO.org does need $LANG to be set to a suitable value.
 
-3 If you stuck into a trouble
+3. If you run into problems
 --------------------------------------------------
-Somehow you can stuck into a trouble. 
-To solve this issue, please remove the already installed
-".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" dir in your homedir and remove the
-appropriate entry from ".sversionrc". After you have done
-this, redo the user installation and the problem will
-go away.
+If you somehow run into problems, please remove the already installed
+".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" dir in your homedir
+along with the appropriate entry in ".sversionrc". Redo the user
+installation and the problems should go away.

Property changes on: head/editors/openoffice.org-2-devel/files/pkg-message.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/editors/openoffice.org-2.0/Makefile
===================================================================
--- head/editors/openoffice.org-2.0/Makefile	(revision 139878)
+++ head/editors/openoffice.org-2.0/Makefile	(revision 139879)
@@ -1,193 +1,209 @@
 # New ports collection makefile for: OpenOffice.org
 # Date created:		28 February 2002
 # Whom:                 Martin Blapp
 #
 # $FreeBSD$
 #
 
 PORTNAME=	openoffice
 PORTVERSION=	2.0.${SNAPDATE}
 CATEGORIES+=	editors
 MASTER_SITES+=	ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
 DISTFILES+=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 gpc231.tar.Z:gpc
 EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
 
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
 USE_GNOME+=	libidl
 .endif
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=        3
 .endif
 USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 
-.if !defined(WITHOUT_JAVA)
+.if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
 JAVA_VERSION=	1.4
 JAVA_BUILD=	jdk
 .endif
 
 .include <bsd.port.pre.mk>
 .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"
 .endif
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		117
-SNAPDATE=		20050713
+MILESTONE=		120
+SNAPDATE=		20050722
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
 PACKAGE_BASENAME=	OOo_${RELEASE_NR}m${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
 .if defined(LANG_PKGNAME)
 PKGNAMEPREFIX=          ${LANG_PKGNAME}-
 .endif
 .if defined(LANG_SUFFIX)
 PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
+.if defined(WITH_GNUGCJ)
+BUILD_DEPENDS+=	gcc41:${PORTSDIR}/lang/gcc41
+BROKEN=	"still work in progress"
+.else
 BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
+.endif
+
 # FIXME (correctly add ccache before gcc and g++)
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
+.if defined(WITH_GNUGCJ)
+CC=	ccache gcc41
+CXX=	ccache g++41
+.else
 CC=	ccache gcc-ooo
 CXX=	ccache g++-ooo
+.endif #WITH_GNUGCJ
+.endif #WITH_CCACHE
+.if !defined(WITH_CCACHE)
+.if defined(WITH_GNUGCJ)
+CC=	gcc41
+CXX=	g++41
 .else
 CC=	gcc-ooo
 CXX=	g++-ooo
-.endif
+.endif #WITH_GNUGCJ
+.endif #!WITH_CCACHE
+
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison-devel:${PORTSDIR}/devel/bison-devel \
 		imake:${X_IMAKE_PORT}
-.if defined(WITHOUT_JAVA)
-LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
-.else
+.if !defined(WITHOUT_JAVA)
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 .endif
 
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 ANT?=		${LOCALBASE}/bin/ant
 ZIP?=		${PREFIX}/bin/zip
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal
 
 .include <${FILESDIR}/Makefile.knobs>
 
 pre-everything::
 # really tweak, extremely useful when you build all localized language versions
 # needed after when you build with ALL_LOCALIZED_LANGS.
 .if defined(TWEAK_L10N)
 	@${RM} -f ${WRKDIR}/.PLIST*
 	@${RM} -f ${WRKDIR}/.install_done.*
 	@${RM} -f ${WRKDIR}/.package_done.*
 	@${RM} -f ${WRKDIR}/.extract_done.*
 	@${RM} -f ${WRKDIR}/.patch_done.*
 	@${RM} -f ${WRKDIR}/.configure_done.*
 	@${RM} -f ${WRKDIR}/.build_done.*
 	@${TOUCH} ${EXTRACT_COOKIE}
 	@${TOUCH} ${PATCH_COOKIE}
 	@${TOUCH} ${CONFIGURE_COOKIE}
 	@${TOUCH} ${BUILD_COOKIE}
 .endif
 
 post-extract:
 .if defined(WITH_TTF_BYTECODE_ENABLED)
 	@cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/optpatch-freetype
 .endif
 	@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/
 .if !defined(WITHOUT_MOZILLA)
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
 .endif
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 .if (${NUMOFPROCESSES}>1)
 	@cd ${WRKSRC} ;	${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
 .else
 	@cd ${WRKSRC} ;	${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes"  ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
 .endif
 
 do-install:
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${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 ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
 		${PREFIX}/bin/${EXECBASE}
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sagenda
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setup
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sfax
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sweb
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
 	@${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 	@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
 			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${PKGMESSAGE}
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
 .include <${FILESDIR}/Makefile.others>
 .include <bsd.port.post.mk>

Property changes on: head/editors/openoffice.org-2.0/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.190
\ No newline at end of property
+1.191
\ No newline at end of property
Index: head/editors/openoffice.org-2.0/distinfo
===================================================================
--- head/editors/openoffice.org-2.0/distinfo	(revision 139878)
+++ head/editors/openoffice.org-2.0/distinfo	(revision 139879)
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_1.9m117_source.tar.bz2) = 95630bc570e10a30b8cfd840c321e00b
-SIZE (openoffice.org2.0/OOo_1.9m117_source.tar.bz2) = 227975719
+MD5 (openoffice.org2.0/OOo_1.9m120_source.tar.bz2) = 9230e6cd7e824a3e3846ccf4a04b92af
+SIZE (openoffice.org2.0/OOo_1.9m120_source.tar.bz2) = 228290473
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
 SIZE (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 38721366

Property changes on: head/editors/openoffice.org-2.0/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.72
\ No newline at end of property
+1.73
\ No newline at end of property
Index: head/editors/openoffice.org-2.0/files/Makefile.knobs
===================================================================
--- head/editors/openoffice.org-2.0/files/Makefile.knobs	(revision 139878)
+++ head/editors/openoffice.org-2.0/files/Makefile.knobs	(revision 139879)
@@ -1,107 +1,125 @@
 # Makefile for knobs
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 
+.if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
+CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
+.endif
+.if !defined(WITHOUT_JAVA) && defined(WITH_GNUGCJ)
+CONFIGURE_ARGS+=	--with-java=gij --with-ant-home=${LOCALBASE}/ant
+.endif
 .if defined(WITHOUT_JAVA)
 CONFIGURE_ARGS+=	--without-java
-.else
-CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
 .endif
 
 .if defined(WITH_KDE)
 CONFIGURE_ARGS+=	--enable-kde QTDIR="${QT_PREFIX}"
 .endif
 
 .if defined(WITH_CUPS)
 LIB_DEPENDS+=		cups.2:${PORTSDIR}/print/cups-base
 CONFIGURE_ARGS+=	--enable-cups=yes
 .else
 CONFIGURE_ARGS+=	--enable-cups=no
 .endif
 
 .if defined(WITHOUT_MOZILLA)
 CONFIGURE_ARGS+=	--disable-mozilla
 .else
 CONFIGURE_ARGS+=	--enable-build-mozilla
 .endif
 
 .if defined(ALL_LOCALIZED_LANGS)
 CONFIGURE_ARGS+=	--with-lang=ALL
 .else
 CONFIGURE_ARGS+=	--with-lang=${LOCALIZED_LANG}
 .endif
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
 CONFIGURE_ARGS+=	--enable-debug
 .else
 CONFIGURE_ARGS+=	--enable-symbols
 .endif
 .endif
 
 pre-fetch:
 .if (${OSVERSION} < 503001 && ${OSVERSION} >= 500000) || (${OSVERSION} < 492000)
 	@${ECHO}
 	@${ECHO} "WARNING"
 	@${ECHO} "Your rtld seems to be old."
 	@${ECHO} "Please remake your rtld by:"
 	@${ECHO} "[1] if you use 4-series:"
 	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4"
 	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4"
 	@${ECHO} "# make ; make depend ; make install"
 	@${ECHO} "[2] if you use 5-series:"
 	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5"
 	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5"
 	@${ECHO} "# make ; make depend ; make install"
 	@${ECHO} "AT YOUR OWN RISK!"
 .endif
 	@${ECHO} "OPTIONS:"
 .if !defined(WITH_DEBUG)
 	@${ECHO}
 	@${ECHO} "You can compile OOo with debug symbols with WITH_DEBUG=1"
 	@${ECHO}
 	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
 	@${ECHO} "OOo debug support."
 .endif
-#XXX currently broken
-#.if !defined(WITHOUT_MOZILLA)
-#	@${ECHO}
-#	@${ECHO} "You can compile OOo without Mozilla connectivity by"
-#	@${ECHO} "make -DWITHOUT_MOZILLA"
-#.endif
+.if !defined(WITHOUT_MOZILLA)
+	@${ECHO}
+	@${ECHO} "You can compile OOo without Mozilla connectivity with"
+	@${ECHO} "make -DWITHOUT_MOZILLA"
+.endif
 .if !defined(WITH_TTF_BYTECODE_ENABLED)
 	@${ECHO}
 	@${ECHO} "You may get better quality of glyphs"
-	@${ECHO} "at small bitmap sizes, If you have"
+	@${ECHO} "at small bitmap sizes if you have"
 	@${ECHO} "licensed the Apple patents"
-	@${ECHO} "US05155805 US05159668 and US05325479, by"
+	@${ECHO} "US05155805 US05159668 and US05325479, with"
 	@${ECHO} "make -DWITH_TTF_BYTECODE_ENABLED"
 	@${ECHO} "See http://www.freetype.org/patents.html for details"
 .endif
+	@${ECHO}
+	@${ECHO} "You can select the language for OOo by making it with:"
+	@${ECHO} "make LOCALIZED_LANG=xx" 
+	@${ECHO} "while xx can be one of the following"
+	@${ECHO} "af ar bn be-BY bg ca cs cy da de el en-GB eo es"
+	@${ECHO} "et eu fi fr gl gu-IN he hi-IN hr hu it ja km kn-IN"
+	@${ECHO} "ko lt ms nb nl nn ns pa-IN pl pt pt-BR ru rw sk"
+	@${ECHO} "sl sv ta-IN th tn tr vi xh zh-CN zh-TW zu"
+	@${ECHO}
 #XXX currently broken
 #.if !defined(WITHOUT_JAVA)
 #	@${ECHO}
-#	@${ECHO} "You can compile OOo without Java support by"
+#	@${ECHO} "You can compile OOo without Java support with"
 #	@${ECHO} "make -DWITHOUT_JAVA"
 #.endif
 #XXX currently broken
+#.if !defined(WITH_GNUGCJ)
+#	@${ECHO}
+#	@${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with"
+#	@${ECHO} "make -DWITH_GNUGCJ"
+#.endif
+#XXX currently broken
 #.if !defined(WITH_CUPS)
 #	@${ECHO}
-#	@${ECHO} "You can compile OOo with CUPS support by"
+#	@${ECHO} "You can compile OOo with CUPS support with"
 #	@${ECHO} "make -DWITH_CUPS"
 #.endif
 .if !defined(WITH_KDE)
 	@${ECHO}
-	@${ECHO} "You can compile OOo to use Qt/KDE vclplug"
+	@${ECHO} "You can compile OOo to use Qt/KDE vclplug with"
 	@${ECHO} "make -DWITH_KDE"
 .endif
 	@${ECHO}
 	@${ECHO} "NOTICE:"
 	@${ECHO}
 	@${ECHO} "To build OOo, you should have a lot"
 .if defined(WITH_DEBUG)
 	@${ECHO} "of free diskspace (~ 18GB)."
 .else
-	@${ECHO} "of free diskspace (~ 8.5GB)."
+	@${ECHO} "of free diskspace (~ 9GB)."
 .endif
 	@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"

Property changes on: head/editors/openoffice.org-2.0/files/Makefile.knobs
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.16
\ No newline at end of property
+1.17
\ No newline at end of property
Index: head/editors/openoffice.org-2.0/files/Makefile.localized
===================================================================
--- head/editors/openoffice.org-2.0/files/Makefile.localized	(revision 139878)
+++ head/editors/openoffice.org-2.0/files/Makefile.localized	(revision 139879)
@@ -1,212 +1,245 @@
 # localized makefile
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 ################################################################
 #See solenv/inc/postset.mk for details	
 ################################################################
 .if defined(LOCALIZED_LANG)
 .if ${LOCALIZED_LANG} == "af"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ar"
 CATEGORIES=	arabic
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "bn"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "be-BY"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "bg"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ca"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "cs"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "cy"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "da"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "de"
 CATEGORIES=	german
 LANG_PKGNAME=	${LOCALIZED_LANG}
 COMMENT=	Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und Praesentationsprogramm
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "el"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "en-GB"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "eo"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "es"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "et"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "eu"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "fi"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "fr"
 CATEGORIES=	french
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "gl"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "gu-IN"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "he"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "hi-IN"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "hr"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "hu"
 CATEGORIES=     hungarian
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "it"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ja"
 CATEGORIES=	japanese
 LANG_PKGNAME=	${LOCALIZED_LANG}
 RUN_DEPENDS+=   ${X11BASE}/lib/X11/fonts/TrueType/sazanami-mincho.ttf:${PORTSDIR}/japanese/sazanami-ttf
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "km"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "kn-IN"
 LANG_PKGNAME=	kn
 LANG_SUFFIX=	IN
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ko"
 CATEGORIES=     korean
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "lt"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ms"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "nb"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "nl"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "nn"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ns"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "pa-IN"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "pl"
 CATEGORIES=	polish
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "pt"
 COMMENT=	Editor texto/grBaGico, banco de dados/planilha/navegador integrado
 CATEGORIES=	portuguese
 LANG_PKGNAME=	${LOCALIZED_LANG}
 LANG_EXT=	03
 LANG_CONFIGURE_ARG=	PORT
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "pt-BR"
 COMMENT=        Editor texto/grBaGico, banco de dados/planilha/navegador integrado
 CATEGORIES=     portuguese
 LANG_PKGNAME=	pt
 LANG_SUFFIX=	BR
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ru"
 CATEGORIES=	russian
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "rw"
+CATEGORIES=	russian
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "sk"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "sl"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "sv"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "ta-IN"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "th"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 #.if ${LOCALIZED_LANG} == "tn"
 #LANG_PKGNAME=	${LOCALIZED_LANG}
 #.endif
 ################################################################
 .if ${LOCALIZED_LANG} == "tr"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "vi"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "xh"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "zh-CN"
 CATEGORIES=	chinese
 LANG_PKGNAME=	zh
 LANG_SUFFIX=	CN
 BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "zh-TW"
 CATEGORIES=	chinese
 LANG_PKGNAME=	zh
 LANG_SUFFIX=	TW
 BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "zu"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .endif

Property changes on: head/editors/openoffice.org-2.0/files/Makefile.localized
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.7
\ No newline at end of property
Index: head/editors/openoffice.org-2.0/files/pkg-message.in
===================================================================
--- head/editors/openoffice.org-2.0/files/pkg-message.in	(revision 139878)
+++ head/editors/openoffice.org-2.0/files/pkg-message.in	(revision 139879)
@@ -1,53 +1,51 @@
 OpenOffice.org Build %%RELEASE_NR%%m%%MILESTONE%% Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
 		and Maho Nakata <maho@FreeBSD.org>
 
 OpenOffice.org %%RELEASE_NR%%m%%MILESTONE%% will soon been installed in
 %%PREFIX%%/%%EXECBASE%%
 
-1 User installation
--------------------
+1. User installation
+--------------------
 
 Just type "%%EXECBASE%%" after you have successfully
 installed the package. If there is no installed
 OO.org dir in your homedir, you'll be prompted to
-install some files and choose a installed JDK.
+install some files and choose an installed JDK.
 The setup installs a ".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" folder
 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
-have both a line for each version which is installed.
+version, you may look in the file ".sversionrc" located
+in your homedir. In this file, OpenOffice and StarOffice
+will have a line for each version that is installed.
 After removing the problematic line you should be able to
-install again.
+install the package again.
 
-2 Start OO.org
---------------
+2. Starting OO.org
+------------------
 
-There are some wrappers installed for fast startup.
+There are some wrappers installed for faster startup.
 Add "%%PREFIX%%/bin/" to your PATH and you will be able
 to use them.
 
 %%PREFIX%%/bin/%%EXECBASE%%
 %%PREFIX%%/bin/%%EXECBASE%%-sagenda
 %%PREFIX%%/bin/%%EXECBASE%%-scalc
 %%PREFIX%%/bin/%%EXECBASE%%-sdraw
 %%PREFIX%%/bin/%%EXECBASE%%-setup
 %%PREFIX%%/bin/%%EXECBASE%%-sfax
 %%PREFIX%%/bin/%%EXECBASE%%-simpress
 %%PREFIX%%/bin/%%EXECBASE%%-spadmin
 %%PREFIX%%/bin/%%EXECBASE%%-sweb
 %%PREFIX%%/bin/%%EXECBASE%%-swriter
 
 OO.org does need $LANG to be set to a suitable value.
 
-3 If you stuck into a trouble
+3. If you run into problems
 --------------------------------------------------
-Somehow you can stuck into a trouble. 
-To solve this issue, please remove the already installed
-".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" dir in your homedir and remove the
-appropriate entry from ".sversionrc". After you have done
-this, redo the user installation and the problem will
-go away.
+If you somehow run into problems, please remove the already installed
+".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" dir in your homedir
+along with the appropriate entry in ".sversionrc". Redo the user
+installation and the problems should go away.

Property changes on: head/editors/openoffice.org-2.0/files/pkg-message.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/editors/openoffice.org-2.0-devel/Makefile
===================================================================
--- head/editors/openoffice.org-2.0-devel/Makefile	(revision 139878)
+++ head/editors/openoffice.org-2.0-devel/Makefile	(revision 139879)
@@ -1,193 +1,209 @@
 # New ports collection makefile for: OpenOffice.org
 # Date created:		28 February 2002
 # Whom:                 Martin Blapp
 #
 # $FreeBSD$
 #
 
 PORTNAME=	openoffice
 PORTVERSION=	2.0.${SNAPDATE}
 CATEGORIES+=	editors
 MASTER_SITES+=	ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
 DISTFILES+=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 gpc231.tar.Z:gpc
 EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
 
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
 USE_GNOME+=	libidl
 .endif
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=        3
 .endif
 USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 
-.if !defined(WITHOUT_JAVA)
+.if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
 JAVA_VERSION=	1.4
 JAVA_BUILD=	jdk
 .endif
 
 .include <bsd.port.pre.mk>
 .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"
 .endif
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		117
-SNAPDATE=		20050713
+MILESTONE=		120
+SNAPDATE=		20050722
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
 PACKAGE_BASENAME=	OOo_${RELEASE_NR}m${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
 .if defined(LANG_PKGNAME)
 PKGNAMEPREFIX=          ${LANG_PKGNAME}-
 .endif
 .if defined(LANG_SUFFIX)
 PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
+.if defined(WITH_GNUGCJ)
+BUILD_DEPENDS+=	gcc41:${PORTSDIR}/lang/gcc41
+BROKEN=	"still work in progress"
+.else
 BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
+.endif
+
 # FIXME (correctly add ccache before gcc and g++)
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
+.if defined(WITH_GNUGCJ)
+CC=	ccache gcc41
+CXX=	ccache g++41
+.else
 CC=	ccache gcc-ooo
 CXX=	ccache g++-ooo
+.endif #WITH_GNUGCJ
+.endif #WITH_CCACHE
+.if !defined(WITH_CCACHE)
+.if defined(WITH_GNUGCJ)
+CC=	gcc41
+CXX=	g++41
 .else
 CC=	gcc-ooo
 CXX=	g++-ooo
-.endif
+.endif #WITH_GNUGCJ
+.endif #!WITH_CCACHE
+
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison-devel:${PORTSDIR}/devel/bison-devel \
 		imake:${X_IMAKE_PORT}
-.if defined(WITHOUT_JAVA)
-LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
-.else
+.if !defined(WITHOUT_JAVA)
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 .endif
 
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 ANT?=		${LOCALBASE}/bin/ant
 ZIP?=		${PREFIX}/bin/zip
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal
 
 .include <${FILESDIR}/Makefile.knobs>
 
 pre-everything::
 # really tweak, extremely useful when you build all localized language versions
 # needed after when you build with ALL_LOCALIZED_LANGS.
 .if defined(TWEAK_L10N)
 	@${RM} -f ${WRKDIR}/.PLIST*
 	@${RM} -f ${WRKDIR}/.install_done.*
 	@${RM} -f ${WRKDIR}/.package_done.*
 	@${RM} -f ${WRKDIR}/.extract_done.*
 	@${RM} -f ${WRKDIR}/.patch_done.*
 	@${RM} -f ${WRKDIR}/.configure_done.*
 	@${RM} -f ${WRKDIR}/.build_done.*
 	@${TOUCH} ${EXTRACT_COOKIE}
 	@${TOUCH} ${PATCH_COOKIE}
 	@${TOUCH} ${CONFIGURE_COOKIE}
 	@${TOUCH} ${BUILD_COOKIE}
 .endif
 
 post-extract:
 .if defined(WITH_TTF_BYTECODE_ENABLED)
 	@cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/optpatch-freetype
 .endif
 	@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/
 .if !defined(WITHOUT_MOZILLA)
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
 .endif
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 .if (${NUMOFPROCESSES}>1)
 	@cd ${WRKSRC} ;	${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
 .else
 	@cd ${WRKSRC} ;	${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes"  ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
 .endif
 
 do-install:
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${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 ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
 		${PREFIX}/bin/${EXECBASE}
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sagenda
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setup
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sfax
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sweb
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
 	@${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 	@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
 			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${PKGMESSAGE}
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
 .include <${FILESDIR}/Makefile.others>
 .include <bsd.port.post.mk>

Property changes on: head/editors/openoffice.org-2.0-devel/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.190
\ No newline at end of property
+1.191
\ No newline at end of property
Index: head/editors/openoffice.org-2.0-devel/distinfo
===================================================================
--- head/editors/openoffice.org-2.0-devel/distinfo	(revision 139878)
+++ head/editors/openoffice.org-2.0-devel/distinfo	(revision 139879)
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_1.9m117_source.tar.bz2) = 95630bc570e10a30b8cfd840c321e00b
-SIZE (openoffice.org2.0/OOo_1.9m117_source.tar.bz2) = 227975719
+MD5 (openoffice.org2.0/OOo_1.9m120_source.tar.bz2) = 9230e6cd7e824a3e3846ccf4a04b92af
+SIZE (openoffice.org2.0/OOo_1.9m120_source.tar.bz2) = 228290473
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
 SIZE (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 38721366

Property changes on: head/editors/openoffice.org-2.0-devel/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.72
\ No newline at end of property
+1.73
\ No newline at end of property
Index: head/editors/openoffice.org-2.0-devel/files/Makefile.knobs
===================================================================
--- head/editors/openoffice.org-2.0-devel/files/Makefile.knobs	(revision 139878)
+++ head/editors/openoffice.org-2.0-devel/files/Makefile.knobs	(revision 139879)
@@ -1,107 +1,125 @@
 # Makefile for knobs
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 
+.if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
+CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
+.endif
+.if !defined(WITHOUT_JAVA) && defined(WITH_GNUGCJ)
+CONFIGURE_ARGS+=	--with-java=gij --with-ant-home=${LOCALBASE}/ant
+.endif
 .if defined(WITHOUT_JAVA)
 CONFIGURE_ARGS+=	--without-java
-.else
-CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
 .endif
 
 .if defined(WITH_KDE)
 CONFIGURE_ARGS+=	--enable-kde QTDIR="${QT_PREFIX}"
 .endif
 
 .if defined(WITH_CUPS)
 LIB_DEPENDS+=		cups.2:${PORTSDIR}/print/cups-base
 CONFIGURE_ARGS+=	--enable-cups=yes
 .else
 CONFIGURE_ARGS+=	--enable-cups=no
 .endif
 
 .if defined(WITHOUT_MOZILLA)
 CONFIGURE_ARGS+=	--disable-mozilla
 .else
 CONFIGURE_ARGS+=	--enable-build-mozilla
 .endif
 
 .if defined(ALL_LOCALIZED_LANGS)
 CONFIGURE_ARGS+=	--with-lang=ALL
 .else
 CONFIGURE_ARGS+=	--with-lang=${LOCALIZED_LANG}
 .endif
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
 CONFIGURE_ARGS+=	--enable-debug
 .else
 CONFIGURE_ARGS+=	--enable-symbols
 .endif
 .endif
 
 pre-fetch:
 .if (${OSVERSION} < 503001 && ${OSVERSION} >= 500000) || (${OSVERSION} < 492000)
 	@${ECHO}
 	@${ECHO} "WARNING"
 	@${ECHO} "Your rtld seems to be old."
 	@${ECHO} "Please remake your rtld by:"
 	@${ECHO} "[1] if you use 4-series:"
 	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4"
 	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4"
 	@${ECHO} "# make ; make depend ; make install"
 	@${ECHO} "[2] if you use 5-series:"
 	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5"
 	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5"
 	@${ECHO} "# make ; make depend ; make install"
 	@${ECHO} "AT YOUR OWN RISK!"
 .endif
 	@${ECHO} "OPTIONS:"
 .if !defined(WITH_DEBUG)
 	@${ECHO}
 	@${ECHO} "You can compile OOo with debug symbols with WITH_DEBUG=1"
 	@${ECHO}
 	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
 	@${ECHO} "OOo debug support."
 .endif
-#XXX currently broken
-#.if !defined(WITHOUT_MOZILLA)
-#	@${ECHO}
-#	@${ECHO} "You can compile OOo without Mozilla connectivity by"
-#	@${ECHO} "make -DWITHOUT_MOZILLA"
-#.endif
+.if !defined(WITHOUT_MOZILLA)
+	@${ECHO}
+	@${ECHO} "You can compile OOo without Mozilla connectivity with"
+	@${ECHO} "make -DWITHOUT_MOZILLA"
+.endif
 .if !defined(WITH_TTF_BYTECODE_ENABLED)
 	@${ECHO}
 	@${ECHO} "You may get better quality of glyphs"
-	@${ECHO} "at small bitmap sizes, If you have"
+	@${ECHO} "at small bitmap sizes if you have"
 	@${ECHO} "licensed the Apple patents"
-	@${ECHO} "US05155805 US05159668 and US05325479, by"
+	@${ECHO} "US05155805 US05159668 and US05325479, with"
 	@${ECHO} "make -DWITH_TTF_BYTECODE_ENABLED"
 	@${ECHO} "See http://www.freetype.org/patents.html for details"
 .endif
+	@${ECHO}
+	@${ECHO} "You can select the language for OOo by making it with:"
+	@${ECHO} "make LOCALIZED_LANG=xx" 
+	@${ECHO} "while xx can be one of the following"
+	@${ECHO} "af ar bn be-BY bg ca cs cy da de el en-GB eo es"
+	@${ECHO} "et eu fi fr gl gu-IN he hi-IN hr hu it ja km kn-IN"
+	@${ECHO} "ko lt ms nb nl nn ns pa-IN pl pt pt-BR ru rw sk"
+	@${ECHO} "sl sv ta-IN th tn tr vi xh zh-CN zh-TW zu"
+	@${ECHO}
 #XXX currently broken
 #.if !defined(WITHOUT_JAVA)
 #	@${ECHO}
-#	@${ECHO} "You can compile OOo without Java support by"
+#	@${ECHO} "You can compile OOo without Java support with"
 #	@${ECHO} "make -DWITHOUT_JAVA"
 #.endif
 #XXX currently broken
+#.if !defined(WITH_GNUGCJ)
+#	@${ECHO}
+#	@${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with"
+#	@${ECHO} "make -DWITH_GNUGCJ"
+#.endif
+#XXX currently broken
 #.if !defined(WITH_CUPS)
 #	@${ECHO}
-#	@${ECHO} "You can compile OOo with CUPS support by"
+#	@${ECHO} "You can compile OOo with CUPS support with"
 #	@${ECHO} "make -DWITH_CUPS"
 #.endif
 .if !defined(WITH_KDE)
 	@${ECHO}
-	@${ECHO} "You can compile OOo to use Qt/KDE vclplug"
+	@${ECHO} "You can compile OOo to use Qt/KDE vclplug with"
 	@${ECHO} "make -DWITH_KDE"
 .endif
 	@${ECHO}
 	@${ECHO} "NOTICE:"
 	@${ECHO}
 	@${ECHO} "To build OOo, you should have a lot"
 .if defined(WITH_DEBUG)
 	@${ECHO} "of free diskspace (~ 18GB)."
 .else
-	@${ECHO} "of free diskspace (~ 8.5GB)."
+	@${ECHO} "of free diskspace (~ 9GB)."
 .endif
 	@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"

Property changes on: head/editors/openoffice.org-2.0-devel/files/Makefile.knobs
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.16
\ No newline at end of property
+1.17
\ No newline at end of property
Index: head/editors/openoffice.org-2.0-devel/files/Makefile.localized
===================================================================
--- head/editors/openoffice.org-2.0-devel/files/Makefile.localized	(revision 139878)
+++ head/editors/openoffice.org-2.0-devel/files/Makefile.localized	(revision 139879)
@@ -1,212 +1,245 @@
 # localized makefile
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 ################################################################
 #See solenv/inc/postset.mk for details	
 ################################################################
 .if defined(LOCALIZED_LANG)
 .if ${LOCALIZED_LANG} == "af"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ar"
 CATEGORIES=	arabic
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "bn"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "be-BY"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "bg"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ca"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "cs"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "cy"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "da"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "de"
 CATEGORIES=	german
 LANG_PKGNAME=	${LOCALIZED_LANG}
 COMMENT=	Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und Praesentationsprogramm
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "el"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "en-GB"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "eo"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "es"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "et"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "eu"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "fi"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "fr"
 CATEGORIES=	french
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "gl"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "gu-IN"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "he"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "hi-IN"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "hr"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "hu"
 CATEGORIES=     hungarian
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "it"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ja"
 CATEGORIES=	japanese
 LANG_PKGNAME=	${LOCALIZED_LANG}
 RUN_DEPENDS+=   ${X11BASE}/lib/X11/fonts/TrueType/sazanami-mincho.ttf:${PORTSDIR}/japanese/sazanami-ttf
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "km"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "kn-IN"
 LANG_PKGNAME=	kn
 LANG_SUFFIX=	IN
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ko"
 CATEGORIES=     korean
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "lt"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ms"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "nb"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "nl"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "nn"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ns"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "pa-IN"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "pl"
 CATEGORIES=	polish
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "pt"
 COMMENT=	Editor texto/grBaGico, banco de dados/planilha/navegador integrado
 CATEGORIES=	portuguese
 LANG_PKGNAME=	${LOCALIZED_LANG}
 LANG_EXT=	03
 LANG_CONFIGURE_ARG=	PORT
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "pt-BR"
 COMMENT=        Editor texto/grBaGico, banco de dados/planilha/navegador integrado
 CATEGORIES=     portuguese
 LANG_PKGNAME=	pt
 LANG_SUFFIX=	BR
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ru"
 CATEGORIES=	russian
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "rw"
+CATEGORIES=	russian
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "sk"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "sl"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "sv"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "ta-IN"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "th"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 #.if ${LOCALIZED_LANG} == "tn"
 #LANG_PKGNAME=	${LOCALIZED_LANG}
 #.endif
 ################################################################
 .if ${LOCALIZED_LANG} == "tr"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "vi"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "xh"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "zh-CN"
 CATEGORIES=	chinese
 LANG_PKGNAME=	zh
 LANG_SUFFIX=	CN
 BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "zh-TW"
 CATEGORIES=	chinese
 LANG_PKGNAME=	zh
 LANG_SUFFIX=	TW
 BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "zu"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .endif

Property changes on: head/editors/openoffice.org-2.0-devel/files/Makefile.localized
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.7
\ No newline at end of property
Index: head/editors/openoffice.org-2.0-devel/files/pkg-message.in
===================================================================
--- head/editors/openoffice.org-2.0-devel/files/pkg-message.in	(revision 139878)
+++ head/editors/openoffice.org-2.0-devel/files/pkg-message.in	(revision 139879)
@@ -1,53 +1,51 @@
 OpenOffice.org Build %%RELEASE_NR%%m%%MILESTONE%% Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
 		and Maho Nakata <maho@FreeBSD.org>
 
 OpenOffice.org %%RELEASE_NR%%m%%MILESTONE%% will soon been installed in
 %%PREFIX%%/%%EXECBASE%%
 
-1 User installation
--------------------
+1. User installation
+--------------------
 
 Just type "%%EXECBASE%%" after you have successfully
 installed the package. If there is no installed
 OO.org dir in your homedir, you'll be prompted to
-install some files and choose a installed JDK.
+install some files and choose an installed JDK.
 The setup installs a ".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" folder
 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
-have both a line for each version which is installed.
+version, you may look in the file ".sversionrc" located
+in your homedir. In this file, OpenOffice and StarOffice
+will have a line for each version that is installed.
 After removing the problematic line you should be able to
-install again.
+install the package again.
 
-2 Start OO.org
---------------
+2. Starting OO.org
+------------------
 
-There are some wrappers installed for fast startup.
+There are some wrappers installed for faster startup.
 Add "%%PREFIX%%/bin/" to your PATH and you will be able
 to use them.
 
 %%PREFIX%%/bin/%%EXECBASE%%
 %%PREFIX%%/bin/%%EXECBASE%%-sagenda
 %%PREFIX%%/bin/%%EXECBASE%%-scalc
 %%PREFIX%%/bin/%%EXECBASE%%-sdraw
 %%PREFIX%%/bin/%%EXECBASE%%-setup
 %%PREFIX%%/bin/%%EXECBASE%%-sfax
 %%PREFIX%%/bin/%%EXECBASE%%-simpress
 %%PREFIX%%/bin/%%EXECBASE%%-spadmin
 %%PREFIX%%/bin/%%EXECBASE%%-sweb
 %%PREFIX%%/bin/%%EXECBASE%%-swriter
 
 OO.org does need $LANG to be set to a suitable value.
 
-3 If you stuck into a trouble
+3. If you run into problems
 --------------------------------------------------
-Somehow you can stuck into a trouble. 
-To solve this issue, please remove the already installed
-".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" dir in your homedir and remove the
-appropriate entry from ".sversionrc". After you have done
-this, redo the user installation and the problem will
-go away.
+If you somehow run into problems, please remove the already installed
+".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" dir in your homedir
+along with the appropriate entry in ".sversionrc". Redo the user
+installation and the problems should go away.

Property changes on: head/editors/openoffice.org-2.0-devel/files/pkg-message.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/editors/openoffice.org-3/Makefile
===================================================================
--- head/editors/openoffice.org-3/Makefile	(revision 139878)
+++ head/editors/openoffice.org-3/Makefile	(revision 139879)
@@ -1,193 +1,209 @@
 # New ports collection makefile for: OpenOffice.org
 # Date created:		28 February 2002
 # Whom:                 Martin Blapp
 #
 # $FreeBSD$
 #
 
 PORTNAME=	openoffice
 PORTVERSION=	2.0.${SNAPDATE}
 CATEGORIES+=	editors
 MASTER_SITES+=	ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
 DISTFILES+=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 gpc231.tar.Z:gpc
 EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
 
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
 USE_GNOME+=	libidl
 .endif
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=        3
 .endif
 USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 
-.if !defined(WITHOUT_JAVA)
+.if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
 JAVA_VERSION=	1.4
 JAVA_BUILD=	jdk
 .endif
 
 .include <bsd.port.pre.mk>
 .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"
 .endif
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		117
-SNAPDATE=		20050713
+MILESTONE=		120
+SNAPDATE=		20050722
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
 PACKAGE_BASENAME=	OOo_${RELEASE_NR}m${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
 .if defined(LANG_PKGNAME)
 PKGNAMEPREFIX=          ${LANG_PKGNAME}-
 .endif
 .if defined(LANG_SUFFIX)
 PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
+.if defined(WITH_GNUGCJ)
+BUILD_DEPENDS+=	gcc41:${PORTSDIR}/lang/gcc41
+BROKEN=	"still work in progress"
+.else
 BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
+.endif
+
 # FIXME (correctly add ccache before gcc and g++)
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
+.if defined(WITH_GNUGCJ)
+CC=	ccache gcc41
+CXX=	ccache g++41
+.else
 CC=	ccache gcc-ooo
 CXX=	ccache g++-ooo
+.endif #WITH_GNUGCJ
+.endif #WITH_CCACHE
+.if !defined(WITH_CCACHE)
+.if defined(WITH_GNUGCJ)
+CC=	gcc41
+CXX=	g++41
 .else
 CC=	gcc-ooo
 CXX=	g++-ooo
-.endif
+.endif #WITH_GNUGCJ
+.endif #!WITH_CCACHE
+
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison-devel:${PORTSDIR}/devel/bison-devel \
 		imake:${X_IMAKE_PORT}
-.if defined(WITHOUT_JAVA)
-LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
-.else
+.if !defined(WITHOUT_JAVA)
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 .endif
 
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 ANT?=		${LOCALBASE}/bin/ant
 ZIP?=		${PREFIX}/bin/zip
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal
 
 .include <${FILESDIR}/Makefile.knobs>
 
 pre-everything::
 # really tweak, extremely useful when you build all localized language versions
 # needed after when you build with ALL_LOCALIZED_LANGS.
 .if defined(TWEAK_L10N)
 	@${RM} -f ${WRKDIR}/.PLIST*
 	@${RM} -f ${WRKDIR}/.install_done.*
 	@${RM} -f ${WRKDIR}/.package_done.*
 	@${RM} -f ${WRKDIR}/.extract_done.*
 	@${RM} -f ${WRKDIR}/.patch_done.*
 	@${RM} -f ${WRKDIR}/.configure_done.*
 	@${RM} -f ${WRKDIR}/.build_done.*
 	@${TOUCH} ${EXTRACT_COOKIE}
 	@${TOUCH} ${PATCH_COOKIE}
 	@${TOUCH} ${CONFIGURE_COOKIE}
 	@${TOUCH} ${BUILD_COOKIE}
 .endif
 
 post-extract:
 .if defined(WITH_TTF_BYTECODE_ENABLED)
 	@cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/optpatch-freetype
 .endif
 	@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/
 .if !defined(WITHOUT_MOZILLA)
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
 .endif
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 .if (${NUMOFPROCESSES}>1)
 	@cd ${WRKSRC} ;	${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
 .else
 	@cd ${WRKSRC} ;	${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes"  ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
 .endif
 
 do-install:
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${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 ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
 		${PREFIX}/bin/${EXECBASE}
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sagenda
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setup
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sfax
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sweb
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
 	@${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 	@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
 			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${PKGMESSAGE}
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
 .include <${FILESDIR}/Makefile.others>
 .include <bsd.port.post.mk>

Property changes on: head/editors/openoffice.org-3/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.190
\ No newline at end of property
+1.191
\ No newline at end of property
Index: head/editors/openoffice.org-3/distinfo
===================================================================
--- head/editors/openoffice.org-3/distinfo	(revision 139878)
+++ head/editors/openoffice.org-3/distinfo	(revision 139879)
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_1.9m117_source.tar.bz2) = 95630bc570e10a30b8cfd840c321e00b
-SIZE (openoffice.org2.0/OOo_1.9m117_source.tar.bz2) = 227975719
+MD5 (openoffice.org2.0/OOo_1.9m120_source.tar.bz2) = 9230e6cd7e824a3e3846ccf4a04b92af
+SIZE (openoffice.org2.0/OOo_1.9m120_source.tar.bz2) = 228290473
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
 SIZE (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 38721366

Property changes on: head/editors/openoffice.org-3/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.72
\ No newline at end of property
+1.73
\ No newline at end of property
Index: head/editors/openoffice.org-3/files/Makefile.knobs
===================================================================
--- head/editors/openoffice.org-3/files/Makefile.knobs	(revision 139878)
+++ head/editors/openoffice.org-3/files/Makefile.knobs	(revision 139879)
@@ -1,107 +1,125 @@
 # Makefile for knobs
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 
+.if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
+CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
+.endif
+.if !defined(WITHOUT_JAVA) && defined(WITH_GNUGCJ)
+CONFIGURE_ARGS+=	--with-java=gij --with-ant-home=${LOCALBASE}/ant
+.endif
 .if defined(WITHOUT_JAVA)
 CONFIGURE_ARGS+=	--without-java
-.else
-CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
 .endif
 
 .if defined(WITH_KDE)
 CONFIGURE_ARGS+=	--enable-kde QTDIR="${QT_PREFIX}"
 .endif
 
 .if defined(WITH_CUPS)
 LIB_DEPENDS+=		cups.2:${PORTSDIR}/print/cups-base
 CONFIGURE_ARGS+=	--enable-cups=yes
 .else
 CONFIGURE_ARGS+=	--enable-cups=no
 .endif
 
 .if defined(WITHOUT_MOZILLA)
 CONFIGURE_ARGS+=	--disable-mozilla
 .else
 CONFIGURE_ARGS+=	--enable-build-mozilla
 .endif
 
 .if defined(ALL_LOCALIZED_LANGS)
 CONFIGURE_ARGS+=	--with-lang=ALL
 .else
 CONFIGURE_ARGS+=	--with-lang=${LOCALIZED_LANG}
 .endif
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
 CONFIGURE_ARGS+=	--enable-debug
 .else
 CONFIGURE_ARGS+=	--enable-symbols
 .endif
 .endif
 
 pre-fetch:
 .if (${OSVERSION} < 503001 && ${OSVERSION} >= 500000) || (${OSVERSION} < 492000)
 	@${ECHO}
 	@${ECHO} "WARNING"
 	@${ECHO} "Your rtld seems to be old."
 	@${ECHO} "Please remake your rtld by:"
 	@${ECHO} "[1] if you use 4-series:"
 	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4"
 	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4"
 	@${ECHO} "# make ; make depend ; make install"
 	@${ECHO} "[2] if you use 5-series:"
 	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5"
 	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5"
 	@${ECHO} "# make ; make depend ; make install"
 	@${ECHO} "AT YOUR OWN RISK!"
 .endif
 	@${ECHO} "OPTIONS:"
 .if !defined(WITH_DEBUG)
 	@${ECHO}
 	@${ECHO} "You can compile OOo with debug symbols with WITH_DEBUG=1"
 	@${ECHO}
 	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
 	@${ECHO} "OOo debug support."
 .endif
-#XXX currently broken
-#.if !defined(WITHOUT_MOZILLA)
-#	@${ECHO}
-#	@${ECHO} "You can compile OOo without Mozilla connectivity by"
-#	@${ECHO} "make -DWITHOUT_MOZILLA"
-#.endif
+.if !defined(WITHOUT_MOZILLA)
+	@${ECHO}
+	@${ECHO} "You can compile OOo without Mozilla connectivity with"
+	@${ECHO} "make -DWITHOUT_MOZILLA"
+.endif
 .if !defined(WITH_TTF_BYTECODE_ENABLED)
 	@${ECHO}
 	@${ECHO} "You may get better quality of glyphs"
-	@${ECHO} "at small bitmap sizes, If you have"
+	@${ECHO} "at small bitmap sizes if you have"
 	@${ECHO} "licensed the Apple patents"
-	@${ECHO} "US05155805 US05159668 and US05325479, by"
+	@${ECHO} "US05155805 US05159668 and US05325479, with"
 	@${ECHO} "make -DWITH_TTF_BYTECODE_ENABLED"
 	@${ECHO} "See http://www.freetype.org/patents.html for details"
 .endif
+	@${ECHO}
+	@${ECHO} "You can select the language for OOo by making it with:"
+	@${ECHO} "make LOCALIZED_LANG=xx" 
+	@${ECHO} "while xx can be one of the following"
+	@${ECHO} "af ar bn be-BY bg ca cs cy da de el en-GB eo es"
+	@${ECHO} "et eu fi fr gl gu-IN he hi-IN hr hu it ja km kn-IN"
+	@${ECHO} "ko lt ms nb nl nn ns pa-IN pl pt pt-BR ru rw sk"
+	@${ECHO} "sl sv ta-IN th tn tr vi xh zh-CN zh-TW zu"
+	@${ECHO}
 #XXX currently broken
 #.if !defined(WITHOUT_JAVA)
 #	@${ECHO}
-#	@${ECHO} "You can compile OOo without Java support by"
+#	@${ECHO} "You can compile OOo without Java support with"
 #	@${ECHO} "make -DWITHOUT_JAVA"
 #.endif
 #XXX currently broken
+#.if !defined(WITH_GNUGCJ)
+#	@${ECHO}
+#	@${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with"
+#	@${ECHO} "make -DWITH_GNUGCJ"
+#.endif
+#XXX currently broken
 #.if !defined(WITH_CUPS)
 #	@${ECHO}
-#	@${ECHO} "You can compile OOo with CUPS support by"
+#	@${ECHO} "You can compile OOo with CUPS support with"
 #	@${ECHO} "make -DWITH_CUPS"
 #.endif
 .if !defined(WITH_KDE)
 	@${ECHO}
-	@${ECHO} "You can compile OOo to use Qt/KDE vclplug"
+	@${ECHO} "You can compile OOo to use Qt/KDE vclplug with"
 	@${ECHO} "make -DWITH_KDE"
 .endif
 	@${ECHO}
 	@${ECHO} "NOTICE:"
 	@${ECHO}
 	@${ECHO} "To build OOo, you should have a lot"
 .if defined(WITH_DEBUG)
 	@${ECHO} "of free diskspace (~ 18GB)."
 .else
-	@${ECHO} "of free diskspace (~ 8.5GB)."
+	@${ECHO} "of free diskspace (~ 9GB)."
 .endif
 	@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"

Property changes on: head/editors/openoffice.org-3/files/Makefile.knobs
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.16
\ No newline at end of property
+1.17
\ No newline at end of property
Index: head/editors/openoffice.org-3/files/Makefile.localized
===================================================================
--- head/editors/openoffice.org-3/files/Makefile.localized	(revision 139878)
+++ head/editors/openoffice.org-3/files/Makefile.localized	(revision 139879)
@@ -1,212 +1,245 @@
 # localized makefile
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 ################################################################
 #See solenv/inc/postset.mk for details	
 ################################################################
 .if defined(LOCALIZED_LANG)
 .if ${LOCALIZED_LANG} == "af"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ar"
 CATEGORIES=	arabic
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "bn"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "be-BY"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "bg"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ca"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "cs"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "cy"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "da"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "de"
 CATEGORIES=	german
 LANG_PKGNAME=	${LOCALIZED_LANG}
 COMMENT=	Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und Praesentationsprogramm
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "el"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "en-GB"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "eo"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "es"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "et"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "eu"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "fi"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "fr"
 CATEGORIES=	french
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "gl"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "gu-IN"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "he"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "hi-IN"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "hr"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "hu"
 CATEGORIES=     hungarian
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "it"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ja"
 CATEGORIES=	japanese
 LANG_PKGNAME=	${LOCALIZED_LANG}
 RUN_DEPENDS+=   ${X11BASE}/lib/X11/fonts/TrueType/sazanami-mincho.ttf:${PORTSDIR}/japanese/sazanami-ttf
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "km"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "kn-IN"
 LANG_PKGNAME=	kn
 LANG_SUFFIX=	IN
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ko"
 CATEGORIES=     korean
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "lt"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ms"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "nb"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "nl"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "nn"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ns"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "pa-IN"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "pl"
 CATEGORIES=	polish
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "pt"
 COMMENT=	Editor texto/grBaGico, banco de dados/planilha/navegador integrado
 CATEGORIES=	portuguese
 LANG_PKGNAME=	${LOCALIZED_LANG}
 LANG_EXT=	03
 LANG_CONFIGURE_ARG=	PORT
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "pt-BR"
 COMMENT=        Editor texto/grBaGico, banco de dados/planilha/navegador integrado
 CATEGORIES=     portuguese
 LANG_PKGNAME=	pt
 LANG_SUFFIX=	BR
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ru"
 CATEGORIES=	russian
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "rw"
+CATEGORIES=	russian
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "sk"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "sl"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "sv"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "ta-IN"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "th"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 #.if ${LOCALIZED_LANG} == "tn"
 #LANG_PKGNAME=	${LOCALIZED_LANG}
 #.endif
 ################################################################
 .if ${LOCALIZED_LANG} == "tr"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "vi"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "xh"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "zh-CN"
 CATEGORIES=	chinese
 LANG_PKGNAME=	zh
 LANG_SUFFIX=	CN
 BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "zh-TW"
 CATEGORIES=	chinese
 LANG_PKGNAME=	zh
 LANG_SUFFIX=	TW
 BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "zu"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .endif

Property changes on: head/editors/openoffice.org-3/files/Makefile.localized
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.7
\ No newline at end of property
Index: head/editors/openoffice.org-3/files/pkg-message.in
===================================================================
--- head/editors/openoffice.org-3/files/pkg-message.in	(revision 139878)
+++ head/editors/openoffice.org-3/files/pkg-message.in	(revision 139879)
@@ -1,53 +1,51 @@
 OpenOffice.org Build %%RELEASE_NR%%m%%MILESTONE%% Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
 		and Maho Nakata <maho@FreeBSD.org>
 
 OpenOffice.org %%RELEASE_NR%%m%%MILESTONE%% will soon been installed in
 %%PREFIX%%/%%EXECBASE%%
 
-1 User installation
--------------------
+1. User installation
+--------------------
 
 Just type "%%EXECBASE%%" after you have successfully
 installed the package. If there is no installed
 OO.org dir in your homedir, you'll be prompted to
-install some files and choose a installed JDK.
+install some files and choose an installed JDK.
 The setup installs a ".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" folder
 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
-have both a line for each version which is installed.
+version, you may look in the file ".sversionrc" located
+in your homedir. In this file, OpenOffice and StarOffice
+will have a line for each version that is installed.
 After removing the problematic line you should be able to
-install again.
+install the package again.
 
-2 Start OO.org
---------------
+2. Starting OO.org
+------------------
 
-There are some wrappers installed for fast startup.
+There are some wrappers installed for faster startup.
 Add "%%PREFIX%%/bin/" to your PATH and you will be able
 to use them.
 
 %%PREFIX%%/bin/%%EXECBASE%%
 %%PREFIX%%/bin/%%EXECBASE%%-sagenda
 %%PREFIX%%/bin/%%EXECBASE%%-scalc
 %%PREFIX%%/bin/%%EXECBASE%%-sdraw
 %%PREFIX%%/bin/%%EXECBASE%%-setup
 %%PREFIX%%/bin/%%EXECBASE%%-sfax
 %%PREFIX%%/bin/%%EXECBASE%%-simpress
 %%PREFIX%%/bin/%%EXECBASE%%-spadmin
 %%PREFIX%%/bin/%%EXECBASE%%-sweb
 %%PREFIX%%/bin/%%EXECBASE%%-swriter
 
 OO.org does need $LANG to be set to a suitable value.
 
-3 If you stuck into a trouble
+3. If you run into problems
 --------------------------------------------------
-Somehow you can stuck into a trouble. 
-To solve this issue, please remove the already installed
-".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" dir in your homedir and remove the
-appropriate entry from ".sversionrc". After you have done
-this, redo the user installation and the problem will
-go away.
+If you somehow run into problems, please remove the already installed
+".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" dir in your homedir
+along with the appropriate entry in ".sversionrc". Redo the user
+installation and the problems should go away.

Property changes on: head/editors/openoffice.org-3/files/pkg-message.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/editors/openoffice.org-3-RC/Makefile
===================================================================
--- head/editors/openoffice.org-3-RC/Makefile	(revision 139878)
+++ head/editors/openoffice.org-3-RC/Makefile	(revision 139879)
@@ -1,193 +1,209 @@
 # New ports collection makefile for: OpenOffice.org
 # Date created:		28 February 2002
 # Whom:                 Martin Blapp
 #
 # $FreeBSD$
 #
 
 PORTNAME=	openoffice
 PORTVERSION=	2.0.${SNAPDATE}
 CATEGORIES+=	editors
 MASTER_SITES+=	ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
 DISTFILES+=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 gpc231.tar.Z:gpc
 EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
 
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
 USE_GNOME+=	libidl
 .endif
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=        3
 .endif
 USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 
-.if !defined(WITHOUT_JAVA)
+.if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
 JAVA_VERSION=	1.4
 JAVA_BUILD=	jdk
 .endif
 
 .include <bsd.port.pre.mk>
 .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"
 .endif
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		117
-SNAPDATE=		20050713
+MILESTONE=		120
+SNAPDATE=		20050722
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
 PACKAGE_BASENAME=	OOo_${RELEASE_NR}m${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
 .if defined(LANG_PKGNAME)
 PKGNAMEPREFIX=          ${LANG_PKGNAME}-
 .endif
 .if defined(LANG_SUFFIX)
 PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
+.if defined(WITH_GNUGCJ)
+BUILD_DEPENDS+=	gcc41:${PORTSDIR}/lang/gcc41
+BROKEN=	"still work in progress"
+.else
 BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
+.endif
+
 # FIXME (correctly add ccache before gcc and g++)
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
+.if defined(WITH_GNUGCJ)
+CC=	ccache gcc41
+CXX=	ccache g++41
+.else
 CC=	ccache gcc-ooo
 CXX=	ccache g++-ooo
+.endif #WITH_GNUGCJ
+.endif #WITH_CCACHE
+.if !defined(WITH_CCACHE)
+.if defined(WITH_GNUGCJ)
+CC=	gcc41
+CXX=	g++41
 .else
 CC=	gcc-ooo
 CXX=	g++-ooo
-.endif
+.endif #WITH_GNUGCJ
+.endif #!WITH_CCACHE
+
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison-devel:${PORTSDIR}/devel/bison-devel \
 		imake:${X_IMAKE_PORT}
-.if defined(WITHOUT_JAVA)
-LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
-.else
+.if !defined(WITHOUT_JAVA)
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 .endif
 
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 ANT?=		${LOCALBASE}/bin/ant
 ZIP?=		${PREFIX}/bin/zip
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal
 
 .include <${FILESDIR}/Makefile.knobs>
 
 pre-everything::
 # really tweak, extremely useful when you build all localized language versions
 # needed after when you build with ALL_LOCALIZED_LANGS.
 .if defined(TWEAK_L10N)
 	@${RM} -f ${WRKDIR}/.PLIST*
 	@${RM} -f ${WRKDIR}/.install_done.*
 	@${RM} -f ${WRKDIR}/.package_done.*
 	@${RM} -f ${WRKDIR}/.extract_done.*
 	@${RM} -f ${WRKDIR}/.patch_done.*
 	@${RM} -f ${WRKDIR}/.configure_done.*
 	@${RM} -f ${WRKDIR}/.build_done.*
 	@${TOUCH} ${EXTRACT_COOKIE}
 	@${TOUCH} ${PATCH_COOKIE}
 	@${TOUCH} ${CONFIGURE_COOKIE}
 	@${TOUCH} ${BUILD_COOKIE}
 .endif
 
 post-extract:
 .if defined(WITH_TTF_BYTECODE_ENABLED)
 	@cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/optpatch-freetype
 .endif
 	@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/
 .if !defined(WITHOUT_MOZILLA)
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
 .endif
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 .if (${NUMOFPROCESSES}>1)
 	@cd ${WRKSRC} ;	${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
 .else
 	@cd ${WRKSRC} ;	${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes"  ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
 .endif
 
 do-install:
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${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 ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
 		${PREFIX}/bin/${EXECBASE}
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sagenda
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setup
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sfax
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sweb
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
 	@${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 	@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
 			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${PKGMESSAGE}
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
 .include <${FILESDIR}/Makefile.others>
 .include <bsd.port.post.mk>

Property changes on: head/editors/openoffice.org-3-RC/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.190
\ No newline at end of property
+1.191
\ No newline at end of property
Index: head/editors/openoffice.org-3-RC/distinfo
===================================================================
--- head/editors/openoffice.org-3-RC/distinfo	(revision 139878)
+++ head/editors/openoffice.org-3-RC/distinfo	(revision 139879)
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_1.9m117_source.tar.bz2) = 95630bc570e10a30b8cfd840c321e00b
-SIZE (openoffice.org2.0/OOo_1.9m117_source.tar.bz2) = 227975719
+MD5 (openoffice.org2.0/OOo_1.9m120_source.tar.bz2) = 9230e6cd7e824a3e3846ccf4a04b92af
+SIZE (openoffice.org2.0/OOo_1.9m120_source.tar.bz2) = 228290473
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
 SIZE (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 38721366

Property changes on: head/editors/openoffice.org-3-RC/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.72
\ No newline at end of property
+1.73
\ No newline at end of property
Index: head/editors/openoffice.org-3-RC/files/Makefile.knobs
===================================================================
--- head/editors/openoffice.org-3-RC/files/Makefile.knobs	(revision 139878)
+++ head/editors/openoffice.org-3-RC/files/Makefile.knobs	(revision 139879)
@@ -1,107 +1,125 @@
 # Makefile for knobs
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 
+.if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
+CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
+.endif
+.if !defined(WITHOUT_JAVA) && defined(WITH_GNUGCJ)
+CONFIGURE_ARGS+=	--with-java=gij --with-ant-home=${LOCALBASE}/ant
+.endif
 .if defined(WITHOUT_JAVA)
 CONFIGURE_ARGS+=	--without-java
-.else
-CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
 .endif
 
 .if defined(WITH_KDE)
 CONFIGURE_ARGS+=	--enable-kde QTDIR="${QT_PREFIX}"
 .endif
 
 .if defined(WITH_CUPS)
 LIB_DEPENDS+=		cups.2:${PORTSDIR}/print/cups-base
 CONFIGURE_ARGS+=	--enable-cups=yes
 .else
 CONFIGURE_ARGS+=	--enable-cups=no
 .endif
 
 .if defined(WITHOUT_MOZILLA)
 CONFIGURE_ARGS+=	--disable-mozilla
 .else
 CONFIGURE_ARGS+=	--enable-build-mozilla
 .endif
 
 .if defined(ALL_LOCALIZED_LANGS)
 CONFIGURE_ARGS+=	--with-lang=ALL
 .else
 CONFIGURE_ARGS+=	--with-lang=${LOCALIZED_LANG}
 .endif
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
 CONFIGURE_ARGS+=	--enable-debug
 .else
 CONFIGURE_ARGS+=	--enable-symbols
 .endif
 .endif
 
 pre-fetch:
 .if (${OSVERSION} < 503001 && ${OSVERSION} >= 500000) || (${OSVERSION} < 492000)
 	@${ECHO}
 	@${ECHO} "WARNING"
 	@${ECHO} "Your rtld seems to be old."
 	@${ECHO} "Please remake your rtld by:"
 	@${ECHO} "[1] if you use 4-series:"
 	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4"
 	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4"
 	@${ECHO} "# make ; make depend ; make install"
 	@${ECHO} "[2] if you use 5-series:"
 	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5"
 	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5"
 	@${ECHO} "# make ; make depend ; make install"
 	@${ECHO} "AT YOUR OWN RISK!"
 .endif
 	@${ECHO} "OPTIONS:"
 .if !defined(WITH_DEBUG)
 	@${ECHO}
 	@${ECHO} "You can compile OOo with debug symbols with WITH_DEBUG=1"
 	@${ECHO}
 	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
 	@${ECHO} "OOo debug support."
 .endif
-#XXX currently broken
-#.if !defined(WITHOUT_MOZILLA)
-#	@${ECHO}
-#	@${ECHO} "You can compile OOo without Mozilla connectivity by"
-#	@${ECHO} "make -DWITHOUT_MOZILLA"
-#.endif
+.if !defined(WITHOUT_MOZILLA)
+	@${ECHO}
+	@${ECHO} "You can compile OOo without Mozilla connectivity with"
+	@${ECHO} "make -DWITHOUT_MOZILLA"
+.endif
 .if !defined(WITH_TTF_BYTECODE_ENABLED)
 	@${ECHO}
 	@${ECHO} "You may get better quality of glyphs"
-	@${ECHO} "at small bitmap sizes, If you have"
+	@${ECHO} "at small bitmap sizes if you have"
 	@${ECHO} "licensed the Apple patents"
-	@${ECHO} "US05155805 US05159668 and US05325479, by"
+	@${ECHO} "US05155805 US05159668 and US05325479, with"
 	@${ECHO} "make -DWITH_TTF_BYTECODE_ENABLED"
 	@${ECHO} "See http://www.freetype.org/patents.html for details"
 .endif
+	@${ECHO}
+	@${ECHO} "You can select the language for OOo by making it with:"
+	@${ECHO} "make LOCALIZED_LANG=xx" 
+	@${ECHO} "while xx can be one of the following"
+	@${ECHO} "af ar bn be-BY bg ca cs cy da de el en-GB eo es"
+	@${ECHO} "et eu fi fr gl gu-IN he hi-IN hr hu it ja km kn-IN"
+	@${ECHO} "ko lt ms nb nl nn ns pa-IN pl pt pt-BR ru rw sk"
+	@${ECHO} "sl sv ta-IN th tn tr vi xh zh-CN zh-TW zu"
+	@${ECHO}
 #XXX currently broken
 #.if !defined(WITHOUT_JAVA)
 #	@${ECHO}
-#	@${ECHO} "You can compile OOo without Java support by"
+#	@${ECHO} "You can compile OOo without Java support with"
 #	@${ECHO} "make -DWITHOUT_JAVA"
 #.endif
 #XXX currently broken
+#.if !defined(WITH_GNUGCJ)
+#	@${ECHO}
+#	@${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with"
+#	@${ECHO} "make -DWITH_GNUGCJ"
+#.endif
+#XXX currently broken
 #.if !defined(WITH_CUPS)
 #	@${ECHO}
-#	@${ECHO} "You can compile OOo with CUPS support by"
+#	@${ECHO} "You can compile OOo with CUPS support with"
 #	@${ECHO} "make -DWITH_CUPS"
 #.endif
 .if !defined(WITH_KDE)
 	@${ECHO}
-	@${ECHO} "You can compile OOo to use Qt/KDE vclplug"
+	@${ECHO} "You can compile OOo to use Qt/KDE vclplug with"
 	@${ECHO} "make -DWITH_KDE"
 .endif
 	@${ECHO}
 	@${ECHO} "NOTICE:"
 	@${ECHO}
 	@${ECHO} "To build OOo, you should have a lot"
 .if defined(WITH_DEBUG)
 	@${ECHO} "of free diskspace (~ 18GB)."
 .else
-	@${ECHO} "of free diskspace (~ 8.5GB)."
+	@${ECHO} "of free diskspace (~ 9GB)."
 .endif
 	@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"

Property changes on: head/editors/openoffice.org-3-RC/files/Makefile.knobs
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.16
\ No newline at end of property
+1.17
\ No newline at end of property
Index: head/editors/openoffice.org-3-RC/files/Makefile.localized
===================================================================
--- head/editors/openoffice.org-3-RC/files/Makefile.localized	(revision 139878)
+++ head/editors/openoffice.org-3-RC/files/Makefile.localized	(revision 139879)
@@ -1,212 +1,245 @@
 # localized makefile
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 ################################################################
 #See solenv/inc/postset.mk for details	
 ################################################################
 .if defined(LOCALIZED_LANG)
 .if ${LOCALIZED_LANG} == "af"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ar"
 CATEGORIES=	arabic
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "bn"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "be-BY"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "bg"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ca"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "cs"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "cy"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "da"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "de"
 CATEGORIES=	german
 LANG_PKGNAME=	${LOCALIZED_LANG}
 COMMENT=	Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und Praesentationsprogramm
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "el"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "en-GB"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "eo"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "es"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "et"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "eu"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "fi"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "fr"
 CATEGORIES=	french
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "gl"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "gu-IN"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "he"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "hi-IN"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "hr"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "hu"
 CATEGORIES=     hungarian
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "it"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ja"
 CATEGORIES=	japanese
 LANG_PKGNAME=	${LOCALIZED_LANG}
 RUN_DEPENDS+=   ${X11BASE}/lib/X11/fonts/TrueType/sazanami-mincho.ttf:${PORTSDIR}/japanese/sazanami-ttf
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "km"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "kn-IN"
 LANG_PKGNAME=	kn
 LANG_SUFFIX=	IN
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ko"
 CATEGORIES=     korean
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "lt"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ms"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "nb"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "nl"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "nn"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ns"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "pa-IN"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "pl"
 CATEGORIES=	polish
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "pt"
 COMMENT=	Editor texto/grBaGico, banco de dados/planilha/navegador integrado
 CATEGORIES=	portuguese
 LANG_PKGNAME=	${LOCALIZED_LANG}
 LANG_EXT=	03
 LANG_CONFIGURE_ARG=	PORT
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "pt-BR"
 COMMENT=        Editor texto/grBaGico, banco de dados/planilha/navegador integrado
 CATEGORIES=     portuguese
 LANG_PKGNAME=	pt
 LANG_SUFFIX=	BR
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ru"
 CATEGORIES=	russian
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "rw"
+CATEGORIES=	russian
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "sk"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "sl"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "sv"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "ta-IN"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "th"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 #.if ${LOCALIZED_LANG} == "tn"
 #LANG_PKGNAME=	${LOCALIZED_LANG}
 #.endif
 ################################################################
 .if ${LOCALIZED_LANG} == "tr"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "vi"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "xh"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "zh-CN"
 CATEGORIES=	chinese
 LANG_PKGNAME=	zh
 LANG_SUFFIX=	CN
 BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "zh-TW"
 CATEGORIES=	chinese
 LANG_PKGNAME=	zh
 LANG_SUFFIX=	TW
 BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "zu"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .endif

Property changes on: head/editors/openoffice.org-3-RC/files/Makefile.localized
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.7
\ No newline at end of property
Index: head/editors/openoffice.org-3-RC/files/pkg-message.in
===================================================================
--- head/editors/openoffice.org-3-RC/files/pkg-message.in	(revision 139878)
+++ head/editors/openoffice.org-3-RC/files/pkg-message.in	(revision 139879)
@@ -1,53 +1,51 @@
 OpenOffice.org Build %%RELEASE_NR%%m%%MILESTONE%% Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
 		and Maho Nakata <maho@FreeBSD.org>
 
 OpenOffice.org %%RELEASE_NR%%m%%MILESTONE%% will soon been installed in
 %%PREFIX%%/%%EXECBASE%%
 
-1 User installation
--------------------
+1. User installation
+--------------------
 
 Just type "%%EXECBASE%%" after you have successfully
 installed the package. If there is no installed
 OO.org dir in your homedir, you'll be prompted to
-install some files and choose a installed JDK.
+install some files and choose an installed JDK.
 The setup installs a ".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" folder
 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
-have both a line for each version which is installed.
+version, you may look in the file ".sversionrc" located
+in your homedir. In this file, OpenOffice and StarOffice
+will have a line for each version that is installed.
 After removing the problematic line you should be able to
-install again.
+install the package again.
 
-2 Start OO.org
---------------
+2. Starting OO.org
+------------------
 
-There are some wrappers installed for fast startup.
+There are some wrappers installed for faster startup.
 Add "%%PREFIX%%/bin/" to your PATH and you will be able
 to use them.
 
 %%PREFIX%%/bin/%%EXECBASE%%
 %%PREFIX%%/bin/%%EXECBASE%%-sagenda
 %%PREFIX%%/bin/%%EXECBASE%%-scalc
 %%PREFIX%%/bin/%%EXECBASE%%-sdraw
 %%PREFIX%%/bin/%%EXECBASE%%-setup
 %%PREFIX%%/bin/%%EXECBASE%%-sfax
 %%PREFIX%%/bin/%%EXECBASE%%-simpress
 %%PREFIX%%/bin/%%EXECBASE%%-spadmin
 %%PREFIX%%/bin/%%EXECBASE%%-sweb
 %%PREFIX%%/bin/%%EXECBASE%%-swriter
 
 OO.org does need $LANG to be set to a suitable value.
 
-3 If you stuck into a trouble
+3. If you run into problems
 --------------------------------------------------
-Somehow you can stuck into a trouble. 
-To solve this issue, please remove the already installed
-".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" dir in your homedir and remove the
-appropriate entry from ".sversionrc". After you have done
-this, redo the user installation and the problem will
-go away.
+If you somehow run into problems, please remove the already installed
+".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" dir in your homedir
+along with the appropriate entry in ".sversionrc". Redo the user
+installation and the problems should go away.

Property changes on: head/editors/openoffice.org-3-RC/files/pkg-message.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/editors/openoffice.org-3-devel/Makefile
===================================================================
--- head/editors/openoffice.org-3-devel/Makefile	(revision 139878)
+++ head/editors/openoffice.org-3-devel/Makefile	(revision 139879)
@@ -1,193 +1,209 @@
 # New ports collection makefile for: OpenOffice.org
 # Date created:		28 February 2002
 # Whom:                 Martin Blapp
 #
 # $FreeBSD$
 #
 
 PORTNAME=	openoffice
 PORTVERSION=	2.0.${SNAPDATE}
 CATEGORIES+=	editors
 MASTER_SITES+=	ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
 DISTFILES+=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 gpc231.tar.Z:gpc
 EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
 
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
 USE_GNOME+=	libidl
 .endif
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=        3
 .endif
 USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 
-.if !defined(WITHOUT_JAVA)
+.if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
 JAVA_VERSION=	1.4
 JAVA_BUILD=	jdk
 .endif
 
 .include <bsd.port.pre.mk>
 .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"
 .endif
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		117
-SNAPDATE=		20050713
+MILESTONE=		120
+SNAPDATE=		20050722
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
 PACKAGE_BASENAME=	OOo_${RELEASE_NR}m${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
 .if defined(LANG_PKGNAME)
 PKGNAMEPREFIX=          ${LANG_PKGNAME}-
 .endif
 .if defined(LANG_SUFFIX)
 PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
+.if defined(WITH_GNUGCJ)
+BUILD_DEPENDS+=	gcc41:${PORTSDIR}/lang/gcc41
+BROKEN=	"still work in progress"
+.else
 BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
+.endif
+
 # FIXME (correctly add ccache before gcc and g++)
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
+.if defined(WITH_GNUGCJ)
+CC=	ccache gcc41
+CXX=	ccache g++41
+.else
 CC=	ccache gcc-ooo
 CXX=	ccache g++-ooo
+.endif #WITH_GNUGCJ
+.endif #WITH_CCACHE
+.if !defined(WITH_CCACHE)
+.if defined(WITH_GNUGCJ)
+CC=	gcc41
+CXX=	g++41
 .else
 CC=	gcc-ooo
 CXX=	g++-ooo
-.endif
+.endif #WITH_GNUGCJ
+.endif #!WITH_CCACHE
+
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison-devel:${PORTSDIR}/devel/bison-devel \
 		imake:${X_IMAKE_PORT}
-.if defined(WITHOUT_JAVA)
-LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
-.else
+.if !defined(WITHOUT_JAVA)
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 .endif
 
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 ANT?=		${LOCALBASE}/bin/ant
 ZIP?=		${PREFIX}/bin/zip
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal
 
 .include <${FILESDIR}/Makefile.knobs>
 
 pre-everything::
 # really tweak, extremely useful when you build all localized language versions
 # needed after when you build with ALL_LOCALIZED_LANGS.
 .if defined(TWEAK_L10N)
 	@${RM} -f ${WRKDIR}/.PLIST*
 	@${RM} -f ${WRKDIR}/.install_done.*
 	@${RM} -f ${WRKDIR}/.package_done.*
 	@${RM} -f ${WRKDIR}/.extract_done.*
 	@${RM} -f ${WRKDIR}/.patch_done.*
 	@${RM} -f ${WRKDIR}/.configure_done.*
 	@${RM} -f ${WRKDIR}/.build_done.*
 	@${TOUCH} ${EXTRACT_COOKIE}
 	@${TOUCH} ${PATCH_COOKIE}
 	@${TOUCH} ${CONFIGURE_COOKIE}
 	@${TOUCH} ${BUILD_COOKIE}
 .endif
 
 post-extract:
 .if defined(WITH_TTF_BYTECODE_ENABLED)
 	@cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/optpatch-freetype
 .endif
 	@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/
 .if !defined(WITHOUT_MOZILLA)
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
 .endif
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 .if (${NUMOFPROCESSES}>1)
 	@cd ${WRKSRC} ;	${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
 .else
 	@cd ${WRKSRC} ;	${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes"  ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
 .endif
 
 do-install:
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${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 ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
 		${PREFIX}/bin/${EXECBASE}
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sagenda
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setup
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sfax
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sweb
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
 	@${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 	@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
 			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${PKGMESSAGE}
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
 .include <${FILESDIR}/Makefile.others>
 .include <bsd.port.post.mk>

Property changes on: head/editors/openoffice.org-3-devel/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.190
\ No newline at end of property
+1.191
\ No newline at end of property
Index: head/editors/openoffice.org-3-devel/distinfo
===================================================================
--- head/editors/openoffice.org-3-devel/distinfo	(revision 139878)
+++ head/editors/openoffice.org-3-devel/distinfo	(revision 139879)
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_1.9m117_source.tar.bz2) = 95630bc570e10a30b8cfd840c321e00b
-SIZE (openoffice.org2.0/OOo_1.9m117_source.tar.bz2) = 227975719
+MD5 (openoffice.org2.0/OOo_1.9m120_source.tar.bz2) = 9230e6cd7e824a3e3846ccf4a04b92af
+SIZE (openoffice.org2.0/OOo_1.9m120_source.tar.bz2) = 228290473
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
 SIZE (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 38721366

Property changes on: head/editors/openoffice.org-3-devel/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.72
\ No newline at end of property
+1.73
\ No newline at end of property
Index: head/editors/openoffice.org-3-devel/files/Makefile.knobs
===================================================================
--- head/editors/openoffice.org-3-devel/files/Makefile.knobs	(revision 139878)
+++ head/editors/openoffice.org-3-devel/files/Makefile.knobs	(revision 139879)
@@ -1,107 +1,125 @@
 # Makefile for knobs
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 
+.if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
+CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
+.endif
+.if !defined(WITHOUT_JAVA) && defined(WITH_GNUGCJ)
+CONFIGURE_ARGS+=	--with-java=gij --with-ant-home=${LOCALBASE}/ant
+.endif
 .if defined(WITHOUT_JAVA)
 CONFIGURE_ARGS+=	--without-java
-.else
-CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
 .endif
 
 .if defined(WITH_KDE)
 CONFIGURE_ARGS+=	--enable-kde QTDIR="${QT_PREFIX}"
 .endif
 
 .if defined(WITH_CUPS)
 LIB_DEPENDS+=		cups.2:${PORTSDIR}/print/cups-base
 CONFIGURE_ARGS+=	--enable-cups=yes
 .else
 CONFIGURE_ARGS+=	--enable-cups=no
 .endif
 
 .if defined(WITHOUT_MOZILLA)
 CONFIGURE_ARGS+=	--disable-mozilla
 .else
 CONFIGURE_ARGS+=	--enable-build-mozilla
 .endif
 
 .if defined(ALL_LOCALIZED_LANGS)
 CONFIGURE_ARGS+=	--with-lang=ALL
 .else
 CONFIGURE_ARGS+=	--with-lang=${LOCALIZED_LANG}
 .endif
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
 CONFIGURE_ARGS+=	--enable-debug
 .else
 CONFIGURE_ARGS+=	--enable-symbols
 .endif
 .endif
 
 pre-fetch:
 .if (${OSVERSION} < 503001 && ${OSVERSION} >= 500000) || (${OSVERSION} < 492000)
 	@${ECHO}
 	@${ECHO} "WARNING"
 	@${ECHO} "Your rtld seems to be old."
 	@${ECHO} "Please remake your rtld by:"
 	@${ECHO} "[1] if you use 4-series:"
 	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4"
 	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4"
 	@${ECHO} "# make ; make depend ; make install"
 	@${ECHO} "[2] if you use 5-series:"
 	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5"
 	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5"
 	@${ECHO} "# make ; make depend ; make install"
 	@${ECHO} "AT YOUR OWN RISK!"
 .endif
 	@${ECHO} "OPTIONS:"
 .if !defined(WITH_DEBUG)
 	@${ECHO}
 	@${ECHO} "You can compile OOo with debug symbols with WITH_DEBUG=1"
 	@${ECHO}
 	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
 	@${ECHO} "OOo debug support."
 .endif
-#XXX currently broken
-#.if !defined(WITHOUT_MOZILLA)
-#	@${ECHO}
-#	@${ECHO} "You can compile OOo without Mozilla connectivity by"
-#	@${ECHO} "make -DWITHOUT_MOZILLA"
-#.endif
+.if !defined(WITHOUT_MOZILLA)
+	@${ECHO}
+	@${ECHO} "You can compile OOo without Mozilla connectivity with"
+	@${ECHO} "make -DWITHOUT_MOZILLA"
+.endif
 .if !defined(WITH_TTF_BYTECODE_ENABLED)
 	@${ECHO}
 	@${ECHO} "You may get better quality of glyphs"
-	@${ECHO} "at small bitmap sizes, If you have"
+	@${ECHO} "at small bitmap sizes if you have"
 	@${ECHO} "licensed the Apple patents"
-	@${ECHO} "US05155805 US05159668 and US05325479, by"
+	@${ECHO} "US05155805 US05159668 and US05325479, with"
 	@${ECHO} "make -DWITH_TTF_BYTECODE_ENABLED"
 	@${ECHO} "See http://www.freetype.org/patents.html for details"
 .endif
+	@${ECHO}
+	@${ECHO} "You can select the language for OOo by making it with:"
+	@${ECHO} "make LOCALIZED_LANG=xx" 
+	@${ECHO} "while xx can be one of the following"
+	@${ECHO} "af ar bn be-BY bg ca cs cy da de el en-GB eo es"
+	@${ECHO} "et eu fi fr gl gu-IN he hi-IN hr hu it ja km kn-IN"
+	@${ECHO} "ko lt ms nb nl nn ns pa-IN pl pt pt-BR ru rw sk"
+	@${ECHO} "sl sv ta-IN th tn tr vi xh zh-CN zh-TW zu"
+	@${ECHO}
 #XXX currently broken
 #.if !defined(WITHOUT_JAVA)
 #	@${ECHO}
-#	@${ECHO} "You can compile OOo without Java support by"
+#	@${ECHO} "You can compile OOo without Java support with"
 #	@${ECHO} "make -DWITHOUT_JAVA"
 #.endif
 #XXX currently broken
+#.if !defined(WITH_GNUGCJ)
+#	@${ECHO}
+#	@${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with"
+#	@${ECHO} "make -DWITH_GNUGCJ"
+#.endif
+#XXX currently broken
 #.if !defined(WITH_CUPS)
 #	@${ECHO}
-#	@${ECHO} "You can compile OOo with CUPS support by"
+#	@${ECHO} "You can compile OOo with CUPS support with"
 #	@${ECHO} "make -DWITH_CUPS"
 #.endif
 .if !defined(WITH_KDE)
 	@${ECHO}
-	@${ECHO} "You can compile OOo to use Qt/KDE vclplug"
+	@${ECHO} "You can compile OOo to use Qt/KDE vclplug with"
 	@${ECHO} "make -DWITH_KDE"
 .endif
 	@${ECHO}
 	@${ECHO} "NOTICE:"
 	@${ECHO}
 	@${ECHO} "To build OOo, you should have a lot"
 .if defined(WITH_DEBUG)
 	@${ECHO} "of free diskspace (~ 18GB)."
 .else
-	@${ECHO} "of free diskspace (~ 8.5GB)."
+	@${ECHO} "of free diskspace (~ 9GB)."
 .endif
 	@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"

Property changes on: head/editors/openoffice.org-3-devel/files/Makefile.knobs
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.16
\ No newline at end of property
+1.17
\ No newline at end of property
Index: head/editors/openoffice.org-3-devel/files/Makefile.localized
===================================================================
--- head/editors/openoffice.org-3-devel/files/Makefile.localized	(revision 139878)
+++ head/editors/openoffice.org-3-devel/files/Makefile.localized	(revision 139879)
@@ -1,212 +1,245 @@
 # localized makefile
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 ################################################################
 #See solenv/inc/postset.mk for details	
 ################################################################
 .if defined(LOCALIZED_LANG)
 .if ${LOCALIZED_LANG} == "af"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ar"
 CATEGORIES=	arabic
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "bn"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "be-BY"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "bg"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ca"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "cs"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "cy"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "da"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "de"
 CATEGORIES=	german
 LANG_PKGNAME=	${LOCALIZED_LANG}
 COMMENT=	Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und Praesentationsprogramm
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "el"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "en-GB"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "eo"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "es"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "et"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "eu"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "fi"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "fr"
 CATEGORIES=	french
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "gl"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "gu-IN"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "he"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "hi-IN"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "hr"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "hu"
 CATEGORIES=     hungarian
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "it"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ja"
 CATEGORIES=	japanese
 LANG_PKGNAME=	${LOCALIZED_LANG}
 RUN_DEPENDS+=   ${X11BASE}/lib/X11/fonts/TrueType/sazanami-mincho.ttf:${PORTSDIR}/japanese/sazanami-ttf
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "km"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "kn-IN"
 LANG_PKGNAME=	kn
 LANG_SUFFIX=	IN
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ko"
 CATEGORIES=     korean
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "lt"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ms"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "nb"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "nl"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "nn"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ns"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "pa-IN"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "pl"
 CATEGORIES=	polish
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "pt"
 COMMENT=	Editor texto/grBaGico, banco de dados/planilha/navegador integrado
 CATEGORIES=	portuguese
 LANG_PKGNAME=	${LOCALIZED_LANG}
 LANG_EXT=	03
 LANG_CONFIGURE_ARG=	PORT
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "pt-BR"
 COMMENT=        Editor texto/grBaGico, banco de dados/planilha/navegador integrado
 CATEGORIES=     portuguese
 LANG_PKGNAME=	pt
 LANG_SUFFIX=	BR
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ru"
 CATEGORIES=	russian
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "rw"
+CATEGORIES=	russian
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "sk"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "sl"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "sv"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "ta-IN"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "th"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 #.if ${LOCALIZED_LANG} == "tn"
 #LANG_PKGNAME=	${LOCALIZED_LANG}
 #.endif
 ################################################################
 .if ${LOCALIZED_LANG} == "tr"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "vi"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "xh"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "zh-CN"
 CATEGORIES=	chinese
 LANG_PKGNAME=	zh
 LANG_SUFFIX=	CN
 BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "zh-TW"
 CATEGORIES=	chinese
 LANG_PKGNAME=	zh
 LANG_SUFFIX=	TW
 BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "zu"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .endif

Property changes on: head/editors/openoffice.org-3-devel/files/Makefile.localized
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.7
\ No newline at end of property
Index: head/editors/openoffice.org-3-devel/files/pkg-message.in
===================================================================
--- head/editors/openoffice.org-3-devel/files/pkg-message.in	(revision 139878)
+++ head/editors/openoffice.org-3-devel/files/pkg-message.in	(revision 139879)
@@ -1,53 +1,51 @@
 OpenOffice.org Build %%RELEASE_NR%%m%%MILESTONE%% Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
 		and Maho Nakata <maho@FreeBSD.org>
 
 OpenOffice.org %%RELEASE_NR%%m%%MILESTONE%% will soon been installed in
 %%PREFIX%%/%%EXECBASE%%
 
-1 User installation
--------------------
+1. User installation
+--------------------
 
 Just type "%%EXECBASE%%" after you have successfully
 installed the package. If there is no installed
 OO.org dir in your homedir, you'll be prompted to
-install some files and choose a installed JDK.
+install some files and choose an installed JDK.
 The setup installs a ".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" folder
 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
-have both a line for each version which is installed.
+version, you may look in the file ".sversionrc" located
+in your homedir. In this file, OpenOffice and StarOffice
+will have a line for each version that is installed.
 After removing the problematic line you should be able to
-install again.
+install the package again.
 
-2 Start OO.org
---------------
+2. Starting OO.org
+------------------
 
-There are some wrappers installed for fast startup.
+There are some wrappers installed for faster startup.
 Add "%%PREFIX%%/bin/" to your PATH and you will be able
 to use them.
 
 %%PREFIX%%/bin/%%EXECBASE%%
 %%PREFIX%%/bin/%%EXECBASE%%-sagenda
 %%PREFIX%%/bin/%%EXECBASE%%-scalc
 %%PREFIX%%/bin/%%EXECBASE%%-sdraw
 %%PREFIX%%/bin/%%EXECBASE%%-setup
 %%PREFIX%%/bin/%%EXECBASE%%-sfax
 %%PREFIX%%/bin/%%EXECBASE%%-simpress
 %%PREFIX%%/bin/%%EXECBASE%%-spadmin
 %%PREFIX%%/bin/%%EXECBASE%%-sweb
 %%PREFIX%%/bin/%%EXECBASE%%-swriter
 
 OO.org does need $LANG to be set to a suitable value.
 
-3 If you stuck into a trouble
+3. If you run into problems
 --------------------------------------------------
-Somehow you can stuck into a trouble. 
-To solve this issue, please remove the already installed
-".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" dir in your homedir and remove the
-appropriate entry from ".sversionrc". After you have done
-this, redo the user installation and the problem will
-go away.
+If you somehow run into problems, please remove the already installed
+".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" dir in your homedir
+along with the appropriate entry in ".sversionrc". Redo the user
+installation and the problems should go away.

Property changes on: head/editors/openoffice.org-3-devel/files/pkg-message.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/editors/openoffice.org-vcltesttool/Makefile
===================================================================
--- head/editors/openoffice.org-vcltesttool/Makefile	(revision 139878)
+++ head/editors/openoffice.org-vcltesttool/Makefile	(revision 139879)
@@ -1,193 +1,209 @@
 # New ports collection makefile for: OpenOffice.org
 # Date created:		28 February 2002
 # Whom:                 Martin Blapp
 #
 # $FreeBSD$
 #
 
 PORTNAME=	openoffice
 PORTVERSION=	2.0.${SNAPDATE}
 CATEGORIES+=	editors
 MASTER_SITES+=	ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
 DISTFILES+=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 gpc231.tar.Z:gpc
 EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
 
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
 USE_GNOME+=	libidl
 .endif
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=        3
 .endif
 USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 
-.if !defined(WITHOUT_JAVA)
+.if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
 JAVA_VERSION=	1.4
 JAVA_BUILD=	jdk
 .endif
 
 .include <bsd.port.pre.mk>
 .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"
 .endif
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		117
-SNAPDATE=		20050713
+MILESTONE=		120
+SNAPDATE=		20050722
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
 PACKAGE_BASENAME=	OOo_${RELEASE_NR}m${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
 .if defined(LANG_PKGNAME)
 PKGNAMEPREFIX=          ${LANG_PKGNAME}-
 .endif
 .if defined(LANG_SUFFIX)
 PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
+.if defined(WITH_GNUGCJ)
+BUILD_DEPENDS+=	gcc41:${PORTSDIR}/lang/gcc41
+BROKEN=	"still work in progress"
+.else
 BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
+.endif
+
 # FIXME (correctly add ccache before gcc and g++)
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
+.if defined(WITH_GNUGCJ)
+CC=	ccache gcc41
+CXX=	ccache g++41
+.else
 CC=	ccache gcc-ooo
 CXX=	ccache g++-ooo
+.endif #WITH_GNUGCJ
+.endif #WITH_CCACHE
+.if !defined(WITH_CCACHE)
+.if defined(WITH_GNUGCJ)
+CC=	gcc41
+CXX=	g++41
 .else
 CC=	gcc-ooo
 CXX=	g++-ooo
-.endif
+.endif #WITH_GNUGCJ
+.endif #!WITH_CCACHE
+
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison-devel:${PORTSDIR}/devel/bison-devel \
 		imake:${X_IMAKE_PORT}
-.if defined(WITHOUT_JAVA)
-LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
-.else
+.if !defined(WITHOUT_JAVA)
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 .endif
 
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 ANT?=		${LOCALBASE}/bin/ant
 ZIP?=		${PREFIX}/bin/zip
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal
 
 .include <${FILESDIR}/Makefile.knobs>
 
 pre-everything::
 # really tweak, extremely useful when you build all localized language versions
 # needed after when you build with ALL_LOCALIZED_LANGS.
 .if defined(TWEAK_L10N)
 	@${RM} -f ${WRKDIR}/.PLIST*
 	@${RM} -f ${WRKDIR}/.install_done.*
 	@${RM} -f ${WRKDIR}/.package_done.*
 	@${RM} -f ${WRKDIR}/.extract_done.*
 	@${RM} -f ${WRKDIR}/.patch_done.*
 	@${RM} -f ${WRKDIR}/.configure_done.*
 	@${RM} -f ${WRKDIR}/.build_done.*
 	@${TOUCH} ${EXTRACT_COOKIE}
 	@${TOUCH} ${PATCH_COOKIE}
 	@${TOUCH} ${CONFIGURE_COOKIE}
 	@${TOUCH} ${BUILD_COOKIE}
 .endif
 
 post-extract:
 .if defined(WITH_TTF_BYTECODE_ENABLED)
 	@cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/optpatch-freetype
 .endif
 	@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/
 .if !defined(WITHOUT_MOZILLA)
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
 .endif
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 .if (${NUMOFPROCESSES}>1)
 	@cd ${WRKSRC} ;	${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
 .else
 	@cd ${WRKSRC} ;	${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes"  ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
 .endif
 
 do-install:
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${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 ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
 		${PREFIX}/bin/${EXECBASE}
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sagenda
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setup
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sfax
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sweb
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
 	@${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 	@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
 			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${PKGMESSAGE}
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
 .include <${FILESDIR}/Makefile.others>
 .include <bsd.port.post.mk>

Property changes on: head/editors/openoffice.org-vcltesttool/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.190
\ No newline at end of property
+1.191
\ No newline at end of property
Index: head/editors/openoffice.org-vcltesttool/distinfo
===================================================================
--- head/editors/openoffice.org-vcltesttool/distinfo	(revision 139878)
+++ head/editors/openoffice.org-vcltesttool/distinfo	(revision 139879)
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_1.9m117_source.tar.bz2) = 95630bc570e10a30b8cfd840c321e00b
-SIZE (openoffice.org2.0/OOo_1.9m117_source.tar.bz2) = 227975719
+MD5 (openoffice.org2.0/OOo_1.9m120_source.tar.bz2) = 9230e6cd7e824a3e3846ccf4a04b92af
+SIZE (openoffice.org2.0/OOo_1.9m120_source.tar.bz2) = 228290473
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
 SIZE (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 38721366

Property changes on: head/editors/openoffice.org-vcltesttool/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.72
\ No newline at end of property
+1.73
\ No newline at end of property
Index: head/editors/openoffice.org-vcltesttool/files/Makefile.knobs
===================================================================
--- head/editors/openoffice.org-vcltesttool/files/Makefile.knobs	(revision 139878)
+++ head/editors/openoffice.org-vcltesttool/files/Makefile.knobs	(revision 139879)
@@ -1,107 +1,125 @@
 # Makefile for knobs
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 
+.if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
+CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
+.endif
+.if !defined(WITHOUT_JAVA) && defined(WITH_GNUGCJ)
+CONFIGURE_ARGS+=	--with-java=gij --with-ant-home=${LOCALBASE}/ant
+.endif
 .if defined(WITHOUT_JAVA)
 CONFIGURE_ARGS+=	--without-java
-.else
-CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
 .endif
 
 .if defined(WITH_KDE)
 CONFIGURE_ARGS+=	--enable-kde QTDIR="${QT_PREFIX}"
 .endif
 
 .if defined(WITH_CUPS)
 LIB_DEPENDS+=		cups.2:${PORTSDIR}/print/cups-base
 CONFIGURE_ARGS+=	--enable-cups=yes
 .else
 CONFIGURE_ARGS+=	--enable-cups=no
 .endif
 
 .if defined(WITHOUT_MOZILLA)
 CONFIGURE_ARGS+=	--disable-mozilla
 .else
 CONFIGURE_ARGS+=	--enable-build-mozilla
 .endif
 
 .if defined(ALL_LOCALIZED_LANGS)
 CONFIGURE_ARGS+=	--with-lang=ALL
 .else
 CONFIGURE_ARGS+=	--with-lang=${LOCALIZED_LANG}
 .endif
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
 CONFIGURE_ARGS+=	--enable-debug
 .else
 CONFIGURE_ARGS+=	--enable-symbols
 .endif
 .endif
 
 pre-fetch:
 .if (${OSVERSION} < 503001 && ${OSVERSION} >= 500000) || (${OSVERSION} < 492000)
 	@${ECHO}
 	@${ECHO} "WARNING"
 	@${ECHO} "Your rtld seems to be old."
 	@${ECHO} "Please remake your rtld by:"
 	@${ECHO} "[1] if you use 4-series:"
 	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4"
 	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4"
 	@${ECHO} "# make ; make depend ; make install"
 	@${ECHO} "[2] if you use 5-series:"
 	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5"
 	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5"
 	@${ECHO} "# make ; make depend ; make install"
 	@${ECHO} "AT YOUR OWN RISK!"
 .endif
 	@${ECHO} "OPTIONS:"
 .if !defined(WITH_DEBUG)
 	@${ECHO}
 	@${ECHO} "You can compile OOo with debug symbols with WITH_DEBUG=1"
 	@${ECHO}
 	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
 	@${ECHO} "OOo debug support."
 .endif
-#XXX currently broken
-#.if !defined(WITHOUT_MOZILLA)
-#	@${ECHO}
-#	@${ECHO} "You can compile OOo without Mozilla connectivity by"
-#	@${ECHO} "make -DWITHOUT_MOZILLA"
-#.endif
+.if !defined(WITHOUT_MOZILLA)
+	@${ECHO}
+	@${ECHO} "You can compile OOo without Mozilla connectivity with"
+	@${ECHO} "make -DWITHOUT_MOZILLA"
+.endif
 .if !defined(WITH_TTF_BYTECODE_ENABLED)
 	@${ECHO}
 	@${ECHO} "You may get better quality of glyphs"
-	@${ECHO} "at small bitmap sizes, If you have"
+	@${ECHO} "at small bitmap sizes if you have"
 	@${ECHO} "licensed the Apple patents"
-	@${ECHO} "US05155805 US05159668 and US05325479, by"
+	@${ECHO} "US05155805 US05159668 and US05325479, with"
 	@${ECHO} "make -DWITH_TTF_BYTECODE_ENABLED"
 	@${ECHO} "See http://www.freetype.org/patents.html for details"
 .endif
+	@${ECHO}
+	@${ECHO} "You can select the language for OOo by making it with:"
+	@${ECHO} "make LOCALIZED_LANG=xx" 
+	@${ECHO} "while xx can be one of the following"
+	@${ECHO} "af ar bn be-BY bg ca cs cy da de el en-GB eo es"
+	@${ECHO} "et eu fi fr gl gu-IN he hi-IN hr hu it ja km kn-IN"
+	@${ECHO} "ko lt ms nb nl nn ns pa-IN pl pt pt-BR ru rw sk"
+	@${ECHO} "sl sv ta-IN th tn tr vi xh zh-CN zh-TW zu"
+	@${ECHO}
 #XXX currently broken
 #.if !defined(WITHOUT_JAVA)
 #	@${ECHO}
-#	@${ECHO} "You can compile OOo without Java support by"
+#	@${ECHO} "You can compile OOo without Java support with"
 #	@${ECHO} "make -DWITHOUT_JAVA"
 #.endif
 #XXX currently broken
+#.if !defined(WITH_GNUGCJ)
+#	@${ECHO}
+#	@${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with"
+#	@${ECHO} "make -DWITH_GNUGCJ"
+#.endif
+#XXX currently broken
 #.if !defined(WITH_CUPS)
 #	@${ECHO}
-#	@${ECHO} "You can compile OOo with CUPS support by"
+#	@${ECHO} "You can compile OOo with CUPS support with"
 #	@${ECHO} "make -DWITH_CUPS"
 #.endif
 .if !defined(WITH_KDE)
 	@${ECHO}
-	@${ECHO} "You can compile OOo to use Qt/KDE vclplug"
+	@${ECHO} "You can compile OOo to use Qt/KDE vclplug with"
 	@${ECHO} "make -DWITH_KDE"
 .endif
 	@${ECHO}
 	@${ECHO} "NOTICE:"
 	@${ECHO}
 	@${ECHO} "To build OOo, you should have a lot"
 .if defined(WITH_DEBUG)
 	@${ECHO} "of free diskspace (~ 18GB)."
 .else
-	@${ECHO} "of free diskspace (~ 8.5GB)."
+	@${ECHO} "of free diskspace (~ 9GB)."
 .endif
 	@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"

Property changes on: head/editors/openoffice.org-vcltesttool/files/Makefile.knobs
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.16
\ No newline at end of property
+1.17
\ No newline at end of property
Index: head/editors/openoffice.org-vcltesttool/files/Makefile.localized
===================================================================
--- head/editors/openoffice.org-vcltesttool/files/Makefile.localized	(revision 139878)
+++ head/editors/openoffice.org-vcltesttool/files/Makefile.localized	(revision 139879)
@@ -1,212 +1,245 @@
 # localized makefile
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 ################################################################
 #See solenv/inc/postset.mk for details	
 ################################################################
 .if defined(LOCALIZED_LANG)
 .if ${LOCALIZED_LANG} == "af"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ar"
 CATEGORIES=	arabic
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "bn"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "be-BY"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "bg"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ca"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "cs"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "cy"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "da"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "de"
 CATEGORIES=	german
 LANG_PKGNAME=	${LOCALIZED_LANG}
 COMMENT=	Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und Praesentationsprogramm
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "el"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "en-GB"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "eo"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "es"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "et"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "eu"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "fi"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "fr"
 CATEGORIES=	french
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "gl"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "gu-IN"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "he"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "hi-IN"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "hr"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "hu"
 CATEGORIES=     hungarian
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "it"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ja"
 CATEGORIES=	japanese
 LANG_PKGNAME=	${LOCALIZED_LANG}
 RUN_DEPENDS+=   ${X11BASE}/lib/X11/fonts/TrueType/sazanami-mincho.ttf:${PORTSDIR}/japanese/sazanami-ttf
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "km"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "kn-IN"
 LANG_PKGNAME=	kn
 LANG_SUFFIX=	IN
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ko"
 CATEGORIES=     korean
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "lt"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ms"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "nb"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "nl"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "nn"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ns"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "pa-IN"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "pl"
 CATEGORIES=	polish
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "pt"
 COMMENT=	Editor texto/grBaGico, banco de dados/planilha/navegador integrado
 CATEGORIES=	portuguese
 LANG_PKGNAME=	${LOCALIZED_LANG}
 LANG_EXT=	03
 LANG_CONFIGURE_ARG=	PORT
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "pt-BR"
 COMMENT=        Editor texto/grBaGico, banco de dados/planilha/navegador integrado
 CATEGORIES=     portuguese
 LANG_PKGNAME=	pt
 LANG_SUFFIX=	BR
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ru"
 CATEGORIES=	russian
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "rw"
+CATEGORIES=	russian
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "sk"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "sl"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "sv"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "ta-IN"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "th"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 #.if ${LOCALIZED_LANG} == "tn"
 #LANG_PKGNAME=	${LOCALIZED_LANG}
 #.endif
 ################################################################
 .if ${LOCALIZED_LANG} == "tr"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "vi"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "xh"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "zh-CN"
 CATEGORIES=	chinese
 LANG_PKGNAME=	zh
 LANG_SUFFIX=	CN
 BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "zh-TW"
 CATEGORIES=	chinese
 LANG_PKGNAME=	zh
 LANG_SUFFIX=	TW
 BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "zu"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .endif

Property changes on: head/editors/openoffice.org-vcltesttool/files/Makefile.localized
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.7
\ No newline at end of property
Index: head/editors/openoffice.org-vcltesttool/files/pkg-message.in
===================================================================
--- head/editors/openoffice.org-vcltesttool/files/pkg-message.in	(revision 139878)
+++ head/editors/openoffice.org-vcltesttool/files/pkg-message.in	(revision 139879)
@@ -1,53 +1,51 @@
 OpenOffice.org Build %%RELEASE_NR%%m%%MILESTONE%% Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
 		and Maho Nakata <maho@FreeBSD.org>
 
 OpenOffice.org %%RELEASE_NR%%m%%MILESTONE%% will soon been installed in
 %%PREFIX%%/%%EXECBASE%%
 
-1 User installation
--------------------
+1. User installation
+--------------------
 
 Just type "%%EXECBASE%%" after you have successfully
 installed the package. If there is no installed
 OO.org dir in your homedir, you'll be prompted to
-install some files and choose a installed JDK.
+install some files and choose an installed JDK.
 The setup installs a ".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" folder
 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
-have both a line for each version which is installed.
+version, you may look in the file ".sversionrc" located
+in your homedir. In this file, OpenOffice and StarOffice
+will have a line for each version that is installed.
 After removing the problematic line you should be able to
-install again.
+install the package again.
 
-2 Start OO.org
---------------
+2. Starting OO.org
+------------------
 
-There are some wrappers installed for fast startup.
+There are some wrappers installed for faster startup.
 Add "%%PREFIX%%/bin/" to your PATH and you will be able
 to use them.
 
 %%PREFIX%%/bin/%%EXECBASE%%
 %%PREFIX%%/bin/%%EXECBASE%%-sagenda
 %%PREFIX%%/bin/%%EXECBASE%%-scalc
 %%PREFIX%%/bin/%%EXECBASE%%-sdraw
 %%PREFIX%%/bin/%%EXECBASE%%-setup
 %%PREFIX%%/bin/%%EXECBASE%%-sfax
 %%PREFIX%%/bin/%%EXECBASE%%-simpress
 %%PREFIX%%/bin/%%EXECBASE%%-spadmin
 %%PREFIX%%/bin/%%EXECBASE%%-sweb
 %%PREFIX%%/bin/%%EXECBASE%%-swriter
 
 OO.org does need $LANG to be set to a suitable value.
 
-3 If you stuck into a trouble
+3. If you run into problems
 --------------------------------------------------
-Somehow you can stuck into a trouble. 
-To solve this issue, please remove the already installed
-".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" dir in your homedir and remove the
-appropriate entry from ".sversionrc". After you have done
-this, redo the user installation and the problem will
-go away.
+If you somehow run into problems, please remove the already installed
+".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" dir in your homedir
+along with the appropriate entry in ".sversionrc". Redo the user
+installation and the problems should go away.

Property changes on: head/editors/openoffice.org-vcltesttool/files/pkg-message.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property