head	1.4;
access;
symbols
	pkgsrc-2019Q1:1.3.0.66
	pkgsrc-2019Q1-base:1.3
	pkgsrc-2018Q4:1.3.0.64
	pkgsrc-2018Q4-base:1.3
	pkgsrc-2018Q3:1.3.0.62
	pkgsrc-2018Q3-base:1.3
	pkgsrc-2018Q2:1.3.0.60
	pkgsrc-2018Q2-base:1.3
	pkgsrc-2018Q1:1.3.0.58
	pkgsrc-2018Q1-base:1.3
	pkgsrc-2017Q4:1.3.0.56
	pkgsrc-2017Q4-base:1.3
	pkgsrc-2017Q3:1.3.0.54
	pkgsrc-2017Q3-base:1.3
	pkgsrc-2017Q2:1.3.0.50
	pkgsrc-2017Q2-base:1.3
	pkgsrc-2017Q1:1.3.0.48
	pkgsrc-2017Q1-base:1.3
	pkgsrc-2016Q4:1.3.0.46
	pkgsrc-2016Q4-base:1.3
	pkgsrc-2016Q3:1.3.0.44
	pkgsrc-2016Q3-base:1.3
	pkgsrc-2016Q2:1.3.0.42
	pkgsrc-2016Q2-base:1.3
	pkgsrc-2016Q1:1.3.0.40
	pkgsrc-2016Q1-base:1.3
	pkgsrc-2015Q4:1.3.0.38
	pkgsrc-2015Q4-base:1.3
	pkgsrc-2015Q3:1.3.0.36
	pkgsrc-2015Q3-base:1.3
	pkgsrc-2015Q2:1.3.0.34
	pkgsrc-2015Q2-base:1.3
	pkgsrc-2015Q1:1.3.0.32
	pkgsrc-2015Q1-base:1.3
	pkgsrc-2014Q4:1.3.0.30
	pkgsrc-2014Q4-base:1.3
	pkgsrc-2014Q3:1.3.0.28
	pkgsrc-2014Q3-base:1.3
	pkgsrc-2014Q2:1.3.0.26
	pkgsrc-2014Q2-base:1.3
	pkgsrc-2014Q1:1.3.0.24
	pkgsrc-2014Q1-base:1.3
	pkgsrc-2013Q4:1.3.0.22
	pkgsrc-2013Q4-base:1.3
	pkgsrc-2013Q3:1.3.0.20
	pkgsrc-2013Q3-base:1.3
	pkgsrc-2013Q2:1.3.0.18
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2013Q1:1.3.0.16
	pkgsrc-2013Q1-base:1.3
	pkgsrc-2012Q4:1.3.0.14
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2012Q3:1.3.0.12
	pkgsrc-2012Q3-base:1.3
	pkgsrc-2012Q2:1.3.0.10
	pkgsrc-2012Q2-base:1.3
	pkgsrc-2012Q1:1.3.0.8
	pkgsrc-2012Q1-base:1.3
	pkgsrc-2011Q4:1.3.0.6
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q3:1.3.0.4
	pkgsrc-2011Q3-base:1.3
	pkgsrc-2011Q2:1.3.0.2
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2011Q1:1.1.0.24
	pkgsrc-2011Q1-base:1.1
	pkgsrc-2010Q4:1.1.0.22
	pkgsrc-2010Q4-base:1.1
	pkgsrc-2010Q3:1.1.0.20
	pkgsrc-2010Q3-base:1.1
	pkgsrc-2010Q2:1.1.0.18
	pkgsrc-2010Q2-base:1.1
	pkgsrc-2010Q1:1.1.0.16
	pkgsrc-2010Q1-base:1.1
	pkgsrc-2009Q4:1.1.0.14
	pkgsrc-2009Q4-base:1.1
	pkgsrc-2009Q3:1.1.0.12
	pkgsrc-2009Q3-base:1.1
	pkgsrc-2009Q2:1.1.0.10
	pkgsrc-2009Q2-base:1.1
	pkgsrc-2009Q1:1.1.0.8
	pkgsrc-2009Q1-base:1.1
	pkgsrc-2008Q4:1.1.0.6
	pkgsrc-2008Q4-base:1.1
	pkgsrc-2008Q3:1.1.0.4
	pkgsrc-2008Q3-base:1.1
	cube-native-xorg:1.1.0.2
	cube-native-xorg-base:1.1;
locks; strict;
comment	@# @;


1.4
date	2019.06.23.09.21.30;	author nia;	state dead;
branches;
next	1.3;
commitid	hTyqn1vE2tpyfisB;

1.3
date	2011.07.02.22.19.30;	author dholland;	state Exp;
branches;
next	1.2;

1.2
date	2011.07.02.18.54.49;	author dholland;	state Exp;
branches;
next	1.1;

1.1
date	2008.09.11.04.22.50;	author dholland;	state Exp;
branches;
next	;


desc
@@


1.4
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-aj,v 1.3 2011/07/02 22:19:30 dholland Exp $

- fix energizer-bunny-makefiles
- hack around build failure in davlib/ (see pkgsrc Makefile for discussion)

--- Amaya/Makefile.in.orig	2009-09-15 12:41:32.000000000 +0000
+++ Amaya/Makefile.in
@@@@ -13,7 +13,11 @@@@ include Options
 LIBWWW	   = libwww
 
 #MKP: adding davlib
-SUBDIRS	= @@SUBDIRS@@ tools thotlib batch annotlib @@DAVDIR@@ amaya
+# Does not build this way - you have to do a partial build in amaya/ first.
+# it appears that if you don't recurse into davlib but do enable it, it
+# cross-recurses from amaya/ after building the needed generated files.
+# Sheesh.
+SUBDIRS	= @@SUBDIRS@@ tools thotlib batch annotlib amaya
 EXTRA_SUBDIRS= $(BUILDRAPTOR) @@BUILDLIBWWW@@ $(WX_BUILDDIR) $(GL_BUILDDIR)
 
 prefix = @@prefix@@
@@@@ -36,44 +40,44 @@@@ force :
 
 batch: rebuild force
 	@@(if test -d batch ; then cd batch ; \
-	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" ; fi)
+	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" ; fi) || exit 1
 
 tools: rebuild force
 	@@(if test -d tools ; then cd tools ; \
-	  $(MAKE) CC="$(CC)" CFLAGS="-O -x c" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" all ; fi)
+	  $(MAKE) CC="$(CC)" CFLAGS="-O -x c" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" all ; fi) || exit 1
 
 thotlib: rebuild force
 	@@(if test -d thotlib ; then cd thotlib ; \
-	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" all ; fi)
+	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" all ; fi) || exit 1
 
 amaya_prog: rebuild force bin/str
 	@@(if test -d amaya ; then cd amaya ; \
-	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" amaya ; fi)
+	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" amaya ; fi) || exit 1
 
 wxwidgets: rebuild force
 	@@(if test -d "$(WX_BUILDDIR)" ; then cd "$(WX_BUILDDIR)" ; \
-	  $(MAKE) ; fi)
+	  $(MAKE) ; fi) || exit 1
 
 gl: rebuild force
 	@@(if test -d "$(GL_BUILDDIR)" ; then cd "$(GL_BUILDDIR)" ; \
-	  $(MAKE) ; fi)
+	  $(MAKE) ; fi) || exit 1
 
 print_prog: rebuild force bin/str
 	@@(if test -d thotlib ; then cd thotlib ; \
-  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" print ; fi)
+  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" print ; fi) || exit 1
 
 all : rebuild
 	@@(for dir in $(EXTRA_SUBDIRS) $(SUBDIRS) ;\
 	  do if test -d $$dir ; then cd $$dir ; \
-	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" all ; \
-	  cd .. ; fi ;done )
+	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" all || exit 1; \
+	  cd .. ; fi ;done ) || exit 1
 
 clean : rebuild
 	$(RM) libpng.a libz.a libjpeg.a
 	@@(for dir in $(SUBDIRS) $(EXTRA_SUBDIRS) ;\
 	  do if test -d $$dir ; then cd $$dir ; \
-	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" clean ; \
-	  cd .. ; fi ;done )
+	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" clean || exit 1; \
+	  cd .. ; fi ;done ) || exit 1
 
 reallyclean : clean
 	$(RM) config.cache config.h config.log config.status
@@@@ -86,14 +90,14 @@@@ tempclean : 
 install : rebuild
 	@@(for dir in $(SUBDIRS) ;\
 	  do if test -d $$dir ; then cd $$dir ; \
-	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" install ; \
-	  cd .. ; fi ;done )
+	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" install || exit 1; \
+	  cd .. ; fi ;done ) || exit 1
 
 uninstall : 
 	@@(for dir in $(SUBDIRS) ;\
 	  do if test -d $$dir ; then cd $$dir ; \
-	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" uninstall ; \
-	  cd .. ; fi ;done )
+	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" uninstall || exit 1; \
+	  cd .. ; fi ;done ) || exit 1
 
 update :
 	@@(cd $(THOTDIR) ; cvs update -dP)
@@@@ -104,26 +108,26 @@@@ commit :
 	@@(cd $(THOTDIR) ; cvs commit)
 
 tools/mkdep/mkdep :
-	@@(cd tools/mkdep ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" mkdep)
+	@@(cd tools/mkdep ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" mkdep) || exit 1
 
 depend depends : rebuild tools/mkdep/mkdep
 	@@(for dir in $(SUBDIRS) ;\
 	  do if test -d $$dir ; then cd $$dir ; \
-	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" depend ; \
-	  cd .. ; fi ;done )
+	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" depend || exit 1; \
+	  cd .. ; fi ;done ) || exit 1
 
 bin/cextract :
-	@@(cd tools/cextract-$(CEXTRACT_VER) ; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" cextract)
+	@@(cd tools/cextract-$(CEXTRACT_VER) ; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" cextract) || exit 1
 
 proto : rebuild bin/cextract
 	@@(for dir in $(SUBDIRS) ;\
 	  do if test -d $$dir ; then cd $$dir ; \
-	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" proto ; \
-	  cd .. ; fi ;done )
+	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" proto || exit 1; \
+	  cd .. ; fi ;done ) || exit 1
 
 mkid : 
 	@@(echo rebuilding $(THOTDIR)/ID reference file)
-	@@(cd $(THOTDIR); mkid --lang-map=makes/id-lang.map . classes/org/w3c/*)
+	@@(cd $(THOTDIR); mkid --lang-map=makes/id-lang.map . classes/org/w3c/*) || exit 1
 
 #
 # Rules to rebuild the libWWW package
@


1.3
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$
@


1.2
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 1
a1 1
$NetBSD: patch-aj,v 1.1 2008/09/11 04:22:50 dholland Exp $
d3 19
a21 3
--- Amaya/Makefile.in.orig	2007-12-06 08:09:56.000000000 -0500
+++ Amaya/Makefile.in	2008-09-08 14:19:26.000000000 -0400
@@@@ -37,44 +37,44 @@@@ force :
d77 1
a77 1
@@@@ -87,14 +87,14 @@@@ tempclean : 
d96 1
a96 1
@@@@ -105,26 +105,26 @@@@ commit :
a129 95
@@@@ -150,11 +150,11 @@@@ AMAYA_LIBWWW_STANDARD_LIBS = \
 
 libwww_config :
 	@@(if [ ! -d $(THOTDIR)/../$(LIBWWW) ] ; then \
-	      $(ECHO) "Error libwww dir not found at $(THOTDIR)/../$(LIBWWW)" ; \
-	  fi)
+	      $(ECHO) "Error libwww dir not found at $(THOTDIR)/../$(LIBWWW)" ; exit 1; \
+	  fi) || exit 1
 	@@(if [ ! -d $(LIBWWW) ] ; then \
 		$(MKDIR) $(LIBWWW) ; \
-          fi)
+          fi) || exit 1
 #MKP: adding --with-dav
 	@@(localdir=`pwd` ; libwwwdir="$$localdir/../../$(LIBWWW)" ; \
 	  cd $(LIBWWW) ; unset LANG; \
@@@@ -170,7 +170,7 @@@@ libwww_config :
 		$(SED) "s/\(\#define HAVE_APPKIT_APPKIT_H 1\)/\/* \1 *\//" \
 			wwwconf.h.orig > wwwconf.h ; \
                 $(ECHO) "wwwconf.h patched !" ; \
-	  fi)
+	  fi) || exit 1
 
 libwww_make_module_md5 \
 libmd5 : force
@@@@ -178,7 +178,7 @@@@ libmd5 : force
 		 cd $(LIBWWW)/modules/md5 ; \
 		 $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) $(EXPAT_OPTIONS)" \
 		 CPPFLAGS="$(CPPFLAGS) $(THOTINCLUDES) $(EXTRA_INCLUDES)" \
-	        	    libmd5.la)
+	        	    libmd5.la) || exit 1
 
 libwww_install_module_md5 : force
 		@@(if [ -e libmd5.a -a ! -L libmd5.a ] ; then \
@@@@ -194,7 +194,7 @@@@ libexpat : force
 		  cd $(LIBWWW)/modules/expat/ ; \
 		  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) $(EXPAT_OPTIONS) -DXML_AMAYA" \
 		  CPPFLAGS="$(CPPFLAGS)" \
-	        	    )
+	        	    ) || exit 1
 
 libwww_install_module_expat : force
 		@@(if [ -e libexpat.a -a ! -L libexpat.a ] ; then \
@@@@ -230,7 +230,7 @@@@ $(AMAYA_LIBWWW_STANDARD_LIBS) : force
 		  cd $(LIBWWW)/Library/src ; \
 		  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) $(EXPAT_OPTIONS)" \
 		  CPPFLAGS="$(CPPFLAGS) $(THOTINCLUDES) $(EXTRA_INCLUDES)" \
-			     $$all_libs)
+			     $$all_libs) || exit 1
 
 libwww_install_standard : force
 		@@(for lib in $(AMAYA_LIBWWW_STANDARD_LIBS) ; do \
@@@@ -299,7 +299,7 @@@@ redland_config: @@MAKEREDLAND@@ force
 redland_make: @@MAKEREDLAND@@ force
 	@@(cd $(REDLAND) ; \
 	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) -DLIBRDF_INTERNAL=1"; \
-	)
+	) || exit 1
 
 redland: @@MAKEREDLAND@@ redland_config redland_make
 	@@($(ECHO) "redland is installed")
@@@@ -308,25 +308,25 @@@@ redland: @@MAKEREDLAND@@ redland_config re
 # Rules to rebuild the libjpeg package
 #
 
-libjpeg libjpeg.a : force
-	@@($(RM) $(THOTDIR)/libjpeg/*.o)
-	@@(cd libjpeg ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c")
+#libjpeg libjpeg.a : force
+#	@@($(RM) $(THOTDIR)/libjpeg/*.o)
+#	@@(cd libjpeg ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c") || exit 1
 
 #
 # Rules to rebuild the libpng package
 #
 
-libpng libpng.a : force
-	@@($(RM) $(THOTDIR)/libpng/*.o)
-	@@(cd libpng ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c")
+#libpng libpng.a : force
+#	@@($(RM) $(THOTDIR)/libpng/*.o)
+#	@@(cd libpng ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c") || exit 1
 
 #
 # Rules to rebuild the libpng package
 #
 
-libz libz.a : force
-	@@($(RM) $(THOTDIR)/libpng/libz/*.o)
-	@@(cd libpng/zlib ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c")
+#libz libz.a : force
+#	@@($(RM) $(THOTDIR)/libpng/libz/*.o)
+#	@@(cd libpng/zlib ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c") || exit 1
 
 #
 # This section try to maintain the Makefile(s) up-to-date in
@


1.1
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
--- ../Makefile.in.orig	2007-12-06 08:09:56.000000000 -0500
+++ ../Makefile.in	2008-09-08 14:19:26.000000000 -0400
@