1. Update to 1.9m77

2. USE_GMAKE=yes
3. Add two knobs WITH_GTK and WITH_KDE

Submitted by:	kris via pointyhat (2)

4 files changed, 23 insertions, 22 deletions

diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 6b7746859266..1ea6a652c1ef 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -19,7 +19,7 @@ EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 
-SNAPDATE=	20050202
+SNAPDATE=	20050205
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_PROJECT=	cws_srx645_mozooo.20041016.tar.gz
@@ -33,6 +33,7 @@ USE_PERL5=	yes
 #USE_BISON=	yes #this bison should be later than bison1.875a
 USE_REINPLACE=	yes
 USE_BZIP2=	yes
+USE_GMAKE=	yes
 
 .if !defined(WITHOUT_JAVA)
 USE_JAVA=	yes
@@ -49,7 +50,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		76
+MILESTONE=		77
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo
index fdc9e5a397f1..36c90e803fed 100644
--- a/editors/openoffice-3/distinfo
+++ b/editors/openoffice-3/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m76_source.tar.bz2) = 9a009beb8824d0d0a0191cf519323b62
-SIZE (openoffice.org2.0/OOo_1.9m76_source.tar.bz2) = 242321515
+MD5 (openoffice.org2.0/OOo_1.9m77_source.tar.bz2) = c461e90e94c43b589a929608a213644e
+SIZE (openoffice.org2.0/OOo_1.9m77_source.tar.bz2) = 242340483
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/cws_srx645_mozooo.20041016.tar.gz) = eda0ab73b24c45890ae08bdfe04049bd
diff --git a/editors/openoffice-3/files/Makefile.knobs b/editors/openoffice-3/files/Makefile.knobs
index 9315fddb9d73..db2eb168ea81 100644
--- a/editors/openoffice-3/files/Makefile.knobs
+++ b/editors/openoffice-3/files/Makefile.knobs
@@ -8,6 +8,14 @@ CONFIGURE_ARGS+=	--disable-java
 CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
 .endif
 
+.if defined(WITH_GTK)
+CONFIGURE_ARGS+=	--enable-gtk
+.endif
+
+.if defined(WITH_KDE)
+CONFIGURE_ARGS+=	--enable-kde
+.endif
+
 .if defined(WITHOUT_MOZILLA)
 CONFIGURE_ARGS+=	--disable-mozilla
 .endif
@@ -79,6 +87,16 @@ pre-fetch:
 	@${ECHO} "You can compile OOo with CUPS support by"
 	@${ECHO} "make -DWITH_CUPS"
 .endif
+.if !defined(WITH_GTK)
+	@${ECHO}
+	@${ECHO} "You can compile OOo to use Gtk+ vclplug"
+	@${ECHO} "make -DWITH_GTK"
+.endif
+.if !defined(WITH_KDE)
+	@${ECHO}
+	@${ECHO} "You can compile OOo to use Qt/KDE vclplug"
+	@${ECHO} "make -DWITH_KDE"
+.endif
 	@${ECHO}
 	@${ECHO} "NOTICE:"
 	@${ECHO}
diff --git a/editors/openoffice-3/files/patch-config_office+configure.in b/editors/openoffice-3/files/patch-config_office+configure.in
deleted file mode 100644
index a1aeeef73064..000000000000
--- a/editors/openoffice-3/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,18 +0,0 @@
-o http://www.openoffice.org/issues/show_bug.cgi?id=41516
-o configuretypofix
-Index: config_office/configure.in
-===================================================================
-RCS file: /cvs/tools/config_office/configure.in,v
-retrieving revision 1.87
-diff -u -r1.87 configure.in
---- config_office/configure.in	25 Jan 2005 16:54:53 -0000	1.87
-+++ config_office/configure.in	28 Jan 2005 09:26:37 -0000
-@@ -2408,7 +2408,7 @@
-    fi
- 
-    AC_MSG_CHECKING([whether $GNUPATCH is GNU patch])
--   if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/deV/null; then
-+   if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/dev/null; then
- 	AC_MSG_RESULT([yes])
-    else
-   	AC_MSG_ERROR([no, GNU patch needed. install or specifiy with --with-gnu-patch=/path/to/it])