Index: head/editors/openoffice-3/Makefile
===================================================================
--- head/editors/openoffice-3/Makefile	(revision 159772)
+++ head/editors/openoffice-3/Makefile	(revision 159773)
@@ -1,248 +1,255 @@
 # New ports collection makefile for: OpenOffice.org
 # Date created:		28 February 2002
 # Whom:                 Martin Blapp
 #
 # $FreeBSD$
 #
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	2.0.2
 CATEGORIES+=	editors java
 MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/${PORTVERSION}/&,} \
 		http://openoffice.lunarshells.com/sources/ \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
 DISTFILES+=	OOo_${PORTVERSION}_src.tar.gz
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
 .if defined(WITH_GNUGCJ)
 DISTFILES+=     ${ANT_DISTFILE}:antbin
 .endif
 EXTRACT_ONLY=	OOo_${PORTVERSION}_src.tar.gz
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
 
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
 USE_GNOME+=	libidl
 .endif
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=        3
 .endif
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 WITHOUT_CPU_CFLAGS=	true
 
 ONLY_FOR_ARCHS=	i386
 
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 JAVA_BUILD=	jdk
 JAVA_VENDOR=	freebsd bsdjava
 .endif
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
 
 .if ${PERL_LEVEL} < 500600
 IGNORE=		install lang/perl5.8 then try again
 .endif
 
 CODELINE=		680
 RELEASE_NR=		2.0
 OOOTAG?=		OOB680_m5
 INSTALLATION_BASEDIR?=	openoffice.org-${PORTVERSION}
 EXECBASE?=		openoffice.org-${PORTVERSION}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
 PACKAGE_BASENAME=	OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
 .if defined(LANG_PKGNAME)
 PKGNAMEPREFIX=          ${LANG_PKGNAME}-
 .endif
 .if defined(LANG_SUFFIX)
 PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
 .if defined(WITH_GNUGCJ)
-#BUILD_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
-#BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
-#RUN_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
-BROKEN=	"Still work in progress"
+#this wired part must be rewritten
+GCCVER=4.1.1
+BUILD_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
+BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
+RUN_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
 .else
 BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
 .endif
 
 # FIXME (correctly add ccache before gcc and g++)
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
 .if defined(WITH_GNUGCJ)
 CC=	ccache gcc41
 CXX=	ccache g++41
 .else
 CC=	ccache gcc-ooo
 CXX=	ccache g++-ooo
 .endif #WITH_GNUGCJ
 .endif #WITH_CCACHE
 .if !defined(WITH_CCACHE)
 .if defined(WITH_GNUGCJ)
 CC=	gcc41
 CXX=	g++41
 .else
 CC=	gcc-ooo
 CXX=	g++-ooo
 .endif #WITH_GNUGCJ
 .endif #!WITH_CCACHE
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison2:${PORTSDIR}/devel/bison2 \
 		imake:${X_IMAKE_PORT}
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
 .else
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
 .endif
 .if defined(WITH_GNUGCJ)
 ANT_DISTFILE=   apache-ant-${ANT_VERSION}-bin.tar.bz2
 ANT_VERSION=	1.6.5
 .endif
 .if !defined(WITH_GPC)
 LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
 .endif
 
 GNU_CONFIGURE=	yes
 WRKSRC?=		${WRKDIR}/${OOOTAG}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --with-system-freetype --enable-crashdump=yes --enable-symbols=SMALL
 #workarounds
 CONFIGURE_ARGS+=	--with-system-xrender-headers=yes #i62713#
 
 .if (${OSVERSION} <= 492000)
 EXTRA_PATCHES+=	${FILESDIR}/fbsd4-workaroundpatch
 .endif
 .if defined(WITH_GNUGCJ)
 EXTRA_PATCHES+=	${FILESDIR}/gcj-cws_jaxpapi ${FILESDIR}/gcj-patches ${FILESDIR}/gcj-fbsdworkaround
 .endif
 .if defined(WITHOUT_MOZILLA)
 EXTRA_PATCHES+=	${FILESDIR}/moz-patch_i59729 #cws pj50
 .endif
 #.if defined(WITH_TTF_BYTECODE_ENABLED)
 #EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
 #.endif
 
 .include <${FILESDIR}/Makefile.knobs>
 
 pre-everything::
 # really tweak, extremely useful when you build all localized language versions
 # needed after when you build with ALL_LOCALIZED_LANGS.
 .if defined(TWEAK_L10N)
 	@${RM} -f ${WRKDIR}/.PLIST*
 	@${RM} -f ${WRKDIR}/.install_done.*
 	@${RM} -f ${WRKDIR}/.package_done.*
 	@${RM} -f ${WRKDIR}/.extract_done.*
 	@${RM} -f ${WRKDIR}/.patch_done.*
 	@${RM} -f ${WRKDIR}/.configure_done.*
 	@${RM} -f ${WRKDIR}/.build_done.*
 	@${TOUCH} ${EXTRACT_COOKIE}
 	@${TOUCH} ${PATCH_COOKIE}
 	@${TOUCH} ${CONFIGURE_COOKIE}
 	@${TOUCH} ${BUILD_COOKIE}
 .endif
 
 post-extract:
 .if defined(WITH_GNUGCJ)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
-# #iXXXXX# xmerge doesn't support gjdoc
-	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKSRC}/solenv/bin/javadoc
+	@${RM} -Rf ${WRKDIR}/gnugcj
+	@${MKDIR} ${WRKDIR}/gnugcj/bin
+	@${MKDIR} ${WRKDIR}/gnugcj/lib
+	@${LN} -s ${LOCALBASE}/bin/gcj41 ${WRKDIR}/gnugcj/bin/gcj
+	@${LN} -s ${LOCALBASE}/bin/gij41 ${WRKDIR}/gnugcj/bin/gij
+	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKDIR}/gnugcj/bin/javadoc  # #iXXXXX# xmerge doesn't support gjdoc
+	@${LN} -s ${LOCALBASE}/bin/fastjar41 ${WRKDIR}/gnugcj/bin/fastjar
+	@${LN} -s ${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/libgcj.so ${WRKDIR}/gnugcj/lib
 .endif
 .if defined(WITH_GPC)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
 	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/external/gpc/
 	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/external/gpc/
 .endif
 .if !defined(WITHOUT_MOZILLA)
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
 .endif
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 # PR:84786 #i53289#
 .if (${NUMOFPROCESSES}>1)
 	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
 .else
 	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
 .endif
 
 do-install:
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
 	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
 		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
 		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKDIR}/tmp/$$i ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			-e 's#%%PORTVERSION%%#${PORTVERSION}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice.org-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \
 		${PREFIX}/bin/${EXECBASE}
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sbase
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setofficelang
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
 	@${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 	@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${PKGMESSAGE}
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
 .include <${FILESDIR}/Makefile.others>
 .include <bsd.port.post.mk>

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

Property changes on: head/editors/openoffice-3/files/Makefile.knobs
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.26
\ No newline at end of property
+1.27
\ No newline at end of property
Index: head/editors/openoffice-3-devel/Makefile
===================================================================
--- head/editors/openoffice-3-devel/Makefile	(revision 159772)
+++ head/editors/openoffice-3-devel/Makefile	(revision 159773)
@@ -1,249 +1,257 @@
 # New ports collection makefile for: OpenOffice.org
 # Date created:		28 February 2002
 # Whom:                 Martin Blapp
 #
 # $FreeBSD$
 #
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	2.0.${SNAPDATE}
 CATEGORIES+=	editors java
 MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680_m${MILESTONE}/&,} \
 		http://openoffice.lunarshells.com/sources/ \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
 DISTFILES+=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
 .if defined(WITH_GNUGCJ)
 DISTFILES+=     ${ANT_DISTFILE}:antbin
 .endif
 EXTRACT_ONLY=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
 
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
 USE_GNOME+=	libidl
 .endif
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=        3
 .endif
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 USE_BZIP2=	yes
 WITHOUT_CPU_CFLAGS=	true
 
 ONLY_FOR_ARCHS=	i386
 
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 JAVA_BUILD=	jdk
 JAVA_VENDOR=	freebsd bsdjava
 .endif
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
 
 .if ${PERL_LEVEL} < 500600
 IGNORE=		install lang/perl5.8 then try again
 .endif
 
 CODELINE=		680
 RELEASE_NR=		2.0
 MILESTONE?=		163
 OOOTAG?=		SRC680_m${MILESTONE}
 SNAPDATE=		20060413
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
 PACKAGE_BASENAME=	OOo_${OOOTAG}_${OPSYS}${SIMPLEOSVER}Intel
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
 .if defined(LANG_PKGNAME)
 PKGNAMEPREFIX=          ${LANG_PKGNAME}-
 .endif
 .if defined(LANG_SUFFIX)
 PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
 .if defined(WITH_GNUGCJ)
-#BUILD_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
-#BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
-#RUN_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
+#this wired part must be rewritten
+GCCVER=4.1.1
+BUILD_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
+BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
+RUN_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
 BROKEN=	"Still work in progress"	
 .else
 BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
 .endif
 
 # FIXME (correctly add ccache before gcc and g++)
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
 .if defined(WITH_GNUGCJ)
 CC=	ccache gcc41
 CXX=	ccache g++41
 .else
 CC=	ccache gcc-ooo
 CXX=	ccache g++-ooo
 .endif #WITH_GNUGCJ
 .endif #WITH_CCACHE
 .if !defined(WITH_CCACHE)
 .if defined(WITH_GNUGCJ)
 CC=	gcc41
 CXX=	g++41
 .else
 CC=	gcc-ooo
 CXX=	g++-ooo
 .endif #WITH_GNUGCJ
 .endif #!WITH_CCACHE
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison2:${PORTSDIR}/devel/bison2 \
 		imake:${X_IMAKE_PORT}
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
 .else
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
 .endif
 .if defined(WITH_GNUGCJ)
 ANT_DISTFILE=   apache-ant-${ANT_VERSION}-bin.tar.bz2
 ANT_VERSION=	1.6.5
 .endif
 .if !defined(WITH_GPC)
 LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
 .endif
 
 GNU_CONFIGURE=	yes
 WRKSRC?=		${WRKDIR}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --enable-crashdump=yes --enable-symbols=SMALL --with-system-freetype 
 #workarounds
 CONFIGURE_ARGS+=	--with-system-xrender-headers=yes #i62713#
 
 .if (${OSVERSION} <= 492000)
 EXTRA_PATCHES+=	${FILESDIR}/fbsd4-workaroundpatch
 .endif
 .if defined(WITH_GNUGCJ)
 EXTRA_PATCHES+=	${FILESDIR}/gcj-patches ${FILESDIR}/cws-maho1.diff ${FILESDIR}/gcj-fbsdworkaround
 .endif
 #.if defined(WITH_TTF_BYTECODE_ENABLED)
 #EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
 #.endif
 
 .include <${FILESDIR}/Makefile.knobs>
 
 pre-everything::
 # really tweak, extremely useful when you build all localized language versions
 # needed after when you build with ALL_LOCALIZED_LANGS.
 .if defined(TWEAK_L10N)
 	@${RM} -f ${WRKDIR}/.PLIST*
 	@${RM} -f ${WRKDIR}/.install_done.*
 	@${RM} -f ${WRKDIR}/.package_done.*
 	@${RM} -f ${WRKDIR}/.extract_done.*
 	@${RM} -f ${WRKDIR}/.patch_done.*
 	@${RM} -f ${WRKDIR}/.configure_done.*
 	@${RM} -f ${WRKDIR}/.build_done.*
 	@${TOUCH} ${EXTRACT_COOKIE}
 	@${TOUCH} ${PATCH_COOKIE}
 	@${TOUCH} ${CONFIGURE_COOKIE}
 	@${TOUCH} ${BUILD_COOKIE}
 .endif
 
 post-extract:
 .if defined(WITH_GNUGCJ)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
-# #iXXXXX# xmerge doesn't support gjdoc
-	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKSRC}/solenv/bin/javadoc
+	@${RM} -Rf ${WRKDIR}/gnugcj
+	@${MKDIR} ${WRKDIR}/gnugcj/bin
+	@${MKDIR} ${WRKDIR}/gnugcj/lib
+	@${LN} -s ${LOCALBASE}/bin/gcj41 ${WRKDIR}/gnugcj/bin/gcj
+	@${LN} -s ${LOCALBASE}/bin/gij41 ${WRKDIR}/gnugcj/bin/gij
+	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKDIR}/gnugcj/bin/javadoc  # #iXXXXX# xmerge doesn't support gjdoc
+	@${LN} -s ${LOCALBASE}/bin/fastjar41 ${WRKDIR}/gnugcj/bin/fastjar
+	@${LN} -s ${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/libgcj.so ${WRKDIR}/gnugcj/lib
 .endif
 .if defined(WITH_GPC)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
 	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/external/gpc/
 	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/external/gpc/
 .endif
 .if !defined(WITHOUT_MOZILLA)
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
 .endif
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 # PR:84786 #i53289#
 .if (${NUMOFPROCESSES}>1)
 	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
 .else
 	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
 .endif
 
 do-install:
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
 	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
 		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
 		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKDIR}/tmp/$$i ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			-e 's#%%OOOTAG%%#${OOOTAG}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice.org-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \
 		${PREFIX}/bin/${EXECBASE}
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sbase
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setofficelang
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
 	@${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 	@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
 			-e 's#%%OOOTAG%%#${OOOTAG}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${PKGMESSAGE}
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
 .include <${FILESDIR}/Makefile.others>
 .include <bsd.port.post.mk>

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

Property changes on: head/editors/openoffice-3-devel/files/Makefile.knobs
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.25
\ No newline at end of property
+1.26
\ No newline at end of property
Index: head/editors/openoffice.org-2/Makefile
===================================================================
--- head/editors/openoffice.org-2/Makefile	(revision 159772)
+++ head/editors/openoffice.org-2/Makefile	(revision 159773)
@@ -1,248 +1,255 @@
 # New ports collection makefile for: OpenOffice.org
 # Date created:		28 February 2002
 # Whom:                 Martin Blapp
 #
 # $FreeBSD$
 #
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	2.0.2
 CATEGORIES+=	editors java
 MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/${PORTVERSION}/&,} \
 		http://openoffice.lunarshells.com/sources/ \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
 DISTFILES+=	OOo_${PORTVERSION}_src.tar.gz
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
 .if defined(WITH_GNUGCJ)
 DISTFILES+=     ${ANT_DISTFILE}:antbin
 .endif
 EXTRACT_ONLY=	OOo_${PORTVERSION}_src.tar.gz
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
 
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
 USE_GNOME+=	libidl
 .endif
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=        3
 .endif
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 WITHOUT_CPU_CFLAGS=	true
 
 ONLY_FOR_ARCHS=	i386
 
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 JAVA_BUILD=	jdk
 JAVA_VENDOR=	freebsd bsdjava
 .endif
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
 
 .if ${PERL_LEVEL} < 500600
 IGNORE=		install lang/perl5.8 then try again
 .endif
 
 CODELINE=		680
 RELEASE_NR=		2.0
 OOOTAG?=		OOB680_m5
 INSTALLATION_BASEDIR?=	openoffice.org-${PORTVERSION}
 EXECBASE?=		openoffice.org-${PORTVERSION}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
 PACKAGE_BASENAME=	OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
 .if defined(LANG_PKGNAME)
 PKGNAMEPREFIX=          ${LANG_PKGNAME}-
 .endif
 .if defined(LANG_SUFFIX)
 PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
 .if defined(WITH_GNUGCJ)
-#BUILD_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
-#BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
-#RUN_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
-BROKEN=	"Still work in progress"
+#this wired part must be rewritten
+GCCVER=4.1.1
+BUILD_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
+BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
+RUN_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
 .else
 BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
 .endif
 
 # FIXME (correctly add ccache before gcc and g++)
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
 .if defined(WITH_GNUGCJ)
 CC=	ccache gcc41
 CXX=	ccache g++41
 .else
 CC=	ccache gcc-ooo
 CXX=	ccache g++-ooo
 .endif #WITH_GNUGCJ
 .endif #WITH_CCACHE
 .if !defined(WITH_CCACHE)
 .if defined(WITH_GNUGCJ)
 CC=	gcc41
 CXX=	g++41
 .else
 CC=	gcc-ooo
 CXX=	g++-ooo
 .endif #WITH_GNUGCJ
 .endif #!WITH_CCACHE
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison2:${PORTSDIR}/devel/bison2 \
 		imake:${X_IMAKE_PORT}
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
 .else
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
 .endif
 .if defined(WITH_GNUGCJ)
 ANT_DISTFILE=   apache-ant-${ANT_VERSION}-bin.tar.bz2
 ANT_VERSION=	1.6.5
 .endif
 .if !defined(WITH_GPC)
 LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
 .endif
 
 GNU_CONFIGURE=	yes
 WRKSRC?=		${WRKDIR}/${OOOTAG}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --with-system-freetype --enable-crashdump=yes --enable-symbols=SMALL
 #workarounds
 CONFIGURE_ARGS+=	--with-system-xrender-headers=yes #i62713#
 
 .if (${OSVERSION} <= 492000)
 EXTRA_PATCHES+=	${FILESDIR}/fbsd4-workaroundpatch
 .endif
 .if defined(WITH_GNUGCJ)
 EXTRA_PATCHES+=	${FILESDIR}/gcj-cws_jaxpapi ${FILESDIR}/gcj-patches ${FILESDIR}/gcj-fbsdworkaround
 .endif
 .if defined(WITHOUT_MOZILLA)
 EXTRA_PATCHES+=	${FILESDIR}/moz-patch_i59729 #cws pj50
 .endif
 #.if defined(WITH_TTF_BYTECODE_ENABLED)
 #EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
 #.endif
 
 .include <${FILESDIR}/Makefile.knobs>
 
 pre-everything::
 # really tweak, extremely useful when you build all localized language versions
 # needed after when you build with ALL_LOCALIZED_LANGS.
 .if defined(TWEAK_L10N)
 	@${RM} -f ${WRKDIR}/.PLIST*
 	@${RM} -f ${WRKDIR}/.install_done.*
 	@${RM} -f ${WRKDIR}/.package_done.*
 	@${RM} -f ${WRKDIR}/.extract_done.*
 	@${RM} -f ${WRKDIR}/.patch_done.*
 	@${RM} -f ${WRKDIR}/.configure_done.*
 	@${RM} -f ${WRKDIR}/.build_done.*
 	@${TOUCH} ${EXTRACT_COOKIE}
 	@${TOUCH} ${PATCH_COOKIE}
 	@${TOUCH} ${CONFIGURE_COOKIE}
 	@${TOUCH} ${BUILD_COOKIE}
 .endif
 
 post-extract:
 .if defined(WITH_GNUGCJ)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
-# #iXXXXX# xmerge doesn't support gjdoc
-	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKSRC}/solenv/bin/javadoc
+	@${RM} -Rf ${WRKDIR}/gnugcj
+	@${MKDIR} ${WRKDIR}/gnugcj/bin
+	@${MKDIR} ${WRKDIR}/gnugcj/lib
+	@${LN} -s ${LOCALBASE}/bin/gcj41 ${WRKDIR}/gnugcj/bin/gcj
+	@${LN} -s ${LOCALBASE}/bin/gij41 ${WRKDIR}/gnugcj/bin/gij
+	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKDIR}/gnugcj/bin/javadoc  # #iXXXXX# xmerge doesn't support gjdoc
+	@${LN} -s ${LOCALBASE}/bin/fastjar41 ${WRKDIR}/gnugcj/bin/fastjar
+	@${LN} -s ${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/libgcj.so ${WRKDIR}/gnugcj/lib
 .endif
 .if defined(WITH_GPC)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
 	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/external/gpc/
 	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/external/gpc/
 .endif
 .if !defined(WITHOUT_MOZILLA)
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
 .endif
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 # PR:84786 #i53289#
 .if (${NUMOFPROCESSES}>1)
 	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
 .else
 	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
 .endif
 
 do-install:
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
 	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
 		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
 		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKDIR}/tmp/$$i ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			-e 's#%%PORTVERSION%%#${PORTVERSION}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice.org-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \
 		${PREFIX}/bin/${EXECBASE}
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sbase
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setofficelang
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
 	@${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 	@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${PKGMESSAGE}
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
 .include <${FILESDIR}/Makefile.others>
 .include <bsd.port.post.mk>

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

Property changes on: head/editors/openoffice.org-2/files/Makefile.knobs
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.26
\ No newline at end of property
+1.27
\ No newline at end of property
Index: head/editors/openoffice.org-2-RC/Makefile
===================================================================
--- head/editors/openoffice.org-2-RC/Makefile	(revision 159772)
+++ head/editors/openoffice.org-2-RC/Makefile	(revision 159773)
@@ -1,248 +1,255 @@
 # New ports collection makefile for: OpenOffice.org
 # Date created:		28 February 2002
 # Whom:                 Martin Blapp
 #
 # $FreeBSD$
 #
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	2.0.2
 CATEGORIES+=	editors java
 MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/${PORTVERSION}/&,} \
 		http://openoffice.lunarshells.com/sources/ \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
 DISTFILES+=	OOo_${PORTVERSION}_src.tar.gz
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
 .if defined(WITH_GNUGCJ)
 DISTFILES+=     ${ANT_DISTFILE}:antbin
 .endif
 EXTRACT_ONLY=	OOo_${PORTVERSION}_src.tar.gz
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
 
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
 USE_GNOME+=	libidl
 .endif
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=        3
 .endif
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 WITHOUT_CPU_CFLAGS=	true
 
 ONLY_FOR_ARCHS=	i386
 
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 JAVA_BUILD=	jdk
 JAVA_VENDOR=	freebsd bsdjava
 .endif
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
 
 .if ${PERL_LEVEL} < 500600
 IGNORE=		install lang/perl5.8 then try again
 .endif
 
 CODELINE=		680
 RELEASE_NR=		2.0
 OOOTAG?=		OOB680_m5
 INSTALLATION_BASEDIR?=	openoffice.org-${PORTVERSION}
 EXECBASE?=		openoffice.org-${PORTVERSION}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
 PACKAGE_BASENAME=	OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
 .if defined(LANG_PKGNAME)
 PKGNAMEPREFIX=          ${LANG_PKGNAME}-
 .endif
 .if defined(LANG_SUFFIX)
 PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
 .if defined(WITH_GNUGCJ)
-#BUILD_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
-#BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
-#RUN_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
-BROKEN=	"Still work in progress"
+#this wired part must be rewritten
+GCCVER=4.1.1
+BUILD_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
+BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
+RUN_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
 .else
 BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
 .endif
 
 # FIXME (correctly add ccache before gcc and g++)
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
 .if defined(WITH_GNUGCJ)
 CC=	ccache gcc41
 CXX=	ccache g++41
 .else
 CC=	ccache gcc-ooo
 CXX=	ccache g++-ooo
 .endif #WITH_GNUGCJ
 .endif #WITH_CCACHE
 .if !defined(WITH_CCACHE)
 .if defined(WITH_GNUGCJ)
 CC=	gcc41
 CXX=	g++41
 .else
 CC=	gcc-ooo
 CXX=	g++-ooo
 .endif #WITH_GNUGCJ
 .endif #!WITH_CCACHE
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison2:${PORTSDIR}/devel/bison2 \
 		imake:${X_IMAKE_PORT}
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
 .else
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
 .endif
 .if defined(WITH_GNUGCJ)
 ANT_DISTFILE=   apache-ant-${ANT_VERSION}-bin.tar.bz2
 ANT_VERSION=	1.6.5
 .endif
 .if !defined(WITH_GPC)
 LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
 .endif
 
 GNU_CONFIGURE=	yes
 WRKSRC?=		${WRKDIR}/${OOOTAG}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --with-system-freetype --enable-crashdump=yes --enable-symbols=SMALL
 #workarounds
 CONFIGURE_ARGS+=	--with-system-xrender-headers=yes #i62713#
 
 .if (${OSVERSION} <= 492000)
 EXTRA_PATCHES+=	${FILESDIR}/fbsd4-workaroundpatch
 .endif
 .if defined(WITH_GNUGCJ)
 EXTRA_PATCHES+=	${FILESDIR}/gcj-cws_jaxpapi ${FILESDIR}/gcj-patches ${FILESDIR}/gcj-fbsdworkaround
 .endif
 .if defined(WITHOUT_MOZILLA)
 EXTRA_PATCHES+=	${FILESDIR}/moz-patch_i59729 #cws pj50
 .endif
 #.if defined(WITH_TTF_BYTECODE_ENABLED)
 #EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
 #.endif
 
 .include <${FILESDIR}/Makefile.knobs>
 
 pre-everything::
 # really tweak, extremely useful when you build all localized language versions
 # needed after when you build with ALL_LOCALIZED_LANGS.
 .if defined(TWEAK_L10N)
 	@${RM} -f ${WRKDIR}/.PLIST*
 	@${RM} -f ${WRKDIR}/.install_done.*
 	@${RM} -f ${WRKDIR}/.package_done.*
 	@${RM} -f ${WRKDIR}/.extract_done.*
 	@${RM} -f ${WRKDIR}/.patch_done.*
 	@${RM} -f ${WRKDIR}/.configure_done.*
 	@${RM} -f ${WRKDIR}/.build_done.*
 	@${TOUCH} ${EXTRACT_COOKIE}
 	@${TOUCH} ${PATCH_COOKIE}
 	@${TOUCH} ${CONFIGURE_COOKIE}
 	@${TOUCH} ${BUILD_COOKIE}
 .endif
 
 post-extract:
 .if defined(WITH_GNUGCJ)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
-# #iXXXXX# xmerge doesn't support gjdoc
-	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKSRC}/solenv/bin/javadoc
+	@${RM} -Rf ${WRKDIR}/gnugcj
+	@${MKDIR} ${WRKDIR}/gnugcj/bin
+	@${MKDIR} ${WRKDIR}/gnugcj/lib
+	@${LN} -s ${LOCALBASE}/bin/gcj41 ${WRKDIR}/gnugcj/bin/gcj
+	@${LN} -s ${LOCALBASE}/bin/gij41 ${WRKDIR}/gnugcj/bin/gij
+	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKDIR}/gnugcj/bin/javadoc  # #iXXXXX# xmerge doesn't support gjdoc
+	@${LN} -s ${LOCALBASE}/bin/fastjar41 ${WRKDIR}/gnugcj/bin/fastjar
+	@${LN} -s ${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/libgcj.so ${WRKDIR}/gnugcj/lib
 .endif
 .if defined(WITH_GPC)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
 	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/external/gpc/
 	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/external/gpc/
 .endif
 .if !defined(WITHOUT_MOZILLA)
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
 .endif
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 # PR:84786 #i53289#
 .if (${NUMOFPROCESSES}>1)
 	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
 .else
 	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
 .endif
 
 do-install:
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
 	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
 		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
 		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKDIR}/tmp/$$i ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			-e 's#%%PORTVERSION%%#${PORTVERSION}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice.org-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \
 		${PREFIX}/bin/${EXECBASE}
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sbase
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setofficelang
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
 	@${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 	@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${PKGMESSAGE}
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
 .include <${FILESDIR}/Makefile.others>
 .include <bsd.port.post.mk>

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

Property changes on: head/editors/openoffice.org-2-RC/files/Makefile.knobs
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.26
\ No newline at end of property
+1.27
\ No newline at end of property
Index: head/editors/openoffice.org-2-devel/Makefile
===================================================================
--- head/editors/openoffice.org-2-devel/Makefile	(revision 159772)
+++ head/editors/openoffice.org-2-devel/Makefile	(revision 159773)
@@ -1,249 +1,257 @@
 # New ports collection makefile for: OpenOffice.org
 # Date created:		28 February 2002
 # Whom:                 Martin Blapp
 #
 # $FreeBSD$
 #
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	2.0.${SNAPDATE}
 CATEGORIES+=	editors java
 MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680_m${MILESTONE}/&,} \
 		http://openoffice.lunarshells.com/sources/ \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
 DISTFILES+=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
 .if defined(WITH_GNUGCJ)
 DISTFILES+=     ${ANT_DISTFILE}:antbin
 .endif
 EXTRACT_ONLY=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
 
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
 USE_GNOME+=	libidl
 .endif
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=        3
 .endif
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 USE_BZIP2=	yes
 WITHOUT_CPU_CFLAGS=	true
 
 ONLY_FOR_ARCHS=	i386
 
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 JAVA_BUILD=	jdk
 JAVA_VENDOR=	freebsd bsdjava
 .endif
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
 
 .if ${PERL_LEVEL} < 500600
 IGNORE=		install lang/perl5.8 then try again
 .endif
 
 CODELINE=		680
 RELEASE_NR=		2.0
 MILESTONE?=		163
 OOOTAG?=		SRC680_m${MILESTONE}
 SNAPDATE=		20060413
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
 PACKAGE_BASENAME=	OOo_${OOOTAG}_${OPSYS}${SIMPLEOSVER}Intel
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
 .if defined(LANG_PKGNAME)
 PKGNAMEPREFIX=          ${LANG_PKGNAME}-
 .endif
 .if defined(LANG_SUFFIX)
 PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
 .if defined(WITH_GNUGCJ)
-#BUILD_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
-#BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
-#RUN_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
+#this wired part must be rewritten
+GCCVER=4.1.1
+BUILD_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
+BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
+RUN_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
 BROKEN=	"Still work in progress"	
 .else
 BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
 .endif
 
 # FIXME (correctly add ccache before gcc and g++)
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
 .if defined(WITH_GNUGCJ)
 CC=	ccache gcc41
 CXX=	ccache g++41
 .else
 CC=	ccache gcc-ooo
 CXX=	ccache g++-ooo
 .endif #WITH_GNUGCJ
 .endif #WITH_CCACHE
 .if !defined(WITH_CCACHE)
 .if defined(WITH_GNUGCJ)
 CC=	gcc41
 CXX=	g++41
 .else
 CC=	gcc-ooo
 CXX=	g++-ooo
 .endif #WITH_GNUGCJ
 .endif #!WITH_CCACHE
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison2:${PORTSDIR}/devel/bison2 \
 		imake:${X_IMAKE_PORT}
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
 .else
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
 .endif
 .if defined(WITH_GNUGCJ)
 ANT_DISTFILE=   apache-ant-${ANT_VERSION}-bin.tar.bz2
 ANT_VERSION=	1.6.5
 .endif
 .if !defined(WITH_GPC)
 LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
 .endif
 
 GNU_CONFIGURE=	yes
 WRKSRC?=		${WRKDIR}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --enable-crashdump=yes --enable-symbols=SMALL --with-system-freetype 
 #workarounds
 CONFIGURE_ARGS+=	--with-system-xrender-headers=yes #i62713#
 
 .if (${OSVERSION} <= 492000)
 EXTRA_PATCHES+=	${FILESDIR}/fbsd4-workaroundpatch
 .endif
 .if defined(WITH_GNUGCJ)
 EXTRA_PATCHES+=	${FILESDIR}/gcj-patches ${FILESDIR}/cws-maho1.diff ${FILESDIR}/gcj-fbsdworkaround
 .endif
 #.if defined(WITH_TTF_BYTECODE_ENABLED)
 #EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
 #.endif
 
 .include <${FILESDIR}/Makefile.knobs>
 
 pre-everything::
 # really tweak, extremely useful when you build all localized language versions
 # needed after when you build with ALL_LOCALIZED_LANGS.
 .if defined(TWEAK_L10N)
 	@${RM} -f ${WRKDIR}/.PLIST*
 	@${RM} -f ${WRKDIR}/.install_done.*
 	@${RM} -f ${WRKDIR}/.package_done.*
 	@${RM} -f ${WRKDIR}/.extract_done.*
 	@${RM} -f ${WRKDIR}/.patch_done.*
 	@${RM} -f ${WRKDIR}/.configure_done.*
 	@${RM} -f ${WRKDIR}/.build_done.*
 	@${TOUCH} ${EXTRACT_COOKIE}
 	@${TOUCH} ${PATCH_COOKIE}
 	@${TOUCH} ${CONFIGURE_COOKIE}
 	@${TOUCH} ${BUILD_COOKIE}
 .endif
 
 post-extract:
 .if defined(WITH_GNUGCJ)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
-# #iXXXXX# xmerge doesn't support gjdoc
-	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKSRC}/solenv/bin/javadoc
+	@${RM} -Rf ${WRKDIR}/gnugcj
+	@${MKDIR} ${WRKDIR}/gnugcj/bin
+	@${MKDIR} ${WRKDIR}/gnugcj/lib
+	@${LN} -s ${LOCALBASE}/bin/gcj41 ${WRKDIR}/gnugcj/bin/gcj
+	@${LN} -s ${LOCALBASE}/bin/gij41 ${WRKDIR}/gnugcj/bin/gij
+	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKDIR}/gnugcj/bin/javadoc  # #iXXXXX# xmerge doesn't support gjdoc
+	@${LN} -s ${LOCALBASE}/bin/fastjar41 ${WRKDIR}/gnugcj/bin/fastjar
+	@${LN} -s ${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/libgcj.so ${WRKDIR}/gnugcj/lib
 .endif
 .if defined(WITH_GPC)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
 	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/external/gpc/
 	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/external/gpc/
 .endif
 .if !defined(WITHOUT_MOZILLA)
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
 .endif
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 # PR:84786 #i53289#
 .if (${NUMOFPROCESSES}>1)
 	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
 .else
 	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
 .endif
 
 do-install:
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
 	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
 		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
 		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKDIR}/tmp/$$i ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			-e 's#%%OOOTAG%%#${OOOTAG}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice.org-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \
 		${PREFIX}/bin/${EXECBASE}
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sbase
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setofficelang
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
 	@${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 	@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
 			-e 's#%%OOOTAG%%#${OOOTAG}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${PKGMESSAGE}
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
 .include <${FILESDIR}/Makefile.others>
 .include <bsd.port.post.mk>

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

Property changes on: head/editors/openoffice.org-2-devel/files/Makefile.knobs
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.25
\ No newline at end of property
+1.26
\ No newline at end of property
Index: head/editors/openoffice.org-2.0/Makefile
===================================================================
--- head/editors/openoffice.org-2.0/Makefile	(revision 159772)
+++ head/editors/openoffice.org-2.0/Makefile	(revision 159773)
@@ -1,248 +1,255 @@
 # New ports collection makefile for: OpenOffice.org
 # Date created:		28 February 2002
 # Whom:                 Martin Blapp
 #
 # $FreeBSD$
 #
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	2.0.2
 CATEGORIES+=	editors java
 MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/${PORTVERSION}/&,} \
 		http://openoffice.lunarshells.com/sources/ \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
 DISTFILES+=	OOo_${PORTVERSION}_src.tar.gz
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
 .if defined(WITH_GNUGCJ)
 DISTFILES+=     ${ANT_DISTFILE}:antbin
 .endif
 EXTRACT_ONLY=	OOo_${PORTVERSION}_src.tar.gz
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
 
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
 USE_GNOME+=	libidl
 .endif
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=        3
 .endif
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 WITHOUT_CPU_CFLAGS=	true
 
 ONLY_FOR_ARCHS=	i386
 
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 JAVA_BUILD=	jdk
 JAVA_VENDOR=	freebsd bsdjava
 .endif
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
 
 .if ${PERL_LEVEL} < 500600
 IGNORE=		install lang/perl5.8 then try again
 .endif
 
 CODELINE=		680
 RELEASE_NR=		2.0
 OOOTAG?=		OOB680_m5
 INSTALLATION_BASEDIR?=	openoffice.org-${PORTVERSION}
 EXECBASE?=		openoffice.org-${PORTVERSION}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
 PACKAGE_BASENAME=	OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
 .if defined(LANG_PKGNAME)
 PKGNAMEPREFIX=          ${LANG_PKGNAME}-
 .endif
 .if defined(LANG_SUFFIX)
 PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
 .if defined(WITH_GNUGCJ)
-#BUILD_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
-#BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
-#RUN_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
-BROKEN=	"Still work in progress"
+#this wired part must be rewritten
+GCCVER=4.1.1
+BUILD_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
+BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
+RUN_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
 .else
 BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
 .endif
 
 # FIXME (correctly add ccache before gcc and g++)
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
 .if defined(WITH_GNUGCJ)
 CC=	ccache gcc41
 CXX=	ccache g++41
 .else
 CC=	ccache gcc-ooo
 CXX=	ccache g++-ooo
 .endif #WITH_GNUGCJ
 .endif #WITH_CCACHE
 .if !defined(WITH_CCACHE)
 .if defined(WITH_GNUGCJ)
 CC=	gcc41
 CXX=	g++41
 .else
 CC=	gcc-ooo
 CXX=	g++-ooo
 .endif #WITH_GNUGCJ
 .endif #!WITH_CCACHE
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison2:${PORTSDIR}/devel/bison2 \
 		imake:${X_IMAKE_PORT}
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
 .else
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
 .endif
 .if defined(WITH_GNUGCJ)
 ANT_DISTFILE=   apache-ant-${ANT_VERSION}-bin.tar.bz2
 ANT_VERSION=	1.6.5
 .endif
 .if !defined(WITH_GPC)
 LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
 .endif
 
 GNU_CONFIGURE=	yes
 WRKSRC?=		${WRKDIR}/${OOOTAG}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --with-system-freetype --enable-crashdump=yes --enable-symbols=SMALL
 #workarounds
 CONFIGURE_ARGS+=	--with-system-xrender-headers=yes #i62713#
 
 .if (${OSVERSION} <= 492000)
 EXTRA_PATCHES+=	${FILESDIR}/fbsd4-workaroundpatch
 .endif
 .if defined(WITH_GNUGCJ)
 EXTRA_PATCHES+=	${FILESDIR}/gcj-cws_jaxpapi ${FILESDIR}/gcj-patches ${FILESDIR}/gcj-fbsdworkaround
 .endif
 .if defined(WITHOUT_MOZILLA)
 EXTRA_PATCHES+=	${FILESDIR}/moz-patch_i59729 #cws pj50
 .endif
 #.if defined(WITH_TTF_BYTECODE_ENABLED)
 #EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
 #.endif
 
 .include <${FILESDIR}/Makefile.knobs>
 
 pre-everything::
 # really tweak, extremely useful when you build all localized language versions
 # needed after when you build with ALL_LOCALIZED_LANGS.
 .if defined(TWEAK_L10N)
 	@${RM} -f ${WRKDIR}/.PLIST*
 	@${RM} -f ${WRKDIR}/.install_done.*
 	@${RM} -f ${WRKDIR}/.package_done.*
 	@${RM} -f ${WRKDIR}/.extract_done.*
 	@${RM} -f ${WRKDIR}/.patch_done.*
 	@${RM} -f ${WRKDIR}/.configure_done.*
 	@${RM} -f ${WRKDIR}/.build_done.*
 	@${TOUCH} ${EXTRACT_COOKIE}
 	@${TOUCH} ${PATCH_COOKIE}
 	@${TOUCH} ${CONFIGURE_COOKIE}
 	@${TOUCH} ${BUILD_COOKIE}
 .endif
 
 post-extract:
 .if defined(WITH_GNUGCJ)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
-# #iXXXXX# xmerge doesn't support gjdoc
-	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKSRC}/solenv/bin/javadoc
+	@${RM} -Rf ${WRKDIR}/gnugcj
+	@${MKDIR} ${WRKDIR}/gnugcj/bin
+	@${MKDIR} ${WRKDIR}/gnugcj/lib
+	@${LN} -s ${LOCALBASE}/bin/gcj41 ${WRKDIR}/gnugcj/bin/gcj
+	@${LN} -s ${LOCALBASE}/bin/gij41 ${WRKDIR}/gnugcj/bin/gij
+	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKDIR}/gnugcj/bin/javadoc  # #iXXXXX# xmerge doesn't support gjdoc
+	@${LN} -s ${LOCALBASE}/bin/fastjar41 ${WRKDIR}/gnugcj/bin/fastjar
+	@${LN} -s ${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/libgcj.so ${WRKDIR}/gnugcj/lib
 .endif
 .if defined(WITH_GPC)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
 	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/external/gpc/
 	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/external/gpc/
 .endif
 .if !defined(WITHOUT_MOZILLA)
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
 .endif
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 # PR:84786 #i53289#
 .if (${NUMOFPROCESSES}>1)
 	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
 .else
 	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
 .endif
 
 do-install:
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
 	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
 		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
 		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKDIR}/tmp/$$i ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			-e 's#%%PORTVERSION%%#${PORTVERSION}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice.org-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \
 		${PREFIX}/bin/${EXECBASE}
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sbase
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setofficelang
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
 	@${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 	@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${PKGMESSAGE}
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
 .include <${FILESDIR}/Makefile.others>
 .include <bsd.port.post.mk>

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

Property changes on: head/editors/openoffice.org-2.0/files/Makefile.knobs
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.26
\ No newline at end of property
+1.27
\ No newline at end of property
Index: head/editors/openoffice.org-2.0-devel/Makefile
===================================================================
--- head/editors/openoffice.org-2.0-devel/Makefile	(revision 159772)
+++ head/editors/openoffice.org-2.0-devel/Makefile	(revision 159773)
@@ -1,249 +1,257 @@
 # New ports collection makefile for: OpenOffice.org
 # Date created:		28 February 2002
 # Whom:                 Martin Blapp
 #
 # $FreeBSD$
 #
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	2.0.${SNAPDATE}
 CATEGORIES+=	editors java
 MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680_m${MILESTONE}/&,} \
 		http://openoffice.lunarshells.com/sources/ \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
 DISTFILES+=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
 .if defined(WITH_GNUGCJ)
 DISTFILES+=     ${ANT_DISTFILE}:antbin
 .endif
 EXTRACT_ONLY=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
 
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
 USE_GNOME+=	libidl
 .endif
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=        3
 .endif
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 USE_BZIP2=	yes
 WITHOUT_CPU_CFLAGS=	true
 
 ONLY_FOR_ARCHS=	i386
 
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 JAVA_BUILD=	jdk
 JAVA_VENDOR=	freebsd bsdjava
 .endif
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
 
 .if ${PERL_LEVEL} < 500600
 IGNORE=		install lang/perl5.8 then try again
 .endif
 
 CODELINE=		680
 RELEASE_NR=		2.0
 MILESTONE?=		163
 OOOTAG?=		SRC680_m${MILESTONE}
 SNAPDATE=		20060413
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
 PACKAGE_BASENAME=	OOo_${OOOTAG}_${OPSYS}${SIMPLEOSVER}Intel
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
 .if defined(LANG_PKGNAME)
 PKGNAMEPREFIX=          ${LANG_PKGNAME}-
 .endif
 .if defined(LANG_SUFFIX)
 PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
 .if defined(WITH_GNUGCJ)
-#BUILD_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
-#BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
-#RUN_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
+#this wired part must be rewritten
+GCCVER=4.1.1
+BUILD_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
+BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
+RUN_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
 BROKEN=	"Still work in progress"	
 .else
 BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
 .endif
 
 # FIXME (correctly add ccache before gcc and g++)
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
 .if defined(WITH_GNUGCJ)
 CC=	ccache gcc41
 CXX=	ccache g++41
 .else
 CC=	ccache gcc-ooo
 CXX=	ccache g++-ooo
 .endif #WITH_GNUGCJ
 .endif #WITH_CCACHE
 .if !defined(WITH_CCACHE)
 .if defined(WITH_GNUGCJ)
 CC=	gcc41
 CXX=	g++41
 .else
 CC=	gcc-ooo
 CXX=	g++-ooo
 .endif #WITH_GNUGCJ
 .endif #!WITH_CCACHE
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison2:${PORTSDIR}/devel/bison2 \
 		imake:${X_IMAKE_PORT}
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
 .else
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
 .endif
 .if defined(WITH_GNUGCJ)
 ANT_DISTFILE=   apache-ant-${ANT_VERSION}-bin.tar.bz2
 ANT_VERSION=	1.6.5
 .endif
 .if !defined(WITH_GPC)
 LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
 .endif
 
 GNU_CONFIGURE=	yes
 WRKSRC?=		${WRKDIR}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --enable-crashdump=yes --enable-symbols=SMALL --with-system-freetype 
 #workarounds
 CONFIGURE_ARGS+=	--with-system-xrender-headers=yes #i62713#
 
 .if (${OSVERSION} <= 492000)
 EXTRA_PATCHES+=	${FILESDIR}/fbsd4-workaroundpatch
 .endif
 .if defined(WITH_GNUGCJ)
 EXTRA_PATCHES+=	${FILESDIR}/gcj-patches ${FILESDIR}/cws-maho1.diff ${FILESDIR}/gcj-fbsdworkaround
 .endif
 #.if defined(WITH_TTF_BYTECODE_ENABLED)
 #EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
 #.endif
 
 .include <${FILESDIR}/Makefile.knobs>
 
 pre-everything::
 # really tweak, extremely useful when you build all localized language versions
 # needed after when you build with ALL_LOCALIZED_LANGS.
 .if defined(TWEAK_L10N)
 	@${RM} -f ${WRKDIR}/.PLIST*
 	@${RM} -f ${WRKDIR}/.install_done.*
 	@${RM} -f ${WRKDIR}/.package_done.*
 	@${RM} -f ${WRKDIR}/.extract_done.*
 	@${RM} -f ${WRKDIR}/.patch_done.*
 	@${RM} -f ${WRKDIR}/.configure_done.*
 	@${RM} -f ${WRKDIR}/.build_done.*
 	@${TOUCH} ${EXTRACT_COOKIE}
 	@${TOUCH} ${PATCH_COOKIE}
 	@${TOUCH} ${CONFIGURE_COOKIE}
 	@${TOUCH} ${BUILD_COOKIE}
 .endif
 
 post-extract:
 .if defined(WITH_GNUGCJ)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
-# #iXXXXX# xmerge doesn't support gjdoc
-	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKSRC}/solenv/bin/javadoc
+	@${RM} -Rf ${WRKDIR}/gnugcj
+	@${MKDIR} ${WRKDIR}/gnugcj/bin
+	@${MKDIR} ${WRKDIR}/gnugcj/lib
+	@${LN} -s ${LOCALBASE}/bin/gcj41 ${WRKDIR}/gnugcj/bin/gcj
+	@${LN} -s ${LOCALBASE}/bin/gij41 ${WRKDIR}/gnugcj/bin/gij
+	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKDIR}/gnugcj/bin/javadoc  # #iXXXXX# xmerge doesn't support gjdoc
+	@${LN} -s ${LOCALBASE}/bin/fastjar41 ${WRKDIR}/gnugcj/bin/fastjar
+	@${LN} -s ${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/libgcj.so ${WRKDIR}/gnugcj/lib
 .endif
 .if defined(WITH_GPC)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
 	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/external/gpc/
 	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/external/gpc/
 .endif
 .if !defined(WITHOUT_MOZILLA)
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
 .endif
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 # PR:84786 #i53289#
 .if (${NUMOFPROCESSES}>1)
 	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
 .else
 	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
 .endif
 
 do-install:
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
 	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
 		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
 		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKDIR}/tmp/$$i ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			-e 's#%%OOOTAG%%#${OOOTAG}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice.org-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \
 		${PREFIX}/bin/${EXECBASE}
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sbase
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setofficelang
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
 	@${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 	@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
 			-e 's#%%OOOTAG%%#${OOOTAG}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${PKGMESSAGE}
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
 .include <${FILESDIR}/Makefile.others>
 .include <bsd.port.post.mk>

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

Property changes on: head/editors/openoffice.org-2.0-devel/files/Makefile.knobs
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.25
\ No newline at end of property
+1.26
\ No newline at end of property
Index: head/editors/openoffice.org-3/Makefile
===================================================================
--- head/editors/openoffice.org-3/Makefile	(revision 159772)
+++ head/editors/openoffice.org-3/Makefile	(revision 159773)
@@ -1,248 +1,255 @@
 # New ports collection makefile for: OpenOffice.org
 # Date created:		28 February 2002
 # Whom:                 Martin Blapp
 #
 # $FreeBSD$
 #
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	2.0.2
 CATEGORIES+=	editors java
 MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/${PORTVERSION}/&,} \
 		http://openoffice.lunarshells.com/sources/ \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
 DISTFILES+=	OOo_${PORTVERSION}_src.tar.gz
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
 .if defined(WITH_GNUGCJ)
 DISTFILES+=     ${ANT_DISTFILE}:antbin
 .endif
 EXTRACT_ONLY=	OOo_${PORTVERSION}_src.tar.gz
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
 
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
 USE_GNOME+=	libidl
 .endif
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=        3
 .endif
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 WITHOUT_CPU_CFLAGS=	true
 
 ONLY_FOR_ARCHS=	i386
 
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 JAVA_BUILD=	jdk
 JAVA_VENDOR=	freebsd bsdjava
 .endif
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
 
 .if ${PERL_LEVEL} < 500600
 IGNORE=		install lang/perl5.8 then try again
 .endif
 
 CODELINE=		680
 RELEASE_NR=		2.0
 OOOTAG?=		OOB680_m5
 INSTALLATION_BASEDIR?=	openoffice.org-${PORTVERSION}
 EXECBASE?=		openoffice.org-${PORTVERSION}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
 PACKAGE_BASENAME=	OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
 .if defined(LANG_PKGNAME)
 PKGNAMEPREFIX=          ${LANG_PKGNAME}-
 .endif
 .if defined(LANG_SUFFIX)
 PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
 .if defined(WITH_GNUGCJ)
-#BUILD_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
-#BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
-#RUN_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
-BROKEN=	"Still work in progress"
+#this wired part must be rewritten
+GCCVER=4.1.1
+BUILD_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
+BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
+RUN_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
 .else
 BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
 .endif
 
 # FIXME (correctly add ccache before gcc and g++)
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
 .if defined(WITH_GNUGCJ)
 CC=	ccache gcc41
 CXX=	ccache g++41
 .else
 CC=	ccache gcc-ooo
 CXX=	ccache g++-ooo
 .endif #WITH_GNUGCJ
 .endif #WITH_CCACHE
 .if !defined(WITH_CCACHE)
 .if defined(WITH_GNUGCJ)
 CC=	gcc41
 CXX=	g++41
 .else
 CC=	gcc-ooo
 CXX=	g++-ooo
 .endif #WITH_GNUGCJ
 .endif #!WITH_CCACHE
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison2:${PORTSDIR}/devel/bison2 \
 		imake:${X_IMAKE_PORT}
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
 .else
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
 .endif
 .if defined(WITH_GNUGCJ)
 ANT_DISTFILE=   apache-ant-${ANT_VERSION}-bin.tar.bz2
 ANT_VERSION=	1.6.5
 .endif
 .if !defined(WITH_GPC)
 LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
 .endif
 
 GNU_CONFIGURE=	yes
 WRKSRC?=		${WRKDIR}/${OOOTAG}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --with-system-freetype --enable-crashdump=yes --enable-symbols=SMALL
 #workarounds
 CONFIGURE_ARGS+=	--with-system-xrender-headers=yes #i62713#
 
 .if (${OSVERSION} <= 492000)
 EXTRA_PATCHES+=	${FILESDIR}/fbsd4-workaroundpatch
 .endif
 .if defined(WITH_GNUGCJ)
 EXTRA_PATCHES+=	${FILESDIR}/gcj-cws_jaxpapi ${FILESDIR}/gcj-patches ${FILESDIR}/gcj-fbsdworkaround
 .endif
 .if defined(WITHOUT_MOZILLA)
 EXTRA_PATCHES+=	${FILESDIR}/moz-patch_i59729 #cws pj50
 .endif
 #.if defined(WITH_TTF_BYTECODE_ENABLED)
 #EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
 #.endif
 
 .include <${FILESDIR}/Makefile.knobs>
 
 pre-everything::
 # really tweak, extremely useful when you build all localized language versions
 # needed after when you build with ALL_LOCALIZED_LANGS.
 .if defined(TWEAK_L10N)
 	@${RM} -f ${WRKDIR}/.PLIST*
 	@${RM} -f ${WRKDIR}/.install_done.*
 	@${RM} -f ${WRKDIR}/.package_done.*
 	@${RM} -f ${WRKDIR}/.extract_done.*
 	@${RM} -f ${WRKDIR}/.patch_done.*
 	@${RM} -f ${WRKDIR}/.configure_done.*
 	@${RM} -f ${WRKDIR}/.build_done.*
 	@${TOUCH} ${EXTRACT_COOKIE}
 	@${TOUCH} ${PATCH_COOKIE}
 	@${TOUCH} ${CONFIGURE_COOKIE}
 	@${TOUCH} ${BUILD_COOKIE}
 .endif
 
 post-extract:
 .if defined(WITH_GNUGCJ)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
-# #iXXXXX# xmerge doesn't support gjdoc
-	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKSRC}/solenv/bin/javadoc
+	@${RM} -Rf ${WRKDIR}/gnugcj
+	@${MKDIR} ${WRKDIR}/gnugcj/bin
+	@${MKDIR} ${WRKDIR}/gnugcj/lib
+	@${LN} -s ${LOCALBASE}/bin/gcj41 ${WRKDIR}/gnugcj/bin/gcj
+	@${LN} -s ${LOCALBASE}/bin/gij41 ${WRKDIR}/gnugcj/bin/gij
+	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKDIR}/gnugcj/bin/javadoc  # #iXXXXX# xmerge doesn't support gjdoc
+	@${LN} -s ${LOCALBASE}/bin/fastjar41 ${WRKDIR}/gnugcj/bin/fastjar
+	@${LN} -s ${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/libgcj.so ${WRKDIR}/gnugcj/lib
 .endif
 .if defined(WITH_GPC)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
 	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/external/gpc/
 	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/external/gpc/
 .endif
 .if !defined(WITHOUT_MOZILLA)
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
 .endif
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 # PR:84786 #i53289#
 .if (${NUMOFPROCESSES}>1)
 	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
 .else
 	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
 .endif
 
 do-install:
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
 	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
 		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
 		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKDIR}/tmp/$$i ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			-e 's#%%PORTVERSION%%#${PORTVERSION}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice.org-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \
 		${PREFIX}/bin/${EXECBASE}
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sbase
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setofficelang
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
 	@${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 	@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${PKGMESSAGE}
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
 .include <${FILESDIR}/Makefile.others>
 .include <bsd.port.post.mk>

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

Property changes on: head/editors/openoffice.org-3/files/Makefile.knobs
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.26
\ No newline at end of property
+1.27
\ No newline at end of property
Index: head/editors/openoffice.org-3-RC/Makefile
===================================================================
--- head/editors/openoffice.org-3-RC/Makefile	(revision 159772)
+++ head/editors/openoffice.org-3-RC/Makefile	(revision 159773)
@@ -1,248 +1,255 @@
 # New ports collection makefile for: OpenOffice.org
 # Date created:		28 February 2002
 # Whom:                 Martin Blapp
 #
 # $FreeBSD$
 #
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	2.0.2
 CATEGORIES+=	editors java
 MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/${PORTVERSION}/&,} \
 		http://openoffice.lunarshells.com/sources/ \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
 DISTFILES+=	OOo_${PORTVERSION}_src.tar.gz
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
 .if defined(WITH_GNUGCJ)
 DISTFILES+=     ${ANT_DISTFILE}:antbin
 .endif
 EXTRACT_ONLY=	OOo_${PORTVERSION}_src.tar.gz
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
 
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
 USE_GNOME+=	libidl
 .endif
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=        3
 .endif
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 WITHOUT_CPU_CFLAGS=	true
 
 ONLY_FOR_ARCHS=	i386
 
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 JAVA_BUILD=	jdk
 JAVA_VENDOR=	freebsd bsdjava
 .endif
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
 
 .if ${PERL_LEVEL} < 500600
 IGNORE=		install lang/perl5.8 then try again
 .endif
 
 CODELINE=		680
 RELEASE_NR=		2.0
 OOOTAG?=		OOB680_m5
 INSTALLATION_BASEDIR?=	openoffice.org-${PORTVERSION}
 EXECBASE?=		openoffice.org-${PORTVERSION}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
 PACKAGE_BASENAME=	OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
 .if defined(LANG_PKGNAME)
 PKGNAMEPREFIX=          ${LANG_PKGNAME}-
 .endif
 .if defined(LANG_SUFFIX)
 PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
 .if defined(WITH_GNUGCJ)
-#BUILD_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
-#BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
-#RUN_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
-BROKEN=	"Still work in progress"
+#this wired part must be rewritten
+GCCVER=4.1.1
+BUILD_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
+BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
+RUN_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
 .else
 BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
 .endif
 
 # FIXME (correctly add ccache before gcc and g++)
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
 .if defined(WITH_GNUGCJ)
 CC=	ccache gcc41
 CXX=	ccache g++41
 .else
 CC=	ccache gcc-ooo
 CXX=	ccache g++-ooo
 .endif #WITH_GNUGCJ
 .endif #WITH_CCACHE
 .if !defined(WITH_CCACHE)
 .if defined(WITH_GNUGCJ)
 CC=	gcc41
 CXX=	g++41
 .else
 CC=	gcc-ooo
 CXX=	g++-ooo
 .endif #WITH_GNUGCJ
 .endif #!WITH_CCACHE
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison2:${PORTSDIR}/devel/bison2 \
 		imake:${X_IMAKE_PORT}
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
 .else
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
 .endif
 .if defined(WITH_GNUGCJ)
 ANT_DISTFILE=   apache-ant-${ANT_VERSION}-bin.tar.bz2
 ANT_VERSION=	1.6.5
 .endif
 .if !defined(WITH_GPC)
 LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
 .endif
 
 GNU_CONFIGURE=	yes
 WRKSRC?=		${WRKDIR}/${OOOTAG}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --with-system-freetype --enable-crashdump=yes --enable-symbols=SMALL
 #workarounds
 CONFIGURE_ARGS+=	--with-system-xrender-headers=yes #i62713#
 
 .if (${OSVERSION} <= 492000)
 EXTRA_PATCHES+=	${FILESDIR}/fbsd4-workaroundpatch
 .endif
 .if defined(WITH_GNUGCJ)
 EXTRA_PATCHES+=	${FILESDIR}/gcj-cws_jaxpapi ${FILESDIR}/gcj-patches ${FILESDIR}/gcj-fbsdworkaround
 .endif
 .if defined(WITHOUT_MOZILLA)
 EXTRA_PATCHES+=	${FILESDIR}/moz-patch_i59729 #cws pj50
 .endif
 #.if defined(WITH_TTF_BYTECODE_ENABLED)
 #EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
 #.endif
 
 .include <${FILESDIR}/Makefile.knobs>
 
 pre-everything::
 # really tweak, extremely useful when you build all localized language versions
 # needed after when you build with ALL_LOCALIZED_LANGS.
 .if defined(TWEAK_L10N)
 	@${RM} -f ${WRKDIR}/.PLIST*
 	@${RM} -f ${WRKDIR}/.install_done.*
 	@${RM} -f ${WRKDIR}/.package_done.*
 	@${RM} -f ${WRKDIR}/.extract_done.*
 	@${RM} -f ${WRKDIR}/.patch_done.*
 	@${RM} -f ${WRKDIR}/.configure_done.*
 	@${RM} -f ${WRKDIR}/.build_done.*
 	@${TOUCH} ${EXTRACT_COOKIE}
 	@${TOUCH} ${PATCH_COOKIE}
 	@${TOUCH} ${CONFIGURE_COOKIE}
 	@${TOUCH} ${BUILD_COOKIE}
 .endif
 
 post-extract:
 .if defined(WITH_GNUGCJ)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
-# #iXXXXX# xmerge doesn't support gjdoc
-	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKSRC}/solenv/bin/javadoc
+	@${RM} -Rf ${WRKDIR}/gnugcj
+	@${MKDIR} ${WRKDIR}/gnugcj/bin
+	@${MKDIR} ${WRKDIR}/gnugcj/lib
+	@${LN} -s ${LOCALBASE}/bin/gcj41 ${WRKDIR}/gnugcj/bin/gcj
+	@${LN} -s ${LOCALBASE}/bin/gij41 ${WRKDIR}/gnugcj/bin/gij
+	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKDIR}/gnugcj/bin/javadoc  # #iXXXXX# xmerge doesn't support gjdoc
+	@${LN} -s ${LOCALBASE}/bin/fastjar41 ${WRKDIR}/gnugcj/bin/fastjar
+	@${LN} -s ${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/libgcj.so ${WRKDIR}/gnugcj/lib
 .endif
 .if defined(WITH_GPC)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
 	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/external/gpc/
 	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/external/gpc/
 .endif
 .if !defined(WITHOUT_MOZILLA)
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
 .endif
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 # PR:84786 #i53289#
 .if (${NUMOFPROCESSES}>1)
 	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
 .else
 	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
 .endif
 
 do-install:
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
 	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
 		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
 		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKDIR}/tmp/$$i ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			-e 's#%%PORTVERSION%%#${PORTVERSION}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice.org-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \
 		${PREFIX}/bin/${EXECBASE}
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sbase
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setofficelang
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
 	@${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 	@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${PKGMESSAGE}
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
 .include <${FILESDIR}/Makefile.others>
 .include <bsd.port.post.mk>

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

Property changes on: head/editors/openoffice.org-3-RC/files/Makefile.knobs
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.26
\ No newline at end of property
+1.27
\ No newline at end of property
Index: head/editors/openoffice.org-3-devel/Makefile
===================================================================
--- head/editors/openoffice.org-3-devel/Makefile	(revision 159772)
+++ head/editors/openoffice.org-3-devel/Makefile	(revision 159773)
@@ -1,249 +1,257 @@
 # New ports collection makefile for: OpenOffice.org
 # Date created:		28 February 2002
 # Whom:                 Martin Blapp
 #
 # $FreeBSD$
 #
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	2.0.${SNAPDATE}
 CATEGORIES+=	editors java
 MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680_m${MILESTONE}/&,} \
 		http://openoffice.lunarshells.com/sources/ \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
 DISTFILES+=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
 .if defined(WITH_GNUGCJ)
 DISTFILES+=     ${ANT_DISTFILE}:antbin
 .endif
 EXTRACT_ONLY=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
 
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
 USE_GNOME+=	libidl
 .endif
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=        3
 .endif
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 USE_BZIP2=	yes
 WITHOUT_CPU_CFLAGS=	true
 
 ONLY_FOR_ARCHS=	i386
 
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 JAVA_BUILD=	jdk
 JAVA_VENDOR=	freebsd bsdjava
 .endif
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
 
 .if ${PERL_LEVEL} < 500600
 IGNORE=		install lang/perl5.8 then try again
 .endif
 
 CODELINE=		680
 RELEASE_NR=		2.0
 MILESTONE?=		163
 OOOTAG?=		SRC680_m${MILESTONE}
 SNAPDATE=		20060413
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
 PACKAGE_BASENAME=	OOo_${OOOTAG}_${OPSYS}${SIMPLEOSVER}Intel
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
 .if defined(LANG_PKGNAME)
 PKGNAMEPREFIX=          ${LANG_PKGNAME}-
 .endif
 .if defined(LANG_SUFFIX)
 PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
 .if defined(WITH_GNUGCJ)
-#BUILD_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
-#BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
-#RUN_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
+#this wired part must be rewritten
+GCCVER=4.1.1
+BUILD_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
+BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
+RUN_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
 BROKEN=	"Still work in progress"	
 .else
 BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
 .endif
 
 # FIXME (correctly add ccache before gcc and g++)
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
 .if defined(WITH_GNUGCJ)
 CC=	ccache gcc41
 CXX=	ccache g++41
 .else
 CC=	ccache gcc-ooo
 CXX=	ccache g++-ooo
 .endif #WITH_GNUGCJ
 .endif #WITH_CCACHE
 .if !defined(WITH_CCACHE)
 .if defined(WITH_GNUGCJ)
 CC=	gcc41
 CXX=	g++41
 .else
 CC=	gcc-ooo
 CXX=	g++-ooo
 .endif #WITH_GNUGCJ
 .endif #!WITH_CCACHE
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison2:${PORTSDIR}/devel/bison2 \
 		imake:${X_IMAKE_PORT}
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
 .else
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
 .endif
 .if defined(WITH_GNUGCJ)
 ANT_DISTFILE=   apache-ant-${ANT_VERSION}-bin.tar.bz2
 ANT_VERSION=	1.6.5
 .endif
 .if !defined(WITH_GPC)
 LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
 .endif
 
 GNU_CONFIGURE=	yes
 WRKSRC?=		${WRKDIR}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --enable-crashdump=yes --enable-symbols=SMALL --with-system-freetype 
 #workarounds
 CONFIGURE_ARGS+=	--with-system-xrender-headers=yes #i62713#
 
 .if (${OSVERSION} <= 492000)
 EXTRA_PATCHES+=	${FILESDIR}/fbsd4-workaroundpatch
 .endif
 .if defined(WITH_GNUGCJ)
 EXTRA_PATCHES+=	${FILESDIR}/gcj-patches ${FILESDIR}/cws-maho1.diff ${FILESDIR}/gcj-fbsdworkaround
 .endif
 #.if defined(WITH_TTF_BYTECODE_ENABLED)
 #EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
 #.endif
 
 .include <${FILESDIR}/Makefile.knobs>
 
 pre-everything::
 # really tweak, extremely useful when you build all localized language versions
 # needed after when you build with ALL_LOCALIZED_LANGS.
 .if defined(TWEAK_L10N)
 	@${RM} -f ${WRKDIR}/.PLIST*
 	@${RM} -f ${WRKDIR}/.install_done.*
 	@${RM} -f ${WRKDIR}/.package_done.*
 	@${RM} -f ${WRKDIR}/.extract_done.*
 	@${RM} -f ${WRKDIR}/.patch_done.*
 	@${RM} -f ${WRKDIR}/.configure_done.*
 	@${RM} -f ${WRKDIR}/.build_done.*
 	@${TOUCH} ${EXTRACT_COOKIE}
 	@${TOUCH} ${PATCH_COOKIE}
 	@${TOUCH} ${CONFIGURE_COOKIE}
 	@${TOUCH} ${BUILD_COOKIE}
 .endif
 
 post-extract:
 .if defined(WITH_GNUGCJ)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
-# #iXXXXX# xmerge doesn't support gjdoc
-	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKSRC}/solenv/bin/javadoc
+	@${RM} -Rf ${WRKDIR}/gnugcj
+	@${MKDIR} ${WRKDIR}/gnugcj/bin
+	@${MKDIR} ${WRKDIR}/gnugcj/lib
+	@${LN} -s ${LOCALBASE}/bin/gcj41 ${WRKDIR}/gnugcj/bin/gcj
+	@${LN} -s ${LOCALBASE}/bin/gij41 ${WRKDIR}/gnugcj/bin/gij
+	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKDIR}/gnugcj/bin/javadoc  # #iXXXXX# xmerge doesn't support gjdoc
+	@${LN} -s ${LOCALBASE}/bin/fastjar41 ${WRKDIR}/gnugcj/bin/fastjar
+	@${LN} -s ${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/libgcj.so ${WRKDIR}/gnugcj/lib
 .endif
 .if defined(WITH_GPC)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
 	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/external/gpc/
 	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/external/gpc/
 .endif
 .if !defined(WITHOUT_MOZILLA)
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
 .endif
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 # PR:84786 #i53289#
 .if (${NUMOFPROCESSES}>1)
 	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
 .else
 	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
 .endif
 
 do-install:
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
 	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
 		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
 		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKDIR}/tmp/$$i ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			-e 's#%%OOOTAG%%#${OOOTAG}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice.org-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \
 		${PREFIX}/bin/${EXECBASE}
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sbase
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setofficelang
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
 	@${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 	@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
 			-e 's#%%OOOTAG%%#${OOOTAG}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${PKGMESSAGE}
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
 .include <${FILESDIR}/Makefile.others>
 .include <bsd.port.post.mk>

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

Property changes on: head/editors/openoffice.org-3-devel/files/Makefile.knobs
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.25
\ No newline at end of property
+1.26
\ No newline at end of property
Index: head/editors/openoffice.org-vcltesttool/Makefile
===================================================================
--- head/editors/openoffice.org-vcltesttool/Makefile	(revision 159772)
+++ head/editors/openoffice.org-vcltesttool/Makefile	(revision 159773)
@@ -1,249 +1,257 @@
 # New ports collection makefile for: OpenOffice.org
 # Date created:		28 February 2002
 # Whom:                 Martin Blapp
 #
 # $FreeBSD$
 #
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	2.0.${SNAPDATE}
 CATEGORIES+=	editors java
 MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680_m${MILESTONE}/&,} \
 		http://openoffice.lunarshells.com/sources/ \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
 DISTFILES+=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
 .if defined(WITH_GNUGCJ)
 DISTFILES+=     ${ANT_DISTFILE}:antbin
 .endif
 EXTRACT_ONLY=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
 
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
 USE_GNOME+=	libidl
 .endif
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=        3
 .endif
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 USE_BZIP2=	yes
 WITHOUT_CPU_CFLAGS=	true
 
 ONLY_FOR_ARCHS=	i386
 
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 JAVA_BUILD=	jdk
 JAVA_VENDOR=	freebsd bsdjava
 .endif
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
 
 .if ${PERL_LEVEL} < 500600
 IGNORE=		install lang/perl5.8 then try again
 .endif
 
 CODELINE=		680
 RELEASE_NR=		2.0
 MILESTONE?=		163
 OOOTAG?=		SRC680_m${MILESTONE}
 SNAPDATE=		20060413
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
 PACKAGE_BASENAME=	OOo_${OOOTAG}_${OPSYS}${SIMPLEOSVER}Intel
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
 .if defined(LANG_PKGNAME)
 PKGNAMEPREFIX=          ${LANG_PKGNAME}-
 .endif
 .if defined(LANG_SUFFIX)
 PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
 .if defined(WITH_GNUGCJ)
-#BUILD_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
-#BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
-#RUN_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
+#this wired part must be rewritten
+GCCVER=4.1.1
+BUILD_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
+BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
+RUN_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
 BROKEN=	"Still work in progress"	
 .else
 BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
 .endif
 
 # FIXME (correctly add ccache before gcc and g++)
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
 .if defined(WITH_GNUGCJ)
 CC=	ccache gcc41
 CXX=	ccache g++41
 .else
 CC=	ccache gcc-ooo
 CXX=	ccache g++-ooo
 .endif #WITH_GNUGCJ
 .endif #WITH_CCACHE
 .if !defined(WITH_CCACHE)
 .if defined(WITH_GNUGCJ)
 CC=	gcc41
 CXX=	g++41
 .else
 CC=	gcc-ooo
 CXX=	g++-ooo
 .endif #WITH_GNUGCJ
 .endif #!WITH_CCACHE
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison2:${PORTSDIR}/devel/bison2 \
 		imake:${X_IMAKE_PORT}
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
 .else
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
 .endif
 .if defined(WITH_GNUGCJ)
 ANT_DISTFILE=   apache-ant-${ANT_VERSION}-bin.tar.bz2
 ANT_VERSION=	1.6.5
 .endif
 .if !defined(WITH_GPC)
 LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
 .endif
 
 GNU_CONFIGURE=	yes
 WRKSRC?=		${WRKDIR}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --enable-crashdump=yes --enable-symbols=SMALL --with-system-freetype 
 #workarounds
 CONFIGURE_ARGS+=	--with-system-xrender-headers=yes #i62713#
 
 .if (${OSVERSION} <= 492000)
 EXTRA_PATCHES+=	${FILESDIR}/fbsd4-workaroundpatch
 .endif
 .if defined(WITH_GNUGCJ)
 EXTRA_PATCHES+=	${FILESDIR}/gcj-patches ${FILESDIR}/cws-maho1.diff ${FILESDIR}/gcj-fbsdworkaround
 .endif
 #.if defined(WITH_TTF_BYTECODE_ENABLED)
 #EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
 #.endif
 
 .include <${FILESDIR}/Makefile.knobs>
 
 pre-everything::
 # really tweak, extremely useful when you build all localized language versions
 # needed after when you build with ALL_LOCALIZED_LANGS.
 .if defined(TWEAK_L10N)
 	@${RM} -f ${WRKDIR}/.PLIST*
 	@${RM} -f ${WRKDIR}/.install_done.*
 	@${RM} -f ${WRKDIR}/.package_done.*
 	@${RM} -f ${WRKDIR}/.extract_done.*
 	@${RM} -f ${WRKDIR}/.patch_done.*
 	@${RM} -f ${WRKDIR}/.configure_done.*
 	@${RM} -f ${WRKDIR}/.build_done.*
 	@${TOUCH} ${EXTRACT_COOKIE}
 	@${TOUCH} ${PATCH_COOKIE}
 	@${TOUCH} ${CONFIGURE_COOKIE}
 	@${TOUCH} ${BUILD_COOKIE}
 .endif
 
 post-extract:
 .if defined(WITH_GNUGCJ)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
-# #iXXXXX# xmerge doesn't support gjdoc
-	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKSRC}/solenv/bin/javadoc
+	@${RM} -Rf ${WRKDIR}/gnugcj
+	@${MKDIR} ${WRKDIR}/gnugcj/bin
+	@${MKDIR} ${WRKDIR}/gnugcj/lib
+	@${LN} -s ${LOCALBASE}/bin/gcj41 ${WRKDIR}/gnugcj/bin/gcj
+	@${LN} -s ${LOCALBASE}/bin/gij41 ${WRKDIR}/gnugcj/bin/gij
+	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKDIR}/gnugcj/bin/javadoc  # #iXXXXX# xmerge doesn't support gjdoc
+	@${LN} -s ${LOCALBASE}/bin/fastjar41 ${WRKDIR}/gnugcj/bin/fastjar
+	@${LN} -s ${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/libgcj.so ${WRKDIR}/gnugcj/lib
 .endif
 .if defined(WITH_GPC)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
 	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/external/gpc/
 	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/external/gpc/
 .endif
 .if !defined(WITHOUT_MOZILLA)
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
 .endif
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 # PR:84786 #i53289#
 .if (${NUMOFPROCESSES}>1)
 	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
 .else
 	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
 .endif
 
 do-install:
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
 	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
 		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
 		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKDIR}/tmp/$$i ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			-e 's#%%OOOTAG%%#${OOOTAG}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice.org-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \
 		${PREFIX}/bin/${EXECBASE}
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sbase
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setofficelang
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
 	@${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 	@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
 			-e 's#%%OOOTAG%%#${OOOTAG}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${PKGMESSAGE}
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
 .include <${FILESDIR}/Makefile.others>
 .include <bsd.port.post.mk>

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

Property changes on: head/editors/openoffice.org-vcltesttool/files/Makefile.knobs
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.25
\ No newline at end of property
+1.26
\ No newline at end of property