diff --git a/editors/openoffice-3-devel/files/Makefile.knobs b/editors/openoffice-3-devel/files/Makefile.knobs index e16cc9caa208..5693c70a021b 100644 --- a/editors/openoffice-3-devel/files/Makefile.knobs +++ b/editors/openoffice-3-devel/files/Makefile.knobs @@ -61,6 +61,19 @@ CONFIGURE_ARGS+= --with-system-icu=yes 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) @@ -83,6 +96,23 @@ pre-fetch: @${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" diff --git a/editors/openoffice-3-devel/files/patch-i109428 b/editors/openoffice-3-devel/files/patch-i109428 new file mode 100644 index 000000000000..46380e3ca111 --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-i109428 @@ -0,0 +1,22 @@ +--- configure.in~ 2010-02-04 02:35:04.000000000 +0900 ++++ configure.in 2010-02-19 10:05:22.000000000 +0900 +@@ -4467,7 +4467,7 @@ + dnl =================================================================== + + AC_MSG_CHECKING([whether to enable graphite support]) +-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 + AC_MSG_RESULT([yes]) + ENABLE_GRAPHITE="TRUE" + AC_MSG_CHECKING([which graphite to use]) +--- configure~ 2010-02-19 10:00:38.000000000 +0900 ++++ configure 2010-02-19 10:14:50.000000000 +0900 +@@ -15617,7 +15617,7 @@ + + { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + ENABLE_GRAPHITE="TRUE" diff --git a/editors/openoffice-3-devel/files/patch-i109429 b/editors/openoffice-3-devel/files/patch-i109429 new file mode 100644 index 000000000000..992094149d99 --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-i109429 @@ -0,0 +1,11 @@ +--- extensions/source/config/ldap/makefile.mk~ 2010-02-04 02:35:34.000000000 +0900 ++++ extensions/source/config/ldap/makefile.mk 2010-02-19 18:50:59.000000000 +0900 +@@ -90,7 +90,7 @@ + SHL1STDLIBS+=-lcompat + # workaround for FreeBSD, which needs -llber50, too + .IF "$(WITH_OPENLDAP)" != "YES" +-SHL1STDLIBS+=-Wl,-Bstatic -llber50 ++SHL1STDLIBS+=-Wl,-Bstatic -llber50 -Wl,-Bdynamic + .ENDIF + .ENDIF + diff --git a/editors/openoffice.org-3-devel/files/Makefile.knobs b/editors/openoffice.org-3-devel/files/Makefile.knobs index e16cc9caa208..5693c70a021b 100644 --- a/editors/openoffice.org-3-devel/files/Makefile.knobs +++ b/editors/openoffice.org-3-devel/files/Makefile.knobs @@ -61,6 +61,19 @@ CONFIGURE_ARGS+= --with-system-icu=yes 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) @@ -83,6 +96,23 @@ pre-fetch: @${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" diff --git a/editors/openoffice.org-3-devel/files/patch-i109428 b/editors/openoffice.org-3-devel/files/patch-i109428 new file mode 100644 index 000000000000..46380e3ca111 --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-i109428 @@ -0,0 +1,22 @@ +--- configure.in~ 2010-02-04 02:35:04.000000000 +0900 ++++ configure.in 2010-02-19 10:05:22.000000000 +0900 +@@ -4467,7 +4467,7 @@ + dnl =================================================================== + + AC_MSG_CHECKING([whether to enable graphite support]) +-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 + AC_MSG_RESULT([yes]) + ENABLE_GRAPHITE="TRUE" + AC_MSG_CHECKING([which graphite to use]) +--- configure~ 2010-02-19 10:00:38.000000000 +0900 ++++ configure 2010-02-19 10:14:50.000000000 +0900 +@@ -15617,7 +15617,7 @@ + + { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + ENABLE_GRAPHITE="TRUE" diff --git a/editors/openoffice.org-3-devel/files/patch-i109429 b/editors/openoffice.org-3-devel/files/patch-i109429 new file mode 100644 index 000000000000..992094149d99 --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-i109429 @@ -0,0 +1,11 @@ +--- extensions/source/config/ldap/makefile.mk~ 2010-02-04 02:35:34.000000000 +0900 ++++ extensions/source/config/ldap/makefile.mk 2010-02-19 18:50:59.000000000 +0900 +@@ -90,7 +90,7 @@ + SHL1STDLIBS+=-lcompat + # workaround for FreeBSD, which needs -llber50, too + .IF "$(WITH_OPENLDAP)" != "YES" +-SHL1STDLIBS+=-Wl,-Bstatic -llber50 ++SHL1STDLIBS+=-Wl,-Bstatic -llber50 -Wl,-Bdynamic + .ENDIF + .ENDIF +