head 1.7; access; symbols pkgsrc-2016Q4:1.6.0.54 pkgsrc-2016Q4-base:1.6 pkgsrc-2016Q3:1.6.0.52 pkgsrc-2016Q3-base:1.6 pkgsrc-2016Q2:1.6.0.50 pkgsrc-2016Q2-base:1.6 pkgsrc-2016Q1:1.6.0.48 pkgsrc-2016Q1-base:1.6 pkgsrc-2015Q4:1.6.0.46 pkgsrc-2015Q4-base:1.6 pkgsrc-2015Q3:1.6.0.44 pkgsrc-2015Q3-base:1.6 pkgsrc-2015Q2:1.6.0.42 pkgsrc-2015Q2-base:1.6 pkgsrc-2015Q1:1.6.0.40 pkgsrc-2015Q1-base:1.6 pkgsrc-2014Q4:1.6.0.38 pkgsrc-2014Q4-base:1.6 pkgsrc-2014Q3:1.6.0.36 pkgsrc-2014Q3-base:1.6 pkgsrc-2014Q2:1.6.0.34 pkgsrc-2014Q2-base:1.6 pkgsrc-2014Q1:1.6.0.32 pkgsrc-2014Q1-base:1.6 pkgsrc-2013Q4:1.6.0.30 pkgsrc-2013Q4-base:1.6 pkgsrc-2013Q3:1.6.0.28 pkgsrc-2013Q3-base:1.6 pkgsrc-2013Q2:1.6.0.26 pkgsrc-2013Q2-base:1.6 pkgsrc-2013Q1:1.6.0.24 pkgsrc-2013Q1-base:1.6 pkgsrc-2012Q4:1.6.0.22 pkgsrc-2012Q4-base:1.6 pkgsrc-2012Q3:1.6.0.20 pkgsrc-2012Q3-base:1.6 pkgsrc-2012Q2:1.6.0.18 pkgsrc-2012Q2-base:1.6 pkgsrc-2012Q1:1.6.0.16 pkgsrc-2012Q1-base:1.6 pkgsrc-2011Q4:1.6.0.14 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q3:1.6.0.12 pkgsrc-2011Q3-base:1.6 pkgsrc-2011Q2:1.6.0.10 pkgsrc-2011Q2-base:1.6 pkgsrc-2011Q1:1.6.0.8 pkgsrc-2011Q1-base:1.6 pkgsrc-2010Q4:1.6.0.6 pkgsrc-2010Q4-base:1.6 pkgsrc-2010Q3:1.6.0.4 pkgsrc-2010Q3-base:1.6 pkgsrc-2010Q2:1.6.0.2 pkgsrc-2010Q2-base:1.6 pkgsrc-2010Q1:1.5.0.6 pkgsrc-2010Q1-base:1.5 pkgsrc-2009Q4:1.5.0.4 pkgsrc-2009Q4-base:1.5 pkgsrc-2009Q3:1.5.0.2 pkgsrc-2009Q3-base:1.5 pkgsrc-2009Q2:1.4.0.2 pkgsrc-2009Q2-base:1.4 pkgsrc-2009Q1:1.3.0.4 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.2 pkgsrc-2008Q4-base:1.3 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.7 date 2016.12.29.19.10.28; author wiz; state dead; branches; next 1.6; commitid UT4GSflIUbUnEUzz; 1.6 date 2010.06.03.07.58.37; author tnn; state Exp; branches; next 1.5; 1.5 date 2009.09.10.00.14.55; author tnn; state Exp; branches; next 1.4; 1.4 date 2009.05.09.18.43.41; author hira; state Exp; branches; next 1.3; 1.3 date 2008.10.31.09.40.58; author hira; state Exp; branches; next 1.2; 1.2 date 2008.10.16.23.16.46; author hira; state Exp; branches; next 1.1; 1.1 date 2008.10.14.11.02.24; author hira; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2008.10.14.11.02.24; author hira; state Exp; branches; next ; desc @@ 1.7 log @Remove old openoffice and libreoffice packages. As discussed on pkgsrc-users. @ text @$NetBSD: patch-ba,v 1.6 2010/06/03 07:58:37 tnn Exp $ --- configure.orig 2009-04-22 14:54:40.000000000 +0000 +++ configure @@@@ -4222,11 +4222,11 @@@@ echo "${ECHO_T}$PTHREAD_LIBS" >&6; } test_randr=no _os=OSF1 ;; - netbsd) + *netbsd*) test_gtk=yes test_cairo=yes test_kde=yes - test_cups=no + test_cups=yes test_randr=yes test_freetype=yes PTHREAD_CFLAGS="-pthread" @@@@ -11414,7 +11414,7 @@@@ echo "$as_me: error: $_javadoc_path not fi if test "$SOLAR_JAVA" != ""; then - if test "$JDK" == "gcj" -a -z "$JAVA_HOME"; then + if test "$JDK" = "gcj" -a -z "$JAVA_HOME"; then if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "50000"; then cat > findhome.java <<_ACEOF import java.io.File; @@@@ -11515,7 +11515,7 @@@@ echo "$as_me: WARNING: in case JAVA_HOME echo "JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >> warn echo "attempted to find JAVA_HOME automatically, but apparently it failed" >> warn echo "in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >> warn -# if test "$JDK" == "gcj"; then +# if test "$JDK" = "gcj"; then # echo "e.g. install java-1.4.2-gcj-compat-devel and use --with-jdk-home=/usr/lib/jvm/java-1.4.2-gcj" >> warn # fi fi @@@@ -14196,7 +14196,7 @@@@ fi if test -n "$with_system_libxslt" -o -n "$with_system_libs" && \ test "$with_system_libxslt" != "no"; then if test -z "$with_system_libxml" -a -z "$with_system_libs" || \ - test "$with_system_libxml" == "no"; then + test "$with_system_libxml" = "no"; then # somehow AC_MSG_WARN won't work... echo "to prevent incompatibilities between internal libxml2 and libxslt, the office will be build with system-libxml" echo "to prevent incompatibilities between internal libxml2 and libxslt, the office will be build with system-libxml" >> warn @@@@ -14206,7 +14206,7 @@@@ fi if test -n "$with_system_libxml" -o -n "$with_system_libs" && \ test "$with_system_libxml" != "no"; then if test -z "$with_system_libxslt" -a -z "$with_system_libs" || \ - test "$with_system_libxslt" == "no"; then + test "$with_system_libxslt" = "no"; then # somehow AC_MSG_WARN won't work... echo "to prevent incompatibilities between internal libxslt and libxml2, the office will be build with system-libxslt" echo "to prevent incompatibilities between internal libxslt and libxml2, the office will be build with system-libxslt" >> warn @@@@ -14728,13 +14728,14 @@@@ echo "${ECHO_T}$am_cv_python_pyexecdir" python_include=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('INCLUDEPY');"` + python_ldflags=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LDFLAGS');"` python_version=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('VERSION');"` PYTHON_CFLAGS="-I$python_include" if test "$_os" = "Darwin"; then PYTHON_LIBS="-framework Python" else - PYTHON_LIBS="-lpython$python_version" + PYTHON_LIBS="-lpython$python_version $python_ldflags" fi save_CPPFLAGS="$CPPFLAGS" @@@@ -14991,7 +14992,7 @@@@ fi { echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5 echo "${ECHO_T}$ac_cv_header_db_h" >&6; } if test $ac_cv_header_db_h = yes; then - DB_INCLUDES=/usr/include + DB_INCLUDES=${BLNK_PREFIX_db4}/include/db4 else CFLAGS=-I/usr/include/db4 @@@@ -15054,7 +15055,7 @@@@ fi { echo "$as_me:$LINENO: checking whether db is at least 4.1" >&5 echo $ECHO_N "checking whether db is at least 4.1... $ECHO_C" >&6; } - for v in `seq 1 7`; do + for v in `seq 1 8`; do if test "$cross_compiling" = yes; then { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling See \`config.log' for more details." >&5 @@@@ -15122,13 +15123,13 @@@@ echo "$as_me: error: no. you need at lea #AC_CHECK_LIB(db, db_create, [], # [AC_MSG_ERROR([db library not installed or functional])], []) -{ echo "$as_me:$LINENO: checking for main in -ldb" >&5 -echo $ECHO_N "checking for main in -ldb... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking for main in -ldb4" >&5 +echo $ECHO_N "checking for main in -ldb4... $ECHO_C" >&6; } if test "${ac_cv_lib_db_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-ldb $LIBS" +LIBS="-ldb4 $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@@@ -15182,7 +15183,7 @@@@ if test $ac_cv_lib_db_main = yes; then #define HAVE_LIBDB 1 _ACEOF - LIBS="-ldb $LIBS" + LIBS="-ldb4 $LIBS" else { { echo "$as_me:$LINENO: error: db not installed or functional" >&5 @@@@ -17470,7 +17471,7 @@@@ Please recompile $tmp with --enable-ldap #e.g. http://fedoraproject.org/wiki/Releases/FeatureXULRunnerAPIChanges #the plugin pkg-config etc. reverts to "mozilla-plugin" with libxul - if test "$MOZ_FLAVOUR" == "libxul"; then + if test "$MOZ_FLAVOUR" = "libxul"; then MOZ_FLAVOUR="mozilla" fi @@@@ -21353,7 +21354,7 @@@@ echo "${ECHO_T}internal" >&6; } NEON_CFLAGS= BUILD_TYPE="$BUILD_TYPE NEON" fi -if test "$_os" = "Darwin" && test "$with_system_openssl" != "no"; then +if test "$USE_BUILTIN_openssl" = "yes" && test "$_os" = "Darwin" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" && test "$with_system_openssl" != "no"; then with_system_openssl=yes fi { echo "$as_me:$LINENO: checking which libssl to use" >&5 @@@@ -21364,7 +21365,7 @@@@ if test -n "$with_system_openssl" -o -n echo "${ECHO_T}external" >&6; } # Mac OS builds should get out without extra stuff is the Mac porters' # wish. And pkg-config is although Xcode ships a .pc for openssl - if test "$_os" = "Darwin"; then + if test "$_os" = "Darwin" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then OPENSSL_CFLAGS= OPENSSL_LIBS="-lssl -lcrypto" else @@@@ -25460,7 +25461,7 @@@@ echo "${ECHO_T}no" >&6; } fi -if test "$ENABLE_MEDIAWIKI" == "YES"; then +if test "$ENABLE_MEDIAWIKI" = "YES"; then { echo "$as_me:$LINENO: checking which Servlet API Jar to use" >&5 echo $ECHO_N "checking which Servlet API Jar to use... $ECHO_C" >&6; } if test -n "$with_system_servlet_api"; then @@@@ -25525,7 +25526,7 @@@@ echo "$as_me: error: not existing. get i fi { echo "$as_me:$LINENO: checking which jfreereport libs to use" >&5 echo $ECHO_N "checking which jfreereport libs to use... $ECHO_C" >&6; } - if test "$with_system_jfreereport" == "yes"; then + if test "$with_system_jfreereport" = "yes"; then SYSTEM_JFREEREPORT=YES { echo "$as_me:$LINENO: result: external" >&5 echo "${ECHO_T}external" >&6; } @@@@ -26733,7 +26734,7 @@@@ your KDE installation by exporting KDEDI fi KDE_CFLAGS="-I$qt_incdir -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT" - KDE_LIBS="-L$kde_libdir -L$qt_libdir -lkdeui -lkdecore -lqt-mt" + KDE_LIBS="-L$kde_libdir -Wl,-R$kde_libdir -L$qt_libdir -Wl,-R$qt_libdir -lkdeui -lkdecore -lqt-mt" fi @@@@ -27269,7 +27270,7 @@@@ if test "$_os" = "Darwin"; then XINERAMA_LINK=dynamic { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } -elif test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then +elif test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then if test -e "$XLIB/libXinerama.so" -a -e "$XLIB/libXinerama.a"; then # we have both versions, let the user decide but use the dynamic one # per default @@@@ -27754,9 +27755,13 @@@@ echo $ECHO_N "checking Ant lib directory if test -f $ANT_HOME/lib/ant/ant.jar; then ANT_LIB="$ANT_HOME/lib/ant" else + if test -f $ANT_HOME/lib/java/ant/ant.jar; then + ANT_LIB="$ANT_HOME/lib/java/ant" + else { { echo "$as_me:$LINENO: error: Ant libraries not found!" >&5 echo "$as_me: error: Ant libraries not found!" >&2;} { (exit 1); exit 1; }; } + fi fi fi fi @@@@ -27964,12 +27969,12 @@@@ fi { echo "$as_me:$LINENO: checking build verbosity" >&5 echo $ECHO_N "checking build verbosity... $ECHO_C" >&6; } if test -n "$enable_verbose"; then - if test "$enable_verbose" == "yes"; then + if test "$enable_verbose" = "yes"; then VERBOSE="TRUE" { echo "$as_me:$LINENO: result: high" >&5 echo "${ECHO_T}high" >&6; } fi - if test "$enable_verbose" == "no"; then + if test "$enable_verbose" = "no"; then VERBOSE="FALSE" { echo "$as_me:$LINENO: result: low" >&5 echo "${ECHO_T}low" >&6; } @ 1.6 log @Let configure accept bdb 4.8. @ text @d1 1 a1 1 $NetBSD$ @ 1.5 log @Remove the firefox3 option and replace it with a xulrunner option. Bump PKGREVISION. @ text @d3 1 a3 1 --- configure.orig 2009-04-22 16:54:40.000000000 +0200 d80 9 @ 1.4 log @Update to 3.1.0. Bug fixes and improvements (please see the following URLs for details). Release notes: http://development.openoffice.org/releases/3.1.0.html New features : http://www.openoffice.org/dev_docs/features/3.1/index.html Build confirmed on NetBSD 5.99.11/i386. @ text @d3 3 a5 3 --- configure.orig 2009-04-22 23:54:40.000000000 +0900 +++ configure 2009-05-09 12:42:15.000000000 +0900 @@@@ -4222,11 +4222,11 @@@@ d19 1 a19 1 @@@@ -11414,7 +11414,7 @@@@ d28 1 a28 1 @@@@ -11515,7 +11515,7 @@@@ d37 1 a37 1 @@@@ -14196,7 +14196,7 @@@@ d46 1 a46 1 @@@@ -14206,7 +14206,7 @@@@ d55 1 a55 1 @@@@ -14728,13 +14728,14 @@@@ d71 1 a71 1 @@@@ -14991,7 +14992,7 @@@@ d80 1 a80 1 @@@@ -15122,13 +15123,13 @@@@ d97 1 a97 1 @@@@ -15182,7 +15183,7 @@@@ d106 1 a106 10 @@@@ -16734,6 +16735,8 @@@@ MOZ_FLAVOUR=seamonkey elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "firefox"; then MOZ_FLAVOUR=firefox + elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "firefox3"; then + MOZ_FLAVOUR=firefox3 elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "mozilla"; then MOZ_FLAVOUR=mozilla else @@@@ -17470,7 +17473,7 @@@@ d115 1 a115 1 @@@@ -21353,7 +21356,7 @@@@ d124 1 a124 1 @@@@ -21364,7 +21367,7 @@@@ d133 1 a133 1 @@@@ -25460,7 +25463,7 @@@@ d142 1 a142 1 @@@@ -25525,7 +25528,7 @@@@ d151 1 a151 1 @@@@ -26733,7 +26736,7 @@@@ d160 1 a160 1 @@@@ -27269,7 +27272,7 @@@@ d169 1 a169 1 @@@@ -27754,9 +27757,13 @@@@ d183 1 a183 1 @@@@ -27964,12 +27971,12 @@@@ @ 1.3 log @ - Fix build with USE_BUILTIN.openssl=no. - Fix configure with builtin openssl on FreeBSD. @ text @d1 1 a1 1 $NetBSD: patch-ba,v 1.2 2008/10/16 23:16:46 hira Exp $ d3 3 a5 3 --- config_office/configure.orig 2008-09-01 20:50:01.000000000 +0900 +++ config_office/configure 2008-10-31 18:07:22.000000000 +0900 @@@@ -4183,11 +4183,11 @@@@ d12 1 a12 1 build_cairo=yes d19 1 a19 1 @@@@ -11429,7 +11429,7 @@@@ d28 1 a28 1 @@@@ -11530,7 +11530,7 @@@@ d37 1 a37 1 @@@@ -14208,7 +14208,7 @@@@ d46 1 a46 1 @@@@ -14218,7 +14218,7 @@@@ d55 1 a55 1 @@@@ -14740,13 +14740,14 @@@@ d71 1 a71 1 @@@@ -15003,7 +15004,7 @@@@ d80 1 a80 1 @@@@ -15133,13 +15134,13 @@@@ d97 1 a97 1 @@@@ -15193,7 +15194,7 @@@@ d106 1 a106 1 @@@@ -16642,6 +16643,8 @@@@ d115 1 a115 1 @@@@ -17378,7 +17381,7 @@@@ d124 1 a124 1 @@@@ -21084,7 +21087,7 @@@@ d133 1 a133 1 @@@@ -21095,7 +21098,7 @@@@ d142 2 a143 11 @@@@ -25060,7 +25063,7 @@@@ ENABLE_MEDIAWIKI=YES { echo "$as_me:$LINENO: checking which Apache commons-* libs to use" >&5 echo $ECHO_N "checking which Apache commons-* libs to use... $ECHO_C" >&6; } - if test "$with_system_apache_commons" == "yes"; then + if test "$with_system_apache_commons" = "yes"; then SYSTEM_APACHE_COMMONS=YES { echo "$as_me:$LINENO: result: external" >&5 echo "${ECHO_T}external" >&6; } @@@@ -25203,7 +25206,7 @@@@ d151 1 a151 1 @@@@ -25268,7 +25271,7 @@@@ d158 1 a158 1 { echo "$as_me:$LINENO: result: external" >&5 d160 1 a160 1 @@@@ -25807,7 +25810,7 @@@@ d169 1 a169 1 @@@@ -26357,7 +26360,7 @@@@ d178 1 a178 1 @@@@ -26842,9 +26845,13 @@@@ d192 1 a192 1 @@@@ -27052,12 +27059,12 @@@@ @ 1.2 log @ - Use security/openssl, textproc/hunspell and textproc/icu. - Add missing -Wl to patch-ch and patch-cs. - Correct flag for disabling optimizations. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ d4 1 a4 1 +++ config_office/configure 2008-10-16 19:07:22.000000000 +0900 d129 1 a129 1 +if test "$_os" = "Darwin" -o "$_os" = "NetBSD" && test "$with_system_openssl" != "no"; then d138 1 a138 1 + if test "$_os" = "Darwin" -o "$_os" = "NetBSD" ; then @ 1.1 log @Initial revision @ text @d4 1 a4 1 +++ config_office/configure 2008-10-01 11:42:40.000000000 +0900 d124 18 @ 1.1.1.1 log @Initial import of OpenOffice.org 3.0.0 as misc/openoffice3. Release note (will be available): http://development.openoffice.org/releases/3.0.0.html @ text @@