diff options
-rw-r--r-- | www/amaya/Makefile | 16 | ||||
-rw-r--r-- | www/amaya/distinfo | 32 | ||||
-rw-r--r-- | www/amaya/patches/patch-aa | 6 | ||||
-rw-r--r-- | www/amaya/patches/patch-ab | 6 | ||||
-rw-r--r-- | www/amaya/patches/patch-ac | 6 | ||||
-rw-r--r-- | www/amaya/patches/patch-ae | 6 | ||||
-rw-r--r-- | www/amaya/patches/patch-ag | 6 | ||||
-rw-r--r-- | www/amaya/patches/patch-ai | 6 | ||||
-rw-r--r-- | www/amaya/patches/patch-aj | 6 | ||||
-rw-r--r-- | www/amaya/patches/patch-ak | 6 | ||||
-rw-r--r-- | www/amaya/patches/patch-al | 6 | ||||
-rw-r--r-- | www/amaya/patches/patch-am | 6 | ||||
-rw-r--r-- | www/amaya/patches/patch-an | 6 | ||||
-rw-r--r-- | www/amaya/patches/patch-ao | 6 | ||||
-rw-r--r-- | www/amaya/patches/patch-ap | 6 | ||||
-rw-r--r-- | www/amaya/patches/patch-aq | 6 | ||||
-rw-r--r-- | www/amaya/patches/patch-ar | 15 | ||||
-rw-r--r-- | www/amaya/patches/patch-as | 15 |
18 files changed, 98 insertions, 64 deletions
diff --git a/www/amaya/Makefile b/www/amaya/Makefile index 80af9be7d95..46dc660547f 100644 --- a/www/amaya/Makefile +++ b/www/amaya/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.63 2011/04/22 13:44:56 obache Exp $ +# $NetBSD: Makefile,v 1.64 2011/07/02 18:54:48 dholland Exp $ DISTNAME= amaya-fullsrc-10.0.1 PKGNAME= ${DISTNAME:S/-fullsrc//} @@ -19,7 +19,9 @@ USE_LANGUAGES= c c++ USE_TOOLS+= gmake perl pkg-config GNU_CONFIGURE= yes -WRKSRC= ${WRKDIR}/Amaya/work +BUILDDIR= ${WRKDIR}/Amaya/work +WRKSRC= ${WRKDIR} +CONFIGURE_DIRS= Amaya/work # also sets BUILD_DIRS CONFIGURE_SCRIPT= ../configure BUILD_TARGET= all @@ -50,7 +52,7 @@ CFLAGS+= -fno-strict-aliasing # 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. +# distribution. If it isn't, the build breaks. Hence CONFIGURE_DIRS. # # - 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 @@ -100,12 +102,12 @@ CFLAGS+= -fno-strict-aliasing # post-extract: - ${MKDIR} ${WRKSRC} + ${MKDIR} ${BUILDDIR} post-configure: - ${CP} ${WRKSRC}/Options.orig ${WRKSRC}/Options - ${TOUCH} ${WRKSRC}/Makefile - cd ${WRKSRC} && \ + ${CP} ${BUILDDIR}/Options.orig ${BUILDDIR}/Options + ${TOUCH} ${BUILDDIR}/Makefile + cd ${BUILDDIR} && \ ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} ${GMAKE} libwww_config # diff --git a/www/amaya/distinfo b/www/amaya/distinfo index 1dbcb5c35d7..7e66be09de1 100644 --- a/www/amaya/distinfo +++ b/www/amaya/distinfo @@ -1,19 +1,21 @@ -$NetBSD: distinfo,v 1.20 2010/06/13 22:45:32 wiz Exp $ +$NetBSD: distinfo,v 1.21 2011/07/02 18:54:48 dholland Exp $ SHA1 (amaya-fullsrc-10.0.1.tgz) = a2dcceedaa2c0256f04aaa86e3dc319d4ff26ade RMD160 (amaya-fullsrc-10.0.1.tgz) = d1a20a03a18ef3b06cf9dcbab907fb412de0ad6b Size (amaya-fullsrc-10.0.1.tgz) = 28608680 bytes -SHA1 (patch-aa) = 9e4eff617bc0304aa85e711c264ca78ab9578fce -SHA1 (patch-ab) = 2a745ed9e857482cc0383d082050b02ea3a3333d -SHA1 (patch-ac) = 6fa5063a186ac8bfbb8763a7914d57a552b4d39c -SHA1 (patch-ae) = d8748493ab506c8a47c9c57a7c8f9f8d30375940 -SHA1 (patch-ag) = ad4caeca06a5fb3769cfd625d63c1b06ec7f4a84 -SHA1 (patch-ai) = 0d1c9d5f2dc4208fa93adc9abc9b939073719c1e -SHA1 (patch-aj) = 747e2c3dc8636f3c1f9b51a8533ceee1d13804fe -SHA1 (patch-ak) = 493e1ca8849571d582201fd0c7f15189c179599a -SHA1 (patch-al) = 172ab5106ecdc8fac825bcca8e57202010c980a3 -SHA1 (patch-am) = 152800baf4b750dbfe1bfa731313222b471d28ab -SHA1 (patch-an) = 5d2e98d7046394960d7c172ed7d491ecb0f0992e -SHA1 (patch-ao) = 34f6b0fe289d966c2a7553799be8bf59426091b4 -SHA1 (patch-ap) = 9d0eaa0bc05dc61f5d29cd78644fb854076590ce -SHA1 (patch-aq) = 3885a77d86fa1c3892a6aab7c9538d119951cd4a +SHA1 (patch-aa) = 9620e7027e71f8a96ae22c351c3b207e58a9ed07 +SHA1 (patch-ab) = 3435b82c09111f328281bea855e4a30558d88e2f +SHA1 (patch-ac) = 68e3c4adbf7841763cf5f015b9eafff236e27d93 +SHA1 (patch-ae) = ae2485427e13e88047ba916e4b4a4cb3ce5adaa7 +SHA1 (patch-ag) = b7d83ecd163ed35a10e3c10199e479686d44276b +SHA1 (patch-ai) = 6d40c18c13ae9f5627315dd93af599a041faed2d +SHA1 (patch-aj) = 9a3c16cc015cc1d1f6be536595667e46aaab566b +SHA1 (patch-ak) = 5f6b57ccc712a97cf0bb1e872a4af901b4d67f7a +SHA1 (patch-al) = 5d7801f70de4a364c7a05165ffcd4f5f861f51ba +SHA1 (patch-am) = 41ec6959384913cee891a9dd2fd0f2b910fbcdf4 +SHA1 (patch-an) = a18967c5a7df9ced4c7239a3c40beb9889f614f6 +SHA1 (patch-ao) = 2a2d1097622dca7e0dedf11e45a947bd3b09b2c3 +SHA1 (patch-ap) = 4554fbe8fd17088ce81273d9938c22b17a7dd20b +SHA1 (patch-aq) = eb251555054a83d69771542609a99fc0d5599947 +SHA1 (patch-ar) = 10a28a129d24f90f5cc8ad297ef14a2d36e74f24 +SHA1 (patch-as) = a57eca7364bd169206468c99c020cbd57fcecbab diff --git a/www/amaya/patches/patch-aa b/www/amaya/patches/patch-aa index 4a367430d5c..d77dbbd37bb 100644 --- a/www/amaya/patches/patch-aa +++ b/www/amaya/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.12 2008/09/11 04:22:50 dholland Exp $ +$NetBSD: patch-aa,v 1.13 2011/07/02 18:54:49 dholland Exp $ ---- ../config.h.in~ 2003-01-07 09:33:07.000000000 -0500 -+++ ../config.h.in 2008-09-08 04:37:57.000000000 -0400 +--- Amaya/config.h.in~ 2003-01-07 09:33:07.000000000 -0500 ++++ Amaya/config.h.in 2008-09-08 04:37:57.000000000 -0400 @@ -321,6 +321,9 @@ /* Define if you have the <unixlib.h> header file. */ #undef HAVE_UNIXLIB_H diff --git a/www/amaya/patches/patch-ab b/www/amaya/patches/patch-ab index b2905920546..6761ceb8526 100644 --- a/www/amaya/patches/patch-ab +++ b/www/amaya/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.13 2008/09/11 04:22:50 dholland Exp $ +$NetBSD: patch-ab,v 1.14 2011/07/02 18:54:49 dholland Exp $ ---- ../configure.orig 2008-01-31 09:07:46.000000000 -0500 -+++ ../configure 2008-09-09 20:44:33.000000000 -0400 +--- Amaya/configure.orig 2008-01-31 09:07:46.000000000 -0500 ++++ Amaya/configure 2008-09-09 20:44:33.000000000 -0400 @@ -4939,7 +4939,7 @@ done diff --git a/www/amaya/patches/patch-ac b/www/amaya/patches/patch-ac index c3b18561282..de44490a5af 100644 --- a/www/amaya/patches/patch-ac +++ b/www/amaya/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.11 2008/09/11 04:22:50 dholland Exp $ +$NetBSD: patch-ac,v 1.12 2011/07/02 18:54:49 dholland Exp $ ---- ../thotlib/include/ustring.h~ 2007-10-18 03:40:32.000000000 -0400 -+++ ../thotlib/include/ustring.h 2008-09-08 04:46:10.000000000 -0400 +--- Amaya/thotlib/include/ustring.h~ 2007-10-18 03:40:32.000000000 -0400 ++++ Amaya/thotlib/include/ustring.h 2008-09-08 04:46:10.000000000 -0400 @@ -6,6 +6,11 @@ #include <windows.h> #endif /* _WINGUI */ diff --git a/www/amaya/patches/patch-ae b/www/amaya/patches/patch-ae index 2718a6d2e70..cd8d186610f 100644 --- a/www/amaya/patches/patch-ae +++ b/www/amaya/patches/patch-ae @@ -1,7 +1,7 @@ -$NetBSD: patch-ae,v 1.10 2008/09/11 04:22:50 dholland Exp $ +$NetBSD: patch-ae,v 1.11 2011/07/02 18:54:49 dholland Exp $ ---- ../thotlib/image/pnghandler.c~ 2007-03-02 05:33:21.000000000 -0500 -+++ ../thotlib/image/pnghandler.c 2008-09-08 04:47:23.000000000 -0400 +--- Amaya/thotlib/image/pnghandler.c~ 2007-03-02 05:33:21.000000000 -0500 ++++ Amaya/thotlib/image/pnghandler.c 2008-09-08 04:47:23.000000000 -0400 @@ -587,7 +587,7 @@ static unsigned char *ReadPng (FILE *inf } diff --git a/www/amaya/patches/patch-ag b/www/amaya/patches/patch-ag index a499fb327d3..097f25fb3d0 100644 --- a/www/amaya/patches/patch-ag +++ b/www/amaya/patches/patch-ag @@ -1,7 +1,7 @@ -$NetBSD: patch-ag,v 1.7 2008/09/11 04:22:50 dholland Exp $ +$NetBSD: patch-ag,v 1.8 2011/07/02 18:54:49 dholland Exp $ ---- ../tools/cextract-1.7/xtract.h.orig 2005-05-30 10:21:42.000000000 -0400 -+++ ../tools/cextract-1.7/xtract.h 2008-09-08 05:20:38.000000000 -0400 +--- Amaya/tools/cextract-1.7/xtract.h.orig 2005-05-30 10:21:42.000000000 -0400 ++++ Amaya/tools/cextract-1.7/xtract.h 2008-09-08 05:20:38.000000000 -0400 @@ -15,9 +15,7 @@ #include <stdio.h> #include <ctype.h> diff --git a/www/amaya/patches/patch-ai b/www/amaya/patches/patch-ai index 5c7807bd0f2..c72811a8091 100644 --- a/www/amaya/patches/patch-ai +++ b/www/amaya/patches/patch-ai @@ -1,7 +1,7 @@ -$NetBSD: patch-ai,v 1.2 2008/09/11 04:22:50 dholland Exp $ +$NetBSD: patch-ai,v 1.3 2011/07/02 18:54:49 dholland Exp $ ---- ../batch/script_install_macosxbundle.in~ 2007-03-29 09:24:04.000000000 -0400 -+++ ../batch/script_install_macosxbundle.in 2008-09-08 04:50:37.000000000 -0400 +--- Amaya/batch/script_install_macosxbundle.in~ 2007-03-29 09:24:04.000000000 -0400 ++++ Amaya/batch/script_install_macosxbundle.in 2008-09-08 04:50:37.000000000 -0400 @@ -44,7 +44,7 @@ fi $ECHO "-- Creating a MacOSX bundle for $AMAYA_INSTALLDIR into $PREFIX/Amaya.app --" diff --git a/www/amaya/patches/patch-aj b/www/amaya/patches/patch-aj index 265221766b2..cb0817c9323 100644 --- a/www/amaya/patches/patch-aj +++ b/www/amaya/patches/patch-aj @@ -1,7 +1,7 @@ -$NetBSD: patch-aj,v 1.1 2008/09/11 04:22:50 dholland Exp $ +$NetBSD: patch-aj,v 1.2 2011/07/02 18:54:49 dholland Exp $ ---- ../Makefile.in.orig 2007-12-06 08:09:56.000000000 -0500 -+++ ../Makefile.in 2008-09-08 14:19:26.000000000 -0400 +--- 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 : batch: rebuild force diff --git a/www/amaya/patches/patch-ak b/www/amaya/patches/patch-ak index 0dc0ef4ee68..ac83ce8a9c2 100644 --- a/www/amaya/patches/patch-ak +++ b/www/amaya/patches/patch-ak @@ -1,7 +1,7 @@ -$NetBSD: patch-ak,v 1.1 2008/09/11 04:22:50 dholland Exp $ +$NetBSD: patch-ak,v 1.2 2011/07/02 18:54:49 dholland Exp $ ---- ../amaya/Makefile.in.orig 2008-02-05 05:31:51.000000000 -0500 -+++ ../amaya/Makefile.in 2008-09-08 15:33:36.000000000 -0400 +--- Amaya/amaya/Makefile.in.orig 2008-02-05 05:31:51.000000000 -0500 ++++ Amaya/amaya/Makefile.in 2008-09-08 15:33:36.000000000 -0400 @@ -17,7 +17,7 @@ INCLUDES= -DHAVE_CONFIG_H $(AMAYA_INCLUD LIBS = $(AMAYA_ANNOT_LIBS) $(AMAYA_DAV_LIBS) \ @AMAYA_RAPTOR_LIBS@ \ diff --git a/www/amaya/patches/patch-al b/www/amaya/patches/patch-al index afcdb2126a1..361d5c00d82 100644 --- a/www/amaya/patches/patch-al +++ b/www/amaya/patches/patch-al @@ -1,7 +1,7 @@ -$NetBSD: patch-al,v 1.1 2008/09/11 04:22:50 dholland Exp $ +$NetBSD: patch-al,v 1.2 2011/07/02 18:54:49 dholland Exp $ ---- ../tools/cextract-1.7/io.c~ 2005-05-30 10:21:55.000000000 -0400 -+++ ../tools/cextract-1.7/io.c 2008-09-08 05:30:58.000000000 -0400 +--- Amaya/tools/cextract-1.7/io.c~ 2005-05-30 10:21:55.000000000 -0400 ++++ Amaya/tools/cextract-1.7/io.c 2008-09-08 05:30:58.000000000 -0400 @@ -2224,7 +2224,7 @@ do_config () char * mach_time () diff --git a/www/amaya/patches/patch-am b/www/amaya/patches/patch-am index b8149b7f19f..95a882a2084 100644 --- a/www/amaya/patches/patch-am +++ b/www/amaya/patches/patch-am @@ -1,7 +1,7 @@ -$NetBSD: patch-am,v 1.1 2008/09/11 04:22:50 dholland Exp $ +$NetBSD: patch-am,v 1.2 2011/07/02 18:54:49 dholland Exp $ ---- ../thotlib/base/testcase.c~ 2007-04-25 03:25:54.000000000 -0400 -+++ ../thotlib/base/testcase.c 2008-09-08 05:34:11.000000000 -0400 +--- Amaya/thotlib/base/testcase.c~ 2007-04-25 03:25:54.000000000 -0400 ++++ Amaya/thotlib/base/testcase.c 2008-09-08 05:34:11.000000000 -0400 @@ -208,9 +208,9 @@ void TtaStopBenchmarkTimer( int bench_id FILE *fp = g_benchmark_timer[bench_id].fp; if (fp) diff --git a/www/amaya/patches/patch-an b/www/amaya/patches/patch-an index ffa38395d3a..440c142029f 100644 --- a/www/amaya/patches/patch-an +++ b/www/amaya/patches/patch-an @@ -1,7 +1,7 @@ -$NetBSD: patch-an,v 1.1 2008/09/11 04:22:50 dholland Exp $ +$NetBSD: patch-an,v 1.2 2011/07/02 18:54:49 dholland Exp $ ---- ../thotlib/unicode/ustring.c~ 2007-10-18 03:40:32.000000000 -0400 -+++ ../thotlib/unicode/ustring.c 2008-09-08 05:37:01.000000000 -0400 +--- Amaya/thotlib/unicode/ustring.c~ 2007-10-18 03:40:32.000000000 -0400 ++++ Amaya/thotlib/unicode/ustring.c 2008-09-08 05:37:01.000000000 -0400 @@ -437,7 +437,7 @@ CHARSET TtaGetLocaleCharset () if (LocaleSystemCharset == UNSUPPORTED_CHARSET) { diff --git a/www/amaya/patches/patch-ao b/www/amaya/patches/patch-ao index 17c5a04ebb2..3678f635080 100644 --- a/www/amaya/patches/patch-ao +++ b/www/amaya/patches/patch-ao @@ -1,7 +1,7 @@ -$NetBSD: patch-ao,v 1.1 2008/09/11 04:22:50 dholland Exp $ +$NetBSD: patch-ao,v 1.2 2011/07/02 18:54:49 dholland Exp $ ---- ../thotlib/base/structlist.c~ 2008-01-21 06:24:18.000000000 -0500 -+++ ../thotlib/base/structlist.c 2008-09-08 05:45:32.000000000 -0400 +--- Amaya/thotlib/base/structlist.c~ 2008-01-21 06:24:18.000000000 -0500 ++++ Amaya/thotlib/base/structlist.c 2008-09-08 05:45:32.000000000 -0400 @@ -577,7 +577,7 @@ static void WrTree (PtrElement pNode, in switch (pAttr1->AttrType) { diff --git a/www/amaya/patches/patch-ap b/www/amaya/patches/patch-ap index d55dc7b901f..cb70f965dfa 100644 --- a/www/amaya/patches/patch-ap +++ b/www/amaya/patches/patch-ap @@ -1,7 +1,7 @@ -$NetBSD: patch-ap,v 1.2 2010/06/13 22:45:32 wiz Exp $ +$NetBSD: patch-ap,v 1.3 2011/07/02 18:54:49 dholland Exp $ ---- ../../wxWidgets/configure.orig 2007-05-14 09:08:25.000000000 +0000 -+++ ../../wxWidgets/configure +--- wxWidgets/configure.orig 2007-05-14 09:08:25.000000000 +0000 ++++ wxWidgets/configure @@ -23470,43 +23470,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu diff --git a/www/amaya/patches/patch-aq b/www/amaya/patches/patch-aq index 25f36492dda..28f91353d0f 100644 --- a/www/amaya/patches/patch-aq +++ b/www/amaya/patches/patch-aq @@ -1,7 +1,7 @@ -$NetBSD: patch-aq,v 1.1 2008/09/11 04:22:50 dholland Exp $ +$NetBSD: patch-aq,v 1.2 2011/07/02 18:54:49 dholland Exp $ ---- ../batch/Makefile.in~ 2006-11-13 07:24:16.000000000 -0500 -+++ ../batch/Makefile.in 2008-09-08 07:32:38.000000000 -0400 +--- Amaya/batch/Makefile.in.orig 2006-11-13 07:24:16.000000000 -0500 ++++ Amaya/batch/Makefile.in 2008-09-08 07:32:38.000000000 -0400 @@ -11,7 +11,7 @@ THOTDIR = @top_srcdir@ include ../Options diff --git a/www/amaya/patches/patch-ar b/www/amaya/patches/patch-ar new file mode 100644 index 00000000000..141208abb16 --- /dev/null +++ b/www/amaya/patches/patch-ar @@ -0,0 +1,15 @@ +$NetBSD: patch-ar,v 1.1 2011/07/02 18:54:49 dholland Exp $ + +Remove bashism. + +--- libwww/configure.ac~ 2006-03-20 10:36:46.000000000 +0000 ++++ libwww/configure.ac +@@ -302,7 +302,7 @@ AC_CHECK_FUNCS(getcwd gethostname getdom + AC_CHECK_FUNC(unlink) + if test "$ac_cv_func_unlink" != yes ; then + AC_CHECK_FUNC(remove) +- if test "$ac_cv_func_remove" == yes ; then ++ if test "$ac_cv_func_remove" = yes ; then + AC_DEFINE(unlink, remove, [What to use for unlink]) + fi + fi diff --git a/www/amaya/patches/patch-as b/www/amaya/patches/patch-as new file mode 100644 index 00000000000..e9e6257e3cc --- /dev/null +++ b/www/amaya/patches/patch-as @@ -0,0 +1,15 @@ +$NetBSD: patch-as,v 1.1 2011/07/02 18:54:49 dholland Exp $ + +Remove bashism. + +--- libwww/configure~ 2006-03-22 15:17:24.000000000 +0000 ++++ libwww/configure +@@ -32726,7 +32726,7 @@ fi + echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 + echo "${ECHO_T}$ac_cv_func_remove" >&6 + +- if test "$ac_cv_func_remove" == yes ; then ++ if test "$ac_cv_func_remove" = yes ; then + + cat >>confdefs.h <<\_ACEOF + #define unlink remove |