head	1.16;
access;
symbols
	pkgsrc-2013Q2:1.16.0.6
	pkgsrc-2013Q2-base:1.16
	pkgsrc-2012Q4:1.16.0.4
	pkgsrc-2012Q4-base:1.16
	pkgsrc-2011Q4:1.16.0.2
	pkgsrc-2011Q4-base:1.16
	pkgsrc-2011Q2:1.15.0.16
	pkgsrc-2011Q2-base:1.15
	pkgsrc-2011Q1:1.15.0.14
	pkgsrc-2011Q1-base:1.15
	pkgsrc-2010Q4:1.15.0.12
	pkgsrc-2010Q4-base:1.15
	pkgsrc-2010Q3:1.15.0.10
	pkgsrc-2010Q3-base:1.15
	pkgsrc-2010Q2:1.15.0.8
	pkgsrc-2010Q2-base:1.15
	pkgsrc-2010Q1:1.15.0.6
	pkgsrc-2010Q1-base:1.15
	pkgsrc-2009Q4:1.15.0.4
	pkgsrc-2009Q4-base:1.15
	pkgsrc-2009Q3:1.15.0.2
	pkgsrc-2009Q3-base:1.15
	pkgsrc-2009Q2:1.14.0.6
	pkgsrc-2009Q2-base:1.14
	pkgsrc-2009Q1:1.14.0.4
	pkgsrc-2009Q1-base:1.14
	pkgsrc-2008Q4:1.14.0.2
	pkgsrc-2008Q4-base:1.14
	pkgsrc-2008Q3:1.13.0.2
	pkgsrc-2008Q3-base:1.13
	cube-native-xorg:1.12.0.6
	cube-native-xorg-base:1.12
	pkgsrc-2008Q2:1.12.0.4
	pkgsrc-2008Q2-base:1.12
	cwrapper:1.12.0.2
	pkgsrc-2008Q1:1.10.0.4
	pkgsrc-2008Q1-base:1.10
	pkgsrc-2007Q4:1.10.0.2
	pkgsrc-2007Q4-base:1.10
	pkgsrc-2007Q3:1.7.0.2
	pkgsrc-2007Q3-base:1.7
	pkgsrc-2007Q2:1.6.0.2
	pkgsrc-2007Q2-base:1.6
	pkgsrc-2007Q1:1.4.0.2
	pkgsrc-2007Q1-base:1.4
	pkgsrc-base:1.1.1.1
	TNF:1.1.1;
locks; strict;
comment	@# @;


1.16
date	2011.10.02.14.11.56;	author wiz;	state dead;
branches;
next	1.15;

1.15
date	2009.09.10.00.27.08;	author tnn;	state Exp;
branches;
next	1.14;

1.14
date	2008.10.31.11.02.55;	author hira;	state Exp;
branches;
next	1.13;

1.13
date	2008.09.30.23.14.18;	author hira;	state Exp;
branches;
next	1.12;

1.12
date	2008.04.09.09.03.59;	author hira;	state Exp;
branches;
next	1.11;

1.11
date	2008.04.07.16.24.51;	author hira;	state Exp;
branches;
next	1.10;

1.10
date	2007.12.24.02.07.10;	author hira;	state Exp;
branches
	1.10.4.1;
next	1.9;

1.9
date	2007.11.17.16.28.09;	author hira;	state Exp;
branches;
next	1.8;

1.8
date	2007.11.11.15.46.25;	author hira;	state Exp;
branches;
next	1.7;

1.7
date	2007.10.06.20.02.22;	author hira;	state Exp;
branches;
next	1.6;

1.6
date	2007.04.20.14.44.11;	author hira;	state Exp;
branches;
next	1.5;

1.5
date	2007.04.12.05.28.08;	author hira;	state Exp;
branches;
next	1.4;

1.4
date	2007.04.05.23.24.01;	author hira;	state Exp;
branches
	1.4.2.1;
next	1.3;

1.3
date	2007.03.04.13.11.19;	author hira;	state Exp;
branches;
next	1.2;

1.2
date	2007.03.01.08.37.32;	author hira;	state Exp;
branches;
next	1.1;

1.1
date	2007.02.27.11.55.57;	author hira;	state Exp;
branches
	1.1.1.1;
next	;

1.10.4.1
date	2008.04.26.04.29.13;	author rtr;	state Exp;
branches;
next	;

1.4.2.1
date	2007.05.15.23.53.48;	author salo;	state Exp;
branches;
next	1.4.2.2;

1.4.2.2
date	2007.06.25.15.37.46;	author salo;	state Exp;
branches;
next	;

1.1.1.1
date	2007.02.27.11.55.57;	author hira;	state Exp;
branches;
next	;


desc
@@


1.16
log
@Remove packages scheduled to be deleted according to the pkgsrc-2011Q2
release notes.
@
text
@$NetBSD: patch-ba,v 1.15 2009/09/10 00:27:08 tnn Exp $

--- config_office/configure.orig	2008-05-20 18:28:55.000000000 +0200
+++ config_office/configure
@@@@ -3176,11 +3176,11 @@@@ echo "${ECHO_T}$PTHREAD_LIBS" >&6
 		test_cups=no
 		_os=OSF1
 		;;
-	netbsd)
+	*netbsd*)
 		test_gtk=yes
 		build_cairo=yes
 		test_kde=yes
-		test_cups=no
+		test_cups=yes
 		PTHREAD_CFLAGS="-pthread"
 		PTHREAD_LIBS="-pthread -lpthread"
 		_os=NetBSD
@@@@ -10304,7 +10304,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 "40200"; then
         cat > findhome.java <<_ACEOF
 import java.io.File;
@@@@ -10404,7 +10404,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
@@@@ -13098,7 +13098,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
@@@@ -13108,7 +13108,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
@@@@ -13591,13 +13591,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"
@@@@ -13868,7 +13869,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
@@@@ -13991,13 +13992,13 @@@@ echo "${ECHO_T}no. you need at least db 
     #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
@@@@ -14054,7 +14055,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
@@@@ -15758,23 +15759,23 @@@@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-xpcom " >&5
-echo $ECHO_N "checking for $MOZ_FLAVOUR-xpcom ... $ECHO_C" >&6
+        echo "$as_me:$LINENO: checking for libxul" >&5
+echo $ECHO_N "checking for libxul ... $ECHO_C" >&6
 
-        if $PKG_CONFIG --exists "$MOZ_FLAVOUR-xpcom " ; then
+        if $PKG_CONFIG --exists libxul; then
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
             succeeded=yes
 
             echo "$as_me:$LINENO: checking MOZILLAXPCOM_CFLAGS" >&5
 echo $ECHO_N "checking MOZILLAXPCOM_CFLAGS... $ECHO_C" >&6
-            MOZILLAXPCOM_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-xpcom "`
+            MOZILLAXPCOM_CFLAGS=`$PKG_CONFIG --cflags libxul`
             echo "$as_me:$LINENO: result: $MOZILLAXPCOM_CFLAGS" >&5
 echo "${ECHO_T}$MOZILLAXPCOM_CFLAGS" >&6
 
             echo "$as_me:$LINENO: checking MOZILLAXPCOM_LIBS" >&5
 echo $ECHO_N "checking MOZILLAXPCOM_LIBS... $ECHO_C" >&6
-            MOZILLAXPCOM_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-xpcom "`
+            MOZILLAXPCOM_LIBS=`$PKG_CONFIG --libs libxul`
             echo "$as_me:$LINENO: result: $MOZILLAXPCOM_LIBS" >&5
 echo "${ECHO_T}$MOZILLAXPCOM_LIBS" >&6
         else
@@@@ -19718,7 +19719,7 @@@@ fi
 echo "$as_me:$LINENO: result: $ac_cv_header_audio_audiolib_h" >&5
 echo "${ECHO_T}$ac_cv_header_audio_audiolib_h" >&6
 if test $ac_cv_header_audio_audiolib_h = yes; then
-   NAS_INCLUDES=/usr/include
+   NAS_INCLUDES=${BLNK_PREFIX_nas}/include
 else
 
              CFLAGS=-I/usr/X11R6/include
@@@@ -20526,7 +20527,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
@@@@ -20537,7 +20538,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
@@@@ -23949,7 +23950,7 @@@@ echo "${ECHO_T}yes" >&6
   ENABLE_REPORTDESIGN=YES
   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
@@@@ -24466,7 +24467,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
 
 
@@@@ -25019,7 +25020,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
@


1.15
log
@remove firefox3 option and add xulrunner option instead ...
... but leave it commented out because of build problems.

I suppose this package is going away soon anyway(?)
@
text
@d1 1
a1 1
$NetBSD$
@


1.14
log
@Apply some fixes and improvements from misc/openoffice3.
  - Change installation directory.
  - Reduce usage of ${WRKDIR}.
  - Use language packs to install multiple languages.
  - Install desktop files as symbolic links.
  - Pass MAKE_JOBS to dmake.
  - Fix build with PKG_DEVELOPER=yes (add missing rpath flag).
  - Fix PLIST without gtk2 option.
  - Fix browser plugin.
  - Fix open-url with firefox3 and seamonkey.
  - Shut up tar warning (remove leading /).
  - Use system openssl.
  - Use system icu.
  - Add lang-all option.
@
text
@d3 3
a5 3
--- config_office/configure.orig	2008-05-21 01:28:55.000000000 +0900
+++ config_office/configure	2008-10-31 19:19:14.000000000 +0900
@@@@ -3176,11 +3176,11 @@@@
d19 1
a19 1
@@@@ -10304,7 +10304,7 @@@@
d28 1
a28 1
@@@@ -10404,7 +10404,7 @@@@
d37 1
a37 1
@@@@ -13098,7 +13098,7 @@@@
d46 1
a46 1
@@@@ -13108,7 +13108,7 @@@@
d55 1
a55 1
@@@@ -13591,13 +13591,14 @@@@
d71 1
a71 1
@@@@ -13868,7 +13869,7 @@@@
d80 1
a80 1
@@@@ -13991,13 +13992,13 @@@@
d97 1
a97 1
@@@@ -14054,7 +14055,7 @@@@
d106 30
a135 10
@@@@ -15695,6 +15696,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
@@@@ -19718,7 +19721,7 @@@@
d144 1
a144 1
@@@@ -20526,7 +20529,7 @@@@
d153 1
a153 1
@@@@ -20537,7 +20540,7 @@@@
d162 1
a162 1
@@@@ -23949,7 +23952,7 @@@@
d171 1
a171 1
@@@@ -24466,7 +24469,7 @@@@
d180 1
a180 1
@@@@ -25019,7 +25022,7 @@@@
@


1.13
log
@Add `firefox3' option.  It's disabled by default.
Requested and OK'd during freeze by wiz@@.
@
text
@d4 1
a4 1
+++ config_office/configure	2008-09-30 22:33:09.000000000 +0900
d124 18
@


1.12
log
@Fix `test =='.  Pointed out by wiz@@.
@
text
@d3 2
a4 2
--- config_office/configure.orig	2008-01-31 20:47:17.000000000 +0900
+++ config_office/configure	2008-04-09 17:33:05.000000000 +0900
d106 10
a115 1
@@@@ -19781,7 +19782,7 @@@@
d124 1
a124 1
@@@@ -24012,7 +24013,7 @@@@
d133 1
a133 1
@@@@ -24529,7 +24530,7 @@@@
d142 1
a142 1
@@@@ -25082,7 +25083,7 @@@@
@


1.11
log
@Update to 2.4.0.

New features:
  General
    * Connect to WebDAV servers via HTTPS
    * Custom icons for toolbars are imported
    * Control password-storing with a master password
    * Warning if document is from a newer ODF
    * PDF documents: relative links, document references, PDF/A-1
      (ISO 19005-1) supported, and cross-document link behavior options
    * Mac OS X: Quicktime support for movies and sound / use the built
      in spell checker
    * Print dialog improvements in usability
    * Edit boxes: warning at limit of characters
    * DejaVu font is now default instead of BitStream Vera

  Localisation
    * Entries for 10 languages added

  Base / DBA
    * Improved rendering of numeric(n) data from JDBC and Oracle
    * Easier choice of table name in "Copy table"
    * Editing of views in HSQLDB
    * Query designer for all properties which allow SQL command
    * Query designer in SQL view
    * Relation design accessible for MySQL databases
    * Setting to check for required fields on forms
    * Support for Access 2007 (.accdb files)

  Calc
    * Convert text to columns: with this feature CSV data inside cells
      can be transformed into columns directly
    * Columns and rows in spreadsheet can be moved with drag and drop
    * Enter key returns to the column where the input started, one row
      below
    * Formula input: "+" and "-" can also be used to start
    * Individual zoom level per sheet
    * AutoFilter: choices clearer grouped and based on result of
      filtering in other columns
    * DataPilot: Manual Sorting / Double-click in DataPilot cell
      provides calculation data of that cell
    * Performance improvement with functions VLOOKUP and MATCH
    * Print dialog for Calc easier to use
    * PageUp and PageDown keys work in print preview
    * Sheet names in cell-hyperlinks: renamed properly

  Chart
    * Regression curves: The equation of trend lines and the R^2 value
      now can be displayed
    * Reverse axes possible
    * Bars on different axes displayed next to each other
    * Data labels: Number format
    * Data point label: display both value and percentage
    * Data label: display each part in a separate line
    * Data labels: more flexible placement of labels
    * Labels on pie segments: avoiding overlapping
    * Data point label: can be removed with delete key

  Draw
    * Navigation (tab) order of page objects
    * PDF export: page names as bookmark
    * Reduce complexity: no longer necessary display options removed

  Impress
    * Navigation (tab) order of page objects
    * Thrilling 3D effects in slide transitions
    * Export slide names as PDF bookmarks
    * Easier to insert background picture

  Writer
    * Selecting rectangular region of text
    * Find and Replace: backward references in regular expressions
    * Spell checking: easier selecting of the language
    * Insert&Insert Object toolbar redesign - Writer
    * Printing of hidden text can be turned on
    * Printing text place holders can be turned off
    * Shortcuts added for paragraph style Heading 4, Heading 5 and
      Textbody
    * Ctrl-click behaviour for hyperlinks can be changed
    * Custom document properties: Text fields and UI support

  Extensions/ programmability / API
    * Extensible Help System for extensions
    * Extensions can have a separate display name
    * Extensions: support of web based update
    * Extensions: additional information about the publisher and
      release notes
    * Extensions: check for updates
    * Dialogs can have a wallpaper set
    * Transparent background for controls
    * Remote control presentations via API
    * API: get selected table(s) or query(s) in the main Base window

Please see the following URL for more information.

  http://development.openoffice.org/releases/2.4.0.html
@
text
@d4 1
a4 1
+++ config_office/configure	2008-04-07 18:20:56.000000000 +0900
d46 9
@


1.10
log
@Link to dynamic Xinerama library instead of static one.  This fixes
build problem on NetBSD/amd64.  Problem reported by darcy@@.
@
text
@d3 3
a5 3
--- config_office/configure.orig	2007-11-02 17:30:08.000000000 +0900
+++ config_office/configure	2007-12-24 09:04:32.000000000 +0900
@@@@ -3010,11 +3010,11 @@@@
d19 10
a28 1
@@@@ -9544,7 +9544,7 @@@@
d37 1
a37 1
@@@@ -12477,7 +12477,7 @@@@
d46 1
a46 10
@@@@ -12487,7 +12487,7 @@@@
 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
@@@@ -12970,13 +12970,13 @@@@
d53 1
a53 1
-
d62 1
a62 1
@@@@ -13200,7 +13200,7 @@@@
d71 1
a71 1
@@@@ -13323,13 +13323,13 @@@@
d88 1
a88 1
@@@@ -13386,7 +13386,7 @@@@
d97 1
a97 1
@@@@ -19101,7 +19101,7 @@@@
d106 10
a115 1
@@@@ -22998,7 +22998,7 @@@@
d124 1
a124 1
@@@@ -23652,7 +23652,7 @@@@
d129 1
a129 1
+elif test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
d131 1
a131 1
       # we have both versions, let the user decide but use the static one
@


1.10.4.1
log
@pullup ticket #2342 - requested by hira
fixes security vulnerabilities

Revisions pulled up:
- pkgsrc/misc/openoffice2/Makefile		1.41
- pkgsrc/misc/openoffice2/distinfo		1.36,1.37,1.38
- pkgsrc/misc/openoffice2/options.mk		1.18
- pkgsrc/misc/openoffice2/patches/patch-aa	r0
- pkgsrc/misc/openoffice2/patches/patch-ae	r0
- pkgsrc/misc/openoffice2/patches/patch-aj	r0
- pkgsrc/misc/openoffice2/patches/patch-ak	1.7,1.8
- pkgsrc/misc/openoffice2/patches/patch-ba	1.11,1.12
- pkgsrc/misc/openoffice2/patches/patch-bg	1.4
- pkgsrc/misc/openoffice2/patches/patch-bs	1.3
- pkgsrc/misc/openoffice2/patches/patch-cp	1.2
- pkgsrc/misc/openoffice2/patches/patch-cr	1.2
- pkgsrc/misc/openoffice2/patches/patch-ct	1.2
- pkgsrc/misc/openoffice2/patches/patch-cw	1.2
- pkgsrc/misc/openoffice2/patches/patch-cz	r0
- pkgsrc/misc/openoffice2/patches/patch-db	r0
- pkgsrc/misc/openoffice2/patches/patch-dc	1.1,1.2
- pkgsrc/misc/openoffice2/patches/patch-dd	1.1

   Module Name:	pkgsrc
   Committed By:	hira
   Date:		Mon Apr  7 16:24:51 UTC 2008

   Modified Files:
   	pkgsrc/misc/openoffice2: Makefile distinfo options.mk
   	pkgsrc/misc/openoffice2/patches: patch-ak patch-ba patch-bg patch-cp
   	    patch-cr patch-ct patch-cw
   Added Files:
   	pkgsrc/misc/openoffice2/patches: patch-dc
   Removed Files:
   	pkgsrc/misc/openoffice2/patches: patch-aa patch-ae patch-aj patch-cz
   	    patch-db

   Log Message:
   Update to 2.4.0.

   <snip>
   ----------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	hira
   Date:		Sun Apr 13 20:32:43 UTC 2008

   Modified Files:
   	pkgsrc/misc/openoffice2: distinfo
   	pkgsrc/misc/openoffice2/patches: patch-ak patch-bs

   Log Message:
   Fix build with firefox.  Problem reported by abs@@.
   ----------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	joerg
   Date:		Thu Apr 17 08:43:31 UTC 2008

   Modified Files:
   	pkgsrc/misc/openoffice2: distinfo
   	pkgsrc/misc/openoffice2/patches: patch-dc
   Added Files:
   	pkgsrc/misc/openoffice2/patches: patch-dd

   Log Message:
   Repeat after me: Never use sys/errno.h, just use errno.h. Fix build on
   AMD64.
   ----------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	hira
   Date:		Wed Apr  9 09:03:59 UTC 2008

   Modified Files:
   	pkgsrc/misc/openoffice2: distinfo
   	pkgsrc/misc/openoffice2/patches: patch-ba

   Log Message:
   Fix `test =='.  Pointed out by wiz@@.
   ----------------------------------------------------------------------
@
text
@d1 1
a1 1
$NetBSD: patch-ba,v 1.10 2007/12/24 02:07:10 hira Exp $
d3 3
a5 3
--- config_office/configure.orig	2008-01-31 20:47:17.000000000 +0900
+++ config_office/configure	2008-04-09 17:33:05.000000000 +0900
@@@@ -3176,11 +3176,11 @@@@
d19 1
a19 10
@@@@ -10304,7 +10304,7 @@@@
 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 "40200"; then
         cat > findhome.java <<_ACEOF
 import java.io.File;
@@@@ -10404,7 +10404,7 @@@@
d28 1
a28 1
@@@@ -13098,7 +13098,7 @@@@
d37 1
a37 1
@@@@ -13108,7 +13108,7 @@@@
d46 1
a46 1
@@@@ -13591,13 +13591,14 @@@@
d53 1
a53 1
 
d62 1
a62 1
@@@@ -13868,7 +13869,7 @@@@
d71 1
a71 1
@@@@ -13991,13 +13992,13 @@@@
d88 1
a88 1
@@@@ -14054,7 +14055,7 @@@@
d97 1
a97 1
@@@@ -19781,7 +19782,7 @@@@
d106 1
a106 10
@@@@ -24012,7 +24013,7 @@@@
   ENABLE_REPORTDESIGN=YES
   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
@@@@ -24529,7 +24530,7 @@@@
d115 1
a115 1
@@@@ -25082,7 +25083,7 @@@@
d120 1
a120 1
+elif test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
d122 1
a122 1
       # we have both versions, let the user decide but use the dynamic one
@


1.9
log
@Use external db4 and neon.  Bump PKGREVISION.
@
text
@d3 2
a4 2
--- config_office/configure.orig	2007-08-24 21:31:18.000000000 +0900
+++ config_office/configure	2007-11-13 10:30:55.000000000 +0900
d62 1
a62 1
@@@@ -13090,7 +13090,7 @@@@
d71 1
a71 1
@@@@ -13213,13 +13213,13 @@@@
d88 1
a88 1
@@@@ -13276,7 +13276,7 @@@@
d97 1
a97 1
@@@@ -18928,7 +18928,7 @@@@
d106 1
a106 1
@@@@ -22818,7 +22818,7 @@@@
d115 9
@


1.8
log
@Add `nas' option.
@
text
@d4 1
a4 1
+++ config_office/configure	2007-11-12 00:42:00.000000000 +0900
d62 35
@


1.7
log
@Update to 2.3.0.

Security fix:
 - Fix CVE-2007-2834 (it has already fixed in 2.2.1nb3).

New features:
 - separated UI/configuration for database forms and database reports.
 - keyboard shortcuts for database record navigation.
 - Show filter options dialog before file dialog in case of pdf-export.
 - Selection of stylist filter now persistent.
 - The title for the broken signature dialog has been changed.
 - Extension Identifiers, unopkg, pkgchk.
 - Export COT, ACOT, COTH, and ACOTH to MS Excel files.
 - Centered document view.
 - separated UI/configuration for XML Form Documents.
 - New locale data:
 	Hausa_Ghana (ha_GH)
	Ewe_Ghana (ee_GH)
	Frisian_Netherlands (fy_NL)
	Uzbek_Uzbekistan (uz_UZ)
	Occitan_France (oc_FR)
	Lingala_Congo (ln_CD)
   	Sango _ Central African Republic (sg_CF)
	English_Ghana (en_GH),
	Ganda_Uganda (lg_UG)
	Armenian_Armenia (hy_AM)
 - Tagalog_Philippines (tl_PH) added to language list box.
 - Jewish calendar dates for en_US locale.
 - Uzbek (Cyrillic) removed from language list box.
 - Currency Bolivar Fuerte, VEF, for Spanish_Venezuela (es_VE) locale.
 - Default currency Ghana Cedi, GHS, for *_Ghana (ak_GH, ee_GH, en_GH, ha_GH)
   locales.
 - com.sun.star.io.SequenceInputStream service.
 - Insert/Title Dialog Layout Changed.
 - offer to switch to a Simple 3d look in charts.
 - exploded 3D pies and donuts.
 - more easy creation of charts / new wizard.
 - Strings for Undo in Charts.
 - enhanced logarithmic scales.
 - Automatic axis scaling.
 - Flexible Source-Range Selection.
 - enhanced selection handling.
 - Export donut charts according to spec.
 - Export manual scales for percent charts correctly.
 - Menu for Charts.
 - Chart Data Editor improved.
 - Right-angled axes for 3D Charts.
 - New Default Colors for Charts
 - Chart-Specific Toolbars.
 - Terms for Chart Elements.
 - simplified 3D dialog for charts.
 - Right-angled axes for 3D Charts.
 - Show formula and R^2 for regression curves in Status Bar and Extended Tip
   Help.
 - keyboard shortcuts for task pane entries.
 - / in database object names not allowed anymore.
 - New Report Designer.
 - HTML export for draw and presentation documents now supports png.
 - Alternative text for non-text image map.
 - Alternative text for layers in drawings.
 - Alternative text for layers in drawings (now with issue number).
 - Preview Document in Web Browser.
 - Extension can integrate options pages in the options dialog.
 - New option: Load printer settings with the document.
 - Single dialog export in dialog editor.
 - Link to extensions.services.openoffice.org in Extension Manager.
 - Editing of path animations is possible again.
 - testtool: new commands to request webpages.
 - testtool: new implementation for typekeys and mouse*.
 - testtool: new methods to access EditBrowseBox.
 - testtool: config tabpage for Crashreport configuration.
 - testtool: New option in options dialog to set OOo program path.
 - testtool: method to get state of menu entry if expandable.
 - testtool: add new methods for ORoadmap e.g. in wizards.
 - testtool: new method to get slot execution status.
 - Default print options in Calc.
 - Support of inline matrix/array constants in formulas.
 - Keyboard shortcut "Ctrl-1" is now "Format Cells".
 - Keyboard shortcuts Ctrl-Plus and Ctrl-Minus for Insert/Delete Cells.
 - GETPIVOTDATA formula function.
 - Division by zero #DIV/0! error displayed for certain functions, #NUM!
   displayed for illegal floating-point operation errors.
 - Cell context menu entry changed.
 - Renamed checkbox in Paste Special dialog.
 - Checkbox in Delete Contents dialog renamed.
 - Extend AutoSum Capabilities in Calc.
 - Renamed "Set Input Mode" to "Toggle Edit Mode".
 - Shortcut for Format->Cells menu entry changed.
 - Ctrl + ~ (Ctrl + `) toggles formula view.
 - Dynamic ranges as formula results in validation lists.
 - Drawing objects support Basic macro calls.
 - JIS and ASC Spreadsheet Functions.
 - "Form Objects" toolbar removed.
 - Toolbars "Insert" and "Insert Object" merged.
 - Changed menu entry Data->Outline.
 - Default print options in Calc.
 - Intro and about bitmap location changed, configure script extended.
 - Selectable FixedTexts.Changed shortcut for "Object" in the Edit menu.
 - Standard Color Palette Extended by new Chart Default Colors.
 - Automatic update for charts in Writer.
 - Language Guessing.
 - Ctrl-click to execute hyperlinks.
 - New Smart Tag API and UI.
 - 'Old' mail merge dialog now supports output to single file.
 - Soft page break.
 - Shortcut for "Repeat".
 - New writer compatibility option.
 - Password of a document is asked untill the correct one is entered or the
   dialog is cancelled.
 - Menu and toolbar merging support for extensions.
 - Default Macro Security Level changed.
 - First word in a Calc cell will no longer be capitalized by auto-correction.
 - Customize Keyboard tabpage.
 - Compatibility option "Expand word space..." added.
 - New export filter: MediaWiki.
 - Spell checking one letter words.

Please see the following URL for more detail of changes.

  http://development.openoffice.org/releases/2.3.0.html
@
text
@d4 1
a4 1
+++ config_office/configure	2007-09-27 10:52:53.000000000 +0900
d62 9
@


1.6
log
@Support `kde' option.  It's disabled by default.
@
text
@d3 3
a5 3
--- config_office/configure.orig	2007-01-19 22:01:19.000000000 +0900
+++ config_office/configure	2007-04-20 06:56:17.000000000 +0900
@@@@ -2975,11 +2975,11 @@@@
d19 1
a19 1
@@@@ -8261,7 +8261,7 @@@@
d28 35
a62 1
@@@@ -21383,7 +21383,7 @@@@
@


1.5
log
@Fix "test ==".  Pointed out by veego@@ in private e-mail.
@
text
@d4 1
a4 1
+++ config_office/configure	2007-04-12 14:18:58.000000000 +0900
d28 9
@


1.4
log
@Update to 2.2.0.  OK'd by wiz@@ for update during freeze.

Release Notes:
 http://development.openoffice.org/releases/2.2.0.html

Changes:
 - Fix CVE-2007-0002, CVE-2007-0238, CVE-2007-0239.
 - field lengths of bibliography database changed.
 - UTF-8 encoding for dBase databases.
 - "Edit in SQL View..." command for database queries.
 - forms: date and time fields do not default to "Today" and "Now" anymore.
 - query/relation design: visual marker indicating the type of table/query.
 - advanced database setting: "Use keyword AS before table alias names".
 - Annoying focus behavior of OOo was fixed.
 - scaling in spadmin page property page deleted.
 - Additional options for pdf export.
 - Desktop-Integration package for slackware.
 - Show/Hide Slide menu entry split into two entries.
 - Support for NetBSD, Linux 64 bit, Linux SPARC in TestTool Environment.
 - New behavior of "Insert - Sheet From File".
 - Import MS Excel files with PivotTables based on external data.
 - Insert/Delete Note in cell context menu.
 - some UNO Remote Protocol (URP) changes.
 - Extension Dependency OpenOffice.org-minimal-version.
 - Export COT, ACOT, COTH, and ACOTH to MS Excel files.
 - System integration for extensions.
 - Online Update for Extensions.
 - Localization of UNO Dialogs.
 - OOo no longer generates sensitive UUIDs.
 - Autokerning enabled by default.
 - CVS import dialog for unformatted clipboard text.
 - Ordinal suffix in AutoFill.
 - simple protocolhandler add-on support in uno-skeletonmaker.
 - Autokerning enabled by default.
 - Create Tango icon set for OO.o.
 - Add localisation support to UNO dialogs and IDE Dialog Editor.
 - extend add-on support in the uno-skeletonmaker.
 - Upgrade icu to latest version.
 - Implement an optional help section in the ObjectInspector.
 - additional PDF export features
 - makes localize.sdf files optional.
 - Add/update Slovenian templates for 2.1.
 - update of icons.
 - changes for soffice script.
 - implement shaped system windows.
 - Updates of OOo <-> ATK bridge.
 - #139464# use #REF! errors in formulas using cells from missing
   external linked sheets.
 - Tooling fixes for CWS and MWS handling.
 - Remove SISSL from module filter.
 - make the 'automatic update check' more consistent.
 - code only cws, adds infrastructure for vba interop project.
 - Prepare framework code to support inplace active objects that are
   not UIactive.
 - Some bugs, some very minor UNO runtime features.
 - Changed context menu (insert/delete note) for Calc cells.
 - new buildsystem features.
 - Improve line height compatibility on UNX platforms while keeping
   the layout backwards compatible.
 - Preparing installation of extensions in installation sets.
 - osl[in|de]crementInterlockedCount(): don't use "lock" prefix on
   single processor, single core, non HT machines.
 - Clean up obsolete files in binfilter.
 - Bug fixes.
@
text
@d4 1
a4 1
+++ config_office/configure	2007-04-01 21:32:20.000000000 +0900
d19 9
@


1.4.2.1
log
@Pullup ticket 2083 - requested by hira
build fix for openoffice2

Revisions pulled up:
- pkgsrc/misc/openoffice2/distinfo			1.13
- pkgsrc/misc/openoffice2/patches/patch-ba		1.5

   Module Name:		pkgsrc
   Committed By:	hira
   Date:		Thu Apr 12 05:28:08 UTC 2007

   Modified Files:
   	pkgsrc/misc/openoffice2: distinfo
   	pkgsrc/misc/openoffice2/patches: patch-ba

   Log Message:
   Fix "test ==".  Pointed out by veego@@ in private e-mail.
@
text
@d1 1
a1 1
$NetBSD: patch-ba,v 1.5 2007/04/12 05:28:08 hira Exp $
d4 1
a4 1
+++ config_office/configure	2007-04-12 14:18:58.000000000 +0900
a18 9
@@@@ -8261,7 +8261,7 @@@@
          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
@


1.4.2.2
log
@Pullup ticket 2117 - requested by lkundrak
security update for openoffice2

Updated via patch from hira, the MAINTAINER.

   Module Name:		pkgsrc
   Committed By:	hira
   Date:		Fri Jun 22 03:52:21 UTC 2007

   Modified Files:
   	pkgsrc/misc/openoffice2: Makefile distinfo

   Log Message:
   Update to 2.2.1 during freeze because of security fixes (CVE-2007-0245
   and CVE-2007-2754).

   Changes from 2.2.0:
    * freetypettg: fix CVE-2007-2754 for the internal freetype copy
    * autotext02: A showstopper fix for OOo2.2.1
    * l10n77316fix: contains fix for i77316
    * notepaint: Fix for invisible text in Calc notes while editing
    * macosxpbuildrepair_OOF680:
      This cws fixes broken Mac OS X 10.3 build, and does contain :
        - a fix for a build breaker in slideshow ( fixed by thb ) #i74325#
        - gcc-3.3 parser fixes #i75990#
        - a complete fix in sal for security.c ( with sb help ) #i76159#
        - a fix for broken linking ( because of extra symbols, due to bad
          filtering ) #i72922#
        - a fix for main.applescript ( build borken on Panther ) #i75972#
      All issue targeted 2.2.1 ( supposing the changes will be integrated
      in SRC680 too)
    * ause078_OOF680: quick and small to get back correct dependencies
    * os95_OOF680,plthes: add license-fixed polish thesaurus
    * olenoserver: A fix for a regression.
    * hro15: Unicode command line support fix for Windows only.
    * custompropsfix: Small bug fix in Word import for import of document
                      variables
    * dba221b: fix issue 73722, in its incarnation as issue 76434, for 2.2.1.
    * swvalgrind: Fix for i76133
    * calc221: Calc fixes for OOo2.2.1
    * fix75967: fix issue 75967
    * c03v8,c07v012,native86,nativebroffice: New Product BrOffice.org
    * impress120: Bugfix workspace for OOo 2.2.1
   	sj->wg: the performance test hasn|t been finished yet, but I think
           it should be no problem to hand over this issue without the test.
    * larsbehr01: Bugfix for i66661: Slideshow bug fixing for 2.2.1
    * dba221a: ongoing DBA-related bugfixing towards OOo 2.2.1
    * sch17: Fixes for sch
    * tbe29: OOo 2.2.1 accessibility bug fixes
    * impress119: Bug fixes for OOo 2.2.1.
    * printhelpfix: Bugfix for 134037.
    * autotext01: A showstopper cws related to autotext bug.
    * native79: Preparing OOo 2.2.1 and SO 8 Update 7
    * vcl73_OOF680: 2.2.1 issues
    * cmcfixes32_OOF680: minor customized build fixes
    * jl57_OOF680: Contains a patch for building with an older gcc compiler.
    * fsfixes06_OOF680: Fix for a bug in WordPerfect typedetection that caused
                        us to crash on unsupported documents instead of refusing
                        them with grace
    * jl62,oasisrng02: Fixes of violations of the RelaxNG schema in ODF.
    * aw050: OOo 2.2.1 BugFixing
    * swqbugfix01: Issues in Writer regarding saving of documents
@
text
@d1 1
a1 1
$NetBSD: patch-ba,v 1.6 2007/04/20 14:44:11 hira Exp $
d4 1
a4 1
+++ config_office/configure	2007-04-20 06:56:17.000000000 +0900
a27 9
@@@@ -21383,7 +21383,7 @@@@
     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
 
 
@


1.3
log
@ - Use CONFIGURE_DIR.
 - Fix "test ==".

From wiz@@ in private e-mail.
@
text
@d1 1
a1 1
$NetBSD: patch-ba,v 1.2 2007/03/01 08:37:32 hira Exp $
d3 3
a5 3
--- config_office/configure.orig	2006-12-02 02:52:35.000000000 +0900
+++ config_office/configure	2007-02-28 22:37:24.000000000 +0900
@@@@ -2940,12 +2940,12 @@@@
a10 1
 		test_x=yes
@


1.2
log
@Make cups option effective.
@
text
@d1 1
a1 1
$NetBSD$
d3 2
a4 2
--- configure.orig	2006-12-02 02:52:35.000000000 +0900
+++ configure	2007-02-28 22:37:24.000000000 +0900
@


1.1
log
@Initial revision
@
text
@d4 2
a5 2
+++ configure	2007-02-23 18:40:17.000000000 +0900
@@@@ -2940,7 +2940,7 @@@@
d14 6
@


1.1.1.1
log
@Import OpenOffice.org 2.1.0 for build.
This fixes a lot of bugs and adds a lot of new features since 1.1.5.

Guide to New Features:
  http://marketing.openoffice.org/2.0/featureguide.html

Release Note:
  http://development.openoffice.org/releases/2.1.0.html
@
text
@@