Unbreak on 8.2-RELEASE.

3 files changed, 83 insertions, 2 deletions

diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 5c78861f0f82..c042df9ae400 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -19,8 +19,6 @@ DISTFILES+=	${OOOSRC} ${OOOEXTSRC} unowinreg.dll:unowinreg
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(release branch)
 
-BROKEN=		does not configure
-
 CONFLICTS=	cppunit*
 
 EXTRATC_ONLY?=	${OOOSRC} ${OOOEXTSRC}
@@ -124,6 +122,7 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		ant:${PORTSDIR}/devel/apache-ant \
 		${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit
 #see #i85469# for gperf
+LIB_DEPENDS+=	rsvg-2.2:${PORTSDIR}/graphics/librsvg2
 
 USE_BISON=	build
 GNU_CONFIGURE=	yes
diff --git a/editors/openoffice.org-3-RC/files/patch-configure b/editors/openoffice.org-3-RC/files/patch-configure
new file mode 100644
index 000000000000..fddb293f18ae
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-configure
@@ -0,0 +1,29 @@
+--- configure~	2011-06-07 15:29:01.000000000 +0900
++++ configure	2011-11-06 12:10:47.000000000 +0900
+@@ -30591,7 +30591,7 @@
+ echo "$as_me:$LINENO: checking whether to build own version of libjpeg" >&5
+ echo $ECHO_N "checking whether to build own version of libjpeg... $ECHO_C" >&6
+ 
+-if test "$SYSTEM_JPEG" == "YES"; then
++if test "$SYSTEM_JPEG" = "YES"; then
+ SYSTEM_LIBJPEG=YES
+ else
+ case "$_os" in
+@@ -30613,7 +30613,7 @@
+ esac
+ fi
+ 
+-if test "$SYSTEM_LIBJPEG" == "YES"; then
++if test "$SYSTEM_LIBJPEG" = "YES"; then
+    echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ else
+@@ -30926,7 +30926,7 @@
+ if test "$SOLAR_JAVA" != "" && test "$with_junit" != "no"; then
+     echo "$as_me:$LINENO: checking for JUnit 4" >&5
+ echo $ECHO_N "checking for JUnit 4... $ECHO_C" >&6
+-    if test "$with_junit" == "yes"; then
++    if test "$with_junit" = "yes"; then
+         if test -e /usr/share/java/junit4.jar; then
+             OOO_JUNIT_JAR=/usr/share/java/junit4.jar
+         else
diff --git a/editors/openoffice.org-3-RC/files/patch-python-2.6.2-svnversion b/editors/openoffice.org-3-RC/files/patch-python-2.6.2-svnversion
new file mode 100644
index 000000000000..5006464fe0f3
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-python-2.6.2-svnversion
@@ -0,0 +1,53 @@
+http://bugs.python.org/file14047
+
+--- python/Python-2.6.1.patch~	2011-11-06 00:03:55.000000000 +0900
++++ python/Python-2.6.1.patch	2011-11-06 07:51:41.000000000 +0900
+@@ -1,3 +1,48 @@
++--- misc/Python-2.6.1/configure.in	Wed Jun 11 09:41:16 2008
+++++ misc/build/Python-2.6.1/configure.in	Fri Apr 17 09:02:52 2009
++@@ -767,7 +767,7 @@
++ then
++ 	SVNVERSION="svnversion \$(srcdir)"
++ else
++-	SVNVERSION="echo exported"
+++	SVNVERSION="echo Unversioned directory"
++ fi
++ 
++ case $MACHDEP in
++--- misc/Python-2.6.1/Makefile.pre.in	Wed Jun 11 09:41:16 2008
+++++ misc/build/Python-2.6.1/Makefile.pre.in	Fri Apr 17 09:02:52 2009
++@@ -501,7 +501,7 @@
++ 		$(SIGNAL_OBJS) \
++ 		$(MODOBJS) \
++ 		$(srcdir)/Modules/getbuildinfo.c
++-	$(CC) -c $(PY_CFLAGS) -DSVNVERSION=\"`LC_ALL=C $(SVNVERSION)`\" -o $@ $(srcdir)/Modules/getbuildinfo.c
+++	$(CC) -c $(PY_CFLAGS) -DSVNVERSION="\"`LC_ALL=C $(SVNVERSION)`\"" -o $@ $(srcdir)/Modules/getbuildinfo.c
++ 
++ Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile
++ 	$(CC) -c $(PY_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \
++--- misc/Python-2.6.1/Modules/getbuildinfo.c	Wed Jun 11 09:41:16 2008
+++++ misc/build/Python-2.6.1/Modules/getbuildinfo.c Fri Apr 17 09:02:52 2009
++@@ -48,5 +48,5 @@
++ 	static const char svnversion[] = SVNVERSION;
++ 	if (svnversion[0] != '$')
++ 		return svnversion; /* it was interpolated, or passed on command line */
++-	return "exported";
+++	return "Unversioned directory";
++ }
++--- misc/Python-2.6.1/Python/sysmodule.c	Wed Jun 11 09:41:16 2008
+++++ misc/build/Python-2.6.1/Python/sysmodule.c Fri Apr 17 09:02:52 2009
++@@ -1161,7 +1161,7 @@
++ 
++ 
++ 	svnversion = _Py_svnversion();
++-	if (strcmp(svnversion, "exported") != 0)
+++	if (strcmp(svnversion, "Unversioned directory") != 0 && strcmp(svnversion, "exported") != 0)
++ 		svn_revision = svnversion;
++ 	else if (istag) {
++ 		len = strlen(_patchlevel_revision);
++
++
++
+ --- misc/Python-2.6.1/Include/pyport.h	Wed Jun 11 09:41:16 2008
+ +++ misc/build/Python-2.6.1/Include/pyport.h	Fri Apr 17 09:02:52 2009
+ @@ -449,11 +449,6 @@