pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www Remove amaya.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/cb0e6006d1f9
branches:  trunk
changeset: 335604:cb0e6006d1f9
user:      nia <nia%pkgsrc.org@localhost>
date:      Sun Jun 23 09:21:30 2019 +0000

description:
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@.

diffstat:

 www/Makefile                                           |     3 +-
 www/amaya/DESCR                                        |     6 -
 www/amaya/MESSAGE                                      |     9 -
 www/amaya/Makefile                                     |   141 -
 www/amaya/PLIST                                        |  1137 ----------------
 www/amaya/distinfo                                     |    26 -
 www/amaya/hacks.mk                                     |     8 -
 www/amaya/patches/patch-Amaya_amaya_HTMLedit_c         |    16 -
 www/amaya/patches/patch-Amaya_thotlib_base_platform_c  |    19 -
 www/amaya/patches/patch-aa                             |    16 -
 www/amaya/patches/patch-ab                             |    65 -
 www/amaya/patches/patch-ac                             |    18 -
 www/amaya/patches/patch-ad                             |    21 -
 www/amaya/patches/patch-ae                             |    52 -
 www/amaya/patches/patch-ag                             |    16 -
 www/amaya/patches/patch-ai                             |    15 -
 www/amaya/patches/patch-aj                             |   129 -
 www/amaya/patches/patch-ak                             |    24 -
 www/amaya/patches/patch-al                             |    15 -
 www/amaya/patches/patch-am                             |    32 -
 www/amaya/patches/patch-an                             |    15 -
 www/amaya/patches/patch-ao                             |    15 -
 www/amaya/patches/patch-aq                             |    16 -
 www/amaya/patches/patch-ar                             |    15 -
 www/amaya/patches/patch-as                             |    15 -
 www/amaya/patches/patch-libwww_Library_src_SSL_HTSSL.c |    14 -
 www/amaya/patches/patch-libwww_Library_src_SSL_HTSSL.h |    12 -
 27 files changed, 1 insertions(+), 1869 deletions(-)

diffs (truncated from 1988 to 300 lines):

diff -r a228da3dc1c0 -r cb0e6006d1f9 www/Makefile
--- a/www/Makefile      Sun Jun 23 09:15:11 2019 +0000
+++ b/www/Makefile      Sun Jun 23 09:21:30 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1390 2019/06/19 10:07:50 fcambus Exp $
+# $NetBSD: Makefile,v 1.1391 2019/06/23 09:21:30 nia Exp $
 #
 
 COMMENT=       Packages related to the World Wide Web
@@ -11,7 +11,6 @@
 SUBDIR+=       aipo
 SUBDIR+=       album
 SUBDIR+=       album_themes
-SUBDIR+=       amaya
 SUBDIR+=       analog
 SUBDIR+=       ap-auth-kerb
 SUBDIR+=       ap-auth-mellon
diff -r a228da3dc1c0 -r cb0e6006d1f9 www/amaya/DESCR
--- a/www/amaya/DESCR   Sun Jun 23 09:15:11 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-Amaya is a complete web browsing and authoring environment and
-comes equipped with a WYSIWYG style of interface, similar to that
-of the most popular commercial browsers.  With such an interface,
-users do not need to know the HTML or CSS languages. Amaya does
-not support Javascript and has an incomplete CSS implementation.
-Amaya supports XHTML, MathML, SVG, and RDF.
diff -r a228da3dc1c0 -r cb0e6006d1f9 www/amaya/MESSAGE
--- a/www/amaya/MESSAGE Sun Jun 23 09:15:11 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2011/07/02 22:19:29 dholland Exp $
-
-The license of this package may require formal notice that the sources
-have been patched. Patches and their history may be inspected here:
-
-   http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/www/amaya/patches/
-
-===========================================================================
diff -r a228da3dc1c0 -r cb0e6006d1f9 www/amaya/Makefile
--- a/www/amaya/Makefile        Sun Jun 23 09:15:11 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,141 +0,0 @@
-# $NetBSD: Makefile,v 1.114 2018/12/13 19:52:24 adam Exp $
-
-DISTNAME=      amaya-fullsrc-11.3.1
-PKGNAME=       ${DISTNAME:S/-fullsrc//}
-PKGREVISION=   46
-CATEGORIES=    www
-MASTER_SITES=  http://www.w3.org/Amaya/Distribution/
-MASTER_SITES+= ftp://ftp.w3.org/pub/amaya/
-MASTER_SITES+= ftp://mirror.aarnet.edu.au/pub/amaya/
-EXTRACT_SUFX=  .tgz
-
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://www.w3.org/Amaya/
-COMMENT=       Web browser/editor from the World Wide Web Consortium (W3C)
-LICENSE=       amaya-license
-
-USE_LANGUAGES=         c c++
-USE_TOOLS+=            gmake perl pkg-config
-GNU_CONFIGURE=         yes
-
-# builds receive SIGSEGV (go figure)
-MAKE_JOBS_SAFE=                no
-
-BUILDDIR=              ${WRKDIR}/Amaya/work
-WRKSRC=                        ${WRKDIR}
-CONFIGURE_DIRS=                Amaya/work              # also sets BUILD_DIRS
-CONFIGURE_SCRIPT=      ../configure
-BUILD_TARGET=          all
-
-CFLAGS+=               -Dunix
-
-FONTS_DIRS.ttf+=       ${PREFIX}/share/Amaya/fonts
-REQD_DIRS+=            ${PREFIX}/share/Amaya ${PREFIX}/share/Amaya/fonts
-
-.include "../../mk/bsd.prefs.mk"
-
-.if !empty(PKGSRC_COMPILER:Mgcc*)
-CFLAGS+=               -fno-strict-aliasing
-.endif
-
-#
-# Some notes on the build issues, for the benefit of the next person
-# hacking this package:
-#
-# - The build directory must be a subdir of the Amaya dir of the
-# distribution. If it isn't, the build breaks. This is why the
-# build dir is put where it is and not directly under ${WRKDIR}.
-# (This was true in 10.x; it might not be true any longer.)
-#
-# - The distfile currently includes copies of Mesa, freetype, libwww,
-# redland, and wxWidgets as well as Amaya itself. In 10.x it used to
-# also contain a pile of graphics libraries; these have thankfully
-# been pruned.
-#
-# - There is no reason I can see to use or care about the included
-# Mesa, freetype, or redland.
-#
-# - The pkgsrc package used to use the included wxWidgets because at
-# the time it was put together pkgsrc didn't have wxGTK28, only
-# 26. This is no longer true and it should be safe to ignore the
-# included wxWidgets. However, if it needs to come back, beware of
-# copies of other libs included in it that Amaya may forcibly build
-# and use; in 10.x the only way to get the included wxWidgets to not
-# use its own copies of png, jpeg, tiff, and xpm was to patch the
-# Amaya build logic. I've left this patch in place for future
-# reference, although it's only about 50% likely it'll have any effect
-# next time. Do not believe the build docs or the configure script
-# when it claims to allow you to disable builtin copies of libs; it
-# lies.
-#
-# - The included libwww, however, appears to be necessary. In 10.x it
-# was a custom-patched version; now it appears not to be but it is
-# also a newer version than found in pkgsrc. As I don't think a newer
-# libwww than the one in pkgsrc has actually been released, it may as
-# well be a custom-patched version. Given the history it is unlikely
-# that Amaya will work with the older libwww in pkgsrc... assuming it
-# works at all of course... so it is probably best to use the included
-# libwww until such time as this becoems clearer.
-#
-# - The included libwww includes in turn its own copy of expat. In
-# 10.x this was also a custom-patched version. This may or may not be
-# true now. Regardless, Amaya shold be made to use pkgsrc expat,
-# because as things stand it is likely to end up with multiple expats
-# linked into it at once, and that's unlikely to work. I have not done
-# this yet though. (XXX)
-#
-# - As of 10.x the code using redland did not work, even using the
-# copy of redland included in the distfile. The schemas it tries to
-# build are syntactically invalid. It *might* be a simple problem, I
-# don't know enough about that stuff to fix it. Maybe someone else
-# does. I haven't tried this in 11.x yet. (XXX)
-#
-# - The build target is "all". This is not the default. The default
-# build target (if you just run make) also sort of builds the package
-# but doesn't actually work.
-#
-# - The makefiles link some of the internal portions of the program
-# using -l/-L, and some by explicitly listing .a files. The pkgsrc
-# wrappers reorder these and break the build. I patched the makefiles
-# to always explicitly name .a files for internal program pieces.
-#
-# - The DAV code does not build by default. It requires generated
-# files from a later part of the build to already exist when it's
-# compiled. (That is, davlib/ doesn't build until part of amaya/ is
-# built, but you can't successfully build amaya/ without davlib/
-# because it needs to link with it. It turns out that this can be
-# hacked around by forcibly disabling the davlib/ directory in the
-# top-level makefile; if davlib is nonetheless enabled, the amaya/
-# makefile recurses back to it to build it after generating the file
-# it needs. Sheesh. Between this and other issues it's clear that
-# whoever develops this thing never tries building a clean tree, and
-# sometimes I wonder if they compile it at all before releasing it.
-#
-
-post-extract:
-       ${MKDIR} ${BUILDDIR}
-
-post-configure:
-       ${CP} ${BUILDDIR}/Options.orig ${BUILDDIR}/Options
-       ${TOUCH} ${BUILDDIR}/Makefile
-
-# The davlib code doesn't build, so disable it. (no longer necessary)
-#CONFIGURE_ARGS+=      --without-dav
-
-#
-# Use the supplied (prerelease?) libwww; use pkgsrc for everything else.
-# See notes above, and check the cvs history for tips if trying to reenable
-# the builtin wxWidgets.
-#
-EXTRACT_ELEMENTS=      Amaya libwww
-CONFIGURE_ARGS+=       --enable-system-redland
-CONFIGURE_ARGS+=       --enable-system-wx
-
-#.include "../../www/libwww/buildlink3.mk"
-.include "../../textproc/redland/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
-.include "../../x11/wxGTK28/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../textproc/expat/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff -r a228da3dc1c0 -r cb0e6006d1f9 www/amaya/PLIST
--- a/www/amaya/PLIST   Sun Jun 23 09:15:11 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1137 +0,0 @@
-@comment $NetBSD: PLIST,v 1.15 2011/07/02 22:19:29 dholland Exp $
-bin/amaya
-share/Amaya/amaya/AmayaPage_WX.html
-share/Amaya/amaya/AmayaPage_WX.html.de
-share/Amaya/amaya/AmayaPage_WX.html.es
-share/Amaya/amaya/AmayaPage_WX.html.fr
-share/Amaya/amaya/AmayaPage_WX.html.ru
-share/Amaya/amaya/AmayaPage_WX.html.sk
-share/Amaya/amaya/AmayaSrcSyncIndex.gif
-share/Amaya/amaya/Annot.conf
-share/Amaya/amaya/COPYRIGHT
-share/Amaya/amaya/HTML.STR
-share/Amaya/amaya/HTML.conf
-share/Amaya/amaya/HTML.en
-share/Amaya/amaya/HTML.trans
-share/Amaya/amaya/HTML.trans.es
-share/Amaya/amaya/HTML.trans.fr
-share/Amaya/amaya/HTMLP.PRS
-share/Amaya/amaya/HTMLPBW.PRS
-share/Amaya/amaya/HTMLPL.PRS
-share/Amaya/amaya/HTMLPLL.PRS
-share/Amaya/amaya/HTMLPLP.PRS
-share/Amaya/amaya/HTMLPLPUS.PRS
-share/Amaya/amaya/HTMLPP.PRS
-share/Amaya/amaya/HTMLPPUS.PRS
-share/Amaya/amaya/HTMLT.TRA
-share/Amaya/amaya/HTMLT11.TRA
-share/Amaya/amaya/HTMLTT.TRA
-share/Amaya/amaya/HTMLTX.TRA
-share/Amaya/amaya/HTMLUSL.PRS
-share/Amaya/amaya/HTMLUSLL.PRS
-share/Amaya/amaya/MathML.STR
-share/Amaya/amaya/MathML.conf
-share/Amaya/amaya/MathML.en
-share/Amaya/amaya/MathML.trans
-share/Amaya/amaya/MathML.trans.es
-share/Amaya/amaya/MathML.trans.fr
-share/Amaya/amaya/MathMLP.PRS
-share/Amaya/amaya/MathMLT.TRA
-share/Amaya/amaya/MathMLTX.TRA
-share/Amaya/amaya/SVG.STR
-share/Amaya/amaya/SVG.conf
-share/Amaya/amaya/SVG.en
-share/Amaya/amaya/SVG.trans
-share/Amaya/amaya/SVG.trans.fr
-share/Amaya/amaya/SVGP.PRS
-share/Amaya/amaya/SVGT.TRA
-share/Amaya/amaya/SVGTX.TRA
-share/Amaya/amaya/Template.STR
-share/Amaya/amaya/Template.en
-share/Amaya/amaya/TemplateP.PRS
-share/Amaya/amaya/TemplatePI.PRS
-share/Amaya/amaya/TemplateT.TRA
-share/Amaya/amaya/TemplateTX.TRA
-share/Amaya/amaya/TextFile.STR
-share/Amaya/amaya/TextFile.conf
-share/Amaya/amaya/TextFile.en
-share/Amaya/amaya/TextFileP.PRS
-share/Amaya/amaya/TextFilePL.PRS
-share/Amaya/amaya/TextFilePLOG.PRS
-share/Amaya/amaya/TextFilePP.PRS
-share/Amaya/amaya/TextFilePPUS.PRS
-share/Amaya/amaya/TextFileT.TRA
-share/Amaya/amaya/TextFileUSL.PRS
-share/Amaya/amaya/Timeline.STR
-share/Amaya/amaya/Timeline.conf
-share/Amaya/amaya/Timeline.en
-share/Amaya/amaya/TimelineP.PRS
-share/Amaya/amaya/TimelineT.TRA
-share/Amaya/amaya/TimelineTX.TRA
-share/Amaya/amaya/Topics.conf
-share/Amaya/amaya/XLink.STR
-share/Amaya/amaya/XLink.en
-share/Amaya/amaya/XLinkP.PRS
-share/Amaya/amaya/XLinkT.TRA
-share/Amaya/amaya/XML.STR
-share/Amaya/amaya/XML.conf
-share/Amaya/amaya/XML.en
-share/Amaya/amaya/XMLP.PRS
-share/Amaya/amaya/XMLPL.PRS
-share/Amaya/amaya/XMLPP.PRS
-share/Amaya/amaya/XMLPPUS.PRS
-share/Amaya/amaya/XMLT.TRA
-share/Amaya/amaya/XMLUSL.PRS
-share/Amaya/amaya/add.png
-share/Amaya/amaya/advice.png
-share/Amaya/amaya/amaya.css
-share/Amaya/amaya/amaya.png
-share/Amaya/amaya/anim_color_sh.png
-share/Amaya/amaya/anim_color_sh_db.png
-share/Amaya/amaya/anim_help_sh.png
-share/Amaya/amaya/anim_motion_sh.png
-share/Amaya/amaya/anim_motion_sh_db.png
-share/Amaya/amaya/annot.gif
-share/Amaya/amaya/annot.png
-share/Amaya/amaya/annotorp.gif
-share/Amaya/amaya/bullet.png
-share/Amaya/amaya/change.png
-share/Amaya/amaya/collapse1.png
-share/Amaya/amaya/collapse2.png
-share/Amaya/amaya/comment.png
-share/Amaya/amaya/example.png
-share/Amaya/amaya/explanation.png
-share/Amaya/amaya/lost.gif
-share/Amaya/amaya/menu.png
-share/Amaya/amaya/option.gif
-share/Amaya/amaya/question.png
-share/Amaya/amaya/radio-s.png
-share/Amaya/amaya/radio.png
-share/Amaya/amaya/seealso.png
-share/Amaya/amaya/slider.gif



Home | Main Index | Thread Index | Old Index