pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www/amaya Update to 10.0.1 and add destdir support.
details: https://anonhg.NetBSD.org/pkgsrc/rev/294559a3e508
branches: trunk
changeset: 547018:294559a3e508
user: dholland <dholland%pkgsrc.org@localhost>
date: Thu Sep 11 04:22:50 2008 +0000
description:
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.
diffstat:
www/amaya/Makefile | 162 +++++-
www/amaya/PLIST | 1176 ++++++++++++-------------------------------
www/amaya/distinfo | 31 +-
www/amaya/patches/patch-aa | 6 +-
www/amaya/patches/patch-ab | 35 +-
www/amaya/patches/patch-ac | 14 +-
www/amaya/patches/patch-ad | 13 -
www/amaya/patches/patch-ae | 21 +-
www/amaya/patches/patch-af | 14 -
www/amaya/patches/patch-ag | 14 +-
www/amaya/patches/patch-ah | 15 -
www/amaya/patches/patch-ai | 20 +-
www/amaya/patches/patch-aj | 208 +++++++
www/amaya/patches/patch-ak | 43 +
www/amaya/patches/patch-al | 13 +
www/amaya/patches/patch-am | 30 +
www/amaya/patches/patch-an | 13 +
www/amaya/patches/patch-ao | 13 +
www/amaya/patches/patch-ap | 125 ++++
www/amaya/patches/patch-aq | 13 +
20 files changed, 1005 insertions(+), 974 deletions(-)
diffs (truncated from 2495 to 300 lines):
diff -r 8b7096263a18 -r 294559a3e508 www/amaya/Makefile
--- a/www/amaya/Makefile Thu Sep 11 00:01:43 2008 +0000
+++ b/www/amaya/Makefile Thu Sep 11 04:22:50 2008 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2008/09/08 08:03:15 dholland Exp $
+# $NetBSD: Makefile,v 1.52 2008/09/11 04:22:50 dholland Exp $
-DISTNAME= amaya-fullsrc-9.2.1
+DISTNAME= amaya-fullsrc-10.0.1
PKGNAME= ${DISTNAME:S/-fullsrc//}
-PKGREVISION= 6
CATEGORIES= www
MASTER_SITES= http://www.w3.org/Amaya/Distribution/ \
ftp://ftp.w3.org/pub/amaya/ \
@@ -13,48 +12,165 @@
HOMEPAGE= http://www.w3.org/Amaya/
COMMENT= Web browser/editor from the World Wide Web Consortium (W3C)
-EXTRACT_ELEMENTS= Amaya libwww
-WRKSRC= ${WRKDIR}/Amaya/work
+PKG_DESTDIR_SUPPORT= user-destdir
USE_DIRS+= xdg-1.1
USE_LANGUAGES= c c++
USE_TOOLS+= gmake perl
GNU_CONFIGURE= yes
+
+WRKSRC= ${WRKDIR}/Amaya/work
CONFIGURE_SCRIPT= ../configure
-CONFIGURE_ARGS+= --without-graphic-libs # Use pkgsrc libraries
+BUILD_TARGET= all
+
CFLAGS+= -Dunix
-# link correctly with pkgsrc zlib
-LIBS+= ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib
FONTS_DIRS.ttf+= ${PREFIX}/share/Amaya/fonts
REQD_DIRS+= ${PREFIX}/share/Amaya ${PREFIX}/share/Amaya/fonts
.include "../../mk/bsd.prefs.mk"
-# GNOME/KDE integration (only for Linux)
-PLIST_VARS+= desktop
-.if ${OPSYS} == "Linux"
-PLIST.desktop= yes
+.if !empty(PKGSRC_COMPILER:Mgcc*)
+CFLAGS+= -fno-strict-aliasing
.endif
+# GNOME/KDE desktop icon and related bits
+# These used to get installed only on Linux; in 10.0.1 they don't seem
+# to exist any more, but given the makefiles in this package that
+# doesn't prove anything, and I can't test on Linux easily. So I'm
+# going to leave this here commented out, along with the PLIST
+# entries, until they're confirmed to be gone.
+#PLIST_VARS+= desktop
+#.if ${OPSYS} == "Linux"
+#PLIST.desktop= yes
+#.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. Hence WRKSRC.
+#
+# - The copy of libwww that comes in the distfile is required; it is
+# custom-patched in unspecified ways. The copy of expat in that copy
+# of libwww is also custom-patched. This means we need to use that
+# expat and not the pkgsrc one, which is problematic because wxWidgets
+# also uses expat.
+#
+# - The build system is incapable of building that libwww without
+# help; if the libwww subdir of the build directory does not exist,
+# the makefiles won't create it, and it's not created by the configure
+# script. Thus the manual invocation of make libwww_config in
+# post-configure.
+#
+# - The distfile contains not just one but multiple included copies of
+# various basic libraries (libpng, libjpeg, zlib, expat) and for the
+# most part we don't want to use those copies, because they're out of
+# date. It is like pulling teeth - you have to patch all over the
+# place, even though the configure script ostensibly supports using
+# the system versions.
+#
+# - For now I'm using the included copy of wxWidgets, because the
+# pkgsrc copy is too old. This has a couple of its own issues, but,
+# once one forcibly persuades the Amaya configure script to configure
+# it correctly, isn't a big problem.
+#
+# - The code using redland does 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.
+#
+# - The DAV code does not build. It requires generated files from a
+# later part of the build to already exist when it's compiled. I don't
+# know if it also must come before that part of the build, but it
+# wouldn't entirely surprise me if it did; between this and the libwww
+# issue it's clear that whoever develops this thing never tries
+# building a clean tree. By the time I got to this I was tired of the
+# lossage and just disabled the DAV code entirely.
+#
+# - 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.
+#
+
post-extract:
${MKDIR} ${WRKSRC}
post-configure:
${CP} ${WRKSRC}/Options.orig ${WRKSRC}/Options
${TOUCH} ${WRKSRC}/Makefile
+ cd ${WRKSRC} && \
+ ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} ${GMAKE} libwww_config
-# currently uses its own copy of these
-#.include "../../graphics/jpeg/buildlink3.mk"
-#.include "../../graphics/png/buildlink3.mk"
+#
+# Components, deps, and included copies of libraries
+#
+
+EXTRACT_ELEMENTS= Amaya
+
+# Requires its own custom-patched libwww,
+# which also incl. a custom-patched expat.
+EXTRACT_ELEMENTS+= libwww
+# -or-
+#.include "../../www/libwww/buildlink3.mk"
+#.include "../../textproc/expat/buildlink3.mk"
+
+# The Amaya portion of the distfile inclues copies of libpng, jpeg, and zlib.
+# Use pkgsrc's libpng, jpeg, and zlib instead.
+CONFIGURE_ARGS+= --without-graphic-libs # Use pkgsrc libraries
+# link correctly with pkgsrc zlib (XXX: is this needed or correct?)
+LIBS+= ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+
+# The davlib code doesn't build.
+CONFIGURE_ARGS+= --without-dav
-.include "../../graphics/imlib/buildlink3.mk"
-.include "../../textproc/expat/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../x11/libXft/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+# pkgsrc doesn't have redland (yet?)
+# disable; currently doesn't work and I don't have time to chase down why
+#EXTRACT_ELEMENTS+= redland
+# -or-
+#CONFIGURE_ARGS+= --enable-system-redland
+#.include "../../???/redland/buildlink3.mk"
+
+# pkgsrc's wxGTK is too old (2.6.3; 2.8.x is required)
+EXTRACT_ELEMENTS+= wxWidgets
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libXinerama/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libXxf86vm/buildlink3.mk"
+.include "../../x11/xf86vidmodeproto/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+CONFIGURE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR:Q}
+# wxWidgets has *another* copy of a bunch of image libs.
+CONFIGURE_ARGS+= --with-libpng=sys # Use pkgsrc libraries
+CONFIGURE_ARGS+= --with-libjpeg=sys # Use pkgsrc libraries
+CONFIGURE_ARGS+= --with-libtiff=sys # Use pkgsrc libraries
+CONFIGURE_ARGS+= --with-libxpm=sys # Use pkgsrc libraries
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
+# wxWidgets also has a private copy of expat; since Amaya ostensibly
+# needs the patched expat in its libwww, which is at least the same
+# version as the one in wxWidgets, we'll let wxWidgets use its builtin
+# copy. That way if both are linked the fallout should be limited, and
+# maybe (ha!) the Amaya developers have seen to it. This will probably
+# break with pkgsrc wxWidgets, but we can worry about that later.
+#.include "../../textproc/expat/buildlink3.mk"
+# -or-
+#CONFIGURE_ARGS+= --enable-system-wx # Use pkgsrc libraries
+#.include "../../graphics/glu/buildlink3.mk"
+#.include "../../x11/wxGTK/buildlink3.mk"
+
+# also uses glib
+.include "../../devel/glib2/buildlink3.mk"
+
.include "../../mk/bsd.pkg.mk"
diff -r 8b7096263a18 -r 294559a3e508 www/amaya/PLIST
--- a/www/amaya/PLIST Thu Sep 11 00:01:43 2008 +0000
+++ b/www/amaya/PLIST Thu Sep 11 04:22:50 2008 +0000
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.12 2008/04/12 22:43:13 jlam Exp $
+@comment $NetBSD: PLIST,v 1.13 2008/09/11 04:22:50 dholland Exp $
bin/amaya
-bin/amaya-gtk
share/Amaya/amaya/Amaya.svg
share/Amaya/amaya/AmayaPage.html
share/Amaya/amaya/AmayaPage.html.de
@@ -11,14 +10,17 @@
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/HTML.trans.new
share/Amaya/amaya/HTMLP.PRS
share/Amaya/amaya/HTMLPBW.PRS
share/Amaya/amaya/HTMLPL.PRS
@@ -45,9 +47,16 @@
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/TemplateT.TRA
+share/Amaya/amaya/TemplateTX.TRA
share/Amaya/amaya/TextFile.STR
share/Amaya/amaya/TextFile.conf
share/Amaya/amaya/TextFile.en
@@ -88,6 +97,7 @@
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
@@ -95,6 +105,7 @@
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.gif
@@ -106,20 +117,33 @@
share/Amaya/amaya/timeline_arrow.gif
share/Amaya/amaya/timeline_cross.gif
share/Amaya/amaya/timelinetoolbar_sh4.png
+share/Amaya/amaya/title.png
share/Amaya/amaya/toggle-s.gif
share/Amaya/amaya/toggle.gif
+share/Amaya/amaya/top.png
+share/Amaya/amaya/xtigerbag.png
+share/Amaya/amaya/xtigeroption.png
+share/Amaya/amaya/xtigerrepeat.png
+share/Amaya/amaya/xtigeruse.png
share/Amaya/annotlib/Topics.en
share/Amaya/annotlib/closed.png
share/Amaya/annotlib/open.png
share/Amaya/annotlib/selected.gif
+share/Amaya/config/Classic.css
+share/Amaya/config/Modern.css
+share/Amaya/config/Standard.css
share/Amaya/config/XKeysymDB
share/Amaya/config/amaya.emacs
share/Amaya/config/amaya.kb
+share/Amaya/config/amaya.kb-mac
share/Amaya/config/amaya.keyboard
share/Amaya/config/amaya.profiles
share/Amaya/config/annot.schemas
share/Amaya/config/annotschema.rdf
share/Amaya/config/annottypes.rdf
+share/Amaya/config/cn-amayadialogue
+share/Amaya/config/cn-amayamsg
+share/Amaya/config/cn-libdialogue
share/Amaya/config/de-amayadialogue
share/Amaya/config/de-amayamsg
share/Amaya/config/de-libdialogue
@@ -134,14 +158,15 @@
share/Amaya/config/fi-libdialogue
share/Amaya/config/fonts.gl
share/Amaya/config/fonts.gl.deb
Home |
Main Index |
Thread Index |
Old Index