head	1.15;
access;
symbols
	pkgsrc-2019Q1:1.14.0.66
	pkgsrc-2019Q1-base:1.14
	pkgsrc-2018Q4:1.14.0.64
	pkgsrc-2018Q4-base:1.14
	pkgsrc-2018Q3:1.14.0.62
	pkgsrc-2018Q3-base:1.14
	pkgsrc-2018Q2:1.14.0.60
	pkgsrc-2018Q2-base:1.14
	pkgsrc-2018Q1:1.14.0.58
	pkgsrc-2018Q1-base:1.14
	pkgsrc-2017Q4:1.14.0.56
	pkgsrc-2017Q4-base:1.14
	pkgsrc-2017Q3:1.14.0.54
	pkgsrc-2017Q3-base:1.14
	pkgsrc-2017Q2:1.14.0.50
	pkgsrc-2017Q2-base:1.14
	pkgsrc-2017Q1:1.14.0.48
	pkgsrc-2017Q1-base:1.14
	pkgsrc-2016Q4:1.14.0.46
	pkgsrc-2016Q4-base:1.14
	pkgsrc-2016Q3:1.14.0.44
	pkgsrc-2016Q3-base:1.14
	pkgsrc-2016Q2:1.14.0.42
	pkgsrc-2016Q2-base:1.14
	pkgsrc-2016Q1:1.14.0.40
	pkgsrc-2016Q1-base:1.14
	pkgsrc-2015Q4:1.14.0.38
	pkgsrc-2015Q4-base:1.14
	pkgsrc-2015Q3:1.14.0.36
	pkgsrc-2015Q3-base:1.14
	pkgsrc-2015Q2:1.14.0.34
	pkgsrc-2015Q2-base:1.14
	pkgsrc-2015Q1:1.14.0.32
	pkgsrc-2015Q1-base:1.14
	pkgsrc-2014Q4:1.14.0.30
	pkgsrc-2014Q4-base:1.14
	pkgsrc-2014Q3:1.14.0.28
	pkgsrc-2014Q3-base:1.14
	pkgsrc-2014Q2:1.14.0.26
	pkgsrc-2014Q2-base:1.14
	pkgsrc-2014Q1:1.14.0.24
	pkgsrc-2014Q1-base:1.14
	pkgsrc-2013Q4:1.14.0.22
	pkgsrc-2013Q4-base:1.14
	pkgsrc-2013Q3:1.14.0.20
	pkgsrc-2013Q3-base:1.14
	pkgsrc-2013Q2:1.14.0.18
	pkgsrc-2013Q2-base:1.14
	pkgsrc-2013Q1:1.14.0.16
	pkgsrc-2013Q1-base:1.14
	pkgsrc-2012Q4:1.14.0.14
	pkgsrc-2012Q4-base:1.14
	pkgsrc-2012Q3:1.14.0.12
	pkgsrc-2012Q3-base:1.14
	pkgsrc-2012Q2:1.14.0.10
	pkgsrc-2012Q2-base:1.14
	pkgsrc-2012Q1:1.14.0.8
	pkgsrc-2012Q1-base:1.14
	pkgsrc-2011Q4:1.14.0.6
	pkgsrc-2011Q4-base:1.14
	pkgsrc-2011Q3:1.14.0.4
	pkgsrc-2011Q3-base:1.14
	pkgsrc-2011Q2:1.14.0.2
	pkgsrc-2011Q2-base:1.14
	TNF:1.1.1
	pkgsrc-2011Q1:1.12.0.24
	pkgsrc-2011Q1-base:1.12
	pkgsrc-2010Q4:1.12.0.22
	pkgsrc-2010Q4-base:1.12
	pkgsrc-2010Q3:1.12.0.20
	pkgsrc-2010Q3-base:1.12
	pkgsrc-2010Q2:1.12.0.18
	pkgsrc-2010Q2-base:1.12
	pkgsrc-2010Q1:1.12.0.16
	pkgsrc-2010Q1-base:1.12
	pkgsrc-2009Q4:1.12.0.14
	pkgsrc-2009Q4-base:1.12
	pkgsrc-2009Q3:1.12.0.12
	pkgsrc-2009Q3-base:1.12
	pkgsrc-2009Q2:1.12.0.10
	pkgsrc-2009Q2-base:1.12
	pkgsrc-2009Q1:1.12.0.8
	pkgsrc-2009Q1-base:1.12
	pkgsrc-2008Q4:1.12.0.6
	pkgsrc-2008Q4-base:1.12
	pkgsrc-2008Q3:1.12.0.4
	pkgsrc-2008Q3-base:1.12
	cube-native-xorg:1.12.0.2
	cube-native-xorg-base:1.12
	pkgsrc-2008Q2:1.11.0.40
	pkgsrc-2008Q2-base:1.11
	cwrapper:1.11.0.38
	pkgsrc-2008Q1:1.11.0.36
	pkgsrc-2008Q1-base:1.11
	pkgsrc-2007Q4:1.11.0.34
	pkgsrc-2007Q4-base:1.11
	pkgsrc-2007Q3:1.11.0.32
	pkgsrc-2007Q3-base:1.11
	pkgsrc-2007Q2:1.11.0.30
	pkgsrc-2007Q2-base:1.11
	pkgsrc-2007Q1:1.11.0.28
	pkgsrc-2007Q1-base:1.11
	pkgsrc-2006Q4:1.11.0.26
	pkgsrc-2006Q4-base:1.11
	pkgsrc-2006Q3:1.11.0.24
	pkgsrc-2006Q3-base:1.11
	pkgsrc-2006Q2:1.11.0.22
	pkgsrc-2006Q2-base:1.11
	pkgsrc-2006Q1:1.11.0.20
	pkgsrc-2006Q1-base:1.11
	pkgsrc-2005Q4:1.11.0.18
	pkgsrc-2005Q4-base:1.11
	pkgsrc-2005Q3:1.11.0.16
	pkgsrc-2005Q3-base:1.11
	pkgsrc-2005Q2:1.11.0.14
	pkgsrc-2005Q2-base:1.11
	pkgsrc-2005Q1:1.11.0.12
	pkgsrc-2005Q1-base:1.11
	pkgsrc-2004Q4:1.11.0.10
	pkgsrc-2004Q4-base:1.11
	pkgsrc-2004Q3:1.11.0.8
	pkgsrc-2004Q3-base:1.11
	pkgsrc-2004Q2:1.11.0.6
	pkgsrc-2004Q2-base:1.11
	pkgsrc-2004Q1:1.11.0.4
	pkgsrc-2004Q1-base:1.11
	pkgsrc-2003Q4:1.11.0.2
	pkgsrc-2003Q4-base:1.11
	netbsd-1-6-1:1.10.0.2
	netbsd-1-6-1-base:1.10
	netbsd-1-6:1.8.0.6
	netbsd-1-6-RELEASE-base:1.8
	pkgviews:1.8.0.2
	pkgviews-base:1.8
	buildlink2:1.7.0.2
	buildlink2-base:1.8
	netbsd-1-5-PATCH003:1.7
	netbsd-1-5-PATCH001:1.5
	netbsd-1-5-RELEASE:1.2
	netbsd-1-4-PATCH003:1.2
	tnf_000620:1.1.1.1;
locks; strict;
comment	@# @;


1.15
date	2019.06.23.09.21.30;	author nia;	state dead;
branches;
next	1.14;
commitid	hTyqn1vE2tpyfisB;

1.14
date	2011.07.02.22.19.30;	author dholland;	state Exp;
branches;
next	1.13;

1.13
date	2011.07.02.18.54.49;	author dholland;	state Exp;
branches;
next	1.12;

1.12
date	2008.09.11.04.22.50;	author dholland;	state Exp;
branches;
next	1.11;

1.11
date	2003.03.22.06.46.20;	author wiz;	state Exp;
branches;
next	1.10;

1.10
date	2002.11.19.20.58.04;	author reinoud;	state Exp;
branches;
next	1.9;

1.9
date	2002.08.25.21.51.43;	author jlam;	state Exp;
branches;
next	1.8;

1.8
date	2002.07.01.02.23.17;	author kristerw;	state Exp;
branches;
next	1.7;

1.7
date	2001.08.09.19.03.19;	author jlam;	state Exp;
branches
	1.7.2.1;
next	1.6;

1.6
date	2001.07.21.15.23.52;	author jlam;	state Exp;
branches;
next	1.5;

1.5
date	2001.04.09.16.44.59;	author drochner;	state Exp;
branches;
next	1.4;

1.4
date	2001.02.28.10.26.03;	author wiz;	state Exp;
branches;
next	1.3;

1.3
date	2001.01.14.12.31.11;	author drochner;	state Exp;
branches;
next	1.2;

1.2
date	2000.10.06.14.05.50;	author agc;	state Exp;
branches;
next	1.1;

1.1
date	2000.06.20.16.50.11;	author drochner;	state Exp;
branches
	1.1.1.1;
next	;

1.7.2.1
date	2002.08.25.21.22.01;	author jlam;	state Exp;
branches;
next	;

1.1.1.1
date	2000.06.20.16.50.11;	author drochner;	state Exp;
branches;
next	;


desc
@@


1.15
log
@Remove amaya.

It's unmaintained by upstream for most of this decade (even then, this
is an old version), and broken in bulk builds since at least last year.

Discussed on pkgsrc-users@@.
@
text
@$NetBSD: patch-aa,v 1.14 2011/07/02 22:19:30 dholland Exp $

- need to be able to check for wchar.h

--- Amaya/config.h.in~	2003-01-07 09:33:07.000000000 -0500
+++ Amaya/config.h.in	2008-09-08 04:37:57.000000000 -0400
@@@@ -321,6 +321,9 @@@@
 /* Define if you have the <unixlib.h> header file.  */
 #undef HAVE_UNIXLIB_H
 
+/* Define if you have the <wchar.h> header file.  */
+#undef HAVE_WCHAR_H
+
 /* Define if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
@


1.14
log
@Update amaya to 11.3.1. This is a leaf package, so it's ok during the
freeze; plus the prior version wasn't buildable anyhow.

pkgsrc changes:
   - add comments to patches
   - fix some pkglint
   - add a LICENSE
   - add a MESSAGE with url to the patches on cvsweb.n.o., which
     the license may require
   - enable the DAV and Redland RDF code

Vulnerabilities:
   - Fixes Secunia 34531.
   - Fixes CVE-2008-6005, which hasn't been in pkg-vulnerabilities for
     some reason.
   - No longer uses outdated builtin wxGTK, so CVE-2009-2369 no longer applies.
   - It isn't clear if Secunia 32848 is fixed or not.

Upstream changes:

Amaya 11.3.1

9 December 2009

    * Amaya merged paragraphs when several paragraphs are selected and
      the user applies to it Strong, Emphasis or Code
    * Sometimes after a <br> element is inserted the selection was misplaced
    * The caret at the end of a line is sometimes not displayed
    * The markup within <script> elements is now preserved
    * Bold Italic fonts were not available on Windows platforms
    * The $HOME variable is now ignored on Windows platforms

Amaya 11.3

2 December 2009
New Features

    * The https protocol is now supported
    * New version of the template editor: creation of XTiger
      libraries, components, imports, etc.
    * Automatic opening of the Structure view for template instances
    * The vertical split opens the Structure view and the horizontal
      split opens the Source view
    * A double click on an item of the List of style sheets tool opens
      the style sheet
    * A new set of Amaya profiles: "Lite", "Lite+Web", "Lite+Web+CSS",
      "Lite+Web+CSS+Math_Graphics", "Advanced"
    * The Insert entity command now allows one to insert a unicode
      character into a HTML document
    * A new command Undo close Tab in the Tab contextual menu
    * The Tab and Shift Tab commands allow one to move down/up list items
    * The fonts configuration changes: old personal fonts.gl and
      fonts.gl.win files have to be removed

Bug fixes

    * The link dialogue didn't allow one to insert relative links into
      a remote document
    * Sometimes the focus in the link dialogue was lost
    * Fix some rendering bugs and improve the CSS support
    * Improve the edit of template instances: management of options
      and attributes and fix bugs
    * The refresh of tool panels was too slow
    * PNG images were not displayed on 64-bit platforms
    * On Mac OSX, the ^ dead key behaved like if "enter" was pressed
    * On Mac OSX 10.5, sometimes cached files of the libwww were
      stored into the "/" directory
    * On Mac OS X platforms when scrolling, svg drawing moved up on the text
    * The table of contents was not generated when the selection is not empty
    * When the loaded file is ReadOnly, the Save As to another
      location didn't work

Amaya 11.2

3 July 2009
New Features

    * CSS: Support of z-index, opacity, SVG fill-rule, stop-opacity
      and stop-color properties
    * SVG: Implementation of linear gradients, copy/paste of markers
    * Amaya proposes now to keep a local copy of edited pages when the
      publishing fails
    * Publishing: Resources can be saved with the document
    * A new button allows one to lock/unlock WebDAV resources

Bug fixes

    * Move the selection into the structure view when the created
      <option> is not visible in the formated view
    * The Attributes panel is updated as soon as it is opened
    * When a column of a table is selected, Attributes and Style
      panels apply to the <col> element
    * Keep options of the table creation dialog
    * Improve the management of template instances: options, repeats, etc.
    * On Windows, local annotations were not correctly loaded
    * On Mac OS X: Improve the management of libwww cached files
    * The Code clean-up command now keeps style and lang attributes of
      <div>, <table>, <span>, and <img> elements
    * Improve the rendering of floated boxes and background images
    * Fix some redisplay problems
    * SVG: When there are several <group> elements, only the first
      <group> could be selected
    * SVG: When the <svg> element is centered, the position of new
      components was miscalculated
    * SVG: Improve the creation of arrows
    * Fix a crash on Windows version when the Tab key was used in a
      document that included a <form> element.
    * The Type of the last created document was sometimes lost.
    * Improve the WebDAV support
    * Etag and preconditions were always checked when a document was
      published
    * Optimize the calculation of large tables and documents
    * And other bug fixes...

Amaya 11.1

30 January 2009
New Features

    * Text wrapping in the source view
    * Partial support of SVG markers (arrow heads are now drawn with markers)

Bug fixes

    * Fix possible security holes CVE-2008-6005
    * Prevent a crash when the window, or a tab, or the application is
      closed and a dialog is opened
    * Display an empty window when the last tab of a window is closed
    * Allow to create a link to the document itself
    * Sometimes images were not loaded
    * Keep options of the Search/Replace command
    * Amaya ignored floated boxes within a table cell
    * Mac OS X: Sometimes the horizontal scroll bar was not displayed
      correctly
    * Mac OS X and Windows: Next element and Previous element keys
      were applied twice

Amaya 11.0

16 December 2008
New Features

    * Support of XHTML+RDFa documents:
          o RDFa attributes are parsed and can be edited
          o Possibility to create XHTML+RDFa documents
          o A command to add/remove namespace declarations of a document
          o List of namespace declarations defined in the RDFa Preference.
    * Shift+wheel scrolls the document horizontally
    * Support direct resizing of images
    * Integration of Japanese dialogs thanks to Martin D?rst
    * XHTML, MathML, SVG, Template, and XML panels are now tabs of the
      Elements tool
    * Few new characters are proposed in the Special Characters tool
    * A Span menu item is now available in the menu Insert > Character
      Element
    * SVG editing (a subset of the language)
    * Template editing
    * the Crtl-Click command opens a link in a new tab (Unix and Windows)
    * The Reload command re-open the source or the structure view
    * New management of Help documentation
    * Improvement of template instances editing (Enter key,
      transformations, contextual menus)
    * A Tools > Code clean up command to clean up documents generated
      by most word processors

Bug fixes

    * Improvement of the rendering engine
    * When the user selects in the structure view, the selection path
      was not displayed in the status bar
    * Sometimes images within a table were not displayed
    * CSS style sheets attached to an object were not applied
    * Close the help window when the user closes the last window document
    * The Save all command was active only when a edited document is displayed
    * Documents are now scrolled page by page
    * On Mac OS X the focus could be lost when a dialog is closed
    * On Mac OS X, Ctrl Enter didn't insert a <br>
    * Improvement of MathML editing
    * It was impossible to extend the selection outside a table
    * <br> elements were not copied/pasted
    * All attributes in MathML expressions were considered invalid
    * Interpretation of attributes attached to <col> elements to fix
      alignment, background-color, and width
    * Display "Column" instead of "td" or "th" in the statusbar when
      the whole column is selected
    * A background image CSS property attached to any element (*) was
      not applied immediately
    * Improvement of XML document saving
    * On Mac OS X, the default charset was set to us-ascii by error
    * Amaya now uses the Content Location to save a remote document
      without suffix (instead of redirecting to the Save As dialog)
    * Amaya requested a confirmation each times the PUT is redirected
    * Amaya keeps "\\windows-server\sharename\filename.html" URIs unchanged
    * When text typed causes image contents to be pushed (to the
      right) along with text, only part of the image was refreshed
    * In source view, <shif-PageUP/DN>, <shift-DNarrow>, and
      <shift-RTarrow> didn't work well.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.13 2011/07/02 18:54:49 dholland Exp $
@


1.13
log
@Don't use ../ in patches; GNU patch doesn't like it. Patch a bashism that
turned up when the portability check got broader.

XXX: this package doesn't build.
@
text
@d1 3
a3 1
$NetBSD: patch-aa,v 1.12 2008/09/11 04:22:50 dholland Exp $
@


1.12
log
@Update to 10.0.1 and add destdir support.
Changes are large and can be found at http://www.w3.org/Amaya/User/New.html.
This update also fixes an ancient security vulnerability and makes the
package build on amd64.
@
text
@d1 1
a1 1
$NetBSD$
d3 2
a4 2
--- ../config.h.in~	2003-01-07 09:33:07.000000000 -0500
+++ ../config.h.in	2008-09-08 04:37:57.000000000 -0400
@


1.11
log
@Update to 7.2, provided by David Forrai in PR 20539.
Many minor new features (at least nothing major struck me)
and lots of bug fixes (details: http://www.w3.org/Amaya/User/New.html).
pkg: now uses GTK instead of Motif.
@
text
@d3 2
a4 2
--- ../config.h.in.orig	Thu Jan 30 10:40:15 2003
+++ ../config.h.in
@


1.10
log
@Update the Amaya package from version 5.3 to 6.4. Main advantages are SVG
graphics rendering bonus and its more stable on my Alpha.

There are some issues with libPNG file loading but those are the same the
old version had; probably related to running on the Alpha.
@
text
@d3 5
a7 4
--- ../configure.orig	Mon Jul  8 09:19:26 2002
+++ ../configure
@@@@ -3008,7 +3008,7 @@@@ EOF
 fi
d9 5
a14 18
-for ac_hdr in stdio.h
+for ac_hdr in stdio.h wchar.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@@@ -6728,12 +6728,6 @@@@ fi
 
 
 if test "$build_amaya" = "yes" ; then
-    if test ! -f $srcdir/../libwww/Makefile.in ; then
-	echo "configure: warning: libwww sources not found !!" 1>&2
-	echo "configure: warning: Disabling Amaya build !" 1>&2
-	build_amaya="no"
-    fi
-
     if test ! -f $srcdir/amaya/MathML.S ; then
 	if test "$with_math" = "yes" ; then
 	    echo "configure: warning: MathML sources not found !!" 1>&2
@


1.9
log
@Merge packages from the buildlink2 branch back into the main trunk that
have been converted to USE_BUILDLINK2.
@
text
@d1 5
a5 4
$NetBSD: patch-aa,v 1.7.2.1 2002/08/25 21:22:01 jlam Exp $
--- ../configure.orig	Tue Jul  3 13:23:50 2001
+++ ../configure	Mon Jul  1 02:48:37 2002
@@@@ -3049,7 +3049,7 @@@@
d14 1
a14 1
@@@@ -6425,12 +6425,6 @@@@
@


1.8
log
@Make Amaya build on NetBSD 1.4.

NetBSD 1.4 does not have wchar.h, but everything needed by Amaya is
defined in stdlib.h. So add a wchar.h test to configure, and protect
inclusion of wchar.h by HAVE_WCHAR_H.

Solves PR 12358.
@
text
@d1 1
a1 1
$NetBSD$
@


1.7
log
@Update amaya to 5.1.  Pkgsrc changes include using www/libwww instead of
the libwww distribution included with the Amaya sources.  The two versions
are identical and we want to take advantage of NetBSD fixes/changes to the
libwww library from www/libwww.  Major changes from amaya-4.3.2 include:

* Large number of bug fixes.
* Improvement of tables printing.
* Amaya is now able to share structure schemas.
* Amaya provides a profile for XHTML 1.1.
* Support for Ruby Annotation.
* Amaya supports inclusion of SVG files linked by elements img or object.
@
text
@d2 11
a12 3

--- ../configure.orig	Tue Jul  3 07:23:50 2001
+++ ../configure
@


1.7.2.1
log
@Merge changes in the main trunk into the buildlink2 branch for those
packages that have been converted to USE_BUILDLINK2.
@
text
@d1 4
a4 12
$NetBSD: patch-aa,v 1.8 2002/07/01 02:23:17 kristerw Exp $
--- ../configure.orig	Tue Jul  3 13:23:50 2001
+++ ../configure	Mon Jul  1 02:48:37 2002
@@@@ -3049,7 +3049,7 @@@@
 fi
 
 
-for ac_hdr in stdio.h
+for ac_hdr in stdio.h wchar.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@


1.6
log
@* Make this compile again after previous partial conversion to buildlink.
* Use lesstif/buildlink.mk instead of USE_MOTIF.
* Simplify patch to configure by fixing --with-graphic-libs check.
* Ensure that proper LDFLAGS are passed through to build process to ensure
  linking against proper libraries.
@
text
@d3 1
a3 1
--- ../configure.orig	Wed Feb 28 02:34:16 2001
d5 1
a5 3
@@@@ -1651,7 +1651,7 @@@@
   :
 fi
d7 11
a17 14
-if test "$with_graphic-libs" = "no" ; then
+if test "$with_graphic_libs" = "no" ; then
     echo $ac_n "checking for libjpeg version = 6b""... $ac_c" 1>&6
 echo "configure:1657: checking for libjpeg version = 6b" >&5
     cat > conftest.$ac_ext <<EOF
@@@@ -1686,7 +1686,7 @@@@
   rm -rf conftest*
           echo "$ac_t""yes" 1>&6
         LIBPNG='-lpng'
-        LIBZ=''
+        LIBZ='-lz'
 	MAKEPNG='#'
 else
   rm -rf conftest*
@


1.5
log
@Update to 4.3.2.
See http://www.w3.org/Amaya/User/New.html for the changelog - it's too
much to list here.
@
text
@d3 1
a3 1
--- ../configure.orig	Wed Feb 28 11:34:16 2001
d5 1
a5 1
@@@@ -1651,57 +1651,11 @@@@
d10 7
a16 33
-    echo $ac_n "checking for libjpeg version = 6b""... $ac_c" 1>&6
-echo "configure:1657: checking for libjpeg version = 6b" >&5
-    cat > conftest.$ac_ext <<EOF
-#line 1659 "configure"
-#include "confdefs.h"
-#include <jpeglib.h>
-         x JPEG_LIB_VERSION x
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "x 62 *x" >/dev/null 2>&1; then
-  rm -rf conftest*
-          echo "$ac_t""yes" 1>&6
         LIBJPEG='-ljpeg'
         MAKEJPEG='#'
-else
-  rm -rf conftest*
-          echo "$ac_t""no" 1>&6
-        LIBJPEG='../libjpeg.a'              
-fi
-rm -f conftest*
-
-    echo $ac_n "checking for libpng version = 1.0.x""... $ac_c" 1>&6
-echo "configure:1678: checking for libpng version = 1.0.x" >&5
-    cat > conftest.$ac_ext <<EOF
-#line 1680 "configure"
-#include "confdefs.h"
-#include <png.h>
-	x PNG_LIBPNG_VER_STRING x
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "x \"1.0\..*\" *x" >/dev/null 2>&1; then
-  rm -rf conftest*
-          echo "$ac_t""yes" 1>&6
d18 2
a19 1
         LIBZ=''
d21 2
a22 37
-else
-  rm -rf conftest*
-          echo "$ac_t""no" 1>&6
-        LIBPNG='../libpng.a'
-        LIBZ='../libz.a'
-        
-fi
-rm -f conftest*
-
-else
-    LIBJPEG='../libjpeg.a'
-    LIBPNG='../libpng.a'
-    LIBZ='../libz.a'
-fi
 
 
 
@@@@ -6453,10 +6407,7 @@@@
 #there is a modified header file we need
 PNGINCL="-I\$(THOTDIR)/libpng -I\$(THOTDIR)/libpng/zlib"
 fi
-if test "${LIBJPEG}" = "../libjpeg.a" ; then
-#there is a modified header file we need
-JPEGINCL="-I\$(THOTDIR)/libjpeg"
-fi
+JPEGINCL="-I${LOCALBASE}/include"
 
 
 THOTINCLUDES="-I${API} -I${VAR} -I${INCL} -I${FUNC} -I${SCHEMAS} ${JPEGINCL} ${PNGINCL}"
@@@@ -6523,7 +6474,6 @@@@
 
 EXTRA_MAKEFILE_IN=
 make_output="Makefile Options.orig:Options.in tools/Makefile \
-       libjpeg/Makefile libpng/Makefile libpng/zlib/Makefile \
        tools/mkdep/Makefile \
        tools/cextract-1.7/Makefile thotlib/Makefile \
        thotlib/include/Makefile batch/Makefile tablelib/Makefile"
@


1.4
log
@We want RCS Ids in the patches.
This is one of the things pkglint checks, so _please_ use it.
@
text
@d2 4
a5 3
--- ../configure.orig	Sun Jan 14 12:11:19 2001
+++ ../configure	Sun Jan 14 12:20:22 2001
@@@@ -1651,58 +1651,12 @@@@
d9 1
a9 1
-if test "$with_included_jpeg" != "yes" ; then
d19 1
a19 1
-  egrep "x 62 x" >/dev/null 2>&1; then
d30 1
a30 2
+	JPEGINCL=-I${LOCALBASE}/include
 
d40 1
a40 1
-  egrep "x \"1.0\..*\" x" >/dev/null 2>&1; then
d43 3
a45 3
-        LIBPNG='-lpng'
-        LIBZ=''
-	MAKEPNG='#'
d49 1
a49 1
         LIBPNG='../libpng.a'
a59 2
-
+	LIBZ=''
d63 13
a75 1
@@@@ -6518,7 +6472,7 @@@@
a79 1
+       libpng/Makefile \
@


1.3
log
@update to 4.2.1
From the changelog:
                            Amaya 4.2.1

   22 December, 2000

Bug fixes

     * The Docttype was not generated for HTML documents after
       creation of a new HTML element.
     * Doing  a  transformation  on  an  HTML document crashed
       Amaya without saving the edited document.

                             Amaya 4.2

   21 December, 2000

New features

     * Amaya  is  now able to read and save UTF8 documents but
       it's   only  able  to  display  ASCII  and  ISO-latin-1
       characters  and  some  mathematical  symbols. For other
       characters  it keeps the Unicode value of the character
       and  displays  a '?'. When an encoding is not supported
       by Amaya, the document is not parsed.
     * MathML:   attributes   rowalign   and  columnalign  are
       interpreted.
     * MathML   2.0:  new  attributes  mathvariant,  mathsize,
       mathcolor, mathbackground, linebreak
     * Annotations:  new  configuration  options for disabling
       the  automatic download of local and remote annotations
       each  time  Amaya  is  started for users who frequently
       work  without network access. Note that this new option
       is  enabled  by  default; users who prefer the previous
       behavior  of  always  querying  annotation  servers can
       select  that behavior from the Annotations/Configure...
       dialog  by  unchecking  the 'Disable remote autoload at
       each startup' and checking the two 'Autoload' boxes.

Bug fixes

     * Annotations:  Annotations  didn't  work  under Windows,
       when Amaya was installed in a directory with a space on
       its  name (e.g., Program Files). Similarly, annotations
       on  local  documents  didn't  work  if the path to this
       document had a space.
     * After  doing a form POST, Amaya always proposed to save
       the  answer  sent  back by the server, even if it could
       understand  its content type (bug introduced in the 4.0
       version).
     * Since  version  4.1,  it's  possible to change the user
       preferences  directory by setting the APP_HOME variable
       in  the win-thot.rc file. However, the user preferences
       were still being read from the default location.
     * After a crash, modified documents with a space in their
       name were not restored.
     * When  Amaya  crashed  during a text insertion, the last
       inserted text was lost.
     * Configure   failed  to  read  the  version  numbers  in
       /usr/include/libjpeg.h  and  /usr/include/png.h (thanks
       to Patrik Hagglund).
     * Updating of German and Italian translations.
     * Contribution   from   Johannes   Zellner  for  enabling
       tear-off menus on Unix platforms.
     * The command Save As added the suffix ".html" to SVG and
       MathML documents.
     * Amaya  was sometimes confusing MathML and SVG elements:
       Schema  ids  were  based  on  the  compiling  time  (in
       seconds)  and  Amaya  used  ids  to  detect whether two
       elements  belong to the same schema or not. That method
       doesn't  work  with  computers that are able to compile
       more  than  one  schema  per  second. Now, Amaya checks
       schema names instead of schema ids.
     * Selection:   When   the   hyphanation  was  active  the
       selection didn't work correctly.
     * Print:  The  command  Print  crashed  when the document
       included XLink attributes.
     * Print:  In  some cases Amaya hanged during the printing
       or generated too short pages.
     * Windows: The dialogue Underline didn't work correctly.
     * Windows:  Improving drawing functions and a part of the
       program print.
     * SVG:  CSS  rules  of  the  SVG  element  style were not
       interpreted when printing.
     * SVG:  Images can be created and edited freely within an
       SVG drawing
     * SVG: When changing the xlink:href attribute of elements
       image  and  use  in SVG, those elements are redisplayed
       according to the new value of the attribute.
     * SVG:  When  the  user created a mathematical expression
       into  a  SVG, the math element was displayed before the
       user selected a position. This was confusing.
     * HTML:  Amaya  hanged  when  the  META  Content-Type was
       quoted by simple quotes.

                             Amaya 4.1

   23 November, 2000

New features

     * Annotations: localization of the Local Filter menu.
     * Windows:  It's  now possible to change the value of the
       user's  preferences  directory.  To  do  so,  edit  the
       win-thot.rc  and  add a variable called APP_HOME in the
       [amaya]  section.  The value of this variable should be
       the  path to directory. This is interesting if you want
       to  install Amaya in an NFS drive, but store the user's
       preferences locally.
     * When the encoding of a XML document is not set, it uses
       the  default  enconding  (UTF 8). This version of Amaya
       doesn't  handle  UTF  8  and this document shouldn't be
       edited  with  Amaya.  In  many  cases  these  documents
       contain  only  ASCII  characters and can be interperted
       correctly  as  ISOlatin-1encoded  documents.  It is why
       Amaya  proposes to set the ISOlatin-1encoding when it's
       not found.

Bug fixes

     * Open  the  Log  file and close it. Then open the source
       view and close it: all other wiews of that document are
       also closed
     * The  entry  "Show parsing errors" (previously "Show Log
       file") is now located in the Views menu
     * Amaya  didn't find out the encoding when it is given by
       a META element. It works now.
     * When  saving a HTML document as XML a wrong DOCTYPE was
       generated: it said the document was HTML 4.0 whereas it
       was XHTML 1.0 actually.
     * In  a  XHTML  document, if you copy and paste an anchor
       with  both  a  name  and  an id, the name of the pasted
       element was changed to make it unique, but not the id.
     * The   MakeBook  command  didn't  work  well  on  remote
       documents that included images and could crash Amaya.
     * The  default  Windows  geometry  was too small for some
       views and documents.
     * Spell  checker: some options didn't reflect the current
       value.  The  special  characters  entry  wasn't working
       under Windows.
     * MathML:  entity  LeftAngleBracket was not recognized by
       the parser
     * MathML:  the entity InvisibleTimes was displayed with a
       too large space on Windows platforms.
     * SVG:  element style is now recognized and the CSS rules
       it contains are applied as expected.
     * SVG: element use is recognized and handled correctly
     * SVG:  comments  and PIs were not displayed correctly in
       the structure view
     * SVG:  text  elements  were  displayed a bit below their
       normal position
     * SVG:  in some cases polylines and polygons were resized
       by mistake
     * SVG:  when  printing the background of the whole SVG or
       group was painted if there was a CSS rule fill
     * SVG:  elements  are  now created with the right default
       colors (fill=black, stroke=none).
     * Annotations:   the  Annotation  element  (pencil  icon)
       wasn't being skipped always when resolving an XPointer.
       This  problem  could  occur  with  orphan  and document
       annotations.
     * Annotations:   ID  attributes  were  not  always  being
       searched correctly in the document's tree.
     * Annotations:   The   Windows  annotations  project  was
       missing from the source tar package.

                             Amaya 4.0

   10 November, 2000

New features

     * Support for a subset of the SVG graphics format, namely
       basic  shapes,  text,  images,  and  foreignObject (the
       later  is  useful  to  include HTML fragments or MathML
       expressions in drawings).
     * Support for native MathML and SVG documents.
     * Support  for  collaborative  annotations, based on RDF,
       XPointer, and XLink..
     * A  single  structure  view  displays  the  structure of
       equations   and   drawings   along  with  the  document
       structure.
     * Generates XHTML document with the right charset.
     * Three  new  profiles: XHTML-transitional, XHTML-strict,
       XHTML-basic. In these profiles, Amaya checks the validy
       of  the  (X)HTML  documents it loads, and it allows the
       user   to   create   only   elements   and   attributes
       corresponding to the chosen profile.
     * MathML:  attributes  macros,  display, overflow, altimg
       and  alttext  are  now available for the top-level math
       element. Attribute alttext is rendered in the Alternate
       view.  Attribute  linethickness  allows  to control the
       aspect of fraction bars.
       Many improvements to math formatting.
       Keys  ->  and <- move the caret according to the MathML
       structure.
     * Upgraded libwww to release 5.3.1
     * Added  the  HTTP  reason  string  to the the save error
       dialog box.
     * Spanish  translation of the Amaya dialogues contributed
       by Pedro Pablo Fabrega
     * The  inline  documentation  is  now available in French
       (other translations are welcome).
     * New  menu  (Special/Create Remove IDs) to add or remove
       ID  attributes  to/from  elements,  either  globally or
       within a selection.
     * Searching is case insensitive by default.
     * The  dialog  box  of link creation allows you to browse
       local files.
     * When  the selection is within a link (an anchor with an
       attribute  href),  the  status line displays the URI of
       the target.
     * The  geometry  of  windows  is now expressed in pixels.
       Users   may   have   to   update   their  configuration
       (Special/Preferences/Window Geometry menu).

Bug fixes

     * When  the selected OPTION in a SELECT within a FORM had
       no content and no value attribute, the value posted for
       the SELECT element was some random garbage.
     * Amaya  hung  when  reading  a  textarea with an initial
       value.
     * When  converting  a  document from HTML to XHTML, Amaya
       did  not  check whether the id's it created were valid.
       For instance, it generated id's starting with a digit.
     * The charset given in the XML declaration was ignored by
       Amaya.
     * 24  bits per pixel images were not handled correctly on
       Unix platforms (thanks to Walter Bächi)
     * Saving a document source crashed Amaya when it followed
       an aborted closing of that document source.
     * When  the  BODY  element  of  an  (X)HTML  document  is
       selected,  command  Delete is no longer refused: it let
       you with an empty BODY element.
     * When  a  background  image is not repeated, Amaya takes
       into  account  the  transparency  now (Unix and Windows
       platforms).
     * After  a synchronisation Amaya considered that both the
       source view and the formatted view should be saved. Now
       the  user  can  decide to save either the source or the
       formatted view but only one of them.
     * The text editing is now more robust.
     * When  browsing a remote URL, Amaya systematically added
       a "/" end character to the URL if the URL didn't finish
       by an extension.
     * It  was  hard  to  create  an  area Polygon because the
       selection hid the associated image.
     * When  a  paragraph  with  a top margin was reformatted,
       included  lines (excepted the last one) were shifted by
       error.
     * In the Structure view, an anchor repeated the attribute
       ID of its parent.
     * Opening  an image that didn' have an extension resulted
       in a crash.

   Windows bugs
     * The  menu Background Image on Windows platforms crashed
       Amaya.
     * On  Windows  platforms,  sometimes Amaya didn't display
       background images correctly.
     * Some  colors  (like  border  colors) were not correctly
       displayed on Windows platforms.
     * Each  time  the  user clicked on the button Math, a new
       Math  palette  was  generated,  now only one palette is
       displayed.
     * It was the same for the dialogue Search/Replace.
     * When  all  entries  of  a  submenu  were  hidden in the
       current profile, the submenu entry was not removed. Now
       it works like on Unix platforms.
     * Troubles   after  a  cancel  of  the  operation  "Close
       Dcument".
@
text
@d1 1
@


1.2
log
@Make this package work with xpkgwedge installed, by passing MOTIFBASE
through the environment, and using the value in the configure script.
@
text
@d1 3
a3 5
$NetBSD: patch-aa,v 1.1.1.1 2000/06/20 16:50:11 drochner Exp $

--- ../configure.orig	Wed Apr 19 14:33:08 2000
+++ ../configure	Sat Jun 17 20:50:20 2000
@@@@ -1659,57 +1659,14 @@@@
d9 1
a9 1
-echo "configure:1665: checking for libjpeg version = 6b" >&5
d11 1
a11 1
-#line 1667 "configure"
d17 1
a17 1
-  egrep "x 62  x" >/dev/null 2>&1; then
d30 2
a31 2
-    echo $ac_n "checking for libpng version = 1.0.1""... $ac_c" 1>&6
-echo "configure:1686: checking for libpng version = 1.0.1" >&5
d33 1
a33 1
-#line 1688 "configure"
d39 1
a39 1
-  egrep "x \"1.0.1\"  x" >/dev/null 2>&1; then
d42 3
a44 3
         LIBPNG='-lpng'
         LIBZ=''
 	MAKEPNG='#'
d48 1
a48 1
-        LIBPNG='../libpng.a'
d59 3
a61 1
+	PNGINCL=-I${LOCALBASE}/include
d64 1
d66 7
a72 16
@@@@ -6220,6 +6177,7 @@@@
     /usr/local/lesstif/include\
     /usr/gnu/lesstif/include  \
     $HOME/lesstif/include     \
+    $MOTIFBASE/include		\
     ; \
   do
     if test -r "$ac_dir/$motif_direct_test_include"; then
@@@@ -6271,6 +6229,7 @@@@
     /usr/local/lesstif/lib\
     /usr/gnu/lesstif/lib  \
     $HOME/lesstif/lib     \
+    $MOTIFBASE/lib		\
     ; \
 do
   for ac_extension in a so sl; do
@


1.1
log
@Initial revision
@
text
@d1 1
a1 1
$NetBSD$
d65 16
@


1.1.1.1
log
@add amaya: W3C's HTML viewer/editor
@
text
@@