Index: head/editors/openoffice/Makefile
===================================================================
--- head/editors/openoffice/Makefile	(revision 76885)
+++ head/editors/openoffice/Makefile	(revision 76886)
@@ -1,564 +1,565 @@
 # New ports collection makefile for: OpenOffice
 # Date created:		28 Februar 2002
 # Whom:                 Martin Blapp
 #
 # $FreeBSD$
 #
 
 PORTNAME=	openoffice
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES+=	editors
 MASTER_SITES+=	http://ny1.mirror.openoffice.org/%SUBDIR%/ \
 		http://ftp.gwdg.de/pub/misc/openoffice/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/&,} \
 		ftp://ftp.chg.ru/pub/OpenOffice/%SUBDIR%/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		ftp://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \
 		http://people.freebsd.org/~mbr/ooo/:moz
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}
 DISTFILES+=	OOo_${PORTVERSION}_source.tar.bz2 \
 		gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz
 .if defined(L10NHELP)
 DISTFILES+=	${L10NHELP:S/$/:help/}
 .endif
 
 SORT?=	/usr/bin/sort
 FIND?=	/usr/bin/find
 CUT?=	/usr/bin/cut
 AWK?=	/usr/bin/awk
 GREP?=	/usr/bin/grep
 MOUNT?=	/sbin/mount
 ZIP?=	${PREFIX}/bin/zip
 UNZIP?=	${PREFIX}/bin/unzip
 ANT?=	${LOCALBASE}/bin/ant
 TCSH?=	/bin/tcsh
 PASTE?= /usr/bin/paste
 
 .include <bsd.port.pre.mk>
 
 INSTALLATION_BASEDIR=	OpenOffice.org1.0
 BUILD_NR=		641
 DIST_SUBDIR=		openoffice
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
 #
 # configuration for language specific slave ports
 #
 .if !defined(LANG_EXT)
 LANG_EXT=01
 .else
 #
 # Add pkg-comment and pkg-descr if available
 #
 .if exists(${.CURDIR}/pkg-comment)
 COMMENTFILE=	${.CURDIR}/pkg-comment
 .endif
 .if exists(${.CURDIR}/pkg-descr)
 DESCR=	${.CURDIR}/pkg-descr
 .endif
 .if exists(${.CURDIR}/pkg-descr)
 PKGMESSAGE=	${.CURDIR}/pkg-message
 .endif
 #
 # Set prefix and suffix
 #
 .if defined(LANG_PKGNAME)
 PKGNAMEPREFIX=	${LANG_PKGNAME}-
 .if defined(LANG_SUFFIX)
 PKGNAMESUFFIX=	-${LANG_SUFFIX}
 .endif
 .endif # if defined(LANG_PKGNAME)
 #
 # LANG_CONFIGURE_ARG is missing for the german port
 #
 .if defined(LANG_EXT)
 CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG},ENUS
 .endif
 .endif
 
 .if !defined (LANG) && !defined(USE_LANG)
 USE_LANG=	en_US.ISO8859-15
 LANG_LIST=	en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII
 .else
 .if !defined(USE_LANG)
 USE_LANG=	${LANG}
 .endif
 .endif
 
 LANG_SORTED=	`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
 
 .if ${OSVERSION} < 500000
 #
 # OO build is broken with the system gcc on STABLE.
 #
 BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
 CC=		gcc32
 CXX=		g++32
 USE_GCC=3.2
 .endif
 
 .if ${OSVERSION} > 500000
 .if defined(USE_GCC) && ${USE_GCC} == 3.2
 BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
 CC=		gcc32
 CXX=		g++32
 .endif
 .endif
 
 EXTRACT_ONLY=	OOo_${PORTVERSION}_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
 #.if !defined(USE_GCC)
 #BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
 #.endif
 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
 BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/jakarta-ant
 BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
 .endif
 .if !defined(WITH_BSD_JDK)
 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/linux-sun-jdk13
 .else
 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
 .endif
 
 USE_PERL5=	yes
 USE_BZIP2=	yes
 USE_BISON=	yes
 USE_GMAKE=	yes
 
 EXTRACT_BEFORE_ARGS_R= -dc
 EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
 EXTRACT_REST=	gpc231.tar.Z
 
 .if !defined(WITH_BSD_JDK)
 JDK13DIR?=      ${LOCALBASE}/linux-sun-jdk1.3.1
 .else
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
 .endif
 JAVAVM=         ${JDK13DIR}/bin/java
 
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
 LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
 .if defined(WITH_DEBUG)
 CFLAGS+=	-g
 .if ${WITH_DEBUG} == 2
 BUILD=		dmake debug="true"
 .else
 BUILD=		dmake
 .endif
 .else
 BUILD=		dmake strip="true"
 .endif
 
 .if !defined(DISPLAY)
 DISPLAYHACK=localhost:1001
 .endif
 
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
 
 CONFIGURE_ARGS+=	--with-jdk-home=${JDK13DIR} \
 			--with-os-version=${OSVERSION} \
 			--with-ant-home=${LOCALBASE}
 
 #.if !defined(USE_GCC)
 #CONFIGURE_ARGS+=	--with-stlport4-home=${PREFIX}
 #.endif
 
 .if !defined(WITH_BSD_JDK)
 CONFIGURE_ARGS+=	--enable-linuxjdk=yes
 .endif
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 .endif
 
 .if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2)
 CONFIGURE_ARGS+=	--enable-gcc3
 .endif
 
 .if ${OSVERSION} > 500000 && !defined(USE_GCC)
 CONFIGURE_ARGS+=	--enable-gcc3
 .endif
 
 pre-fetch:
 	@${ECHO}
 .if !defined(LANG)
 	@${ECHO} "REQUIREMENTS:"
 	@${ECHO}
 	@${ECHO} "OO requires that the ENV variable LANG"
 	@${ECHO} "is set to a proper value. Dependent on"
 	@${ECHO} "which language port you use, OO does"
 	@${ECHO} "automatically set LANG to a suitable"
 	@${ECHO} "value. You can change this with:"
 	@${ECHO}
 	@${ECHO} "USE_LANG=\"prefered language\""
 	@${ECHO}
 	@${ECHO} "and set a different language"
 	@${ECHO} "like:"
 	@${ECHO}
 	@${ECHO} "${LANG_SORTED}"
 	@${ECHO}
 	@${ECHO} "Your current setting is:"
 	@${ECHO}
 	@${ECHO} "USE_LANG=${USE_LANG}"
 	@${ECHO}
 	@${ECHO}
 .endif
 	@${ECHO} "OPTIONS:"
 .if !defined(USE_GCC)
 	@${ECHO}
 	@${ECHO} "You can compile OO with different"
 	@${ECHO} "gcc compiler versions:"
 	@${ECHO}
 	@${ECHO} "Add USE_GCC=2.95 or USE_GCC=3.1"
 	@${ECHO} "to compile openoffice with your"
 	@${ECHO} "prefered compiler."
 .endif
 .if !defined(WITH_BSD_JDK)
 	@${ECHO}
 	@${ECHO} "If you like to use the native BSD"
 	@${ECHO} "JDK for the build system, you can use"
 	@${ECHO} "WITH_BSD_JDK=TRUE to disable the"
 	@${ECHO} "usage of the linux-JDK and linux dependency."
 	@${ECHO}
 .endif
 .if !defined(WITH_DEBUG)
 	@${ECHO}
 	@${ECHO} "You can compile OO with debug symbols"
 	@${ECHO} "if you call make with WITH_DEBUG=1"
 	@${ECHO}
 	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
 	@${ECHO} "OO.org debug support."
 	@${ECHO}
 .endif
 .if !defined(WITH_TTF_BYTECODE_ENABLED)
 	@${ECHO}
 	@${ECHO} "You may set WITH_TTF_BYTECODE_ENABLED=YES"
 	@${ECHO} "if you like to use the Freetype library to"
 	@${ECHO} "render TTF fonts. Normally the TTF lib is"
 	@${ECHO} "not used to render fonts."
 	@${ECHO}
 	@${ECHO} "If you have licensed the Apple patents"
 	@${ECHO} "US05155805 US05159668 and US05325479"
 	@${ECHO} "you can enable this option to get better"
 	@${ECHO} "quality of glyphs at small bitmap sizes."
 	@${ECHO}
 .endif
 .if ${OSVERSION} < 450002
 	@${ECHO}
 	@${ECHO} "OS-VERSION ${OSVERSION} too low"
 	@${ECHO}
 	@${ECHO} "OO need some important libc_r and"
 	@${ECHO} "gcc fixes to build. Please upgrade to 4.6"
 	@${ECHO} "RELEASE or 4.6 STABLE."
 	@${FALSE}
 .endif
 	@${ECHO}
 	@${ECHO} "NOTICE:"
 	@${ECHO}
 	@${ECHO} "To build Openoffice, you should have a lot"
 .if defined(WITH_DEBUG)
 	@${ECHO} "of free diskspace (~ 8GB)."
 .else
 	@${ECHO} "of free diskspace (~ 4GB)."
 .endif
 	@${ECHO}
 .if (defined(USE_GCC) && ${USE_GCC} == 2.95) || \
     (${OSVERSION} < 500000 && !defined(USE_GCC))
 	@${ECHO} "KERNEL CONFIGURATION:"
 	@${ECHO}
 	@${ECHO} "Openoffice needs a larger stack- and"
 	@${ECHO} "datasize to build. Check your limit"
 	@${ECHO} "settings and and put this in /boot/loader.conf"
 	@${ECHO} "if neccessary:"
 	@${ECHO}
 	@${ECHO} "kern.maxdsiz=\"1073741824\""
 	@${ECHO} "kern.maxssiz=\"268435456\""
 .endif
 	@${ECHO}
 .if ${OSVERSION} < 460002
 	@${ECHO} "REQUIRED SYSTEM PATCHES:"
 	@${ECHO}
 .endif
 .if ${OSVERSION} < 500000
 	@${ECHO} "OO.org can crash if you enter a non existing path"
 	@${ECHO} "or URL in the location bar. To fix these crashes"
 	@${ECHO} "you need a uncommitted system patch for rtld:"
 	@${ECHO}
 	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff"
 	@${ECHO}
 .endif
 .if ${OSVERSION} < 460001
 	@${ECHO}
 	@${ECHO} "OO setup is broken on STABLE < 4.6"
 	@${ECHO} "including 4.6 RELEASE."
 	@${ECHO} "You'll need a system patch to solve"
 	@${ECHO} "this problem:"
 	@${ECHO}
 	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-alloca.diff"
 	@${ECHO}
 .endif
 .if ${OSVERSION} < 460002
 	@${ECHO}
 	@${ECHO} "OO.org soffice binary can deadlock. You can work around"
 	@${ECHO} "this problem with this patch:"
 	@${ECHO}
 	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-deadlock.diff"
 	@${ECHO}
 .endif
 .if ${OSVERSION} < 500000
 	@${ECHO}
 	@${ECHO} "OO.org build can deadlock in regmerge. You can work around"
 	@${ECHO} "this problem with this patch:"
 	@${ECHO}
 	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-builddeadlock.diff"
 	@${ECHO}
 .endif
 .if !exists(/usr/include/langinfo.h)
 	@${ECHO}
 	@${ECHO} "langinfo.h is missing !"
 	@${ECHO}
 	@${ECHO} "Please upgrade to 4.6 RELEASE or"
 	@${ECHO} "4.6 STABLE."
 	@${ECHO}
 	@${FALSE}
 .endif
 
 post-extract:
 	@for file in ${EXTRACT_REST}; do \
 		if ! (cd ${WRKDIR} && ${EXTRACT_CMD_R} \
 			${EXTRACT_BEFORE_ARGS_R} \
 			${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS_R}) ; \
 		then \
 			exit 1; \
 		fi \
 	done
 	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/
 	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
 	@${MAKE} extract-mozilla
 	@-${RM} ${WRKSRC}/../moz/zipped/*.zip
 	@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
 .if defined(L10NHELP)
 	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
 	@${MKDIR} ${WRKDIR}/L10NHELP
 	@cd ${WRKDIR}/L10NHELP && \
 	    ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP}
 .endif
 
 post-patch:
 	@${MAKE} patch-mozilla
 .if defined(WITH_TTF_BYTECODE_ENABLED)
 	@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
 		${ECHO_MSG} "===>  Applying additional TTF bytecode patches for ${PKGNAME}" ; \
 		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
 			${ECHO_MSG} "===>   Applying ${OPSYS} patch ${PATCHDIR}/optpatch-freetype::patch" ; \
 		fi; \
 		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
 	fi
 .endif
 .if defined(WITH_DEBUG)
 	@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
 		${ECHO_MSG} "===>  Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
 		PATCHES_APPLIED="" ; \
 		for i in ${PATCHDIR}/debugpatch-*; do \
 			case $$i in \
 				*.orig|*.rej|*~) \
 					${ECHO_MSG} "===>   Ignoring patchfile $$i" ; \
 					;; \
 				*) \
 					if [ ${PATCH_DEBUG_TMP} = yes ]; then \
 						${ECHO_MSG} "===>   Applying ${OPSYS} patch $$i" ; \
 					fi; \
 					if ${PATCH} ${PATCH_ARGS} < $$i ; then \
 						PATCHES_APPLIED="$$PATCHES_APPLIED $$i" ; \
 					else \
 						${ECHO_MSG} `${ECHO_CMD} ">> Patch $$i failed to apply cleanly." | ${SED} "s|${PATCHDIR}/||"` ; \
 						if [ x"$$PATCHES_APPLIED" != x"" ]; then \
 							${ECHO_MSG} `${ECHO_CMD} ">> Patch(es) $$PATCHES_APPLIED applied cleanly." | ${SED} "s|${PATCHDIR}/||g"` ; \
 						fi; \
 						${FALSE} ; \
 					fi; \
 					;; \
 			esac; \
 		done; \
 	fi;
 .endif
 	@${ECHO_MSG} "===>  Find old malloc.h defines and fix them in ${PKGNAME} source"
 	@${FIND} ${WRKSRC}/.. | ${EGREP} "\.(cxx|h|c)$$" | ${XARGS} \
 		${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g"
 
 extract-mozilla:
 .if ! exists(${WRKDIR}/mozilla/Makefile)
 	@${ECHO_MSG} "===>  Extracting mozilla sub project"
 	@${MKDIR} ${WRKDIR}/mozilla
 	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
 	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
 	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
 	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
 	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
 	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla
 .endif
 	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
 
 patch-mozilla:
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/patch-openoffice-mozilla101-2002-10-14 \
 		${WRKDIR}/mozilla/files/
 	@cd ${WRKDIR}/mozilla && ${MAKE} patch WRKDIRPREFIX=""
 
 build-mozilla:
 .if ! exists(${WRKDIR}/FREEBSDGCCIruntime.zip)
 	@${ECHO_MSG} "===>  Building mozilla sub project"
 .if defined(WITH_DEBUG)
 	@${CP} ${WRKDIR}/mozilla/Makefile ${WRKDIR}/mozilla/Makefile.new
 	@${SED} -e 's|--disable-debug||' \
 		-e 's|--disable-cpp-rtti||' \
 		-e 's|--enable-strip||' \
 		< ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile
 .endif
 .if defined(USE_GCC)
 	@cd ${WRKDIR}/mozilla && ${MAKE} CXX=${CXX} CC=${CC} CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
 .else
 	@cd ${WRKDIR}/mozilla && ${MAKE} CFLAGS="${CFLAGS}" build WRKDIRPREFIX=""
 .endif
 	@${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR}
 	@${CHMOD} 755 ${WRKDIR}/zipmoz.sh
 	@${WRKDIR}/zipmoz.sh ${WRKDIR}/mozilla/work/mozilla/dist FREEBSDGCCI ${WRKDIR}
 .endif
 
 install-mozilla:
 	@${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/
 	@${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/
 	@${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/
 
 register-mozilla:
 .if exists(${WRKDIR}/mozilla-runtime)
 	@${RM} -rf ${WRKDIR}/mozilla-runtime
 .endif
 	@${MKDIR} ${WRKDIR}/mozilla-runtime
 	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIruntime.zip
 	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIlib.zip
 	@${CP} ${WRKDIR}/mozilla/work/mozilla/dist/bin/regxpcom ${WRKDIR}/mozilla-runtime/
 	@-${RM} ${WRKDIR}/mozilla-runtime/components/component.reg
 	@cd ${WRKDIR}/mozilla-runtime && export MOZILLA_FIVE_HOME=. \
 		&& export LD_LIBRARY_PATH=.:./lib && ./regxpcom 
 	@${CP} ${WRKDIR}/mozilla-runtime/components/xpti.dat \
 		${WRKDIR}/mozilla-runtime/components/xptitemp.dat
 	@${RM} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKDIR}/mozilla-runtime/regxpcom
 	@cd ${WRKDIR}/mozilla-runtime && ${FIND} . -type f \
 		| ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@
 
 mozilla:
 	@${MAKE} extract-mozilla
 	@${MAKE} patch-mozilla
 	@${MAKE} build-mozilla
 	@${MAKE} register-mozilla
 	@${MAKE} install-mozilla
 
 do-build:
 .if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
 .if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
 .if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
 	@${MAKE} mozilla
 .endif
 .endif
 .endif
 .if exists(${WRKDIR}/.Xvfb.pid)
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
 .endif
 .if !defined(DISPLAY)
 	#
 	# This is a UGLY hack to not have to specify a X-Display.
 	#
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
 .endif
 	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
 .if defined(L10NHELP)
 	@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck 
 	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
 .endif
 .if !defined(DISPLAY)
 	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
 		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
 .else
 	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
 		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
 .endif
 .if defined(LANG_PKGNAME)
 	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
 		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANG_EXT}'
 .endif
 
 pre-install:
 	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \
 	   > ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
 
 do-install:
 .if !defined(DISPLAY)
 	#
 	# UGLY hack to not have to specify a X-Display.
 	#
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
 	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
 		TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
 		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
 .else
 	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
 		TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
 		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
 .endif
 
 install-user:
 	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \
 		${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice
 	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda
 	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc
 	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw
 	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup
 	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax
 	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress
 	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin
 	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb
 	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter
 	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST}
 	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${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}
 
 package-rename:
 	@${ECHO_MSG} "===>   Rename package for OO.org mirror upload";
 .if defined(LANG_SUFFIX)
 	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${LANG_SUFFIX}-${PORTVERSION}_${PORTREVISION}.tbz2 \
 	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}.tbz2
 .else
 	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${PORTVERSION}_${PORTREVISION}.tbz2 \
 	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/editors/openoffice/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.157
\ No newline at end of property
+1.158
\ No newline at end of property
Index: head/editors/openoffice/files/patch-dtrans+source+X11+X11_selection.cxx
===================================================================
--- head/editors/openoffice/files/patch-dtrans+source+X11+X11_selection.cxx	(revision 76885)
+++ head/editors/openoffice/files/patch-dtrans+source+X11+X11_selection.cxx	(revision 76886)
@@ -1,11 +1,19 @@
 --- ../dtrans/source/X11/X11_selection.cxx.orig	Sat Jul 20 23:18:03 2002
 +++ ../dtrans/source/X11/X11_selection.cxx	Sat Jul 20 23:18:05 2002
 @@ -65,7 +65,7 @@
  #include <X11/keysym.h>
  #include <X11/Xlib.h>
  #include <X11/Xutil.h>
 -#if defined(LINUX) || defined(NETBSD)
 +#if defined(LINUX) || defined(NETBSD) || defined (FREEBSD)
  #include <sys/poll.h>
  #else
  #include <poll.h>
+@@ -175,6 +175,7 @@
+ 	{ 0, "text/plain;charset=ksc5601.1992-0", "KSC5601.1992-0", 8 },
+ 	// eastern european encodings
+ 	{ 0, "text/plain;charset=koi8-r", "KOI8-R", 8 },
++	{ 0, "text/plain;charset=koi8-u", "KOI8-U", 8 },
+ 	// String (== iso8859-1)
+ 	{ XA_STRING, "text/plain;charset=string", "STRING", 8 },
+     // special for compound text

Property changes on: head/editors/openoffice/files/patch-dtrans+source+X11+X11_selection.cxx
___________________________________________________________________
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/files/patch-sal+osl+unx+nlsupport.c
===================================================================
--- head/editors/openoffice/files/patch-sal+osl+unx+nlsupport.c	(revision 76885)
+++ head/editors/openoffice/files/patch-sal+osl+unx+nlsupport.c	(revision 76886)
@@ -1,176 +1,184 @@
 --- ../sal/osl/unx/nlsupport.c.orig	Tue May 21 15:22:11 2002
 +++ ../sal/osl/unx/nlsupport.c	Tue Sep  3 12:58:48 2002
 @@ -63,7 +63,7 @@
  #include <osl/diagnose.h>
  #include <osl/process.h>
  
 -#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD)
 +#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(FREEBSD) || defined(NETBSD)
  #include <pthread.h>
  #include <locale.h>
  #include <langinfo.h>
 @@ -114,8 +114,7 @@
          comparison = _pair_compare( key, base + current );
          if (comparison < 0)
              upper = current;
 -        else
 -        if (comparison > 0)
 +        else if (comparison > 0)
              lower = current + 1;
          else
              return base + current;
 @@ -241,12 +240,13 @@
      return NULL;
  }
          
 -#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD)
 +#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(FREEBSD) || defined(NETBSD)
  
  /*
   * This implementation of osl_getTextEncodingFromLocale maps 
   * from nl_langinfo(CODESET) to rtl_textencoding defines. 
 - * nl_langinfo() is supported only on Linux, Solaris and IRIX. 
 + * nl_langinfo() is supported only on Linux, Solaris and IRIX,
 + * >= NetBSD 1.6 and >= FreeBSD 4.4
   *
   * This routine is SLOW because of the setlocale call, so
   * grab the result and cache it.
 @@ -260,6 +260,12 @@
  #endif
  #endif
  
 +/*
 + * _nl_language_list[] is an array list of supported encodings. Because
 + * we are using a binary search, the list has to be in ascending order.
 + * We are comparing the encodings case insensitiv, so the list has
 + * to be completly upper- , or lowercase.
 + */
  
  #if defined(SOLARIS)
  
 @@ -299,23 +305,23 @@
  #elif defined(IRIX)
  
  const _pair _nl_language_list[] = {
 -   { "ISO8859-1",  	RTL_TEXTENCODING_ISO_8859_1	}, /* Western */
 -   { "ISO8859-2",  	RTL_TEXTENCODING_ISO_8859_2     }, /* Central European */
 -   { "ISO8859-5",  	RTL_TEXTENCODING_ISO_8859_5     }, /* Cyrillic */
 -   { "ISO8859-7",  	RTL_TEXTENCODING_ISO_8859_7    	}, /* Greek */
 -   { "ISO8859-9",  	RTL_TEXTENCODING_ISO_8859_9     }, /* Turkish */
 -   { "ISO8859-15", 	RTL_TEXTENCODING_ISO_8859_15    }, /* Western Updated (w/Euro sign) */
 -   { "eucJP",		RTL_TEXTENCODING_EUC_JP 	}, /* Japan */
 -   { "eucKR",		RTL_TEXTENCODING_EUC_KR		}, /* Korea */
 -   { "eucCN",		RTL_TEXTENCODING_EUC_CN		}, /* China */
 -   { "eucTW",		RTL_TEXTENCODING_EUC_TW		}, /* Taiwan - Traditional Chinese */
 -   { "big5",		RTL_TEXTENCODING_BIG5		}, /* China - Traditional Chinese */
 -   { "eucgbk",		RTL_TEXTENCODING_DONTKNOW	}, /* China - Simplified Chinese */
 -   { "gbk",		RTL_TEXTENCODING_GBK		}, /* China - Simplified Chinese */
 -   { "sjis",		RTL_TEXTENCODING_SHIFT_JIS	}, /* Japan */
 +   { "BIG5",		RTL_TEXTENCODING_BIG5		}, /* China - Traditional Chinese */
 +   { "EUCCN",		RTL_TEXTENCODING_EUC_CN		}, /* China */
 +   { "EUCGBK",		RTL_TEXTENCODING_DONTKNOW	}, /* China - Simplified Chinese */
 +   { "EUCJP",		RTL_TEXTENCODING_EUC_JP		}, /* Japan */
 +   { "EUCKR",		RTL_TEXTENCODING_EUC_KR		}, /* Korea */
 +   { "EUCTW",		RTL_TEXTENCODING_EUC_TW		}, /* Taiwan - Traditional Chinese */
 +   { "GBK",		RTL_TEXTENCODING_GBK		}, /* China - Simplified Chinese */
 +   { "ISO8859-1",	RTL_TEXTENCODING_ISO_8859_1	}, /* Western */
 +   { "ISO8859-15",	RTL_TEXTENCODING_ISO_8859_15	}, /* Western Updated (w/Euro sign) */
 +   { "ISO8859-2",	RTL_TEXTENCODING_ISO_8859_2	}, /* Central European */
 +   { "ISO8859-5",	RTL_TEXTENCODING_ISO_8859_5	}, /* Cyrillic */
 +   { "ISO8859-7",	RTL_TEXTENCODING_ISO_8859_7	}, /* Greek */
 +   { "ISO8859-9",	RTL_TEXTENCODING_ISO_8859_9	}, /* Turkish */
 +   { "SJIS",		RTL_TEXTENCODING_SHIFT_JIS	}  /* Japan */
  };
  
 -#elif defined(LINUX) || defined(NETBSD)
 +#elif defined(LINUX)
  
  const _pair _nl_language_list[] = {
      { "ANSI_X3.110-1983",           RTL_TEXTENCODING_DONTKNOW   },  /* ISO-IR-99 NAPLPS */
 @@ -496,7 +502,59 @@
      { "WIN-SAMI-2",                 RTL_TEXTENCODING_DONTKNOW }     /* WS2 */
  };
  
 -#endif /* ifdef LINUX || NETBSD */
 +#elif defined(FREEBSD)
 +
 +const _pair _nl_language_list[] = {
 +   { "ASCII",		RTL_TEXTENCODING_ASCII_US	}, /* US-ASCII */
 +   { "BIG5",		RTL_TEXTENCODING_BIG5		}, /* China - Traditional Chinese */
 +   { "CP1251",		RTL_TEXTENCODING_MS_1251	}, /* MS-CYRL */
 +   { "CP866",		RTL_TEXTENCODING_IBM_866	}, /* CP866 866 */
 +   { "EUCCN",		RTL_TEXTENCODING_EUC_CN		}, /* China - Simplified Chinese */
 +   { "EUCJP",		RTL_TEXTENCODING_EUC_JP		}, /* Japan */
 +   { "EUCKR",		RTL_TEXTENCODING_EUC_KR		}, /* Korea */
 +   { "ISO8859-1",	RTL_TEXTENCODING_ISO_8859_1	}, /* Western */
 +   { "ISO8859-15",	RTL_TEXTENCODING_ISO_8859_15	}, /* Western Updated (w/Euro sign) */
 +   { "ISO8859-2",	RTL_TEXTENCODING_ISO_8859_2	}, /* Central European */
 +   { "ISO8859-4",	RTL_TEXTENCODING_ISO_8859_4	}, /* LATIN4 L4 */
 +   { "ISO8859-5",	RTL_TEXTENCODING_ISO_8859_5	}, /* Cyrillic */
 +   { "ISO8859-7",	RTL_TEXTENCODING_ISO_8859_7	}, /* Greek */
 +   { "ISO8859-9",	RTL_TEXTENCODING_ISO_8859_9	}, /* Turkish */
-+   { "KOI-U",		RTL_TEXTENCODING_DONTKNOW	}, /* Not supported at the moment */
 +   { "KOI8-R",		RTL_TEXTENCODING_KOI8_R		}, /* KOI8 */
++   { "KOI8-U",		RTL_TEXTENCODING_KOI8_U		}, /* KOI8-U */
 +   { "SJIS",		RTL_TEXTENCODING_SHIFT_JIS	}, /* Japan */
 +   { "US-ASCII",	RTL_TEXTENCODING_ASCII_US	}, /* US-ASCII */
 +   { "UTF-8",		RTL_TEXTENCODING_UTF8		}  /* ISO-10646/UTF-8 */
 +};
 +
 +#elif defined(NETBSD)
 +
 +const _pair _nl_language_list[] = {
 +   { "ASCII",		RTL_TEXTENCODING_ASCII_US	}, /* US-ASCII */
 +   { "BIG5",		RTL_TEXTENCODING_BIG5		}, /* China - Traditional Chinese */
 +   { "CP1251",		RTL_TEXTENCODING_MS_1251	}, /* MS-CYRL */
 +   { "CP866",		RTL_TEXTENCODING_IBM_866	}, /* CP866 866 */
 +   { "CTEXT",		RTL_TEXTENCODING_ASCII_US	}, /* US-ASCII */
 +   { "EUCCN",		RTL_TEXTENCODING_EUC_CN		}, /* China - Simplified Chinese */
 +   { "EUCJP",		RTL_TEXTENCODING_EUC_JP		}, /* Japan */
 +   { "EUCKR",		RTL_TEXTENCODING_EUC_KR		}, /* Korea */
 +   { "EUCTW",		RTL_TEXTENCODING_EUC_TW		}, /* China - Traditional Chinese */
 +   { "ISO-2022-JP",	RTL_TEXTENCODING_DONTKNOW	}, /* */
 +   { "ISO-2022-JP-2",	RTL_TEXTENCODING_DONTKNOW	}, /* */
 +   { "ISO8859-1",	RTL_TEXTENCODING_ISO_8859_1	}, /* Western */
 +   { "ISO8859-15",	RTL_TEXTENCODING_ISO_8859_15	}, /* Western Updated (w/Euro sign) */
 +   { "ISO8859-2",	RTL_TEXTENCODING_ISO_8859_2	}, /* Central European */
 +   { "ISO8859-4",	RTL_TEXTENCODING_ISO_8859_4	}, /* LATIN4 L4 */
 +   { "ISO8859-5",	RTL_TEXTENCODING_ISO_8859_5	}, /* Cyrillic */
 +   { "ISO8859-7",	RTL_TEXTENCODING_ISO_8859_7	}, /* Greek */
 +   { "ISO8859-9",	RTL_TEXTENCODING_ISO_8859_9	}, /* Turkish */
-+   { "KOI-U",		RTL_TEXTENCODING_DONTKNOW	}, /* Not supported at the moment */
 +   { "KOI8-R",		RTL_TEXTENCODING_KOI8_R		}, /* KOI8 */
++   { "KOI8-U",		RTL_TEXTENCODING_KOI8_U		}, /* KOI8-U */
 +   { "SJIS",		RTL_TEXTENCODING_SHIFT_JIS	}, /* Japan */
 +   { "US-ASCII",	RTL_TEXTENCODING_ASCII_US	}, /* US-ASCII */
 +   { "UTF-8",		RTL_TEXTENCODING_UTF8		}  /* ISO-10646/UTF-8 */
 +};
 +
 +#endif /* ifdef SOLARIS IRIX LINUX FREEBSD NETBSD */
  
  static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
  
 @@ -618,7 +676,7 @@
      return ret;
  }
  
 -#elif defined(MACOSX) /* ifdef LINUX || SOLARIS || NETBSD */
 +#elif defined(MACOSX) /* ifdef LINUX || SOLARIS || IRIX || FREEBSD || NETBSD */
  
  /*
   * FIXME: the MacOS X implemetation is missing
 @@ -651,7 +709,7 @@
      return 0;
  }
  
 -#else /* ifdef LINUX || SOLARIS || MACOSX || NETBSD */
 +#else /* ifdef LINUX || SOLARIS || IRIX || FREEBSD || NETBSD || MACOSX */
  
  /*
   * This implementation of osl_getTextEncodingFromLocale maps 
-@@ -887,6 +945,6 @@
+@@ -684,6 +742,7 @@
+     { "iso8859-8",    RTL_TEXTENCODING_ISO_8859_8  },
+     { "iso8859-9",    RTL_TEXTENCODING_ISO_8859_9  },
+     { "koi8-r",       RTL_TEXTENCODING_KOI8_R      },
++    { "koi8-u",       RTL_TEXTENCODING_KOI8_U      },
+     { "pck",          RTL_TEXTENCODING_MS_932      },
+ #if (0)
+     { "sun_eu_greek", RTL_TEXTENCODING_DONTKNOW    },
+@@ -887,6 +946,6 @@
      return 0;
  }
  
 -#endif /* ifdef LINUX || SOLARIS || MACOSX || NETBSD */
 +#endif /* ifdef LINUX || SOLARIS || FREEBSD || NETBSD || MACOSX */
  
  

Property changes on: head/editors/openoffice/files/patch-sal+osl+unx+nlsupport.c
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.11
\ No newline at end of property
+1.12
\ No newline at end of property
Index: head/editors/openoffice/files/patch-sal+textenc+tencinfo.c
===================================================================
--- head/editors/openoffice/files/patch-sal+textenc+tencinfo.c	(revision 76885)
+++ head/editors/openoffice/files/patch-sal+textenc+tencinfo.c	(revision 76886)
@@ -1,13 +1,37 @@
 --- ../sal/textenc/tencinfo.c.orig	Wed Jul 31 11:44:35 2002
 +++ ../sal/textenc/tencinfo.c	Wed Jul 31 11:45:47 2002
+@@ -532,6 +532,7 @@
+     static ImplStrCharsetDef const aUnixCharsetKOI8Tab[] =
+     {
+         { "r", RTL_TEXTENCODING_KOI8_R },
++        { "u", RTL_TEXTENCODING_KOI8_U },
+         { NULL, RTL_TEXTENCODING_DONTKNOW }
+     };
+ 
 @@ -695,6 +695,10 @@
      /* characters. The function search for the first equal string in */
      /* the table. In this table are only the most used mime types. */
      /* Sort order: important */
 +
 +    if (pMimeCharset == NULL)
 +	pMimeCharset = "usascii";
 +
      static ImplStrCharsetDef const aVIPMimeCharsetTab[] =
      {
          { "usascii", RTL_TEXTENCODING_ASCII_US },
+@@ -741,6 +742,7 @@
+         { "windows1256", RTL_TEXTENCODING_MS_1256 },
+         { "windows1257", RTL_TEXTENCODING_MS_1257 },
+         { "windows1258", RTL_TEXTENCODING_MS_1258 },
++        { "koi8u", RTL_TEXTENCODING_KOI8_U },
+         { NULL, RTL_TEXTENCODING_DONTKNOW }
+     };
+ 
+@@ -815,6 +817,7 @@
+         { "iso10646us", RTL_TEXTENCODING_ASCII_US },
+         { "iso646irv", RTL_TEXTENCODING_ASCII_US },
+         { "cskoi8r", RTL_TEXTENCODING_KOI8_R },
++        { "cskoi8u", RTL_TEXTENCODING_KOI8_U },
+         { "ibm437", RTL_TEXTENCODING_IBM_437 },
+         { "cp437", RTL_TEXTENCODING_IBM_437 },
+         { "437", RTL_TEXTENCODING_IBM_437 },

Property changes on: head/editors/openoffice/files/patch-sal+textenc+tencinfo.c
___________________________________________________________________
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/files/patch-sysui+tools+lngconv+lngconv.cxx
===================================================================
--- head/editors/openoffice/files/patch-sysui+tools+lngconv+lngconv.cxx	(revision 76885)
+++ head/editors/openoffice/files/patch-sysui+tools+lngconv+lngconv.cxx	(revision 76886)
@@ -1,11 +1,19 @@
 --- ../sysui/tools/lngconv/lngconv.cxx.orig	Sat Jul 20 23:14:29 2002
 +++ ../sysui/tools/lngconv/lngconv.cxx	Sat Jul 20 23:14:34 2002
 @@ -62,7 +62,7 @@
  #include <stdlib.h>
  #include <stdio.h>
  
 -#if defined( LINUX ) || defined (SOLARIS)
 +#if defined(LINUX) || defined (SOLARIS) || defined (FREEBSD)
  #include <locale.h>
  #include <langinfo.h>
  #endif
+@@ -143,6 +143,7 @@
+     { "iso8859-8",    RTL_TEXTENCODING_ISO_8859_8  },
+     { "iso8859-9",    RTL_TEXTENCODING_ISO_8859_9  },
+     { "koi8-r",       RTL_TEXTENCODING_KOI8_R      },
++    { "koi8-u",       RTL_TEXTENCODING_KOI8_U      },
+     { "pck",          RTL_TEXTENCODING_MS_932      },
+ #if (0)
+     { "sun_eu_greek", RTL_TEXTENCODING_DONTKNOW    },

Property changes on: head/editors/openoffice/files/patch-sysui+tools+lngconv+lngconv.cxx
___________________________________________________________________
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-1.0/Makefile
===================================================================
--- head/editors/openoffice-1.0/Makefile	(revision 76885)
+++ head/editors/openoffice-1.0/Makefile	(revision 76886)
@@ -1,564 +1,565 @@
 # New ports collection makefile for: OpenOffice
 # Date created:		28 Februar 2002
 # Whom:                 Martin Blapp
 #
 # $FreeBSD$
 #
 
 PORTNAME=	openoffice
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES+=	editors
 MASTER_SITES+=	http://ny1.mirror.openoffice.org/%SUBDIR%/ \
 		http://ftp.gwdg.de/pub/misc/openoffice/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/&,} \
 		ftp://ftp.chg.ru/pub/OpenOffice/%SUBDIR%/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		ftp://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \
 		http://people.freebsd.org/~mbr/ooo/:moz
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}
 DISTFILES+=	OOo_${PORTVERSION}_source.tar.bz2 \
 		gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz
 .if defined(L10NHELP)
 DISTFILES+=	${L10NHELP:S/$/:help/}
 .endif
 
 SORT?=	/usr/bin/sort
 FIND?=	/usr/bin/find
 CUT?=	/usr/bin/cut
 AWK?=	/usr/bin/awk
 GREP?=	/usr/bin/grep
 MOUNT?=	/sbin/mount
 ZIP?=	${PREFIX}/bin/zip
 UNZIP?=	${PREFIX}/bin/unzip
 ANT?=	${LOCALBASE}/bin/ant
 TCSH?=	/bin/tcsh
 PASTE?= /usr/bin/paste
 
 .include <bsd.port.pre.mk>
 
 INSTALLATION_BASEDIR=	OpenOffice.org1.0
 BUILD_NR=		641
 DIST_SUBDIR=		openoffice
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
 #
 # configuration for language specific slave ports
 #
 .if !defined(LANG_EXT)
 LANG_EXT=01
 .else
 #
 # Add pkg-comment and pkg-descr if available
 #
 .if exists(${.CURDIR}/pkg-comment)
 COMMENTFILE=	${.CURDIR}/pkg-comment
 .endif
 .if exists(${.CURDIR}/pkg-descr)
 DESCR=	${.CURDIR}/pkg-descr
 .endif
 .if exists(${.CURDIR}/pkg-descr)
 PKGMESSAGE=	${.CURDIR}/pkg-message
 .endif
 #
 # Set prefix and suffix
 #
 .if defined(LANG_PKGNAME)
 PKGNAMEPREFIX=	${LANG_PKGNAME}-
 .if defined(LANG_SUFFIX)
 PKGNAMESUFFIX=	-${LANG_SUFFIX}
 .endif
 .endif # if defined(LANG_PKGNAME)
 #
 # LANG_CONFIGURE_ARG is missing for the german port
 #
 .if defined(LANG_EXT)
 CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG},ENUS
 .endif
 .endif
 
 .if !defined (LANG) && !defined(USE_LANG)
 USE_LANG=	en_US.ISO8859-15
 LANG_LIST=	en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII
 .else
 .if !defined(USE_LANG)
 USE_LANG=	${LANG}
 .endif
 .endif
 
 LANG_SORTED=	`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
 
 .if ${OSVERSION} < 500000
 #
 # OO build is broken with the system gcc on STABLE.
 #
 BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
 CC=		gcc32
 CXX=		g++32
 USE_GCC=3.2
 .endif
 
 .if ${OSVERSION} > 500000
 .if defined(USE_GCC) && ${USE_GCC} == 3.2
 BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
 CC=		gcc32
 CXX=		g++32
 .endif
 .endif
 
 EXTRACT_ONLY=	OOo_${PORTVERSION}_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
 #.if !defined(USE_GCC)
 #BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
 #.endif
 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
 BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/jakarta-ant
 BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
 .endif
 .if !defined(WITH_BSD_JDK)
 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/linux-sun-jdk13
 .else
 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
 .endif
 
 USE_PERL5=	yes
 USE_BZIP2=	yes
 USE_BISON=	yes
 USE_GMAKE=	yes
 
 EXTRACT_BEFORE_ARGS_R= -dc
 EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
 EXTRACT_REST=	gpc231.tar.Z
 
 .if !defined(WITH_BSD_JDK)
 JDK13DIR?=      ${LOCALBASE}/linux-sun-jdk1.3.1
 .else
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
 .endif
 JAVAVM=         ${JDK13DIR}/bin/java
 
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
 LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
 .if defined(WITH_DEBUG)
 CFLAGS+=	-g
 .if ${WITH_DEBUG} == 2
 BUILD=		dmake debug="true"
 .else
 BUILD=		dmake
 .endif
 .else
 BUILD=		dmake strip="true"
 .endif
 
 .if !defined(DISPLAY)
 DISPLAYHACK=localhost:1001
 .endif
 
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
 
 CONFIGURE_ARGS+=	--with-jdk-home=${JDK13DIR} \
 			--with-os-version=${OSVERSION} \
 			--with-ant-home=${LOCALBASE}
 
 #.if !defined(USE_GCC)
 #CONFIGURE_ARGS+=	--with-stlport4-home=${PREFIX}
 #.endif
 
 .if !defined(WITH_BSD_JDK)
 CONFIGURE_ARGS+=	--enable-linuxjdk=yes
 .endif
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 .endif
 
 .if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2)
 CONFIGURE_ARGS+=	--enable-gcc3
 .endif
 
 .if ${OSVERSION} > 500000 && !defined(USE_GCC)
 CONFIGURE_ARGS+=	--enable-gcc3
 .endif
 
 pre-fetch:
 	@${ECHO}
 .if !defined(LANG)
 	@${ECHO} "REQUIREMENTS:"
 	@${ECHO}
 	@${ECHO} "OO requires that the ENV variable LANG"
 	@${ECHO} "is set to a proper value. Dependent on"
 	@${ECHO} "which language port you use, OO does"
 	@${ECHO} "automatically set LANG to a suitable"
 	@${ECHO} "value. You can change this with:"
 	@${ECHO}
 	@${ECHO} "USE_LANG=\"prefered language\""
 	@${ECHO}
 	@${ECHO} "and set a different language"
 	@${ECHO} "like:"
 	@${ECHO}
 	@${ECHO} "${LANG_SORTED}"
 	@${ECHO}
 	@${ECHO} "Your current setting is:"
 	@${ECHO}
 	@${ECHO} "USE_LANG=${USE_LANG}"
 	@${ECHO}
 	@${ECHO}
 .endif
 	@${ECHO} "OPTIONS:"
 .if !defined(USE_GCC)
 	@${ECHO}
 	@${ECHO} "You can compile OO with different"
 	@${ECHO} "gcc compiler versions:"
 	@${ECHO}
 	@${ECHO} "Add USE_GCC=2.95 or USE_GCC=3.1"
 	@${ECHO} "to compile openoffice with your"
 	@${ECHO} "prefered compiler."
 .endif
 .if !defined(WITH_BSD_JDK)
 	@${ECHO}
 	@${ECHO} "If you like to use the native BSD"
 	@${ECHO} "JDK for the build system, you can use"
 	@${ECHO} "WITH_BSD_JDK=TRUE to disable the"
 	@${ECHO} "usage of the linux-JDK and linux dependency."
 	@${ECHO}
 .endif
 .if !defined(WITH_DEBUG)
 	@${ECHO}
 	@${ECHO} "You can compile OO with debug symbols"
 	@${ECHO} "if you call make with WITH_DEBUG=1"
 	@${ECHO}
 	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
 	@${ECHO} "OO.org debug support."
 	@${ECHO}
 .endif
 .if !defined(WITH_TTF_BYTECODE_ENABLED)
 	@${ECHO}
 	@${ECHO} "You may set WITH_TTF_BYTECODE_ENABLED=YES"
 	@${ECHO} "if you like to use the Freetype library to"
 	@${ECHO} "render TTF fonts. Normally the TTF lib is"
 	@${ECHO} "not used to render fonts."
 	@${ECHO}
 	@${ECHO} "If you have licensed the Apple patents"
 	@${ECHO} "US05155805 US05159668 and US05325479"
 	@${ECHO} "you can enable this option to get better"
 	@${ECHO} "quality of glyphs at small bitmap sizes."
 	@${ECHO}
 .endif
 .if ${OSVERSION} < 450002
 	@${ECHO}
 	@${ECHO} "OS-VERSION ${OSVERSION} too low"
 	@${ECHO}
 	@${ECHO} "OO need some important libc_r and"
 	@${ECHO} "gcc fixes to build. Please upgrade to 4.6"
 	@${ECHO} "RELEASE or 4.6 STABLE."
 	@${FALSE}
 .endif
 	@${ECHO}
 	@${ECHO} "NOTICE:"
 	@${ECHO}
 	@${ECHO} "To build Openoffice, you should have a lot"
 .if defined(WITH_DEBUG)
 	@${ECHO} "of free diskspace (~ 8GB)."
 .else
 	@${ECHO} "of free diskspace (~ 4GB)."
 .endif
 	@${ECHO}
 .if (defined(USE_GCC) && ${USE_GCC} == 2.95) || \
     (${OSVERSION} < 500000 && !defined(USE_GCC))
 	@${ECHO} "KERNEL CONFIGURATION:"
 	@${ECHO}
 	@${ECHO} "Openoffice needs a larger stack- and"
 	@${ECHO} "datasize to build. Check your limit"
 	@${ECHO} "settings and and put this in /boot/loader.conf"
 	@${ECHO} "if neccessary:"
 	@${ECHO}
 	@${ECHO} "kern.maxdsiz=\"1073741824\""
 	@${ECHO} "kern.maxssiz=\"268435456\""
 .endif
 	@${ECHO}
 .if ${OSVERSION} < 460002
 	@${ECHO} "REQUIRED SYSTEM PATCHES:"
 	@${ECHO}
 .endif
 .if ${OSVERSION} < 500000
 	@${ECHO} "OO.org can crash if you enter a non existing path"
 	@${ECHO} "or URL in the location bar. To fix these crashes"
 	@${ECHO} "you need a uncommitted system patch for rtld:"
 	@${ECHO}
 	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff"
 	@${ECHO}
 .endif
 .if ${OSVERSION} < 460001
 	@${ECHO}
 	@${ECHO} "OO setup is broken on STABLE < 4.6"
 	@${ECHO} "including 4.6 RELEASE."
 	@${ECHO} "You'll need a system patch to solve"
 	@${ECHO} "this problem:"
 	@${ECHO}
 	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-alloca.diff"
 	@${ECHO}
 .endif
 .if ${OSVERSION} < 460002
 	@${ECHO}
 	@${ECHO} "OO.org soffice binary can deadlock. You can work around"
 	@${ECHO} "this problem with this patch:"
 	@${ECHO}
 	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-deadlock.diff"
 	@${ECHO}
 .endif
 .if ${OSVERSION} < 500000
 	@${ECHO}
 	@${ECHO} "OO.org build can deadlock in regmerge. You can work around"
 	@${ECHO} "this problem with this patch:"
 	@${ECHO}
 	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-builddeadlock.diff"
 	@${ECHO}
 .endif
 .if !exists(/usr/include/langinfo.h)
 	@${ECHO}
 	@${ECHO} "langinfo.h is missing !"
 	@${ECHO}
 	@${ECHO} "Please upgrade to 4.6 RELEASE or"
 	@${ECHO} "4.6 STABLE."
 	@${ECHO}
 	@${FALSE}
 .endif
 
 post-extract:
 	@for file in ${EXTRACT_REST}; do \
 		if ! (cd ${WRKDIR} && ${EXTRACT_CMD_R} \
 			${EXTRACT_BEFORE_ARGS_R} \
 			${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS_R}) ; \
 		then \
 			exit 1; \
 		fi \
 	done
 	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/
 	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
 	@${MAKE} extract-mozilla
 	@-${RM} ${WRKSRC}/../moz/zipped/*.zip
 	@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
 .if defined(L10NHELP)
 	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
 	@${MKDIR} ${WRKDIR}/L10NHELP
 	@cd ${WRKDIR}/L10NHELP && \
 	    ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP}
 .endif
 
 post-patch:
 	@${MAKE} patch-mozilla
 .if defined(WITH_TTF_BYTECODE_ENABLED)
 	@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
 		${ECHO_MSG} "===>  Applying additional TTF bytecode patches for ${PKGNAME}" ; \
 		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
 			${ECHO_MSG} "===>   Applying ${OPSYS} patch ${PATCHDIR}/optpatch-freetype::patch" ; \
 		fi; \
 		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
 	fi
 .endif
 .if defined(WITH_DEBUG)
 	@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
 		${ECHO_MSG} "===>  Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
 		PATCHES_APPLIED="" ; \
 		for i in ${PATCHDIR}/debugpatch-*; do \
 			case $$i in \
 				*.orig|*.rej|*~) \
 					${ECHO_MSG} "===>   Ignoring patchfile $$i" ; \
 					;; \
 				*) \
 					if [ ${PATCH_DEBUG_TMP} = yes ]; then \
 						${ECHO_MSG} "===>   Applying ${OPSYS} patch $$i" ; \
 					fi; \
 					if ${PATCH} ${PATCH_ARGS} < $$i ; then \
 						PATCHES_APPLIED="$$PATCHES_APPLIED $$i" ; \
 					else \
 						${ECHO_MSG} `${ECHO_CMD} ">> Patch $$i failed to apply cleanly." | ${SED} "s|${PATCHDIR}/||"` ; \
 						if [ x"$$PATCHES_APPLIED" != x"" ]; then \
 							${ECHO_MSG} `${ECHO_CMD} ">> Patch(es) $$PATCHES_APPLIED applied cleanly." | ${SED} "s|${PATCHDIR}/||g"` ; \
 						fi; \
 						${FALSE} ; \
 					fi; \
 					;; \
 			esac; \
 		done; \
 	fi;
 .endif
 	@${ECHO_MSG} "===>  Find old malloc.h defines and fix them in ${PKGNAME} source"
 	@${FIND} ${WRKSRC}/.. | ${EGREP} "\.(cxx|h|c)$$" | ${XARGS} \
 		${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g"
 
 extract-mozilla:
 .if ! exists(${WRKDIR}/mozilla/Makefile)
 	@${ECHO_MSG} "===>  Extracting mozilla sub project"
 	@${MKDIR} ${WRKDIR}/mozilla
 	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
 	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
 	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
 	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
 	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
 	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla
 .endif
 	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
 
 patch-mozilla:
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/patch-openoffice-mozilla101-2002-10-14 \
 		${WRKDIR}/mozilla/files/
 	@cd ${WRKDIR}/mozilla && ${MAKE} patch WRKDIRPREFIX=""
 
 build-mozilla:
 .if ! exists(${WRKDIR}/FREEBSDGCCIruntime.zip)
 	@${ECHO_MSG} "===>  Building mozilla sub project"
 .if defined(WITH_DEBUG)
 	@${CP} ${WRKDIR}/mozilla/Makefile ${WRKDIR}/mozilla/Makefile.new
 	@${SED} -e 's|--disable-debug||' \
 		-e 's|--disable-cpp-rtti||' \
 		-e 's|--enable-strip||' \
 		< ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile
 .endif
 .if defined(USE_GCC)
 	@cd ${WRKDIR}/mozilla && ${MAKE} CXX=${CXX} CC=${CC} CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
 .else
 	@cd ${WRKDIR}/mozilla && ${MAKE} CFLAGS="${CFLAGS}" build WRKDIRPREFIX=""
 .endif
 	@${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR}
 	@${CHMOD} 755 ${WRKDIR}/zipmoz.sh
 	@${WRKDIR}/zipmoz.sh ${WRKDIR}/mozilla/work/mozilla/dist FREEBSDGCCI ${WRKDIR}
 .endif
 
 install-mozilla:
 	@${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/
 	@${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/
 	@${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/
 
 register-mozilla:
 .if exists(${WRKDIR}/mozilla-runtime)
 	@${RM} -rf ${WRKDIR}/mozilla-runtime
 .endif
 	@${MKDIR} ${WRKDIR}/mozilla-runtime
 	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIruntime.zip
 	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIlib.zip
 	@${CP} ${WRKDIR}/mozilla/work/mozilla/dist/bin/regxpcom ${WRKDIR}/mozilla-runtime/
 	@-${RM} ${WRKDIR}/mozilla-runtime/components/component.reg
 	@cd ${WRKDIR}/mozilla-runtime && export MOZILLA_FIVE_HOME=. \
 		&& export LD_LIBRARY_PATH=.:./lib && ./regxpcom 
 	@${CP} ${WRKDIR}/mozilla-runtime/components/xpti.dat \
 		${WRKDIR}/mozilla-runtime/components/xptitemp.dat
 	@${RM} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKDIR}/mozilla-runtime/regxpcom
 	@cd ${WRKDIR}/mozilla-runtime && ${FIND} . -type f \
 		| ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@
 
 mozilla:
 	@${MAKE} extract-mozilla
 	@${MAKE} patch-mozilla
 	@${MAKE} build-mozilla
 	@${MAKE} register-mozilla
 	@${MAKE} install-mozilla
 
 do-build:
 .if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
 .if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
 .if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
 	@${MAKE} mozilla
 .endif
 .endif
 .endif
 .if exists(${WRKDIR}/.Xvfb.pid)
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
 .endif
 .if !defined(DISPLAY)
 	#
 	# This is a UGLY hack to not have to specify a X-Display.
 	#
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
 .endif
 	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
 .if defined(L10NHELP)
 	@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck 
 	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
 .endif
 .if !defined(DISPLAY)
 	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
 		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
 .else
 	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
 		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
 .endif
 .if defined(LANG_PKGNAME)
 	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
 		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANG_EXT}'
 .endif
 
 pre-install:
 	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \
 	   > ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
 
 do-install:
 .if !defined(DISPLAY)
 	#
 	# UGLY hack to not have to specify a X-Display.
 	#
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
 	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
 		TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
 		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
 .else
 	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
 		TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
 		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
 .endif
 
 install-user:
 	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \
 		${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice
 	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda
 	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc
 	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw
 	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup
 	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax
 	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress
 	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin
 	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb
 	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter
 	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST}
 	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${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}
 
 package-rename:
 	@${ECHO_MSG} "===>   Rename package for OO.org mirror upload";
 .if defined(LANG_SUFFIX)
 	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${LANG_SUFFIX}-${PORTVERSION}_${PORTREVISION}.tbz2 \
 	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}.tbz2
 .else
 	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${PORTVERSION}_${PORTREVISION}.tbz2 \
 	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/editors/openoffice-1.0/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.157
\ No newline at end of property
+1.158
\ No newline at end of property
Index: head/editors/openoffice-1.0/files/patch-dtrans+source+X11+X11_selection.cxx
===================================================================
--- head/editors/openoffice-1.0/files/patch-dtrans+source+X11+X11_selection.cxx	(revision 76885)
+++ head/editors/openoffice-1.0/files/patch-dtrans+source+X11+X11_selection.cxx	(revision 76886)
@@ -1,11 +1,19 @@
 --- ../dtrans/source/X11/X11_selection.cxx.orig	Sat Jul 20 23:18:03 2002
 +++ ../dtrans/source/X11/X11_selection.cxx	Sat Jul 20 23:18:05 2002
 @@ -65,7 +65,7 @@
  #include <X11/keysym.h>
  #include <X11/Xlib.h>
  #include <X11/Xutil.h>
 -#if defined(LINUX) || defined(NETBSD)
 +#if defined(LINUX) || defined(NETBSD) || defined (FREEBSD)
  #include <sys/poll.h>
  #else
  #include <poll.h>
+@@ -175,6 +175,7 @@
+ 	{ 0, "text/plain;charset=ksc5601.1992-0", "KSC5601.1992-0", 8 },
+ 	// eastern european encodings
+ 	{ 0, "text/plain;charset=koi8-r", "KOI8-R", 8 },
++	{ 0, "text/plain;charset=koi8-u", "KOI8-U", 8 },
+ 	// String (== iso8859-1)
+ 	{ XA_STRING, "text/plain;charset=string", "STRING", 8 },
+     // special for compound text

Property changes on: head/editors/openoffice-1.0/files/patch-dtrans+source+X11+X11_selection.cxx
___________________________________________________________________
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-1.0/files/patch-sal+osl+unx+nlsupport.c
===================================================================
--- head/editors/openoffice-1.0/files/patch-sal+osl+unx+nlsupport.c	(revision 76885)
+++ head/editors/openoffice-1.0/files/patch-sal+osl+unx+nlsupport.c	(revision 76886)
@@ -1,176 +1,184 @@
 --- ../sal/osl/unx/nlsupport.c.orig	Tue May 21 15:22:11 2002
 +++ ../sal/osl/unx/nlsupport.c	Tue Sep  3 12:58:48 2002
 @@ -63,7 +63,7 @@
  #include <osl/diagnose.h>
  #include <osl/process.h>
  
 -#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD)
 +#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(FREEBSD) || defined(NETBSD)
  #include <pthread.h>
  #include <locale.h>
  #include <langinfo.h>
 @@ -114,8 +114,7 @@
          comparison = _pair_compare( key, base + current );
          if (comparison < 0)
              upper = current;
 -        else
 -        if (comparison > 0)
 +        else if (comparison > 0)
              lower = current + 1;
          else
              return base + current;
 @@ -241,12 +240,13 @@
      return NULL;
  }
          
 -#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD)
 +#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(FREEBSD) || defined(NETBSD)
  
  /*
   * This implementation of osl_getTextEncodingFromLocale maps 
   * from nl_langinfo(CODESET) to rtl_textencoding defines. 
 - * nl_langinfo() is supported only on Linux, Solaris and IRIX. 
 + * nl_langinfo() is supported only on Linux, Solaris and IRIX,
 + * >= NetBSD 1.6 and >= FreeBSD 4.4
   *
   * This routine is SLOW because of the setlocale call, so
   * grab the result and cache it.
 @@ -260,6 +260,12 @@
  #endif
  #endif
  
 +/*
 + * _nl_language_list[] is an array list of supported encodings. Because
 + * we are using a binary search, the list has to be in ascending order.
 + * We are comparing the encodings case insensitiv, so the list has
 + * to be completly upper- , or lowercase.
 + */
  
  #if defined(SOLARIS)
  
 @@ -299,23 +305,23 @@
  #elif defined(IRIX)
  
  const _pair _nl_language_list[] = {
 -   { "ISO8859-1",  	RTL_TEXTENCODING_ISO_8859_1	}, /* Western */
 -   { "ISO8859-2",  	RTL_TEXTENCODING_ISO_8859_2     }, /* Central European */
 -   { "ISO8859-5",  	RTL_TEXTENCODING_ISO_8859_5     }, /* Cyrillic */
 -   { "ISO8859-7",  	RTL_TEXTENCODING_ISO_8859_7    	}, /* Greek */
 -   { "ISO8859-9",  	RTL_TEXTENCODING_ISO_8859_9     }, /* Turkish */
 -   { "ISO8859-15", 	RTL_TEXTENCODING_ISO_8859_15    }, /* Western Updated (w/Euro sign) */
 -   { "eucJP",		RTL_TEXTENCODING_EUC_JP 	}, /* Japan */
 -   { "eucKR",		RTL_TEXTENCODING_EUC_KR		}, /* Korea */
 -   { "eucCN",		RTL_TEXTENCODING_EUC_CN		}, /* China */
 -   { "eucTW",		RTL_TEXTENCODING_EUC_TW		}, /* Taiwan - Traditional Chinese */
 -   { "big5",		RTL_TEXTENCODING_BIG5		}, /* China - Traditional Chinese */
 -   { "eucgbk",		RTL_TEXTENCODING_DONTKNOW	}, /* China - Simplified Chinese */
 -   { "gbk",		RTL_TEXTENCODING_GBK		}, /* China - Simplified Chinese */
 -   { "sjis",		RTL_TEXTENCODING_SHIFT_JIS	}, /* Japan */
 +   { "BIG5",		RTL_TEXTENCODING_BIG5		}, /* China - Traditional Chinese */
 +   { "EUCCN",		RTL_TEXTENCODING_EUC_CN		}, /* China */
 +   { "EUCGBK",		RTL_TEXTENCODING_DONTKNOW	}, /* China - Simplified Chinese */
 +   { "EUCJP",		RTL_TEXTENCODING_EUC_JP		}, /* Japan */
 +   { "EUCKR",		RTL_TEXTENCODING_EUC_KR		}, /* Korea */
 +   { "EUCTW",		RTL_TEXTENCODING_EUC_TW		}, /* Taiwan - Traditional Chinese */
 +   { "GBK",		RTL_TEXTENCODING_GBK		}, /* China - Simplified Chinese */
 +   { "ISO8859-1",	RTL_TEXTENCODING_ISO_8859_1	}, /* Western */
 +   { "ISO8859-15",	RTL_TEXTENCODING_ISO_8859_15	}, /* Western Updated (w/Euro sign) */
 +   { "ISO8859-2",	RTL_TEXTENCODING_ISO_8859_2	}, /* Central European */
 +   { "ISO8859-5",	RTL_TEXTENCODING_ISO_8859_5	}, /* Cyrillic */
 +   { "ISO8859-7",	RTL_TEXTENCODING_ISO_8859_7	}, /* Greek */
 +   { "ISO8859-9",	RTL_TEXTENCODING_ISO_8859_9	}, /* Turkish */
 +   { "SJIS",		RTL_TEXTENCODING_SHIFT_JIS	}  /* Japan */
  };
  
 -#elif defined(LINUX) || defined(NETBSD)
 +#elif defined(LINUX)
  
  const _pair _nl_language_list[] = {
      { "ANSI_X3.110-1983",           RTL_TEXTENCODING_DONTKNOW   },  /* ISO-IR-99 NAPLPS */
 @@ -496,7 +502,59 @@
      { "WIN-SAMI-2",                 RTL_TEXTENCODING_DONTKNOW }     /* WS2 */
  };
  
 -#endif /* ifdef LINUX || NETBSD */
 +#elif defined(FREEBSD)
 +
 +const _pair _nl_language_list[] = {
 +   { "ASCII",		RTL_TEXTENCODING_ASCII_US	}, /* US-ASCII */
 +   { "BIG5",		RTL_TEXTENCODING_BIG5		}, /* China - Traditional Chinese */
 +   { "CP1251",		RTL_TEXTENCODING_MS_1251	}, /* MS-CYRL */
 +   { "CP866",		RTL_TEXTENCODING_IBM_866	}, /* CP866 866 */
 +   { "EUCCN",		RTL_TEXTENCODING_EUC_CN		}, /* China - Simplified Chinese */
 +   { "EUCJP",		RTL_TEXTENCODING_EUC_JP		}, /* Japan */
 +   { "EUCKR",		RTL_TEXTENCODING_EUC_KR		}, /* Korea */
 +   { "ISO8859-1",	RTL_TEXTENCODING_ISO_8859_1	}, /* Western */
 +   { "ISO8859-15",	RTL_TEXTENCODING_ISO_8859_15	}, /* Western Updated (w/Euro sign) */
 +   { "ISO8859-2",	RTL_TEXTENCODING_ISO_8859_2	}, /* Central European */
 +   { "ISO8859-4",	RTL_TEXTENCODING_ISO_8859_4	}, /* LATIN4 L4 */
 +   { "ISO8859-5",	RTL_TEXTENCODING_ISO_8859_5	}, /* Cyrillic */
 +   { "ISO8859-7",	RTL_TEXTENCODING_ISO_8859_7	}, /* Greek */
 +   { "ISO8859-9",	RTL_TEXTENCODING_ISO_8859_9	}, /* Turkish */
-+   { "KOI-U",		RTL_TEXTENCODING_DONTKNOW	}, /* Not supported at the moment */
 +   { "KOI8-R",		RTL_TEXTENCODING_KOI8_R		}, /* KOI8 */
++   { "KOI8-U",		RTL_TEXTENCODING_KOI8_U		}, /* KOI8-U */
 +   { "SJIS",		RTL_TEXTENCODING_SHIFT_JIS	}, /* Japan */
 +   { "US-ASCII",	RTL_TEXTENCODING_ASCII_US	}, /* US-ASCII */
 +   { "UTF-8",		RTL_TEXTENCODING_UTF8		}  /* ISO-10646/UTF-8 */
 +};
 +
 +#elif defined(NETBSD)
 +
 +const _pair _nl_language_list[] = {
 +   { "ASCII",		RTL_TEXTENCODING_ASCII_US	}, /* US-ASCII */
 +   { "BIG5",		RTL_TEXTENCODING_BIG5		}, /* China - Traditional Chinese */
 +   { "CP1251",		RTL_TEXTENCODING_MS_1251	}, /* MS-CYRL */
 +   { "CP866",		RTL_TEXTENCODING_IBM_866	}, /* CP866 866 */
 +   { "CTEXT",		RTL_TEXTENCODING_ASCII_US	}, /* US-ASCII */
 +   { "EUCCN",		RTL_TEXTENCODING_EUC_CN		}, /* China - Simplified Chinese */
 +   { "EUCJP",		RTL_TEXTENCODING_EUC_JP		}, /* Japan */
 +   { "EUCKR",		RTL_TEXTENCODING_EUC_KR		}, /* Korea */
 +   { "EUCTW",		RTL_TEXTENCODING_EUC_TW		}, /* China - Traditional Chinese */
 +   { "ISO-2022-JP",	RTL_TEXTENCODING_DONTKNOW	}, /* */
 +   { "ISO-2022-JP-2",	RTL_TEXTENCODING_DONTKNOW	}, /* */
 +   { "ISO8859-1",	RTL_TEXTENCODING_ISO_8859_1	}, /* Western */
 +   { "ISO8859-15",	RTL_TEXTENCODING_ISO_8859_15	}, /* Western Updated (w/Euro sign) */
 +   { "ISO8859-2",	RTL_TEXTENCODING_ISO_8859_2	}, /* Central European */
 +   { "ISO8859-4",	RTL_TEXTENCODING_ISO_8859_4	}, /* LATIN4 L4 */
 +   { "ISO8859-5",	RTL_TEXTENCODING_ISO_8859_5	}, /* Cyrillic */
 +   { "ISO8859-7",	RTL_TEXTENCODING_ISO_8859_7	}, /* Greek */
 +   { "ISO8859-9",	RTL_TEXTENCODING_ISO_8859_9	}, /* Turkish */
-+   { "KOI-U",		RTL_TEXTENCODING_DONTKNOW	}, /* Not supported at the moment */
 +   { "KOI8-R",		RTL_TEXTENCODING_KOI8_R		}, /* KOI8 */
++   { "KOI8-U",		RTL_TEXTENCODING_KOI8_U		}, /* KOI8-U */
 +   { "SJIS",		RTL_TEXTENCODING_SHIFT_JIS	}, /* Japan */
 +   { "US-ASCII",	RTL_TEXTENCODING_ASCII_US	}, /* US-ASCII */
 +   { "UTF-8",		RTL_TEXTENCODING_UTF8		}  /* ISO-10646/UTF-8 */
 +};
 +
 +#endif /* ifdef SOLARIS IRIX LINUX FREEBSD NETBSD */
  
  static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
  
 @@ -618,7 +676,7 @@
      return ret;
  }
  
 -#elif defined(MACOSX) /* ifdef LINUX || SOLARIS || NETBSD */
 +#elif defined(MACOSX) /* ifdef LINUX || SOLARIS || IRIX || FREEBSD || NETBSD */
  
  /*
   * FIXME: the MacOS X implemetation is missing
 @@ -651,7 +709,7 @@
      return 0;
  }
  
 -#else /* ifdef LINUX || SOLARIS || MACOSX || NETBSD */
 +#else /* ifdef LINUX || SOLARIS || IRIX || FREEBSD || NETBSD || MACOSX */
  
  /*
   * This implementation of osl_getTextEncodingFromLocale maps 
-@@ -887,6 +945,6 @@
+@@ -684,6 +742,7 @@
+     { "iso8859-8",    RTL_TEXTENCODING_ISO_8859_8  },
+     { "iso8859-9",    RTL_TEXTENCODING_ISO_8859_9  },
+     { "koi8-r",       RTL_TEXTENCODING_KOI8_R      },
++    { "koi8-u",       RTL_TEXTENCODING_KOI8_U      },
+     { "pck",          RTL_TEXTENCODING_MS_932      },
+ #if (0)
+     { "sun_eu_greek", RTL_TEXTENCODING_DONTKNOW    },
+@@ -887,6 +946,6 @@
      return 0;
  }
  
 -#endif /* ifdef LINUX || SOLARIS || MACOSX || NETBSD */
 +#endif /* ifdef LINUX || SOLARIS || FREEBSD || NETBSD || MACOSX */
  
  

Property changes on: head/editors/openoffice-1.0/files/patch-sal+osl+unx+nlsupport.c
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.11
\ No newline at end of property
+1.12
\ No newline at end of property
Index: head/editors/openoffice-1.0/files/patch-sal+textenc+tencinfo.c
===================================================================
--- head/editors/openoffice-1.0/files/patch-sal+textenc+tencinfo.c	(revision 76885)
+++ head/editors/openoffice-1.0/files/patch-sal+textenc+tencinfo.c	(revision 76886)
@@ -1,13 +1,37 @@
 --- ../sal/textenc/tencinfo.c.orig	Wed Jul 31 11:44:35 2002
 +++ ../sal/textenc/tencinfo.c	Wed Jul 31 11:45:47 2002
+@@ -532,6 +532,7 @@
+     static ImplStrCharsetDef const aUnixCharsetKOI8Tab[] =
+     {
+         { "r", RTL_TEXTENCODING_KOI8_R },
++        { "u", RTL_TEXTENCODING_KOI8_U },
+         { NULL, RTL_TEXTENCODING_DONTKNOW }
+     };
+ 
 @@ -695,6 +695,10 @@
      /* characters. The function search for the first equal string in */
      /* the table. In this table are only the most used mime types. */
      /* Sort order: important */
 +
 +    if (pMimeCharset == NULL)
 +	pMimeCharset = "usascii";
 +
      static ImplStrCharsetDef const aVIPMimeCharsetTab[] =
      {
          { "usascii", RTL_TEXTENCODING_ASCII_US },
+@@ -741,6 +742,7 @@
+         { "windows1256", RTL_TEXTENCODING_MS_1256 },
+         { "windows1257", RTL_TEXTENCODING_MS_1257 },
+         { "windows1258", RTL_TEXTENCODING_MS_1258 },
++        { "koi8u", RTL_TEXTENCODING_KOI8_U },
+         { NULL, RTL_TEXTENCODING_DONTKNOW }
+     };
+ 
+@@ -815,6 +817,7 @@
+         { "iso10646us", RTL_TEXTENCODING_ASCII_US },
+         { "iso646irv", RTL_TEXTENCODING_ASCII_US },
+         { "cskoi8r", RTL_TEXTENCODING_KOI8_R },
++        { "cskoi8u", RTL_TEXTENCODING_KOI8_U },
+         { "ibm437", RTL_TEXTENCODING_IBM_437 },
+         { "cp437", RTL_TEXTENCODING_IBM_437 },
+         { "437", RTL_TEXTENCODING_IBM_437 },

Property changes on: head/editors/openoffice-1.0/files/patch-sal+textenc+tencinfo.c
___________________________________________________________________
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-1.0/files/patch-sysui+tools+lngconv+lngconv.cxx
===================================================================
--- head/editors/openoffice-1.0/files/patch-sysui+tools+lngconv+lngconv.cxx	(revision 76885)
+++ head/editors/openoffice-1.0/files/patch-sysui+tools+lngconv+lngconv.cxx	(revision 76886)
@@ -1,11 +1,19 @@
 --- ../sysui/tools/lngconv/lngconv.cxx.orig	Sat Jul 20 23:14:29 2002
 +++ ../sysui/tools/lngconv/lngconv.cxx	Sat Jul 20 23:14:34 2002
 @@ -62,7 +62,7 @@
  #include <stdlib.h>
  #include <stdio.h>
  
 -#if defined( LINUX ) || defined (SOLARIS)
 +#if defined(LINUX) || defined (SOLARIS) || defined (FREEBSD)
  #include <locale.h>
  #include <langinfo.h>
  #endif
+@@ -143,6 +143,7 @@
+     { "iso8859-8",    RTL_TEXTENCODING_ISO_8859_8  },
+     { "iso8859-9",    RTL_TEXTENCODING_ISO_8859_9  },
+     { "koi8-r",       RTL_TEXTENCODING_KOI8_R      },
++    { "koi8-u",       RTL_TEXTENCODING_KOI8_U      },
+     { "pck",          RTL_TEXTENCODING_MS_932      },
+ #if (0)
+     { "sun_eu_greek", RTL_TEXTENCODING_DONTKNOW    },

Property changes on: head/editors/openoffice-1.0/files/patch-sysui+tools+lngconv+lngconv.cxx
___________________________________________________________________
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-1.0/Makefile
===================================================================
--- head/editors/openoffice.org-1.0/Makefile	(revision 76885)
+++ head/editors/openoffice.org-1.0/Makefile	(revision 76886)
@@ -1,564 +1,565 @@
 # New ports collection makefile for: OpenOffice
 # Date created:		28 Februar 2002
 # Whom:                 Martin Blapp
 #
 # $FreeBSD$
 #
 
 PORTNAME=	openoffice
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES+=	editors
 MASTER_SITES+=	http://ny1.mirror.openoffice.org/%SUBDIR%/ \
 		http://ftp.gwdg.de/pub/misc/openoffice/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/&,} \
 		ftp://ftp.chg.ru/pub/OpenOffice/%SUBDIR%/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		ftp://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \
 		http://people.freebsd.org/~mbr/ooo/:moz
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}
 DISTFILES+=	OOo_${PORTVERSION}_source.tar.bz2 \
 		gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz
 .if defined(L10NHELP)
 DISTFILES+=	${L10NHELP:S/$/:help/}
 .endif
 
 SORT?=	/usr/bin/sort
 FIND?=	/usr/bin/find
 CUT?=	/usr/bin/cut
 AWK?=	/usr/bin/awk
 GREP?=	/usr/bin/grep
 MOUNT?=	/sbin/mount
 ZIP?=	${PREFIX}/bin/zip
 UNZIP?=	${PREFIX}/bin/unzip
 ANT?=	${LOCALBASE}/bin/ant
 TCSH?=	/bin/tcsh
 PASTE?= /usr/bin/paste
 
 .include <bsd.port.pre.mk>
 
 INSTALLATION_BASEDIR=	OpenOffice.org1.0
 BUILD_NR=		641
 DIST_SUBDIR=		openoffice
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
 #
 # configuration for language specific slave ports
 #
 .if !defined(LANG_EXT)
 LANG_EXT=01
 .else
 #
 # Add pkg-comment and pkg-descr if available
 #
 .if exists(${.CURDIR}/pkg-comment)
 COMMENTFILE=	${.CURDIR}/pkg-comment
 .endif
 .if exists(${.CURDIR}/pkg-descr)
 DESCR=	${.CURDIR}/pkg-descr
 .endif
 .if exists(${.CURDIR}/pkg-descr)
 PKGMESSAGE=	${.CURDIR}/pkg-message
 .endif
 #
 # Set prefix and suffix
 #
 .if defined(LANG_PKGNAME)
 PKGNAMEPREFIX=	${LANG_PKGNAME}-
 .if defined(LANG_SUFFIX)
 PKGNAMESUFFIX=	-${LANG_SUFFIX}
 .endif
 .endif # if defined(LANG_PKGNAME)
 #
 # LANG_CONFIGURE_ARG is missing for the german port
 #
 .if defined(LANG_EXT)
 CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG},ENUS
 .endif
 .endif
 
 .if !defined (LANG) && !defined(USE_LANG)
 USE_LANG=	en_US.ISO8859-15
 LANG_LIST=	en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII
 .else
 .if !defined(USE_LANG)
 USE_LANG=	${LANG}
 .endif
 .endif
 
 LANG_SORTED=	`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
 
 .if ${OSVERSION} < 500000
 #
 # OO build is broken with the system gcc on STABLE.
 #
 BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
 CC=		gcc32
 CXX=		g++32
 USE_GCC=3.2
 .endif
 
 .if ${OSVERSION} > 500000
 .if defined(USE_GCC) && ${USE_GCC} == 3.2
 BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
 CC=		gcc32
 CXX=		g++32
 .endif
 .endif
 
 EXTRACT_ONLY=	OOo_${PORTVERSION}_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
 #.if !defined(USE_GCC)
 #BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
 #.endif
 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
 BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/jakarta-ant
 BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
 .endif
 .if !defined(WITH_BSD_JDK)
 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/linux-sun-jdk13
 .else
 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
 .endif
 
 USE_PERL5=	yes
 USE_BZIP2=	yes
 USE_BISON=	yes
 USE_GMAKE=	yes
 
 EXTRACT_BEFORE_ARGS_R= -dc
 EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
 EXTRACT_REST=	gpc231.tar.Z
 
 .if !defined(WITH_BSD_JDK)
 JDK13DIR?=      ${LOCALBASE}/linux-sun-jdk1.3.1
 .else
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
 .endif
 JAVAVM=         ${JDK13DIR}/bin/java
 
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
 LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
 .if defined(WITH_DEBUG)
 CFLAGS+=	-g
 .if ${WITH_DEBUG} == 2
 BUILD=		dmake debug="true"
 .else
 BUILD=		dmake
 .endif
 .else
 BUILD=		dmake strip="true"
 .endif
 
 .if !defined(DISPLAY)
 DISPLAYHACK=localhost:1001
 .endif
 
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
 
 CONFIGURE_ARGS+=	--with-jdk-home=${JDK13DIR} \
 			--with-os-version=${OSVERSION} \
 			--with-ant-home=${LOCALBASE}
 
 #.if !defined(USE_GCC)
 #CONFIGURE_ARGS+=	--with-stlport4-home=${PREFIX}
 #.endif
 
 .if !defined(WITH_BSD_JDK)
 CONFIGURE_ARGS+=	--enable-linuxjdk=yes
 .endif
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 .endif
 
 .if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2)
 CONFIGURE_ARGS+=	--enable-gcc3
 .endif
 
 .if ${OSVERSION} > 500000 && !defined(USE_GCC)
 CONFIGURE_ARGS+=	--enable-gcc3
 .endif
 
 pre-fetch:
 	@${ECHO}
 .if !defined(LANG)
 	@${ECHO} "REQUIREMENTS:"
 	@${ECHO}
 	@${ECHO} "OO requires that the ENV variable LANG"
 	@${ECHO} "is set to a proper value. Dependent on"
 	@${ECHO} "which language port you use, OO does"
 	@${ECHO} "automatically set LANG to a suitable"
 	@${ECHO} "value. You can change this with:"
 	@${ECHO}
 	@${ECHO} "USE_LANG=\"prefered language\""
 	@${ECHO}
 	@${ECHO} "and set a different language"
 	@${ECHO} "like:"
 	@${ECHO}
 	@${ECHO} "${LANG_SORTED}"
 	@${ECHO}
 	@${ECHO} "Your current setting is:"
 	@${ECHO}
 	@${ECHO} "USE_LANG=${USE_LANG}"
 	@${ECHO}
 	@${ECHO}
 .endif
 	@${ECHO} "OPTIONS:"
 .if !defined(USE_GCC)
 	@${ECHO}
 	@${ECHO} "You can compile OO with different"
 	@${ECHO} "gcc compiler versions:"
 	@${ECHO}
 	@${ECHO} "Add USE_GCC=2.95 or USE_GCC=3.1"
 	@${ECHO} "to compile openoffice with your"
 	@${ECHO} "prefered compiler."
 .endif
 .if !defined(WITH_BSD_JDK)
 	@${ECHO}
 	@${ECHO} "If you like to use the native BSD"
 	@${ECHO} "JDK for the build system, you can use"
 	@${ECHO} "WITH_BSD_JDK=TRUE to disable the"
 	@${ECHO} "usage of the linux-JDK and linux dependency."
 	@${ECHO}
 .endif
 .if !defined(WITH_DEBUG)
 	@${ECHO}
 	@${ECHO} "You can compile OO with debug symbols"
 	@${ECHO} "if you call make with WITH_DEBUG=1"
 	@${ECHO}
 	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
 	@${ECHO} "OO.org debug support."
 	@${ECHO}
 .endif
 .if !defined(WITH_TTF_BYTECODE_ENABLED)
 	@${ECHO}
 	@${ECHO} "You may set WITH_TTF_BYTECODE_ENABLED=YES"
 	@${ECHO} "if you like to use the Freetype library to"
 	@${ECHO} "render TTF fonts. Normally the TTF lib is"
 	@${ECHO} "not used to render fonts."
 	@${ECHO}
 	@${ECHO} "If you have licensed the Apple patents"
 	@${ECHO} "US05155805 US05159668 and US05325479"
 	@${ECHO} "you can enable this option to get better"
 	@${ECHO} "quality of glyphs at small bitmap sizes."
 	@${ECHO}
 .endif
 .if ${OSVERSION} < 450002
 	@${ECHO}
 	@${ECHO} "OS-VERSION ${OSVERSION} too low"
 	@${ECHO}
 	@${ECHO} "OO need some important libc_r and"
 	@${ECHO} "gcc fixes to build. Please upgrade to 4.6"
 	@${ECHO} "RELEASE or 4.6 STABLE."
 	@${FALSE}
 .endif
 	@${ECHO}
 	@${ECHO} "NOTICE:"
 	@${ECHO}
 	@${ECHO} "To build Openoffice, you should have a lot"
 .if defined(WITH_DEBUG)
 	@${ECHO} "of free diskspace (~ 8GB)."
 .else
 	@${ECHO} "of free diskspace (~ 4GB)."
 .endif
 	@${ECHO}
 .if (defined(USE_GCC) && ${USE_GCC} == 2.95) || \
     (${OSVERSION} < 500000 && !defined(USE_GCC))
 	@${ECHO} "KERNEL CONFIGURATION:"
 	@${ECHO}
 	@${ECHO} "Openoffice needs a larger stack- and"
 	@${ECHO} "datasize to build. Check your limit"
 	@${ECHO} "settings and and put this in /boot/loader.conf"
 	@${ECHO} "if neccessary:"
 	@${ECHO}
 	@${ECHO} "kern.maxdsiz=\"1073741824\""
 	@${ECHO} "kern.maxssiz=\"268435456\""
 .endif
 	@${ECHO}
 .if ${OSVERSION} < 460002
 	@${ECHO} "REQUIRED SYSTEM PATCHES:"
 	@${ECHO}
 .endif
 .if ${OSVERSION} < 500000
 	@${ECHO} "OO.org can crash if you enter a non existing path"
 	@${ECHO} "or URL in the location bar. To fix these crashes"
 	@${ECHO} "you need a uncommitted system patch for rtld:"
 	@${ECHO}
 	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff"
 	@${ECHO}
 .endif
 .if ${OSVERSION} < 460001
 	@${ECHO}
 	@${ECHO} "OO setup is broken on STABLE < 4.6"
 	@${ECHO} "including 4.6 RELEASE."
 	@${ECHO} "You'll need a system patch to solve"
 	@${ECHO} "this problem:"
 	@${ECHO}
 	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-alloca.diff"
 	@${ECHO}
 .endif
 .if ${OSVERSION} < 460002
 	@${ECHO}
 	@${ECHO} "OO.org soffice binary can deadlock. You can work around"
 	@${ECHO} "this problem with this patch:"
 	@${ECHO}
 	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-deadlock.diff"
 	@${ECHO}
 .endif
 .if ${OSVERSION} < 500000
 	@${ECHO}
 	@${ECHO} "OO.org build can deadlock in regmerge. You can work around"
 	@${ECHO} "this problem with this patch:"
 	@${ECHO}
 	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-builddeadlock.diff"
 	@${ECHO}
 .endif
 .if !exists(/usr/include/langinfo.h)
 	@${ECHO}
 	@${ECHO} "langinfo.h is missing !"
 	@${ECHO}
 	@${ECHO} "Please upgrade to 4.6 RELEASE or"
 	@${ECHO} "4.6 STABLE."
 	@${ECHO}
 	@${FALSE}
 .endif
 
 post-extract:
 	@for file in ${EXTRACT_REST}; do \
 		if ! (cd ${WRKDIR} && ${EXTRACT_CMD_R} \
 			${EXTRACT_BEFORE_ARGS_R} \
 			${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS_R}) ; \
 		then \
 			exit 1; \
 		fi \
 	done
 	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/
 	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
 	@${MAKE} extract-mozilla
 	@-${RM} ${WRKSRC}/../moz/zipped/*.zip
 	@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
 .if defined(L10NHELP)
 	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
 	@${MKDIR} ${WRKDIR}/L10NHELP
 	@cd ${WRKDIR}/L10NHELP && \
 	    ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP}
 .endif
 
 post-patch:
 	@${MAKE} patch-mozilla
 .if defined(WITH_TTF_BYTECODE_ENABLED)
 	@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
 		${ECHO_MSG} "===>  Applying additional TTF bytecode patches for ${PKGNAME}" ; \
 		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
 			${ECHO_MSG} "===>   Applying ${OPSYS} patch ${PATCHDIR}/optpatch-freetype::patch" ; \
 		fi; \
 		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
 	fi
 .endif
 .if defined(WITH_DEBUG)
 	@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
 		${ECHO_MSG} "===>  Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
 		PATCHES_APPLIED="" ; \
 		for i in ${PATCHDIR}/debugpatch-*; do \
 			case $$i in \
 				*.orig|*.rej|*~) \
 					${ECHO_MSG} "===>   Ignoring patchfile $$i" ; \
 					;; \
 				*) \
 					if [ ${PATCH_DEBUG_TMP} = yes ]; then \
 						${ECHO_MSG} "===>   Applying ${OPSYS} patch $$i" ; \
 					fi; \
 					if ${PATCH} ${PATCH_ARGS} < $$i ; then \
 						PATCHES_APPLIED="$$PATCHES_APPLIED $$i" ; \
 					else \
 						${ECHO_MSG} `${ECHO_CMD} ">> Patch $$i failed to apply cleanly." | ${SED} "s|${PATCHDIR}/||"` ; \
 						if [ x"$$PATCHES_APPLIED" != x"" ]; then \
 							${ECHO_MSG} `${ECHO_CMD} ">> Patch(es) $$PATCHES_APPLIED applied cleanly." | ${SED} "s|${PATCHDIR}/||g"` ; \
 						fi; \
 						${FALSE} ; \
 					fi; \
 					;; \
 			esac; \
 		done; \
 	fi;
 .endif
 	@${ECHO_MSG} "===>  Find old malloc.h defines and fix them in ${PKGNAME} source"
 	@${FIND} ${WRKSRC}/.. | ${EGREP} "\.(cxx|h|c)$$" | ${XARGS} \
 		${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g"
 
 extract-mozilla:
 .if ! exists(${WRKDIR}/mozilla/Makefile)
 	@${ECHO_MSG} "===>  Extracting mozilla sub project"
 	@${MKDIR} ${WRKDIR}/mozilla
 	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
 	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
 	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
 	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
 	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
 	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla
 .endif
 	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
 
 patch-mozilla:
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/patch-openoffice-mozilla101-2002-10-14 \
 		${WRKDIR}/mozilla/files/
 	@cd ${WRKDIR}/mozilla && ${MAKE} patch WRKDIRPREFIX=""
 
 build-mozilla:
 .if ! exists(${WRKDIR}/FREEBSDGCCIruntime.zip)
 	@${ECHO_MSG} "===>  Building mozilla sub project"
 .if defined(WITH_DEBUG)
 	@${CP} ${WRKDIR}/mozilla/Makefile ${WRKDIR}/mozilla/Makefile.new
 	@${SED} -e 's|--disable-debug||' \
 		-e 's|--disable-cpp-rtti||' \
 		-e 's|--enable-strip||' \
 		< ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile
 .endif
 .if defined(USE_GCC)
 	@cd ${WRKDIR}/mozilla && ${MAKE} CXX=${CXX} CC=${CC} CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
 .else
 	@cd ${WRKDIR}/mozilla && ${MAKE} CFLAGS="${CFLAGS}" build WRKDIRPREFIX=""
 .endif
 	@${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR}
 	@${CHMOD} 755 ${WRKDIR}/zipmoz.sh
 	@${WRKDIR}/zipmoz.sh ${WRKDIR}/mozilla/work/mozilla/dist FREEBSDGCCI ${WRKDIR}
 .endif
 
 install-mozilla:
 	@${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/
 	@${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/
 	@${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/
 
 register-mozilla:
 .if exists(${WRKDIR}/mozilla-runtime)
 	@${RM} -rf ${WRKDIR}/mozilla-runtime
 .endif
 	@${MKDIR} ${WRKDIR}/mozilla-runtime
 	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIruntime.zip
 	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIlib.zip
 	@${CP} ${WRKDIR}/mozilla/work/mozilla/dist/bin/regxpcom ${WRKDIR}/mozilla-runtime/
 	@-${RM} ${WRKDIR}/mozilla-runtime/components/component.reg
 	@cd ${WRKDIR}/mozilla-runtime && export MOZILLA_FIVE_HOME=. \
 		&& export LD_LIBRARY_PATH=.:./lib && ./regxpcom 
 	@${CP} ${WRKDIR}/mozilla-runtime/components/xpti.dat \
 		${WRKDIR}/mozilla-runtime/components/xptitemp.dat
 	@${RM} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKDIR}/mozilla-runtime/regxpcom
 	@cd ${WRKDIR}/mozilla-runtime && ${FIND} . -type f \
 		| ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@
 
 mozilla:
 	@${MAKE} extract-mozilla
 	@${MAKE} patch-mozilla
 	@${MAKE} build-mozilla
 	@${MAKE} register-mozilla
 	@${MAKE} install-mozilla
 
 do-build:
 .if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
 .if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
 .if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
 	@${MAKE} mozilla
 .endif
 .endif
 .endif
 .if exists(${WRKDIR}/.Xvfb.pid)
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
 .endif
 .if !defined(DISPLAY)
 	#
 	# This is a UGLY hack to not have to specify a X-Display.
 	#
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
 .endif
 	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
 .if defined(L10NHELP)
 	@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck 
 	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
 .endif
 .if !defined(DISPLAY)
 	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
 		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
 .else
 	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
 		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
 .endif
 .if defined(LANG_PKGNAME)
 	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
 		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANG_EXT}'
 .endif
 
 pre-install:
 	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \
 	   > ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
 
 do-install:
 .if !defined(DISPLAY)
 	#
 	# UGLY hack to not have to specify a X-Display.
 	#
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
 	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
 		TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
 		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
 .else
 	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
 		TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
 		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
 .endif
 
 install-user:
 	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \
 		${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice
 	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda
 	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc
 	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw
 	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup
 	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax
 	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress
 	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin
 	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb
 	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter
 	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST}
 	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${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}
 
 package-rename:
 	@${ECHO_MSG} "===>   Rename package for OO.org mirror upload";
 .if defined(LANG_SUFFIX)
 	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${LANG_SUFFIX}-${PORTVERSION}_${PORTREVISION}.tbz2 \
 	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}.tbz2
 .else
 	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${PORTVERSION}_${PORTREVISION}.tbz2 \
 	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/editors/openoffice.org-1.0/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.157
\ No newline at end of property
+1.158
\ No newline at end of property
Index: head/editors/openoffice.org-1.0/files/patch-dtrans+source+X11+X11_selection.cxx
===================================================================
--- head/editors/openoffice.org-1.0/files/patch-dtrans+source+X11+X11_selection.cxx	(revision 76885)
+++ head/editors/openoffice.org-1.0/files/patch-dtrans+source+X11+X11_selection.cxx	(revision 76886)
@@ -1,11 +1,19 @@
 --- ../dtrans/source/X11/X11_selection.cxx.orig	Sat Jul 20 23:18:03 2002
 +++ ../dtrans/source/X11/X11_selection.cxx	Sat Jul 20 23:18:05 2002
 @@ -65,7 +65,7 @@
  #include <X11/keysym.h>
  #include <X11/Xlib.h>
  #include <X11/Xutil.h>
 -#if defined(LINUX) || defined(NETBSD)
 +#if defined(LINUX) || defined(NETBSD) || defined (FREEBSD)
  #include <sys/poll.h>
  #else
  #include <poll.h>
+@@ -175,6 +175,7 @@
+ 	{ 0, "text/plain;charset=ksc5601.1992-0", "KSC5601.1992-0", 8 },
+ 	// eastern european encodings
+ 	{ 0, "text/plain;charset=koi8-r", "KOI8-R", 8 },
++	{ 0, "text/plain;charset=koi8-u", "KOI8-U", 8 },
+ 	// String (== iso8859-1)
+ 	{ XA_STRING, "text/plain;charset=string", "STRING", 8 },
+     // special for compound text

Property changes on: head/editors/openoffice.org-1.0/files/patch-dtrans+source+X11+X11_selection.cxx
___________________________________________________________________
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-1.0/files/patch-sal+osl+unx+nlsupport.c
===================================================================
--- head/editors/openoffice.org-1.0/files/patch-sal+osl+unx+nlsupport.c	(revision 76885)
+++ head/editors/openoffice.org-1.0/files/patch-sal+osl+unx+nlsupport.c	(revision 76886)
@@ -1,176 +1,184 @@
 --- ../sal/osl/unx/nlsupport.c.orig	Tue May 21 15:22:11 2002
 +++ ../sal/osl/unx/nlsupport.c	Tue Sep  3 12:58:48 2002
 @@ -63,7 +63,7 @@
  #include <osl/diagnose.h>
  #include <osl/process.h>
  
 -#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD)
 +#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(FREEBSD) || defined(NETBSD)
  #include <pthread.h>
  #include <locale.h>
  #include <langinfo.h>
 @@ -114,8 +114,7 @@
          comparison = _pair_compare( key, base + current );
          if (comparison < 0)
              upper = current;
 -        else
 -        if (comparison > 0)
 +        else if (comparison > 0)
              lower = current + 1;
          else
              return base + current;
 @@ -241,12 +240,13 @@
      return NULL;
  }
          
 -#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD)
 +#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(FREEBSD) || defined(NETBSD)
  
  /*
   * This implementation of osl_getTextEncodingFromLocale maps 
   * from nl_langinfo(CODESET) to rtl_textencoding defines. 
 - * nl_langinfo() is supported only on Linux, Solaris and IRIX. 
 + * nl_langinfo() is supported only on Linux, Solaris and IRIX,
 + * >= NetBSD 1.6 and >= FreeBSD 4.4
   *
   * This routine is SLOW because of the setlocale call, so
   * grab the result and cache it.
 @@ -260,6 +260,12 @@
  #endif
  #endif
  
 +/*
 + * _nl_language_list[] is an array list of supported encodings. Because
 + * we are using a binary search, the list has to be in ascending order.
 + * We are comparing the encodings case insensitiv, so the list has
 + * to be completly upper- , or lowercase.
 + */
  
  #if defined(SOLARIS)
  
 @@ -299,23 +305,23 @@
  #elif defined(IRIX)
  
  const _pair _nl_language_list[] = {
 -   { "ISO8859-1",  	RTL_TEXTENCODING_ISO_8859_1	}, /* Western */
 -   { "ISO8859-2",  	RTL_TEXTENCODING_ISO_8859_2     }, /* Central European */
 -   { "ISO8859-5",  	RTL_TEXTENCODING_ISO_8859_5     }, /* Cyrillic */
 -   { "ISO8859-7",  	RTL_TEXTENCODING_ISO_8859_7    	}, /* Greek */
 -   { "ISO8859-9",  	RTL_TEXTENCODING_ISO_8859_9     }, /* Turkish */
 -   { "ISO8859-15", 	RTL_TEXTENCODING_ISO_8859_15    }, /* Western Updated (w/Euro sign) */
 -   { "eucJP",		RTL_TEXTENCODING_EUC_JP 	}, /* Japan */
 -   { "eucKR",		RTL_TEXTENCODING_EUC_KR		}, /* Korea */
 -   { "eucCN",		RTL_TEXTENCODING_EUC_CN		}, /* China */
 -   { "eucTW",		RTL_TEXTENCODING_EUC_TW		}, /* Taiwan - Traditional Chinese */
 -   { "big5",		RTL_TEXTENCODING_BIG5		}, /* China - Traditional Chinese */
 -   { "eucgbk",		RTL_TEXTENCODING_DONTKNOW	}, /* China - Simplified Chinese */
 -   { "gbk",		RTL_TEXTENCODING_GBK		}, /* China - Simplified Chinese */
 -   { "sjis",		RTL_TEXTENCODING_SHIFT_JIS	}, /* Japan */
 +   { "BIG5",		RTL_TEXTENCODING_BIG5		}, /* China - Traditional Chinese */
 +   { "EUCCN",		RTL_TEXTENCODING_EUC_CN		}, /* China */
 +   { "EUCGBK",		RTL_TEXTENCODING_DONTKNOW	}, /* China - Simplified Chinese */
 +   { "EUCJP",		RTL_TEXTENCODING_EUC_JP		}, /* Japan */
 +   { "EUCKR",		RTL_TEXTENCODING_EUC_KR		}, /* Korea */
 +   { "EUCTW",		RTL_TEXTENCODING_EUC_TW		}, /* Taiwan - Traditional Chinese */
 +   { "GBK",		RTL_TEXTENCODING_GBK		}, /* China - Simplified Chinese */
 +   { "ISO8859-1",	RTL_TEXTENCODING_ISO_8859_1	}, /* Western */
 +   { "ISO8859-15",	RTL_TEXTENCODING_ISO_8859_15	}, /* Western Updated (w/Euro sign) */
 +   { "ISO8859-2",	RTL_TEXTENCODING_ISO_8859_2	}, /* Central European */
 +   { "ISO8859-5",	RTL_TEXTENCODING_ISO_8859_5	}, /* Cyrillic */
 +   { "ISO8859-7",	RTL_TEXTENCODING_ISO_8859_7	}, /* Greek */
 +   { "ISO8859-9",	RTL_TEXTENCODING_ISO_8859_9	}, /* Turkish */
 +   { "SJIS",		RTL_TEXTENCODING_SHIFT_JIS	}  /* Japan */
  };
  
 -#elif defined(LINUX) || defined(NETBSD)
 +#elif defined(LINUX)
  
  const _pair _nl_language_list[] = {
      { "ANSI_X3.110-1983",           RTL_TEXTENCODING_DONTKNOW   },  /* ISO-IR-99 NAPLPS */
 @@ -496,7 +502,59 @@
      { "WIN-SAMI-2",                 RTL_TEXTENCODING_DONTKNOW }     /* WS2 */
  };
  
 -#endif /* ifdef LINUX || NETBSD */
 +#elif defined(FREEBSD)
 +
 +const _pair _nl_language_list[] = {
 +   { "ASCII",		RTL_TEXTENCODING_ASCII_US	}, /* US-ASCII */
 +   { "BIG5",		RTL_TEXTENCODING_BIG5		}, /* China - Traditional Chinese */
 +   { "CP1251",		RTL_TEXTENCODING_MS_1251	}, /* MS-CYRL */
 +   { "CP866",		RTL_TEXTENCODING_IBM_866	}, /* CP866 866 */
 +   { "EUCCN",		RTL_TEXTENCODING_EUC_CN		}, /* China - Simplified Chinese */
 +   { "EUCJP",		RTL_TEXTENCODING_EUC_JP		}, /* Japan */
 +   { "EUCKR",		RTL_TEXTENCODING_EUC_KR		}, /* Korea */
 +   { "ISO8859-1",	RTL_TEXTENCODING_ISO_8859_1	}, /* Western */
 +   { "ISO8859-15",	RTL_TEXTENCODING_ISO_8859_15	}, /* Western Updated (w/Euro sign) */
 +   { "ISO8859-2",	RTL_TEXTENCODING_ISO_8859_2	}, /* Central European */
 +   { "ISO8859-4",	RTL_TEXTENCODING_ISO_8859_4	}, /* LATIN4 L4 */
 +   { "ISO8859-5",	RTL_TEXTENCODING_ISO_8859_5	}, /* Cyrillic */
 +   { "ISO8859-7",	RTL_TEXTENCODING_ISO_8859_7	}, /* Greek */
 +   { "ISO8859-9",	RTL_TEXTENCODING_ISO_8859_9	}, /* Turkish */
-+   { "KOI-U",		RTL_TEXTENCODING_DONTKNOW	}, /* Not supported at the moment */
 +   { "KOI8-R",		RTL_TEXTENCODING_KOI8_R		}, /* KOI8 */
++   { "KOI8-U",		RTL_TEXTENCODING_KOI8_U		}, /* KOI8-U */
 +   { "SJIS",		RTL_TEXTENCODING_SHIFT_JIS	}, /* Japan */
 +   { "US-ASCII",	RTL_TEXTENCODING_ASCII_US	}, /* US-ASCII */
 +   { "UTF-8",		RTL_TEXTENCODING_UTF8		}  /* ISO-10646/UTF-8 */
 +};
 +
 +#elif defined(NETBSD)
 +
 +const _pair _nl_language_list[] = {
 +   { "ASCII",		RTL_TEXTENCODING_ASCII_US	}, /* US-ASCII */
 +   { "BIG5",		RTL_TEXTENCODING_BIG5		}, /* China - Traditional Chinese */
 +   { "CP1251",		RTL_TEXTENCODING_MS_1251	}, /* MS-CYRL */
 +   { "CP866",		RTL_TEXTENCODING_IBM_866	}, /* CP866 866 */
 +   { "CTEXT",		RTL_TEXTENCODING_ASCII_US	}, /* US-ASCII */
 +   { "EUCCN",		RTL_TEXTENCODING_EUC_CN		}, /* China - Simplified Chinese */
 +   { "EUCJP",		RTL_TEXTENCODING_EUC_JP		}, /* Japan */
 +   { "EUCKR",		RTL_TEXTENCODING_EUC_KR		}, /* Korea */
 +   { "EUCTW",		RTL_TEXTENCODING_EUC_TW		}, /* China - Traditional Chinese */
 +   { "ISO-2022-JP",	RTL_TEXTENCODING_DONTKNOW	}, /* */
 +   { "ISO-2022-JP-2",	RTL_TEXTENCODING_DONTKNOW	}, /* */
 +   { "ISO8859-1",	RTL_TEXTENCODING_ISO_8859_1	}, /* Western */
 +   { "ISO8859-15",	RTL_TEXTENCODING_ISO_8859_15	}, /* Western Updated (w/Euro sign) */
 +   { "ISO8859-2",	RTL_TEXTENCODING_ISO_8859_2	}, /* Central European */
 +   { "ISO8859-4",	RTL_TEXTENCODING_ISO_8859_4	}, /* LATIN4 L4 */
 +   { "ISO8859-5",	RTL_TEXTENCODING_ISO_8859_5	}, /* Cyrillic */
 +   { "ISO8859-7",	RTL_TEXTENCODING_ISO_8859_7	}, /* Greek */
 +   { "ISO8859-9",	RTL_TEXTENCODING_ISO_8859_9	}, /* Turkish */
-+   { "KOI-U",		RTL_TEXTENCODING_DONTKNOW	}, /* Not supported at the moment */
 +   { "KOI8-R",		RTL_TEXTENCODING_KOI8_R		}, /* KOI8 */
++   { "KOI8-U",		RTL_TEXTENCODING_KOI8_U		}, /* KOI8-U */
 +   { "SJIS",		RTL_TEXTENCODING_SHIFT_JIS	}, /* Japan */
 +   { "US-ASCII",	RTL_TEXTENCODING_ASCII_US	}, /* US-ASCII */
 +   { "UTF-8",		RTL_TEXTENCODING_UTF8		}  /* ISO-10646/UTF-8 */
 +};
 +
 +#endif /* ifdef SOLARIS IRIX LINUX FREEBSD NETBSD */
  
  static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
  
 @@ -618,7 +676,7 @@
      return ret;
  }
  
 -#elif defined(MACOSX) /* ifdef LINUX || SOLARIS || NETBSD */
 +#elif defined(MACOSX) /* ifdef LINUX || SOLARIS || IRIX || FREEBSD || NETBSD */
  
  /*
   * FIXME: the MacOS X implemetation is missing
 @@ -651,7 +709,7 @@
      return 0;
  }
  
 -#else /* ifdef LINUX || SOLARIS || MACOSX || NETBSD */
 +#else /* ifdef LINUX || SOLARIS || IRIX || FREEBSD || NETBSD || MACOSX */
  
  /*
   * This implementation of osl_getTextEncodingFromLocale maps 
-@@ -887,6 +945,6 @@
+@@ -684,6 +742,7 @@
+     { "iso8859-8",    RTL_TEXTENCODING_ISO_8859_8  },
+     { "iso8859-9",    RTL_TEXTENCODING_ISO_8859_9  },
+     { "koi8-r",       RTL_TEXTENCODING_KOI8_R      },
++    { "koi8-u",       RTL_TEXTENCODING_KOI8_U      },
+     { "pck",          RTL_TEXTENCODING_MS_932      },
+ #if (0)
+     { "sun_eu_greek", RTL_TEXTENCODING_DONTKNOW    },
+@@ -887,6 +946,6 @@
      return 0;
  }
  
 -#endif /* ifdef LINUX || SOLARIS || MACOSX || NETBSD */
 +#endif /* ifdef LINUX || SOLARIS || FREEBSD || NETBSD || MACOSX */
  
  

Property changes on: head/editors/openoffice.org-1.0/files/patch-sal+osl+unx+nlsupport.c
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.11
\ No newline at end of property
+1.12
\ No newline at end of property
Index: head/editors/openoffice.org-1.0/files/patch-sal+textenc+tencinfo.c
===================================================================
--- head/editors/openoffice.org-1.0/files/patch-sal+textenc+tencinfo.c	(revision 76885)
+++ head/editors/openoffice.org-1.0/files/patch-sal+textenc+tencinfo.c	(revision 76886)
@@ -1,13 +1,37 @@
 --- ../sal/textenc/tencinfo.c.orig	Wed Jul 31 11:44:35 2002
 +++ ../sal/textenc/tencinfo.c	Wed Jul 31 11:45:47 2002
+@@ -532,6 +532,7 @@
+     static ImplStrCharsetDef const aUnixCharsetKOI8Tab[] =
+     {
+         { "r", RTL_TEXTENCODING_KOI8_R },
++        { "u", RTL_TEXTENCODING_KOI8_U },
+         { NULL, RTL_TEXTENCODING_DONTKNOW }
+     };
+ 
 @@ -695,6 +695,10 @@
      /* characters. The function search for the first equal string in */
      /* the table. In this table are only the most used mime types. */
      /* Sort order: important */
 +
 +    if (pMimeCharset == NULL)
 +	pMimeCharset = "usascii";
 +
      static ImplStrCharsetDef const aVIPMimeCharsetTab[] =
      {
          { "usascii", RTL_TEXTENCODING_ASCII_US },
+@@ -741,6 +742,7 @@
+         { "windows1256", RTL_TEXTENCODING_MS_1256 },
+         { "windows1257", RTL_TEXTENCODING_MS_1257 },
+         { "windows1258", RTL_TEXTENCODING_MS_1258 },
++        { "koi8u", RTL_TEXTENCODING_KOI8_U },
+         { NULL, RTL_TEXTENCODING_DONTKNOW }
+     };
+ 
+@@ -815,6 +817,7 @@
+         { "iso10646us", RTL_TEXTENCODING_ASCII_US },
+         { "iso646irv", RTL_TEXTENCODING_ASCII_US },
+         { "cskoi8r", RTL_TEXTENCODING_KOI8_R },
++        { "cskoi8u", RTL_TEXTENCODING_KOI8_U },
+         { "ibm437", RTL_TEXTENCODING_IBM_437 },
+         { "cp437", RTL_TEXTENCODING_IBM_437 },
+         { "437", RTL_TEXTENCODING_IBM_437 },

Property changes on: head/editors/openoffice.org-1.0/files/patch-sal+textenc+tencinfo.c
___________________________________________________________________
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-1.0/files/patch-sysui+tools+lngconv+lngconv.cxx
===================================================================
--- head/editors/openoffice.org-1.0/files/patch-sysui+tools+lngconv+lngconv.cxx	(revision 76885)
+++ head/editors/openoffice.org-1.0/files/patch-sysui+tools+lngconv+lngconv.cxx	(revision 76886)
@@ -1,11 +1,19 @@
 --- ../sysui/tools/lngconv/lngconv.cxx.orig	Sat Jul 20 23:14:29 2002
 +++ ../sysui/tools/lngconv/lngconv.cxx	Sat Jul 20 23:14:34 2002
 @@ -62,7 +62,7 @@
  #include <stdlib.h>
  #include <stdio.h>
  
 -#if defined( LINUX ) || defined (SOLARIS)
 +#if defined(LINUX) || defined (SOLARIS) || defined (FREEBSD)
  #include <locale.h>
  #include <langinfo.h>
  #endif
+@@ -143,6 +143,7 @@
+     { "iso8859-8",    RTL_TEXTENCODING_ISO_8859_8  },
+     { "iso8859-9",    RTL_TEXTENCODING_ISO_8859_9  },
+     { "koi8-r",       RTL_TEXTENCODING_KOI8_R      },
++    { "koi8-u",       RTL_TEXTENCODING_KOI8_U      },
+     { "pck",          RTL_TEXTENCODING_MS_932      },
+ #if (0)
+     { "sun_eu_greek", RTL_TEXTENCODING_DONTKNOW    },

Property changes on: head/editors/openoffice.org-1.0/files/patch-sysui+tools+lngconv+lngconv.cxx
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property