head 1.2; access; symbols pkgsrc-2019Q1:1.1.0.62 pkgsrc-2019Q1-base:1.1 pkgsrc-2018Q4:1.1.0.60 pkgsrc-2018Q4-base:1.1 pkgsrc-2018Q3:1.1.0.58 pkgsrc-2018Q3-base:1.1 pkgsrc-2018Q2:1.1.0.56 pkgsrc-2018Q2-base:1.1 pkgsrc-2018Q1:1.1.0.54 pkgsrc-2018Q1-base:1.1 pkgsrc-2017Q4:1.1.0.52 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.50 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.46 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.44 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.42 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.40 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.38 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.36 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.34 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.32 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.30 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.28 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.26 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.24 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.22 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.20 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.18 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.16 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.14 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.12 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.10 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.8 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.6 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.4 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.2; locks; strict; comment @# @; 1.2 date 2019.06.23.09.21.30; author nia; state dead; branches; next 1.1; commitid hTyqn1vE2tpyfisB; 1.1 date 2012.01.08.22.15.21; author dholland; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2012.01.08.22.15.21; author sbd; state dead; branches; next 1.1.2.2; 1.1.2.2 date 2012.01.09.04.17.31; author sbd; state Exp; branches; next ; desc @@ 1.2 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-Amaya_thotlib_base_platform_c,v 1.1 2012/01/08 22:15:21 dholland Exp $ Hack insane C++ so gcc 4.5 accepts it. No idea if this works. No idea if it worked before I touched it, either. --- Amaya/thotlib/base/platform.c.orig 2009-12-02 11:23:07.000000000 +0000 +++ Amaya/thotlib/base/platform.c @@@@ -329,9 +329,9 @@@@ ThotBool TtaFileCopy (CONST char *source { tmp = (char *)TtaGetMemory (strlen(targetFileName)+10); sprintf (tmp, "%s.tmp", targetFileName); - wxFile::wxFile (targetFile, wxFile::write); + wxFile targetFileFile (targetFile, wxFile::write); tmpFile = TtaConvMessageToWX(tmp); - wxFile::wxFile (tmpFile, wxFile::write); + wxFile tmpFileFile (tmpFile, wxFile::write); result = wxFile::Exists(targetFile); if (result) result = wxConcatFiles (tmpFile, sourceFile, targetFile); @ 1.1 log @Fix build problems with gcc 4.5. The code makes no sense so I'm not sure what I did is going to work... or that the code that was here previously ever worked or actually did what anyone upstream intended. C++ is fun that way. @ text @d1 1 a1 1 $NetBSD$ @ 1.1.2.1 log @file patch-Amaya_thotlib_base_platform_c was added on branch pkgsrc-2011Q4 on 2012-01-09 04:17:31 +0000 @ text @d1 19 @ 1.1.2.2 log @Pullup ticket #3639 - requested by dholland www/amaya build fix Revisions pulled up: - www/amaya/distinfo 1.24 - www/amaya/hacks.mk 1.1 - www/amaya/patches/patch-Amaya_amaya_HTMLedit_c 1.1 - www/amaya/patches/patch-Amaya_thotlib_base_platform_c 1.1 --- Module Name: pkgsrc Committed By: dholland Date: Sun Jan 8 22:15:21 UTC 2012 Modified Files: pkgsrc/www/amaya: distinfo Added Files: pkgsrc/www/amaya/patches: patch-Amaya_amaya_HTMLedit_c patch-Amaya_thotlib_base_platform_c Log Message: Fix build problems with gcc 4.5. The code makes no sense so I'm not sure what I did is going to work... or that the code that was here previously ever worked or actually did what anyone upstream intended. C++ is fun that way. --- Module Name: pkgsrc Committed By: dholland Date: Sun Jan 8 22:19:03 UTC 2012 Added Files: pkgsrc/www/amaya: hacks.mk Log Message: Add a workaround for PR 45266 (krb5-config issue in NetBSD base): clear BUILDLINK_INCDIRS.heimdal. Otherwise -I/usr/include/krb5 appears in CFLAGS, which breaks the build because the compiler finds krb5's base64.h instead of Amaya's. krb5 is pulled in by curl, which is a several-times-indirect dependency, and nothing in this package uses it, or apparently anything that needs it, directly. @ text @a0 19 $NetBSD$ Hack insane C++ so gcc 4.5 accepts it. No idea if this works. No idea if it worked before I touched it, either. --- Amaya/thotlib/base/platform.c.orig 2009-12-02 11:23:07.000000000 +0000 +++ Amaya/thotlib/base/platform.c @@@@ -329,9 +329,9 @@@@ ThotBool TtaFileCopy (CONST char *source { tmp = (char *)TtaGetMemory (strlen(targetFileName)+10); sprintf (tmp, "%s.tmp", targetFileName); - wxFile::wxFile (targetFile, wxFile::write); + wxFile targetFileFile (targetFile, wxFile::write); tmpFile = TtaConvMessageToWX(tmp); - wxFile::wxFile (tmpFile, wxFile::write); + wxFile tmpFileFile (tmpFile, wxFile::write); result = wxFile::Exists(targetFile); if (result) result = wxConcatFiles (tmpFile, sourceFile, targetFile); @