Index: files/Makefile.knobs =================================================================== RCS file: /home/ncvs/ports/editors/openoffice.org-3-devel/files/Makefile.knobs,v retrieving revision 1.62 diff -u -r1.62 Makefile.knobs --- files/Makefile.knobs 4 Sep 2009 23:58:20 -0000 1.62 +++ files/Makefile.knobs 14 Oct 2009 13:29:01 -0000 @@ -57,6 +57,19 @@ CONFIGURE_ARGS+= --with-system-icu=no .endif +.if defined(WITH_GRAPHITE) +CONFIGURE_ARGS+= --enable-graphite=yes --without-stlport +.else +CONFIGURE_ARGS+= --enable-graphite=no +.endif + +.if defined(WITH_SYSTEM_GRAPHITE) && defined(WITH_GRAPHITE) +LIB_DEPENDS+= graphite.3:${PORTSDIR}/graphics/silgraphite +CONFIGURE_ARGS+= --with-system-graphite=yes +.else +CONFIGURE_ARGS+= --with-system-graphite=no +.endif + pre-fetch: @${ECHO} "OPTIONS:" .if !defined(WITH_DEBUG) @@ -79,6 +92,23 @@ @${ECHO} "You can compile OOo with devel/icu from ports with" @${ECHO} "make -DWITH_SYSTEM_ICU" .endif +.if !defined(WITH_GRAPHITE) + @${ECHO} + @${ECHO} "You can compile OOo with Graphite smart font rendering with" + @${ECHO} "make -DWITH_GRAPHITE" +.else + @${ECHO} + @${ECHO} "WARNING: Graphite support enabled, --without-stlport added" + @${ECHO} "to configure arguments." +.endif +.if !defined(WITH_SYSTEM_GRAPHITE) + @${ECHO} + @${ECHO} "You can compile OOo with graphics/silgraphite from ports with" + @${ECHO} "make -DWITH_SYSTEM_GRAPHITE" +.elif !defined(WITH_GRAPHITE) + @${ECHO} + @${ECHO} "To use system Graphite, WITH_GRAPHITE must be set as well." +.endif .if !defined(WITHOUT_CUPS) @${ECHO} @${ECHO} "You can compile OOo without CUPS support with" Index: files/patch-configure =================================================================== RCS file: files/patch-configure diff -N files/patch-configure --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-configure 14 Oct 2009 13:29:57 -0000 @@ -0,0 +1,11 @@ +--- configure 2009-10-13 21:32:34.000000000 +0200 ++++ configure 2009-10-13 21:34:20.000000000 +0200 +@@ -19991,7 +19991,7 @@ + + { $as_echo "$as_me:$LINENO: checking whether to enable graphite support" >&5 + $as_echo_n "checking whether to enable graphite support... " >&6; } +-if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "z$enable_graphite" == "z" -o "$enable_graphite" != "no" ; then ++if test "$_os" = "WINNT" -o "$_os" = "Linux" -o "$_os" = "FreeBSD" && test "z$enable_graphite" = "z" -o "$enable_graphite" != "no" ; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 + $as_echo "yes" >&6; } + ENABLE_GRAPHITE="TRUE"