diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2005-02-07 10:31:07 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2005-02-07 10:31:07 +0000 |
| commit | 0b5181511b0d2a522fc0a3d187954ba621f9ee47 (patch) | |
| tree | 83cfdc9aaf2f24f756fb0dc48e95e77def38abe3 /editors/openoffice.org-2.0/files | |
| parent | - Upgrade to 2.3.0 [1] (diff) | |
1. Update to 1.9m77
2. USE_GMAKE=yes
3. Add two knobs WITH_GTK and WITH_KDE
Submitted by: kris via pointyhat (2)
Notes
Notes:
svn path=/head/; revision=128217
Diffstat (limited to 'editors/openoffice.org-2.0/files')
| -rw-r--r-- | editors/openoffice.org-2.0/files/Makefile.knobs | 18 | ||||
| -rw-r--r-- | editors/openoffice.org-2.0/files/patch-config_office+configure.in | 18 |
2 files changed, 18 insertions, 18 deletions
diff --git a/editors/openoffice.org-2.0/files/Makefile.knobs b/editors/openoffice.org-2.0/files/Makefile.knobs index 9315fddb9d73..db2eb168ea81 100644 --- a/editors/openoffice.org-2.0/files/Makefile.knobs +++ b/editors/openoffice.org-2.0/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.org-2.0/files/patch-config_office+configure.in b/editors/openoffice.org-2.0/files/patch-config_office+configure.in deleted file mode 100644 index a1aeeef73064..000000000000 --- a/editors/openoffice.org-2.0/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]) |