* Add evolution2 support[1]

* Fix typo[2]

PR:		 105400 [2]
Suggested by:	Vizo Allman <vizoster@gmail.com> [1]
Submitted by:   	Alexey Shuvaev[2]

12 files changed, 78 insertions, 12 deletions

diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index f34e9c250c84..6a344450ba04 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -96,9 +96,9 @@ PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .if defined(WITH_GNUGCJ)
 GCCVER=41
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt
-BUILD_DEPEND+=	${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
+BUILD_DEPENDS+=	${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
 RUN_DEPENDS+=	${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt
-RUN_DEPEND+=	${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
+RUN_DEPENDS+=	${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
 .else
 .if ${ARCH} == amd64
 GCCVER=41
diff --git a/editors/openoffice-3/files/Makefile.knobs b/editors/openoffice-3/files/Makefile.knobs
index 85ab949146a4..9ce1258cdf1c 100644
--- a/editors/openoffice-3/files/Makefile.knobs
+++ b/editors/openoffice-3/files/Makefile.knobs
@@ -31,6 +31,12 @@ CONFIGURE_ARGS+=	--disable-gnome-vfs
 USE_GNOME+=		gnomevfs2
 .endif
 
+.if defined(WITH_EVOLUTION2)
+CONFIGURE_ARGS+=	--enable-evolution2=yes
+.else
+USE_GNOME+=		glib20
+.endif
+
 .if defined(ALL_LOCALIZED_LANGS)
 CONFIGURE_ARGS+=	--with-lang=ALL
 .else
@@ -121,6 +127,11 @@ pre-fetch:
 	@${ECHO} "You can compile OOo with gpc instead of libart by"
 	@${ECHO} "make -DWITH_GPC"
 .endif
+.if !defined(WITH_EVOLUTION2)
+	@${ECHO}
+	@${ECHO} "You can compile OOo with evolution2 support by"
+	@${ECHO} "make -DWITH_EVOLUTION2"
+.endif
 	@${ECHO}
 	@${ECHO} "NOTICE:"
 	@${ECHO}
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index f34e9c250c84..6a344450ba04 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -96,9 +96,9 @@ PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .if defined(WITH_GNUGCJ)
 GCCVER=41
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt
-BUILD_DEPEND+=	${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
+BUILD_DEPENDS+=	${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
 RUN_DEPENDS+=	${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt
-RUN_DEPEND+=	${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
+RUN_DEPENDS+=	${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
 .else
 .if ${ARCH} == amd64
 GCCVER=41
diff --git a/editors/openoffice.org-2-RC/files/Makefile.knobs b/editors/openoffice.org-2-RC/files/Makefile.knobs
index 85ab949146a4..9ce1258cdf1c 100644
--- a/editors/openoffice.org-2-RC/files/Makefile.knobs
+++ b/editors/openoffice.org-2-RC/files/Makefile.knobs
@@ -31,6 +31,12 @@ CONFIGURE_ARGS+=	--disable-gnome-vfs
 USE_GNOME+=		gnomevfs2
 .endif
 
+.if defined(WITH_EVOLUTION2)
+CONFIGURE_ARGS+=	--enable-evolution2=yes
+.else
+USE_GNOME+=		glib20
+.endif
+
 .if defined(ALL_LOCALIZED_LANGS)
 CONFIGURE_ARGS+=	--with-lang=ALL
 .else
@@ -121,6 +127,11 @@ pre-fetch:
 	@${ECHO} "You can compile OOo with gpc instead of libart by"
 	@${ECHO} "make -DWITH_GPC"
 .endif
+.if !defined(WITH_EVOLUTION2)
+	@${ECHO}
+	@${ECHO} "You can compile OOo with evolution2 support by"
+	@${ECHO} "make -DWITH_EVOLUTION2"
+.endif
 	@${ECHO}
 	@${ECHO} "NOTICE:"
 	@${ECHO}
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index f34e9c250c84..6a344450ba04 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -96,9 +96,9 @@ PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .if defined(WITH_GNUGCJ)
 GCCVER=41
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt
-BUILD_DEPEND+=	${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
+BUILD_DEPENDS+=	${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
 RUN_DEPENDS+=	${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt
-RUN_DEPEND+=	${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
+RUN_DEPENDS+=	${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
 .else
 .if ${ARCH} == amd64
 GCCVER=41
diff --git a/editors/openoffice.org-2.0/files/Makefile.knobs b/editors/openoffice.org-2.0/files/Makefile.knobs
index 85ab949146a4..9ce1258cdf1c 100644
--- a/editors/openoffice.org-2.0/files/Makefile.knobs
+++ b/editors/openoffice.org-2.0/files/Makefile.knobs
@@ -31,6 +31,12 @@ CONFIGURE_ARGS+=	--disable-gnome-vfs
 USE_GNOME+=		gnomevfs2
 .endif
 
+.if defined(WITH_EVOLUTION2)
+CONFIGURE_ARGS+=	--enable-evolution2=yes
+.else
+USE_GNOME+=		glib20
+.endif
+
 .if defined(ALL_LOCALIZED_LANGS)
 CONFIGURE_ARGS+=	--with-lang=ALL
 .else
@@ -121,6 +127,11 @@ pre-fetch:
 	@${ECHO} "You can compile OOo with gpc instead of libart by"
 	@${ECHO} "make -DWITH_GPC"
 .endif
+.if !defined(WITH_EVOLUTION2)
+	@${ECHO}
+	@${ECHO} "You can compile OOo with evolution2 support by"
+	@${ECHO} "make -DWITH_EVOLUTION2"
+.endif
 	@${ECHO}
 	@${ECHO} "NOTICE:"
 	@${ECHO}
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index f34e9c250c84..6a344450ba04 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -96,9 +96,9 @@ PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .if defined(WITH_GNUGCJ)
 GCCVER=41
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt
-BUILD_DEPEND+=	${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
+BUILD_DEPENDS+=	${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
 RUN_DEPENDS+=	${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt
-RUN_DEPEND+=	${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
+RUN_DEPENDS+=	${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
 .else
 .if ${ARCH} == amd64
 GCCVER=41
diff --git a/editors/openoffice.org-2/files/Makefile.knobs b/editors/openoffice.org-2/files/Makefile.knobs
index 85ab949146a4..9ce1258cdf1c 100644
--- a/editors/openoffice.org-2/files/Makefile.knobs
+++ b/editors/openoffice.org-2/files/Makefile.knobs
@@ -31,6 +31,12 @@ CONFIGURE_ARGS+=	--disable-gnome-vfs
 USE_GNOME+=		gnomevfs2
 .endif
 
+.if defined(WITH_EVOLUTION2)
+CONFIGURE_ARGS+=	--enable-evolution2=yes
+.else
+USE_GNOME+=		glib20
+.endif
+
 .if defined(ALL_LOCALIZED_LANGS)
 CONFIGURE_ARGS+=	--with-lang=ALL
 .else
@@ -121,6 +127,11 @@ pre-fetch:
 	@${ECHO} "You can compile OOo with gpc instead of libart by"
 	@${ECHO} "make -DWITH_GPC"
 .endif
+.if !defined(WITH_EVOLUTION2)
+	@${ECHO}
+	@${ECHO} "You can compile OOo with evolution2 support by"
+	@${ECHO} "make -DWITH_EVOLUTION2"
+.endif
 	@${ECHO}
 	@${ECHO} "NOTICE:"
 	@${ECHO}
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index f34e9c250c84..6a344450ba04 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -96,9 +96,9 @@ PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .if defined(WITH_GNUGCJ)
 GCCVER=41
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt
-BUILD_DEPEND+=	${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
+BUILD_DEPENDS+=	${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
 RUN_DEPENDS+=	${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt
-RUN_DEPEND+=	${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
+RUN_DEPENDS+=	${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
 .else
 .if ${ARCH} == amd64
 GCCVER=41
diff --git a/editors/openoffice.org-3-RC/files/Makefile.knobs b/editors/openoffice.org-3-RC/files/Makefile.knobs
index 85ab949146a4..9ce1258cdf1c 100644
--- a/editors/openoffice.org-3-RC/files/Makefile.knobs
+++ b/editors/openoffice.org-3-RC/files/Makefile.knobs
@@ -31,6 +31,12 @@ CONFIGURE_ARGS+=	--disable-gnome-vfs
 USE_GNOME+=		gnomevfs2
 .endif
 
+.if defined(WITH_EVOLUTION2)
+CONFIGURE_ARGS+=	--enable-evolution2=yes
+.else
+USE_GNOME+=		glib20
+.endif
+
 .if defined(ALL_LOCALIZED_LANGS)
 CONFIGURE_ARGS+=	--with-lang=ALL
 .else
@@ -121,6 +127,11 @@ pre-fetch:
 	@${ECHO} "You can compile OOo with gpc instead of libart by"
 	@${ECHO} "make -DWITH_GPC"
 .endif
+.if !defined(WITH_EVOLUTION2)
+	@${ECHO}
+	@${ECHO} "You can compile OOo with evolution2 support by"
+	@${ECHO} "make -DWITH_EVOLUTION2"
+.endif
 	@${ECHO}
 	@${ECHO} "NOTICE:"
 	@${ECHO}
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index f34e9c250c84..6a344450ba04 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -96,9 +96,9 @@ PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .if defined(WITH_GNUGCJ)
 GCCVER=41
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt
-BUILD_DEPEND+=	${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
+BUILD_DEPENDS+=	${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
 RUN_DEPENDS+=	${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt
-RUN_DEPEND+=	${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
+RUN_DEPENDS+=	${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
 .else
 .if ${ARCH} == amd64
 GCCVER=41
diff --git a/editors/openoffice.org-3/files/Makefile.knobs b/editors/openoffice.org-3/files/Makefile.knobs
index 85ab949146a4..9ce1258cdf1c 100644
--- a/editors/openoffice.org-3/files/Makefile.knobs
+++ b/editors/openoffice.org-3/files/Makefile.knobs
@@ -31,6 +31,12 @@ CONFIGURE_ARGS+=	--disable-gnome-vfs
 USE_GNOME+=		gnomevfs2
 .endif
 
+.if defined(WITH_EVOLUTION2)
+CONFIGURE_ARGS+=	--enable-evolution2=yes
+.else
+USE_GNOME+=		glib20
+.endif
+
 .if defined(ALL_LOCALIZED_LANGS)
 CONFIGURE_ARGS+=	--with-lang=ALL
 .else
@@ -121,6 +127,11 @@ pre-fetch:
 	@${ECHO} "You can compile OOo with gpc instead of libart by"
 	@${ECHO} "make -DWITH_GPC"
 .endif
+.if !defined(WITH_EVOLUTION2)
+	@${ECHO}
+	@${ECHO} "You can compile OOo with evolution2 support by"
+	@${ECHO} "make -DWITH_EVOLUTION2"
+.endif
 	@${ECHO}
 	@${ECHO} "NOTICE:"
 	@${ECHO}