diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/amaya/Makefile | 4 | ||||
| -rw-r--r-- | www/amaya/distinfo | 6 | ||||
| -rw-r--r-- | www/amaya/patches/patch-ab | 15 |
3 files changed, 19 insertions, 6 deletions
diff --git a/www/amaya/Makefile b/www/amaya/Makefile index 7ce94f1c247..c02650f244f 100644 --- a/www/amaya/Makefile +++ b/www/amaya/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.94 2016/03/05 11:29:34 jperkin Exp $ +# $NetBSD: Makefile,v 1.95 2016/04/03 12:43:39 joerg Exp $ DISTNAME= amaya-fullsrc-11.3.1 PKGNAME= ${DISTNAME:S/-fullsrc//} -PKGREVISION= 27 +PKGREVISION= 28 CATEGORIES= www MASTER_SITES= http://www.w3.org/Amaya/Distribution/ \ ftp://ftp.w3.org/pub/amaya/ \ diff --git a/www/amaya/distinfo b/www/amaya/distinfo index a62ddddd7fa..8e5ca271f5a 100644 --- a/www/amaya/distinfo +++ b/www/amaya/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.25 2015/11/04 02:46:47 agc Exp $ +$NetBSD: distinfo,v 1.26 2016/04/03 12:43:39 joerg Exp $ SHA1 (amaya-fullsrc-11.3.1.tgz) = 7b180434a8271ecdeb3ae821997619bc3dcd2da4 RMD160 (amaya-fullsrc-11.3.1.tgz) = 12206de82551ed2eb548e3c778909bf0d9cafe43 @@ -7,7 +7,7 @@ Size (amaya-fullsrc-11.3.1.tgz) = 37240030 bytes SHA1 (patch-Amaya_amaya_HTMLedit_c) = bda20efa29e6ace95222d42574e7acd3afb55834 SHA1 (patch-Amaya_thotlib_base_platform_c) = 034512f7886fb15089a1134538891f9c62c0c90b SHA1 (patch-aa) = bd04e6ee2a23b18696dad50168da5b6f31bbb3a1 -SHA1 (patch-ab) = d3280c6137eb1b37f62986a5bfe3fc8a23c4b24c +SHA1 (patch-ab) = ed2cf7ad9575b055b66e10e9f3bcb04858659629 SHA1 (patch-ac) = 3140206116c5dfdbf9257d754c1ea06966d8bd22 SHA1 (patch-ad) = 1d53dc196395922585638592560373c27a1b0927 SHA1 (patch-ae) = 76fe53fc0d21d8e32c290bbdc87c2f74a3e9eba9 @@ -22,3 +22,5 @@ SHA1 (patch-ao) = 095eb0d2d47b1cc4993dd159ad419da47ddf3ee3 SHA1 (patch-aq) = 9cae8443030f95248b46ee4dc5d1082621c552db SHA1 (patch-ar) = 10a28a129d24f90f5cc8ad297ef14a2d36e74f24 SHA1 (patch-as) = 97b8de2ca8aa7818b4a9fd1f45b42ea97b318a66 +SHA1 (patch-libwww_Library_src_SSL_HTSSL.c) = 8d016b1c87d5216c25ab7f5d95c2f819147afdd5 +SHA1 (patch-libwww_Library_src_SSL_HTSSL.h) = d11422b87ed933b894b68efac606794e228a6c9c diff --git a/www/amaya/patches/patch-ab b/www/amaya/patches/patch-ab index 2cc44b10be2..12ad84ef06d 100644 --- a/www/amaya/patches/patch-ab +++ b/www/amaya/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.15 2011/07/02 22:19:30 dholland Exp $ +$NetBSD: patch-ab,v 1.16 2016/04/03 12:43:39 joerg Exp $ - need to check for wchar.h - configure the included wxWidgets to use pksrc png/jpeg/tiff/xpm instead @@ -6,6 +6,7 @@ $NetBSD: patch-ab,v 1.15 2011/07/02 22:19:30 dholland Exp $ used, but this change will be wanted again if it ever comes back) - don't overwrite pkgsrc CFLAGS/CXXFLAGS - fix install paths for pkgsrc +- don't add __cplusplus, any proper C++ compiler will define it already --- Amaya/configure.orig 2009-12-09 13:42:57.000000000 +0000 +++ Amaya/configure @@ -43,7 +44,17 @@ $NetBSD: patch-ab,v 1.15 2011/07/02 22:19:30 dholland Exp $ fi if test "${CC}" = "gcc" ; then -@@ -14785,7 +14785,7 @@ if test "${VPATHOPT}" = "" ; then +@@ -13833,8 +13833,7 @@ CFLAGS="${CFLAGS} -x c" + + # C++ options (-x c++) + #CXXFLAGS="${CXXFLAGS} -Wall" +-CXX_OPTIONS="-D__cplusplus" +-CXXFLAGS="${CXXFLAGS} -Wall -x c++ ${CXX_OPTIONS}" ++CXXFLAGS="${CXXFLAGS} -Wall -x c++" + + # setup LDFLAGS + # on macosx, specific flags must be set to avoid conflicts with allready installed libwww +@@ -14785,7 +14784,7 @@ if test "${VPATHOPT}" = "" ; then VPATHOPT="VPATH" fi |